diff options
author | jlam <jlam@pkgsrc.org> | 2001-08-15 19:40:04 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-08-15 19:40:04 +0000 |
commit | ede1d114f4d753376b5e0266decbd38cead687bb (patch) | |
tree | 807d7ab91c4980ad114a282b741de93fabdd5033 /mail/courier-imap | |
parent | 996bbeb4afe7c6eac8f46050df9013ff6fbe0d70 (diff) | |
download | pkgsrc-ede1d114f4d753376b5e0266decbd38cead687bb.tar.gz |
* Instead of patching imap/configure to replace for SSLCERTS, do it directly
in the package Makefile since we substitute for @SSLCERTS@ anyway.
* Add the *.rand files to the list of files to DEINSTALL.
* Explicitly disable the PAM, LDAP, and MySQL authentication modules so
that hidden dependencies aren't accidentally added to the build.
XXX - These should probably be added in via make variables (USE_PAM,
XXX - USE_LDAP, etc.) in the future, but aren't needed for now in the
XXX - base package.
Diffstat (limited to 'mail/courier-imap')
-rw-r--r-- | mail/courier-imap/Makefile | 11 | ||||
-rw-r--r-- | mail/courier-imap/distinfo | 3 | ||||
-rw-r--r-- | mail/courier-imap/patches/patch-ac | 12 | ||||
-rw-r--r-- | mail/courier-imap/pkg/DEINSTALL | 6 |
4 files changed, 12 insertions, 20 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 62f65e7677f..093a2b5c2fd 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/14 21:42:14 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2001/08/15 19:40:04 jlam Exp $ DISTNAME= courier-imap-1.3.8.2 CATEGORIES= mail @@ -22,7 +22,6 @@ CONFIGURE_ARGS+= --with-db=db CONFIGURE_ARGS+= --with-userdb=/etc/courier/userdb CONFIGURE_ARGS+= --disable-root-check CONFIGURE_ENV+= OPENSSL=${BUILDLINK_PREFIX.openssl}/bin/openssl -CONFIGURE_ENV+= SSLCERTS=${SSLCERTS} INSTALL_TARGET= install-strip @@ -32,6 +31,10 @@ INSTALL_TARGET= install-strip #.include "../../security/PAM/buildlink.mk" #.endif +CONFIGURE_ARGS+= --without-authpam +CONFIGURE_ARGS+= --without-authldap +CONFIGURE_ARGS+= --without-authmysql + .if ${OPSYS} == "SunOS" .include "../../databases/db/buildlink.mk" CPPFLAGS+= -I${BUILDLINK_DIR}/include/db2 @@ -63,9 +66,9 @@ post-extract: -e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g" \ -e "s|^POP3DSTART=.*|POP3DSTART=YES|g" \ -e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g" \ - -e "s|@datadir@/imapd.pem|@SSLCERTS@/imapd.pem|g" \ + -e "s|@datadir@/imapd.pem|${SSLCERTS}/imapd.pem|g" \ -e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g" \ - -e "s|@datadir@/pop3d.pem|@SSLCERTS@/pop3d.pem|g" \ + -e "s|@datadir@/pop3d.pem|${SSLCERTS}/pop3d.pem|g" \ -e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g" \ $${file}.fixme > $${file}; \ if [ -x $${file}.fixme ]; then \ diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo index ba0ced8e10e..106ef473df5 100644 --- a/mail/courier-imap/distinfo +++ b/mail/courier-imap/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/07/31 22:48:50 jlam Exp $ +$NetBSD: distinfo,v 1.2 2001/08/15 19:40:05 jlam Exp $ SHA1 (courier-imap-1.3.8.2.tar.gz) = 7e199dee58eb125df2b897f0621ffa5eb6d7fbde Size (courier-imap-1.3.8.2.tar.gz) = 1131541 bytes SHA1 (patch-aa) = caa86582c8b0915acb126969cbd69f88714f0f3a SHA1 (patch-ab) = da50612c40a7882353eec09abeebb4ad89720d94 -SHA1 (patch-ac) = d9ad35518d72ff40735d7981cf7d35c8b78c0d32 diff --git a/mail/courier-imap/patches/patch-ac b/mail/courier-imap/patches/patch-ac deleted file mode 100644 index 8ae647eae26..00000000000 --- a/mail/courier-imap/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/07/31 22:48:50 jlam Exp $ - ---- imap/configure.orig Wed Jun 6 22:49:47 2001 -+++ imap/configure -@@ -2880,6 +2880,7 @@ - s%@HAVE_AUTH_TRUE@%$HAVE_AUTH_TRUE%g - s%@HAVE_AUTH_FALSE@%$HAVE_AUTH_FALSE%g - s%@NETLIBS@%$NETLIBS%g -+s%@SSLCERTS@%$SSLCERTS%g - - CEOF - EOF diff --git a/mail/courier-imap/pkg/DEINSTALL b/mail/courier-imap/pkg/DEINSTALL index 0fcd5882742..1f9f05df8b7 100644 --- a/mail/courier-imap/pkg/DEINSTALL +++ b/mail/courier-imap/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1.1.1 2001/07/31 22:48:50 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2001/08/15 19:40:07 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -18,6 +18,7 @@ CONFFILES_1="imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist" CONFFILES_2="imapd.cnf pop3d.cnf" CONFFILES_3="quotawarnmsg" NONCONFFILES="userdb.dat userdbshadow.dat" +RANDFILES="imapd.rand pop3d.rand" PEMFILES="imapd.pem pop3d.pem" case ${STAGE} in @@ -60,7 +61,8 @@ POST-DEINSTALL) modified_files='' for file in \ ${GENERATED_CONFFILES} ${CONFFILES_1} \ - ${CONFFILES_2} ${CONFFILES_3} ${NONCONFFILES} + ${CONFFILES_2} ${CONFFILES_3} ${NONCONFFILES} \ + ${RANDFILES} do FILE=${CONFDIR}/${file} if [ -f ${FILE} ] |