Buildlinkify, respect ${CONFDIR}, and use general INSTALL/DEINSTALL scripts.

5 files changed, 83 insertions, 151 deletions

diff --git a/mail/cyrus-imapd/DEINSTALL b/mail/cyrus-imapd/DEINSTALL
index f449695f9da..31ba1bd4575 100644
--- a/mail/cyrus-imapd/DEINSTALL
+++ b/mail/cyrus-imapd/DEINSTALL
@@ -1,68 +1,22 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:59:46 zuntum Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-AWK="@AWK@"
-CAT="@CAT@"
-RM="@RM@"
-
-IMAPDCONF=/etc/imapd.conf
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-
-POST-DEINSTALL)
-	existing_dirs=''
-	if [ -f ${IMAPDCONF} ]
-	then
-		imap_dirs=`\
-			${AWK} '/configdirectory:/      { print $2 }; \
-				/partition-.*:/         { print $2 }; \
-				/sievedir:/             { print $2 }' \
-				${IMAPDCONF}`
-		for dir in ${imap_dirs}
-		do
-			if [ -d ${dir} ]
-			then
-				existing_dirs="${existing_dirs} ${dir}"
-			fi
-		done
-	fi
-
-	${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want
-to remove:
-
-  * the following files:
-
-	${IMAPDCONF}
-EOF
-	if [ -n "${existing_dirs}" ]
-	then
-		${CAT} << EOF
-
-  * the following directories:
-
-EOF
-		for dir in ${existing_dirs}
-		do
-			echo "	${dir}"
-		done
-	fi
-		${CAT} << EOF
-===========================================================================
-EOF
-        ;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
+# $NetBSD: DEINSTALL,v 1.2 2001/11/24 20:49:42 jlam Exp $
+
+IMAPDCONF=@IMAPDCONF@
+
+if [ -f ${IMAPDCONF} ]
+then
+	imap_dirs=`							\
+		${AWK} '/configdirectory:/      { print $2 };		\
+			/partition-.*:/         { print $2 };		\
+			/sievedir:/             { print $2 }'		\
+			${IMAPDCONF}					\
+	`
+	for dir in ${imap_dirs}
+	do
+		if [ -d ${dir} ]
+		then
+			ALL_DIRS="${ALL_DIRS} ${dir}"
+		fi
+	done
+fi
diff --git a/mail/cyrus-imapd/INSTALL b/mail/cyrus-imapd/INSTALL
index db776997b2d..d3199102f7a 100644
--- a/mail/cyrus-imapd/INSTALL
+++ b/mail/cyrus-imapd/INSTALL
@@ -1,49 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2001/11/01 00:59:46 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CHMOD="@CHMOD@"
-CP="@CP@"
-
-SAMPLECONFDIR=${PKG_PREFIX}/share/examples/cyrus-imapd
-CONFDIR=/etc
-CONFFILES="imapd.conf"
+# $NetBSD: INSTALL,v 1.2 2001/11/24 20:49:42 jlam Exp $
 
 case ${STAGE} in
-PRE-INSTALL)
-	;;
-
 POST-INSTALL)
-	echo "Installing configuration files:"
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		SAMPLEFILE=${SAMPLECONFDIR}/${file}
-		if [ -f ${FILE} ]
-		then
-			echo "    ${FILE} already exists"
-		else
-			echo "    ${FILE}"
-			${CP} ${SAMPLEFILE} ${FILE}
-			${CHMOD} 644 ${FILE}
-		fi
-	done
 	${CAT} << EOF
 ===========================================================================
-Some files you might need to customize include the following:
-
-EOF
-	for file in ${CONFFILES}
-	do
-		FILE=${CONFDIR}/${file}
-		echo "	${FILE}"
-	done
-	${CAT} << EOF
-
 Please also refer to:
 
 	${PKG_PREFIX}/share/doc/html/cyrus-imapd/install.html
@@ -52,10 +14,4 @@ to set up the necessary directories before starting the Cyrus IMAP server.
 ===========================================================================
 EOF
 	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
 esac
-exit 0
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 050eb1d8284..aef42158f03 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/11/21 22:12:24 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2001/11/24 20:49:42 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 SVR4_PKGNAME=		cimap
@@ -10,12 +10,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
 COMMENT=		IMAP server
 
-DEPENDS+=		cyrus-sasl>=1.5.24nb2:../../security/cyrus-sasl
-DEPENDS+=		db3>=2.9:../../databases/db3
-
-USE_PERL5=		# defined
-USE_SSL=		# defined
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=		YES
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,17 +27,20 @@ CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
 CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
 CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=	--with-statedir=/var/run
-CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
-CONFIGURE_ARGS+=	--with-dbdir=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-dbdir=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_DIR}
 CONFIGURE_ARGS+=	--without-ucdsnmp
 CONFIGURE_ARGS+=	--without-notify
 CONFIGURE_ARGS+=	--without-zephyr
 CONFIGURE_ARGS+=	--enable-netscapehack
 
+CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_DIR}
+CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
+
 .if exists(/usr/include/krb5/com_err.h)
-CONFIGURE_ARGS+=	--with-com_err=/usr
 CPPFLAGS+=		-I/usr/include/krb5
+CONFIGURE_ARGS+=	--with-com_err=
 .else
 CONFIGURE_ARGS+=	--with-com_err=yes
 .endif
@@ -54,55 +53,58 @@ CONFIGURE_ARGS+=	--with-auth=unix
 CONFIGURE_ARGS+=	--without-krb
 .endif
 
