From root@bsdunix.ch  Tue Dec 18 21:06:34 2012
Return-Path: <root@bsdunix.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2A77ACCD
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Dec 2012 21:06:34 +0000 (UTC)
	(envelope-from root@bsdunix.ch)
Received: from conversation.bsdunix.ch (ns1.bsdunix.ch [82.220.1.90])
	by mx1.freebsd.org (Postfix) with ESMTP id 662088FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Dec 2012 21:06:32 +0000 (UTC)
Received: from conversation.bsdunix.ch (localhost [127.0.0.1])
	by conversation.bsdunix.ch (Postfix) with ESMTP id 22D5813BF2
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 18 Dec 2012 21:06:26 +0000 (UTC)
Received: from conversation.bsdunix.ch ([127.0.0.1])
	by conversation.bsdunix.ch (conversation.bsdunix.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id tyGqyh3x9ZkK for <FreeBSD-gnats-submit@freebsd.org>;
	Tue, 18 Dec 2012 21:06:24 +0000 (UTC)
Received: by conversation.bsdunix.ch (Postfix, from userid 0)
	id E7D2613BEF; Tue, 18 Dec 2012 21:06:23 +0000 (UTC)
Message-Id: <20121218210623.E7D2613BEF@conversation.bsdunix.ch>
Date: Tue, 18 Dec 2012 21:06:23 +0000 (UTC)
From: Thomas Vogt <thomas@bsdunix.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] mail/perdition: update to 1.18
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         174550
>Category:       ports
>Synopsis:       [MAINTAINER] mail/perdition: update to 1.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jhale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 18 21:10:00 UTC 2012
>Closed-Date:    Tue Jan 08 22:33:41 UTC 2013
>Last-Modified:  Tue Jan  8 22:40:00 UTC 2013
>Originator:     Thomas Vogt
>Release:        FreeBSD 8.3-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD conversation.bsdunix.ch 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #1: Mon Jun 18 11:44:02 UTC 2012
>Description:
This update will replace http://www.freebsd.org/cgi/query-pr.cgi?pr=174410

- Update to 1.18, mostly done by Joel Ray Holveck <joelh@piquan.org>
- Small changes from me:
- Switch to OptionsNG
- Fix GDBM Compile issues
- Set GDBM to the default db backend to be consistent with perditiondb(5)
- USE_BDB instead of hardcoded bdb3 version
- Remove LIB_DEPENDS ABI version number .4 in gdbm.4 (suggested by portlint)
- Remove LIB_DEPENDS ABI version number .2 in odbc.2 (suggested by portlint)
- Remove some patches


Removed file(s):
- files/patch-makebdb-Makefile.in
- files/patch-makebdb-makebdb.c
- files/patch-perdition-db-bdb-Makefile.in
- files/patch-perdition-db-bdb-perditiondb_bdb.h
- files/patch-perdition::Makefile.in

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:

--- perdition-1.18.patch begins here ---
diff -ruN --exclude=CVS ../perdition.orig/Makefile ./Makefile
--- ../perdition.orig/Makefile	2012-12-11 14:29:18.000000000 +0000
+++ ./Makefile	2012-12-18 20:53:43.725748217 +0000
@@ -2,10 +2,9 @@
 # $FreeBSD: ports/mail/perdition/Makefile,v 1.44 2012/12/11 14:29:18 svnexp Exp $
 
 PORTNAME=	perdition
-PORTVERSION=	1.17.1
-PORTREVISION=	7
+PORTVERSION=	1.18
 CATEGORIES=	mail net security
-MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
+MASTER_SITES=	http://horms.net/projects/perdition/download/${PORTVERSION}/
 
 MAINTAINER=	thomas@bsdunix.ch
 COMMENT=	POP3 & IMAP4 proxy that can map users to multiple backend servers
@@ -23,39 +22,39 @@
 USE_AUTOTOOLS=	libtool
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	BDB_LIB=db3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	DOCSDIR=${DOCSDIR}
-CONFIGURE_ARGS+=--disable-daemon-map --localstatedir=/var
+CONFIGURE_ARGS+=--localstatedir=/var
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	perdition perdition.pop3 perdition.pop3s \
 		perdition.imap4 perdition.imap4s perdition.imaps
 
-##
-## Available knobs:
-##   WITH_BDB: Enable Berkerley database backend
-##   WITH_DAEMON_MAP: Enable Daemon Map support
-##   WITH_GDBM: Enable gdbm database backend
-##   WITH_MYSQL: Enable MySQL database backend
-##   WITH_NIS: Enable NIS database backend
-##   WITH_PGSQL: Enable PostgreSQL database backend
-##   WITH_ODBC: Enable ODBC database backend
-##   WITH_OPENLDAP: Enable OpenLDAP database backend
-##
-##   WITHOUT_SSL: Disable OpenSSL support
-##   WITHOUT_POSIX_REGEX: Disable native regex support
-##
+OPTIONS_DEFINE=		GDBM BDB DAEMON_MAP MYSQL NIS PGSQL ODBC OPENLDAP SSL POSIX_REGEX
+GDBM_DESC=		gdbm database backend
+BDB_DESC=		Berkerley database backend
+DAEMON_MAP_DESC=	Daemon Map support
+MYSQL_DESC=		MySQL database backend
+NIS_DESC=		NIS database backend
+PGSQL_DESC=		PostgreSQL database backend
+ODBC_DESC=	 	ODBC database backend
+OPENLDAP_DESC=		OpenLDAP database backend
+SSL_DESC=		OpenSSL support
+POSIX_REGEX_DESC=	Native regex support
 
