>Number: 87890
>Category: ports
>Synopsis: [MAINTAINER] mail/bogofilter*: Fix NOPORTDOCS, minor cleanups
>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: Sun Oct 23 23:50:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 4.11-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 4.11-RELEASE-p12 FreeBSD 4.11-RELEASE-p12 #2: Fri Sep 16 00:02:49 CEST 2005
>Description:
- Fix NOPORTDOCS "make install" and packaging,
reported by Stanislaw Halik (bcc'd to protect his mail address).
- Clean up CONFLICTS
- Run t.lock3 in bogofilter-sqlite again
- Bump port revision after pkg-plist change.
Notice: Fix section below contains patches for bogofilter, bogofilter-qdbm and bogofilter-sqlite ports.
Please commit all three of them. Thank you.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- bogofilter-0.96.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /usr/home/emma/ports/mail/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile Mon Oct 24 01:08:40 2005
+++ /usr/home/emma/ports/mail/bogofilter/Makefile Mon Oct 24 01:31:20 2005
@@ -7,7 +7,7 @@
PORTNAME= bogofilter
PORTVERSION= 0.96.2
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,7 +21,7 @@
LIB_DEPENDS?= db-4.3:${PORTSDIR}/databases/db43
-CONFLICTS?= bogofilter-sqlite-[0-9]* bogofilter-tdb-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
+CONFLICTS?= bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
USE_BZIP2= yes
USE_REINPLACE= yes
@@ -72,15 +72,18 @@
.if !defined(NOPORTDOCS)
PORTDOCS= *
+PLIST_SUB= CONTRIB="@comment "
+.else
+PLIST_SUB= CONTRIB=""
.endif
post-build::
cd ${WRKSRC} && make check SHELL=${SH}
post-install::
+ @${MKDIR} ${DOCSDIR}/contrib
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for i in contrib html programmer xml
+.for i in html programmer xml
@${MKDIR} ${DOCSDIR}/${i}
.endfor
.for i in AUTHORS COPYING INSTALL NEWS README README.cvs \
@@ -93,19 +96,19 @@
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
${INSTALL_DATA} ${WRKSRC}/trio/AUTHORS ${DOCSDIR}/AUTHORS.trio
-.for i in contrib/bogo.R contrib/bogofilter-qfe \
- contrib/mime.get.rfc822 contrib/printmaildir.pl \
- contrib/bogominitrain.pl contrib/README.contrib
- ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
-.endfor
.for i in contrib/dot-qmail-bogofilter-default
${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/contrib/bogogrep ${DOCSDIR}/contrib/
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
${INSTALL_DATA} ${WRKSRC}/doc/*.xml ${DOCSDIR}/xml
${INSTALL_DATA} ${WRKSRC}/doc/programmer/README.freebsd ${DOCSDIR}/programmer
.endif
+ ${INSTALL_PROGRAM} ${WRKSRC}/contrib/bogogrep ${DOCSDIR}/contrib/
+.for i in contrib/bogo.R contrib/bogofilter-qfe \
+ contrib/mime.get.rfc822 contrib/printmaildir.pl \
+ contrib/bogominitrain.pl contrib/README.contrib
+ ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
+.endfor
.if !defined(WITHOUT_BASH)
.for i in randomtrain scramble trainbogo.sh
${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${DOCSDIR}/contrib/
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/pkg-plist /usr/home/emma/ports/mail/bogofilter/pkg-plist
--- /usr/ports/mail/bogofilter/pkg-plist Wed Jul 27 11:43:20 2005
+++ /usr/home/emma/ports/mail/bogofilter/pkg-plist Mon Oct 24 01:21:20 2005
@@ -7,3 +7,16 @@
bin/bogoutil
bin/bogoupgrade
etc/bogofilter.cf.example
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogo.R
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogofilter-qfe
+%%CONTRIB%%%%DOCSDIR%%/contrib/mime.get.rfc822
+%%CONTRIB%%%%DOCSDIR%%/contrib/printmaildir.pl
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogominitrain.pl
+%%CONTRIB%%%%DOCSDIR%%/contrib/README.contrib
+%%CONTRIB%%%%DOCSDIR%%/contrib/bogogrep
+%%CONTRIB%%%%DOCSDIR%%/contrib/randomtrain
+%%CONTRIB%%%%DOCSDIR%%/contrib/scramble
+%%CONTRIB%%%%DOCSDIR%%/contrib/trainbogo.sh
+%%CONTRIB%%%%DOCSDIR%%/contrib/README.randomtrain
+%%CONTRIB%%@dirrm %%DOCSDIR%%/contrib
+%%CONTRIB%%@dirrm %%DOCSDIR%%
--- bogofilter-0.96.2_1.patch ends here ---
--- /usr/ports/mail/bogofilter-sqlite/Makefile Wed Jun 8 22:34:33 2005
+++ /usr/home/emma/ports/mail/bogofilter-sqlite/Makefile Mon Oct 24 01:28:05 2005
@@ -6,7 +6,6 @@
#
PORTNAME= bogofilter
-PORTREVISION= 0
CATEGORIES= mail
PKGNAMESUFFIX= -sqlite
@@ -14,8 +13,7 @@
LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3
-CONFLICTS= bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tdb-[0-9]* \
- [a-z][a-z]-bogofilter-[0-9]* bogofilter-current-[0-9]*
+CONFLICTS= bogofilter-[0-9]* bogofilter-qdbm-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
CONFIGURE_ARGS= --with-database=sqlite
BF_CPPFLAGS= -I${LOCALBASE}/include
@@ -23,9 +21,5 @@
DESCR= ${PKGDIR}/pkg-descr
MASTERDIR= ${.CURDIR}/../bogofilter
-
-pre-configure:
- ${REINPLACE_CMD} 's/^INTEGRITY_TESTS.*/INTEGRITY_TESTS=t.lock1/' \
- ${WRKSRC}/src/tests/Makefile.in
.include "${MASTERDIR}/Makefile"
--- /usr/ports/mail/bogofilter-qdbm/Makefile Fri Sep 16 00:03:11 2005
+++ /usr/home/emma/ports/mail/bogofilter-qdbm/Makefile Mon Oct 24 01:26:35 2005
@@ -6,7 +6,6 @@
#
PORTNAME= bogofilter
-PORTREVISION= 0
CATEGORIES= mail
PKGNAMESUFFIX= -qdbm
@@ -14,7 +13,7 @@
LIB_DEPENDS= qdbm.11:${PORTSDIR}/databases/qdbm
-CONFLICTS= bogofilter-[0-9]* bogofilter-tdb-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
+CONFLICTS= bogofilter-[0-9]* [a-z][a-z]-bogofilter-[0-9]* bogofilter-sqlite-[0-9]*
CONFIGURE_ARGS= --with-database=qdbm
BF_CPPFLAGS= -I${LOCALBASE}/include
>Release-Note:
>Audit-Trail:
>Unformatted: