diff options
| -rw-r--r-- | mail/bogofilter/Makefile | 13 | ||||
| -rw-r--r-- | mail/bogofilter/PLIST | 4 | ||||
| -rw-r--r-- | mail/bogofilter/distinfo | 9 | ||||
| -rw-r--r-- | mail/bogofilter/options.mk | 19 | ||||
| -rw-r--r-- | mail/bogofilter/patches/patch-aa | 29 |
5 files changed, 26 insertions, 48 deletions
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index aac1da5c113..1a5581e0320 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.40 2008/10/15 12:15:40 martti Exp $ +# $NetBSD: Makefile,v 1.41 2010/07/24 09:33:09 obache Exp $ -DISTNAME= bogofilter-1.1.7 -#PKGREVISION= 1 +DISTNAME= bogofilter-1.2.2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bogofilter/} EXTRACT_SUFX= .tar.bz2 @@ -15,15 +14,17 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} + +INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/bogofilter EGDIR= ${PREFIX}/share/examples/bogofilter -CONF_FILES= ${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf +CONF_FILES= ${EGDIR}/bogofilter.cf.example ${PKG_SYSCONFDIR}/bogofilter.cf USE_TOOLS+= perl:run -REPLACE_PERL= src/bogoupgrade .include "options.mk" +.include "../../converters/libiconv/buildlink3.mk" .include "../../math/gsl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/bogofilter/PLIST b/mail/bogofilter/PLIST index 4a43dc5a677..016b545f6ea 100644 --- a/mail/bogofilter/PLIST +++ b/mail/bogofilter/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:04:27 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/07/24 09:33:09 obache Exp $ bin/bf_compact bin/bf_copy bin/bf_tar @@ -16,4 +16,4 @@ man/man1/bogolexer.1 man/man1/bogotune.1 man/man1/bogoupgrade.1 man/man1/bogoutil.1 -share/examples/bogofilter/bogofilter.cf +share/examples/bogofilter/bogofilter.cf.example diff --git a/mail/bogofilter/distinfo b/mail/bogofilter/distinfo index 6e233a8a919..bfe1043d100 100644 --- a/mail/bogofilter/distinfo +++ b/mail/bogofilter/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.19 2008/10/15 12:15:40 martti Exp $ +$NetBSD: distinfo,v 1.20 2010/07/24 09:33:09 obache Exp $ -SHA1 (bogofilter-1.1.7.tar.bz2) = b34e2bf224a2139e080960fb44cf2abe1c35c9b3 -RMD160 (bogofilter-1.1.7.tar.bz2) = 799a375d54441c8fd6355921c468f33f7e65a46f -Size (bogofilter-1.1.7.tar.bz2) = 839687 bytes -SHA1 (patch-aa) = e45350ce0f2f74af949b6a298e98873da3798239 +SHA1 (bogofilter-1.2.2.tar.bz2) = 6d2860c1d919fe47a8efcfc7fd6de9433872f21d +RMD160 (bogofilter-1.2.2.tar.bz2) = a522d0c7d2deae59d479c67f64e9bd9551b59096 +Size (bogofilter-1.2.2.tar.bz2) = 867043 bytes SHA1 (patch-ab) = f55a9956d82f56cef686a9125983ec5fd6942809 diff --git a/mail/bogofilter/options.mk b/mail/bogofilter/options.mk index 0151420f270..d4378ca906f 100644 --- a/mail/bogofilter/options.mk +++ b/mail/bogofilter/options.mk @@ -1,16 +1,18 @@ -# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:03 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2010/07/24 09:33:09 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bogofilter PKG_OPTIONS_REQUIRED_GROUPS= database -PKG_OPTIONS_GROUP.database= db4 qdbm sqlite -PKG_SUGGESTED_OPTIONS= db4 +PKG_OPTIONS_GROUP.database= bdb qdbm sqlite tokyocabinet +PKG_SUGGESTED_OPTIONS= bdb +PKG_OPTIONS_LEGACY_OPTS+= db4:bdb .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mdb4) +.if !empty(PKG_OPTIONS:Mbdb) CONFIGURE_ARGS+= --with-database=db -.include "../../databases/db4/buildlink3.mk" -BUILDLINK_TRANSFORM+= l:db:db4 +BDB_ACCEPTED= db3 db4 db5 +.include "../../mk/bdb.buildlink3.mk" +BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} .endif PLIST_VARS+= qdbm @@ -24,3 +26,8 @@ PLIST.qdbm= yes CONFIGURE_ARGS+= --with-database=sqlite3 .include "../../databases/sqlite3/buildlink3.mk" .endif + +.if !empty(PKG_OPTIONS:Mtokyocabinet) +CONFIGURE_ARGS+= --with-database=tokyocabinet +.include "../../databases/tokyocabinet/buildlink3.mk" +.endif diff --git a/mail/bogofilter/patches/patch-aa b/mail/bogofilter/patches/patch-aa deleted file mode 100644 index d6fc5f1e750..00000000000 --- a/mail/bogofilter/patches/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2008/10/15 12:15:40 martti Exp $ - ---- Makefile.in.orig 2008-04-20 18:59:42.000000000 +0300 -+++ Makefile.in 2008-10-15 14:42:37.000000000 +0300 -@@ -246,6 +246,7 @@ - - # what to build - sysconf_DATA = bogofilter.cf.example -+egdir = $(prefix)/share/examples/bogofilter - - # what to distribute - EXTRA_DIST = autogen.sh gsl config.rpath bogofilter.cf.example \ -@@ -399,14 +400,8 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bogogrep.obj `if test -f 'contrib/bogogrep.c'; then $(CYGPATH_W) 'contrib/bogogrep.c'; else $(CYGPATH_W) '$(srcdir)/contrib/bogogrep.c'; fi` - install-sysconfDATA: $(sysconf_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" -- @list='$(sysconf_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ -- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ -- done -+ $(mkdir_p) $(DESTDIR)$(egdir) -+ $(INSTALL_DATA) $(sysconf_DATA) $(DESTDIR)$(egdir)/bogofilter.cf - - uninstall-sysconfDATA: - @$(NORMAL_UNINSTALL) |