diff options
55 files changed, 274 insertions, 2856 deletions
diff --git a/databases/postgresql-server/DEINSTALL b/databases/postgresql-server/DEINSTALL index 78f834b41c8..aab9c52f4b3 100644 --- a/databases/postgresql-server/DEINSTALL +++ b/databases/postgresql-server/DEINSTALL @@ -1,17 +1,4 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:12:41 zuntum Exp $ -# - -PKGNAME=$1 -STAGE=$2 - -USER="@PGUSER@" -GROUP="@PGGROUP@" -PGHOME="@PGHOME@" - -CAT="@CAT@" -RM="@RM@" +# $NetBSD: DEINSTALL,v 1.2 2001/11/19 16:23:08 jlam Exp $ case ${STAGE} in DEINSTALL) @@ -30,27 +17,4 @@ perform the databases dump. =========================================================================== EOF ;; - -POST-DEINSTALL) - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want -to remove: - - * the \`${USER}' user - - * the \`${GROUP}' group - - * the following directories: - - ${PGHOME} -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; esac -exit 0 diff --git a/databases/postgresql-server/INSTALL b/databases/postgresql-server/INSTALL deleted file mode 100644 index 6bd3f913bed..00000000000 --- a/databases/postgresql-server/INSTALL +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 00:12:41 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -USER=@PGUSER@ -GROUP=@PGGROUP@ -PGHOME=@PGHOME@ - -ADDUSER="@ADDUSER@" -ADDGROUP="@ADDGROUP@" -CHGRP="@CHGRP@" -CHOWN="@CHOWN@" -ID="@ID@" -MKDIR="@MKDIR@" -RM="@RM@" -SU="@SU@" -TOUCH="@TOUCH@" - -case ${STAGE} in -PRE-INSTALL) - # Group... the default's shipped with NetBSD - # We need to check that ${GROUP} exists before adding the user. - # Do it with chgrp to be able to use NIS. - # - ${TOUCH} "/tmp/grouptest.$$" - ${CHGRP} ${GROUP} "/tmp/grouptest.$$" >/dev/null 2>&1 - if [ $? -eq 0 ] - then - echo "Group '${GROUP}' already exists...proceeding." - else - echo "Creating '${GROUP}' group..." - ${ADDGROUP} ${GROUP} - echo "Done." - fi - ${RM} -f "/tmp/grouptest.$$" - - # Use `id' to be able to use NIS. - # - ${ID} ${USER} 2>/dev/null >/dev/null - if [ $? -eq 0 ] - then - echo "User '${USER}' already exists...proceeding." - else - echo "Creating '${USER}' user..." - ${ADDUSER} \ - -c "PostgreSQL database administrator" \ - -d ${PGHOME} \ - -g ${GROUP} \ - -s /bin/sh \ - ${USER} - ${RM} -f ${PGHOME}/.profile - echo "Done." - fi - ${MKDIR} ${PGHOME} - ${CHOWN} -R ${USER}:${GROUP} ${PGHOME} - ;; - -POST-INSTALL) - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index 164d623db1c..201f5f3552e 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/08/20 03:55:32 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2001/11/19 16:23:08 jlam Exp $ .include "../../databases/postgresql/Makefile.common" .include "../../databases/postgresql/Makefile.ssl" @@ -23,46 +23,22 @@ DIRS_TO_BUILD= src/backend # PGGROUP group of the database administrator # PGHOME home directory of the database administrator and location of # the databases - +# PGUSER?= pgsql PGGROUP?= pgsql PGHOME?= ${PREFIX}/${PGUSER} BUILD_DEFS= PGUSER PGROUP PGHOME -.if ${OPSYS} == "NetBSD" -.if exists(/usr/sbin/user) -ADDUSER= /usr/sbin/useradd -ADDGROUP= /usr/sbin/groupadd -.else -DEPENDS+= user>=20000313:../../sysutils/user -ADDUSER= ${LOCALBASE}/sbin/useradd -ADDGROUP= ${LOCALBASE}/sbin/groupadd -.endif -.else -ADDUSER= useradd -ADDGROUP= groupadd -.endif - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST= PREFIX=${PREFIX} -FILES_SUBST+= PGUSER=${PGUSER} -FILES_SUBST+= PGGROUP=${PGGROUP} -FILES_SUBST+= PGHOME=${PGHOME} - -FILES_SUBST+= ADDUSER=${ADDUSER:Q} -FILES_SUBST+= ADDGROUP=${ADDGROUP:Q} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHGRP=${CHGRP:Q} -FILES_SUBST+= CHOWN=${CHOWN:Q} -FILES_SUBST+= ID=${ID:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= SU=${SU:Q} -FILES_SUBST+= TOUCH=${TOUCH:Q} - -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +PKG_USER= ${PGUSER} +PKG_USER_DESCR= PostgreSQL database administrator +PKG_USER_HOME= ${PGHOME} +PKG_USER_SHELL= ${SH} +PKG_GROUP= ${PGGROUP} + +RCD_SCRIPTS= ${PREFIX}/etc/rc.d/pgsql /etc/rc.d/pgsql +OWN_DIRS_PERMS= ${PGHOME} ${PGUSER} ${PGGROUP} 0755 + +DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL do-build: .for DIR in ${DIRS_TO_BUILD} @@ -84,8 +60,6 @@ pre-install: esac ${SED} ${FILES_SUBST_SED} ${FILESDIR}/pgsql.sh > ${WRKDIR}/pgsql.sh - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: @@ -102,4 +76,5 @@ post-install: .include "../../devel/libgetopt/buildlink.mk" .include "../../databases/postgresql-lib/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh index 7c422f2d88f..c3a19767ed2 100644 --- a/databases/postgresql-server/files/pgsql.sh +++ b/databases/postgresql-server/files/pgsql.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pgsql.sh,v 1.4 2001/05/14 21:19:42 jlam Exp $ +# $NetBSD: pgsql.sh,v 1.5 2001/11/19 16:23:08 jlam Exp $ # # PostgreSQL database rc.d control script # @@ -8,11 +8,11 @@ # REQUIRE: DAEMON # KEYWORD: shutdown -PGHOME=@PGHOME@ +PGHOME=@PKG_USER_HOME@ name="pgsql" rcvar=$name -pgsql_user="@PGUSER@" +pgsql_user="@PKG_USER@" command="@PREFIX@/bin/pg_ctl" command_args="-s -D ${PGHOME}/data -l ${PGHOME}/errlog" diff --git a/databases/unixodbc/DEINSTALL b/databases/unixodbc/DEINSTALL deleted file mode 100644 index f12ac349993..00000000000 --- a/databases/unixodbc/DEINSTALL +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1.1.1 2001/11/06 04:08:33 jlam Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -ECHO="@ECHO@" -RM="@RM@" -RMDIR="@RMDIR@" -TR="@TR@" -TRUE="@TRUE@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/@PKGBASE@ -CONFDIR=/etc - -CONFFILES=" \ - ${SAMPLECONFDIR}/odbcinst.ini ${CONFDIR}/odbcinst.ini : \ - /dev/null ${CONFDIR}/odbc.ini \ - " - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for FILE in ${CONFFILES} - do - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${CONFDIR}/ODBCDataSources 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${CONFDIR}/ODBCDataSources - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - ${ECHO} " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - - * the following directories: - -EOF - for dir in ${existing_dirs} - do - ${ECHO} " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/databases/unixodbc/INSTALL b/databases/unixodbc/INSTALL deleted file mode 100644 index e2ede9bceca..00000000000 --- a/databases/unixodbc/INSTALL +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1.1.1 2001/11/06 04:08:33 jlam Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" -ECHO="@ECHO@" -MKDIR="@MKDIR@" -TR="@TR@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/@PKGBASE@ -CONFDIR=/etc - -CONFFILES=" \ - ${SAMPLECONFDIR}/odbcinst.ini ${CONFDIR}/odbcinst.ini : \ - /dev/null ${CONFDIR}/odbc.ini \ - " - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - ${MKDIR} ${CONFDIR}/ODBCDataSources - - ${ECHO} "Installing configuration files:" - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - if [ -f ${FILE} ] - then - ${ECHO} " ${FILE} already exists" - else - ${ECHO} " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - done - ${CAT} << EOF - -=========================================================================== -You may wish to customize the following files: - -EOF - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - ${ECHO} " ${FILE}" - done - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index 359db49ab39..4bde02d67a2 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/11/06 04:08:33 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2001/11/19 16:23:09 jlam Exp $ PKGNAME= unixodbc-${ODBC_VERS} ODBC_PKG_VERS= # empty @@ -11,37 +11,20 @@ USE_BUILDLINK_ONLY= YES CONFIGURE_ARGS+= --disable-gui -EGDIR= ${PREFIX}/share/examples/${PKGBASE} - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -PLIST_SUBST+= PKGBASE=${PKGBASE} PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR} - -FILES_SUBST+= PKGBASE=${PKGBASE} FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR} -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= PKGBASE=${PKGBASE} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= ECHO=${ECHO:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TR=${TR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} + +EGDIR= ${PREFIX}/share/examples/${PKGBASE} + +CONF_FILES= ${EGDIR}/odbcinst.ini ${CONFDIR}/odbcinst.ini +CONF_FILES+= /dev/null ${CONFDIR}/odbc.ini +OWN_DIRS= ${CONFDIR}/ODBCDataSources post-patch: fix-driver-installation pre-install: ${SED} ${FILES_SUBST_SED} ${FILESDIR}/odbcinst.ini.in \ > ${WRKDIR}/odbcinst.ini - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: @@ -50,4 +33,5 @@ post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../devel/readline/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common index 2e17e6ace0d..81d2737940c 100644 --- a/databases/unixodbc/Makefile.common +++ b/databases/unixodbc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2001/11/07 06:12:19 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2001/11/19 16:23:09 jlam Exp $ DISTNAME= unixODBC-${ODBC_DIST_VERS} CATEGORIES= databases @@ -23,7 +23,7 @@ USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=/etc +CONFIGURE_ARGS+= --sysconfdir=${CONFDIR} CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --enable-gnuthreads CONFIGURE_ARGS+= --with-pth=${BUILDLINK_DIR} diff --git a/mail/imp/DEINSTALL b/mail/imp/DEINSTALL deleted file mode 100644 index 637f7db0914..00000000000 --- a/mail/imp/DEINSTALL +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:00:16 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" - -APACHE_SYSCONFDIR="@APACHE_SYSCONFDIR@" -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/imp -CONFDIR=${APACHE_SYSCONFDIR} -IMPDIR=${PKG_PREFIX}/@IMPDIR@ - -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/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 ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - for FILE in ${CONFFILES} ${NONCONFFILES} - do - SAMPLEFILE=${FILE}.dist - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for FILE in ${CONFDIR}/imp.conf ${CONFFILES} ${NONCONFFILES} - do - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${IMPDIR}/config 2>/dev/null || ${TRUE} - ${RMDIR} ${IMPDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${IMPDIR} - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - - * the following directories: - -EOF - for dir in ${existing_dirs} - do - echo " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/imp/INSTALL b/mail/imp/INSTALL deleted file mode 100644 index 59d56707c9c..00000000000 --- a/mail/imp/INSTALL +++ /dev/null @@ -1,79 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 01:00:17 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -APACHE_SYSCONFDIR="@APACHE_SYSCONFDIR@" -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/imp -CONFDIR=${APACHE_SYSCONFDIR} -IMPDIR=${PKG_PREFIX}/@IMPDIR@ - -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) - ;; - -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 - 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 - echo " ${FILE}" - done - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/imp/Makefile b/mail/imp/Makefile index 6f2d15982e8..da6608f1102 100644 --- a/mail/imp/Makefile +++ b/mail/imp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/11/11 19:29:10 bouyer Exp $ +# $NetBSD: Makefile,v 1.14 2001/11/19 16:23:10 jlam Exp $ DISTNAME= imp-2.2.7 CATEGORIES= mail www @@ -11,11 +11,6 @@ COMMENT= Internet Messaging Program DEPENDS+= horde-1.2.7:../../www/horde DEPENDS+= php-imap>3.0.17:../../mail/php4-imap -NO_CONFIGURE= # defined - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - DOCDIR= ${PREFIX}/share/doc/imp EGDIR= ${PREFIX}/share/examples/imp HORDEDIR= ${PREFIX}/share/horde @@ -25,26 +20,44 @@ MESSAGE_SUBST+= IMPDIR=${IMPDIR} .include "../../mk/bsd.prefs.mk" -APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +APACHE_SYSCONFDIR?= ${CONFDIR}/httpd BUILD_DEFS+= APACHE_SYSCONFDIR MESSAGE_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST= IMPDIR=${IMPDIR:S/^${PREFIX}\///} -FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +CONF_FILES= ${EGDIR}/imp.conf ${APACHE_SYSCONFDIR}/imp.conf +CONF_FILES+= ${IMPDIR}/config/defaults.php3.dist \ + ${IMPDIR}/config/defaults.php3 +CONF_FILES+= ${IMPDIR}/config/ldap.php3.dist \ + ${IMPDIR}/config/ldap.php3 +CONF_FILES+= ${IMPDIR}/config/servers.php3.dist \ + ${IMPDIR}/config/servers.php3 +SUPPORT_FILES+= ${IMPDIR}/config/MOTD.html.dist \ + ${IMPDIR}/config/MOTD.html +SUPPORT_FILES+= ${IMPDIR}/config/header.txt.dist \ + ${IMPDIR}/config/header.txt +SUPPORT_FILES+= ${IMPDIR}/config/html.php3.dist \ + ${IMPDIR}/config/html.php3 +SUPPORT_FILES+= ${IMPDIR}/config/imp_module_config.php3.dist \ + ${IMPDIR}/config/imp_module_config.php3 +SUPPORT_FILES+= ${IMPDIR}/config/lang.php3.dist \ + ${IMPDIR}/config/lang.php3 +SUPPORT_FILES+= ${IMPDIR}/config/mailbox.php3.dist \ + ${IMPDIR}/config/mailbox.php3 +SUPPORT_FILES+= ${IMPDIR}/config/menu.txt.dist \ + ${IMPDIR}/config/menu.txt +SUPPORT_FILES+= ${IMPDIR}/config/mime.php3.dist \ + ${IMPDIR}/config/mime.php3 +SUPPORT_FILES+= ${IMPDIR}/config/prefs.php3.dist \ + ${IMPDIR}/config/prefs.php3 +SUPPORT_FILES+= ${IMPDIR}/config/trailer.txt.dist \ + ${IMPDIR}/config/trailer.txt +MAKE_DIRS= ${APACHE_SYSCONFDIR} post-extract: - cd ${WRKSRC}; \ + cd ${WRKSRC}; \ for file in \ - config/MOTD.html config/header.txt config/html.php3 \ - config/imp_module_config.php3 config/lang.php3 \ + config/MOTD.html config/header.txt config/html.php3 \ + config/imp_module_config.php3 config/lang.php3 \ config/mailbox.php3 config/menu.txt config/trailer.txt ; \ do \ ${MV} $${file} $${file}.dist; \ @@ -77,8 +90,6 @@ do-build: pre-install: ${SED} -e "s|@IMPDIR@|${IMPDIR}|g" \ ${FILESDIR}/imp.conf.dist > ${WRKDIR}/imp.conf.dist - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: @@ -95,4 +106,5 @@ do-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/sq-squirrelspell/DEINSTALL b/mail/sq-squirrelspell/DEINSTALL deleted file mode 100644 index 2118bb90f42..00000000000 --- a/mail/sq-squirrelspell/DEINSTALL +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:01:25 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" - -SMDIR=${PKG_PREFIX}/@SMDIR@ -CONFDIR=${SMDIR}/plugins/squirrelspell -SAMPLECONFDIR=${CONFDIR} - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - FILE=${CONFDIR}/sqspell_config.php - SAMPLEFILE=${CONFDIR}/sqspell_config.dist - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - ;; - -POST-DEINSTALL) - modified_files='' - for FILE in \ - ${CONFDIR}/sqspell_config.php - do - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${CONFDIR} - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - - * the following directories: - -EOF - for dir in ${existing_dirs} - do - echo " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/sq-squirrelspell/INSTALL b/mail/sq-squirrelspell/INSTALL deleted file mode 100644 index 8f42baf1488..00000000000 --- a/mail/sq-squirrelspell/INSTALL +++ /dev/null @@ -1,47 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 01:01:26 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -SMDIR=${PKG_PREFIX}/@SMDIR@ -CONFDIR=${SMDIR}/plugins/squirrelspell -SAMPLECONFDIR=${CONFDIR} - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - echo "Installing configuration files:" - FILE=${CONFDIR}/sqspell_config.php - SAMPLEFILE=${CONFDIR}/sqspell_config.dist - if [ -f ${FILE} ] - then - echo " ${FILE} already exists" - else - echo " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - ${CAT} << EOF - -=========================================================================== -You may wish to customize: - - ${CONFDIR}/sqspell_config.php -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/sq-squirrelspell/Makefile b/mail/sq-squirrelspell/Makefile index ad4b3ee7b9d..c5e6a5d2e75 100644 --- a/mail/sq-squirrelspell/Makefile +++ b/mail/sq-squirrelspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/29 05:43:47 jmc Exp $ +# $NetBSD: Makefile,v 1.5 2001/11/19 16:23:11 jlam Exp $ DISTNAME= squirrelspell.0.3.5-1.0.6 PKGNAME= sq-squirrelspell-0.3.5 @@ -17,25 +17,13 @@ DEPENDS+= squirrelmail>=1.0.6:../../mail/squirrelmail SMDIR= ${PREFIX}/share/squirrelmail MESSAGE_SUBST+= SMDIR=${SMDIR} -NO_CONFIGURE= # defined NO_BUILD= # defined -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST= SMDIR=${SMDIR:S/^${PREFIX}\///} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +CONF_FILES= ${SMDIR}/plugins/squirrelspell/sqspell_config.dist \ + ${SMDIR}/plugins/squirrelspell/sqspell_config.php +OWN_DIRS= ${SMDIR}/plugins/squirrelspell pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: @@ -44,4 +32,5 @@ do-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/squirrelmail/DEINSTALL b/mail/squirrelmail/DEINSTALL deleted file mode 100644 index 350b6d3cfba..00000000000 --- a/mail/squirrelmail/DEINSTALL +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 01:01:30 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" - -APACHE_SYSCONFDIR=@APACHE_SYSCONFDIR@ -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/squirrelmail -CONFDIR=${APACHE_SYSCONFDIR} -DATADIR=/var/spool/squirrelmail -SMDIR=${PKG_PREFIX}/@SMDIR@ -CONFFILES="config.php" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - FILE=${DATADIR}/data/default_pref - SAMPLEFILE=${SMDIR}/data/default_pref - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - FILE=${CONFDIR}/squirrelmail.conf - SAMPLEFILE=${SAMPLECONFDIR}/squirrelmail.conf - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - ;; - -POST-DEINSTALL) - modified_files='' - for FILE in \ - ${SMDIR}/config/config.php \ - ${DATADIR}/data/default_pref \ - ${CONFDIR}/squirrelmail.conf - do - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${SMDIR}/config 2>/dev/null || ${TRUE} - ${RMDIR} ${SMDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${DATADIR}/attachments 2>/dev/null || ${TRUE} - ${RMDIR} ${DATADIR}/data 2>/dev/null || ${TRUE} - ${RMDIR} ${DATADIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${SMDIR} ${DATADIR} - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - - * the following directories: - -EOF - for dir in ${existing_dirs} - do - echo " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/squirrelmail/INSTALL b/mail/squirrelmail/INSTALL deleted file mode 100644 index b60507aa247..00000000000 --- a/mail/squirrelmail/INSTALL +++ /dev/null @@ -1,77 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 01:01:31 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHGRP="@CHGRP@" -CHMOD="@CHMOD@" -CHOWN="@CHOWN@" -CP="@CP@" -MKDIR="@MKDIR@" - -USER=nobody -GROUP=nobody - -APACHE_SYSCONFDIR=@APACHE_SYSCONFDIR@ -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/squirrelmail -CONFDIR=${APACHE_SYSCONFDIR} -SMDIR=${PKG_PREFIX}/@SMDIR@ -DATADIR=/var/spool/squirrelmail - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - ${MKDIR} ${DATADIR} - ${MKDIR} ${DATADIR}/attachments - ${CHGRP} -R ${GROUP} ${DATADIR}/attachments - ${CHMOD} 730 ${DATADIR}/attachments - ${MKDIR} ${DATADIR}/data - ${CHOWN} -R ${USER}:${GROUP} ${DATADIR}/data - - echo "Installing configuration files:" - FILE=${DATADIR}/data/default_pref - SAMPLEFILE=${SMDIR}/data/default_pref - if [ -f ${FILE} ] - then - echo " ${FILE} already exists" - else - echo " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - FILE=${CONFDIR}/squirrelmail.conf - SAMPLEFILE=${SAMPLECONFDIR}/squirrelmail.conf - if [ -f ${FILE} ] - then - echo " ${FILE} already exists" - else - echo " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - ${CAT} << EOF - -=========================================================================== -Please run the SquirrelMail configuration script: - - cd ${SMDIR}/config && ./conf.pl - -to customize the SquirrelMail webmail system for your site. You may also -wish to customize: - - ${CONFDIR}/squirrelmail.conf -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/squirrelmail/MESSAGE b/mail/squirrelmail/MESSAGE index a229cb7630a..6742d3e1df7 100644 --- a/mail/squirrelmail/MESSAGE +++ b/mail/squirrelmail/MESSAGE @@ -1,5 +1,11 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.1 2001/11/01 01:01:31 zuntum Exp $ +$NetBSD: MESSAGE,v 1.2 2001/11/19 16:23:10 jlam Exp $ + +Please run the SquirrelMail configuration script: + + cd ${SMDIR}/config && ./conf.pl + +to customize the SquirrelMail webmail system for your site. You will need to make SquirrelMail accessible through your HTTP server. If you are running Apache and ap-php, then you may either symlink diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile index 1beed6d82fd..e94d0225a53 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/07/13 07:09:19 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/11/19 16:23:10 jlam Exp $ DISTNAME= squirrelmail-1.0.6 CATEGORIES= mail www @@ -19,30 +19,25 @@ NO_BUILD= # defined .include "../../mk/bsd.prefs.mk" -APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +APACHE_SYSCONFDIR?= ${CONFDIR}/httpd BUILD_DEFS+= APACHE_SYSCONFDIR MESSAGE_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} +FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} EGDIR= ${PREFIX}/share/examples/squirrelmail SMDIR= ${PREFIX}/share/squirrelmail +DATADIR= /var/spool/squirrelmail MESSAGE_SUBST+= SMDIR=${SMDIR} +FILES_SUBST+= SMDIR=${SMDIR} -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST= SMDIR=${SMDIR:S/^${PREFIX}\///} -FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHGRP=${CHGRP:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CHOWN=${CHOWN:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +CONF_FILES= ${SMDIR}/config/config_default.php ${SMDIR}/config/config.php +CONF_FILES+= ${SMDIR}/data/default_pref ${DATADIR}/data/default_pref +CONF_FILES+= ${EGDIR}/squirrelmail.conf ${APACHE_SYSCONFDIR}/squirrelmail.conf +MAKE_DIRS= ${APACHE_SYSCONFDIR} +OWN_DIRS= ${DATADIR} +OWN_DIRS+= ${SMDIR} ${SMDIR}/config +OWN_DIRS_PERMS= ${DATADIR}/attachments root nobody 730 +OWN_DIRS_PERMS+= ${DATADIR}/data nobody nobody 755 post-extract: cd ${WRKSRC}; \ @@ -56,11 +51,9 @@ post-patch: ${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \; pre-install: - ${SED} -e "s|@SMDIR@|${SMDIR}|g" \ + ${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/squirrelmail.conf.dist \ > ${WRKDIR}/squirrelmail.conf.dist - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: @@ -74,4 +67,5 @@ do-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/DEINSTALL b/print/cups/DEINSTALL deleted file mode 100644 index 086d3279dc2..00000000000 --- a/print/cups/DEINSTALL +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 23:27:34 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -USER="@CUPS_USER@" -GROUP="@CUPS_GROUP@" - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" - -LOGDIR=/var/log/cups -REQUESTDIR=/var/spool/cups -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/cups -CONFDIR=/etc/cups -CONFFILES="client.conf cupsd.conf" -NONCONFFILES="classes.conf mime.convs mime.types printers.conf" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${CONFDIR}/ppd 2>/dev/null || ${TRUE} - ${RMDIR} ${CONFDIR}/interfaces 2>/dev/null || ${TRUE} - ${RMDIR} ${CONFDIR}/certs 2>/dev/null || ${TRUE} - ${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE} - ${RM} -rf ${REQUESTDIR}/tmp - ${RMDIR} ${REQUESTDIR} 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${CONFDIR} ${LOGDIR} ${REQUESTDIR} - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: - - * the \`${USER}' user - - * the \`${GROUP}' group -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - fi - 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 diff --git a/print/cups/INSTALL b/print/cups/INSTALL deleted file mode 100644 index 19d3c3e6961..00000000000 --- a/print/cups/INSTALL +++ /dev/null @@ -1,122 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/10/31 23:27:35 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -USER="@CUPS_USER@" -GROUP="@CUPS_GROUP@" - -ADDUSER="@ADDUSER@" -ADDGROUP="@ADDGROUP@" -CAT="@CAT@" -CHGRP="@CHGRP@" -CHMOD="@CHMOD@" -CHOWN="@CHOWN@" -CP="@CP@" -ID="@ID@" -MKDIR="@MKDIR@" -RM="@RM@" -TOUCH="@TOUCH@" - -LOGDIR=/var/log/cups -REQUESTDIR=/var/spool/cups -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/cups -CONFDIR=/etc/cups -CONFFILES="client.conf cupsd.conf" -NONCONFFILES="classes.conf mime.convs mime.types printers.conf" - -case ${STAGE} in -PRE-INSTALL) - # Group... the default's shipped with NetBSD - # We need to check that ${GROUP} exists before adding the user. - # Do it with chgrp to be able to use NIS. - # - ${TOUCH} "/tmp/grouptest.$$" - ${CHGRP} ${GROUP} "/tmp/grouptest.$$" >/dev/null 2>&1 - if [ $? -eq 0 ] - then - echo "Group '${GROUP}' already exists...proceeding." - else - echo "Creating '${GROUP}' group..." - ${ADDGROUP} ${GROUP} - echo "Done." - fi - ${RM} -f "/tmp/grouptest.$$" - - # Use `id' to be able to use NIS. - # - ${ID} ${USER} 2>/dev/null >/dev/null - if [ $? -eq 0 ] - then - echo "User '${USER}' already exists...proceeding." - else - echo "Creating '${USER}' user..." - ${ADDUSER} -c "Common UNIX Printing System user" -g ${GROUP} -s /bin/sh ${USER} - echo "Done." - fi - ;; - -POST-INSTALL) - ${MKDIR} ${CONFDIR} - ${MKDIR} ${CONFDIR}/certs - ${CHMOD} 711 ${CONFDIR}/certs - ${CHOWN} ${USER}:${GROUP} ${CONFDIR}/certs - ${MKDIR} ${CONFDIR}/interfaces - ${MKDIR} ${CONFDIR}/ppd - ${MKDIR} ${LOGDIR} - ${MKDIR} ${REQUESTDIR} - ${CHMOD} 700 ${REQUESTDIR} - ${CHOWN} ${USER}:${GROUP} ${REQUESTDIR} - ${MKDIR} ${REQUESTDIR}/tmp - ${CHMOD} 1700 ${REQUESTDIR}/tmp - ${CHOWN} ${USER}:${GROUP} ${REQUESTDIR}/tmp - - echo "Installing configuration files:" - for file in ${CONFFILES} ${NONCONFFILES} - 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 - if [ -f ${SAMPLECONFDIR}/cups.pam ] - then - ${CAT} << EOF - -To authenticate for CUPS using PAM, add the contents of the file: - - ${SAMPLECONFDIR}/cups.pam - -to your PAM configuration file. -EOF - fi - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/print/cups/MESSAGE.pam b/print/cups/MESSAGE.pam new file mode 100644 index 00000000000..0abf930da0d --- /dev/null +++ b/print/cups/MESSAGE.pam @@ -0,0 +1,9 @@ +========================================================================== +$NetBSD: MESSAGE.pam,v 1.1 2001/11/19 16:23:11 jlam Exp $ + +To authenticate for CUPS using PAM, add the contents of the file: + + ${PREFIX}/share/examples/cups/cups.pam + +to your PAM configuration file. +========================================================================== diff --git a/print/cups/Makefile b/print/cups/Makefile index daf5a04bebe..78427e305e1 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2001/08/18 04:41:45 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2001/11/19 16:23:11 jlam Exp $ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${VERS} @@ -25,7 +25,7 @@ USE_BUILDLINK_ONLY= # defined USE_GMAKE= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --sysconfdir=/etc +CONFIGURE_ARGS+= --sysconfdir=${CONFDIR} CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/cups CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} @@ -42,8 +42,11 @@ CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" CONFIGURE_ARGS+= --enable-pam PLIST_SRC= ${PKGDIR}/PLIST.pam PLIST_SRC+= ${PKGDIR}/PLIST +MESSAGE_SRC= ${PKGDIR}/MESSAGE +MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam .else CONFIGURE_ARGS+= --disable-pam +MESSAGE_SRC= ${.CURDIR}/MESSAGE PLIST_SRC= ${PKGDIR}/PLIST .endif @@ -55,51 +58,32 @@ CUPS_GROUP?= sys BUILD_DEFS+= CUPS_USER CUPS_GROUP -.if ${OPSYS} == "NetBSD" -.if exists(/usr/sbin/user) -ADDUSER= /usr/sbin/useradd -ADDGROUP= /usr/sbin/groupadd -.else -DEPENDS+= user>=20000313:../../sysutils/user -ADDUSER= ${LOCALBASE}/sbin/useradd -ADDGROUP= ${LOCALBASE}/sbin/groupadd -.endif -.elif ${OPSYS} == "SunOS" -ADDUSER= useradd -ADDGROUP= groupadd -.endif - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - DOCDIR= ${PREFIX}/share/doc/cups EGDIR= ${PREFIX}/share/examples/cups -FILES_SUBST= CUPS_USER=${CUPS_USER} -FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= ADDUSER=${ADDUSER:Q} -FILES_SUBST+= ADDGROUP=${ADDGROUP:Q} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHGRP=${CHGRP:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CHOWN=${CHOWN:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= ECHO=${ECHO:Q} -FILES_SUBST+= ID=${ID:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TOUCH=${TOUCH:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +PKG_USER= ${CUPS_USER} +PKG_USER_DESCR= Common UNIX Printing System user +PKG_GROUP= ${CUPS_GROUP} + +CONF_FILES= ${EGDIR}/client.conf ${CONFDIR}/cups/client.conf +CONF_FILES+= ${EGDIR}/cupsd.conf ${CONFDIR}/cups/cupsd.conf +SUPPORT_FILES= ${EGDIR}/classes.conf ${CONFDIR}/cups/classes.conf +SUPPORT_FILES+= ${EGDIR}/mime.convs ${CONFDIR}/cups/mime.convs +SUPPORT_FILES+= ${EGDIR}/mime.types ${CONFDIR}/cups/mime.types +SUPPORT_FILES+= ${EGDIR}/printers.conf ${CONFDIR}/cups/printers.conf +RCD_SCRIPTS= ${PREFIX}/etc/rc.d/cupsd /etc/rc.d/cupsd + +OWN_DIRS+= ${CONFDIR}/cups +OWN_DIRS+= ${CONFDIR}/cups/interfaces +OWN_DIRS+= ${CONFDIR}/cups/ppd +OWN_DIRS+= /var/log/cups +OWN_DIRS+= /var/spool/cups +OWN_DIRS_PERMS= ${CONFDIR}/cups/certs ${CUPS_USER} ${CUPS_GROUP} 0711 +OWN_DIRS_PERMS+= /var/spool/cups/tmp ${CUPS_USER} ${CUPS_GROUP} 1700 pre-install: - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/cupsd.sh > ${WRKDIR}/cupsd.sh - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} + @${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam + @${SED} ${FILES_SUBST_SED} ${FILESDIR}/cupsd.sh > ${WRKDIR}/cupsd.sh PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: @@ -121,4 +105,5 @@ post-install: .include "../../graphics/tiff/buildlink.mk" .include "../../net/openslp/buildlink.mk" .include "../../security/openssl/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/files/cupsd.sh b/print/cups/files/cupsd.sh index 6a47ed84a57..8729933ec46 100644 --- a/print/cups/files/cupsd.sh +++ b/print/cups/files/cupsd.sh @@ -1,5 +1,7 @@ #! /bin/sh # +# $NetBSD: cupsd.sh,v 1.5 2001/11/19 16:23:11 jlam Exp $ +# # Common UNIX Printing System daemon # # PROVIDE: cupsd diff --git a/www/ap-ssl/DEINSTALL b/www/ap-ssl/DEINSTALL deleted file mode 100644 index 45e7902d252..00000000000 --- a/www/ap-ssl/DEINSTALL +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:15:59 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" - -SERVERROOT="@APACHE_SYSCONFDIR@" -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/mod_ssl -CONFDIR=${SERVERROOT} -CONFFILES="apache_start.conf" -NONCONFFILES=" ssl.crl/Makefile.crl \ - ssl.crl/README.CRL \ - ssl.crt/Makefile.crt \ - ssl.crt/README.CRT \ - ssl.crt/ca-bundle.crt \ - ssl.csr/README.CSR \ - ssl.key/README.KEY \ - ssl.prm/README.PRM" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/ap-ssl/INSTALL b/www/ap-ssl/INSTALL deleted file mode 100644 index b1e32926f2a..00000000000 --- a/www/ap-ssl/INSTALL +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 02:16:00 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" -MKDIR="@MKDIR@" - -SERVERROOT="@APACHE_SYSCONFDIR@" -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/mod_ssl -CONFDIR=${SERVERROOT} -CONFFILES="apache_start.conf" -NONCONFFILES=" ssl.crl/Makefile.crl \ - ssl.crl/README.CRL \ - ssl.crt/Makefile.crt \ - ssl.crt/README.CRT \ - ssl.crt/ca-bundle.crt \ - ssl.csr/README.CSR \ - ssl.key/README.KEY \ - ssl.prm/README.PRM" - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - # ${SERVERROOT} (${CONFDIR}) is already set up by apache/pkg/INSTALL, - # so we don't need to create those directories here. - - echo "Installing configuration files:" - for file in ${CONFFILES} ${NONCONFFILES} - 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 -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 394d5572ebc..7282528618b 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2001/10/17 19:17:11 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2001/11/19 16:23:12 jlam Exp $ DISTNAME= mod_ssl-2.8.5-1.3.22 PKGNAME= ap-ssl-2.8.5 @@ -24,25 +24,29 @@ CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} MAKE_ENV+= SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib" -APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +APACHE_SYSCONFDIR?= ${CONFDIR}/httpd BUILD_DEFS+= APACHE_SYSCONFDIR - -SAMPLECONFDIR= ${PREFIX}/share/examples/mod_ssl - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -# Given foo=${bar}, replace @foo@ with ${bar}. -# -FILES_SUBST= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/} +FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} + +EGDIR= ${PREFIX}/share/examples/mod_ssl +CONF_FILES= ${EGDIR}/apache_start.conf \ + ${APACHE_SYSCONFDIR}/apache_start.conf +SUPPORT_FILES= ${EGDIR}/ssl.crl/Makefile.crl \ + ${APACHE_SYSCONFDIR}/ssl.crl/Makefile.crl +SUPPORT_FILES+= ${EGDIR}/ssl.crl/README.CRL \ + ${APACHE_SYSCONFDIR}/ssl.crl/README.CRL +SUPPORT_FILES+= ${EGDIR}/ssl.crt/Makefile.crt \ + ${APACHE_SYSCONFDIR}/ssl.crt/Makefile.crt +SUPPORT_FILES+= ${EGDIR}/ssl.crt/README.CRT \ + ${APACHE_SYSCONFDIR}/ssl.crt/README.CRT +SUPPORT_FILES+= ${EGDIR}/ssl.crt/ca-bundle.crt \ + ${APACHE_SYSCONFDIR}/ssl.crt/ca-bundle.crt +SUPPORT_FILES+= ${EGDIR}/ssl.csr/README.CSR \ + ${APACHE_SYSCONFDIR}/ssl.csr/README.CSR +SUPPORT_FILES+= ${EGDIR}/ssl.key/README.KEY \ + ${APACHE_SYSCONFDIR}/ssl.key/README.KEY +SUPPORT_FILES+= ${EGDIR}/ssl.prm/README.PRM \ + ${APACHE_SYSCONFDIR}/ssl.prm/README.PRM post-extract: cd ${WRKSRC}/pkg.contrib; ${MV} -f loadcacert.cgi loadcacert.cgi.in @@ -57,23 +61,21 @@ post-build: > ${WRKSRC}/pkg.sslsup/mkcert.sh pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} ${SED} ${FILES_SUBST_SED} \ ${FILESDIR}/README.mkcert > ${WRKDIR}/README.mkcert post-install: - ${INSTALL_DATA_DIR} ${SAMPLECONFDIR} - ${INSTALL_DATA_DIR} ${SAMPLECONFDIR}/ssl.crl - ${INSTALL_DATA_DIR} ${SAMPLECONFDIR}/ssl.crt - ${INSTALL_DATA_DIR} ${SAMPLECONFDIR}/ssl.csr - ${INSTALL_DATA_DIR} ${SAMPLECONFDIR}/ssl.key - ${INSTALL_DATA_DIR} ${SAMPLECONFDIR}/ssl.prm + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA_DIR} ${EGDIR}/ssl.crl + ${INSTALL_DATA_DIR} ${EGDIR}/ssl.crt + ${INSTALL_DATA_DIR} ${EGDIR}/ssl.csr + ${INSTALL_DATA_DIR} ${EGDIR}/ssl.key + ${INSTALL_DATA_DIR} ${EGDIR}/ssl.prm cd ${PREFIX}/lib/httpd; ${MV} -f libssl.so mod_ssl.so cd ${WRKSRC}/pkg.sslsup; ${INSTALL_SCRIPT} mkcert.sh \ ${PREFIX}/sbin/mkcert - ${INSTALL_DATA} ${FILESDIR}/apache_start.conf ${SAMPLECONFDIR} + ${INSTALL_DATA} ${FILESDIR}/apache_start.conf ${EGDIR} ${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl cd ${WRKSRC}/pkg.ssldoc; ${INSTALL_DATA} *.html *.gif *.jpg \ @@ -86,17 +88,18 @@ post-install: cd ${WRKSRC}/pkg.sslcfg; ${RM} -f server.* cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CRL *.crl \ - ${SAMPLECONFDIR}/ssl.crl + ${EGDIR}/ssl.crl cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CRT *.crt \ - ${SAMPLECONFDIR}/ssl.crt + ${EGDIR}/ssl.crt cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CSR \ - ${SAMPLECONFDIR}/ssl.csr + ${EGDIR}/ssl.csr cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.KEY *.key \ - ${SAMPLECONFDIR}/ssl.key + ${EGDIR}/ssl.key cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.PRM *.prm \ - ${SAMPLECONFDIR}/ssl.prm + ${EGDIR}/ssl.prm PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../security/openssl/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/apache/DEINSTALL b/www/apache/DEINSTALL deleted file mode 100644 index a17b0b045aa..00000000000 --- a/www/apache/DEINSTALL +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:16:06 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" - -SERVERROOT="@APACHE_SYSCONFDIR@" -DATADIR=${PKG_PREFIX}/share/httpd -LOGDIR=/var/log/httpd -SPOOLDIR=/var/spool/httpd -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/httpd -CONFDIR=${SERVERROOT} -CONFFILES="httpd.conf" -NONCONFFILES="magic mime.types" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file}.default - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${SPOOLDIR}/proxy 2>/dev/null || ${TRUE} - ${RMDIR} ${SPOOLDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${DATADIR}/htdocs 2>/dev/null || ${TRUE} - ${RMDIR} ${DATADIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.prm 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.key 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.csr 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.crt 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.crl 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT} 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${CONFDIR} ${LOGDIR} ${REQUESTDIR} ${DATADIR} - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - - * the following directories: - -EOF - for dir in ${existing_dirs} - do - echo " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/apache/INSTALL b/www/apache/INSTALL deleted file mode 100644 index cf1122572a9..00000000000 --- a/www/apache/INSTALL +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 02:16:06 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CHOWN="@CHOWN@" -CP="@CP@" -MKDIR="@MKDIR@" - -SERVERROOT="@APACHE_SYSCONFDIR@" -LOGDIR=/var/log/httpd -SPOOLDIR=/var/spool/httpd -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/httpd -CONFDIR=${SERVERROOT} -CONFFILES="httpd.conf" -NONCONFFILES="magic mime.types" - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - ${MKDIR} ${SERVERROOT} - ${MKDIR} ${SERVERROOT}/ssl.crl - ${MKDIR} ${SERVERROOT}/ssl.crt - ${MKDIR} ${SERVERROOT}/ssl.csr - ${MKDIR} ${SERVERROOT}/ssl.key - ${MKDIR} ${SERVERROOT}/ssl.prm - ${MKDIR} ${LOGDIR} - ${MKDIR} ${SPOOLDIR} - ${MKDIR} ${SPOOLDIR}/proxy - ${CHOWN} nobody:nobody ${SPOOLDIR}/proxy - - echo "Installing configuration files:" - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file}.default - 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 -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/apache/Makefile b/www/apache/Makefile index 8d9c5fc7572..bd405fdf693 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2001/10/22 18:02:51 jlam Exp $ +# $NetBSD: Makefile,v 1.82 2001/11/19 16:23:12 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -39,8 +39,9 @@ CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" .include "../../mk/bsd.prefs.mk" -APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +APACHE_SYSCONFDIR?= ${CONFDIR}/httpd BUILD_DEFS+= APACHE_SYSCONFDIR +FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES APACHE_USER?= www @@ -98,23 +99,22 @@ BUILD_DEFS+= APACHE_CUSTOM_CFLAGS BUILD_DEFS+= APACHE_PERF_TUNING BUILD_DEFS+= APACHE_SUEXEC -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL +EGDIR= ${PREFIX}/share/examples/httpd -# Given foo=${bar}, replace @foo@ with ${bar}. -# -FILES_SUBST= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CHOWN=${CHOWN:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/} +CONF_FILES= ${EGDIR}/httpd.conf.default ${APACHE_SYSCONFDIR}/httpd.conf +SUPPORT_FILES= ${EGDIR}/magic.default ${APACHE_SYSCONFDIR}/magic +SUPPORT_FILES+= ${EGDIR}/mime.types.default ${APACHE_SYSCONFDIR}/mime.types +RCD_SCRIPTS= ${PREFIX}/etc/rc.d/apache /etc/rc.d/apache + +MAKE_DIRS= ${APACHE_SYSCONFDIR} +OWN_DIRS= ${APACHE_SYSCONFDIR}/ssl.crl +OWN_DIRS+= ${APACHE_SYSCONFDIR}/ssl.crt +OWN_DIRS+= ${APACHE_SYSCONFDIR}/ssl.csr +OWN_DIRS+= ${APACHE_SYSCONFDIR}/ssl.key +OWN_DIRS+= ${APACHE_SYSCONFDIR}/ssl.prm +OWN_DIRS+= /var/log/httpd +OWN_DIRS+= /var/spool/httpd +OWN_DIRS_PERMS+= /var/spool/httpd/proxy nobody nobody 0755 post-extract: ${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include @@ -149,8 +149,6 @@ pre-configure: pre-install: ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f ${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} post-install: .if !defined(NOPIC) @@ -168,4 +166,5 @@ post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../textproc/expat/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/apache6/DEINSTALL b/www/apache6/DEINSTALL deleted file mode 100644 index 43993420643..00000000000 --- a/www/apache6/DEINSTALL +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:16:12 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" - -SERVERROOT="@APACHE_SYSCONFDIR@" -DATADIR=${PKG_PREFIX}/share/httpd -LOGDIR=/var/log/httpd -SPOOLDIR=/var/spool/httpd -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/httpd -CONFDIR=${SERVERROOT} -CONFFILES="httpd.conf" -NONCONFFILES="magic mime.types" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file}.default - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${SPOOLDIR}/proxy 2>/dev/null || ${TRUE} - ${RMDIR} ${SPOOLDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${LOGDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${DATADIR}/htdocs 2>/dev/null || ${TRUE} - ${RMDIR} ${DATADIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.prm 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.key 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.csr 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.crt 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT}/ssl.crl 2>/dev/null || ${TRUE} - ${RMDIR} ${SERVERROOT} 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${CONFDIR} ${LOGDIR} ${REQUESTDIR} ${DATADIR} - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - - * the following directories: - -EOF - for dir in ${existing_dirs} - do - echo " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/apache6/INSTALL b/www/apache6/INSTALL deleted file mode 100644 index 87ae2dea8a6..00000000000 --- a/www/apache6/INSTALL +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 02:16:12 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CHOWN="@CHOWN@" -CP="@CP@" -MKDIR="@MKDIR@" - -SERVERROOT="@APACHE_SYSCONFDIR@" -LOGDIR=/var/log/httpd -SPOOLDIR=/var/spool/httpd -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/httpd -CONFDIR=${SERVERROOT} -CONFFILES="httpd.conf" -NONCONFFILES="magic mime.types" - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - ${MKDIR} ${SERVERROOT} - ${MKDIR} ${SERVERROOT}/ssl.crl - ${MKDIR} ${SERVERROOT}/ssl.crt - ${MKDIR} ${SERVERROOT}/ssl.csr - ${MKDIR} ${SERVERROOT}/ssl.key - ${MKDIR} ${SERVERROOT}/ssl.prm - ${MKDIR} ${LOGDIR} - ${MKDIR} ${SPOOLDIR} - ${MKDIR} ${SPOOLDIR}/proxy - ${CHOWN} nobody:nobody ${SPOOLDIR}/proxy - - echo "Installing configuration files:" - for file in ${CONFFILES} ${NONCONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file}.default - 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 -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/apache6/Makefile b/www/apache6/Makefile index 8afb89fc35e..5a3ed3cf9ff 100644 --- a/www/apache6/Makefile +++ b/www/apache6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2001/10/22 18:10:28 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2001/11/19 16:23:13 jlam Exp $ # # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6-enable patch. @@ -46,8 +46,9 @@ BUILD_DEFS+= USE_INET6 IGNORE= "IPv6 only build" .endif -APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +APACHE_SYSCONFDIR?= ${CONFDIR}/httpd BUILD_DEFS+= APACHE_SYSCONFDIR +FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} .if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES APACHE_USER?= www @@ -103,23 +104,17 @@ BUILD_DEFS+= APACHE_CUSTOM_CFLAGS BUILD_DEFS+= APACHE_PERF_TUNING BUILD_DEFS+= APACHE_SUEXEC -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL +EGDIR= ${PREFIX}/share/examples/httpd -# Given foo=${bar}, replace @foo@ with ${bar}. -# -FILES_SUBST= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CHOWN=${CHOWN:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/} +CONF_FILES= ${EGDIR}/httpd.conf.default ${APACHE_SYSCONFDIR}/httpd.conf +SUPPORT_FILES= ${EGDIR}/magic.default ${APACHE_SYSCONFDIR}/magic +SUPPORT_FILES+= ${EGDIR}/mime.types.default ${APACHE_SYSCONFDIR}/mime.types +RCD_SCRIPTS= ${PREFIX}/etc/rc.d/apache /etc/rc.d/apache + +MAKE_DIRS= ${APACHE_SYSCONFDIR} +OWN_DIRS= /var/log/httpd +OWN_DIRS+= /var/spool/httpd +OWN_DIRS_PERMS+= /var/spool/httpd/proxy nobody nobody 0755 pre-patch: ${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f @@ -149,8 +144,6 @@ pre-configure: pre-install: ${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f ${SED} ${FILES_SUBST_SED} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} post-install: .if !defined(NOPIC) @@ -168,4 +161,5 @@ post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../textproc/expat/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/apc-gui/DEINSTALL b/www/apc-gui/DEINSTALL deleted file mode 100644 index 7595a08d594..00000000000 --- a/www/apc-gui/DEINSTALL +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.2 2001/11/05 07:44:49 jlam Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -ECHO="@ECHO@" -RM="@RM@" -RMDIR="@RMDIR@" -TR="@TR@" -TRUE="@TRUE@" - -APACHE_SYSCONFDIR=@APACHE_SYSCONFDIR@ -APC_GUI_DIR=${PKG_PREFIX}/@APC_GUI_DIR@ -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/@PKGBASE@ - -CONFFILES=" \ - ${SAMPLECONFDIR}/apc_gui.conf ${APACHE_SYSCONFDIR}/apc_gui.conf : \ - /dev/null ${APC_GUI_DIR}/apc_config_local.php \ - " - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for FILE in ${CONFFILES} - do - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${APC_GUI_DIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${APACHE_SYSCONFDIR} 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${APC_GUI_DIR} ${APACHE_SYSCONFDIR} - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - ${ECHO} " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - - * the following directories: - -EOF - for dir in ${existing_dirs} - do - ${ECHO} " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/apc-gui/INSTALL b/www/apc-gui/INSTALL deleted file mode 100644 index 40494591944..00000000000 --- a/www/apc-gui/INSTALL +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.2 2001/11/05 07:47:48 jlam Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" -ECHO="@ECHO@" -MKDIR="@MKDIR@" -TR="@TR@" - -APACHE_SYSCONFDIR=@APACHE_SYSCONFDIR@ -APC_GUI_DIR=${PKG_PREFIX}/@APC_GUI_DIR@ -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/@PKGBASE@ - -CONFFILES=" \ - ${SAMPLECONFDIR}/apc_gui.conf ${APACHE_SYSCONFDIR}/apc_gui.conf : \ - /dev/null ${APC_GUI_DIR}/apc_config_local.php \ - " - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - ${MKDIR} ${APACHE_SYSCONFDIR} - - ${ECHO} "Installing configuration files:" - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - if [ -f ${FILE} ] - then - ${ECHO} " ${FILE} already exists" - else - ${ECHO} " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - done - ${CAT} << EOF - -=========================================================================== -You may wish to customize the following files: - -EOF - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - ${ECHO} " ${FILE}" - done - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile index 70b7edc7349..d96e6601e43 100644 --- a/www/apc-gui/Makefile +++ b/www/apc-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/10/29 19:35:04 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2001/11/19 16:23:14 jlam Exp $ DISTNAME= apc_gui-1.0.3 PKGNAME= ${DISTNAME:S/_/-/} @@ -14,7 +14,7 @@ DEPENDS+= php-gd>=4.0.1:../../graphics/php4-gd NO_BUILD= YES -APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +APACHE_SYSCONFDIR?= ${CONFDIR}/httpd BUILD_DEFS+= APACHE_SYSCONFDIR MESSAGE_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} @@ -23,37 +23,19 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} PLIST_SUBST+= PKGBASE=${PKGBASE} MESSAGE_SUBST+= APC_GUI_DIR=${APC_GUI_DIR} -PLIST_SUBST+= PKGBASE=${PKGBASE} - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST= APC_GUI_DIR=${APC_GUI_DIR:S/^${PREFIX}\///} -FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= PKGBASE=${PKGBASE} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= ECHO=${ECHO:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TR=${TR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +CONF_FILES= ${EGDIR}/apc_gui.conf ${APACHE_SYSCONFDIR}/apc_gui.conf +CONF_FILES+= /dev/null ${APC_GUI_DIR}/apc_config_local.php +MAKE_DIRS= ${APACHE_SYSCONFDIR} +OWN_DIRS= ${APC_GUI_DIR} pre-install: ${SED} ${FILES_SUBST_SED} ${FILESDIR}/apc_gui.conf.dist \ > ${WRKDIR}/apc_gui.conf.dist - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: ${INSTALL_DATA_DIR} ${APC_GUI_DIR} ${EGDIR} - cd ${WRKDIR}; ${INSTALL_DATA} apc_gui.conf.dist \ + cd ${WRKDIR}; ${INSTALL_DATA} apc_gui.conf.dist \ ${EGDIR}/apc_gui.conf ${CP} -R ${WRKSRC}/* ${APC_GUI_DIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${APC_GUI_DIR} @@ -62,4 +44,5 @@ do-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/cvsweb/DEINSTALL b/www/cvsweb/DEINSTALL deleted file mode 100644 index 01803ad5a7e..00000000000 --- a/www/cvsweb/DEINSTALL +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:16:38 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -CP="@CP@" -RM="@RM@" - -SERVERROOT="@APACHE_SYSCONFDIR@" -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/cvsweb -CONFDIR=${SERVERROOT} -CONFFILES="cvsweb.conf" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file}.default - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - if [ -n "${modified_files}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/cvsweb/INSTALL b/www/cvsweb/INSTALL deleted file mode 100644 index fdd15d6244f..00000000000 --- a/www/cvsweb/INSTALL +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 02:16:38 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -SERVERROOT="@APACHE_SYSCONFDIR@" -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/cvsweb -CONFDIR=${SERVERROOT} -CONFFILES="cvsweb.conf" - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - echo "Installing configuration files:" - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file}.default - if [ -f ${FILE} ] - then - echo " ${FILE} already exists" - else - echo " ${FILE}" - ${CP} -p ${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 -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile index 237e1c62c18..c6ef9311fa5 100644 --- a/www/cvsweb/Makefile +++ b/www/cvsweb/Makefile @@ -1,5 +1,5 @@ # -# $NetBSD: Makefile,v 1.4 2001/10/15 17:25:09 martti Exp $ +# $NetBSD: Makefile,v 1.5 2001/11/19 16:23:14 jlam Exp $ # DISTNAME= cvsweb-1.112 @@ -22,15 +22,11 @@ INSTALL_FILE= ${WRKDIR}/INSTALL .include "../../mk/bsd.prefs.mk" -APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +APACHE_SYSCONFDIR?= ${CONFDIR}/httpd +EGDIR= ${PREFIX}/share/examples/${PKGBASE} -FILES_SUBST= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +CONF_FILES= ${EGDIR}/cvsweb.conf.default ${APACHE_SYSCONFDIR}/cvsweb.conf +MAKE_DIRS= ${APACHE_SYSCONFDIR} do-build: ${MV} ${WRKSRC}/cvsweb.cgi ${WRKSRC}/cvsweb.cgi.bak @@ -38,16 +34,15 @@ do-build: -e 's,/usr/local/web/apache/conf/,${APACHE_SYSCONFDIR}/,' \ ${WRKSRC}/cvsweb.cgi.bak > ${WRKSRC}/cvsweb.cgi -pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} - do-install: ${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cgi-bin ${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/libexec/cgi-bin ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cvsweb ${INSTALL_DATA} ${WRKSRC}/cvsweb.conf \ ${PREFIX}/share/examples/cvsweb/cvsweb.conf.default + +post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/horde/DEINSTALL b/www/horde/DEINSTALL deleted file mode 100644 index 093d7d86d7e..00000000000 --- a/www/horde/DEINSTALL +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:16:51 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" -TRUE="@TRUE@" - -APACHE_SYSCONFDIR="@APACHE_SYSCONFDIR@" -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/horde -CONFDIR=${APACHE_SYSCONFDIR} -HORDEDIR=${PKG_PREFIX}/@HORDEDIR@ -PHPLIBDIR=${PKG_PREFIX}/@PHPLIBDIR@ - -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 ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - for FILE in ${CONFFILES} ${NONCONFFILES} - do - SAMPLEFILE=${FILE}.dist - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for FILE in ${CONFDIR}/horde.conf ${CONFFILES} ${NONCONFFILES} - do - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - ${RMDIR} ${PHPLIBDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${HORDEDIR}/config 2>/dev/null || ${TRUE} - ${RMDIR} ${HORDEDIR} 2>/dev/null || ${TRUE} - ${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE} - - existing_dirs='' - for dir in ${PHPLIBDIR} ${HORDEDIR} - do - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove: -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - - * the following directories: - -EOF - for dir in ${existing_dirs} - do - echo " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/horde/INSTALL b/www/horde/INSTALL deleted file mode 100644 index 6b06e8ec82c..00000000000 --- a/www/horde/INSTALL +++ /dev/null @@ -1,76 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 02:16:51 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -APACHE_SYSCONFDIR="@APACHE_SYSCONFDIR@" -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/horde -CONFDIR=${APACHE_SYSCONFDIR} -HORDEDIR=${PKG_PREFIX}/@HORDEDIR@ -PHPLIBDIR=${PKG_PREFIX}/@PHPLIBDIR@ - -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) - ;; - -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 - 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 - echo " ${FILE}" - done - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/horde/Makefile b/www/horde/Makefile index 4dfb14ed659..0c8f05c2b2f 100644 --- a/www/horde/Makefile +++ b/www/horde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/11/11 19:30:07 bouyer Exp $ +# $NetBSD: Makefile,v 1.15 2001/11/19 16:23:15 jlam Exp $ DISTNAME= horde-1.2.7 CATEGORIES= www @@ -11,11 +11,6 @@ COMMENT= PHP application framework DEPENDS+= php>3.0.17:../../www/php4 DEPENDS+= php-pcre>3.0.17:../../devel/php4-pcre -NO_CONFIGURE= # defined - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - DOCDIR= ${PREFIX}/share/doc/horde EGDIR= ${PREFIX}/share/examples/horde HORDEDIR= ${PREFIX}/share/horde @@ -26,21 +21,21 @@ MESSAGE_SUBST+= PHPLIBDIR=${PHPLIBDIR} .include "../../mk/bsd.prefs.mk" -APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd +APACHE_SYSCONFDIR?= ${CONFDIR}/httpd BUILD_DEFS+= APACHE_SYSCONFDIR MESSAGE_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST= HORDEDIR=${HORDEDIR:S/^${PREFIX}\///} -FILES_SUBST+= PHPLIBDIR=${PHPLIBDIR:S/^${PREFIX}\///} -FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +CONF_FILES= ${EGDIR}/horde.conf ${APACHE_SYSCONFDIR}/horde.conf +CONF_FILES+= ${PHPLIBDIR}/local.inc.dist ${PHPLIBDIR}/local.inc +CONF_FILES+= ${PHPLIBDIR}/prepend.php3.dist ${PHPLIBDIR}/prepend.php3 +CONF_FILES+= ${HORDEDIR}/config/horde.php3.dist ${HORDEDIR}/config/horde.php3 +SUPPORT_FILES= ${HORDEDIR}/config/MOTD.html.dist ${HORDEDIR}/config/MOTD.html +SUPPORT_FILES+= ${HORDEDIR}/config/header.txt.dist ${HORDEDIR}/config/header.txt +SUPPORT_FILES+= ${HORDEDIR}/config/html.php3.dist ${HORDEDIR}/config/html.php3 +SUPPORT_FILES+= ${HORDEDIR}/config/lang.php3.dist ${HORDEDIR}/config/lang.php3 +SUPPORT_FILES+= ${HORDEDIR}/config/menu.txt.dist ${HORDEDIR}/config/menu.txt +SUPPORT_FILES+= ${HORDEDIR}/config/mime.php3.dist ${HORDEDIR}/config/mime.php3 +MAKE_DIRS= ${APACHE_SYSCONFDIR} post-extract: cd ${WRKSRC}/phplib; \ @@ -82,8 +77,6 @@ pre-install: ${FILESDIR}/horde_setup.sh > ${WRKDIR}/horde_setup.sh ${SED} -e "s|@HORDEDIR@|${HORDEDIR}|g" \ ${FILESDIR}/horde_secure.sh > ${WRKDIR}/horde_secure.sh - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL do-install: @@ -103,4 +96,5 @@ do-install: post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/php4/DEINSTALL b/www/php4/DEINSTALL deleted file mode 100644 index 44ca1ef324f..00000000000 --- a/www/php4/DEINSTALL +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:18:38 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/php -CONFDIR="@PHP_CONFDIR@" -CONFFILES="php.ini" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file}-dist - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - if [ -n "${modified_files}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove the -following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/php4/INSTALL b/www/php4/INSTALL deleted file mode 100644 index e1ce12e47e7..00000000000 --- a/www/php4/INSTALL +++ /dev/null @@ -1,56 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 02:18:38 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/php -CONFDIR="@PHP_CONFDIR@" -CONFFILES="php.ini" - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - echo "Installing configuration files:" - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file}-dist - 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 -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/php4/MESSAGE.module b/www/php4/MESSAGE.module index 623f2866fa0..2cf5de6114b 100644 --- a/www/php4/MESSAGE.module +++ b/www/php4/MESSAGE.module @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE.module,v 1.1 2001/11/01 19:34:52 jlam Exp $ +$NetBSD: MESSAGE.module,v 1.2 2001/11/19 16:23:15 jlam Exp $ -To enable this module, add the following to ${PHP_CONFDIR}/php.ini: +To enable this module, add the following to ${CONFDIR}/php.ini: extension=${MODNAME}.so diff --git a/www/php4/Makefile b/www/php4/Makefile index 55a02a65beb..51144daedaa 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/10/20 17:46:50 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/11/19 16:23:15 jlam Exp $ .include "Makefile.php" @@ -17,17 +17,6 @@ LDFLAGS+= -Wl,--export-dynamic CGIDIR= ${PREFIX}/libexec/cgi-bin EGDIR= ${PREFIX}/share/examples/php -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST= PHP_CONFDIR=${PHP_CONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} - # On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that # certain symbols from the C++ implementation (__get_eh_context, etc.) # referenced by DSOs written in C++ will resolve correctly. We need to @@ -40,9 +29,9 @@ LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -Wl,-lgcc -Wl,--no-whole-archive MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" .endif +CONF_FILES= ${EGDIR}/php.ini-dist ${CONFDIR}/php.ini + pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: @@ -55,4 +44,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/php4.gif ${PREFIX}/share/php PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index 87879f55658..dea78f38234 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2001/10/16 04:54:24 jlam Exp $ +# $NetBSD: Makefile.common,v 1.18 2001/11/19 16:23:15 jlam Exp $ DISTNAME= php-${PHP_DIST_VERS} CATEGORIES+= www php4 @@ -31,5 +31,4 @@ PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} .include "../../mk/bsd.prefs.mk" -PHP_CONFDIR?= ${LOCALBASE}/etc -MESSAGE_SUBST+= PHP_CONFDIR=${PHP_CONFDIR} +MESSAGE_SUBST+= CONFDIR=${CONFDIR} diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 38d2d065a45..3d5d7a65d5f 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.3 2001/10/18 17:16:43 jlam Exp $ +# $NetBSD: Makefile.php,v 1.4 2001/11/19 16:23:15 jlam Exp $ .include "../../www/php4/Makefile.common" @@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --disable-posix CONFIGURE_ARGS+= --disable-session CONFIGURE_ARGS+= --disable-xml -CONFIGURE_ARGS+= --with-config-file-path=${PHP_CONFDIR} +CONFIGURE_ARGS+= --with-config-file-path=${CONFDIR} CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4 CONFIGURE_ARGS+= --with-regex=system diff --git a/www/surfraw/DEINSTALL b/www/surfraw/DEINSTALL deleted file mode 100644 index bb4a088a979..00000000000 --- a/www/surfraw/DEINSTALL +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.4 2001/11/06 23:12:00 jlam Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -ECHO="@ECHO@" -RM="@RM@" -RMDIR="@RMDIR@" -TR="@TR@" -TRUE="@TRUE@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/@PKGBASE@ -CONFDIR=@SURFRAW_SYSCONFDIR@ -MAKEDIRS="" - -CONFFILES=" \ - ${SAMPLECONFDIR}/surfraw.conf ${CONFDIR}/surfraw.conf : \ - ${SAMPLECONFDIR}/surfraw_elvi.list ${CONFDIR}/surfraw_elvi.list \ - " - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files=` \ - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | \ - while read SAMPLEFILE FILE; \ - do \ - if [ -f ${FILE} ]; \ - then \ - ${ECHO} ${FILE}; \ - fi; \ - done; \ - ` - - existing_dirs='' - for dir in __dummy ${MAKEDIRS} - do - if [ "${dir}" != "__dummy" -a \ - "${dir}" != "/etc" -a \ - "${dir}" != "${PKG_PREFIX}/etc" ] - then - ${RMDIR} -p ${dir} 2>/dev/null || ${TRUE} - if [ -d ${dir} ] - then - existing_dirs="${existing_dirs} ${dir}" - fi - fi - done - - if [ -n "${modified_files}" -o -n "${existing_dirs}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove -EOF - if [ -n "${modified_files}" ] - then - ${CAT} << EOF - - * the following files: - -EOF - for file in ${modified_files} - do - ${ECHO} " ${file}" - done - fi - if [ -n "${existing_dirs}" ] - then - ${CAT} << EOF - -* the following directories: - -EOF - for dir in ${existing_dirs} - do - ${ECHO} " ${dir}" - done - fi - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/surfraw/INSTALL b/www/surfraw/INSTALL deleted file mode 100644 index e9ffb363131..00000000000 --- a/www/surfraw/INSTALL +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.2 2001/11/06 10:58:03 jlam Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" -ECHO="@ECHO@" -MKDIR="@MKDIR@" -TR="@TR@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples/@PKGBASE@ -CONFDIR=@SURFRAW_SYSCONFDIR@ -MAKEDIRS="${CONFDIR}" - -CONFFILES=" \ - ${SAMPLECONFDIR}/surfraw.conf ${CONFDIR}/surfraw.conf : \ - ${SAMPLECONFDIR}/surfraw_elvi.list ${CONFDIR}/surfraw_elvi.list \ - " - -case ${STAGE} in -PRE-INSTALL) - ;; - -POST-INSTALL) - for dir in __dummy ${MAKEDIRS} - do - if [ "${dir}" != "__dummy" ] - then - ${MKDIR} ${dir} - fi - done - - ${ECHO} "Installing configuration files:" - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - if [ -f ${FILE} ] - then - ${ECHO} " ${FILE} already exists" - else - ${ECHO} " ${FILE}" - ${CP} ${SAMPLEFILE} ${FILE} - ${CHMOD} 644 ${FILE} - fi - done - ${CAT} << EOF -=========================================================================== -You may wish to customize the following files: - -EOF - ${ECHO} ${CONFFILES} | ${TR} ":" "\012" | while read SAMPLEFILE FILE - do - ${ECHO} " ${FILE}" - done - ${CAT} << EOF -=========================================================================== -EOF - ;; - -*) - ${ECHO} "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile index a960dc7f363..b5bfd1889bb 100644 --- a/www/surfraw/Makefile +++ b/www/surfraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/11/07 06:12:20 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/11/19 16:23:16 jlam Exp $ # DISTNAME= surfraw-1.0.5 @@ -14,7 +14,7 @@ CONFLICTS+= surfaw-[0-9]* USE_BUILDLINK_ONLY= YES AUTOMAKE_OVERRIDE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${SURFRAW_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${CONFDIR} # Override sysconfdir so that the installation puts the example config file # in ${EGDIR}. @@ -22,32 +22,15 @@ CONFIGURE_ARGS+= --sysconfdir=${SURFRAW_SYSCONFDIR} MAKE_FLAGS+= sysconfdir=${EGDIR} MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}" -SURFRAW_SYSCONFDIR?= ${PREFIX}/etc -DOCDIR= ${PREFIX}/share/doc/surfraw -EGDIR= ${PREFIX}/share/examples/${PKGBASE} - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -PLIST_SUBST+= PKGBASE=${PKGBASE} - -FILES_SUBST+= PKGBASE=${PKGBASE} -FILES_SUBST+= SURFRAW_SYSCONFDIR=${SURFRAW_SYSCONFDIR} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= ECHO=${ECHO:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= TR=${TR:Q} -FILES_SUBST+= TRUE=${TRUE:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +DOCDIR= ${PREFIX}/share/doc/surfraw +EGDIR= ${PREFIX}/share/examples/${PKGBASE} + +CONF_FILES= ${EGDIR}/surfraw.conf ${CONFDIR}/surfraw.conf +SUPPORT_FILES= ${EGDIR}/surfraw_elvi.list ${CONFDIR}/surfraw_elvi.list + +PLIST_SUBST+= PKGBASE=${PKGBASE} pre-install: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: @@ -55,4 +38,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/thttpd/DEINSTALL b/www/thttpd/DEINSTALL deleted file mode 100644 index 38428f4a9c7..00000000000 --- a/www/thttpd/DEINSTALL +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/11/01 02:18:57 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples -CONFDIR=/etc -CONFFILES="thttpd.conf" - -case ${STAGE} in -DEINSTALL) - # Remove configuration files if they don't differ from the default - # config file. - # - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - SAMPLEFILE=${SAMPLECONFDIR}/${file} - if ${CMP} -s ${FILE} ${SAMPLEFILE} - then - ${RM} -f ${FILE} - fi - done - ;; - -POST-DEINSTALL) - modified_files='' - for file in ${CONFFILES} - do - FILE=${CONFDIR}/${file} - if [ -f ${FILE} ] - then - modified_files="${modified_files} ${FILE}" - fi - done - - if [ -n "${modified_files}" ] - then - ${CAT} << EOF -=========================================================================== -If you won't be using ${PKGNAME} any longer, you may want to remove the -following files: - -EOF - for file in ${modified_files} - do - echo " ${file}" - done - ${CAT} << EOF -=========================================================================== -EOF - fi - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/thttpd/INSTALL b/www/thttpd/INSTALL deleted file mode 100644 index 26bd2bbe4ef..00000000000 --- a/www/thttpd/INSTALL +++ /dev/null @@ -1,56 +0,0 @@ -#! /bin/sh -# -# $NetBSD: INSTALL,v 1.1 2001/11/01 02:18:57 zuntum Exp $ - -PKGNAME=$1 -STAGE=$2 - -CAT="@CAT@" -CHMOD="@CHMOD@" -CP="@CP@" - -SAMPLECONFDIR=${PKG_PREFIX}/share/examples -CONFDIR=/etc -CONFFILES="thttpd.conf" - -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 -=========================================================================== -EOF - ;; - -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/www/thttpd/MESSAGE b/www/thttpd/MESSAGE index dd436d03907..2a185db797a 100644 --- a/www/thttpd/MESSAGE +++ b/www/thttpd/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2001/11/01 02:18:57 zuntum Exp $ +$NetBSD: MESSAGE,v 1.2 2001/11/19 16:23:16 jlam Exp $ In order to use makeweb: @@ -7,5 +7,4 @@ In order to use makeweb: chmod 2755 makeweb The suggested group is "www". - =========================================================================== diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile index 0a13b4759ca..8865790e657 100644 --- a/www/thttpd/Makefile +++ b/www/thttpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/07/13 07:09:27 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/11/19 16:23:16 jlam Exp $ DISTNAME= thttpd-2.21b CATEGORIES= www @@ -16,35 +16,27 @@ GNU_CONFIGURE= # defined # Note: this pkg auto-detects IPv6 without regarding USE_INET6. BUILD_DEFS+= USE_INET6 -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST= CAT=${CAT:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CP=${CP:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} +EGDIR= ${PREFIX}/share/examples +CONF_FILES= ${EGDIR}/thttpd.conf ${CONFDIR}/thttpd.conf +RCD_SCRIPTS= ${PREFIX}/etc/rc.d/thttpd /etc/rc.d/thttpd pre-configure: ${MV} ${WRKSRC}/extras/htpasswd.1 ${WRKSRC}/extras/thtpasswd.1 ${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thtpasswd.c - for file in thttpd.8 extras/Makefile.in extras/thtpasswd.c; do \ - ${MV} -f ${WRKSRC}/$${file} ${WRKSRC}/$${file}.bak; \ - ${SED} -e "s,htpasswd,thtpasswd,g" \ - < ${WRKSRC}/$${file}.bak > ${WRKSRC}/$${file}; \ + for file in thttpd.8 extras/Makefile.in extras/thtpasswd.c; do \ + ${MV} -f ${WRKSRC}/$${file} ${WRKSRC}/$${file}.bak; \ + ${SED} -e "s,htpasswd,thtpasswd,g" \ + ${WRKSRC}/$${file}.bak > ${WRKSRC}/$${file}; \ done post-build: - for file in thttpd.conf thttpd.sh; do \ - ${SED} -e "s,@PREFIX@,${PREFIX},g" \ - < ${FILESDIR}/$${file} > ${WRKDIR}/$${file}; \ + for file in thttpd.conf thttpd.sh; do \ + ${SED} ${FILES_SUBST_SED} \ + ${FILESDIR}/$${file} > ${WRKDIR}/$${file}; \ done pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/thttpd - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL post-install: @@ -54,4 +46,5 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/thttpd/files/thttpd.sh b/www/thttpd/files/thttpd.sh index 5b8ef544608..d5ffb3848c1 100644 --- a/www/thttpd/files/thttpd.sh +++ b/www/thttpd/files/thttpd.sh @@ -1,54 +1,26 @@ #!/bin/sh # -# $NetBSD: thttpd.sh,v 1.4 2001/01/14 06:14:13 jlam Exp $ +# $NetBSD: thttpd.sh,v 1.5 2001/11/19 16:23:17 jlam Exp $ # # PROVIDE: thttpd # REQUIRE: DAEMON +if [ -d /etc/rc.d -a -f /etc/rc.subr ] +then + . /etc/rc.subr +fi + name="thttpd" +rcvar=$name command=@PREFIX@/sbin/${name} +command_args="-C @CONFDIR@/${name}.conf" +required_files="@CONFDIR@/${name}.conf" -pid=`ps -ax | awk '{print $1,$5}' | grep ${name} | awk '{print $1}'` - -cmd=${1:-start} - -case ${cmd} in -start) - if [ "$pid" = "" -a -x ${command} -a -f /etc/${name}.conf ] - then - echo "Starting ${name}." - ${command} -C /etc/${name}.conf - fi - ;; - -stop) - if [ "$pid" != "" ] - then - echo "Stopping ${name}." - kill -TERM ${pid} - else - echo "${name} not running?" - fi - ;; - -restart) - ( $0 stop ) - sleep 1 - $0 start - ;; - -status) - if [ "$pid" != "" ] - then - echo "${name} is running as pid ${pid}." - else - echo "${name} is not running." - fi - ;; +if [ ! -d /etc/rc.d ] +then + @ECHO@ -n " ${name}" + exec ${command} ${thttpd_flags} ${command_args} +fi -*) - echo 1>&2 "Usage: ${name} [restart|start|stop|status]" - exit 1 - ;; -esac -exit 0 +load_rc_config $name +run_rc_command "$1" |