- Repect ${APACHE_SYSCONFDIR} setting

- Install example imp.conf Apache config file fragment info
  ${PREFIX}/share/examples/imp.
- Add missing directory share/doc/imp to PLIST.

5 files changed, 70 insertions, 18 deletions

diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index da4c58826cc..903192856b4 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/28 10:33:53 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/04/30 06:11:09 jlam Exp $
 
 DISTNAME=	imp-2.2.4
 CATEGORIES=	mail www
@@ -16,13 +16,19 @@ NO_CONFIGURE=	# defined
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 INSTALL_FILE=	${WRKDIR}/INSTALL
 
-CONFDIR=	${PREFIX}/etc/httpd
 DOCDIR=		${PREFIX}/share/doc/imp
+EGDIR=		${PREFIX}/share/examples/imp
 HORDEDIR=	${PREFIX}/share/horde
 IMPDIR=		${HORDEDIR}/imp
 
 MESSAGE_SUBST+=	IMPDIR=${IMPDIR}
 
+.include "../../mk/bsd.prefs.mk"
+
+APACHE_SYSCONFDIR?=	${LOCALBASE}/etc/httpd
+BUILD_DEFS+=		APACHE_SYSCONFDIR
+MESSAGE_SUBST+=		APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+
 post-extract:
 	cd ${WRKSRC}/config;						\
 	for file in							\
@@ -60,12 +66,14 @@ pre-install:
 	${SED}	-e "s|@IMPDIR@|${IMPDIR}|g"				\
 		${FILESDIR}/imp.conf.dist > ${WRKDIR}/imp.conf.dist
 	${SED}	-e "s|@IMPDIR@|${IMPDIR:S/^${PREFIX}\///}|g"		\