-LIBS+=			`sasl-config --libs`
-
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
+LIBS+=			`${SASL_CONFIG} --libs`
 
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-imapd
 EGDIR=			${PREFIX}/share/examples/cyrus-imapd
+CONF_FILES=		${EGDIR}/imapd.conf ${CONFDIR}/imapd.conf
+CONF_FILES+=		${EGDIR}/normal.conf ${CONFDIR}/cyrus.conf
+FILES_SUBST+=		IMAPDCONF=${CONFDIR}/imapd.conf
+
+DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 
 PERL5_PACKLIST= \
-	${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist \
-	${PERL5_SITEARCH}/auto/Cyrus/SIEVE/acap/.packlist \
+	${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist			\
+	${PERL5_SITEARCH}/auto/Cyrus/SIEVE/acap/.packlist		\
 	${PERL5_SITEARCH}/auto/Cyrus/SIEVE/managesieve/.packlist
 
 # Change references of some manpages from foo.8 to cyrus-foo.8 to avoid
-# manpage conflicts with other packages.
+# manpage conflicts with other packages.  Also change references to
+# "/etc/{cyrus,imapd}.conf" into "${CONFDIR}/{cyrus,imapd}.conf".
 #
 post-patch:
 	cd ${WRKSRC}/man;						\
-	for man in deliver.8 imapd.8 master.8 pop3d.8; do		\
-		${MV} $${man} cyrus-$${man};				\
-		name=$${man%.*};					\
-		suffix=$${man##*.};					\
-		for file in *.[0-9]*; do				\
-			${SED} -e "s|\(\\fB\)\($${name}($${suffix})\)|\1cyrus-\2|g" \
-				$${file} > $${file}.fixed;		\
-			${MV} -f $${file}.fixed $${file};		\
-		done;							\
-		${SED} -e "s|\(\$$(srcdir)/\)\($${man}\)|\1cyrus-\2|g"	\
+	for file in deliver.8 imapd.8 master.8 pop3d.8; do		\
+		${MV} $${file} cyrus-$${file};				\
+		${SED}	-e "s|\(\$$(srcdir)/\)\($${file}\)|\1cyrus-\2|g" \
 			Makefile.in > Makefile.in.fixed;		\
 		${MV} -f Makefile.in.fixed Makefile.in;			\
 	done
-
-pre-install:
-	${SED}	-e "s,@AWK@,${AWK},g" \
-		-e "s,@CAT@,${CAT},g" \
-		-e "s,@RM@,${RM},g" \
-		< ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED}	-e "s,@CAT@,${CAT},g" \
-		-e "s,@CHMOD@,${CHMOD},g" \
-		-e "s,@CP@,${CP},g" \
-		< ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	cd ${WRKSRC};							\
+	files=`${FIND} . -type f -exec ${GREP} -l /etc/imapd\.conf {} \;`; \
+	for file in $${files}; do					\
+		${SED}	-e "s|\(\\fB\)\($${name}($${suffix})\)|\1cyrus-\2|g" \
+			-e "s|\(\$$(srcdir)/\)\($${man}\)|\1cyrus-\2|g"	\
+			-e "s|/etc/\(cyrus\.conf\)|${CONFDIR}/\1|g"	\
+			-e "s|/etc/\(imapd\.conf\)|${CONFDIR}/\1|g"	\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
+	cd ${WRKSRC}/master/conf; ${INSTALL_DATA} *.conf ${EGDIR}
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html cyrusv2.mc ${HTMLDIR}
-	cd ${WRKSRC}/master/conf; ${INSTALL_DATA} *.conf ${EGDIR}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../databases/db3/buildlink.mk"
+.include "../../lang/perl5/buildlink.mk"
+.include "../../security/cyrus-sasl/buildlink.mk"
+.include "../../security/openssl/buildlink.mk"
+.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 3883ea07120..be6585325d1 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/10/15 21:30:36 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/11/24 20:49:42 jlam Exp $
 
 SHA1 (cyrus-imapd-2.0.16.tar.gz) = 7aa83f4b01d164f57cfd4cfe195f85551212b962
 Size (cyrus-imapd-2.0.16.tar.gz) = 1383996 bytes
@@ -10,3 +10,4 @@ SHA1 (patch-ag) = 08068d3d44a055237b208838def5e1ac4c4715b5
 SHA1 (patch-ah) = d6602de6b2105c97cef1005fb7883e6023184ef7
 SHA1 (patch-ai) = eb32cf0cf4c4007efc57530fa028b5336c22e26a
 SHA1 (patch-aj) = ca70e0a1e9d21cc5e4a2a01efcf6832e286df8a4
+SHA1 (patch-ak) = f03e5eb8afb8ecdaf37656c49ce75ed4701f3e36
diff --git a/mail/cyrus-imapd/patches/patch-ak b/mail/cyrus-imapd/patches/patch-ak
new file mode 100644
index 00000000000..68365e5e899
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ak
@@ -0,0 +1,19 @@
+$NetBSD: patch-ak,v 1.1 2001/11/24 20:49:43 jlam Exp $
+
+--- configure.orig	Fri Jul 27 19:53:11 2001
++++ configure
+@@ -1413,14 +1413,6 @@
+ fi
+ 
+ echo "$ac_t""$andrew_runpath_switch" 1>&6
+-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
+-
+-  # this is CMU ADD LIBPATH
+-  if test "$andrew_runpath_switch" = "none" ; then
+-	LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}"
+-  else
+-	LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
+-  fi
+ 
+ 
+ for ac_hdr in unistd.h sys/select.h sys/param.h