diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index d28eac8ee7a..216b605fa75 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2003/04/10 18:08:56 jsyn Exp $
+# $OpenBSD: Makefile,v 1.21 2003/05/12 18:02:44 sturm Exp $
 
 COMMENT=	"MOD player"
 DISTNAME=	tracker-5.3
@@ -21,7 +21,7 @@ MAKE_FLAGS=	MACHINE=openbsd CC=$(CC) INSTALL="$(INSTALL)" \
 		CFLAGS_openbsd='-O3 -funroll-loops -finline-functions ${COPTS}' \
 		INST_BIN_OPT="-c -s -m $(BINMODE) -o $(BINOWN) -g $(BINGRP)" \
 		INST_MAN_OPT="-c -m 644 -o $(BINOWN) -g $(BINGRP)" \
-		COMPRESSION_FILE='$${DESTDIR}/etc/compression_methods' \
+		COMPRESSION_FILE='$${DESTDIR}${SYSCONFDIR}/compression_methods' \
 		PREFIX='$${DESTDIR}/${PREFIX}'
 
 NO_REGRESS=	Yes
@@ -32,6 +32,9 @@ post-extract:
 	@mkdir -p ${WRKSRC}/Arch/OpenBSD
 	@cp files/{audio.c,config.h} ${WRKSRC}/Arch/OpenBSD
 
+pre-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${SYSCONFDIR}
+
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tracker
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/tracker
diff --git a/audio/tracker/pkg/PLIST b/audio/tracker/pkg/PLIST
index 932b724411f..f3faef5d98b 100644
--- a/audio/tracker/pkg/PLIST
+++ b/audio/tracker/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.5 2000/06/10 17:39:24 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2003/05/12 18:02:44 sturm Exp $
 @unexec install-info --delete --info-dir=%D/info %D/info/tracker.info
 bin/randomize
 bin/tracker
 info/tracker.info
 lib/tracker/compression_methods.sample
-@exec if [ ! -f /etc/compression_methods ]; then cp %D/%F /etc/compression_methods; fi
+@exec if [ ! -f ${SYSCONFDIR}/compression_methods ]; then cp %D/%F ${SYSCONFDIR}/compression_methods; fi
 share/doc/tracker/FAQ
 share/doc/tracker/Html/Accessing_Aminet_on_the_Internet.html
 share/doc/tracker/Html/Accessing_Aminet_without_Internet.html
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 3b712aafa57..bdad1c02c06 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2002/12/29 19:37:53 fgsch Exp $
+# $OpenBSD: Makefile,v 1.9 2003/05/12 18:02:44 sturm Exp $
 
 DISTNAME=	sqsh-2.1
 CATEGORIES=	databases shells
@@ -18,16 +18,20 @@ MAINTAINER=	Joshua Stein <jcs@rt.fm>
 MODULES=	gettext
 LIB_DEPENDS=	tds.0,ct.0::databases/freetds
 
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= gnu old
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/autoconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		SYBASE="${LOCALBASE}"
-CONFIGURE_ARGS=	--with-readline --sysconfdir=/etc
+CONFIGURE_ARGS=	--with-readline --sysconfdir='${SYSCONFDIR}'
 
 ALL_TARGET=	
 NO_REGRESS=	Yes
 
+post-patch:
+	@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," ${WRKSRC}/Makefile.in \
+		${WRKSRC}/src/Makefile.in
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${PREFIX}/bin/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sqsh
diff --git a/databases/sqsh/patches/patch-Makefile_in b/databases/sqsh/patches/patch-Makefile_in
index 0cbf415f92c..3f6a4b1f141 100644
--- a/databases/sqsh/patches/patch-Makefile_in
+++ b/databases/sqsh/patches/patch-Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2001/12/23 23:27:23 jcs Exp $
+$OpenBSD: patch-Makefile_in,v 1.2 2003/05/12 18:02:44 sturm Exp $
 --- Makefile.in.orig	Sun Dec 23 16:57:51 2001
 +++ Makefile.in	Sun Dec 23 16:59:00 2001
 @@ -17,7 +17,7 @@
