diff --git a/benchmarks/siege/Makefile b/benchmarks/siege/Makefile index 57db01fa266..0fb259000f4 100644 --- a/benchmarks/siege/Makefile +++ b/benchmarks/siege/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2010/11/15 00:22:49 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT = multi-threaded HTTP benchmark and regression tester DISTNAME = siege-2.70 +REVISION = 0 CATEGORIES = benchmarks www @@ -20,12 +21,13 @@ WANTLIB += c crypto pthread ssl MASTER_SITES = http://spacehopper.org/mirrors/ \ ftp://ftp.joedog.org/pub/siege/ -MAKE_FLAGS = localstatedir='/var/log/siege' +MAKE_FLAGS = localstatedir=${LOCALSTATEDIR} USE_GROFF = Yes +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/log/siege +SYSCONFDIR= ${BASESYSCONFDIR}/siege + CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += --localstatedir=/var/log/siege \ - --sysconfdir=${SYSCONFDIR}/siege post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/siege diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index c60ae04a87c..9a33b09c6a3 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.202 2012/03/26 08:05:01 giovanni Exp $ +# $OpenBSD: Makefile,v 1.203 2012/04/28 10:51:44 ajacoutot Exp $ SHARED_ONLY= Yes @@ -42,13 +42,14 @@ CXXFLAGS= ${CFLAGS} -felide-constructors -fno-exceptions -fno-rtti VMEM_WARNING= Yes +LOCALSTATEDIR= ${DB_DIR} + USE_LIBTOOL= Yes USE_GROFF= Yes CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.63 CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --localstatedir="${DB_DIR}" \ - --with-big-tables \ +CONFIGURE_ARGS+= --with-big-tables \ --with-comment='OpenBSD port: ${FULLPKGNAME-server}' \ --with-libwrap \ --with-low-memory \ diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index 78762662f21..1288b6e737f 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2011/12/02 14:36:14 espie Exp $ +# $OpenBSD: Makefile,v 1.53 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT= game where you deal drugs on the streets of NY @@ -21,6 +21,8 @@ MODULES+= devel/gettext LIB_DEPENDS+= devel/glib2 WANTLIB += gio-2.0 glib-2.0 +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/games + USE_LIBTOOL= Yes USE_GROFF = Yes CONFIGURE_STYLE= gnu @@ -29,8 +31,7 @@ CONFIGURE_ARGS+= --enable-nls \ --without-esd \ --disable-gui-server \ --disable-plugins \ - --disable-sdl \ - --localstatedir="/var/games" + --disable-sdl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/ivan/Makefile b/games/ivan/Makefile index 2fcf20c64bf..3520edf66ea 100644 --- a/games/ivan/Makefile +++ b/games/ivan/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/16 11:23:27 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2012/04/28 10:51:44 ajacoutot Exp $ BROKEN-sparc64= SIGBUS on sparc64 when starting @@ -27,7 +27,7 @@ VMEM_WARNING= Yes USE_GMAKE= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= --localstatedir=/var/games +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/games post-install: ${INSTALL_DATA} /dev/null \ diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile index 888ba93d299..153691c11de 100755 --- a/games/lbreakout2/Makefile +++ b/games/lbreakout2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2011/03/19 13:37:17 benoit Exp $ +# $OpenBSD: Makefile,v 1.22 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT = breakout game with many levels, powerups, good graphics @@ -27,9 +27,10 @@ RUN_DEPENDS = devel/desktop-file-utils USE_GMAKE = Yes +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/games + CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += --localstatedir=/var/games \ - --with-docdir=${PREFIX}/share/doc +CONFIGURE_ARGS += --with-docdir=${PREFIX}/share/doc CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng" \ LDFLAGS="-L${LOCALBASE}/lib" \ LIBS="-lintl -liconv" diff --git a/games/toppler/Makefile b/games/toppler/Makefile index 62583df7017..c87954422d9 100644 --- a/games/toppler/Makefile +++ b/games/toppler/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2010/11/16 11:23:28 espie Exp $ +# $OpenBSD: Makefile,v 1.23 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT= Nebulous rewrite of Tower Toppler @@ -24,7 +24,7 @@ RUN_DEPENDS= devel/desktop-file-utils MODULES= devel/gettext CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --localstatedir=/var/games +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/games USE_LIBTOOL= Yes USE_GROFF = Yes diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index c9d3635cb6f..c6c7b31800a 100755 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2012/02/16 22:29:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.51 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT= API for accessing scanners, backends @@ -37,6 +37,8 @@ USE_GROFF= Yes NO_REGRESS= Yes +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/spool + CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -pthread" \ @@ -44,7 +46,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --sbindir=${PREFIX}/libexec \ --with-docdir=${PREFIX}/share/doc/sane-backends \ - --localstatedir=/var/spool \ --without-gphoto2 \ --with-group=553 \ --disable-latex diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index c467e6a474a..725b12722ed 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.82 2012/04/10 22:31:10 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.83 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT-main= imap server for maildir format mailboxes COMMENT-pop3= pop3 server for maildir format mailboxes @@ -46,9 +46,10 @@ EXAMPLE_DIR= ${PREFIX}/share/examples/courier SUBST_VARS= COURIERSTATE SYSCONFDIR= /etc/courier +LOCALSTATEDIR= ${COURIERSTATE} + CONFIGURE_ARGS= --sbindir=${PREFIX}/sbin \ --datadir=${PREFIX}/sbin \ - --localstatedir=${COURIERSTATE} \ --prefix=${PREFIX} \ --bindir=${PREFIX}/bin \ --mandir=${PREFIX}/man \ diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile index d79964c4cb7..a42d2c11321 100644 --- a/mail/solid-pop3d/Makefile +++ b/mail/solid-pop3d/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2012/03/29 13:38:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.25 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT= flexible POP3 server @@ -19,10 +19,11 @@ WANTLIB= c FLAVORS= apop FLAVOR?= +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/spool/spop3d + SEPARATE_BUILD= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --localstatedir="/var/spool/spop3d" \ - --mandir="${PREFIX}/man" \ +CONFIGURE_ARGS+= --mandir="${PREFIX}/man" \ --enable-last --enable-bulletins --enable-nonip \ --enable-ipv6 --enable-resolve --enable-connect \ --enable-logextend --enable-statistics diff --git a/multimedia/gstreamer-0.10/Makefile.inc b/multimedia/gstreamer-0.10/Makefile.inc index 9d6d91fb37b..bf416da3c17 100644 --- a/multimedia/gstreamer-0.10/Makefile.inc +++ b/multimedia/gstreamer-0.10/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.20 2012/04/05 16:24:35 ajacoutot Exp $ +# $OpenBSD: Makefile.inc,v 1.21 2012/04/28 10:51:44 ajacoutot Exp $ CATEGORIES ?= multimedia devel @@ -36,8 +36,9 @@ BUILD_DEPENDS += devel/bison \ AUTOCONF_VERSION ?= 2.68 CONFIGURE_STYLE ?= autoconf +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/db + CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --localstatedir=/var/db \ --with-default-audiosink=sndiosink \ --with-default-audiosrc=sndiosrc \ --with-default-videosink=xvimagesink \ diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index 15f1fbf1a70..12f161497ae 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2012/03/29 13:38:48 sthen Exp $ +# $OpenBSD: Makefile,v 1.27 2012/04/28 10:51:44 ajacoutot Exp $ SHARED_LIBS += ft 0.0 # .0.0 @@ -28,10 +28,11 @@ WANTLIB= c z MODULES= lang/python +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/flow-tools + CONFIGURE_STYLE= gnu SEPARATE_BUILD= Yes SYSCONFDIR= ${BASESYSCONFDIR}/flow-tools -CONFIGURE_ARGS+= --localstatedir=/var/flow-tools .if !${FLAVOR:L:Mpgsql} CONFIGURE_ARGS+= --without-postgresql diff --git a/net/icinga/core/Makefile b/net/icinga/core/Makefile index 8ec14753617..4564d04b813 100644 --- a/net/icinga/core/Makefile +++ b/net/icinga/core/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2012/03/16 12:39:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.21 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT-main = network monitoring system (improved fork of Nagios) COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI) @@ -38,13 +38,14 @@ RUN_DEPENDS-cgi = FAKE_FLAGS = CFGDIR=${TRUEPREFIX}/share/examples/icinga +LOCALSTATEDIR = ${BASELOCALSTATEDIR}/icinga + CONFIGURE_STYLE = gnu CONFIGURE_STYLE += old # don't override sysconfdir CONFIGURE_ARGS += \ --sysconfdir=${SYSCONFDIR}/icinga \ --datarootdir=/var/www/icinga-cgi \ --libexecdir=${PREFIX}/libexec/nagios \ - --localstatedir=/var/icinga \ --sbindir=/var/www/cgi-bin/icinga \ --with-command-group=www \ --with-cgiurl=/cgi-bin/icinga \ diff --git a/net/icinga/web/Makefile b/net/icinga/web/Makefile index b6020ac3b68..6d9ff667579 100644 --- a/net/icinga/web/Makefile +++ b/net/icinga/web/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2011/12/03 15:01:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2012/04/28 10:51:44 ajacoutot Exp $ # Work in progress. Not yet linked to the build. @@ -18,11 +18,12 @@ RUN_DEPENDS = www/pear \ MAKE_FLAGS = PREFIX=/var/www/icinga-web FAKE_FLAGS = CFGDIR=${TRUEPREFIX}/share/examples/icinga +LOCALSTATEDIR = ${BASELOCALSTATEDIR}/icinga + CONFIGURE_STYLE = gnu CONFIGURE_ENV += PHP="${MODPHP_BIN}" CONFIGURE_ARGS += \ --datarootdir=/var/www \ - --localstatedir=/var/icinga \ --sbindir=/var/www/cgi-bin/icinga \ --with-web-apache-path=/var/www/conf/modules.sample \ --with-api-cmd-file=/var/icinga/rw/icinga.cmd \ diff --git a/net/irc/Makefile b/net/irc/Makefile index 6c9ae3e4f49..166c96c08a9 100644 --- a/net/irc/Makefile +++ b/net/irc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.32 2012/04/28 10:51:44 ajacoutot Exp $ # $FreeBSD: Makefile,v 1.19 1998/12/09 20:15:29 billf Exp $ COMMENT= internet relay chat (irc) server @@ -20,11 +20,12 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c m z +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/run + CONFDIR= ${SYSCONFDIR}/ircd CONFIGURE_STYLE= gnu old MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/support CONFIGURE_ARGS= --logdir="/var/log/ircd" \ - --localstatedir="/var/run" \ --sysconfdir=${CONFDIR} USE_GROFF = Yes diff --git a/net/nagios/nagios/Makefile b/net/nagios/nagios/Makefile index 13ebbc53c1b..eb44612f35a 100644 --- a/net/nagios/nagios/Makefile +++ b/net/nagios/nagios/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2011/12/17 22:01:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.52 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT-main= host and service monitor COMMENT-web= cgis and webpages for nagios @@ -29,10 +29,11 @@ BUILD_DEPENDS= graphics/gd LIB_DEPENDS= devel/libtool,-ltdl RUN_DEPENDS= net/nagios/plugins +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/nagios + CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--datadir=/var/www/nagios \ --libexecdir=${PREFIX}/libexec/nagios \ - --localstatedir=/var/nagios \ --sbindir=/var/www/cgi-bin/nagios \ --with-cgiurl=/cgi-bin/nagios \ --with-checkresult-dir=/var/spool/nagios \ diff --git a/net/nagios/nsca/Makefile b/net/nagios/nsca/Makefile index 448003b20ce..467836c7183 100644 --- a/net/nagios/nsca/Makefile +++ b/net/nagios/nsca/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2011/11/12 00:49:49 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT-main= nagios service check acceptor COMMENT-client= nagios service check acceptor - client @@ -25,10 +25,11 @@ MASTER_SITES= http://spacehopper.org/mirrors/ WANTLIB= c mcrypt>=8 LIB_DEPENDS= security/libmcrypt +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/nagios + CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-nsca-user=_nagios \ - --with-nsca-grp=_nagios \ - --localstatedir=/var/nagios + --with-nsca-grp=_nagios MULTI_PACKAGES= -main -client diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile index 7cab98cbb49..6636dde33d0 100644 --- a/net/nepenthes/Makefile +++ b/net/nepenthes/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2011/09/21 17:20:56 jasper Exp $ +# $OpenBSD: Makefile,v 1.32 2012/04/28 10:51:44 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= determine the malware activity on a network @@ -36,6 +36,8 @@ WANTLIB= c crypto idn m ssl stdc++ pcap z \ FAKE_FLAGS+= localstatedir='/var/nepenthes' \ sysconfdir='${PREFIX}/share/examples' +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/nepenthes + CONFIGURE_STYLE=gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \ -I${LOCALBASE}/include/postgresql" @@ -43,7 +45,6 @@ CONFIGURE_ARGS+=--enable-debug-logging \ --disable-mysql \ --enable-postgre \ --disable-capabilities \ - --localstatedir='/var/nepenthes' \ --with-curl-lib=${PREFIX}/lib FLAVORS= prelude diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 49cdc04c7c9..0d0cb7431bc 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2012/03/31 10:51:47 sthen Exp $ +# $OpenBSD: Makefile,v 1.28 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT= multi-threaded routing daemon @@ -22,6 +22,8 @@ WANTLIB= c curses m readline termcap STATEDIR?= /var/quagga SUBST_VARS= STATEDIR +LOCALSTATEDIR= ${STATEDIR} + BUILD_DEPENDS= lang/gawk USE_GMAKE= Yes USE_LIBTOOL= Yes @@ -30,7 +32,6 @@ SEPARATE_BUILD= Yes CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.68 CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include/quagga \ - --localstatedir=${STATEDIR} \ --enable-user=_quagga \ --enable-group=_quagga \ --enable-vty-group=_quagga \ diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile index f3afe62bd18..02f11830085 100644 --- a/sysutils/freeipmi/Makefile +++ b/sysutils/freeipmi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2012/04/13 20:53:19 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2012/04/28 10:51:44 ajacoutot Exp $ # needs machine/sysarch.h & machine/pio.h ONLY_FOR_ARCHS= amd64 arm i386 @@ -40,8 +40,7 @@ USE_GMAKE= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=${CONFIGURE_SHARED} -CONFIGURE_ARGS+=--disable-dependency-tracking \ - --localstatedir=/var +CONFIGURE_ARGS+=--disable-dependency-tracking CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" FAKE_FLAGS= localstatedir=${PREFIX}/share/examples/freeipmi \ sysconfdir=${PREFIX}/share/examples/freeipmi diff --git a/sysutils/rancid/Makefile b/sysutils/rancid/Makefile index 5405eefd339..3b6edc6d767 100644 --- a/sysutils/rancid/Makefile +++ b/sysutils/rancid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2011/06/02 13:41:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.13 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT = Really Awesome New Cisco confIg Differ @@ -24,10 +24,11 @@ MASTER_SITES = ftp://ftp.shrubbery.net/pub/rancid/ RUN_DEPENDS = lang/expect,no_tk BUILD_DEPENDS = ${RUN_DEPENDS} +LOCALSTATEDIR = ${BASELOCALSTATEDIR}/rancid + AUTOMAKE_VERSION = 1.8 CONFIGURE_STYLE = automake CONFIGURE_ARGS = --prefix=${PREFIX} \ - --localstatedir=/var/rancid/ \ --disable-mk-localstatedir USE_GMAKE = yes diff --git a/textproc/namazu/Makefile b/textproc/namazu/Makefile index d987ad3e480..264701111ea 100644 --- a/textproc/namazu/Makefile +++ b/textproc/namazu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2011/07/19 13:44:19 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT= small to medium scale full-text search engine DISTNAME= namazu-2.0.21 @@ -25,10 +25,11 @@ BUILD_DEPENDS= misc/p5-File-MMagic RUN_DEPENDS= archivers/unzip \ misc/p5-File-MMagic +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/db + USE_LIBTOOL= Yes USE_GROFF = Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=--localstatedir=/var/db CFLAGS+= -I${LOCALBASE}/include FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/namazu diff --git a/www/squid/Makefile b/www/squid/Makefile index c18172963d1..7fadf6b9b6e 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.125 2012/03/29 13:39:00 sthen Exp $ +# $OpenBSD: Makefile,v 1.126 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT= WWW and FTP proxy cache and accelerator @@ -43,6 +43,9 @@ SEPARATE_BUILD= Yes AUTOCONF_VERSION= 2.62 CONFIGURE_STYLE= autoconf MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/cfgaux + +LOCALSTATEDIR= ${SQUIDDIR} + CONFIGURE_ARGS+=--datadir="${PREFIX}/share/squid" \ --enable-auth="${AUTH}" \ --enable-arp-acl \ @@ -56,7 +59,6 @@ CONFIGURE_ARGS+=--datadir="${PREFIX}/share/squid" \ --enable-ssl \ --enable-storeio="${STOREIO}" \ --with-pthreads \ - --localstatedir="${SQUIDDIR}" \ --enable-follow-x-forwarded-for .if ${FLAVOR:L:Mldap} diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile index db606705241..9c8cb40fc94 100644 --- a/www/squidguard/Makefile +++ b/www/squidguard/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2012/04/28 10:51:44 ajacoutot Exp $ COMMENT = filter, redirector and access controller for Squid DISTNAME = squidGuard-1.4 -REVISION = 2 +REVISION = 3 CATEGORIES = www HOMEPAGE = http://www.squidguard.org/ @@ -19,9 +19,9 @@ WANTLIB = c lib/db4/db pthread MASTER_SITES = http://www.squidguard.org/Downloads/ -SG_DIR = /var/db/squidGuard +LOCALSTATEDIR= ${BASELOCALSTATEDIR}/db/squidGuard CONFIG_DIR = ${SYSCONFDIR}/squidguard -SUBST_VARS = SG_DIR CONFIG_DIR +SUBST_VARS = LOCALSTATEDIR CONFIG_DIR LIB_DEPENDS = databases/db/v4 RUN_DEPENDS = www/squid @@ -30,12 +30,10 @@ BUILD_DEPENDS = ${RUN_DEPENDS} CONFIGURE_ENV = CFLAGS='${CFLAGS} -I${LOCALBASE}/include' \ LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' \ ac_cv_path_LYNX=false - CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --with-squiduser='_squid' \ - --localstatedir=${SG_DIR} \ --with-sg-logdir=/var/log/squidguard \ - --with-sg-dbhome=${SG_DIR}/db \ + --with-sg-dbhome=${LOCALSTATEDIR}/db \ --with-sg-config=${CONFIG_DIR}/squidguard.conf \ --with-db-lib=${LOCALBASE}/lib/db4 \ --with-db-inc=${LOCALBASE}/include/db4 diff --git a/www/squidguard/pkg/PLIST b/www/squidguard/pkg/PLIST index 7555da1c75b..f9ad6cd78ed 100644 --- a/www/squidguard/pkg/PLIST +++ b/www/squidguard/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/04/09 23:53:13 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.3 2012/04/28 10:51:44 ajacoutot Exp $ @bin bin/squidGuard share/doc/squidguard/ share/doc/squidguard/LDAPFlow.txt @@ -53,9 +53,9 @@ share/examples/squidguard/squidGuard.cgi @mode 771 @owner _squid @group _squid -@sample ${SG_DIR}/ -@sample ${SG_DIR}/db/ +@sample ${LOCALSTATEDIR}/ +@sample ${LOCALSTATEDIR}/db/ @sample /var/log/squidguard/ @extraunexec rm -fr ${CONFIG_DIR} -@extraunexec rm -fr ${SG_DIR} +@extraunexec rm -fr ${LOCALSTATEDIR} @extraunexec rm -fr /var/log/squidguard/