Update pfqueue to 0.56

pkgsrc changes:
  - Pick backends using options framework

Upstream changes:
  Too many changes, please see HOMEPAGE.

5 files changed, 82 insertions, 10 deletions

diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index ad232e10e77..00702dadeb8 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -1,24 +1,34 @@
-# $NetBSD: Makefile,v 1.7 2008/03/04 17:57:19 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2009/11/20 13:14:13 fhajny Exp $
 #
 
-DISTNAME=	pfqueue-0.1.4
+DISTNAME=	pfqueue-0.5.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pfqueue/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://pfqueue.sourceforge.net/
 COMMENT=	Real-time queue scanner for postfix
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 INCOMPAT_CURSES=	NetBSD-1.*-*
 
+.include "options.mk"
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pfqueue ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/pfqueue.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+CONFIGURE_ARGS+=	--enable-shared
+
+SUBST_CLASSES+=		make
+SUBST_MESSAGE.make=	Fixing Makefiles for shared lib
+SUBST_STAGE.make=	pre-configure
+SUBST_FILES.make=	backends/Makefile.in
+SUBST_FILES.make+=	libpfq/Makefile.in
+SUBST_SED.make+=	-e 's,-module,,'
 
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/pfqueue/PLIST b/mail/pfqueue/PLIST
index 18f72d8c0ba..033692a68c9 100644
--- a/mail/pfqueue/PLIST
+++ b/mail/pfqueue/PLIST
@@ -1,3 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/12/28 15:51:16 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/11/20 13:14:13 fhajny Exp $
 bin/pfqueue
+bin/spfqueue
+${PLIST.exim}lib/libpfq_exim.la
+${PLIST.postfix}lib/libpfq_postfix2.la
+${PLIST.socket}lib/libpfq_socket.la
+lib/libpfqueue.la
 man/man1/pfqueue.1
+man/man5/pfqueue.conf.5
diff --git a/mail/pfqueue/distinfo b/mail/pfqueue/distinfo
index 7887730592a..7ff4a02ce4e 100644
--- a/mail/pfqueue/distinfo
+++ b/mail/pfqueue/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:26 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/11/20 13:14:13 fhajny Exp $
 
-SHA1 (pfqueue-0.1.4.tar.gz) = 0b47055f3a012b9e827d83ba50850b1295d88b5d
-RMD160 (pfqueue-0.1.4.tar.gz) = 9932454d57f641c9fbfcb77456cd899f78ce7dae
-Size (pfqueue-0.1.4.tar.gz) = 103880 bytes
+SHA1 (pfqueue-0.5.6.tar.gz) = 29fc58eab31b1a6225bda1205f155ed5cfb951b2
+RMD160 (pfqueue-0.5.6.tar.gz) = 6b2b539449fd9e0f127b23ba49de1761d769c27f
+Size (pfqueue-0.5.6.tar.gz) = 298870 bytes
+SHA1 (patch-aa) = 51c1ae7a438ef596a6b1c0d4821440822315e2e4
diff --git a/mail/pfqueue/options.mk b/mail/pfqueue/options.mk
new file mode 100644
index 00000000000..86a069ec7bb
--- /dev/null
+++ b/mail/pfqueue/options.mk
@@ -0,0 +1,40 @@
+# $NetBSD: options.mk,v 1.1 2009/11/20 13:14:13 fhajny Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.pfqueue
+
+PKG_SUPPORTED_OPTIONS=	exim postfix socket
+PKG_SUGGESTED_OPTIONS=	postfix socket
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	exim postfix socket
+
+###
+### Enable Exim support
+###
+.if !empty(PKG_OPTIONS:Mexim)
+PFQ_BACKENDS+=	libpfq_exim.la
+PLIST.exim=	yes
+.endif
+
+###
+### Enable Postfix support
+###
+.if !empty(PKG_OPTIONS:Mpostfix)
+PFQ_BACKENDS+=	libpfq_postfix2.la
+PLIST.postfix=	yes
+.endif
+
+###
+### Enable socket support
+###
+.if !empty(PKG_OPTIONS:Msocket)
+PFQ_BACKENDS+=	libpfq_socket.la
+PLIST.socket=	yes
+.endif
+
+SUBST_CLASSES+=		backends
+SUBST_STAGE.backends=	post-patch
+SUBST_MESSAGE.backends=	Enabling backends
+SUBST_FILES.backends=	backends/Makefile.in
+SUBST_SED.backends=	-e 's|@PFQ_BACKENDS@|${PFQ_BACKENDS:Q}|'
diff --git a/mail/pfqueue/patches/patch-aa b/mail/pfqueue/patches/patch-aa
new file mode 100644
index 00000000000..b58d643aec8
--- /dev/null
+++ b/mail/pfqueue/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2009/11/20 13:14:13 fhajny Exp $
+
+Only install backends requested via options
+
+--- backends/Makefile.in.orig	2007-02-03 17:49:29.000000000 +0000
++++ backends/Makefile.in
+@@ -183,7 +183,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-lib_LTLIBRARIES = libpfq_postfix1.la libpfq_postfix2.la libpfq_exim.la libpfq_socket.la
++lib_LTLIBRARIES = @PFQ_BACKENDS@
+ libpfq_postfix1_la_SOURCES = pfq_postfix1.c pfq_backend.h pfq_service.c pfq_service.h
+ libpfq_postfix1_la_LDFLAGS = -module
+ libpfq_postfix2_la_SOURCES = pfq_postfix2.c pfq_backend.h pfq_service.c pfq_service.h