From owner-svn-ports-all@FreeBSD.ORG Wed Apr 30 13:26:19 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8A03FAA; Wed, 30 Apr 2014 13:26:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A32A811D4; Wed, 30 Apr 2014 13:26:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3UDQJoB048311; Wed, 30 Apr 2014 13:26:19 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3UDQJjE048305; Wed, 30 Apr 2014 13:26:19 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201404301326.s3UDQJjE048305@svn.freebsd.org> From: Adam Weinberger Date: Wed, 30 Apr 2014 13:26:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352681 - head/mail/bogofilter X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2014 13:26:19 -0000 Author: adamw Date: Wed Apr 30 13:26:18 2014 New Revision: 352681 URL: http://svnweb.freebsd.org/changeset/ports/352681 QAT: https://qat.redports.org/buildarchive/r352681/ Log: Make it possible to fully disable DOCS by considering everything in DOCSDIR to be part of PORTDOCS. Really, the "contrib" stuff belong in EXAMPLESDIR. While here, use OPTIONS helpers, add DOCS to the OPTIONS_DEFINE list, and bump PORTREVISION. Maintainer should consider moving the contrib pieces to EXAMPLESDIR, and moving the pkg-install to a pkg-message so that it can be viewed later. Modified: head/mail/bogofilter/Makefile head/mail/bogofilter/pkg-plist Modified: head/mail/bogofilter/Makefile ============================================================================== --- head/mail/bogofilter/Makefile Wed Apr 30 13:21:06 2014 (r352680) +++ head/mail/bogofilter/Makefile Wed Apr 30 13:26:18 2014 (r352681) @@ -3,7 +3,7 @@ PORTNAME= bogofilter PORTVERSION= 1.2.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= mail MASTER_SITES= SF/bogofilter/bogofilter-current/bogofilter-${PORTVERSION} @@ -15,7 +15,7 @@ COMMENT= Fast, teachable, learning spam USE_BDB= 41+ .endif -OPTIONS_DEFINE= GSL UNICODE +OPTIONS_DEFINE= GSL UNICODE DOCS OPTIONS_DEFAULT= GSL UNICODE GSL_DESC= Link with system-wide GSL dynamically (recommended) UNICODE_DESC= Normalize tokens to Unicode (UTF-8) (recommended) @@ -27,11 +27,12 @@ USE_PERL5= run USE_BZIP2= yes GNU_CONFIGURE= yes -.include +UNICODE_USES= iconv +UNICODE_CONFIGURE_ENABLE= unicode +GSL_LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl +GSL_CONFIGURE_ARGS_OFF= --with-included-gsl -.if ${PORT_OPTIONS:MUNICODE} -USES+= iconv -.endif +PORTDOCS= * .include @@ -43,14 +44,8 @@ BF_LIBS?= -l${BDB_LIB_NAME} BF_CPPFLAGS?= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc .if ${PORT_OPTIONS:MUNICODE} -CONFIGURE_ARGS+= --enable-unicode BF_LIBS+= ${ICONV_LIB} .endif -.if ${PORT_OPTIONS:MGSL} -LIB_DEPENDS+= libgsl.so:${PORTSDIR}/math/gsl -.else -CONFIGURE_ARGS+= --with-included-gsl -.endif CPPFLAGS+= ${BF_CPPFLAGS} CONFIGURE_ENV+= LIBS="${BF_LIBS}" \ PERL="${PERL}" @@ -65,20 +60,12 @@ post-patch: -e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \ ${WRKSRC}/src/tests/Makefile.am -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -PLIST_SUB= CONTRIB="@comment " -.else -PLIST_SUB= CONTRIB="" -.endif - # XXX: disable self-tests until issue with automake-1.13 is sorted out # post-build:: # cd ${WRKSRC}/src && make check SHELL=${SH} post-install:: @${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib -.if ${PORT_OPTIONS:MDOCS} .for i in html programmer xml @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} .endfor @@ -97,7 +84,6 @@ post-install:: ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html ${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${STAGEDIR}${DOCSDIR}/xml ${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${STAGEDIR}${DOCSDIR}/programmer -.endif ${INSTALL_PROGRAM} ${WRKSRC}/bogogrep ${STAGEDIR}${PREFIX}/bin/ .for i in bfproxy.pl bogofilter-milter.pl bogo.R bogofilter-qfe.sh \ mime.get.rfc822.pl parmtest.sh printmaildir.pl \ Modified: head/mail/bogofilter/pkg-plist ============================================================================== --- head/mail/bogofilter/pkg-plist Wed Apr 30 13:21:06 2014 (r352680) +++ head/mail/bogofilter/pkg-plist Wed Apr 30 13:26:18 2014 (r352681) @@ -16,22 +16,3 @@ man/man1/bogolexer.1.gz man/man1/bogotune.1.gz man/man1/bogoupgrade.1.gz man/man1/bogoutil.1.gz -%%CONTRIB%%%%DOCSDIR%%/contrib/bfproxy.pl -%%CONTRIB%%%%DOCSDIR%%/contrib/bogo.R -%%CONTRIB%%%%DOCSDIR%%/contrib/bogofilter-milter.pl -%%CONTRIB%%%%DOCSDIR%%/contrib/bogofilter-qfe.sh -%%CONTRIB%%%%DOCSDIR%%/contrib/bogominitrain.pl -%%CONTRIB%%%%DOCSDIR%%/contrib/dot-qmail-bogofilter-default -%%CONTRIB%%%%DOCSDIR%%/contrib/mailfilter.example -%%CONTRIB%%%%DOCSDIR%%/contrib/mime.get.rfc822.pl -%%CONTRIB%%%%DOCSDIR%%/contrib/parmtest.sh -%%CONTRIB%%%%DOCSDIR%%/contrib/printmaildir.pl -%%CONTRIB%%%%DOCSDIR%%/contrib/procmailrc.example -%%CONTRIB%%%%DOCSDIR%%/contrib/randomtrain.sh -%%CONTRIB%%%%DOCSDIR%%/contrib/scramble.sh -%%CONTRIB%%%%DOCSDIR%%/contrib/spamitarium.pl -%%CONTRIB%%%%DOCSDIR%%/contrib/stripsearch.pl -%%CONTRIB%%%%DOCSDIR%%/contrib/trainbogo.sh -%%CONTRIB%%%%DOCSDIR%%/contrib/vm-bogofilter.el -%%CONTRIB%%@dirrm %%DOCSDIR%%/contrib -%%CONTRIB%%@dirrm %%DOCSDIR%%