summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/bonobo-activation/Makefile4
-rw-r--r--devel/libgnome/Makefile4
-rw-r--r--graphics/librsvg2/Makefile4
-rw-r--r--graphics/swfdec/Makefile4
-rw-r--r--mail/sqwebmail/Makefile4
-rw-r--r--net/spread/Makefile6
-rw-r--r--print/ghostscript-esp/Makefile.common4
-rw-r--r--security/openssl/buildlink2.mk4
-rw-r--r--security/openssl/buildlink3.mk4
-rw-r--r--security/ssh2/Makefile.common6
-rw-r--r--sysutils/gnome-vfs2/Makefile4
-rw-r--r--textproc/icu/Makefile4
-rw-r--r--textproc/xmlcatmgr/buildlink2.mk6
-rw-r--r--wm/ion/Makefile6
-rw-r--r--wm/windowmaker/Makefile4
-rw-r--r--x11/gtk2/Makefile4
16 files changed, 36 insertions, 36 deletions
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index be549356181..d49314cd11a 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/12/04 19:48:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/07 02:21:16 jlam Exp $
#
DISTNAME= bonobo-activation-2.1.1
@@ -25,7 +25,7 @@ PKGCONFIG_OVERRIDE= ${WRKSRC}/bonobo-activation-2.0.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-gtk-doc=no
-CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFBASE}"
+CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFBASEDIR}"
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
PKG_SYSCONFSUBDIR= bonobo-activation
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index ff5fd1ddbe2..1ed91dc8a3d 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/12/28 23:37:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/07 02:21:16 jlam Exp $
#
DISTNAME= libgnome-2.4.0
@@ -27,7 +27,7 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= libgnome/libgnome-2.0.pc.in
CONFIGURE_ARGS= --enable-gtk-doc=no
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
OWN_DIRS= ${PKG_SYSCONFDIR}/sound/events
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index f6a3b04e6ef..64aa00ecc09 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/04 17:23:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/07 02:21:16 jlam Exp $
#
DISTNAME= librsvg-2.5.0
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --with-gimp=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html/librsvg2
.if !defined(PKG_SYSCONFDIR.gtk2) || empty(PKG_SYSCONFDIR.gtk2)
-MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFBASE}/gtk-2.0"
+MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFBASEDIR}/gtk-2.0"
.else
MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFDIR.gtk2}"
.endif
diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index e30fc0374c2..6bb99709171 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/07 02:21:16 jlam Exp $
#
DISTNAME= swfdec-0.2.1
@@ -20,7 +20,7 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/swfdec.pc.in
.if !defined(PKG_SYSCONFDIR.gtk2) || empty(PKG_SYSCONFDIR.gtk2)
-MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFBASE}/gtk-2.0"
+MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFBASEDIR}/gtk-2.0"
.else
MESSAGE_SUBST+= PKG_SYSCONFDIR.gtk2="${PKG_SYSCONFDIR.gtk2}"
.endif
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 94353805507..c551bc639db 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/08/30 22:51:23 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/07 02:21:16 jlam Exp $
DISTNAME= sqwebmail-3.3.1
CATEGORIES= www
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/cgi-bin
CONFIGURE_ARGS+= --enable-imagedir=${IMAGEDIR}
CONFIGURE_ARGS+= --enable-imageurl=/images/sqwebmail
-MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASE}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types
+MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types
CONFIGURE_ARGS+= --enable-mimetypes="${MIME_TYPES}"
CONFIGURE_ARGS+= --with-ispell="${LOCALBASE}/bin/ispell"
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 5412021a862..f40aa211bb2 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/11/05 08:22:12 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/07 02:21:16 jlam Exp $
#
DISTNAME= spread-src-3.17.1
@@ -38,8 +38,8 @@ RUNTIME_DIR= /var/run/spread
RCD_SCRIPTS= spread
PKG_GROUPS= ${SPREAD_USER}
PKG_USERS= ${SPREAD_USER}:${SPREAD_GROUP}
-CONF_FILES= ${EXAMPLEDIR}/spread.access_ip.sample ${PKG_SYSCONFBASE}/spread.access_ip
-CONF_FILES+= ${EXAMPLEDIR}/spread.conf.sample ${PKG_SYSCONFBASE}/spread.conf
+CONF_FILES= ${EXAMPLEDIR}/spread.access_ip.sample ${PKG_SYSCONFDIR}/spread.access_ip
+CONF_FILES+= ${EXAMPLEDIR}/spread.conf.sample ${PKG_SYSCONFDIR}/spread.conf
OWN_DIRS_PERMS= ${RUNTIME_DIR} ${SPREAD_USER} ${SPREAD_GROUP} 0750
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 793d1ab2a73..6b6663d8aee 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/01/07 02:21:16 jlam Exp $
DISTNAME= espgs-${GS_VERS}-source
BASEGS_VERS= 7.07
@@ -63,7 +63,7 @@ CFLAGS+= -DHAVE_MKSTEMP=1
REPLACE_PERL= lib/fixmswrd.pl
-CUPS_CONFDIR?= ${PKG_SYSCONFBASE}/cups
+CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups
CUPS_EGDIR= ${PREFIX}/share/examples/cups
DOCDIR= ${PREFIX}/share/doc/ghostscript
HTMLDIR= ${PREFIX}/share/doc/html/ghostscript
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
index 4b09750546f..ee7b802094b 100644
--- a/security/openssl/buildlink2.mk
+++ b/security/openssl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.13 2003/11/27 05:19:58 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2004/01/07 02:21:16 jlam Exp $
.if !defined(OPENSSL_BUILDLINK2_MK)
OPENSSL_BUILDLINK2_MK= # defined
@@ -145,7 +145,7 @@ SSLCERTS= ${PKG_SYSCONFDIR.openssl}/certs
.elif ${OPSYS} == "NetBSD"
SSLCERTS= /etc/openssl/certs
.else
-SSLCERTS= ${PKG_SYSCONFBASE}/openssl/certs
+SSLCERTS= ${PKG_SYSCONFBASEDIR}/openssl/certs
.endif
BUILD_DEFS+= SSLCERTS
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index 7a8ce8508d3..6bc3747f75a 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/07 02:21:17 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+
@@ -149,7 +149,7 @@ SSLCERTS= ${PKG_SYSCONFDIR.openssl}/certs
. elif ${OPSYS} == "NetBSD"
SSLCERTS= /etc/openssl/certs
. else
-SSLCERTS= ${PKG_SYSCONFBASE}/openssl/certs
+SSLCERTS= ${PKG_SYSCONFBASEDIR}/openssl/certs
. endif
BUILD_DEFS+= SSLCERTS
diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common
index 92ea77dc517..9d53ffcf29c 100644
--- a/security/ssh2/Makefile.common
+++ b/security/ssh2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2003/08/12 19:08:55 seb Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/01/07 02:21:17 jlam Exp $
#
DISTNAME= ssh-3.2.5
@@ -58,10 +58,10 @@ CONFIGURE_ARGS+= --without-ssh1-compat
CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers}
CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR}
-# Setting FOREIGN_ETCDIR to PKG_SYSCONFBASE may seem stupid
+# Setting FOREIGN_ETCDIR to PKG_SYSCONFBASEDIR may seem stupid
# if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm...
#
-CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
MAKE_ENV+= PKGBASE=${PKGBASE}
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 3c2a3307b9b..40eeedb7d3c 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/12/28 23:35:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/07 02:21:17 jlam Exp $
#
DISTNAME= gnome-vfs-2.4.1
@@ -27,7 +27,7 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-vfs-module-2.0.pc.in
CONFIGURE_ARGS= --enable-gtk-doc=no
CONFIGURE_ARGS+= --enable-platform-gnome-2
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
CPPFLAGS+= -I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 50e27e4ee93..fced6b4e561 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/12/04 11:37:15 recht Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/07 02:21:17 jlam Exp $
#
DISTNAME= icu-2.6.1
@@ -25,7 +25,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-static
# ICU's configure script will automatically append "/icu" to the sysconfdir.
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
PKG_SYSCONFSUBDIR= icu
SUPPORT_FILES+= ${PREFIX}/share/examples/icu/convrtrs.txt \
diff --git a/textproc/xmlcatmgr/buildlink2.mk b/textproc/xmlcatmgr/buildlink2.mk
index a259314e0ba..a76e0a53b7d 100644
--- a/textproc/xmlcatmgr/buildlink2.mk
+++ b/textproc/xmlcatmgr/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/22 18:25:09 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/01/07 02:21:17 jlam Exp $
#
# This Makefile fragment is included by packages that use xmlcatmgr.
#
@@ -32,8 +32,8 @@ XMLCATMGR= ${BUILDLINK_PREFIX.xmlcatmgr}/bin/xmlcatmgr
SGML_DEFAULT_CATALOG= ${PKG_SYSCONFDIR.xmlcatmgr}/sgml/catalog
XML_DEFAULT_CATALOG= ${PKG_SYSCONFDIR.xmlcatmgr}/xml/catalog
.else
-SGML_DEFAULT_CATALOG= ${PKG_SYSCONFBASE}/sgml/catalog
-XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASE}/xml/catalog
+SGML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/sgml/catalog
+XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/xml/catalog
.endif
xmlcatmgr-buildlink: _BUILDLINK_USE
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index aa10d4caf79..d4745b9076e 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:34:03 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/07 02:21:17 jlam Exp $
#
DISTNAME= ion-20020207
@@ -25,8 +25,8 @@ CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
.endfor
.undef f
-# ion's sources will append "ion/" to PKG_SYSCONFBASE, that is, the
+# ion's sources will append "ion/" to PKG_SYSCONFBASEDIR, that is, the
# PKG_SYSCONFSUBDIR we are currently using.
-MAKE_ENV= PKG_SYSCONFBASE="${PKG_SYSCONFBASE}"
+MAKE_ENV= PKG_SYSCONFBASEDIR="${PKG_SYSCONFBASEDIR}"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index b8f04b93dd0..5d9382d79c4 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.41 2004/01/07 02:21:17 jlam Exp $
DISTNAME= WindowMaker-0.80.2
PKGNAME= windowmaker-0.80.2
@@ -22,7 +22,7 @@ USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-usermenu \
- --sysconfdir=${PKG_SYSCONFBASE} \
+ --sysconfdir=${PKG_SYSCONFBASEDIR} \
--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ENV+= LINGUAS=yes
CONFIGURE_ENV+= CPP_PATH="${CPP}"
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 7cda776da28..d556b75f447 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/01/03 18:49:57 reed Exp $
+# $NetBSD: Makefile,v 1.38 2004/01/07 02:21:17 jlam Exp $
#
DISTNAME= gtk+-2.2.4
@@ -23,7 +23,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-xinput=xfree
-CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFBASE}"
+CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFBASEDIR}"
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 01:11:21 +0000