-.if !defined(WITHOUT_SSL)
+OPTIONS_DEFAULT=	GDBM SSL POSIX_REGEX
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--enable-ssl
 USE_OPENSSL=		yes
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if !defined(WITHOUT_POSIX_REGEX)
+.if ${PORT_OPTIONS:MPOSIX_REGEX}
 CONFIGURE_ARGS+=	--enable-posix_regex
 PLIST_SUB+=		POSIXREGEX=""
 .else
@@ -63,7 +62,7 @@
 PLIST_SUB+=		POSIXREGEX="@comment "
 .endif
 
-.if defined(WITH_DAEMON_MAP)
+.if ${PORT_OPTIONS:MDAEMON_MAP}
 CONFIGURE_ARGS+=	--enable-daemon-map
 PLIST_SUB+=		DAEMONMAP=""
 LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
@@ -72,17 +71,17 @@
 PLIST_SUB+=		DAEMONMAP="@comment "
 .endif
 
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 CONFIGURE_ARGS+=	--enable-bdb
 PLIST_SUB+=		BDB=""
-LIB_DEPENDS+=		db3.3:${PORTSDIR}/databases/db3
+USE_BDB=		yes
 MAN1+=			makebdb.1
 .else
 CONFIGURE_ARGS+=	--disable-bdb
 PLIST_SUB+=		BDB="@comment "
 .endif
 
-.if defined(WITH_NIS)
+.if ${PORT_OPTIONS:MNIS}
 CONFIGURE_ARGS+=	--enable-nis
 PLIST_SUB+=		NIS=""
 .else
@@ -90,9 +89,9 @@
 PLIST_SUB+=		NIS="@comment "
 .endif
 
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=	--enable-gdbm
-LIB_DEPENDS+=		gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
 PLIST_SUB+=		GDBM=""
 MAN1+=			makegdbm.1
 .else
@@ -100,7 +99,7 @@
 PLIST_SUB+=		GDBM="@comment "
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		YES
 CONFIGURE_ARGS+=	--enable-mysql
 PLIST_SUB+=		MYSQL=""
@@ -110,7 +109,7 @@
 PLIST_SUB+=		MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 CONFIGURE_ARGS+=	--enable-pg
 USE_PGSQL=		yes
 PLIST_SUB+=		PGSQL=""
@@ -120,7 +119,7 @@
 PLIST_SUB+=		PGSQL="@comment "
 .endif
 
-.if defined(WITH_OPENLDAP)
+.if ${PORT_OPTIONS:MOPENLDAP}
 USE_OPENLDAP=		YES
 CONFIGURE_ARGS+=	--enable-ldap \
 			--with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ \
@@ -132,9 +131,9 @@
 PLIST_SUB+=		OPENLDAP="@comment "
 .endif
 
-.if defined(WITH_ODBC)
+.if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--enable-odbc
-LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		odbc:${PORTSDIR}/databases/unixODBC
 PLIST_SUB+=		ODBC=""
 MAN8+=			perditiondb_odbc_makedb.8
 .else
@@ -142,13 +141,23 @@
 PLIST_SUB+=		ODBC="@comment "
 .endif
 
