doxygen: update to 1.8.14

2 files changed, 62 insertions, 41 deletions

diff --git a/abs/extra/doxygen/PKGBUILD b/abs/extra/doxygen/PKGBUILD
index d877cd2..8d22169 100644
--- a/abs/extra/doxygen/PKGBUILD
+++ b/abs/extra/doxygen/PKGBUILD
@@ -1,25 +1,70 @@
-# $Id: PKGBUILD 84267 2010-06-28 05:13:23Z dan $
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Maintainer: Dan McGee <dan@archlinux.org>
-pkgname=doxygen
-pkgver=1.8.2
+
+pkgbase=doxygen
+pkgname=('doxygen' 'doxygen-docs')
+pkgver=1.8.14
 pkgrel=1
-pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
+pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
+url='http://www.doxygen.org/'
+arch=('x86_64')
 license=('GPL')
-arch=(i686 x86_64)
-url="http://www.doxygen.org/"
-depends=('gcc-libs')
-# qt required to build and run doxywizard, but don't want to drag it in
-makedepends=('flex' 'qt')
-optdepends=('graphviz: for caller/callee graph generation'
-            'qt: for doxywizard')
-source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
+makedepends=('cmake' 'gcc-libs' 'flex' 'qt5-base' 'texlive-core' 'ghostscript'
+             'texlive-latexextra' 'graphviz' 'python2')
+source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz)
+sha256sums=('18bc3790b4d5f4d57cb8ee0a77dd63a52518f3f70d7fdff868a7ce7961a6edc3')
+sha512sums=('e19d706be64f8c1d35d3cd12b8c35f09503213bb3f5a4aa311ef0a6a953843ebed5ac4eca52ca908222543fb9794d545bb6d88c9fc8f39e66ef22c1919c120b0')
+
+prepare() {
+  cd ${pkgbase}-Release_${pkgver//./_}
+
+  mkdir build
+
+  # Install the man pages in the right place
+  sed -i 's:DESTINATION man/man1:DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1":g' \
+    doc/CMakeLists.txt
+}
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  QTDIR=/usr ./configure --prefix /usr --with-doxywizard
-  make || return 1
-  make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install
+  cd ${pkgbase}-Release_${pkgver//./_}/build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DDOC_INSTALL_DIR:PATH=share/doc/doxygen \
+    -DPYTHON_EXECUTABLE:FILE=/usr/bin/python2 \
+    -Dbuild_doc:BOOL=ON \
+    -Dbuild_wizard:BOOL=ON
+
+  make
+  make docs
+}
+
+check(){
+  cd ${pkgbase}-Release_${pkgver//./_}/build
+  make tests
+}
+
+package_doxygen() {
+  pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
+  depends=('gcc-libs')
+  optdepends=('graphviz: for caller/callee graph generation'
+              'qt5-base: for doxywizard')
+
+  cd ${pkgbase}-Release_${pkgver//./_}/build
+  make DESTDIR="${pkgdir}" install
+
+  # Docs are in 'doxygen-docs'
+  rm -rf "${pkgdir}/usr/share/doc"
 }
 
+package_doxygen-docs() {
+  pkgdesc='Developer documentation for doxygen'
+
+  cd ${pkgbase}-Release_${pkgver//./_}/build
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/bin"
+  rm -rf "${pkgdir}/usr/share/man"
+}
 
-md5sums=('6fa7baf995fa3f71cfc09e264ba88a83')
+# vim: ts=2 sw=2 et:
diff --git a/abs/extra/doxygen/PKGBUILD.orig b/abs/extra/doxygen/PKGBUILD.orig
deleted file mode 100644
index f4b09d2..0000000
--- a/abs/extra/doxygen/PKGBUILD.orig
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 14308 2008-10-05 15:59:28Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-pkgname=doxygen
-pkgver=1.7.1
-pkgrel=1
-pkgdesc="A documentation system for C++, C, Java, IDL and PHP"
-license=('GPL')
-arch=(i686 x86_64)
-url="http://www.doxygen.org/"
-depends=('gcc-libs')
-# qt required to build and run doxywizard, but don't want to drag it in
-makedepends=('flex' 'qt3')
-optdepends=('graphviz: for caller/callee graph generation'
-            'qt3: for doxywizard')
-source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-
-build() {
-  . /etc/profile.d/qt3.sh
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix /usr --with-doxywizard
-  make || return 1
-  make INSTALL=${startdir}/pkg/usr MAN1DIR=share/man/man1 install
-}
-md5sums=('13e76e10fb55581a16ee04de35c264f0')