Date: Wed, 9 Jan 2013 01:07:48 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: "Jason E. Hale" <jhale@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r310110 - in head: . mail/perdition mail/perdition/files Message-ID: <20130109000747.GH85686@ithaqua.etoilebsd.net> In-Reply-To: <201301082233.r08MXBtn030900@svn.freebsd.org> References: <201301082233.r08MXBtn030900@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--vhOf6eAHdfH9MSjZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 08, 2013 at 10:33:11PM +0000, Jason E. Hale wrote: > Author: jhale > Date: Tue Jan 8 22:33:10 2013 > New Revision: 310110 > URL: http://svnweb.freebsd.org/changeset/ports/310110 >=20 > 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] > =20 > PR: ports/174550 [1], ports/174410 [2] > Submitted by: Thomas Vogt <thomas@bsdunix.ch> (maintainer) [1], > Joel Ray Holveck <joelh@piquan.org> [2] >=20 > Added: > head/mail/perdition/files/patch-makegdbm-options.h (contents, props c= hanged) > 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 (conten= ts, props changed) > head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in = (contents, props changed) > head/mail/perdition/pkg-plist (contents, props changed) >=20 > Modified: head/UPDATING > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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. > =20 > 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 > =20 >=20 > Modified: head/mail/perdition/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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$ > =20 > PORTNAME=3D perdition > -PORTVERSION=3D 1.17.1 > -PORTREVISION=3D 7 > +PORTVERSION=3D 1.18 > CATEGORIES=3D mail net security > -MASTER_SITES=3D http://www.vergenet.net/linux/perdition/download/${PORTV= ERSION}/ > +MASTER_SITES=3D http://horms.net/projects/perdition/download/${PORTVERSI= ON}/ > =20 > MAINTAINER=3D thomas@bsdunix.ch > COMMENT=3D POP3 & IMAP4 proxy that can map users to multiple backend ser= vers > @@ -23,39 +22,34 @@ MANCOMPRESSED=3D no > USE_AUTOTOOLS=3D libtool > USE_GETTEXT=3D yes > GNU_CONFIGURE=3D yes > -CONFIGURE_ENV=3D BDB_LIB=3Ddb3 > CPPFLAGS+=3D -I${LOCALBASE}/include > LDFLAGS+=3D -L${LOCALBASE}/lib > MAKE_ENV+=3D DOCSDIR=3D${DOCSDIR} > -CONFIGURE_ARGS+=3D--disable-daemon-map --localstatedir=3D/var > +CONFIGURE_ARGS+=3D--localstatedir=3D/var > =20 > USE_LDCONFIG=3D yes > USE_RC_SUBR=3D perdition perdition.pop3 perdition.pop3s \ > perdition.imap4 perdition.imap4s perdition.imaps > =20 > -## > -## 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=3D BDB DAEMON_MAP GDBM MYSQL NIS ODBC OPENLDAP OPENSSL P= GSQL POSIX_REGEX SSL The last SSL is unused in the rest of the port, it can probably be removed. Why not appending DOCS given that the dialog will be shown anyway? While I = do understand that people do not create an OPTIONS_DEFINE just for DOCS do avo= id prompting the dialog all the time, I do think that if there is already an OPTIONS_DEFINE then it is worth appending DOCS to it. > +OPTIONS_DEFAULT=3D GDBM POSIX_REGEX SSL > =20 > -.if !defined(WITHOUT_SSL) > +DAEMON_MAP_DESC=3D Daemon Map support > +GDBM_DESC=3D GDBM database backend That probalbly deserves a generic definition as it is wildly used in the po= rts tree > +NIS_DESC=3D NIS database backend This can problem be deneric definition (bsd.options.desc.mk) > +OPENLDAP_DESC=3D OpenLDAP database backend Why not using LDAP instead of OPENLDAP? > +POSIX_REGEX_DESC=3D Native regex support > + > +.include <bsd.port.options.mk> > + > +.if ${PORT_OPTIONS:MOPENSSL} > CONFIGURE_ARGS+=3D --enable-ssl > USE_OPENSSL=3D yes > .else > CONFIGURE_ARGS+=3D --disable-ssl > .endif > =20 > -.if !defined(WITHOUT_POSIX_REGEX) > +.if ${PORT_OPTIONS:MPOSIX_REGEX} > CONFIGURE_ARGS+=3D --enable-posix_regex > PLIST_SUB+=3D POSIXREGEX=3D"" > .else > @@ -63,7 +57,7 @@ CONFIGURE_ARGS+=3D --disable-posix_regex > PLIST_SUB+=3D POSIXREGEX=3D"@comment " > .endif > =20 > -.if defined(WITH_DAEMON_MAP) > +.if ${PORT_OPTIONS:MDAEMON_MAP} > CONFIGURE_ARGS+=3D --enable-daemon-map > PLIST_SUB+=3D DAEMONMAP=3D"" > LIB_DEPENDS+=3D gdbm:${PORTSDIR}/databases/gdbm > @@ -72,17 +66,18 @@ CONFIGURE_ARGS+=3D --disable-daemon-map > PLIST_SUB+=3D DAEMONMAP=3D"@comment " > .endif > =20 > -.if defined(WITH_BDB) > +.if ${PORT_OPTIONS:MBDB} > +CPPFLAGS+=3D -I${BDB_INCLUDE_DIR} > CONFIGURE_ARGS+=3D --enable-bdb > PLIST_SUB+=3D BDB=3D"" > -LIB_DEPENDS+=3D db3.3:${PORTSDIR}/databases/db3 > +USE_BDB=3D yes > MAN1+=3D makebdb.1 > .else > CONFIGURE_ARGS+=3D --disable-bdb > PLIST_SUB+=3D BDB=3D"@comment " > .endif > =20 > -.if defined(WITH_NIS) > +.if ${PORT_OPTIONS:MNIS} > CONFIGURE_ARGS+=3D --enable-nis > PLIST_SUB+=3D NIS=3D"" > .else > @@ -90,9 +85,9 @@ CONFIGURE_ARGS+=3D --disable-nis > PLIST_SUB+=3D NIS=3D"@comment " > .endif > =20 > -.if defined(WITH_GDBM) > +.if ${PORT_OPTIONS:MGDBM} > CONFIGURE_ARGS+=3D --enable-gdbm > -LIB_DEPENDS+=3D gdbm.4:${PORTSDIR}/databases/gdbm > +LIB_DEPENDS+=3D gdbm:${PORTSDIR}/databases/gdbm > PLIST_SUB+=3D GDBM=3D"" > MAN1+=3D makegdbm.1 > .else > @@ -100,8 +95,8 @@ CONFIGURE_ARGS+=3D --disable-gdbm > PLIST_SUB+=3D GDBM=3D"@comment " > .endif > =20 > -.if defined(WITH_MYSQL) > -USE_MYSQL=3D YES > +.if ${PORT_OPTIONS:MMYSQL} > +USE_MYSQL=3D yes > CONFIGURE_ARGS+=3D --enable-mysql > PLIST_SUB+=3D MYSQL=3D"" > MAN8+=3D perditiondb_mysql_makedb.8 > @@ -110,7 +105,7 @@ CONFIGURE_ARGS+=3D --disable-mysql > PLIST_SUB+=3D MYSQL=3D"@comment " > .endif > =20 > -.if defined(WITH_PGSQL) > +.if ${PORT_OPTIONS:MPGSQL} > CONFIGURE_ARGS+=3D --enable-pg > USE_PGSQL=3D yes > PLIST_SUB+=3D PGSQL=3D"" > @@ -120,8 +115,8 @@ CONFIGURE_ARGS+=3D --disable-pg > PLIST_SUB+=3D PGSQL=3D"@comment " > .endif > =20 > -.if defined(WITH_OPENLDAP) > -USE_OPENLDAP=3D YES > +.if ${PORT_OPTIONS:MOPENLDAP} > +USE_OPENLDAP=3D yes > CONFIGURE_ARGS+=3D --enable-ldap \ > --with-ldap-schema-directory=3D${LOCALBASE}/etc/openldap/schema/ \ > --disable-ldap-doc > @@ -132,9 +127,9 @@ CONFIGURE_ARGS+=3D --disable-ldap > PLIST_SUB+=3D OPENLDAP=3D"@comment " > .endif > =20 > -.if defined(WITH_ODBC) > +.if ${PORT_OPTIONS:MODBC} > CONFIGURE_ARGS+=3D --enable-odbc > -LIB_DEPENDS+=3D odbc.2:${PORTSDIR}/databases/unixODBC > +LIB_DEPENDS+=3D odbc:${PORTSDIR}/databases/unixODBC > PLIST_SUB+=3D ODBC=3D"" > MAN8+=3D perditiondb_odbc_makedb.8 > .else > @@ -142,13 +137,14 @@ CONFIGURE_ARGS+=3D --disable-odbc > PLIST_SUB+=3D ODBC=3D"@comment " > .endif > =20 > -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 > =20 > post-install: > -.if !defined(NOPORTDOCS) > +.if ${PORT_OPTIONS:MDOCS} > @${MKDIR} ${DOCSDIR} > @${INSTALL_DATA} ${WRKSRC}/etc/pam.d/perdition ${DOCSDIR}/perdition-pam= =2Esample > @${ECHO_MSG} "" >=20 > Modified: head/mail/perdition/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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) =3D e2abd57aa76b106591056ef835e26816c71= c3b39dc55bc3aeba6dfeefac7af26 > -SIZE (perdition-1.17.1.tar.gz) =3D 638162 > +SHA256 (perdition-1.18.tar.gz) =3D cad541ca1881de8eec74106851d10c2027588= b96cf1f70e3cf395f2c24c4ecaa > +SIZE (perdition-1.18.tar.gz) =3D 602933 >=20 > Modified: head/mail/perdition/files/patch-etc-perdition-Makefile.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D'$(perditionconf_DATA)'; for p in $$list; do \ > - if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ > - f=3D$(am__strip_dir) \ > -- echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionc= onfdir)/$$f'"; \ > -- $(perditionconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(perditionconfdir)= /$$f"; \ > -+ echo " $(perditionconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(perditionc= onfdir)/$$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" || ex= it $$?; \ > ++ done; \ > done > =20 > uninstall-perditionconfDATA: > @$(NORMAL_UNINSTALL) > - @list=3D'$(perditionconf_DATA)'; for p in $$list; do \ > - f=3D$(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=3D'$(perditionconf_DATA)'; test -n "$(perditionconfdir)" || list= =3D; \ > +- files=3D`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ > ++ files=3D`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 >=20 > Added: head/mail/perdition/files/patch-makegdbm-options.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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:1= 0 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 > +=20 > + extern gdbm_error gdbm_errno; > +-extern char *gdbm_version; > +=20 > + #define COPYRIGHT \ > + "(c) 1999 Horms <horms@verge.net.au>\nReleased under the GNU GPL\n" >=20 > Added: head/mail/perdition/files/patch-perdition-db-gdbm-perditiondb_gdbm= =2Eh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /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.0000= 00000 -0500 > ++++ ./perdition/db/gdbm/perditiondb_gdbm.h 2013-01-08 16:05:40.000000000= -0500 > +@@ -31,7 +31,6 @@ > + #include <gdbm.h> > +=20 > + extern gdbm_error gdbm_errno; > +-extern char *gdbm_version; > +=20 > + #ifndef PERDITIONDB_GDBM_SYSCONFDIR > + #define PERDITIONDB_GDBM_SYSCONFDIR "/usr/local/etc/perdition" >=20 > Modified: head/mail/perdition/files/patch-perdition-db-ldap-Makefile.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 -07= 00 > ++++ 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 > =20 > + # 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. >=20 > Modified: head/mail/perdition/files/patch-perdition-db-posix_regex-Makefi= le.in > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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.000000= 000 +0100 > -+++ perdition/db/posix_regex/Makefile.in 2007-11-02 15:55:31.000000000 += 0100 > -@@ -355,16 +355,16 @@ > - @list=3D'$(conf_DATA)'; for p in $$list; do \ > - if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ > - f=3D$(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.000000= 000 -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 > =20 > uninstall-confDATA: > @$(NORMAL_UNINSTALL) > - @list=3D'$(conf_DATA)'; for p in $$list; do \ > - f=3D$(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 > -=20 > - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) > + @list=3D'$(conf_DATA)'; test -n "$(confdir)" || list=3D; \ > +- files=3D`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ > ++ files=3D`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 >=20 > Modified: head/mail/perdition/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 --vhOf6eAHdfH9MSjZ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlDstNMACgkQ8kTtMUmk6EzYXwCdFY+usgdEROsJoWodBiBFiDif 26kAn3LUqepZJO3JE6BJMcwaOxDMv4IU =dRXS -----END PGP SIGNATURE----- --vhOf6eAHdfH9MSjZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130109000747.GH85686>