From 523a52f116ff9483bfb6d709e49b67f54419fca7 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 25 Jun 2020 23:30:24 +0000
Subject: user/doxygen: Update to 1.8.18

---
 user/doxygen/APKBUILD                     | 12 +++++-------
 user/doxygen/doxygen-1.8.14-install.patch | 21 ---------------------
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 user/doxygen/doxygen-1.8.14-install.patch

(limited to 'user/doxygen')

diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD
index eefc391ce..9255fda64 100644
--- a/user/doxygen/APKBUILD
+++ b/user/doxygen/APKBUILD
@@ -1,9 +1,9 @@
 # Maintainer: 
 pkgname=doxygen
-pkgver=1.8.16
+pkgver=1.8.18
 _pkgver=${pkgver%.*.*}_${pkgver#*.}
 _pkgver=${_pkgver%.*}_${pkgver#*.*.}
-pkgrel=1
+pkgrel=0
 pkgdesc="A documentation system for C++, C, Java, IDL, and PHP"
 url="http://www.doxygen.org/"
 arch="all"
@@ -12,7 +12,6 @@ depends=""
 makedepends="bison cmake coreutils flex perl python3"
 checkdepends="libxml2-utils"
 source="https://github.com/doxygen/doxygen/archive/Release_$_pkgver.tar.gz
-	doxygen-1.8.14-install.patch
 	time64.patch
 	"
 builddir="$srcdir/doxygen-Release_$_pkgver"
@@ -22,8 +21,8 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-Dbuild_xmlparser=ON \
-		-DMAN_INSTALL_DIR=/usr/share/man/man1 \
-		-DDOC_INSTALL_DIR=/usr/share/doc/doxygen
+		-DMAN_INSTALL_DIR=share/man/man1 \
+		-DDOC_INSTALL_DIR=share/doc/doxygen
 
 	make
 }
@@ -38,6 +37,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="546ceaae949cf5cc8162309bc804dad7a00b970c14a2dd66d27111e03f2fbebfec299ddc559f8c915ed00776217d2c439843806d2b6c15b58cf29f490979bd8f  Release_1_8_16.tar.gz
-725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1  doxygen-1.8.14-install.patch
+sha512sums="32b0d9e5fbb44e947eb771f323ce4aa76f8b31e940f47dcec2af6c5e98a20b58cb4627eff6e70faac6b8cb2ad67b88b0280496310a5b784466196c22e1174233  Release_1_8_18.tar.gz
 92d82c0799d7cdbb6fb37069514d7c6dbadb0c3d88409803e88180bcfcf4be9a2f346c035cd49de8f7496eed2ffd1519d96a1ec3c22db21c2dfdc4e437dada50  time64.patch"
diff --git a/user/doxygen/doxygen-1.8.14-install.patch b/user/doxygen/doxygen-1.8.14-install.patch
deleted file mode 100644
index 71448b8b4..000000000
--- a/user/doxygen/doxygen-1.8.14-install.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- doxygen-1.8.14/doc/CMakeLists.txt.config	2017-12-31 15:28:32.351163123 +0100
-+++ doxygen-1.8.14/doc/CMakeLists.txt	2017-12-31 15:29:11.490119182 +0100
-@@ -168,15 +168,15 @@ install(FILES
-         "${PROJECT_BINARY_DIR}/man/doxywizard.1"
-         "${PROJECT_BINARY_DIR}/man/doxysearch.1"
-         "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
--        DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-+        DESTINATION "${MAN_INSTALL_DIR}"
- )
- 
- install(FILES
-         "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+        DESTINATION "${DOC_INSTALL_DIR}"
- )
- 
- install(DIRECTORY
-         "${PROJECT_BINARY_DIR}/html"
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+        DESTINATION "${DOC_INSTALL_DIR}"
- )
-- 
cgit v1.2.3-60-g2f50