-pre-everything:: show-options
+post-patch:
+.if ${PORT_OPTIONS:MBDB}
+	${REINPLACE_CMD} 's,\-ldb ,${BDB_LIB_NAME},g' ${WRKSRC}/perdition/db/bdb/Makefile.in ; \
+	${REINPLACE_CMD} 's,\-ldb ,${BDB_LIB_NAME},g' ${WRKSRC}/perdition/db/bdb/Makefile.am ; \
+	${REINPLACE_CMD} 's,\-ldb ,${BDB_LIB_NAME},g' ${WRKSRC}/makebdb/Makefile.am ; \
+	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/perdition/db/bdb/perditiondb_bdb.h ; \
+	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/makebdb/makebdb.c ; \
+	${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/makebdb/options.h
+.endif
 
-show-options:
-	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
+.if ${PORT_OPTIONS:MGDBM}
+	${REINPLACE_CMD} 's,extern\ char\ \*gdbm_version,,' ${WRKSRC}/perdition/db/gdbm/perditiondb_gdbm.h ; \
+	${REINPLACE_CMD} 's,extern\ char\ \*gdbm_version,,' ${WRKSRC}/makegdbm/options.h
+.endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+. if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/etc/pam.d/perdition ${DOCSDIR}/perdition-pam.sample
 	@${ECHO_MSG} ""
diff -ruN --exclude=CVS ../perdition.orig/distinfo ./distinfo
--- ../perdition.orig/distinfo	2011-07-03 13:53:22.000000000 +0000
+++ ./distinfo	2012-12-18 20:35:27.462833651 +0000
@@ -1,2 +1,2 @@
-SHA256 (perdition-1.17.1.tar.gz) = e2abd57aa76b106591056ef835e26816c71c3b39dc55bc3aeba6dfeefac7af26
-SIZE (perdition-1.17.1.tar.gz) = 638162
+SHA256 (perdition-1.18.tar.gz) = cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa
+SIZE (perdition-1.18.tar.gz) = 602933
diff -ruN --exclude=CVS ../perdition.orig/files/patch-etc-perdition-Makefile.in ./files/patch-etc-perdition-Makefile.in
--- ../perdition.orig/files/patch-etc-perdition-Makefile.in	2007-11-06 11:08:18.000000000 +0000
+++ ./files/patch-etc-perdition-Makefile.in	2012-12-18 20:35:27.461825684 +0000
@@ -1,23 +1,23 @@
---- etc/perdition/Makefile.in.orig	2007-11-02 15:40:32.000000000 +0100
-+++ etc/perdition/Makefile.in	2007-11-02 15:45:43.000000000 +0100
-@@ -259,16 +259,16 @@
- 	@list='$(perditionconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f'"; \
--	  $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f"; \
-+	  echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
-+	  $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \
+--- etc/perdition/Makefile.in.orig	2012-03-20 05:07:55.000000000 -0700
++++ etc/perdition/Makefile.in	2012-12-12 16:48:33.000000000 -0800
+@@ -303,14 +303,17 @@
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perditionconfdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(perditionconfdir)" || exit $$?; \
++	  for p in $$files; do \
++	    $(am__strip_dir) \
++	    echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
++	    $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" || exit $$?; \
++          done; \
  	done
  
  uninstall-perditionconfDATA:
  	@$(NORMAL_UNINSTALL)
- 	@list='$(perditionconf_DATA)'; for p in $$list; do \
- 	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(perditionconfdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(perditionconfdir)/$$f"; \
-+	  echo " rm -f '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
-+	  rm -f "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \
- 	done
- tags: TAGS
- TAGS:
+ 	@list='$(perditionconf_DATA)'; test -n "$(perditionconfdir)" || list=; \
+-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++	files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \
+ 	test -n "$$files" || exit 0; \
+ 	echo " ( cd '$(DESTDIR)$(perditionconfdir)' && rm -f" $$files ")"; \
+ 	cd "$(DESTDIR)$(perditionconfdir)" && rm -f $$files
diff -ruN --exclude=CVS ../perdition.orig/files/patch-makebdb-Makefile.in ./files/patch-makebdb-Makefile.in
--- ../perdition.orig/files/patch-makebdb-Makefile.in	2007-11-06 11:08:18.000000000 +0000
+++ ./files/patch-makebdb-Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- makebdb/Makefile.in.orig	2007-11-02 15:47:34.000000000 +0100
-+++ makebdb/Makefile.in	2007-11-02 15:48:33.000000000 +0100
-@@ -231,7 +231,7 @@
-         options.c \
-         options.h
- 
--makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb -lpopt \
-+makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb3 -lpopt \
- @dmalloc_lib@
- 
- INCLUDES = -I$(top_srcdir)/libjain
diff -ruN --exclude=CVS ../perdition.orig/files/patch-makebdb-makebdb.c ./files/patch-makebdb-makebdb.c
--- ../perdition.orig/files/patch-makebdb-makebdb.c	2003-07-03 05:54:50.000000000 +0000
+++ ./files/patch-makebdb-makebdb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- makebdb/makebdb.c.orig	Mon Apr 28 08:13:47 2003
-+++ makebdb/makebdb.c	Sun Jun 15 18:36:21 2003
-@@ -35,7 +35,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <ctype.h>
--#include <db.h>
-+#include <db3/db.h>
- 
- #include "options.h"
- 
diff -ruN --exclude=CVS ../perdition.orig/files/patch-perdition-db-bdb-Makefile.in ./files/patch-perdition-db-bdb-Makefile.in
--- ../perdition.orig/files/patch-perdition-db-bdb-Makefile.in	2007-11-06 11:08:18.000000000 +0000
+++ ./files/patch-perdition-db-bdb-Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- perdition/db/bdb/Makefile.in.orig	2007-11-02 15:49:39.000000000 +0100
-+++ perdition/db/bdb/Makefile.in	2007-11-02 15:50:20.000000000 +0100
-@@ -235,7 +235,7 @@
-   perditiondb_bdb.h
- 
- libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0
--libperditiondb_bdb_la_LIBADD = -ldb
-+libperditiondb_bdb_la_LIBADD = -ldb3
- INCLUDES = \
-   -I$(top_srcdir)/ \
-   -I$(top_srcdir)/perdition \
diff -ruN --exclude=CVS ../perdition.orig/files/patch-perdition-db-bdb-perditiondb_bdb.h ./files/patch-perdition-db-bdb-perditiondb_bdb.h
--- ../perdition.orig/files/patch-perdition-db-bdb-perditiondb_bdb.h	2005-12-19 10:06:19.000000000 +0000
+++ ./files/patch-perdition-db-bdb-perditiondb_bdb.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- perdition/db/bdb/perditiondb_bdb.h.orig	Tue Dec  6 15:58:20 2005
-+++ perdition/db/bdb/perditiondb_bdb.h	Tue Dec  6 15:58:34 2005
-@@ -29,7 +29,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <ctype.h>
--#include <db.h>
-+#include <db3/db.h>
- #include "log.h"
- 
- #ifndef PERDITIONDB_BDB_SYSCONFDIR
diff -ruN --exclude=CVS ../perdition.orig/files/patch-perdition-db-ldap-Makefile.in ./files/patch-perdition-db-ldap-Makefile.in
--- ../perdition.orig/files/patch-perdition-db-ldap-Makefile.in	2005-12-19 10:06:19.000000000 +0000
+++ ./files/patch-perdition-db-ldap-Makefile.in	2012-12-18 20:35:27.461825684 +0000
@@ -1,13 +1,11 @@
---- perdition/db/ldap/Makefile.in.orig	Tue Dec  6 15:59:30 2005
-+++ perdition/db/ldap/Makefile.in	Tue Dec  6 16:04:27 2005
-@@ -545,8 +545,8 @@
- 				"$(DESTDIR)@ldap_schemadir@"; \
- 		fi; \
- 		if test -w "$(DESTDIR)@ldap_schemadir@"; then \
--			install -m644 $< \
--				"$(DESTDIR)@ldap_schemadir@/perdition.schema";\
-+			install -m644 $(schema_sources) \
-+				"$(DESTDIR)@ldap_schemadir@/perdition.schema-dist";\
- 		fi \
- 	fi
+--- perdition/db/ldap/Makefile.in.orig	2012-03-20 05:08:04.000000000 -0700
++++ perdition/db/ldap/Makefile.in	2012-12-12 16:50:02.000000000 -0800
+@@ -864,7 +864,7 @@
+ @LDAP_SCHEMA_TRUE@	test -n "@ldap_schemadir@"
+ @LDAP_SCHEMA_TRUE@	mkdir -p "$(DESTDIR)@ldap_schemadir@"
+ @LDAP_SCHEMA_TRUE@	chmod 755 "$(DESTDIR)@ldap_schemadir@"
+-@LDAP_SCHEMA_TRUE@	install -m 644 $< "$(DESTDIR)@ldap_schemadir@/"
++@LDAP_SCHEMA_TRUE@	for p in $< ; do $(am__strip_dir) install -m 644 $$p "$(DESTDIR)@ldap_schemadir@/$$f-dist" ; done
  
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff -ruN --exclude=CVS ../perdition.orig/files/patch-perdition-db-posix_regex-Makefile.in ./files/patch-perdition-db-posix_regex-Makefile.in
--- ../perdition.orig/files/patch-perdition-db-posix_regex-Makefile.in	2007-11-06 11:08:18.000000000 +0000
+++ ./files/patch-perdition-db-posix_regex-Makefile.in	2012-12-18 20:35:27.461825684 +0000
@@ -1,23 +1,23 @@
---- perdition/db/posix_regex/Makefile.in.orig	2007-11-02 15:53:56.000000000 +0100
-+++ perdition/db/posix_regex/Makefile.in	2007-11-02 15:55:31.000000000 +0100
-@@ -355,16 +355,16 @@
- 	@list='$(conf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
--	  $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
-+	  echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f-dist'"; \
-+	  $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f-dist"; \
+--- perdition/db/posix_regex/Makefile.in.orig	2012-03-20 05:08:06.000000000 -0700
++++ perdition/db/posix_regex/Makefile.in	2012-12-12 16:47:41.000000000 -0800
+@@ -414,14 +414,17 @@
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" || exit $$?; \
++	  for p in $$files; do \
++	    $(am__strip_dir) \
++	    echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \
++	    $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" || exit $$?; \
++          done ; \
  	done
  
  uninstall-confDATA:
  	@$(NORMAL_UNINSTALL)
- 	@list='$(conf_DATA)'; for p in $$list; do \
- 	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(confdir)/$$f"; \
-+	  echo " rm -f '$(DESTDIR)$(confdir)/$$f-dist'"; \
-+	  rm -f "$(DESTDIR)$(confdir)/$$f-dist"; \
- 	done
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	@list='$(conf_DATA)'; test -n "$(confdir)" || list=; \
+-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++	files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \
+ 	test -n "$$files" || exit 0; \
+ 	echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \
+ 	cd "$(DESTDIR)$(confdir)" && rm -f $$files
diff -ruN --exclude=CVS ../perdition.orig/files/patch-perdition::Makefile.in ./files/patch-perdition::Makefile.in
--- ../perdition.orig/files/patch-perdition::Makefile.in	2005-12-19 10:06:19.000000000 +0000
+++ ./files/patch-perdition::Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- perdition/Makefile.in.orig	Tue Dec  6 16:08:58 2005
-+++ perdition/Makefile.in	Tue Dec  6 16:09:36 2005
-@@ -560,8 +560,6 @@
- 	for i in pop3 pop3s imap4 imap4s imaps; do \
- 		(cd $(DESTDIR)$(sbindir) && rm -f perdition.$$i && \
- 			ln -sf perdition perdition.$$i); \
--		(cd $(DESTDIR)$(mandir)/man8 && rm -f perdition.$$i && \
--			ln -sf perdition.8 perdition.$$i.8); \
- 	done
- 
- uninstall-local:
diff -ruN --exclude=CVS ../perdition.orig/pkg-plist ./pkg-plist
--- ../perdition.orig/pkg-plist	2008-11-25 05:33:07.000000000 +0000
+++ ./pkg-plist	2012-12-18 20:35:27.462833651 +0000
@@ -9,11 +9,6 @@
 etc/perdition/popmap-dist
 etc/perdition/Makefile.popmap-dist
 etc/perdition/Makefile
-include/jain.h
-lib/libjain.so.0
-lib/libjain.so
-lib/libjain.la
-lib/libjain.a
 %%BDB%%lib/libperditiondb_bdb.so.0
 %%BDB%%lib/libperditiondb_bdb.so
 %%BDB%%lib/libperditiondb_bdb.la
--- perdition-1.18.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jhale 
Responsible-Changed-By: jhale 
Responsible-Changed-When: Tue Dec 18 22:16:20 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174550 

From: Thomas Vogt <thomas@bsdunix.ch>
To: bug-followup@FreeBSD.org, thomas@bsdunix.ch, jhale@freebsd.org
Cc:  
Subject: Re: ports/174550: [MAINTAINER] mail/perdition: update to 1.18
Date: Mon, 07 Jan 2013 23:13:17 +0100

 Hi,
 
 Is something wrong with this update? It would be nice if this port
 update can be comited to svn because perdition 1.17 no longer works in
 our ports tree.
 
 Regards,
 Tom
State-Changed-From-To: open->closed 
State-Changed-By: jhale 
State-Changed-When: Tue Jan 8 22:33:40 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174550 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/174550: commit references a PR
Date: Tue,  8 Jan 2013 22:33:21 +0000 (UTC)

 Author: jhale
 Date: Tue Jan  8 22:33:10 2013
 New Revision: 310110
 URL: http://svnweb.freebsd.org/changeset/ports/310110
 
 Log:
   - Update to 1.18 [1]
   - Convert KNOBS to new options framework [1]
   - Drop ABI version numbers in LIB_DEPENDS [1]
   - Add UPDATING entry to inform users of IPv6 changes to
     devel/libvanessa_socket that affect perdition [2]
   
   PR:		ports/174550 [1], ports/174410 [2]
   Submitted by:	Thomas Vogt <thomas@bsdunix.ch> (maintainer) [1],
   		Joel Ray Holveck <joelh@piquan.org> [2]
 
 Added:
   head/mail/perdition/files/patch-makegdbm-options.h   (contents, props changed)
   head/mail/perdition/files/patch-perdition-db-gdbm-perditiondb_gdbm.h   (contents, props changed)
 Deleted:
   head/mail/perdition/files/patch-makebdb-Makefile.in
   head/mail/perdition/files/patch-makebdb-makebdb.c
   head/mail/perdition/files/patch-perdition-db-bdb-Makefile.in
   head/mail/perdition/files/patch-perdition-db-bdb-perditiondb_bdb.h
   head/mail/perdition/files/patch-perdition::Makefile.in
 Modified:
   head/UPDATING
   head/mail/perdition/Makefile
   head/mail/perdition/distinfo   (contents, props changed)
   head/mail/perdition/files/patch-etc-perdition-Makefile.in   (contents, props changed)
   head/mail/perdition/files/patch-perdition-db-ldap-Makefile.in   (contents, props changed)
   head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in   (contents, props changed)
   head/mail/perdition/pkg-plist   (contents, props changed)
 
 Modified: head/UPDATING
 ==============================================================================
 --- head/UPDATING	Tue Jan  8 22:25:44 2013	(r310109)
 +++ head/UPDATING	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -6,6 +6,21 @@ You should get into the habit of checkin
  you update your ports collection, before attempting any port upgrades.
  
  20130108:
 +  AFFECTS: users of devel/libvanessa_socket, mail/perdition
 +  AUTHOR: jhale@FreeBSD.org
 +
 +  The update of devel/libvanessa_socket to 0.0.12 (used by Perdition)
 +  adds IPv6 support.  If the hostname in bind_address has both IPv4 and
 +  IPv6 addresses in DNS, then Perdition will ONLY listen on IPv6.
 +
 +  If you prefer to continue to use IPv4, you need to change the
 +  bind_address in /usr/local/etc/perdition/perdition.conf to use an
 +  explicit IPv4 address.  This can be in addition to, or instead of,
 +  the current hostname, depending on whether you want to use IPv6 or
 +  not.  If your Perdition server does not have an IPv6 address
 +  listed in DNS, this change does not affect you.
 +
 +20130108:
    AFFECTS: users of sysutils/cfengine*
    AUTHOR: gjb@FreeBSD.org
  
 
 Modified: head/mail/perdition/Makefile
 ==============================================================================
 --- head/mail/perdition/Makefile	Tue Jan  8 22:25:44 2013	(r310109)
 +++ head/mail/perdition/Makefile	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -2,10 +2,9 @@
  # $FreeBSD$
  
  PORTNAME=	perdition
 -PORTVERSION=	1.17.1
 -PORTREVISION=	7
 +PORTVERSION=	1.18
  CATEGORIES=	mail net security
 -MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
 +MASTER_SITES=	http://horms.net/projects/perdition/download/${PORTVERSION}/
  
  MAINTAINER=	thomas@bsdunix.ch
  COMMENT=	POP3 & IMAP4 proxy that can map users to multiple backend servers
 @@ -23,39 +22,34 @@ MANCOMPRESSED=	no
  USE_AUTOTOOLS=	libtool
  USE_GETTEXT=	yes
  GNU_CONFIGURE=	yes
 -CONFIGURE_ENV=	BDB_LIB=db3
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  MAKE_ENV+=	DOCSDIR=${DOCSDIR}
 -CONFIGURE_ARGS+=--disable-daemon-map --localstatedir=/var
 +CONFIGURE_ARGS+=--localstatedir=/var
  
  USE_LDCONFIG=	yes
  USE_RC_SUBR=	perdition perdition.pop3 perdition.pop3s \
  		perdition.imap4 perdition.imap4s perdition.imaps
  
 -##
 -## Available knobs:
 -##   WITH_BDB: Enable Berkerley database backend
 -##   WITH_DAEMON_MAP: Enable Daemon Map support
 -##   WITH_GDBM: Enable gdbm database backend
 -##   WITH_MYSQL: Enable MySQL database backend
 -##   WITH_NIS: Enable NIS database backend
 -##   WITH_PGSQL: Enable PostgreSQL database backend
 -##   WITH_ODBC: Enable ODBC database backend
 -##   WITH_OPENLDAP: Enable OpenLDAP database backend
 -##
 -##   WITHOUT_SSL: Disable OpenSSL support
 -##   WITHOUT_POSIX_REGEX: Disable native regex support
 -##
 +OPTIONS_DEFINE=		BDB DAEMON_MAP GDBM MYSQL NIS ODBC OPENLDAP OPENSSL PGSQL POSIX_REGEX SSL
 +OPTIONS_DEFAULT=	GDBM POSIX_REGEX SSL
  
 -.if !defined(WITHOUT_SSL)
 +DAEMON_MAP_DESC=	Daemon Map support
 +GDBM_DESC=		GDBM database backend
 +NIS_DESC=		NIS database backend
 +OPENLDAP_DESC=		OpenLDAP database backend
 +POSIX_REGEX_DESC=	Native regex support
 +
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MOPENSSL}
  CONFIGURE_ARGS+=	--enable-ssl
  USE_OPENSSL=		yes
  .else
  CONFIGURE_ARGS+=	--disable-ssl
  .endif
  
 -.if !defined(WITHOUT_POSIX_REGEX)
 +.if ${PORT_OPTIONS:MPOSIX_REGEX}
  CONFIGURE_ARGS+=	--enable-posix_regex
  PLIST_SUB+=		POSIXREGEX=""
  .else
 @@ -63,7 +57,7 @@ CONFIGURE_ARGS+=	--disable-posix_regex
  PLIST_SUB+=		POSIXREGEX="@comment "
  .endif
  
 -.if defined(WITH_DAEMON_MAP)
 +.if ${PORT_OPTIONS:MDAEMON_MAP}
  CONFIGURE_ARGS+=	--enable-daemon-map
  PLIST_SUB+=		DAEMONMAP=""
  LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
 @@ -72,17 +66,18 @@ CONFIGURE_ARGS+=	--disable-daemon-map
  PLIST_SUB+=		DAEMONMAP="@comment "
  .endif
  
 -.if defined(WITH_BDB)
 +.if ${PORT_OPTIONS:MBDB}
 +CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
  CONFIGURE_ARGS+=	--enable-bdb
  PLIST_SUB+=		BDB=""
 -LIB_DEPENDS+=		db3.3:${PORTSDIR}/databases/db3
 +USE_BDB=		yes
  MAN1+=			makebdb.1
  .else
  CONFIGURE_ARGS+=	--disable-bdb
  PLIST_SUB+=		BDB="@comment "
  .endif
  
 -.if defined(WITH_NIS)
 +.if ${PORT_OPTIONS:MNIS}
  CONFIGURE_ARGS+=	--enable-nis
  PLIST_SUB+=		NIS=""
  .else
 @@ -90,9 +85,9 @@ CONFIGURE_ARGS+=	--disable-nis
  PLIST_SUB+=		NIS="@comment "
  .endif
  
 -.if defined(WITH_GDBM)
 +.if ${PORT_OPTIONS:MGDBM}
  CONFIGURE_ARGS+=	--enable-gdbm
 -LIB_DEPENDS+=		gdbm.4:${PORTSDIR}/databases/gdbm
 +LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
  PLIST_SUB+=		GDBM=""
  MAN1+=			makegdbm.1
  .else
 @@ -100,8 +95,8 @@ CONFIGURE_ARGS+=	--disable-gdbm
  PLIST_SUB+=		GDBM="@comment "
  .endif
  
 -.if defined(WITH_MYSQL)
 -USE_MYSQL=		YES
 +.if ${PORT_OPTIONS:MMYSQL}
 +USE_MYSQL=		yes
  CONFIGURE_ARGS+=	--enable-mysql
  PLIST_SUB+=		MYSQL=""
  MAN8+=			perditiondb_mysql_makedb.8
 @@ -110,7 +105,7 @@ CONFIGURE_ARGS+=	--disable-mysql
  PLIST_SUB+=		MYSQL="@comment "
  .endif
  
 -.if defined(WITH_PGSQL)
 +.if ${PORT_OPTIONS:MPGSQL}
  CONFIGURE_ARGS+=	--enable-pg
  USE_PGSQL=		yes
  PLIST_SUB+=		PGSQL=""
 @@ -120,8 +115,8 @@ CONFIGURE_ARGS+=	--disable-pg
  PLIST_SUB+=		PGSQL="@comment "
  .endif
  
 -.if defined(WITH_OPENLDAP)
 -USE_OPENLDAP=		YES
 +.if ${PORT_OPTIONS:MOPENLDAP}
 +USE_OPENLDAP=		yes
  CONFIGURE_ARGS+=	--enable-ldap \
  			--with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ \
  			--disable-ldap-doc
 @@ -132,9 +127,9 @@ CONFIGURE_ARGS+=	--disable-ldap
  PLIST_SUB+=		OPENLDAP="@comment "
  .endif
  
 -.if defined(WITH_ODBC)
 +.if ${PORT_OPTIONS:MODBC}
  CONFIGURE_ARGS+=	--enable-odbc
 -LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 +LIB_DEPENDS+=		odbc:${PORTSDIR}/databases/unixODBC
  PLIST_SUB+=		ODBC=""
  MAN8+=			perditiondb_odbc_makedb.8
  .else
 @@ -142,13 +137,14 @@ CONFIGURE_ARGS+=	--disable-odbc
  PLIST_SUB+=		ODBC="@comment "
  .endif
  
 -pre-everything:: show-options
 -
 -show-options:
 -	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
 +post-patch:
 +	cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \
 +		configure \
 +		makebdb/Makefile.in \
 +		perdition/db/bdb/Makefile.in
  
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
  	@${INSTALL_DATA} ${WRKSRC}/etc/pam.d/perdition ${DOCSDIR}/perdition-pam.sample
  	@${ECHO_MSG} ""
 
 Modified: head/mail/perdition/distinfo
 ==============================================================================
 --- head/mail/perdition/distinfo	Tue Jan  8 22:25:44 2013	(r310109)
 +++ head/mail/perdition/distinfo	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -1,2 +1,2 @@
 -SHA256 (perdition-1.17.1.tar.gz) = e2abd57aa76b106591056ef835e26816c71c3b39dc55bc3aeba6dfeefac7af26
 -SIZE (perdition-1.17.1.tar.gz) = 638162
 +SHA256 (perdition-1.18.tar.gz) = cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa
 +SIZE (perdition-1.18.tar.gz) = 602933
 
 Modified: head/mail/perdition/files/patch-etc-perdition-Makefile.in
 ==============================================================================
 --- head/mail/perdition/files/patch-etc-perdition-Makefile.in	Tue Jan  8 22:25:44 2013	(r310109)
 +++ head/mail/perdition/files/patch-etc-perdition-Makefile.in	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -1,23 +1,23 @@
 ---- etc/perdition/Makefile.in.orig	2007-11-02 15:40:32.000000000 +0100
 -+++ etc/perdition/Makefile.in	2007-11-02 15:45:43.000000000 +0100
 -@@ -259,16 +259,16 @@
 - 	@list='$(perditionconf_DATA)'; for p in $$list; do \
 - 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 - 	  f=$(am__strip_dir) \
 --	  echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f'"; \
 --	  $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f"; \
 -+	  echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
 -+	  $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \
 +--- etc/perdition/Makefile.in.orig	2012-03-20 05:07:55.000000000 -0700
 ++++ etc/perdition/Makefile.in	2012-12-12 16:48:33.000000000 -0800
 +@@ -303,14 +303,17 @@
 + 	  echo "$$d$$p"; \
 + 	done | $(am__base_list) | \
 + 	while read files; do \
 +-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perditionconfdir)'"; \
 +-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(perditionconfdir)" || exit $$?; \
 ++	  for p in $$files; do \
 ++	    $(am__strip_dir) \
 ++	    echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
 ++	    $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" || exit $$?; \
 ++          done; \
   	done
   
   uninstall-perditionconfDATA:
   	@$(NORMAL_UNINSTALL)
 - 	@list='$(perditionconf_DATA)'; for p in $$list; do \
 - 	  f=$(am__strip_dir) \
 --	  echo " rm -f '$(DESTDIR)$(perditionconfdir)/$$f'"; \
 --	  rm -f "$(DESTDIR)$(perditionconfdir)/$$f"; \
 -+	  echo " rm -f '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
 -+	  rm -f "$(DESTDIR)$(perditionconfdir)/$$f-dist"; \
 - 	done
 - tags: TAGS
 - TAGS:
 + 	@list='$(perditionconf_DATA)'; test -n "$(perditionconfdir)" || list=; \
 +-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 ++	files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \
 + 	test -n "$$files" || exit 0; \
 + 	echo " ( cd '$(DESTDIR)$(perditionconfdir)' && rm -f" $$files ")"; \
 + 	cd "$(DESTDIR)$(perditionconfdir)" && rm -f $$files
 
 Added: head/mail/perdition/files/patch-makegdbm-options.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/mail/perdition/files/patch-makegdbm-options.h	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -0,0 +1,10 @@
 +--- ./makegdbm/options.h.orig	2013-01-08 16:04:27.000000000 -0500
 ++++ ./makegdbm/options.h	2013-01-08 16:04:51.000000000 -0500
 +@@ -39,7 +39,6 @@
 + #endif
 + 
 + extern gdbm_error gdbm_errno;
 +-extern char *gdbm_version;
 + 
 + #define COPYRIGHT \
 +   "(c) 1999 Horms <horms@verge.net.au>\nReleased under the GNU GPL\n"
 
 Added: head/mail/perdition/files/patch-perdition-db-gdbm-perditiondb_gdbm.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/mail/perdition/files/patch-perdition-db-gdbm-perditiondb_gdbm.h	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -0,0 +1,10 @@
 +--- ./perdition/db/gdbm/perditiondb_gdbm.h.orig	2013-01-08 16:05:30.000000000 -0500
 ++++ ./perdition/db/gdbm/perditiondb_gdbm.h	2013-01-08 16:05:40.000000000 -0500
 +@@ -31,7 +31,6 @@
 + #include <gdbm.h>
 + 
 + extern gdbm_error gdbm_errno;
 +-extern char *gdbm_version;
 + 
 + #ifndef PERDITIONDB_GDBM_SYSCONFDIR
 + #define PERDITIONDB_GDBM_SYSCONFDIR "/usr/local/etc/perdition"
 
 Modified: head/mail/perdition/files/patch-perdition-db-ldap-Makefile.in
 ==============================================================================
 --- head/mail/perdition/files/patch-perdition-db-ldap-Makefile.in	Tue Jan  8 22:25:44 2013	(r310109)
 +++ head/mail/perdition/files/patch-perdition-db-ldap-Makefile.in	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -1,13 +1,11 @@
 ---- perdition/db/ldap/Makefile.in.orig	Tue Dec  6 15:59:30 2005
 -+++ perdition/db/ldap/Makefile.in	Tue Dec  6 16:04:27 2005
 -@@ -545,8 +545,8 @@
 - 				"$(DESTDIR)@ldap_schemadir@"; \
 - 		fi; \
 - 		if test -w "$(DESTDIR)@ldap_schemadir@"; then \
 --			install -m644 $< \
 --				"$(DESTDIR)@ldap_schemadir@/perdition.schema";\
 -+			install -m644 $(schema_sources) \
 -+				"$(DESTDIR)@ldap_schemadir@/perdition.schema-dist";\
 - 		fi \
 - 	fi
 +--- perdition/db/ldap/Makefile.in.orig	2012-03-20 05:08:04.000000000 -0700
 ++++ perdition/db/ldap/Makefile.in	2012-12-12 16:50:02.000000000 -0800
 +@@ -864,7 +864,7 @@
 + @LDAP_SCHEMA_TRUE@	test -n "@ldap_schemadir@"
 + @LDAP_SCHEMA_TRUE@	mkdir -p "$(DESTDIR)@ldap_schemadir@"
 + @LDAP_SCHEMA_TRUE@	chmod 755 "$(DESTDIR)@ldap_schemadir@"
 +-@LDAP_SCHEMA_TRUE@	install -m 644 $< "$(DESTDIR)@ldap_schemadir@/"
 ++@LDAP_SCHEMA_TRUE@	for p in $< ; do $(am__strip_dir) install -m 644 $$p "$(DESTDIR)@ldap_schemadir@/$$f-dist" ; done
   
 + # Tell versions [3.59,3.63) of GNU make to not export all variables.
 + # Otherwise a system limit (for SysV at least) may be exceeded.
 
 Modified: head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in
 ==============================================================================
 --- head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in	Tue Jan  8 22:25:44 2013	(r310109)
 +++ head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -1,23 +1,23 @@
 ---- perdition/db/posix_regex/Makefile.in.orig	2007-11-02 15:53:56.000000000 +0100
 -+++ perdition/db/posix_regex/Makefile.in	2007-11-02 15:55:31.000000000 +0100
 -@@ -355,16 +355,16 @@
 - 	@list='$(conf_DATA)'; for p in $$list; do \
 - 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 - 	  f=$(am__strip_dir) \
 --	  echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
 --	  $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
 -+	  echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f-dist'"; \
 -+	  $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f-dist"; \
 +--- perdition/db/posix_regex/Makefile.in.orig	2012-03-20 05:08:06.000000000 -0700
 ++++ perdition/db/posix_regex/Makefile.in	2012-12-12 16:47:41.000000000 -0800
 +@@ -414,14 +414,17 @@
 + 	  echo "$$d$$p"; \
 + 	done | $(am__base_list) | \
 + 	while read files; do \
 +-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \
 +-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" || exit $$?; \
 ++	  for p in $$files; do \
 ++	    $(am__strip_dir) \
 ++	    echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \
 ++	    $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" || exit $$?; \
 ++          done ; \
   	done
   
   uninstall-confDATA:
   	@$(NORMAL_UNINSTALL)
 - 	@list='$(conf_DATA)'; for p in $$list; do \
 - 	  f=$(am__strip_dir) \
 --	  echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \
 --	  rm -f "$(DESTDIR)$(confdir)/$$f"; \
 -+	  echo " rm -f '$(DESTDIR)$(confdir)/$$f-dist'"; \
 -+	  rm -f "$(DESTDIR)$(confdir)/$$f-dist"; \
 - 	done
 - 
 - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 + 	@list='$(conf_DATA)'; test -n "$(confdir)" || list=; \
 +-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 ++	files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \
 + 	test -n "$$files" || exit 0; \
 + 	echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \
 + 	cd "$(DESTDIR)$(confdir)" && rm -f $$files
 
 Modified: head/mail/perdition/pkg-plist
 ==============================================================================
 --- head/mail/perdition/pkg-plist	Tue Jan  8 22:25:44 2013	(r310109)
 +++ head/mail/perdition/pkg-plist	Tue Jan  8 22:33:10 2013	(r310110)
 @@ -9,11 +9,6 @@ etc/perdition/perdition.conf-dist
  etc/perdition/popmap-dist
  etc/perdition/Makefile.popmap-dist
  etc/perdition/Makefile
 -include/jain.h
 -lib/libjain.so.0
 -lib/libjain.so
 -lib/libjain.la
 -lib/libjain.a
  %%BDB%%lib/libperditiondb_bdb.so.0
  %%BDB%%lib/libperditiondb_bdb.so
  %%BDB%%lib/libperditiondb_bdb.la
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