@@ -6,7 +6,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2001/12/23 23:27:23 jcs Exp $
  INSTALL_MAN    = $(src_dir)/autoconf/install-man
  
 -SQSHRC_GLOBAL  = $(prefix)/etc/sqshrc
-+SQSHRC_GLOBAL  = /etc/sqshrc
++SQSHRC_GLOBAL  = %%SYSCONFDIR%%/sqshrc
  
  MAN_PAGES      = sqsh.1
  SRCS           = $(OBJS:.o=.c)
diff --git a/databases/sqsh/patches/patch-src_Makefile_in b/databases/sqsh/patches/patch-src_Makefile_in
index 9d4a9893355..d3b72c48cba 100644
--- a/databases/sqsh/patches/patch-src_Makefile_in
+++ b/databases/sqsh/patches/patch-src_Makefile_in
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2001/12/23 23:27:23 jcs Exp $
+$OpenBSD: patch-src_Makefile_in,v 1.2 2003/05/12 18:02:44 sturm Exp $
 --- src/Makefile.in.orig	Sun Dec 23 16:52:30 2001
 +++ src/Makefile.in	Sun Dec 23 16:53:03 2001
 @@ -7,7 +7,7 @@
@@ -6,7 +6,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 2001/12/23 23:27:23 jcs Exp $
  #  out SQSHRC_GLOBAL, below.
  
 -SQSHRC_GLOBAL = @prefix@/etc/sqshrc
-+SQSHRC_GLOBAL = /etc/sqshrc
++SQSHRC_GLOBAL = %%SYSCONFDIR%%/sqshrc
  SQSHRC_PATH   = "$(SQSHRC_GLOBAL):$${HOME}/.sqshrc"
  
  #  The following variables are configurable by the user.  Typically
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index f20a75aae1a..47a021d5519 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2002/10/26 00:39:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2003/05/12 18:02:44 sturm Exp $
 # NetBSD: Makefile,v 1.6 2000/01/19 12:28:44 hubertf Exp
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
@@ -28,7 +28,7 @@ FLAVOR?=
 PATCH_DIST_STRIP=-p1
 WRKSRC=	${WRKDIR}/${DISTNAME}/build
 CONFIGURE_STYLE=gnu dest
-CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"/etc/vi.exrc\"' 
+CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"${SYSCONFDIR}/vi.exrc\"' 
 CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n --host=${ARCH}-unknown-netbsd
 
 .if ${FLAVOR:L} == "canna"
diff --git a/net/irc/Makefile b/net/irc/Makefile
index 47e54128ec4..a585c1c43c7 100644
--- a/net/irc/Makefile
+++ b/net/irc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2002/10/28 01:38:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2003/05/12 18:02:44 sturm Exp $
 # $FreeBSD: Makefile,v 1.19 1998/12/09 20:15:29 billf Exp $
 
 COMMENT=	"internet relay chat (irc) server"
@@ -18,11 +18,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-SYSCONFDIR=	/etc/ircd
-CONFIGURE_STYLE= gnu
+CONFDIR=	${SYSCONFDIR}/ircd
+CONFIGURE_STYLE= gnu old
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/support
 CONFIGURE_ARGS=	--logdir="/var/log/ircd" \
 		--localstatedir="/var/run" \
+		--sysconfdir=${CONFDIR}
 
 FLAVORS=	ipv6
 FLAVOR?=	
@@ -38,6 +39,8 @@ ALL_TARGET=	server
 
 WRKBUILD=	${WRKSRC}/support
 
+SUBST_VARS=	CONFDIR
+
 post-patch:
 	@sed -e s#!!SYSLOG_FACILITY!!#$(SYSLOG_FACILITY)#g \
 		$(WRKSRC)/support/config.h.dist > $(WRKSRC)/support/config.h.dist.new
diff --git a/net/irc/pkg/DEINSTALL b/net/irc/pkg/DEINSTALL
index 3d06daf658c..bdd42efaa00 100644
--- a/net/irc/pkg/DEINSTALL
+++ b/net/irc/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2001/01/28 00:47:20 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/05/12 18:02:44 sturm Exp $
 #
 # ircd de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 
 echo
 echo "+---------------"
