summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/ap-ssl/Makefile24
-rw-r--r--www/apache/Makefile27
-rw-r--r--www/apache6/Makefile17
-rw-r--r--www/apc-gui/Makefile10
-rw-r--r--www/cvsweb/Makefile9
-rw-r--r--www/horde/Makefile9
-rw-r--r--www/php4/Makefile4
-rw-r--r--www/surfraw/Makefile8
-rw-r--r--www/thttpd/Makefile4
9 files changed, 48 insertions, 64 deletions
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 7282528618b..213b749d40a 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/11/19 16:23:12 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2001/11/25 18:59:48 jlam Exp $
DISTNAME= mod_ssl-2.8.5-1.3.22
PKGNAME= ap-ssl-2.8.5
@@ -24,29 +24,27 @@ CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs
CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR}
MAKE_ENV+= SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib"
-APACHE_SYSCONFDIR?= ${CONFDIR}/httpd
-BUILD_DEFS+= APACHE_SYSCONFDIR
-FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?= httpd
EGDIR= ${PREFIX}/share/examples/mod_ssl
CONF_FILES= ${EGDIR}/apache_start.conf \
- ${APACHE_SYSCONFDIR}/apache_start.conf
+ ${PKG_SYSCONFDIR}/apache_start.conf
SUPPORT_FILES= ${EGDIR}/ssl.crl/Makefile.crl \
- ${APACHE_SYSCONFDIR}/ssl.crl/Makefile.crl
+ ${PKG_SYSCONFDIR}/ssl.crl/Makefile.crl
SUPPORT_FILES+= ${EGDIR}/ssl.crl/README.CRL \
- ${APACHE_SYSCONFDIR}/ssl.crl/README.CRL
+ ${PKG_SYSCONFDIR}/ssl.crl/README.CRL
SUPPORT_FILES+= ${EGDIR}/ssl.crt/Makefile.crt \
- ${APACHE_SYSCONFDIR}/ssl.crt/Makefile.crt
+ ${PKG_SYSCONFDIR}/ssl.crt/Makefile.crt
SUPPORT_FILES+= ${EGDIR}/ssl.crt/README.CRT \
- ${APACHE_SYSCONFDIR}/ssl.crt/README.CRT
+ ${PKG_SYSCONFDIR}/ssl.crt/README.CRT
SUPPORT_FILES+= ${EGDIR}/ssl.crt/ca-bundle.crt \
- ${APACHE_SYSCONFDIR}/ssl.crt/ca-bundle.crt
+ ${PKG_SYSCONFDIR}/ssl.crt/ca-bundle.crt
SUPPORT_FILES+= ${EGDIR}/ssl.csr/README.CSR \
- ${APACHE_SYSCONFDIR}/ssl.csr/README.CSR
+ ${PKG_SYSCONFDIR}/ssl.csr/README.CSR
SUPPORT_FILES+= ${EGDIR}/ssl.key/README.KEY \
- ${APACHE_SYSCONFDIR}/ssl.key/README.KEY
+ ${PKG_SYSCONFDIR}/ssl.key/README.KEY
SUPPORT_FILES+= ${EGDIR}/ssl.prm/README.PRM \
- ${APACHE_SYSCONFDIR}/ssl.prm/README.PRM
+ ${PKG_SYSCONFDIR}/ssl.prm/README.PRM
post-extract:
cd ${WRKSRC}/pkg.contrib; ${MV} -f loadcacert.cgi loadcacert.cgi.in
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 003131181f0..002a8e0c5cf 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2001/11/21 15:44:23 jlam Exp $
+# $NetBSD: Makefile,v 1.84 2001/11/25 18:59:48 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,9 +39,7 @@ CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}"
.include "../../mk/bsd.prefs.mk"
-APACHE_SYSCONFDIR?= ${CONFDIR}/httpd
-BUILD_DEFS+= APACHE_SYSCONFDIR
-FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?= httpd
.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
APACHE_USER?= www
@@ -101,17 +99,16 @@ BUILD_DEFS+= APACHE_SUEXEC
EGDIR= ${PREFIX}/share/examples/httpd
-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
+CONF_FILES= ${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf
+SUPPORT_FILES= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
+SUPPORT_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
RCD_SCRIPTS= 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= ${PKG_SYSCONFDIR}/ssl.crl
+OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.crt
+OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.csr
+OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.key
+OWN_DIRS+= ${PKG_SYSCONFDIR}/ssl.prm
OWN_DIRS+= /var/log/httpd
OWN_DIRS+= /var/spool/httpd
OWN_DIRS_PERMS+= /var/spool/httpd/proxy nobody nobody 0755
@@ -156,9 +153,9 @@ post-install:
.endif
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
for file in httpd.conf magic mime.types; do \
- ${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$${file}.default \
+ ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default \
${PREFIX}/share/examples/httpd; \
- ${RM} -f ${APACHE_SYSCONFDIR}/$${file}.default; \
+ ${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \
done
${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 09e9f96b88c..15a271b86d6 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2001/11/23 10:52:21 martti Exp $
+# $NetBSD: Makefile,v 1.46 2001/11/25 18:59:48 jlam Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -46,9 +46,7 @@ BUILD_DEFS+= USE_INET6
IGNORE= "IPv6 only build"
.endif
-APACHE_SYSCONFDIR?= ${CONFDIR}/httpd
-BUILD_DEFS+= APACHE_SYSCONFDIR
-FILES_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?= httpd
.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
APACHE_USER?= www
@@ -106,12 +104,11 @@ BUILD_DEFS+= APACHE_SUEXEC
EGDIR= ${PREFIX}/share/examples/httpd
-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
+CONF_FILES= ${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf
+SUPPORT_FILES= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
+SUPPORT_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
RCD_SCRIPTS= 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
@@ -151,9 +148,9 @@ post-install:
.endif
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
for file in httpd.conf magic mime.types; do \
- ${INSTALL_DATA} ${APACHE_SYSCONFDIR}/$${file}.default \
+ ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default \
${PREFIX}/share/examples/httpd; \
- ${RM} -f ${APACHE_SYSCONFDIR}/$${file}.default; \
+ ${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \
done
${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index d96e6601e43..b77c551d4e5 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/11/19 16:23:14 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/25 18:59:49 jlam Exp $
DISTNAME= apc_gui-1.0.3
PKGNAME= ${DISTNAME:S/_/-/}
@@ -14,18 +14,14 @@ DEPENDS+= php-gd>=4.0.1:../../graphics/php4-gd
NO_BUILD= YES
-APACHE_SYSCONFDIR?= ${CONFDIR}/httpd
-BUILD_DEFS+= APACHE_SYSCONFDIR
-MESSAGE_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
-
+PKG_SYSCONFSUBDIR?= httpd
APC_GUI_DIR= ${PREFIX}/share/${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
PLIST_SUBST+= PKGBASE=${PKGBASE}
MESSAGE_SUBST+= APC_GUI_DIR=${APC_GUI_DIR}
-CONF_FILES= ${EGDIR}/apc_gui.conf ${APACHE_SYSCONFDIR}/apc_gui.conf
+CONF_FILES= ${EGDIR}/apc_gui.conf ${PKG_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:
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index c6ef9311fa5..bf16030fc76 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,5 +1,5 @@
#
-# $NetBSD: Makefile,v 1.5 2001/11/19 16:23:14 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/25 18:59:49 jlam Exp $
#
DISTNAME= cvsweb-1.112
@@ -22,16 +22,15 @@ INSTALL_FILE= ${WRKDIR}/INSTALL
.include "../../mk/bsd.prefs.mk"
-APACHE_SYSCONFDIR?= ${CONFDIR}/httpd
+PKG_SYSCONFSUBDIR?= httpd
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES= ${EGDIR}/cvsweb.conf.default ${APACHE_SYSCONFDIR}/cvsweb.conf
-MAKE_DIRS= ${APACHE_SYSCONFDIR}
+CONF_FILES= ${EGDIR}/cvsweb.conf.default ${PKG_SYSCONFDIR}/cvsweb.conf
do-build:
${MV} ${WRKSRC}/cvsweb.cgi ${WRKSRC}/cvsweb.cgi.bak
${SED} -e 's,/usr/bin/perl,${PERL5},' \
- -e 's,/usr/local/web/apache/conf/,${APACHE_SYSCONFDIR}/,' \
+ -e 's,/usr/local/web/apache/conf/,${PKG_SYSCONFDIR}/,' \
${WRKSRC}/cvsweb.cgi.bak > ${WRKSRC}/cvsweb.cgi
do-install:
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 0c8f05c2b2f..97425efc322 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/19 16:23:15 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:49 jlam Exp $
DISTNAME= horde-1.2.7
CATEGORIES= www
@@ -21,11 +21,9 @@ MESSAGE_SUBST+= PHPLIBDIR=${PHPLIBDIR}
.include "../../mk/bsd.prefs.mk"
-APACHE_SYSCONFDIR?= ${CONFDIR}/httpd
-BUILD_DEFS+= APACHE_SYSCONFDIR
-MESSAGE_SUBST+= APACHE_SYSCONFDIR=${APACHE_SYSCONFDIR}
+PKG_SYSCONFSUBDIR?= httpd
-CONF_FILES= ${EGDIR}/horde.conf ${APACHE_SYSCONFDIR}/horde.conf
+CONF_FILES= ${EGDIR}/horde.conf ${PKG_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
@@ -35,7 +33,6 @@ 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; \
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 51144daedaa..a24153470ed 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/11/19 16:23:15 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/11/25 18:59:49 jlam Exp $
.include "Makefile.php"
@@ -29,7 +29,7 @@ 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
+CONF_FILES= ${EGDIR}/php.ini-dist ${PKG_SYSCONFDIR}/php.ini
pre-install:
PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index b5bfd1889bb..40d1b058889 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/19 16:23:16 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:50 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=${CONFDIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
# Override sysconfdir so that the installation puts the example config file
# in ${EGDIR}.
@@ -25,8 +25,8 @@ MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}"
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
+CONF_FILES= ${EGDIR}/surfraw.conf ${PKG_SYSCONFDIR}/surfraw.conf
+SUPPORT_FILES= ${EGDIR}/surfraw_elvi.list ${PKG_SYSCONFDIR}/surfraw_elvi.list
PLIST_SUBST+= PKGBASE=${PKGBASE}
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index cde36b933e9..5691f63c6a5 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/21 15:44:24 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:50 jlam Exp $
DISTNAME= thttpd-2.21b
CATEGORIES= www
@@ -17,7 +17,7 @@ GNU_CONFIGURE= # defined
BUILD_DEFS+= USE_INET6
EGDIR= ${PREFIX}/share/examples
-CONF_FILES= ${EGDIR}/thttpd.conf ${CONFDIR}/thttpd.conf
+CONF_FILES= ${EGDIR}/thttpd.conf ${PKG_SYSCONFDIR}/thttpd.conf
RCD_SCRIPTS= thttpd
pre-configure:
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 00:16:08 +0000