Bug 171238

Summary: [MAINTAINER] devel/gwenhywfar finance/aqbanking: Fix DOCS option
Product: Ports & Packages Reporter: Jason E. Hale <bsdkaffee>
Component: Individual Port(s)Assignee: Raphael Kubo da Costa <rakuco>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
2012-09-01-gwenhywfar.diff none

Description Jason E. Hale 2012-09-02 02:10:08 UTC 
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
Comment 1 Raphael Kubo da Costa freebsd_committer freebsd_triage 2012-09-02 10:40:38 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->rakuco

I'll take it.
Comment 2 Raphael Kubo da Costa freebsd_committer freebsd_triage 2012-09-02 10:58:35 UTC 
State Changed
From-To: open->closed

Committed with a PORTREVISION bump in both ports.
Comment 3 dfilter service freebsd_committer freebsd_triage 2012-09-02 10:58:43 UTC 
Author: rakuco
Date: Sun Sep  2 09:58:32 2012
New Revision: 303541
URL: http://svn.freebsd.org/changeset/ports/303541

Log:
  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.
  
  Bump PORTREVISION.
  
  [1] Reported by: Jan Henrik Sylvester <me@janh.de>
  
  PR:		ports/171238
  Submitted by:	Jason E. Hale <bsdkaffee@gmail.com> (maintainer)

Modified:
  head/devel/gwenhywfar/Makefile
  head/finance/aqbanking/Makefile

Modified: head/devel/gwenhywfar/Makefile
==============================================================================
--- head/devel/gwenhywfar/Makefile	Sun Sep  2 09:16:08 2012	(r303540)
+++ head/devel/gwenhywfar/Makefile	Sun Sep  2 09:58:32 2012	(r303541)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gwenhywfar
 PORTVERSION=	4.3.3
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	devel net security
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security
 		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 @@ GWEN_SHLIB_VER=	60
 
 .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 @@ post-patch:
 .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

Modified: head/finance/aqbanking/Makefile
==============================================================================
--- head/finance/aqbanking/Makefile	Sun Sep  2 09:16:08 2012	(r303540)
+++ head/finance/aqbanking/Makefile	Sun Sep  2 09:58:32 2012	(r303541)
@@ -2,6 +2,7 @@
 
 PORTNAME=	aqbanking
 PORTVERSION=	5.0.25
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=03&release=95&file=01&dummy=/
 
@@ -14,7 +15,7 @@ LICENSE_COMB=	dual
 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 +42,7 @@ GWEN_SHLIB_VER=	60
 
 .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 +65,12 @@ post-patch:
 		${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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"