work in cmake build process

3 files changed, 44 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7da89a1655e8..c922f35b1340 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
-# Generated by mksrcinfo v8
-# Sat Aug 27 15:38:22 UTC 2016
 pkgbase = apt
-	pkgdesc = commandline package manager
-	pkgver = 1.2.14
+	pkgdesc = Command-line package manager used on Debian-based systems
+	pkgver = 1.3.2
 	pkgrel = 1
-	url = http://packages.debian.org/sid/apt
+	url = http://packages.debian.org
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	makedepends = cmake
 	makedepends = dpkg
 	makedepends = docbook-xsl
+	makedepends = doxygen
 	makedepends = po4a
 	makedepends = gtest
-	makedepends = dash
+	makedepends = w3m
 	depends = gnupg
 	depends = curl
 	depends = xz
@@ -20,8 +20,8 @@ pkgbase = apt
 	provides = libapt-pkg
 	provides = libapt-pkg-dev
 	provides = apt-utils
-	source = https://github.com/Debian/apt/archive/1.2.14.tar.gz
-	sha256sums = 5809427f78a9e3081ff0afc0547a9917ea9115ce634f4479015f3a14b1eb527d
+	source = git+https://anonscm.debian.org/git/apt/apt.git#tag=1.3.2
+	sha256sums = SKIP
 
 pkgname = apt
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05c6d4d4c97b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 8ed2bdfbab3e..f79d6918ec72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,106 +1,51 @@
-# Maintainer: Mark Weiman <mark.weiman@markzz.com>
+# Maintainer:  Michael DeGuzis <mdeguzis@gmail.com>
+# Contributor: Mark Weiman <mark.weiman@markzz.com>
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
+# Contributor: Tony Lambiris <tony@critialstack.com>
 
 pkgname=apt
-pkgver=1.2.14
+pkgver=1.3.2
 pkgrel=1
-pkgdesc="commandline package manager"
+pkgdesc="Command-line package manager used on Debian-based systems"
 arch=('i686' 'x86_64')
-url="http://packages.debian.org/sid/apt"
+url="http://packages.debian.org"
 license=('GPL2')
 depends=('gnupg' 'curl' 'xz')
-makedepends=('dpkg' 'docbook-xsl' 'po4a' 'gtest' 'dash')
+makedepends=('cmake' 'dpkg' 'docbook-xsl' 'doxygen' 'po4a' 'gtest' 'w3m')
+checkdepends=()
+optdepends=()
 provides=('libapt-inst' 'libapt-pkg' 'libapt-pkg-dev' "apt-utils")
