Date: Thu, 7 Dec 2006 10:46:46 GMT From: Jimmy Mäkelä<jimmy@loopia.se> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/106441: [PATCH] mail/p5-Mail-SpamAssassin: option to include libspamc Message-ID: <200612071046.kB7AkkmS040470@www.freebsd.org> Resent-Message-ID: <200612071050.kB7Ao2IB031981@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 106441 >Category: ports >Synopsis: [PATCH] mail/p5-Mail-SpamAssassin: option to include libspamc >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 Dec 07 10:50:01 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jimmy Mäkelä >Release: 6.1-RELEASE >Organization: Loopia AB >Environment: FreeBSD lab6.loopia.se 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:32:43 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: Adds an option to the port for compiling and installing libspamc (and libsslspamc if WITH_SSL is defined). The patch is made against 3.1.7_1. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ur p5-Mail-SpamAssassin.orig/Makefile p5-Mail-SpamAssassin/Makefile --- p5-Mail-SpamAssassin.orig/Makefile Fri Nov 10 14:35:49 2006 +++ p5-Mail-SpamAssassin/Makefile Thu Dec 7 11:14:46 2006 @@ -41,7 +41,8 @@ RAZOR "Add Vipul's Razor support" on \ SPF_QUERY "Add SPF query support" off \ RELAY_COUNTRY "Relay country support" off \ - TOOLS "Install SpamAssassin tools" off + TOOLS "Install SpamAssassin tools" off \ + LIBSPAMC "Install libspamc" off .include <bsd.port.pre.mk> @@ -60,6 +61,10 @@ CONFIGURE_ARGS+= ENABLE_SSL=no .endif +.if defined(WITH_LIBSPAMC) +USE_LDCONFIG=yes +.endif + .if defined(WITH_MYSQL) RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql .endif @@ -186,6 +191,14 @@ ${REINPLACE_CMD} -e '/RelayCountry/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre .endif +.if defined(WITH_LIBSPAMC) +post-build: + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libspamc.so) +.if !defined(WITHOUT_SSL) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libsslspamc.so) +.endif +.endif + pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -205,6 +218,13 @@ @for f in ${WRKSRC}/tools/*; do \ ${INSTALL} $${f} ${DATADIR}/tools; \ done +.endif +.if defined(WITH_LIBSPAMC) + ${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.so ${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${PREFIX}/include +.if !defined(WITHOUT_SSL) + ${INSTALL_DATA} ${WRKSRC}/spamc/libsslspamc.so ${PREFIX}/lib +.endif .endif .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${DOCSDIR}/sql ${DOCSDIR}/contrib ${DOCSDIR}/ldap diff -ur p5-Mail-SpamAssassin.orig/pkg-plist p5-Mail-SpamAssassin/pkg-plist --- p5-Mail-SpamAssassin.orig/pkg-plist Thu Sep 7 10:35:03 2006 +++ p5-Mail-SpamAssassin/pkg-plist Thu Dec 7 11:01:47 2006 @@ -15,6 +15,9 @@ @unexec if cmp -s %B/v312.pre.sample %B/v312.pre; then rm -f %B/v312.pre; fi etc/mail/spamassassin/v312.pre.sample @exec [ -f %B/v312.pre ] || cp %B/%f %B/v312.pre +lib/libspamc.so +lib/libsslspamc.so +include/libspamc.h %%SITE_PERL%%/Mail/SpamAssassin.pm %%SITE_PERL%%/Mail/SpamAssassin/AICache.pm %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612071046.kB7AkkmS040470>