Date: Fri, 10 Jun 2005 03:00:09 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/82076: Update port: mail/qsf to 1.1.0 Message-ID: <20050610030009.67f97207.tkato432@yahoo.com> Resent-Message-ID: <200506091810.j59IA7YX032972@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 82076
>Category: ports
>Synopsis: Update port: mail/qsf to 1.1.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 09 18:10:06 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.0
Remove file:
files/patch-autoconf_make_modules.mk
files/patch-autoconf_scripts_makemake.sh
files/patch-link.mk
files/patch-vars.mk
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/mail/qsf/Makefile mail/qsf/Makefile
--- /usr/ports/mail/qsf/Makefile Wed Jun 1 13:53:26 2005
+++ mail/qsf/Makefile Sat Jun 4 23:03:11 2005
@@ -6,8 +6,7 @@
#
PORTNAME= qsf
-PORTVERSION= 1.0.18
-PORTREVISION= 2
+PORTVERSION= 1.1.0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= qsf
@@ -15,16 +14,19 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A small fast spam filter intended to be used with procmail
-GNU_CONFIGURE= yes
USE_BZIP2= yes
+USE_GETOPT_LONG= yes
USE_REINPLACE= yes
-
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+GNU_CONFIGURE= yes
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN1= qsf.1
-MANCOMPRESSED= yes
PLIST_FILES= bin/qsf
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
+
OPTIONS= GDBM "GDBM support" off \
MYSQL "MySQL support" off \
SQLITE2 "SQLite2 support" off
@@ -33,17 +35,20 @@
.if defined(WITH_GDBM)
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+= --with-gdbm
+.else
+CONFIGURE_ARGS+= --without-gdbm
.endif
.if defined(WITH_MYSQL)
USE_MYSQL= yes
-CONFIGURE_ARGS+= --with-mysql
+.else
+CONFIGURE_ARGS+= --without-mysql
.endif
.if defined(WITH_SQLITE2)
LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2
-CONFIGURE_ARGS+= --with-sqlite
+.else
+CONFIGURE_ARGS+= --without-sqlite
.endif
# not supported yet.
@@ -52,5 +57,9 @@
post-patch:
@${REINPLACE_CMD} -e 's/Linux/${OPSYS}/g' ${WRKSRC}/doc/quickref.1.in
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/qsf ${PREFIX}/bin/qsf
+ ${INSTALL_MAN} ${WRKSRC}/doc/quickref.1 ${MANPREFIX}/man/man1/qsf.1
.include <bsd.port.post.mk>
diff -urN /usr/ports/mail/qsf/distinfo mail/qsf/distinfo
--- /usr/ports/mail/qsf/distinfo Fri Feb 25 13:43:08 2005
+++ mail/qsf/distinfo Sat Jun 4 22:54:57 2005
@@ -1,2 +1,2 @@
-MD5 (qsf-1.0.18.tar.bz2) = 975d3d9785d636c463a0b4eed21e91e1
-SIZE (qsf-1.0.18.tar.bz2) = 145120
+MD5 (qsf-1.1.0.tar.bz2) = e1ce182655f046e209d2c6ba2207afbc
+SIZE (qsf-1.1.0.tar.bz2) = 164284
diff -urN /usr/ports/mail/qsf/files/patch-autoconf_make_modules.mk mail/qsf/files/patch-autoconf_make_modules.mk
--- /usr/ports/mail/qsf/files/patch-autoconf_make_modules.mk Wed Jun 1 07:24:05 2005
+++ mail/qsf/files/patch-autoconf_make_modules.mk Thu Jan 1 09:00:00 1970
@@ -1,30 +0,0 @@
---- autoconf/make/modules.mk~.orig Wed Jun 1 00:19:04 2005
-+++ autoconf/make/modules.mk~ Wed Jun 1 00:19:45 2005
-@@ -3,21 +3,21 @@
- # Creation time: Sat Feb 19 12:25:32 GMT 2005
-
- src/db.o: src/db/alloc.o src/db/cache.o src/db/delete.o src/db/error.o src/db/fetch.o src/db/gdbm.o src/db/io.o src/db/lock.o src/db/mysql.o src/db/organise.o src/db/signal.o src/db/sqlite.o src/db/store.o src/db/walk.o
-- $(LD) $(LDFLAGS) -o $@ src/db/alloc.o src/db/cache.o src/db/delete.o src/db/error.o src/db/fetch.o src/db/gdbm.o src/db/io.o src/db/lock.o src/db/mysql.o src/db/organise.o src/db/signal.o src/db/sqlite.o src/db/store.o src/db/walk.o
-+ $(LD) -r $(LDFLAGS) -o $@ src/db/alloc.o src/db/cache.o src/db/delete.o src/db/error.o src/db/fetch.o src/db/gdbm.o src/db/io.o src/db/lock.o src/db/mysql.o src/db/organise.o src/db/signal.o src/db/sqlite.o src/db/store.o src/db/walk.o
-
- src/mailbox.o: src/mailbox/alloc.o src/mailbox/count.o src/mailbox/scan.o src/mailbox/select.o
-- $(LD) $(LDFLAGS) -o $@ src/mailbox/alloc.o src/mailbox/count.o src/mailbox/scan.o src/mailbox/select.o
-+ $(LD) -r $(LDFLAGS) -o $@ src/mailbox/alloc.o src/mailbox/count.o src/mailbox/scan.o src/mailbox/select.o
-
- src/main.o: src/main/help.o src/main/license.o src/main/log.o src/main/main.o src/main/options.o src/main/tick.o src/main/version.o
-- $(LD) $(LDFLAGS) -o $@ src/main/help.o src/main/license.o src/main/log.o src/main/main.o src/main/options.o src/main/tick.o src/main/version.o
-+ $(LD) -r $(LDFLAGS) -o $@ src/main/help.o src/main/license.o src/main/log.o src/main/main.o src/main/options.o src/main/tick.o src/main/version.o
-
- src/message.o: src/message/alloc.o src/message/base64.o src/message/dump.o src/message/header.o src/message/parse.o src/message/qp.o src/message/read.o src/message/rfc2047.o
-- $(LD) $(LDFLAGS) -o $@ src/message/alloc.o src/message/base64.o src/message/dump.o src/message/header.o src/message/parse.o src/message/qp.o src/message/read.o src/message/rfc2047.o
-+ $(LD) -r $(LDFLAGS) -o $@ src/message/alloc.o src/message/base64.o src/message/dump.o src/message/header.o src/message/parse.o src/message/qp.o src/message/read.o src/message/rfc2047.o
-
- src/spam.o: src/spam/alloc.o src/spam/allowlist.o src/spam/benchmark.o src/spam/check.o src/spam/cksum.o src/spam/db.o src/spam/dump.o src/spam/merge.o src/spam/prune.o src/spam/token.o src/spam/train.o src/spam/update.o
-- $(LD) $(LDFLAGS) -o $@ src/spam/alloc.o src/spam/allowlist.o src/spam/benchmark.o src/spam/check.o src/spam/cksum.o src/spam/db.o src/spam/dump.o src/spam/merge.o src/spam/prune.o src/spam/token.o src/spam/train.o src/spam/update.o
-+ $(LD) -r $(LDFLAGS) -o $@ src/spam/alloc.o src/spam/allowlist.o src/spam/benchmark.o src/spam/check.o src/spam/cksum.o src/spam/db.o src/spam/dump.o src/spam/merge.o src/spam/prune.o src/spam/token.o src/spam/train.o src/spam/update.o
-
- src/tests.o: src/tests/attached_files.o src/tests/gibberish.o src/tests/gtube.o src/tests/html.o src/tests/imgcount.o src/tests/main.o src/tests/urls.o
-- $(LD) $(LDFLAGS) -o $@ src/tests/attached_files.o src/tests/gibberish.o src/tests/gtube.o src/tests/html.o src/tests/imgcount.o src/tests/main.o src/tests/urls.o
-+ $(LD) -r $(LDFLAGS) -o $@ src/tests/attached_files.o src/tests/gibberish.o src/tests/gtube.o src/tests/html.o src/tests/imgcount.o src/tests/main.o src/tests/urls.o
-
-
diff -urN /usr/ports/mail/qsf/files/patch-autoconf_scripts_makemake.sh mail/qsf/files/patch-autoconf_scripts_makemake.sh
--- /usr/ports/mail/qsf/files/patch-autoconf_scripts_makemake.sh Wed Jun 1 07:24:05 2005
+++ mail/qsf/files/patch-autoconf_scripts_makemake.sh Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- autoconf/scripts/makemake.sh.orig Wed Jun 1 00:14:20 2005
-+++ autoconf/scripts/makemake.sh Wed Jun 1 00:14:34 2005
-@@ -86,7 +86,7 @@
- done
- [ -n "$deps" ] || continue
- echo "$i.o: $deps" >> $outlink
-- echo ' $(LD) $(LDFLAGS) -o $@' "$deps" >> $outlink
-+ echo ' $(LD) -r $(LDFLAGS) -o $@' "$deps" >> $outlink
- echo >> $outlink
- done
-
diff -urN /usr/ports/mail/qsf/files/patch-link.mk mail/qsf/files/patch-link.mk
--- /usr/ports/mail/qsf/files/patch-link.mk Thu Apr 14 03:39:36 2005
+++ mail/qsf/files/patch-link.mk Thu Jan 1 09:00:00 1970
@@ -1,14 +0,0 @@
---- autoconf/make/link.mk.orig Wed Apr 13 21:33:54 2005
-+++ autoconf/make/link.mk Wed Apr 13 21:34:15 2005
-@@ -6,9 +6,9 @@
- mainobjs := src/main.o src/md5.o src/library.o src/db.o src/message.o src/mailbox.o src/spam.o src/tests.o
-
- $(package): $(mainobjs)
-- $(CC) $(CFLAGS) -o $@ $(mainobjs) $(LIBS)
-+ $(CC) $(CFLAGS) -o $@ $(mainobjs) ${LDFLAGS} $(LIBS)
-
- $(package)-static: $(mainobjs)
-- $(CC) $(CFLAGS) -static -o $@ $(mainobjs) $(LIBS)
-+ $(CC) $(CFLAGS) -static -o $@ $(mainobjs) ${LDFLAGS} $(LIBS)
-
- # EOF
diff -urN /usr/ports/mail/qsf/files/patch-vars.mk mail/qsf/files/patch-vars.mk
--- /usr/ports/mail/qsf/files/patch-vars.mk Wed Jun 1 13:53:26 2005
+++ mail/qsf/files/patch-vars.mk Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- autoconf/make/vars.mk.orig Wed Apr 13 21:33:12 2005
-+++ autoconf/make/vars.mk Wed Apr 13 21:35:10 2005
-@@ -24,7 +24,7 @@
- INSTALL_DATA = @INSTALL_DATA@
- UNINSTALL = rm -f
-
--LDFLAGS = -r
-+LDFLAGS = @LDFLAGS@
- DEFS = @DEFS@
- CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/src/include -Isrc/include $(DEFS)
diff -urN /usr/ports/mail/qsf/pkg-descr mail/qsf/pkg-descr
--- /usr/ports/mail/qsf/pkg-descr Sun Jan 18 10:48:17 2004
+++ mail/qsf/pkg-descr Sat Jun 4 23:04:48 2005
@@ -2,6 +2,7 @@
It is designed to be small, fast, reliable, easy to install, and simple to use
in a procmail recipe
-WWW: http://www.ivarch.com/programs/qsf.shtml
+WWW: http://www.ivarch.com/programs/qsf/
+
-Liam Foy
liamfoy@sepulcrum.org
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050610030009.67f97207.tkato432>