diff options
| author | Stefan Walter <stefan@FreeBSD.org> | 2009-10-06 14:52:01 +0000 |
|---|---|---|
| committer | Stefan Walter <stefan@FreeBSD.org> | 2009-10-06 14:52:01 +0000 |
| commit | 9d2cd5b6205861f182218f1abc7edad0854462bb (patch) | |
| tree | cd70375355e4f25b7f0d559c1d200d137232d314 | |
| parent | 07b090ef99a17ac615ac92ae6f84962ae63a700d (diff) | |
| download | ports-9d2cd5b6205861f182218f1abc7edad0854462bb.tar.gz ports-9d2cd5b6205861f182218f1abc7edad0854462bb.zip | |
Notes
| -rw-r--r-- | databases/libpbl/Makefile | 23 | ||||
| -rw-r--r-- | databases/libpbl/distinfo | 6 | ||||
| -rw-r--r-- | mail/spamprobe/Makefile | 2 | ||||
| -rw-r--r-- | mail/spamprobe/files/patch-src_database_FrequencyCBImpl_pbl.cc | 21 |
4 files changed, 35 insertions, 17 deletions
diff --git a/databases/libpbl/Makefile b/databases/libpbl/Makefile index 8eb4f961d679..4ba829351d2d 100644 --- a/databases/libpbl/Makefile +++ b/databases/libpbl/Makefile @@ -6,29 +6,29 @@ # PORTNAME= libpbl -PORTVERSION= 1.03 +PORTVERSION= 1.04 CATEGORIES= databases MASTER_SITES= http://www.mission-base.com/peter/source/ -DISTNAME= pbl_1_03 +DISTNAME= pbl_${PORTVERSION:S/./_/g} MAINTAINER= hideo@lastamericanempire.com COMMENT= Peter Graf's Program Base Library -ALL_TARGET= libpbl.a MAKEFILE= makefile PLIST_FILES= lib/libpbl.a include/pbl.h +MAKE_JOBS_SAFE= yes .ifndef(NOPORTDOCS) PORTDOCS= * .endif post-extract: - @${REINPLACE_CMD} -e 's/= -Wall -O3/+= -Wall/' \ - -e 's/^CC=/CC?=/' ${WRKSRC}/makefile - @${REINPLACE_CMD} -e 's/%d/%zd/' ${WRKSRC}/pbl.c + @${REINPLACE_CMD} -e 's/= -Wall -O3/+= -Wall -Werror/' \ + -e 's/^CC=/CC?=/' -e '/^.rm -f/d' ${WRKSRC}/makefile + @${REINPLACE_CMD} -e 's/%d/%zd/' -e 's/(int)size/size/' ${WRKSRC}/pbl.c @${REINPLACE_CMD} -e 's/dir\.h/dirent\.h/' ${WRKSRC}/pbl.h @${REINPLACE_CMD} -e 's/malloc\.h/stdlib\.h/' \ - ${WRKSRC}/pbl.c ${WRKSRC}/pblhash.c + ${WRKSRC}/*.c do-install: @${INSTALL_DATA} ${WRKSRC}/libpbl.a ${LOCALBASE}/lib @@ -40,10 +40,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR} .endif -.include <bsd.port.pre.mk> +post-build test regression-test check: + ${MAKE} -C ${WRKSRC} test -.if ${OSVERSION} >= 700000 -BROKEN= does not work with databases > ~200 MB (see ports/130236) -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/libpbl/distinfo b/databases/libpbl/distinfo index 383950aaf418..90881c1fff11 100644 --- a/databases/libpbl/distinfo +++ b/databases/libpbl/distinfo @@ -1,3 +1,3 @@ -MD5 (pbl_1_03.tar.gz) = 452b1f802dfb2da7ceaaf647eb8564c8 -SHA256 (pbl_1_03.tar.gz) = dc14cdf46cacf3d634c49c1487dde8e4469269f87eaa9e6205f6ada2f6cee87e -SIZE (pbl_1_03.tar.gz) = 114672 +MD5 (pbl_1_04.tar.gz) = 4f3d8515725517c6f027a95d6590b724 +SHA256 (pbl_1_04.tar.gz) = 6f3b83ee1ea0aab729e0527a3da9a3f212e77a2935a92d5b5d5d77eb08c2527c +SIZE (pbl_1_04.tar.gz) = 268095 diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile index 5009d2ee55a3..2c612d0b194e 100644 --- a/mail/spamprobe/Makefile +++ b/mail/spamprobe/Makefile @@ -14,7 +14,7 @@ PORTNAME= spamprobe PORTVERSION= 1.4d -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= SF diff --git a/mail/spamprobe/files/patch-src_database_FrequencyCBImpl_pbl.cc b/mail/spamprobe/files/patch-src_database_FrequencyCBImpl_pbl.cc new file mode 100644 index 000000000000..dcbe2d89dc87 --- /dev/null +++ b/mail/spamprobe/files/patch-src_database_FrequencyCBImpl_pbl.cc @@ -0,0 +1,21 @@ +--- src/database/FrequencyDBImpl_pbl.cc 2006-11-17 02:24:48.000000000 -0500 ++++ src/database/FrequencyDBImpl_pbl.cc 2009-09-30 16:08:39.000000000 -0400 +@@ -45,6 +45,6 @@ + const char *FrequencyDBImpl_pbl::SEARCH_SUFFIX("pkey"); + +-inline int throw_on_error(const char *function_name, +- int rc) ++inline long throw_on_error(const char *function_name, ++ long rc) + { + if (rc >= 0) { +@@ -261,6 +261,6 @@ + { + char key[BUFFER_SIZE]; +- int keylen = 0; +- int rc = 0; ++ size_t keylen; ++ int rc; + + switch (pbl_code) { + |