diff options
-rw-r--r-- | chat/silc-server/Makefile | 8 | ||||
-rw-r--r-- | comms/efax-gtk/Makefile | 4 | ||||
-rw-r--r-- | games/xconq/Makefile | 4 | ||||
-rw-r--r-- | mail/cyrus-imapd/Makefile | 4 | ||||
-rw-r--r-- | mail/cyrus-imapd21/Makefile | 4 | ||||
-rw-r--r-- | mail/cyrus-imapd22/Makefile | 4 | ||||
-rw-r--r-- | net/jftpgw/Makefile | 4 | ||||
-rw-r--r-- | net/nsd/Makefile | 4 | ||||
-rw-r--r-- | net/pxe/Makefile | 4 | ||||
-rw-r--r-- | sysutils/apcupsd/Makefile | 4 | ||||
-rw-r--r-- | www/ap-jserv/Makefile | 4 | ||||
-rw-r--r-- | www/squidGuard/Makefile | 6 | ||||
-rw-r--r-- | www/wwwoffle/Makefile | 6 |
13 files changed, 30 insertions, 30 deletions
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 636e1095d50..78fd4db5bdb 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/12/28 02:47:41 reed Exp $ +# $NetBSD: Makefile,v 1.37 2004/12/29 15:42:37 minskim Exp $ # DISTNAME= silc-server-0.9.18 @@ -51,15 +51,15 @@ RCD_SCRIPT_SRC.silcd= ${FILESDIR}/silcd.sh RCD_SCRIPT_SRC.silcd= ${FILESDIR}/silcd.generic .endif -OWN_DIRS_PERMS+= /var/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700 +OWN_DIRS_PERMS+= ${VARBASE}/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700 CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE} CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE} CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/${PKGBASE}/modules -CONFIGURE_ARGS+= --with-logsdir=/var/log/silcd -CONFIGURE_ARGS+= --with-silcd-pid-file=/var/run/silcd.pid +CONFIGURE_ARGS+= --with-logsdir=${VARBASE}/log/silcd +CONFIGURE_ARGS+= --with-silcd-pid-file=${VARBASE}/run/silcd.pid CONFIGURE_ARGS+= --without-iconv CONFIGURE_ARGS+= --without-libtoolfix diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index 47fd450b1b7..2d9df574dd4 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/12/03 15:14:52 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2004/12/29 15:42:37 minskim Exp $ DISTNAME= efax-gtk-1.0.1b.src PKGNAME= efax-gtk-1.0.1b @@ -18,7 +18,7 @@ GNU_CONFIGURE= YES USE_BUILDLINK3= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --with-spooldir=/var/spool/efax +CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/spool/efax CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} EGDIR= ${PREFIX}/share/examples/efax-gtk diff --git a/games/xconq/Makefile b/games/xconq/Makefile index 744695b5985..2e29fa4fe5d 100644 --- a/games/xconq/Makefile +++ b/games/xconq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/10/03 00:14:47 tv Exp $ +# $NetBSD: Makefile,v 1.25 2004/12/29 15:42:37 minskim Exp $ DISTNAME= xconq-7.4.1 PKGREVISION= 4 @@ -13,7 +13,7 @@ USE_BUILDLINK3= YES USE_X11BASE= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-alternate-scoresdir=/var/games/xconq/scores +CONFIGURE_ARGS+= --enable-alternate-scoresdir=${VARBASE}/games/xconq/scores CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" CONFIGURE_ARGS+= --with-tkconfig="${BUILDLINK_PREFIX.tk}/lib" diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 301ddaf7165..3b539446ee3 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2004/12/28 02:47:44 reed Exp $ +# $NetBSD: Makefile,v 1.50 2004/12/29 15:42:37 minskim Exp $ DISTNAME= cyrus-imapd-2.0.17 PKGREVISION= 5 @@ -41,7 +41,7 @@ FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP} CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER} CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP} CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus -CONFIGURE_ARGS+= --with-statedir=/var/run +CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run CONFIGURE_ARGS+= --with-dbdir=${BUILDLINK_PREFIX.db3} CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 9904cf21a52..ec0e6111655 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/12/28 02:47:44 reed Exp $ +# $NetBSD: Makefile,v 1.27 2004/12/29 15:42:37 minskim Exp $ DISTNAME= cyrus-imapd-2.1.15 PKGREVISION= 5 @@ -36,7 +36,7 @@ FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP} CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER} CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP} CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus -CONFIGURE_ARGS+= --with-statedir=/var/run +CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} CONFIGURE_ARGS+= --with-perl=${PERL5} diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index 0bc39781118..f724245ec55 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/12/28 02:47:44 reed Exp $ +# $NetBSD: Makefile,v 1.31 2004/12/29 15:42:37 minskim Exp $ DISTNAME= cyrus-imapd-2.2.10 PKGREVISION= 1 @@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER} CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP} CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus -CONFIGURE_ARGS+= --with-statedir=/var/run +CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} CONFIGURE_ARGS+= --with-perl=${PERL5} diff --git a/net/jftpgw/Makefile b/net/jftpgw/Makefile index 041ffbcd940..284246beb31 100644 --- a/net/jftpgw/Makefile +++ b/net/jftpgw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:46 reed Exp $ +# $NetBSD: Makefile,v 1.6 2004/12/29 15:42:38 minskim Exp $ DISTNAME= jftpgw-0.13.4 PKGREVISION= 1 @@ -13,7 +13,7 @@ USE_BUILDLINK3= yes GNU_CONFIGURE= yes USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --with-logpath=/var/log +CONFIGURE_ARGS+= --with-logpath=${VARBASE}/log CONFIGURE_ARGS+= --enable-crypt CONFIGURE_ARGS+= --enable-sftp diff --git a/net/nsd/Makefile b/net/nsd/Makefile index 4b3ca2ea2f9..8ea7fc4a8f2 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/10/03 00:17:56 tv Exp $ +# $NetBSD: Makefile,v 1.26 2004/12/29 15:42:38 minskim Exp $ DISTNAME= nsd-2.1.2 PKGREVISION= 1 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} CONFIGURE_ARGS+=--disable-ipv6 .endif .if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+=--with-pidfile=/var/run/nsd.pid +CONFIGURE_ARGS+=--with-pidfile=${VARBASE}/run/nsd.pid CONFIGURE_ARGS+=--with-user=named CONFIGURE_ARGS+=--with-namedxfer=/usr/libexec/named-xfer .endif diff --git a/net/pxe/Makefile b/net/pxe/Makefile index a0a8ade2677..9b556a45d3c 100644 --- a/net/pxe/Makefile +++ b/net/pxe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:47 reed Exp $ +# $NetBSD: Makefile,v 1.11 2004/12/29 15:42:38 minskim Exp $ # DISTNAME= pxe-1.4 @@ -15,7 +15,7 @@ USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_LANGUAGES= c c++ -CONFIGURE_ARGS+= --with-log=/var/log/pxe.log +CONFIGURE_ARGS+= --with-log=${VARBASE}/log/pxe.log CONFIGURE_ARGS+= --with-config="${PKG_SYSCONFDIR}/pxe.conf" EGDIR= ${PREFIX}/share/examples/pxe diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 8cdf509f64f..1e14fb2218c 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:50 reed Exp $ +# $NetBSD: Makefile,v 1.33 2004/12/29 15:42:38 minskim Exp $ DISTNAME= apcupsd-3.8.6 PKGREVISION= 3 @@ -29,7 +29,7 @@ PKG_SYSCONFSUBDIR= apcupsd CONFIGURE_ARGS+= --with-catgets # use catgets functions CONFIGURE_ARGS+= --enable-nls # i18n support -CONFIGURE_ARGS+= --with-lock-dir=/var/spool/lock +CONFIGURE_ARGS+= --with-lock-dir=${VARBASE}/spool/lock CONFIGURE_ARGS+= --with-serial-dev=/dev/tty01 CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} # configure sets sbindir to '${prefix}/sbin' without expanding $prefix diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile index 6916c343628..f3e4ca0b78f 100644 --- a/www/ap-jserv/Makefile +++ b/www/ap-jserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/01/24 15:23:46 grant Exp $ +# $NetBSD: Makefile,v 1.28 2004/12/29 15:42:38 minskim Exp $ DISTNAME= ApacheJServ-1.1.2 PKGNAME= ap-jserv-1.1.2 @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs CONFIGURE_ARGS+= --with-jdk-home=${PKG_JAVA_HOME} CONFIGURE_ARGS+= --with-JSDK=${PREFIX}/lib/java/jsdk.jar -CONFIGURE_ARGS+= --with-logdir=/var/log/httpd +CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/httpd CONFIGURE_ARGS+= --with-servlets=${LOCALBASE}/share/httpd/servlets CONFIGURE_ARGS+= --enable-EAPI diff --git a/www/squidGuard/Makefile b/www/squidGuard/Makefile index 63fabb74795..fa70aac7345 100644 --- a/www/squidGuard/Makefile +++ b/www/squidGuard/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/10/03 00:18:27 tv Exp $ +# $NetBSD: Makefile,v 1.10 2004/12/29 15:42:38 minskim Exp $ # DISTNAME= squidGuard-1.2.0 @@ -17,8 +17,8 @@ USE_BUILDLINK3= YES CONFIGURE_ARGS+= --with-db-inc=${BUILDLINK_PREFIX.db3}/include/db3 CONFIGURE_ARGS+= --with-db-lib=${BUILDLINK_PREFIX.db3}/lib/db3 CONFIGURE_ARGS+= --with-sg-config=${PKG_SYSCONFDIR}/squidguard/filter.conf -CONFIGURE_ARGS+= --with-sg-logdir=/var/squidguard/log -CONFIGURE_ARGS+= --with-sg-dbhome=/var/squidguard/db +CONFIGURE_ARGS+= --with-sg-logdir=${VARBASE}/squidguard/log +CONFIGURE_ARGS+= --with-sg-dbhome=${VARBASE}/squidguard/db .include "../../databases/db3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index 080c3ff2f44..7ce72cfdea8 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2004/12/28 02:47:52 reed Exp $ +# $NetBSD: Makefile,v 1.53 2004/12/29 15:42:38 minskim Exp $ DISTNAME= wwwoffle-2.8c PKGREVISION= 1 @@ -17,7 +17,7 @@ USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-spooldir=/var/wwwoffle +CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle PKG_SYSCONFSUBDIR= wwwoffle PLIST_SUBST+= GTAR="${GTAR}" @@ -41,7 +41,7 @@ post-build: # target incorrectly calculates to be a pre-2.2 cache. This tricks it # into setting up the cache directory properly. pre-install: - ${MKDIR} /var/wwwoffle/prevtime1 + ${MKDIR} ${VARBASE}/wwwoffle/prevtime1 post-install: if [ -f ${PKG_SYSCONFDIR}/wwwoffle.conf.install ]; then \ |