+		-e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g"	\
 		-e "s|@CAT@|${CAT}|g"					\
 		-e "s|@RM@|${RM}|g"					\
 		-e "s|@RMDIR@|${RMDIR}|g"				\
 		-e "s|@TRUE@|${TRUE}|g"					\
 		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 	${SED}	-e "s|@IMPDIR@|${IMPDIR:S/^${PREFIX}\///}|g"		\
+		-e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g"	\
 		-e "s|@CAT@|${CAT}|g"					\
 		-e "s|@CHMOD@|${CHMOD}|g"				\
 		-e "s|@CP@|${CP}|g"					\
@@ -73,8 +81,8 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
-	${INSTALL_DATA_DIR} ${CONFDIR} ${DOCDIR} ${IMPDIR}
-	cd ${WRKDIR}; ${INSTALL_DATA} imp.conf.dist ${CONFDIR}
+	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} ${IMPDIR}
+	cd ${WRKDIR}; ${INSTALL_DATA} imp.conf.dist ${EGDIR}/imp.conf
 	cd ${WRKSRC}; ${INSTALL_DATA} COPYING README docs/* ${DOCDIR}
 	cd ${WRKSRC}; ${CP} -R graphics lib locale scripts templates ${IMPDIR}
 	${INSTALL_DATA_DIR} ${IMPDIR}/config
diff --git a/mail/imp/pkg/DEINSTALL b/mail/imp/pkg/DEINSTALL
index 5b841c2ef15..b885189ef4a 100644
--- a/mail/imp/pkg/DEINSTALL
+++ b/mail/imp/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1.1.1 2001/02/12 15:27:41 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2001/04/30 06:11:09 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -10,17 +10,36 @@ RM="@RM@"
 RMDIR="@RMDIR@"
 TRUE="@TRUE@"
 
-CONFDIR=${PKG_PREFIX}/etc/httpd
+APACHE_SYSCONFDIR="@APACHE_SYSCONFDIR@"
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/imp
+CONFDIR=${APACHE_SYSCONFDIR}
 IMPDIR=${PKG_PREFIX}/@IMPDIR@
 
-CONFFILES="${CONFDIR}/imp.conf ${IMPDIR}/config/defaults.php3 ${IMPDIR}/config/ldap.php3 ${IMPDIR}/config/servers.php3"
-NONCONFFILES="${IMPDIR}/config/MOTD.html ${IMPDIR}/config/header.txt ${IMPDIR}/config/html.php3 ${IMPDIR}/config/imp_module_config.php3 ${IMPDIR}/config/lang.php3 ${IMPDIR}/config/mailbox.php3 ${IMPDIR}/config/menu.txt ${IMPDIR}/config/mime.php3 ${IMPDIR}/config/prefs.php3 ${IMPDIR}/config/trailer.txt"
+CONFFILES="	${IMPDIR}/config/defaults.php3				\
+		${IMPDIR}/config/ldap.php3				\
+		${IMPDIR}/config/servers.php3"
+NONCONFFILES="	${IMPDIR}/config/MOTD.html				\
+		${IMPDIR}/config/header.txt				\
+		${IMPDIR}/config/html.php3				\
+		${IMPDIR}/config/imp_module_config.php3			\
+		${IMPDIR}/config/lang.php3				\
+		${IMPDIR}/config/mailbox.php3				\
+		${IMPDIR}/config/menu.txt				\
+		${IMPDIR}/config/mime.php3				\
+		${IMPDIR}/config/prefs.php3				\
+		${IMPDIR}/config/trailer.txt"
 
 case ${STAGE} in
 DEINSTALL)
 	# Remove configuration files if they don't differ from the default
 	# config file.
 	#
+	FILE=${CONFDIR}/imp.conf
+	SAMPLEFILE=${SAMPLECONFDIR}/imp.conf
+	if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
+	then
+		${RM} -f ${FILE}
+	fi
 	for FILE in ${CONFFILES} ${NONCONFFILES}
 	do
 		SAMPLEFILE=${FILE}.dist
@@ -33,7 +52,7 @@ DEINSTALL)
 
 POST-DEINSTALL)
 	modified_files=''
-	for FILE in ${CONFFILES} ${NONCONFFILES}
+	for FILE in ${CONFDIR}/imp.conf ${CONFFILES} ${NONCONFFILES}
 	do
 		if [ -f ${FILE} ]
 		then
diff --git a/mail/imp/pkg/INSTALL b/mail/imp/pkg/INSTALL
index 23165f9f0e2..949c583c974 100644
--- a/mail/imp/pkg/INSTALL
+++ b/mail/imp/pkg/INSTALL
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.1.1.1 2001/02/12 15:27:41 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2001/04/30 06:11:09 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -9,11 +9,24 @@ CAT="@CAT@"
 CHMOD="@CHMOD@"
 CP="@CP@"
 
-CONFDIR=${PKG_PREFIX}/etc/httpd
+APACHE_SYSCONFDIR="@APACHE_SYSCONFDIR@"
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/imp
+CONFDIR=${APACHE_SYSCONFDIR}
 IMPDIR=${PKG_PREFIX}/@IMPDIR@
 
-CONFFILES="${CONFDIR}/imp.conf ${IMPDIR}/config/defaults.php3 ${IMPDIR}/config/ldap.php3 ${IMPDIR}/config/servers.php3"
-NONCONFFILES="${IMPDIR}/config/MOTD.html ${IMPDIR}/config/header.txt ${IMPDIR}/config/html.php3 ${IMPDIR}/config/imp_module_config.php3 ${IMPDIR}/config/lang.php3 ${IMPDIR}/config/mailbox.php3 ${IMPDIR}/config/menu.txt ${IMPDIR}/config/mime.php3 ${IMPDIR}/config/prefs.php3 ${IMPDIR}/config/trailer.txt"
+CONFFILES="	${IMPDIR}/config/defaults.php3				\
+		${IMPDIR}/config/ldap.php3				\
+		${IMPDIR}/config/servers.php3"
+NONCONFFILES="	${IMPDIR}/config/MOTD.html				\
+		${IMPDIR}/config/header.txt				\
+		${IMPDIR}/config/html.php3				\
+		${IMPDIR}/config/imp_module_config.php3			\
+		${IMPDIR}/config/lang.php3				\
+		${IMPDIR}/config/mailbox.php3				\
+		${IMPDIR}/config/menu.txt				\
+		${IMPDIR}/config/mime.php3				\
+		${IMPDIR}/config/prefs.php3				\
+		${IMPDIR}/config/trailer.txt"
 
 case ${STAGE} in
 PRE-INSTALL)
@@ -21,6 +34,16 @@ PRE-INSTALL)
 
 POST-INSTALL)
 	echo "Installing configuration files:"
+	FILE=${CONFDIR}/imp.conf
+	SAMPLEFILE=${SAMPLECONFDIR}/imp.conf
+	if [ -f ${FILE} ]
+	then
+		echo "    ${FILE} already exists"
+	else
+		echo "    ${FILE}"
+		${CP} ${SAMPLEFILE} ${FILE}
+		${CHMOD} 644 ${FILE}
+	fi
 	for FILE in ${CONFFILES} ${NONCONFFILES}
 	do
 		SAMPLEFILE=${FILE}.dist
diff --git a/mail/imp/pkg/MESSAGE b/mail/imp/pkg/MESSAGE
index 51dad3e36bb..3465d5a34f6 100644
--- a/mail/imp/pkg/MESSAGE
+++ b/mail/imp/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2001/02/12 15:27:43 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2001/04/30 06:11:09 jlam Exp $
 
 Please refer to the file:
 
@@ -19,8 +19,8 @@ You will also need to make IMP accessible through your HTTP server.  If
 you are running Apache and ap-php, then you can add the following lines
 to httpd.conf:
 
-	Include ${PREFIX}/etc/httpd/horde.conf
-	Include ${PREFIX}/etc/httpd/imp.conf
+	Include ${APACHE_SYSCONFDIR}/horde.conf
+	Include ${APACHE_SYSCONFDIR}/imp.conf
 
 to make Horde accessible through:
 	
diff --git a/mail/imp/pkg/PLIST b/mail/imp/pkg/PLIST
index 401d98dca13..4da68da6dba 100644
--- a/mail/imp/pkg/PLIST
+++ b/mail/imp/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/02/12 15:27:43 jlam Exp $
-etc/httpd/imp.conf.dist
+@comment $NetBSD: PLIST,v 1.2 2001/04/30 06:11:09 jlam Exp $
 share/doc/imp/CHANGES
 share/doc/imp/COPYING
 share/doc/imp/CREDITS
@@ -9,6 +8,7 @@ share/doc/imp/INSTALL
 share/doc/imp/PACKAGES
 share/doc/imp/README
 share/doc/imp/SECURITY
+share/examples/imp/imp.conf
 share/horde/imp/addcontact.php3
 share/horde/imp/compose.php3
 share/horde/imp/config/MOTD.html.dist
@@ -855,3 +855,5 @@ share/horde/imp/view.php3
 @dirrm share/horde/imp/lib/js
 @dirrm share/horde/imp/lib
 @dirrm share/horde/imp/graphics
+@dirrm share/examples/imp
+@dirrm share/doc/imp