ports/153352: [maintainer update] mail/claws-mail add knob to disable manual building

[Pawel Pekala]

>Number:         153352
>Category:       ports
>Synopsis:       [maintainer update] mail/claws-mail add knob to disable manual building
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 21 20:30:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Pawel Pekala
>Release:        FreeBSD 8.1-RELEASE i386
>Organization:
>Environment:


System: FreeBSD 8.1-RELEASE #2: Sat Aug 21 18:46:54 CEST 2010
    corn at caprica.slowicza.org:/usr/obj/usr/src/sys/GENERIC



>Description:


Due to popular demand on ports@ add a knob to
disable manual building and installing which can
add a lot of build dependencies.


>How-To-Repeat:





>Fix:


--- claws-mail-3.7.8.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/claws-mail/Makefile /home/corn/devel/claws-mail/Makefile
--- /usr/ports/mail/claws-mail/Makefile	2010-12-16 09:19:15.000000000 +0100
+++ /home/corn/devel/claws-mail/Makefile	2010-12-21 21:16:18.000000000 +0100
@@ -13,7 +13,6 @@
 MAINTAINER=	c0rn at o2.pl
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils
 LIB_DEPENDS=	etpan:${PORTSDIR}/mail/libetpan \
 		cairo:${PORTSDIR}/graphics/cairo \
 		expat:${PORTSDIR}/textproc/expat2 \
@@ -26,6 +25,8 @@
 
 CONFLICTS=	sylpheed-claws
 
+LICENSE=	GPLv3
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -40,16 +41,14 @@
 
 MAN1=		claws-mail.1
 
-CONFIGURE_ARGS=	\
-		--with-libiconv-prefix=${LOCALBASE} \
-		--with-manualdir=${DOCSDIR}/manual \
+CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-OPTIONS=	ALL		"Enable all options except GNUTLS."			off \
+OPTIONS=	ALL		"Enable all options."			off \
 		ENCHANT		"Enable spell checking support."	on \
 		BOGOFILTER	"Enable bogofilter support."		off \
 		COMPFACE	"Enable X-Face support."		on \
@@ -59,6 +58,7 @@
 		IPV6		"Enable ipv6 support."			on \
 		JPILOT		"Enable JPilot support."		off \
 		LDAP		"Enable LDAP support."			off \
+		MANUAL		"Build and install manual files"	on \
 		SA_PLUG		"Enable SpamAssassin support."		off \
 		STARTUP		"Enable startup notification support."	on \
 		THEMES		"Install additional themes."		on
@@ -99,6 +99,14 @@
 .else
 CONFIGURE_ARGS+=	--disable-ldap
 .endif
+.if defined(WITH_MANUAL) || defined(WITH_ALL)
+BUILD_DEPENDS=	${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils
+CONFIGURE_ARGS+=	--enable-manual --with-manualdir=${DOCSDIR}/manual
+PLIST_SUB+=		MANUAL=""
+.else
+CONFIGURE_ARGS+=	--disable-manual
+PLIST_SUB+=		MANUAL="@comment "
+.endif
 .if defined(WITH_SA_PLUG) || defined(WITH_ALL)
 RUN_DEPENDS+=		spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 CONFIGURE_ARGS+=	--enable-spamassassin-plugin
@@ -162,6 +170,7 @@
 
 post-install:
 .if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 .for i in NEWS RELEASE_NOTES README TODO
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
diff -ruN --exclude=CVS /usr/ports/mail/claws-mail/pkg-plist /home/corn/devel/claws-mail/pkg-plist
--- /usr/ports/mail/claws-mail/pkg-plist	2010-12-16 09:19:15.000000000 +0100
+++ /home/corn/devel/claws-mail/pkg-plist	2010-12-16 17:34:02.000000000 +0100
@@ -277,26 +277,26 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.tools
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%DOCSDIR%%/manual/de/claws-mail-manual.html
-%%DOCSDIR%%/manual/de/claws-mail-manual.pdf
-%%DOCSDIR%%/manual/de/claws-mail-manual.ps
-%%DOCSDIR%%/manual/de/claws-mail-manual.txt
-%%DOCSDIR%%/manual/en/claws-mail-manual.html
-%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
-%%DOCSDIR%%/manual/en/claws-mail-manual.ps
-%%DOCSDIR%%/manual/en/claws-mail-manual.txt
-%%DOCSDIR%%/manual/es/claws-mail-manual.html
-%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
-%%DOCSDIR%%/manual/es/claws-mail-manual.ps
-%%DOCSDIR%%/manual/es/claws-mail-manual.txt
-%%DOCSDIR%%/manual/fr/claws-mail-manual.html
-%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
-%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
-%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
-%%DOCSDIR%%/manual/pl/claws-mail-manual.html
-%%DOCSDIR%%/manual/pl/claws-mail-manual.pdf
-%%DOCSDIR%%/manual/pl/claws-mail-manual.ps
-%%DOCSDIR%%/manual/pl/claws-mail-manual.txt
+%%MANUAL%%%%DOCSDIR%%/manual/de/claws-mail-manual.html
+%%MANUAL%%%%DOCSDIR%%/manual/de/claws-mail-manual.pdf
+%%MANUAL%%%%DOCSDIR%%/manual/de/claws-mail-manual.ps
+%%MANUAL%%%%DOCSDIR%%/manual/de/claws-mail-manual.txt
+%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.html
+%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.pdf
+%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.ps
+%%MANUAL%%%%DOCSDIR%%/manual/en/claws-mail-manual.txt
+%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.html
+%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.pdf
+%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.ps
+%%MANUAL%%%%DOCSDIR%%/manual/es/claws-mail-manual.txt
+%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.html
+%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.pdf
+%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.ps
+%%MANUAL%%%%DOCSDIR%%/manual/fr/claws-mail-manual.txt
+%%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.html
+%%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.pdf
+%%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.ps
+%%MANUAL%%%%DOCSDIR%%/manual/pl/claws-mail-manual.txt
 share/icons/hicolor/128x128/apps/claws-mail-128x128.png
 share/icons/hicolor/48x48/apps/claws-mail.png
 share/icons/hicolor/64x64/apps/claws-mail-64x64.png
@@ -325,12 +325,12 @@
 share/pixmaps/claws-mail-64x64.png
 share/pixmaps/claws-mail.png
 @dirrm %%DATADIR%%
- at dirrm %%DOCSDIR%%/manual/pl
- at dirrm %%DOCSDIR%%/manual/fr
- at dirrm %%DOCSDIR%%/manual/es
- at dirrm %%DOCSDIR%%/manual/en
- at dirrm %%DOCSDIR%%/manual/de
- at dirrm %%DOCSDIR%%/manual
+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/pl
+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/fr
+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/es
+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/en
+%%MANUAL%%@dirrm %%DOCSDIR%%/manual/de
+%%MANUAL%%@dirrm %%DOCSDIR%%/manual
 @dirrmtry %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrmtry lib/claws-mail/plugins
--- claws-mail-3.7.8.patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: