Should have used PKG_SYSCONFDIR instead of PKG_SYSCONFBASE.

4 files changed, 15 insertions, 15 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 37b10ab3c0c..1e63fcbda32 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/11/29 02:37:21 kim Exp $
+# $NetBSD: Makefile,v 1.8 2002/11/29 02:58:46 kim Exp $
 
 DISTNAME=	abcde-2.0.3
 PKGREVISION=	1
@@ -21,11 +21,11 @@ NO_BUILD=	# defined
 EGDIR=		${PREFIX}/share/examples/abcde
 
 MESSAGE_SUBST+=	EGDIR=${EGDIR}
-MESSAGE_SUBST+=	PKG_SYSCONFBASE=${PKG_SYSCONFBASE}
+MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
-post-patch:
+pre-configure:
 	@cd ${WRKSRC} && for f in abcde abcde.1; do			\
-		${SED} "s,@PKG_SYSCONFBASE@,${PKG_SYSCONFBASE},"	\
+		${SED} "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},"		\
 			$$f > $$f.tmp &&				\
 		${MV} $$f.tmp $$f;					\
 	done
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 44eb7177834..62ba2d516ef 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2002/11/29 02:37:22 kim Exp $
+$NetBSD: distinfo,v 1.10 2002/11/29 02:58:46 kim Exp $
 
 SHA1 (abcde_2.0.3.orig.tar.gz) = 66a7620a835baee29296f4d5e9322bb1679baa49
 Size (abcde_2.0.3.orig.tar.gz) = 35655 bytes
-SHA1 (patch-aa) = 9d371a43a5b67c7dbcd191e7197ed86734583a18
+SHA1 (patch-aa) = 31392536c53eb76df26da1bb4bbe1e68b9427999
 SHA1 (patch-ab) = 524452b3930c25351deee7a508f98bcd0f51a872
-SHA1 (patch-ac) = 2ac23cf529045eceeca3e6d89c5b6cffcbf1c975
+SHA1 (patch-ac) = af57feea1d63a5aa4b524f1710709fd01b71686f
 SHA1 (patch-ad) = 72550c6a7fa8231c9058a674e85781ec8d3adc18
diff --git a/audio/abcde/patches/patch-aa b/audio/abcde/patches/patch-aa
index d050ce14455..2b03f884ca7 100644
--- a/audio/abcde/patches/patch-aa
+++ b/audio/abcde/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2002/11/29 02:37:22 kim Exp $
+$NetBSD: patch-aa,v 1.5 2002/11/29 02:58:47 kim Exp $
 
 --- abcde.1.orig	Mon Aug 20 21:22:33 2001
-+++ abcde.1	Thu Nov 28 20:57:01 2002
++++ abcde.1	Thu Nov 28 21:55:24 2002
 @@ -42,7 +42,7 @@
  .TP
  .B \-c [filename]
  Specifies an additional configuration file to parse. Configuration options
 -in this file override those in /etc/abcde.conf or $HOME/.abcde.conf.
-+in this file override those in @PKG_SYSCONFBASE@/abcde.conf or $HOME/.abcde.conf.
++in this file override those in @PKG_SYSCONFDIR@/abcde.conf or $HOME/.abcde.conf.
  .TP
  .B \-C [discid]
  Allows you to resume a session for
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 2002/11/29 02:37:22 kim Exp $
  variables in your abcde.conf.
  .SH CONFIGURATION
 -abcde sources two configuration files on startup - /etc/abcde.conf and
-+abcde sources two configuration files on startup - @PKG_SYSCONFBASE@/abcde.conf and
++abcde sources two configuration files on startup - @PKG_SYSCONFDIR@/abcde.conf and
  $HOME/.abcde.conf, in that order. Here is a list of options abcde recognizes:
  .TP
  .B CDDBURL
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index 711485918e5..39d777e2b6f 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.7 2002/11/29 02:37:22 kim Exp $
+$NetBSD: patch-ac,v 1.8 2002/11/29 02:58:47 kim Exp $
 
 --- abcde.orig	Mon Jan 28 00:44:02 2002
-+++ abcde	Thu Nov 28 20:57:50 2002
++++ abcde	Thu Nov 28 21:55:10 2002
 @@ -206,6 +206,11 @@
  			TRACKARTIST="$(echo $DTITLEARTIST | cut -f1 -d~)"
  			TRACKNAME="$(echo $DTITLEARTIST | cut -f2 -d~)"
@@ -128,8 +128,8 @@ $NetBSD: patch-ac,v 1.7 2002/11/29 02:37:22 kim Exp $
  # Load system defaults
 -if [ -r /etc/abcde.conf ]; then
 -	. /etc/abcde.conf
-+if [ -r @PKG_SYSCONFBASE@/abcde.conf ]; then
-+	. @PKG_SYSCONFBASE@/abcde.conf
++if [ -r @PKG_SYSCONFDIR@/abcde.conf ]; then
++	. @PKG_SYSCONFDIR@/abcde.conf
  fi
  # Load user preference defaults
  if [ -r $HOME/.abcde.conf ]; then