Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 May 2004 20:51:14 +0200
From:      Matthias Andree <matthias.andree@gmx.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Tig <tigger@onemoremonkey.com>
Subject:   ports/67303: [MAINTAINER] mail/bogofilter: add script + WITHOUT_BASH option
Message-ID:  <E1BTmRm-0005ge-L2@libertas.emma.line.org>
Resent-Message-ID: <200405281900.i4SJ0kGO098628@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         67303
>Category:       ports
>Synopsis:       [MAINTAINER] mail/bogofilter: add script + WITHOUT_BASH option
>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:   Fri May 28 12:00:46 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Andree
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 4.10-STABLE FreeBSD 4.10-STABLE #109: Wed May 26 14:54:14 CEST 2004
>Description:
- install trainbogo.sh script, noted by Jef Poskanzer
- add a WITHOUT_BASH install-time option that will remove the bash2
  dependency and the bash-dependent contrib/ scripts and documentation
  (randomtrain, scramble, trainbogo.sh)
- bump portrevision

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- bogofilter-0.17.5_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/bogofilter/Makefile /root/ports/mail/bogofilter/Makefile
--- /usr/ports/mail/bogofilter/Makefile	Sat Apr 10 20:41:34 2004
+++ /root/ports/mail/bogofilter/Makefile	Fri May 28 20:47:50 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	bogofilter
 PORTVERSION=	0.17.5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,9 @@
 
 LIB_DEPENDS?=	db-4.2:${PORTSDIR}/databases/db42
 LIB_DEPENDS+=	gsl.5:${PORTSDIR}/math/gsl
+.if !defined(WITHOUT_BASH)
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2
+.endif
 
 CONFLICTS?=	bogofilter-tdb* bogofilter-qdbm*
 
@@ -50,6 +53,15 @@
 PORTDOCS=	*
 .endif
 
+.if !defined(WITHOUT_BASH)
+pre-everything::
+	@${ECHO_CMD} "----------------------------------------------------------------------------"
+	@${ECHO_CMD} "To install without bash dependency, you can use: make -DWITHOUT_BASH install"
+	@${ECHO_CMD} "Note that installing without bash dependency will mean that some of the"
+	@${ECHO_CMD} "${DOCSDIR}/contrib scripts will not be installed."
+	@${ECHO_CMD} "----------------------------------------------------------------------------"
+.endif
+
 post-build::
 	cd ${WRKSRC} && make check SHELL=${SH}
 
@@ -69,18 +81,23 @@
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/trio/AUTHORS ${DOCSDIR}/AUTHORS.trio
 .for i in contrib/bogo.R contrib/bogofilter-qfe \
-		contrib/randomtrain contrib/scramble \
 		contrib/mime.get.rfc822 contrib/printmaildir.pl \
 		contrib/bogominitrain.pl contrib/README.contrib
 	  ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
-.for i in contrib/README.randomtrain contrib/dot-qmail-bogofilter-default
+.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
+.if !defined(WITHOUT_BASH)
+.for i in randomtrain scramble trainbogo.sh
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/${i} ${DOCSDIR}/contrib/
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/contrib/README.randomtrain ${DOCSDIR}/contrib/
 .endif
 	${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
--- bogofilter-0.17.5_1.patch ends here ---

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BTmRm-0005ge-L2>