diff options
32 files changed, 195 insertions, 196 deletions
diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index dfab22a53ea1..864ea3ca8f4c 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -255,7 +255,13 @@ libperl() { fi } -checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl" +prefixvar() { + if test -d ${STAGEDIR}${PREFIX}/var; then + warn "port uses ${PREFIX}/var instead of /var" + fi +} + +checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl prefixvar" ret=0 cd ${STAGEDIR} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 28a16c56e845..7d128f9c102f 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -805,7 +805,8 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # Default: ${PREFIX} # CONFIGURE_ARGS # - Pass these args to configure if ${HAS_CONFIGURE} is set. -# Default: "--prefix=${GNU_CONFIGURE_PREFIX} --infodir=${PREFIX}/${INFO_PATH} +# Default: "--prefix=${GNU_CONFIGURE_PREFIX} +# --infodir=${PREFIX}/${INFO_PATH} --localstatedir=/var # --mandir=${MANPREFIX}/man --build=${CONFIGURE_TARGET}" if # GNU_CONFIGURE is set, "CC=${CC} CFLAGS=${CFLAGS} # PREFIX=${PREFIX} INSTALLPRIVLIB=${PREFIX}/lib @@ -2679,6 +2680,10 @@ HAS_CONFIGURE= yes SET_LATE_CONFIGURE_ARGS= \ _LATE_CONFIGURE_ARGS="" ; \ + if [ -z "${CONFIGURE_ARGS:M--localstatedir=*:Q}" ] && \ + ./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- --localstatedir > /dev/null; then \ + _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --localstatedir=/var" ; \ + fi ; \ if [ ! -z "`./${CONFIGURE_SCRIPT} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \ _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \ fi ; \ diff --git a/audio/ample/Makefile b/audio/ample/Makefile index 395ecad71dfa..e9a4f2040447 100644 --- a/audio/ample/Makefile +++ b/audio/ample/Makefile @@ -10,6 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Allows you to listen to your own MP3's away from home GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" PLIST_FILES= bin/ample man/man1/ample.1.gz man/man5/ample.conf.5.gz \ man/man5/ample.html.5.gz diff --git a/databases/monetdb/Makefile b/databases/monetdb/Makefile index db8d56e0eef2..79e55c7e0fb1 100644 --- a/databases/monetdb/Makefile +++ b/databases/monetdb/Makefile @@ -97,6 +97,7 @@ CONFIGURE_ARGS+= --enable-gdk \ --bindir=${PREFIX}/bin \ --libdir=${MONETDB_LIBDIR} \ --includedir=${MONETDB_INCLUDEDIR} \ + --localstatedir="${PREFIX}/var" \ --docdir=${PREFIX}/${DATADIR} SPHINXCLIENT_CONFIGURE_WITH= sphinxclient diff --git a/devel/global/Makefile b/devel/global/Makefile index 2f58f4c25ef6..06129522dbef 100644 --- a/devel/global/Makefile +++ b/devel/global/Makefile @@ -14,6 +14,7 @@ LICENSE= GPLv3 OPTIONS_DEFINE= DOCS GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" INSTALL_TARGET= install-strip USES= libtool perl5 diff --git a/dns/opendnssec/Makefile b/dns/opendnssec/Makefile index d08ce3806d5c..e8b9249ea10c 100644 --- a/dns/opendnssec/Makefile +++ b/dns/opendnssec/Makefile @@ -15,6 +15,7 @@ BUILD_DEPENDS= ldns>=1.6.16:${PORTSDIR}/dns/ldns LIB_DEPENDS= libldns.so:${PORTSDIR}/dns/ldns GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" USE_RC_SUBR= opendnssec USE_GNOME= libxml2 USES= perl5 diff --git a/dns/opendnssec13/Makefile b/dns/opendnssec13/Makefile index 4ef9b592bc02..c4303e786af2 100644 --- a/dns/opendnssec13/Makefile +++ b/dns/opendnssec13/Makefile @@ -17,6 +17,7 @@ BUILD_DEPENDS= ldns>=1.6.16:${PORTSDIR}/dns/ldns LIB_DEPENDS= libldns.so:${PORTSDIR}/dns/ldns GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" USE_RC_SUBR= opendnssec USE_GNOME= libxml2 USES= perl5 diff --git a/games/acm/Makefile b/games/acm/Makefile index 61f9c5f477b5..ff760c871388 100644 --- a/games/acm/Makefile +++ b/games/acm/Makefile @@ -14,8 +14,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= perl5 -USE_XORG= x11 -GNU_CONFIGURE= yes +USE_XORG= x11 xext +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} \ + --x-includes=${LOCALBASE}/include \ + --x-libraries=${LOCALBASE}/lib CONFIGURE_ENV= ac_cv_lib_Xm_XmCreateBulletinBoard=no \ ac_cv_lib_gdbm_dbm_fetch=no USE_PERL5= build diff --git a/games/acm/files/patch-dis-disgen-configure b/games/acm/files/patch-dis-disgen-configure deleted file mode 100644 index 2b52e1983745..000000000000 --- a/games/acm/files/patch-dis-disgen-configure +++ /dev/null @@ -1,23 +0,0 @@ ---- dis/disgen/configure.orig Mon Jul 16 21:38:36 2007 -+++ dis/disgen/configure Mon Jul 16 21:41:58 2007 -@@ -140,10 +140,20 @@ - EOF - exit 0 ;; - -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ ;; -+ - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile index 2242340af251..002b7fa13a49 100644 --- a/games/wolfpack/Makefile +++ b/games/wolfpack/Makefile @@ -17,8 +17,7 @@ USES= gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes BINDIR= ${PREFIX}/lib/${PORTNAME} -VARDIR= ${PREFIX}/var/${PORTNAME} -CONFIGURE_ARGS+= --bindir=${BINDIR} --sbindir=${BINDIR} +CONFIGURE_ARGS= --bindir=${BINDIR} --sbindir=${BINDIR} --localstatedir="${PREFIX}/var" CONFLICTS_INSTALL= empire-[0-9]* diff --git a/games/xlogical/Makefile b/games/xlogical/Makefile index fe1d597ecf2d..f3c9a7b66291 100644 --- a/games/xlogical/Makefile +++ b/games/xlogical/Makefile @@ -14,11 +14,10 @@ COMMENT= Remake of the classic puzzle game Logical LICENSE= GPLv2 -USES= gmake tar:bzip2 dos2unix -USE_AUTOTOOLS= aclocal automake autoconf -AUTOMAKE_ARGS= --add-missing -USE_SDL= sdl image mixer GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" +USES= autoreconf dos2unix gmake tar:bzip2 +USE_SDL= sdl image mixer OPTIONS_DEFINE= DOCS diff --git a/irc/charybdis/Makefile b/irc/charybdis/Makefile index 94768069429f..e54e1962caac 100644 --- a/irc/charybdis/Makefile +++ b/irc/charybdis/Makefile @@ -2,7 +2,7 @@ PORTNAME= charybdis PORTVERSION= 3.4.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= irc net MASTER_SITES= http://www.stack.nl/~jilles/irc/ \ http://www.bayofrum.net/dist/${PORTNAME}/ @@ -25,17 +25,15 @@ MASTER_SITES:= ${MASTER_SITES} \ PORTDOCS= charybdis-oper-guide.pdf -USE_AUTOTOOLS= autoconf USES= libtool pathfix USE_OPENSSL= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes USERS= ircd GROUPS= ircd -CONFIGURE_ARGS= --with-confdir=${ETCDIR} \ - --with-helpdir=${DATADIR}/help \ - --with-logdir=/var/log/${PORTNAME} \ - --with-moduledir=${DATADIR}/modules \ +CONFIGURE_ARGS= --sysconfdir=${ETCDIR} \ + --with-rundir=/var/run \ + --enable-fhs-paths \ --enable-kqueue OPTIONS_DEFINE= DOCS diff --git a/irc/charybdis/files/charybdis.in b/irc/charybdis/files/charybdis.in index 63fcb6c3bf50..fbb5de99f28d 100644 --- a/irc/charybdis/files/charybdis.in +++ b/irc/charybdis/files/charybdis.in @@ -30,8 +30,7 @@ start_precmd=${name}_prestart charybdis_prestart() { - install -d -o ircd -m755 /var/run/${name} /var/log/${name} /var/db/${name} - chown -R ircd %%ETCDIR%% + chown -R ircd %%ETCDIR%% /var/run/${name} /var/log/${name} /var/db/${name} } run_rc_command $1 diff --git a/irc/charybdis/files/patch-configure b/irc/charybdis/files/patch-configure new file mode 100644 index 000000000000..1c947bf9ad59 --- /dev/null +++ b/irc/charybdis/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2012-12-31 21:47:31 UTC ++++ configure +@@ -5411,7 +5411,7 @@ if test "x$enable_fhs_paths" = "xyes"; t + pkglibexecdir='${libexecdir}/${PACKAGE_TARNAME}' + rundir=${rundir-'${prefix}/run'} + pkgrundir='${rundir}/${PACKAGE_TARNAME}' +- pkglocalstatedir='${localstatedir}/${PACKAGE_TARNAME}' ++ pkglocalstatedir='${localstatedir}/db/${PACKAGE_TARNAME}' + else + libexecdir='${bindir}' + pkglibexecdir='${libexecdir}' diff --git a/irc/charybdis/files/patch-configure-ac b/irc/charybdis/files/patch-configure-ac deleted file mode 100644 index 61d9cc1788c1..000000000000 --- a/irc/charybdis/files/patch-configure-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2013-01-02 14:54:13.907049431 +0000 -+++ configure.ac 2013-01-02 15:00:16.779052086 +0000 -@@ -247,7 +247,7 @@ - rundir='${sysconfdir}' - pkgrundir='${rundir}' - localstatedir='${prefix}' -- pkglocalstatedir='${sysconfdir}']) -+ pkglocalstatedir='/var/db/${PACKAGE_TARNAME}']) - pkglibdir='${libdir}/${PACKAGE_TARNAME}' - AC_SUBST([pkglibdir]) - AC_SUBST([rundir]) diff --git a/irc/charybdis/pkg-plist b/irc/charybdis/pkg-plist index d21b07222bd7..840998df0432 100644 --- a/irc/charybdis/pkg-plist +++ b/irc/charybdis/pkg-plist @@ -1,18 +1,147 @@ -bin/bandb bin/bantool bin/convertilines bin/convertklines bin/genssl.sh bin/ircd bin/mkpasswd -bin/ssld bin/viconf bin/vimotd -etc/charybdis/example.conf -@sample etc/charybdis/ircd.motd.sample +%%ETCDIR%%/example.conf +@sample %%ETCDIR%%/ircd.motd.sample %%ETCDIR%%/reference.conf +lib/charybdis/modules/autoload/m_accept.so +lib/charybdis/modules/autoload/m_admin.so +lib/charybdis/modules/autoload/m_away.so +lib/charybdis/modules/autoload/m_cap.so +lib/charybdis/modules/autoload/m_capab.so +lib/charybdis/modules/autoload/m_certfp.so +lib/charybdis/modules/autoload/m_challenge.so +lib/charybdis/modules/autoload/m_chghost.so +lib/charybdis/modules/autoload/m_close.so +lib/charybdis/modules/autoload/m_cmessage.so +lib/charybdis/modules/autoload/m_connect.so +lib/charybdis/modules/autoload/m_dline.so +lib/charybdis/modules/autoload/m_encap.so +lib/charybdis/modules/autoload/m_etrace.so +lib/charybdis/modules/autoload/m_help.so +lib/charybdis/modules/autoload/m_info.so +lib/charybdis/modules/autoload/m_invite.so +lib/charybdis/modules/autoload/m_ison.so +lib/charybdis/modules/autoload/m_kline.so +lib/charybdis/modules/autoload/m_knock.so +lib/charybdis/modules/autoload/m_links.so +lib/charybdis/modules/autoload/m_list.so +lib/charybdis/modules/autoload/m_locops.so +lib/charybdis/modules/autoload/m_lusers.so +lib/charybdis/modules/autoload/m_map.so +lib/charybdis/modules/autoload/m_monitor.so +lib/charybdis/modules/autoload/m_motd.so +lib/charybdis/modules/autoload/m_names.so +lib/charybdis/modules/autoload/m_oper.so +lib/charybdis/modules/autoload/m_operspy.so +lib/charybdis/modules/autoload/m_pass.so +lib/charybdis/modules/autoload/m_ping.so +lib/charybdis/modules/autoload/m_pong.so +lib/charybdis/modules/autoload/m_post.so +lib/charybdis/modules/autoload/m_privs.so +lib/charybdis/modules/autoload/m_rehash.so +lib/charybdis/modules/autoload/m_restart.so +lib/charybdis/modules/autoload/m_resv.so +lib/charybdis/modules/autoload/m_sasl.so +lib/charybdis/modules/autoload/m_scan.so +lib/charybdis/modules/autoload/m_services.so +lib/charybdis/modules/autoload/m_set.so +lib/charybdis/modules/autoload/m_signon.so +lib/charybdis/modules/autoload/m_snote.so +lib/charybdis/modules/autoload/m_stats.so +lib/charybdis/modules/autoload/m_svinfo.so +lib/charybdis/modules/autoload/m_tb.so +lib/charybdis/modules/autoload/m_testline.so +lib/charybdis/modules/autoload/m_testmask.so +lib/charybdis/modules/autoload/m_tginfo.so +lib/charybdis/modules/autoload/m_time.so +lib/charybdis/modules/autoload/m_topic.so +lib/charybdis/modules/autoload/m_trace.so +lib/charybdis/modules/autoload/m_unreject.so +lib/charybdis/modules/autoload/m_user.so +lib/charybdis/modules/autoload/m_userhost.so +lib/charybdis/modules/autoload/m_users.so +lib/charybdis/modules/autoload/m_version.so +lib/charybdis/modules/autoload/m_wallops.so +lib/charybdis/modules/autoload/m_who.so +lib/charybdis/modules/autoload/m_whois.so +lib/charybdis/modules/autoload/m_whowas.so +lib/charybdis/modules/autoload/m_xline.so +lib/charybdis/modules/autoload/sno_routing.so +lib/charybdis/modules/extensions/chm_adminonly.so +lib/charybdis/modules/extensions/chm_operonly.so +lib/charybdis/modules/extensions/chm_operonly_compat.so +lib/charybdis/modules/extensions/chm_quietunreg_compat.so +lib/charybdis/modules/extensions/chm_sslonly.so +lib/charybdis/modules/extensions/chm_sslonly_compat.so +lib/charybdis/modules/extensions/createauthonly.so +lib/charybdis/modules/extensions/createoperonly.so +lib/charybdis/modules/extensions/example_module.so +lib/charybdis/modules/extensions/extb_account.so +lib/charybdis/modules/extensions/extb_canjoin.so +lib/charybdis/modules/extensions/extb_channel.so +lib/charybdis/modules/extensions/extb_extgecos.so +lib/charybdis/modules/extensions/extb_oper.so +lib/charybdis/modules/extensions/extb_realname.so +lib/charybdis/modules/extensions/extb_server.so +lib/charybdis/modules/extensions/extb_ssl.so +lib/charybdis/modules/extensions/extb_usermode.so +lib/charybdis/modules/extensions/force_user_invis.so +lib/charybdis/modules/extensions/hurt.so +lib/charybdis/modules/extensions/ip_cloaking.so +lib/charybdis/modules/extensions/ip_cloaking_3.0.so +lib/charybdis/modules/extensions/ip_cloaking_4.0.so +lib/charybdis/modules/extensions/ip_cloaking_old.so +lib/charybdis/modules/extensions/m_42.so +lib/charybdis/modules/extensions/m_adminwall.so +lib/charybdis/modules/extensions/m_findforwards.so +lib/charybdis/modules/extensions/m_identify.so +lib/charybdis/modules/extensions/m_mkpasswd.so +lib/charybdis/modules/extensions/m_ojoin.so +lib/charybdis/modules/extensions/m_okick.so +lib/charybdis/modules/extensions/m_olist.so +lib/charybdis/modules/extensions/m_omode.so +lib/charybdis/modules/extensions/m_opme.so +lib/charybdis/modules/extensions/m_remove.so +lib/charybdis/modules/extensions/m_roleplay.so +lib/charybdis/modules/extensions/m_sendbans.so +lib/charybdis/modules/extensions/m_webirc.so +lib/charybdis/modules/extensions/no_locops.so +lib/charybdis/modules/extensions/no_oper_invis.so +lib/charybdis/modules/extensions/override.so +lib/charybdis/modules/extensions/sno_farconnect.so +lib/charybdis/modules/extensions/sno_globalkline.so +lib/charybdis/modules/extensions/sno_globaloper.so +lib/charybdis/modules/extensions/sno_whois.so +lib/charybdis/modules/extensions/spy_admin_notice.so +lib/charybdis/modules/extensions/spy_info_notice.so +lib/charybdis/modules/extensions/spy_links_notice.so +lib/charybdis/modules/extensions/spy_motd_notice.so +lib/charybdis/modules/extensions/spy_stats_notice.so +lib/charybdis/modules/extensions/spy_stats_p_notice.so +lib/charybdis/modules/extensions/spy_trace_notice.so +lib/charybdis/modules/m_ban.so +lib/charybdis/modules/m_die.so +lib/charybdis/modules/m_error.so +lib/charybdis/modules/m_join.so +lib/charybdis/modules/m_kick.so +lib/charybdis/modules/m_kill.so +lib/charybdis/modules/m_message.so +lib/charybdis/modules/m_mode.so +lib/charybdis/modules/m_nick.so +lib/charybdis/modules/m_part.so +lib/charybdis/modules/m_quit.so +lib/charybdis/modules/m_server.so +lib/charybdis/modules/m_squit.so lib/libratbox.so libdata/pkgconfig/libratbox.pc +libexec/charybdis/bandb +libexec/charybdis/ssld man/man8/ircd.8.gz %%DATADIR%%/help/opers/accept %%DATADIR%%/help/opers/admin @@ -146,134 +275,6 @@ man/man8/ircd.8.gz %%DATADIR%%/help/users/who %%DATADIR%%/help/users/whois %%DATADIR%%/help/users/whowas -%%DATADIR%%/modules/autoload/m_accept.so -%%DATADIR%%/modules/autoload/m_admin.so -%%DATADIR%%/modules/autoload/m_away.so -%%DATADIR%%/modules/autoload/m_cap.so -%%DATADIR%%/modules/autoload/m_capab.so -%%DATADIR%%/modules/autoload/m_certfp.so -%%DATADIR%%/modules/autoload/m_challenge.so -%%DATADIR%%/modules/autoload/m_chghost.so -%%DATADIR%%/modules/autoload/m_close.so -%%DATADIR%%/modules/autoload/m_cmessage.so -%%DATADIR%%/modules/autoload/m_connect.so -%%DATADIR%%/modules/autoload/m_dline.so -%%DATADIR%%/modules/autoload/m_encap.so -%%DATADIR%%/modules/autoload/m_etrace.so -%%DATADIR%%/modules/autoload/m_help.so -%%DATADIR%%/modules/autoload/m_info.so -%%DATADIR%%/modules/autoload/m_invite.so -%%DATADIR%%/modules/autoload/m_ison.so -%%DATADIR%%/modules/autoload/m_kline.so -%%DATADIR%%/modules/autoload/m_knock.so -%%DATADIR%%/modules/autoload/m_links.so -%%DATADIR%%/modules/autoload/m_list.so -%%DATADIR%%/modules/autoload/m_locops.so -%%DATADIR%%/modules/autoload/m_lusers.so -%%DATADIR%%/modules/autoload/m_map.so -%%DATADIR%%/modules/autoload/m_monitor.so -%%DATADIR%%/modules/autoload/m_motd.so -%%DATADIR%%/modules/autoload/m_names.so -%%DATADIR%%/modules/autoload/m_oper.so -%%DATADIR%%/modules/autoload/m_operspy.so -%%DATADIR%%/modules/autoload/m_pass.so -%%DATADIR%%/modules/autoload/m_ping.so -%%DATADIR%%/modules/autoload/m_pong.so -%%DATADIR%%/modules/autoload/m_post.so -%%DATADIR%%/modules/autoload/m_privs.so -%%DATADIR%%/modules/autoload/m_rehash.so -%%DATADIR%%/modules/autoload/m_restart.so -%%DATADIR%%/modules/autoload/m_resv.so -%%DATADIR%%/modules/autoload/m_sasl.so -%%DATADIR%%/modules/autoload/m_scan.so -%%DATADIR%%/modules/autoload/m_services.so -%%DATADIR%%/modules/autoload/m_set.so -%%DATADIR%%/modules/autoload/m_signon.so -%%DATADIR%%/modules/autoload/m_snote.so -%%DATADIR%%/modules/autoload/m_stats.so -%%DATADIR%%/modules/autoload/m_svinfo.so -%%DATADIR%%/modules/autoload/m_tb.so -%%DATADIR%%/modules/autoload/m_testline.so -%%DATADIR%%/modules/autoload/m_testmask.so -%%DATADIR%%/modules/autoload/m_tginfo.so -%%DATADIR%%/modules/autoload/m_time.so -%%DATADIR%%/modules/autoload/m_topic.so -%%DATADIR%%/modules/autoload/m_trace.so -%%DATADIR%%/modules/autoload/m_unreject.so -%%DATADIR%%/modules/autoload/m_user.so -%%DATADIR%%/modules/autoload/m_userhost.so -%%DATADIR%%/modules/autoload/m_users.so -%%DATADIR%%/modules/autoload/m_version.so -%%DATADIR%%/modules/autoload/m_wallops.so -%%DATADIR%%/modules/autoload/m_who.so -%%DATADIR%%/modules/autoload/m_whois.so -%%DATADIR%%/modules/autoload/m_whowas.so -%%DATADIR%%/modules/autoload/m_xline.so -%%DATADIR%%/modules/autoload/sno_routing.so -%%DATADIR%%/modules/extensions/chm_adminonly.so -%%DATADIR%%/modules/extensions/chm_operonly.so -%%DATADIR%%/modules/extensions/chm_operonly_compat.so -%%DATADIR%%/modules/extensions/chm_quietunreg_compat.so -%%DATADIR%%/modules/extensions/chm_sslonly.so -%%DATADIR%%/modules/extensions/chm_sslonly_compat.so -%%DATADIR%%/modules/extensions/createauthonly.so -%%DATADIR%%/modules/extensions/createoperonly.so -%%DATADIR%%/modules/extensions/example_module.so -%%DATADIR%%/modules/extensions/extb_account.so -%%DATADIR%%/modules/extensions/extb_canjoin.so -%%DATADIR%%/modules/extensions/extb_channel.so -%%DATADIR%%/modules/extensions/extb_extgecos.so -%%DATADIR%%/modules/extensions/extb_oper.so -%%DATADIR%%/modules/extensions/extb_realname.so -%%DATADIR%%/modules/extensions/extb_server.so -%%DATADIR%%/modules/extensions/extb_ssl.so -%%DATADIR%%/modules/extensions/extb_usermode.so -%%DATADIR%%/modules/extensions/force_user_invis.so -%%DATADIR%%/modules/extensions/hurt.so -%%DATADIR%%/modules/extensions/ip_cloaking.so -%%DATADIR%%/modules/extensions/ip_cloaking_3.0.so -%%DATADIR%%/modules/extensions/ip_cloaking_4.0.so -%%DATADIR%%/modules/extensions/ip_cloaking_old.so -%%DATADIR%%/modules/extensions/m_42.so -%%DATADIR%%/modules/extensions/m_adminwall.so -%%DATADIR%%/modules/extensions/m_findforwards.so -%%DATADIR%%/modules/extensions/m_identify.so -%%DATADIR%%/modules/extensions/m_mkpasswd.so -%%DATADIR%%/modules/extensions/m_ojoin.so -%%DATADIR%%/modules/extensions/m_okick.so -%%DATADIR%%/modules/extensions/m_olist.so -%%DATADIR%%/modules/extensions/m_omode.so -%%DATADIR%%/modules/extensions/m_opme.so -%%DATADIR%%/modules/extensions/m_remove.so -%%DATADIR%%/modules/extensions/m_roleplay.so -%%DATADIR%%/modules/extensions/m_sendbans.so -%%DATADIR%%/modules/extensions/m_webirc.so -%%DATADIR%%/modules/extensions/no_locops.so -%%DATADIR%%/modules/extensions/no_oper_invis.so -%%DATADIR%%/modules/extensions/override.so -%%DATADIR%%/modules/extensions/sno_farconnect.so -%%DATADIR%%/modules/extensions/sno_globalkline.so -%%DATADIR%%/modules/extensions/sno_globaloper.so -%%DATADIR%%/modules/extensions/sno_whois.so -%%DATADIR%%/modules/extensions/spy_admin_notice.so -%%DATADIR%%/modules/extensions/spy_info_notice.so -%%DATADIR%%/modules/extensions/spy_links_notice.so -%%DATADIR%%/modules/extensions/spy_motd_notice.so -%%DATADIR%%/modules/extensions/spy_stats_notice.so -%%DATADIR%%/modules/extensions/spy_stats_p_notice.so -%%DATADIR%%/modules/extensions/spy_trace_notice.so -%%DATADIR%%/modules/m_ban.so -%%DATADIR%%/modules/m_die.so -%%DATADIR%%/modules/m_error.so -%%DATADIR%%/modules/m_join.so -%%DATADIR%%/modules/m_kick.so -%%DATADIR%%/modules/m_kill.so -%%DATADIR%%/modules/m_message.so -%%DATADIR%%/modules/m_mode.so -%%DATADIR%%/modules/m_nick.so -%%DATADIR%%/modules/m_part.so -%%DATADIR%%/modules/m_quit.so -%%DATADIR%%/modules/m_server.so -%%DATADIR%%/modules/m_squit.so @dir /var/log/charybdis @dir /var/db/charybdis +@dir /var/run/charybdis diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index ed5408243bf9..062febb5e682 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -33,6 +33,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_prog_EMACS=no ac_cv_prog_AWK=gawk CONFIGURE_ARGS= --enable-generational-gc=no \ --enable-gtk=no \ + --localstatedir="${PREFIX}/var" \ --with-emacs=no \ --with-gmp=no USE_LDCONFIG= yes diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 29b2c87c7bfa..90c5f6f2695b 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -49,6 +49,7 @@ PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS= --sysconfdir=${CONFDIR} \ + --localstatedir="${PREFIX}/var" \ --datadir=${DATADIR} \ --libexecdir=${LIBEXECDIR} \ --enable-workarounds-for-imap-client-bugs \ diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile index a6eec21456c1..b8cf5d2292f1 100644 --- a/mail/gnarwl/Makefile +++ b/mail/gnarwl/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed USES= iconv gmake tar:tgz USE_OPENLDAP= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-docdir=${DOCSDIR} +CONFIGURE_ARGS= --with-docdir=${DOCSDIR} --localstatedir="${PREFIX}/var" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index f645ed44c95f..10c6ac61a02f 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -36,6 +36,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL=${PERL} PERL5LIB=${PREFIX}/smokeping/lib CONFIGURE_ARGS+= \ --sysconfdir=${ETCDIR} \ + --localstatedir="${PREFIX}/var" \ --with-htdocs-dir=${PREFIX}/smokeping/htdocs \ --libdir=${PREFIX}/smokeping/lib HTDOCSDIR= ${PREFIX}/smokeping/htdocs diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile index 32e78ba93a02..810b3322dfcf 100644 --- a/net/ndisc6/Makefile +++ b/net/ndisc6/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 USES= tar:bzip2 perl5 USE_GCC= any GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-suid-install +CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var" CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl MAKE_ENV= CHOWNPROG=: diff --git a/security/krb5-111/Makefile b/security/krb5-111/Makefile index 79f26e149b83..cbfc4d94ff14 100644 --- a/security/krb5-111/Makefile +++ b/security/krb5-111/Makefile @@ -32,7 +32,8 @@ USE_PERL5= build USE_LDCONFIG= yes USE_CSTD= gnu99 GNU_CONFIGURE= yes -CONFIGURE_ARGS?= --without-system-verto --disable-rpath +CONFIGURE_ARGS?= --without-system-verto --disable-rpath \ + --localstatedir="${PREFIX}/var" CONFIGURE_ENV= NSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" diff --git a/security/krb5-112/Makefile b/security/krb5-112/Makefile index 8517c6783778..65f9c7a794c4 100644 --- a/security/krb5-112/Makefile +++ b/security/krb5-112/Makefile @@ -30,7 +30,7 @@ USE_CSTD= gnu99 GNU_CONFIGURE= yes USES= cpe gettext gmake perl5 libtool:build CONFIGURE_ARGS?= --enable-shared --without-system-verto \ - --disable-rpath + --disable-rpath --localstatedir="${PREFIX}/var" CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" diff --git a/security/krb5/Makefile b/security/krb5/Makefile index e3c02d930a1b..4563d5f76fd9 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -28,7 +28,7 @@ USE_CSTD= gnu99 GNU_CONFIGURE= yes USES= cpe gettext gmake perl5 libtool:build CONFIGURE_ARGS?= --enable-shared --without-system-verto \ - --disable-rpath + --disable-rpath --localstatedir="${PREFIX}/var" CONFIGURE_ENV= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" YACC="${YACC}" MAKE_ARGS= INSTALL="${INSTALL}" INSTALL_LIB="${INSTALL_LIB}" diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile index da5996ee9749..34b64414c951 100644 --- a/security/nessus-libnasl/Makefile +++ b/security/nessus-libnasl/Makefile @@ -21,6 +21,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libnessus.so:${PORTSDIR}/security/nessus-libraries GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" USES= bison libtool USE_LDCONFIG= yes USE_OPENSSL= yes diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile index 840070f613c5..d15bdc7262a7 100644 --- a/security/nessus-libraries/Makefile +++ b/security/nessus-libraries/Makefile @@ -21,7 +21,7 @@ COMMENT= Libraries for Nessus, the security scanner LICENSE= LGPL20 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-cipher +CONFIGURE_ARGS= --enable-cipher --localstatedir="${PREFIX}/var" .if defined(WITH_NESSUS_BPF_SHARE) CONFIGURE_ARGS+= --enable-bpf-sharing .endif diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile index 418211d86d9d..1603c343b9e5 100644 --- a/security/nessus-plugins/Makefile +++ b/security/nessus-plugins/Makefile @@ -24,7 +24,7 @@ USES= libtool WRKSRC= ${WRKDIR}/nessus-plugins GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-fetchcmd=wget +CONFIGURE_ARGS= --with-fetchcmd=wget --localstatedir="${PREFIX}/var" post-patch: @${REINPLACE_CMD} 's/-o $$(installuser)//' ${WRKSRC}/Makefile diff --git a/security/nessus/Makefile b/security/nessus/Makefile index d8ea0abe307f..efc15adf00e6 100644 --- a/security/nessus/Makefile +++ b/security/nessus/Makefile @@ -28,6 +28,7 @@ GTK2_USES= pkgconfig GTK2_USE= GNOME=gtk20 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" MAKE_JOBS_UNSAFE= yes SUB_FILES= nessusd.conf USE_RC_SUBR= nessusd diff --git a/security/softhsm2/Makefile b/security/softhsm2/Makefile index 22784df1b717..70c2fa30779a 100644 --- a/security/softhsm2/Makefile +++ b/security/softhsm2/Makefile @@ -14,11 +14,10 @@ COMMENT= Software implementation of a Hardware Security Module (HSM) LICENSE= BSD2CLAUSE -LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 GNU_CONFIGURE= yes - -CONFIGURE_ARGS+= --with-sqlite3=${LOCALBASE} +CONFIGURE_ARGS= --with-sqlite3=${LOCALBASE} --localstatedir="${PREFIX}/var" INSTALL_TARGET= install-strip USES= libtool diff --git a/security/super/Makefile b/security/super/Makefile index d01c2aa7c3b0..90f9c28d0413 100644 --- a/security/super/Makefile +++ b/security/super/Makefile @@ -16,6 +16,7 @@ LICENSE= ART10 GPLv1 LICENSE_COMB= dual GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir="${PREFIX}/var" OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile index 3cb4ecda9f96..98e340552c64 100644 --- a/textproc/mifluz/Makefile +++ b/textproc/mifluz/Makefile @@ -14,6 +14,7 @@ LICENSE= GPLv3 USES= bison iconv libtool makeinfo pathfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-posixmutexes \ + --localstatedir="${PREFIX}/var" \ --without-unac INSTALL_TARGET= install-strip USE_LDCONFIG= yes diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile index 3a1194a01baf..237bd65901a9 100644 --- a/textproc/soothsayer/Makefile +++ b/textproc/soothsayer/Makefile @@ -22,7 +22,7 @@ CONFIGURE_ENV= ac_cv_path_CPPUNIT_CONFIG=no \ ac_cv_path_SWIG=no \ ac_cv_prog_HAVE_DOT=no \ ac_cv_prog_HAVE_DOXYGEN=no -CONFIGURE_ARGS= --disable-python-binding +CONFIGURE_ARGS= --disable-python-binding --localstatedir="${PREFIX}/var" INSTALL_TARGET= install-strip USE_LDCONFIG= yes |