diff --git a/net/irc/pkg/INSTALL b/net/irc/pkg/INSTALL
index d494efe88b9..f479a0d60be 100644
--- a/net/irc/pkg/INSTALL
+++ b/net/irc/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2001/01/28 00:47:21 brad Exp $
+# $OpenBSD: INSTALL,v 1.2 2003/05/12 18:02:44 sturm Exp $
 #
 # Pre/post-installation setup of ircd
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 #CONFIG_FILE1=ircd.conf
 #CONFIG_FILE2=iauth.conf
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/ircd
diff --git a/net/netatalk/reference/Makefile b/net/netatalk/reference/Makefile
index 3fa1df70537..7cf7d915308 100644
--- a/net/netatalk/reference/Makefile
+++ b/net/netatalk/reference/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2002/12/14 14:32:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2003/05/12 18:02:44 sturm Exp $
 
 NOT_FOR_ARCHS=	powerpc		# char is unsigned
 
@@ -16,14 +16,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+CONFDIR=	${SYSCONFDIR}/netatalk
+
 MAKE_FLAGS=	CC="${CC}" OPTOPTS="${CFLAGS} -Wall" \
-		PREFIX="${PREFIX}" SYSCONFDIR="${SYSCONFDIR}"
+		PREFIX="${PREFIX}" SYSCONFDIR="${CONFDIR}"
 FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR="${WRKINST}"
 
-SYSCONFDIR=	/etc/netatalk
-
 NO_REGRESS=	Yes
 
+SUBST_VARS=	CONFDIR
+
 # NOTES:
 # Will compile with kerberos support in apfd and papd.
 # Haven't tested kerberos support as there is no MacOS
diff --git a/net/netatalk/reference/pkg/DEINSTALL b/net/netatalk/reference/pkg/DEINSTALL
index fada3fa1978..4b5ddc21cdc 100644
--- a/net/netatalk/reference/pkg/DEINSTALL
+++ b/net/netatalk/reference/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/07/23 11:47:35 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/05/12 18:02:45 sturm Exp $
 #
 # netatalk de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 
 if [ -d $CONFIG_DIR ]; then
     echo
diff --git a/net/netatalk/reference/pkg/INSTALL b/net/netatalk/reference/pkg/INSTALL
index f2ea9d40075..883516f691a 100644
--- a/net/netatalk/reference/pkg/INSTALL
+++ b/net/netatalk/reference/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1.1.1 2002/07/23 11:47:35 naddy Exp $
+# $OpenBSD: INSTALL,v 1.2 2003/05/12 18:02:45 sturm Exp $
 #
 # Pre/post-installation setup of netatalk
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/netatalk
 
 do_notice()
diff --git a/net/netatalk/stable/Makefile b/net/netatalk/stable/Makefile
index 2474aa30f61..50a18410b3c 100644
--- a/net/netatalk/stable/Makefile
+++ b/net/netatalk/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2002/12/14 14:32:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2003/05/12 18:02:45 sturm Exp $
 
 COMMENT=	"AFP file and print services for AppleTalk/IP networks"
 
@@ -19,14 +19,16 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 
 SEPARATE_BUILD= 	concurrent
 
-SYSCONFDIR=	/etc/netatalk
 CONFIGURE_STYLE=	gnu
 
+CONFDIR=		${SYSCONFDIR}/netatalk
+SUBST_VARS=		CONFDIR
+
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} 
 CONFIGURE_ARGS+=	--with-flock-locks
 CONFIGURE_ARGS+=	--with-ssl=/usr
-CONFIGURE_ARGS+=	--with-config-dir=${SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-pkgconfdir=${SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-config-dir=${CONFDIR}
+CONFIGURE_ARGS+=	--with-pkgconfdir=${CONFDIR}
 CONFIGURE_ARGS+=	--with-uams-path=${PREFIX}/lib/netatalk/uams
 CONFIGURE_ARGS+=	--with-tcp-wrappers
 
diff --git a/net/netatalk/stable/pkg/DEINSTALL b/net/netatalk/stable/pkg/DEINSTALL
index 2b17cb44a19..4b5ddc21cdc 100644
--- a/net/netatalk/stable/pkg/DEINSTALL
+++ b/net/netatalk/stable/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/07/23 11:52:12 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/05/12 18:02:45 sturm Exp $
 #
 # netatalk de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 
 if [ -d $CONFIG_DIR ]; then
     echo
diff --git a/net/netatalk/stable/pkg/INSTALL b/net/netatalk/stable/pkg/INSTALL
index 881750d2625..43dc784108c 100644
--- a/net/netatalk/stable/pkg/INSTALL
+++ b/net/netatalk/stable/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1.1.1 2002/07/23 11:52:12 naddy Exp $
+# $OpenBSD: INSTALL,v 1.2 2003/05/12 18:02:45 sturm Exp $
 #
 # Pre/post-installation setup of netatalk
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 NLS_DIR=$CONFIG_DIR/nls
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/netatalk
 SAMPLE_CONFIG_NLS=$PREFIX/share/nls/netatalk
diff --git a/net/samba/stable/Makefile b/net/samba/stable/Makefile
index 65345acf102..f5a4202bf3a 100644
--- a/net/samba/stable/Makefile
+++ b/net/samba/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2003/04/14 15:02:09 wilfried Exp $
+# $OpenBSD: Makefile,v 1.18 2003/05/12 18:02:45 sturm Exp $
 
 COMMENT=	"SMB and CIFS client and server for UNIX"
 
@@ -32,10 +32,10 @@ FAKE_FLAGS=	prefix="${WRKINST}${PREFIX}" \
 		SBINDIR="${WRKINST}${PREFIX}/libexec" \
 		VARDIR="${WRKINST}/var"
 
-SYSCONFDIR=	/etc/samba
+CONFDIR=	${SYSCONFDIR}/samba
 SAMBA_SPOOL=	/var/spool/samba
 SAMBA_LOGDIR=	/var/log
-SUBST_VARS=	SAMBA_SPOOL
+SUBST_VARS=	SAMBA_SPOOL CONFDIR
 
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= autoconf
@@ -43,11 +43,11 @@ CONFIGURE_ARGS=	--libdir="${PREFIX}/lib/samba" \
 		--localstatedir="/var" \
 		--sbindir="${PREFIX}/libexec" \
 		--disable-cups \
-		--with-configdir="${SYSCONFDIR}" \
+		--with-configdir="${CONFDIR}" \
 		--with-lockdir="${SAMBA_SPOOL}" \
 		--with-piddir="/var/run" \
 		--with-logfilebase="${SAMBA_LOGDIR}" \
-		--with-privatedir="${SYSCONFDIR}" \
+		--with-privatedir="${CONFDIR}" \
 		--with-swatdir="${PREFIX}/share/swat" \
 		--with-ssl \
 		--with-sslinc="/usr/include/ssl" \
diff --git a/net/samba/stable/pkg/DEINSTALL b/net/samba/stable/pkg/DEINSTALL
index 8e65e7e7cf2..df0ebc17aaf 100644
--- a/net/samba/stable/pkg/DEINSTALL
+++ b/net/samba/stable/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2002/02/09 14:15:09 dhartmei Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/05/12 18:02:45 sturm Exp $
 #
 # samba de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 SAMBA_SPOOL=${SAMBA_SPOOL}
 
 if [ -d ${CONFIG_DIR} ]; then
diff --git a/net/samba/stable/pkg/INSTALL b/net/samba/stable/pkg/INSTALL
index 05e4c5e9f9a..31e22ed0449 100644
--- a/net/samba/stable/pkg/INSTALL
+++ b/net/samba/stable/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2002/02/09 14:15:09 dhartmei Exp $
+# $OpenBSD: INSTALL,v 1.3 2003/05/12 18:02:45 sturm Exp $
 #
 # Pre/post-installation setup of samba
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 CONFIG_FILE=$CONFIG_DIR/smb.conf
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/samba
 SAMBA_SPOOL=${SAMBA_SPOOL}
diff --git a/net/uucp/Makefile b/net/uucp/Makefile
index 14b8399f32a..6e5191e88c2 100644
--- a/net/uucp/Makefile
+++ b/net/uucp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2002/10/28 01:38:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2003/05/12 18:02:45 sturm Exp $
 
 COMMENT=	"UUCP suite"
 
@@ -16,8 +16,8 @@ WRKDIST=	${WRKDIR}/uucp-1.06.1
 CONFIGURE_STYLE= gnu dest old
 
 MAKE_FLAGS+=	sbindir='$$(PREFIX)/libexec/uucp' \
-		newconfigdir=/etc/uucp \
-		oldconfigdir=/etc/uucp \
+		newconfigdir=${SYSCONFDIR}/uucp \
+		oldconfigdir=${SYSCONFDIR}/uucp \
 		MAKEINFO='makeinfo --no-split'
 
 NO_REGRESS=	Yes
@@ -26,6 +26,9 @@ FAKE_FLAGS=	DESTDIR=${WRKINST} $(MAKE_FLAGS)
 FAKE_TARGET=	install install-info
 
 post-install:
+	@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
+		${PREFIX}/man/man1/uu{cp,stat,x}.1 \
+		${PREFIX}/man/man8/uu{cico,xqt}.8
 	@mv ${PREFIX}/libexec/uucp/uusched ${PREFIX}/bin
 	@chown ${BINOWN}:${BINGRP} ${PREFIX}/bin/cu
 	@chmod ${BINMODE} ${PREFIX}/bin/cu
diff --git a/net/uucp/patches/patch-cu_1 b/net/uucp/patches/patch-cu_1
index 7f890aa0cca..43d4f4677b3 100644
--- a/net/uucp/patches/patch-cu_1
+++ b/net/uucp/patches/patch-cu_1
@@ -1,4 +1,4 @@
-$OpenBSD: patch-cu_1,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
+$OpenBSD: patch-cu_1,v 1.2 2003/05/12 18:02:45 sturm Exp $
 --- cu.1.orig	Sun Aug 20 15:29:24 1995
 +++ cu.1	Thu Jul 12 04:04:26 2001
 @@ -304,7 +304,7 @@ The file name may be changed at compilat
@@ -6,7 +6,7 @@ $OpenBSD: patch-cu_1,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
  
  .br
 -/usr/lib/uucp/config - Configuration file.
-+/etc/uucp/config - Configuration file.
++%%SYSCONFDIR%%/uucp/config - Configuration file.
  .SH AUTHOR
  Ian Lance Taylor
  <ian@airs.com>
diff --git a/net/uucp/patches/patch-uucico_8 b/net/uucp/patches/patch-uucico_8
index 65a3441364c..dc6bf082f47 100644
--- a/net/uucp/patches/patch-uucico_8
+++ b/net/uucp/patches/patch-uucico_8
@@ -1,4 +1,4 @@
-$OpenBSD: patch-uucico_8,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
+$OpenBSD: patch-uucico_8,v 1.2 2003/05/12 18:02:45 sturm Exp $
 --- uucico.8.orig	Sun Aug 20 15:29:42 1995
 +++ uucico.8	Thu Jul 12 04:05:49 2001
 @@ -250,8 +250,8 @@ is equivalent to
@@ -17,10 +17,10 @@ $OpenBSD: patch-uucico_8,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
  
  .br
 -/usr/lib/uucp/config - Configuration file.
-+/etc/uucp/config - Configuration file.
++%%SYSCONFDIR%%/uucp/config - Configuration file.
  .br
 -/usr/lib/uucp/passwd - Default UUCP password file.
-+/etc/uucp/passwd - Default UUCP password file.
++%%SYSCONFDIR%%/uucp/passwd - Default UUCP password file.
  .br
 -/usr/spool/uucp -
 +/var/spool/uucp -
diff --git a/net/uucp/patches/patch-uucp_1 b/net/uucp/patches/patch-uucp_1
index 3c03af6fec2..bab5657aa72 100644
--- a/net/uucp/patches/patch-uucp_1
+++ b/net/uucp/patches/patch-uucp_1
@@ -1,4 +1,4 @@
-$OpenBSD: patch-uucp_1,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
+$OpenBSD: patch-uucp_1,v 1.2 2003/05/12 18:02:45 sturm Exp $
 --- uucp.1.orig	Sun Aug 20 15:29:46 1995
 +++ uucp.1	Thu Jul 12 04:07:23 2001
 @@ -181,15 +181,15 @@ The file names may be changed at compila
@@ -6,7 +6,7 @@ $OpenBSD: patch-uucp_1,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
  
  .br
 -/usr/lib/uucp/config - Configuration file.
-+/etc/uucp/config - Configuration file.
++%%SYSCONFDIR%%/uucp/config - Configuration file.
  .br
 -/usr/spool/uucp -
 +/var/spool/uucp -
diff --git a/net/uucp/patches/patch-uustat_1 b/net/uucp/patches/patch-uustat_1
index 3d73785b5b3..d4c9c963ab4 100644
--- a/net/uucp/patches/patch-uustat_1
+++ b/net/uucp/patches/patch-uustat_1
@@ -1,4 +1,4 @@
-$OpenBSD: patch-uustat_1,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
+$OpenBSD: patch-uustat_1,v 1.2 2003/05/12 18:02:45 sturm Exp $
 --- uustat.1.orig	Sun Aug 20 15:29:55 1995
 +++ uustat.1	Thu Jul 12 04:08:06 2001
 @@ -540,9 +540,9 @@ The file names may be changed at compila
@@ -6,7 +6,7 @@ $OpenBSD: patch-uustat_1,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
  
  .br
 -/usr/lib/uucp/config - Configuration file.
-+/etc/uucp/config - Configuration file.
++%%SYSCONFDIR%%/uucp/config - Configuration file.
  .br
 -/usr/spool/uucp -
 +/var/spool/uucp -
diff --git a/net/uucp/patches/patch-uux_1 b/net/uucp/patches/patch-uux_1
index fe3261ad146..14c64f2e47d 100644
--- a/net/uucp/patches/patch-uux_1
+++ b/net/uucp/patches/patch-uux_1
@@ -1,4 +1,4 @@
-$OpenBSD: patch-uux_1,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
+$OpenBSD: patch-uux_1,v 1.2 2003/05/12 18:02:45 sturm Exp $
 --- uux.1.orig	Sun Aug 20 15:29:57 1995
 +++ uux.1	Thu Jul 12 04:08:36 2001
 @@ -40,7 +40,7 @@ file to a command being executed on a re
@@ -15,7 +15,7 @@ $OpenBSD: patch-uux_1,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
  
  .br
 -/usr/lib/uucp/config - Configuration file.
-+/etc/uucp/config - Configuration file.
++%%SYSCONFDIR%%/uucp/config - Configuration file.
  .br
 -/usr/spool/uucp -
 +/var/spool/uucp -
diff --git a/net/uucp/patches/patch-uuxqt_8 b/net/uucp/patches/patch-uuxqt_8
index 159ee292779..87ed452a81e 100644
--- a/net/uucp/patches/patch-uuxqt_8
+++ b/net/uucp/patches/patch-uuxqt_8
@@ -1,4 +1,4 @@
-$OpenBSD: patch-uuxqt_8,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
+$OpenBSD: patch-uuxqt_8,v 1.2 2003/05/12 18:02:45 sturm Exp $
 --- uuxqt.8.orig	Sun Aug 20 15:29:58 1995
 +++ uuxqt.8	Thu Jul 12 04:09:00 2001
 @@ -64,8 +64,8 @@ is equivalent to
@@ -17,7 +17,7 @@ $OpenBSD: patch-uuxqt_8,v 1.1.1.1 2001/07/13 02:27:16 fgsch Exp $
  
  .br
 -/usr/lib/uucp/config - Configuration file.
-+/etc/uucp/config - Configuration file.
++%%SYSCONFDIR%%/uucp/config - Configuration file.
  .br
 -/usr/spool/uucp -
 +/var/spool/uucp -
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 5f8b55e9748..713f8b47e13 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2002/07/10 20:14:45 mickey Exp $
+# $OpenBSD: Makefile,v 1.24 2003/05/12 18:02:45 sturm Exp $
 # KAME Id: Makefile,v 1.5 1999/09/13 16:27:41 itojun Exp
 # Originally by: peter.galbavy@knowledge.com
 
@@ -28,10 +28,10 @@ PERMIT_DISTFILES_FTP=	Yes
 #CFLAGS+=	-g
 
 USE_GMAKE=	Yes
-SYSCONFDIR=	/etc/zebra
+CONFDIR=	${SYSCONFDIR}/zebra
 SEPARATE_BUILD=	concurrent
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-vtysh
+CONFIGURE_STYLE= gnu old
+CONFIGURE_ARGS+= --enable-vtysh --sysconfdir=${CONFDIR}
 CONFIGURE_ENV=	LIBS=-lcurses
 
 FLAVORS=	snmp
@@ -44,6 +44,8 @@ CONFIGURE_ARGS+= --enable-snmp
 CONFIGURE_ARGS+= --disable-snmp
 .endif
 
+SUBST_VARS=	CONFDIR
+
 post-extract:
 .for f in vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 zebra.info
 	@cd ${WRKSRC}/doc; sed \
@@ -57,6 +59,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/zebra
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/zebra
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/zebra
-	${INSTALL_DATA} ${WRKINST}/etc/zebra/* ${PREFIX}/share/examples/zebra
+	${INSTALL_DATA} ${WRKINST}${SYSCONFDIR}/zebra/* ${PREFIX}/share/examples/zebra
 
 .include <bsd.port.mk>
diff --git a/net/zebra/pkg/DEINSTALL b/net/zebra/pkg/DEINSTALL
index 1bcd5b0fc58..5d3c52adae2 100644
--- a/net/zebra/pkg/DEINSTALL
+++ b/net/zebra/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2000/08/25 01:18:21 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2003/05/12 18:02:45 sturm Exp $
 #
 # zebra deinstallation
 
@@ -7,7 +7,7 @@
 #
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 
 if [ -d $CONFIG_DIR ]; then
     echo
diff --git a/net/zebra/pkg/INSTALL b/net/zebra/pkg/INSTALL
index 00373467628..83211555a30 100644
--- a/net/zebra/pkg/INSTALL
+++ b/net/zebra/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2000/08/25 01:18:21 brad Exp $
+# $OpenBSD: INSTALL,v 1.3 2003/05/12 18:02:45 sturm Exp $
 #
 # Pre/post-installation setup of zebra
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${CONFDIR}
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/zebra
 
 do_notice()
diff --git a/www/jakarta-tomcat/v4/Makefile b/www/jakarta-tomcat/v4/Makefile
index 93bfbc80094..7a91c7ce52c 100644
--- a/www/jakarta-tomcat/v4/Makefile
+++ b/www/jakarta-tomcat/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2002/10/11 14:36:21 reinhard Exp $
+# $OpenBSD: Makefile,v 1.9 2003/05/12 18:02:45 sturm Exp $
 
 COMMENT=	"Java servlet 2.3 and Java server pages 1.2 server"
 
@@ -30,7 +30,7 @@ NO_REGRESS=	Yes
 
 CONF_FILES=catalina.policy server-noexamples.xml.config server.xml \
 tomcat-users.xml web.xml
-CONFDIR=	/etc/tomcat
+CONFDIR=	${SYSCONFDIR}/tomcat
 DIRS=		bin classes common conf lib server webapps
 DOCS=LICENSE RELEASE-NOTES-4.0-B1.txt RELEASE-NOTES-4.0-B2.txt \
 RELEASE-NOTES-4.0-B3.txt RELEASE-NOTES-4.0-B4.txt RELEASE-NOTES-4.0-B5.txt \
diff --git a/www/jakarta-tomcat/v4/pkg/MESSAGE b/www/jakarta-tomcat/v4/pkg/MESSAGE
index 76773ce1ecd..3a07790c94e 100644
--- a/www/jakarta-tomcat/v4/pkg/MESSAGE
+++ b/www/jakarta-tomcat/v4/pkg/MESSAGE
@@ -7,5 +7,5 @@ For more information on application development with Tomcat, see
 Note that Tomcat may be started with the following command:
 	${PREFIX}/${DISTNAME}/bin/startup.sh
 
-Configuration files are in `/etc/tomcat'.
+Configuration files are in `${SYSCONFDIR}/tomcat'.
 `$CATALINA_BASE' is `/var/tomcat'.
diff --git a/www/jesred/Makefile b/www/jesred/Makefile
index 1f8d6908c64..4dcbda3de8b 100644
--- a/www/jesred/Makefile
+++ b/www/jesred/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2002/10/29 01:30:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2003/05/12 18:02:45 sturm Exp $
 
 COMMENT=	"squid redirector"
 
@@ -20,6 +20,10 @@ MASTER_SITES=	http://ivs.cs.uni-magdeburg.de/~elkner/webtools/src/
 USE_GMAKE=	Yes
 NO_REGRESS=	Yes
 
+pre-build:
+	@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
+		${WRKSRC}/etc/jesred.conf ${WRKSRC}/path.h
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jesred ${PREFIX}/libexec
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/jesred
diff --git a/www/jesred/patches/patch-etc_jesred_conf b/www/jesred/patches/patch-etc_jesred_conf
index aec2c751019..5ac32a9919f 100644
--- a/www/jesred/patches/patch-etc_jesred_conf
+++ b/www/jesred/patches/patch-etc_jesred_conf
@@ -1,14 +1,14 @@
-$OpenBSD: patch-etc_jesred_conf,v 1.1.1.1 2001/08/22 17:42:11 pvalchev Exp $
+$OpenBSD: patch-etc_jesred_conf,v 1.2 2003/05/12 18:02:45 sturm Exp $
 --- etc/jesred.conf.orig	Fri Aug 14 22:17:54 1998
 +++ etc/jesred.conf	Wed Aug 22 10:47:21 2001
 @@ -1,17 +1,17 @@
  # file with IP addresses, for which URL rewriting is [not] allowed
 -allow = /local/squid/etc/redirect.acl
-+allow = /etc/jesred/redirect.acl
++allow = %%SYSCONFDIR%%/jesred/redirect.acl
  
  # file with rules for URL rewriting
 -rules = /local/squid/etc/redirect.rules
-+rules = /etc/jesred/redirect.rules
++rules = %%SYSCONFDIR%%/jesred/redirect.rules
  
  # log file for general, error and debug messages (empty value or commenting
  # this out disables logging)
diff --git a/www/jesred/patches/patch-path_h b/www/jesred/patches/patch-path_h
index 7fbdd05ed22..4d11911f78a 100644
--- a/www/jesred/patches/patch-path_h
+++ b/www/jesred/patches/patch-path_h
@@ -1,4 +1,4 @@
-$OpenBSD: patch-path_h,v 1.1.1.1 2001/08/22 17:42:11 pvalchev Exp $
+$OpenBSD: patch-path_h,v 1.2 2003/05/12 18:02:45 sturm Exp $
 --- path.h.orig	Fri Jul 24 17:03:13 1998
 +++ path.h	Wed Aug 22 11:32:59 2001
 @@ -7,6 +7,6 @@
@@ -6,6 +6,6 @@ $OpenBSD: patch-path_h,v 1.1.1.1 2001/08/22 17:42:11 pvalchev Exp $
  /* change this to the path, which contains your jesred.conf */
  
 -#define DEFAULT_PATH "/local/squid/etc"
-+#define DEFAULT_PATH "/etc/jesred"
++#define DEFAULT_PATH "%%SYSCONFDIR%%/jesred"
  
  #endif