Re: UPDATE: devel/doxygen, devel/doxygen-gui
Any objections?
On Mon Jan 01, 2018 at 03:21:37PM +0100, Rafael Sadowski wrote:
> Hi All,
>
> please find below a simple diff to update doxygen. There are a three
> notables changes:
>
> - Remove the DOXYGEN_ENCODE_PATH_STRIP hack diff. No port uses it anymore
> - Change MAINTAINER email address
> - CONFIGURE_ARGS and BUILD_DEPENDS tweaks
>
> The only one consumer opencv builds fine and generate no PLIST changes.
>
> Ok? Comments?
>
> Rafael
>
>
> Index: devel/doxygen/Makefile
> ===
> RCS file: /cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 Makefile
> --- devel/doxygen/Makefile17 Aug 2017 14:31:37 - 1.44
> +++ devel/doxygen/Makefile1 Jan 2018 14:12:43 -
> @@ -7,16 +7,15 @@ BROKEN-alpha= .got subsegment exceeds 64
>
> COMMENT= source code documentation generator tool
>
> -VERSION= 1.8.13
> +VERSION= 1.8.14
> DISTNAME=doxygen-${VERSION}.src
> PKGNAME= doxygen-${VERSION}
> -REVISION=0
>
> CATEGORIES= devel textproc
>
> HOMEPAGE=http://www.doxygen.org/
>
> -MAINTAINER= Rafael Sadowski
> +MAINTAINER= Rafael Sadowski
>
> # GPLv2
> PERMIT_PACKAGE_CDROM=Yes
> @@ -43,9 +42,9 @@ BUILD_DEPENDS+= devel/bison
> RUN_DEPENDS+=print/ghostscript/gnu \
> math/graphviz
>
> -CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON
> -CONFIGURE_ARGS+=-Dbuild_app:Bool=ON
> -CONFIGURE_ARGS+=-Dbuild_search:Bool=ON
> +CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON \
> + -Dbuild_app:Bool=ON \
> + -Dbuild_search:Bool=ON
>
> WRKDIST= ${WRKDIR}/doxygen-${VERSION}
>
> Index: devel/doxygen/distinfo
> ===
> RCS file: /cvs/ports/devel/doxygen/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- devel/doxygen/distinfo21 Apr 2017 19:43:38 - 1.11
> +++ devel/doxygen/distinfo1 Jan 2018 14:12:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (doxygen-1.8.13.src.tar.gz) =
> r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
> -SIZE (doxygen-1.8.13.src.tar.gz) = 4893912
> +SHA256 (doxygen-1.8.14.src.tar.gz) =
> 0XV+AnVe9vVv1F8fQ5hZi5IDgZSNb8+lj1ymqlb1nU0=
> +SIZE (doxygen-1.8.14.src.tar.gz) = 4877980
> Index: devel/doxygen/patches/patch-doc_CMakeLists_txt
> ===
> RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-doc_CMakeLists_txt
> --- devel/doxygen/patches/patch-doc_CMakeLists_txt23 Dec 2016 15:23:11
> - 1.2
> +++ devel/doxygen/patches/patch-doc_CMakeLists_txt1 Jan 2018 14:12:43
> -
> @@ -4,29 +4,30 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
> - remove doxywizard.1, see devel/doxygen-gui
>
>
> doc/CMakeLists.txt.orig Sun Sep 4 19:06:42 2016
> -+++ doc/CMakeLists.txt Fri Dec 9 22:52:29 2016
> -@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
> +Index: doc/CMakeLists.txt
> +--- doc/CMakeLists.txt.orig
> doc/CMakeLists.txt
> +@@ -152,12 +152,7 @@ add_custom_target(doxygen_pdf
> WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
> )
> add_custom_target(docs
> -COMMAND ${CMAKE_COMMAND} -E copy
> ${CMAKE_SOURCE_DIR}/doc/doxygen_logo.gif ${PROJECT_BINARY_DIR}/html/
> -COMMAND ${CMAKE_COMMAND} -E copy
> ${CMAKE_SOURCE_DIR}/doc/doxygen_logo_low.gif ${PROJECT_BINARY_DIR}/html/
> DEPENDS ${PROJECT_BINARY_DIR}/man/doxygen.1
> - ${PROJECT_BINARY_DIR}/man/doxywizard.1
> +-${PROJECT_BINARY_DIR}/man/doxywizard.1
> -${PROJECT_BINARY_DIR}/man/doxysearch.1
> -${PROJECT_BINARY_DIR}/man/doxyindexer.1
> --doxygen_pdf
> + doxygen_pdf
> VERBATIM
> )
> -
> +@@ -165,18 +160,5 @@ add_custom_target(docs
>
>
> install(FILES
> "${PROJECT_BINARY_DIR}/man/doxygen.1"
> -"${PROJECT_BINARY_DIR}/man/doxywizard.1"
> -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
> -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
> --DESTINATION share/man/man1
> + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
> -)
> -
> -install(FILES
> @@ -37,7 +38,4 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
> -install(DIRECTORY
> -"${PROJECT_BINARY_DIR}/html"
> -DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
> -+DESTINATION man/man1
> )
> -
> - endif(build_doc)
> Index: devel/doxygen/patches/patch-src_dirdef_cpp
> ===
> RCS file: devel/doxygen/patches/patch-src_dirdef_cpp
> diff -N devel/doxygen/patches/patch-src_dirdef_cpp
> --- devel/doxygen/patches/patch-src_dirdef_cpp
UPDATE: devel/doxygen, devel/doxygen-gui
Hi All,
please find below a simple diff to update doxygen. There are a three
notables changes:
- Remove the DOXYGEN_ENCODE_PATH_STRIP hack diff. No port uses it anymore
- Change MAINTAINER email address
- CONFIGURE_ARGS and BUILD_DEPENDS tweaks
The only one consumer opencv builds fine and generate no PLIST changes.
Ok? Comments?
Rafael
Index: devel/doxygen/Makefile
===
RCS file: /cvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- devel/doxygen/Makefile 17 Aug 2017 14:31:37 - 1.44
+++ devel/doxygen/Makefile 1 Jan 2018 14:12:43 -
@@ -7,16 +7,15 @@ BROKEN-alpha= .got subsegment exceeds 64
COMMENT= source code documentation generator tool
-VERSION= 1.8.13
+VERSION= 1.8.14
DISTNAME= doxygen-${VERSION}.src
PKGNAME= doxygen-${VERSION}
-REVISION= 0
CATEGORIES=devel textproc
HOMEPAGE= http://www.doxygen.org/
-MAINTAINER=Rafael Sadowski
+MAINTAINER=Rafael Sadowski
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -43,9 +42,9 @@ BUILD_DEPENDS+= devel/bison
RUN_DEPENDS+= print/ghostscript/gnu \
math/graphviz
-CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON
-CONFIGURE_ARGS+=-Dbuild_app:Bool=ON
-CONFIGURE_ARGS+=-Dbuild_search:Bool=ON
+CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON \
+ -Dbuild_app:Bool=ON \
+ -Dbuild_search:Bool=ON
WRKDIST= ${WRKDIR}/doxygen-${VERSION}
Index: devel/doxygen/distinfo
===
RCS file: /cvs/ports/devel/doxygen/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- devel/doxygen/distinfo 21 Apr 2017 19:43:38 - 1.11
+++ devel/doxygen/distinfo 1 Jan 2018 14:12:43 -
@@ -1,2 +1,2 @@
-SHA256 (doxygen-1.8.13.src.tar.gz) =
r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
-SIZE (doxygen-1.8.13.src.tar.gz) = 4893912
+SHA256 (doxygen-1.8.14.src.tar.gz) =
0XV+AnVe9vVv1F8fQ5hZi5IDgZSNb8+lj1ymqlb1nU0=
+SIZE (doxygen-1.8.14.src.tar.gz) = 4877980
Index: devel/doxygen/patches/patch-doc_CMakeLists_txt
===
RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-doc_CMakeLists_txt
--- devel/doxygen/patches/patch-doc_CMakeLists_txt 23 Dec 2016 15:23:11
- 1.2
+++ devel/doxygen/patches/patch-doc_CMakeLists_txt 1 Jan 2018 14:12:43
-
@@ -4,29 +4,30 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
- remove doxywizard.1, see devel/doxygen-gui
doc/CMakeLists.txt.origSun Sep 4 19:06:42 2016
-+++ doc/CMakeLists.txt Fri Dec 9 22:52:29 2016
-@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
+Index: doc/CMakeLists.txt
+--- doc/CMakeLists.txt.orig
doc/CMakeLists.txt
+@@ -152,12 +152,7 @@ add_custom_target(doxygen_pdf
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
)
add_custom_target(docs
-COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/doc/doxygen_logo.gif ${PROJECT_BINARY_DIR}/html/
-COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/doc/doxygen_logo_low.gif ${PROJECT_BINARY_DIR}/html/
DEPENDS ${PROJECT_BINARY_DIR}/man/doxygen.1
- ${PROJECT_BINARY_DIR}/man/doxywizard.1
+-${PROJECT_BINARY_DIR}/man/doxywizard.1
-${PROJECT_BINARY_DIR}/man/doxysearch.1
-${PROJECT_BINARY_DIR}/man/doxyindexer.1
--doxygen_pdf
+ doxygen_pdf
VERBATIM
)
-
+@@ -165,18 +160,5 @@ add_custom_target(docs
install(FILES
"${PROJECT_BINARY_DIR}/man/doxygen.1"
-"${PROJECT_BINARY_DIR}/man/doxywizard.1"
-"${PROJECT_BINARY_DIR}/man/doxysearch.1"
-"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
--DESTINATION share/man/man1
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-)
-
-install(FILES
@@ -37,7 +38,4 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
-install(DIRECTORY
-"${PROJECT_BINARY_DIR}/html"
-DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+DESTINATION man/man1
)
-
- endif(build_doc)
Index: devel/doxygen/patches/patch-src_dirdef_cpp
===
RCS file: devel/doxygen/patches/patch-src_dirdef_cpp
diff -N devel/doxygen/patches/patch-src_dirdef_cpp
--- devel/doxygen/patches/patch-src_dirdef_cpp 12 Nov 2016 20:50:41 -
1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_dirdef_cpp,v 1.5 2016/11/12 20:50:41 jca Exp $
src/dirdef.cpp.origSun Sep 4 19:06:42 2016
-+++ src/dirdef.cpp Mon Sep 12 07:52:20 2016
-@@ -86,10 +86,16 @@ void DirDef::sort()
-
- static
