Date: Sat, 1 Sep 2012 21:00:38 -0400 From: "Jason E. Hale" <bsdkaffee@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/171238: [MAINTAINER] devel/gwenhywfar finance/aqbanking: Fix DOCS option Message-ID: <1346547638.4919.33164@mocha.verizon.net> Resent-Message-ID: <201209020110.q821A8VX005378@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171238
>Category: ports
>Synopsis: [MAINTAINER] devel/gwenhywfar finance/aqbanking: Fix DOCS option
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 02 01:10:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jason E. Hale
>Release: FreeBSD 9.0-RELEASE i386
>Organization:
none
>Environment:
System: FreeBSD mocha.verizon.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Thu Jan 19 11:42:41 EST 2012 Jason@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA9 i386
>Description:
In devel/gwenhywfar and finance/aqbanking, the documentation installed by
doxygen is massive and shouldn't be installed by default. [1] This was the
behavior prior to the last update, but while converting to OPTIONSng the
logic got lost.
Use the DOXYGEN option instead but we still need to check if DOCS is enabled
since the PORTDOCS macro is being used to generate the plist for the
documentation.
Also, fix typos s/DOC/DOCS/ in devel/gwenhywfar.
[1] Reported by: Jan Henrik Sylvester <me@janh.de>
>How-To-Repeat:
Use attached diff
>Fix:
--- 2012-09-01-gwenhywfar.diff begins here ---
Index: finance/aqbanking/Makefile
===================================================================
--- finance/aqbanking/Makefile (revision 303524)
+++ finance/aqbanking/Makefile (working copy)
@@ -14,7 +14,7 @@
LIB_DEPENDS= gwenhywfar:${PORTSDIR}/devel/gwenhywfar \
gmp:${PORTSDIR}/math/gmp
-OPTIONS_DEFINE= DOCS KTOBLZCHECK PAYPAL
+OPTIONS_DEFINE= DOXYGEN KTOBLZCHECK PAYPAL
OPTIONS_DEFAULT= KTOBLZCHECK
KTOBLZCHECK_DESC= Enable KtoBlzCheck support
@@ -41,7 +41,7 @@
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \
dot:${PORTSDIR}/graphics/graphviz
CONFIGURE_ARGS+=--enable-full-doc
@@ -64,12 +64,12 @@
${WRKSRC}/Makefile.in
post-build:
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
@cd ${WRKSRC} && ${GMAKE} srcdoc
.endif
post-install:
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
${MKDIR} ${DOCSDIR}/apidoc
cd ${WRKSRC}/apidoc && \
${COPYTREE_SHARE} \* ${DOCSDIR}/apidoc
Index: devel/gwenhywfar/Makefile
===================================================================
--- devel/gwenhywfar/Makefile (revision 303524)
+++ devel/gwenhywfar/Makefile (working copy)
@@ -15,7 +15,7 @@
gnutls:${PORTSDIR}/security/gnutls
.if !defined(SLAVEPORT)
-OPTIONS_DEFINE= DOC MEMDEBUG
+OPTIONS_DEFINE= DOXYGEN MEMDEBUG
MEMDEBUG_DESC= Enable memory debugger statistic
.endif
@@ -40,7 +40,7 @@
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MDOC}
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \
dot:${PORTSDIR}/graphics/graphviz
CONFIGURE_ARGS+=--enable-full-doc
@@ -79,12 +79,12 @@
.endif
post-build:
-.if ${PORT_OPTIONS:MDOC}
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
@cd ${WRKSRC} && ${GMAKE} srcdoc
.endif
post-install:
-.if ${PORT_OPTIONS:MDOC}
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
${MKDIR} ${DOCSDIR}/apidoc
cd ${WRKSRC}/apidoc && \
${COPYTREE_SHARE} \* ${DOCSDIR}/apidoc
--- 2012-09-01-gwenhywfar.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1346547638.4919.33164>