-source=(https://github.com/Debian/apt/archive/1.2.14.tar.gz)
-sha256sums=('5809427f78a9e3081ff0afc0547a9917ea9115ce634f4479015f3a14b1eb527d')
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("git+https://anonscm.debian.org/git/apt/apt.git#tag=${pkgver}")
+sha256sums=('SKIP')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
+
+  # docbook xsl is stored with the version on Arch
+  DOCBOOK_XSL_VER=$(pacman -Q docbook-xsl | sed 's/docbook-xsl //;s/\-.*//')
+
+  cmake \
+	-DCMAKE_INSTALL_PREFIX="/usr" \
+	-DCMAKE_INSTALL_LIBDIR="lib" \
+	-DDOCBOOK_XSL="/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER}" \
+	.
 
-  # this only copies config.{guess,sub} and displays errors
-  automake --add-missing --no-force -W none 2> /dev/null || true
-  autoreconf --install || true
   _stylesheet=`ls -d /usr/share/xml/docbook/xsl-stylesheets-* | xargs basename`
-  sed -i -e "s|stylesheet/nwalsh|$_stylesheet|" doc/manpage-style.xsl
-  # disable debiandoc, this saves us from sgml problems
-  sed -i -e 's|-C doc $@|-C doc manpages|' Makefile
-  # bash 4.3.33 seems to have problems, use dash instead (sh symlink in Debian)
-  sed -i -e 's|#!/bin/sh|#!/bin/dash|' configure
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
-  make
-}
+  sed -i -e "s|stylesheet/docbook-xsl|$_stylesheet|" doc/*.xsl
+  sed -i -e "s|stylesheet/nwalsh|$_stylesheet|" doc/*.xsl
 
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k test
+  make -j $(nproc) all
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p $pkgdir/usr/bin
-  # apt
-  for file in {cache,cdrom,config,get,key,mark}; do
-    install bin/apt-$file $pkgdir/usr/bin/
-  done
-  # apt-utils
-  for file in {extracttemplates,ftparchive,sortpkgs}; do
-    install bin/apt-$file $pkgdir/usr/bin/
-  done
-
-  mkdir -p $pkgdir/usr/lib
-  libdir=$pkgdir/usr/lib
-  # libapt-inst
-  install bin/libapt-inst.so.2.0 $libdir/
-  ln -s -r $libdir/libapt-inst.so.2.0 $libdir/libapt-inst.so.2.0.0
-  ln -s -r $libdir/libapt-inst.so.2.0 $libdir/libapt-inst.so
-  # libapt-pkg
-  install bin/libapt-pkg.so.5.0 $libdir/
-  ln -s -r $libdir/libapt-pkg.so.5.0 $libdir/libapt-pkg.so.5.0.0
-  ln -s -r $libdir/libapt-pkg.so.5.0 $libdir/libapt-pkg.so
-  # libapt-private
-  install bin/libapt-private.so.0.0.0 $libdir/
-  ln -s -r $libdir/libapt-private.so.0.0.0 $libdir/libapt-private.so.0.0
-  ln -s -r $libdir/libapt-private.so.0.0.0 $libdir/libapt-private.so
-  # apt-utils
-  mkdir -p $pkgdir/usr/lib/apt/solvers
-  install bin/apt-internal-solver $pkgdir/usr/lib/apt/solvers/apt
-  install bin/apt-dump-solver $pkgdir/usr/lib/apt/solvers/dump
-  # apt
-  mkdir -p $pkgdir/usr/lib/apt/methods
-  install bin/methods/* $pkgdir/usr/lib/apt/methods/
-  mkdir -p $pkgdir/usr/lib/dpkg/methods/apt/
-  install dselect/{install,setup,update} $pkgdir/usr/lib/dpkg/methods/apt/
-  install -m 644 dselect/{desc.apt,names} $pkgdir/usr/lib/dpkg/methods/apt/
-
-  # ALL manpages
-  mkdir -p $pkgdir/usr/share/man
-  for part in {1,5,8}; do
-    for lang in {de,en,es,fr,it,ja,pl,pt}; do
-      mkdir -p $pkgdir/usr/share/man/$lang/man$part
-      gzip -f doc/$lang/*.$part || true
-      install -m 644 doc/$lang/*.$part.gz $pkgdir/usr/share/man/$lang/man$part/\
-                                                                        || true
-    done
-  done
-
-  # ALL example configs
-  mkdir -p $pkgdir/usr/share/doc/apt/examples
-  install -m 644 doc/examples/* $pkgdir/usr/share/doc/apt/examples
-
-  # ALL locales
-  mkdir -p $pkgdir/usr/share/locale
-  for lang in locale/*; do
-    mkdir -p $pkgdir/usr/share/$lang/LC_MESSAGES
-    install -m 644 $lang/LC_MESSAGES/* $pkgdir/usr/share/$lang/LC_MESSAGES/
-  done
-
-  # libapt-pkg-dev
-  mkdir -p $pkgdir/usr/include/apt-pkg
-  install -m 644 include/apt-pkg/* $pkgdir/usr/include/apt-pkg/
-  # libapt-private-dev
-  mkdir -p $pkgdir/usr/include/apt-private
-  install -m 644 include/apt-private/* $pkgdir/usr/include/apt-private/
+  cd "$srcdir/$pkgname"
+  make DESTDIR="${pkgdir}" install
 }
 
 # vim:set ts=2 sw=2 et: