diff options
-rw-r--r-- | www/horde/Makefile | 16 | ||||
-rw-r--r-- | www/horde/pkg/DEINSTALL | 25 | ||||
-rw-r--r-- | www/horde/pkg/INSTALL | 27 | ||||
-rw-r--r-- | www/horde/pkg/MESSAGE | 4 | ||||
-rw-r--r-- | www/horde/pkg/PLIST | 4 |
5 files changed, 59 insertions, 17 deletions
diff --git a/www/horde/Makefile b/www/horde/Makefile index fba11943e73..9f6da9ebe58 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/28 10:33:53 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/04/30 05:53:29 jlam Exp $ DISTNAME= horde-1.2.4 CATEGORIES= www @@ -15,14 +15,20 @@ NO_CONFIGURE= # defined DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -CONFDIR= ${PREFIX}/etc/httpd DOCDIR= ${PREFIX}/share/doc/horde +EGDIR= ${PREFIX}/share/examples/horde HORDEDIR= ${PREFIX}/share/horde PHPLIBDIR= ${PREFIX}/share/horde/phplib MESSAGE_SUBST+= HORDEDIR=${HORDEDIR} MESSAGE_SUBST+= PHPLIBDIR=${PHPLIBDIR} +.include "../../mk/bsd.prefs.mk" + +APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +BUILD_DEFS+= APACHE_SYSCONFDIR +MESSAGE_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} + post-extract: cd ${WRKSRC}/phplib; \ for file in local.inc prepend.php3; do \ @@ -65,6 +71,7 @@ pre-install: ${FILESDIR}/horde_secure.sh > ${WRKDIR}/horde_secure.sh ${SED} -e "s|@HORDEDIR@|${HORDEDIR:S/^${PREFIX}\///}|g" \ -e "s|@PHPLIBDIR@|${PHPLIBDIR: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" \ @@ -72,6 +79,7 @@ pre-install: ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} -e "s|@HORDEDIR@|${HORDEDIR:S/^${PREFIX}\///}|g" \ -e "s|@PHPLIBDIR@|${PHPLIBDIR: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" \ @@ -81,8 +89,8 @@ pre-install: do-install: ${INSTALL_SCRIPT} ${WRKDIR}/horde_setup.sh ${PREFIX}/sbin/horde_setup ${INSTALL_SCRIPT} ${WRKDIR}/horde_secure.sh ${PREFIX}/sbin/horde_secure - ${INSTALL_DATA_DIR} ${CONFDIR} ${DOCDIR} ${HORDEDIR} ${PHPLIBDIR} - cd ${WRKDIR}; ${INSTALL_DATA} horde.conf.dist ${CONFDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} ${HORDEDIR} ${PHPLIBDIR} + cd ${WRKDIR}; ${INSTALL_DATA} horde.conf.dist ${EGDIR}/horde.conf cd ${WRKSRC}; ${INSTALL_DATA} COPYING README docs/* ${DOCDIR} cd ${WRKSRC}/phplib; ${INSTALL_DATA} * ${PHPLIBDIR} cd ${WRKSRC}; ${CP} -R graphics lib locale scripts templates ${HORDEDIR} diff --git a/www/horde/pkg/DEINSTALL b/www/horde/pkg/DEINSTALL index 2f8c664b4f0..298f4bb423f 100644 --- a/www/horde/pkg/DEINSTALL +++ b/www/horde/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2001/04/30 05:53:29 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -10,18 +10,33 @@ RM="@RM@" RMDIR="@RMDIR@" TRUE="@TRUE@" -CONFDIR=${PKG_PREFIX}/etc/httpd +APACHE_SYSCONFDIR="@APACHE_SYSCONFDIR@" +SAMPLECONFDIR=${PKG_PREFIX}/share/examples/horde +CONFDIR=${APACHE_SYSCONFDIR} HORDEDIR=${PKG_PREFIX}/@HORDEDIR@ PHPLIBDIR=${PKG_PREFIX}/@PHPLIBDIR@ -CONFFILES="${CONFDIR}/horde.conf ${PHPLIBDIR}/local.inc ${PHPLIBDIR}/prepend.php3 ${HORDEDIR}/config/horde.php3" -NONCONFFILES="${HORDEDIR}/config/MOTD.html ${HORDEDIR}/config/header.txt ${HORDEDIR}/config/html.php3 ${HORDEDIR}/config/lang.php3 ${HORDEDIR}/config/menu.txt ${HORDEDIR}/config/mime.php3" +CONFFILES=" ${PHPLIBDIR}/local.inc \ + ${PHPLIBDIR}/prepend.php3 \ + ${HORDEDIR}/config/horde.php3" +NONCONFFILES=" ${HORDEDIR}/config/MOTD.html \ + ${HORDEDIR}/config/header.txt \ + ${HORDEDIR}/config/html.php3 \ + ${HORDEDIR}/config/lang.php3 \ + ${HORDEDIR}/config/menu.txt \ + ${HORDEDIR}/config/mime.php3" case ${STAGE} in DEINSTALL) # Remove configuration files if they don't differ from the default # config file. # + FILE=${CONFDIR}/horde.conf + SAMPLEFILE=${SAMPLECONFDIR}/horde.conf + if diff -q ${FILE} ${SAMPLEFILE} >/dev/null + then + ${RM} -f ${FILE} + fi for FILE in ${CONFFILES} ${NONCONFFILES} do SAMPLEFILE=${FILE}.dist @@ -34,7 +49,7 @@ DEINSTALL) POST-DEINSTALL) modified_files='' - for FILE in ${CONFFILES} ${NONCONFFILES} + for FILE in ${CONFDIR}/horde.conf ${CONFFILES} ${NONCONFFILES} do if [ -f ${FILE} ] then diff --git a/www/horde/pkg/INSTALL b/www/horde/pkg/INSTALL index 09341c1f5d1..4370250c1b3 100644 --- a/www/horde/pkg/INSTALL +++ b/www/horde/pkg/INSTALL @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: INSTALL,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $ +# $NetBSD: INSTALL,v 1.2 2001/04/30 05:53:30 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -9,12 +9,21 @@ CAT="@CAT@" CHMOD="@CHMOD@" CP="@CP@" -CONFDIR=${PKG_PREFIX}/etc/httpd +APACHE_SYSCONFDIR="@APACHE_SYSCONFDIR@" +SAMPLECONFDIR=${PKG_PREFIX}/share/examples/horde +CONFDIR=${APACHE_SYSCONFDIR} HORDEDIR=${PKG_PREFIX}/@HORDEDIR@ PHPLIBDIR=${PKG_PREFIX}/@PHPLIBDIR@ -CONFFILES="${CONFDIR}/horde.conf ${PHPLIBDIR}/local.inc ${PHPLIBDIR}/prepend.php3 ${HORDEDIR}/config/horde.php3" -NONCONFFILES="${HORDEDIR}/config/MOTD.html ${HORDEDIR}/config/header.txt ${HORDEDIR}/config/html.php3 ${HORDEDIR}/config/lang.php3 ${HORDEDIR}/config/menu.txt ${HORDEDIR}/config/mime.php3" +CONFFILES=" ${PHPLIBDIR}/local.inc \ + ${PHPLIBDIR}/prepend.php3 \ + ${HORDEDIR}/config/horde.php3" +NONCONFFILES=" ${HORDEDIR}/config/MOTD.html \ + ${HORDEDIR}/config/header.txt \ + ${HORDEDIR}/config/html.php3 \ + ${HORDEDIR}/config/lang.php3 \ + ${HORDEDIR}/config/menu.txt \ + ${HORDEDIR}/config/mime.php3" case ${STAGE} in PRE-INSTALL) @@ -22,6 +31,16 @@ PRE-INSTALL) POST-INSTALL) echo "Installing configuration files:" + FILE=${CONFDIR}/horde.conf + SAMPLEFILE=${SAMPLECONFDIR}/horde.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/www/horde/pkg/MESSAGE b/www/horde/pkg/MESSAGE index 7ad93612c74..0ea67456ef7 100644 --- a/www/horde/pkg/MESSAGE +++ b/www/horde/pkg/MESSAGE @@ -1,5 +1,5 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2001/02/12 15:26:05 jlam Exp $ +$NetBSD: MESSAGE,v 1.2 2001/04/30 05:53:30 jlam Exp $ Please refer to the file: @@ -29,7 +29,7 @@ You will also need to make Horde accessible through your HTTP server. If you are running Apache and ap-php, then you can add the following line to httpd.conf: - Include ${PREFIX}/etc/httpd/horde.conf + Include ${APACHE_SYSCONFDIR}/horde.conf to make Horde accessible through: diff --git a/www/horde/pkg/PLIST b/www/horde/pkg/PLIST index 031e728d96b..c7c5e4d6cbb 100644 --- a/www/horde/pkg/PLIST +++ b/www/horde/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2001/02/13 03:54:00 jlam Exp $ -etc/httpd/horde.conf.dist +@comment $NetBSD: PLIST,v 1.3 2001/04/30 05:53:30 jlam Exp $ sbin/horde_setup sbin/horde_secure share/doc/horde/CHANGES @@ -10,6 +9,7 @@ share/doc/horde/HELP share/doc/horde/INSTALL share/doc/horde/README share/doc/horde/SECURITY +share/examples/horde/horde.conf share/horde/config/MOTD.html.dist share/horde/config/header.txt.dist share/horde/config/horde.php3.dist |