diff options
author | krion <krion@FreeBSD.org> | 2004-05-29 03:30:05 +0800 |
---|---|---|
committer | krion <krion@FreeBSD.org> | 2004-05-29 03:30:05 +0800 |
commit | 767f7d1a4a5a3021548f4a6d5d967e3ab46ee7a0 (patch) | |
tree | f3245f49bb30d9fedbb37a137aeccbd0dcd4a9ae /mail | |
parent | f4b5afbf37c5752241f3b23de0160fd9c0312762 (diff) | |
download | freebsd-ports-gnome-767f7d1a4a5a3021548f4a6d5d967e3ab46ee7a0.tar.gz freebsd-ports-gnome-767f7d1a4a5a3021548f4a6d5d967e3ab46ee7a0.tar.zst freebsd-ports-gnome-767f7d1a4a5a3021548f4a6d5d967e3ab46ee7a0.zip |
- Install trainbogo.sh script
- 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
PR: ports/67303
Submitted by: maintainer
Diffstat (limited to 'mail')
-rw-r--r-- | mail/bogofilter-current/Makefile | 21 | ||||
-rw-r--r-- | mail/bogofilter/Makefile | 21 |
2 files changed, 38 insertions, 4 deletions
diff --git a/mail/bogofilter-current/Makefile b/mail/bogofilter-current/Makefile index f3506fd8aa71..c0c396db288a 100644 --- a/mail/bogofilter-current/Makefile +++ b/mail/bogofilter-current/Makefile @@ -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 @@ COMMENT= "Fast, teachable, learning spam detector" 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 @@ post-patch: 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,12 +81,11 @@ post-install:: .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/ @@ -82,6 +93,12 @@ post-install:: ${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 .include <bsd.port.mk> diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index f3506fd8aa71..c0c396db288a 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -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 @@ COMMENT= "Fast, teachable, learning spam detector" 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 @@ post-patch: 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,12 +81,11 @@ post-install:: .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/ @@ -82,6 +93,12 @@ post-install:: ${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 .include <bsd.port.mk> |