ports/60263: [maintainer update] mail/perdition: update to 1.12
Clement LAFORET
sheepkiller at cultdeadsheep.org
Mon Dec 15 16:00:42 UTC 2003
>Number: 60263
>Category: ports
>Synopsis: [maintainer update] mail/perdition: update to 1.12
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 15 08:00:36 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Clement Laforet
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Sun Dec 7 15:41:23 GMT 2003 root at lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386
>Description:
- Update perdition to 1.12
- Introduce WITH_DAEMON_MAP knob
- add make-showoptions
- sort pkg-plist and makefile
- new files:
files/patch-perdition::Makefile.in
files/patch-perdition::db::daemon::Makefile.in
files/patch-perdition::perdition.c
>How-To-Repeat:
N/A
>Fix:
--- perdition.diff begins here ---
Index: perdition/Makefile
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/mail/perdition/Makefile,v
retrieving revision 1.19
diff -u -u -r1.19 Makefile
--- perdition/Makefile 1 Sep 2003 14:02:08 -0000 1.19
+++ perdition/Makefile 15 Dec 2003 15:50:25 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= perdition
-PORTVERSION= 1.11
-PORTREVISION= 2
+PORTVERSION= 1.12
CATEGORIES= mail net security
MASTER_SITES= http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
@@ -22,29 +21,31 @@
MAN5= perditiondb.5
MAN8= perdition.8
-MLINK= perdition.8 - perdition.pop3s.8 \
- - perdition.imap4.8 - perdition.imap4s.8 \
- - perdition.imaps.8 - perdition.pop3.8
MANCOMPRESSED= no
USE_LIBTOOL= YES
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= DOCSDIR=${DOCSDIR}
+CONFIGURE_ARGS+= --disable-daemon-map
INSTALLS_SHLIB= yes
-# Available knobs:
-# WITHOUT_SSL: Disable OpenSSL support
-# WITHOUT_POSIX_REGEX: Disable native regex support
-# WITH_BDB: Enable Berkerley database backend
-# WITH_NIS: Enable NIS database backend
-# WITH_GDBM: Enable gdbm database backend
-# WITH_MYSQL: Enable MySQL database backend
-# WITH_PGSQL: Enable PostgreSQL database backend
-# WITH_OPENLDAP: Enable OpenLDAP database backend
-# WITH_ODBC: Enable ODBC database backend
+##
+## 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
+##
.if !defined(WITHOUT_SSL)
CONFIGURE_ARGS+= --enable-ssl
@@ -55,10 +56,19 @@
.if !defined(WITHOUT_POSIX_REGEX)
CONFIGURE_ARGS+= --enable-posix_regex
-PLIST_SUB+= POSIX_REGEX=""
+PLIST_SUB+= POSIXREGEX=""
.else
CONFIGURE_ARGS+= --disable-posix_regex
-PLIST_SUB+= POSIX_REGEX="@comment "
+PLIST_SUB+= POSIXREGEX="@comment "
+.endif
+
+.if defined(WITH_DAEMON_MAP)
+CONFIGURE_ARGS+= --enable-daemon-map
+PLIST_SUB+= DAEMONMAP=""
+LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm
+.else
+CONFIGURE_ARGS+= --disable-daemon-map
+PLIST_SUB+= DAEMONMAP="@comment "
.endif
.if defined(WITH_BDB)
@@ -129,7 +139,13 @@
PLIST_SUB+= ODBC="@comment "
.endif
+pre-everything:: show-options
+
+show-options:
+ @${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
+
post-install:
+.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/etc/pam.d/perdition ${DOCSDIR}/perdition-pam.sample
@${ECHO_MSG} ""
@@ -138,5 +154,6 @@
@${ECHO_MSG} " ${DOCSDIR}/perdition-pam.sample"
@${ECHO_MSG} "/********************************************************/"
@${ECHO_MSG} ""
+.endif
.include <bsd.port.mk>
Index: perdition/distinfo
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/mail/perdition/distinfo,v
retrieving revision 1.4
diff -u -u -r1.4 distinfo
--- perdition/distinfo 3 Jul 2003 05:54:50 -0000 1.4
+++ perdition/distinfo 15 Dec 2003 15:50:25 -0000
@@ -1 +1 @@
-MD5 (perdition-1.11.tar.gz) = 4499246c5380a843b1f2e7da0aecc0eb
+MD5 (perdition-1.12.tar.gz) = c0c0edd864fd707e327aa6ac7706ce32
Index: perdition/pkg-plist
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/mail/perdition/pkg-plist,v
retrieving revision 1.4
diff -u -u -r1.4 pkg-plist
--- perdition/pkg-plist 31 Jul 2003 06:40:01 -0000 1.4
+++ perdition/pkg-plist 15 Dec 2003 15:50:25 -0000
@@ -4,7 +4,7 @@
%%ODBC%%bin/perditiondb_odbc_makedb
%%MYSQL%%bin/perditiondb_mysql_makedb
%%PGSQL%%bin/perditiondb_postgresql_makedb
-%%POSIX_REGEX%%etc/perdition/popmap.re-dist
+%%POSIXREGEX%%etc/perdition/popmap.re-dist
etc/perdition/perdition.conf-dist
etc/perdition/popmap-dist
etc/perdition/Makefile.popmap-dist
@@ -14,22 +14,22 @@
lib/libjain.so
lib/libjain.la
lib/libjain.a
-%%GDBM%%lib/libperditiondb_gdbm.so.0
-%%GDBM%%lib/libperditiondb_gdbm.so
-%%GDBM%%lib/libperditiondb_gdbm.la
-%%GDBM%%lib/libperditiondb_gdbm.a
%%BDB%%lib/libperditiondb_bdb.so.0
%%BDB%%lib/libperditiondb_bdb.so
%%BDB%%lib/libperditiondb_bdb.la
%%BDB%%lib/libperditiondb_bdb.a
+%%DAEMONMAP%%libperditiondb_daemon.so.0
+%%DAEMONMAP%%libperditiondb_daemon.so
+%%DAEMONMAP%%libperditiondb_daemon.la
+%%DAEMONMAP%%libperditiondb_daemon.a
+%%GDBM%%lib/libperditiondb_gdbm.so.0
+%%GDBM%%lib/libperditiondb_gdbm.so
+%%GDBM%%lib/libperditiondb_gdbm.la
+%%GDBM%%lib/libperditiondb_gdbm.a
%%OPENLDAP%%lib/libperditiondb_ldap.so.0
%%OPENLDAP%%lib/libperditiondb_ldap.so
%%OPENLDAP%%lib/libperditiondb_ldap.la
%%OPENLDAP%%lib/libperditiondb_ldap.a
-%%ODBC%%lib/libperditiondb_odbc.so.0
-%%ODBC%%lib/libperditiondb_odbc.so
-%%ODBC%%lib/libperditiondb_odbc.la
-%%ODBC%%lib/libperditiondb_odbc.a
%%MYSQL%%lib/libperditiondb_mysql.so.0
%%MYSQL%%lib/libperditiondb_mysql.so
%%MYSQL%%lib/libperditiondb_mysql.la
@@ -38,14 +38,18 @@
%%NIS%%lib/libperditiondb_nis.so
%%NIS%%lib/libperditiondb_nis.la
%%NIS%%lib/libperditiondb_nis.a
+%%ODBC%%lib/libperditiondb_odbc.so.0
+%%ODBC%%lib/libperditiondb_odbc.so
+%%ODBC%%lib/libperditiondb_odbc.la
+%%ODBC%%lib/libperditiondb_odbc.a
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.so.0
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.so
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.la
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.a
%%PGSQL%%lib/libperditiondb_postgresql.so.0
%%PGSQL%%lib/libperditiondb_postgresql.so
%%PGSQL%%lib/libperditiondb_postgresql.la
%%PGSQL%%lib/libperditiondb_postgresql.a
-%%POSIX_REGEX%%lib/libperditiondb_posix_regex.so.0
-%%POSIX_REGEX%%lib/libperditiondb_posix_regex.so
-%%POSIX_REGEX%%lib/libperditiondb_posix_regex.la
-%%POSIX_REGEX%%lib/libperditiondb_posix_regex.a
sbin/perdition
sbin/perdition.pop3
sbin/perdition.pop3s
Index: perdition/files/patch-perdition::Makefile.in
===================================================================
RCS file: perdition/files/patch-perdition::Makefile.in
diff -N perdition/files/patch-perdition::Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ perdition/files/patch-perdition::Makefile.in 15 Dec 2003 15:50:25 -0000
@@ -0,0 +1,11 @@
+--- perdition/Makefile.in.orig Mon Dec 15 08:19:21 2003
++++ perdition/Makefile.in Mon Dec 15 14:35:08 2003
+@@ -573,8 +573,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:
Index: perdition/files/patch-perdition::db::daemon::Makefile.in
===================================================================
RCS file: perdition/files/patch-perdition::db::daemon::Makefile.in
diff -N perdition/files/patch-perdition::db::daemon::Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ perdition/files/patch-perdition::db::daemon::Makefile.in 15 Dec 2003 15:50:25 -0000
@@ -0,0 +1,11 @@
+--- perdition/db/daemon/Makefile.in.orig Mon Dec 15 12:24:51 2003
++++ perdition/db/daemon/Makefile.in Mon Dec 15 12:27:20 2003
+@@ -155,7 +155,7 @@
+
+ libperditiondb_daemon_la_LDFLAGS = -version-info 0:0:0
+
+-libperditiondb_daemon_la_LIBADD = -ldb
++libperditiondb_daemon_la_LIBADD = -lgdbm
+
+ noinst_PROGRAMS = client server
+
Index: perdition/files/patch-perdition::perdition.c
===================================================================
RCS file: perdition/files/patch-perdition::perdition.c
diff -N perdition/files/patch-perdition::perdition.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ perdition/files/patch-perdition::perdition.c 15 Dec 2003 15:50:25 -0000
@@ -0,0 +1,17 @@
+--- perdition/perdition.c.orig Mon Dec 1 02:31:37 2003
++++ perdition/perdition.c Mon Dec 15 12:07:31 2003
+@@ -65,6 +65,14 @@
+ #include <dmalloc.h>
+ #endif
+
++#include <sys/param.h>
++#ifdef __FreeBSD__
++# if __FreeBSD_version < 500112
++# include <machine/limits.h>
++# else
++# include <sys/limits.h>
++# endif
++#endif
+
+ /*Use uname information here and there to idinify this system*/
+ struct utsname *system_uname;
--- perdition.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list