Make xmp install its configuration files in the examples tree and let

bsd.pkg.install.mk copy them to PKG_SYSCONFDIR. Bump PKGREVISION to 1.

7 files changed, 63 insertions, 31 deletions

diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 7287ddf07b4..bb606c68f04 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/01/29 07:41:28 martti Exp $
+# $NetBSD: Makefile,v 1.5 2002/12/22 17:05:51 jmmv Exp $
 # FreeBSD: ports/audio/xmp/Makefile,v 1.5 2000/04/08 21:24:59 mharo Exp
 #
 
 DISTNAME=	xmp-2.0.4
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmp/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,9 +15,18 @@ COMMENT=	Player for many different Amiga and PC module formats
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-alsa \
 		--disable-oss \
-		--disable-xmms
+		--disable-xmms \
+		--sysconfdir=${PKG_SYSCONFDIR}
 
 USE_X11=	yes
 USE_GMAKE=	yes
 
+EGDIR=		${PREFIX}/share/examples/xmp
+CONF_FILES=	${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
+CONF_FILES+=	${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
+
+pre-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmp/PLIST b/audio/xmp/PLIST
index 44b5196b78f..7c902840f34 100644
--- a/audio/xmp/PLIST
+++ b/audio/xmp/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:18:37 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/22 17:05:51 jmmv Exp $
 bin/xmp
 bin/xxmp
-etc/xmp-modules.conf
-etc/xmp.conf
 man/man1/xmp.1
 man/man1/xxmp.1
+share/examples/xmp/xmp-modules.conf
+share/examples/xmp/xmp.conf
+@dirrm share/examples/xmp
diff --git a/audio/xmp/distinfo b/audio/xmp/distinfo
index dcfca438162..9365016233f 100644
--- a/audio/xmp/distinfo
+++ b/audio/xmp/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2002/01/29 07:41:28 martti Exp $
+$NetBSD: distinfo,v 1.4 2002/12/22 17:05:51 jmmv Exp $
 
 SHA1 (xmp-2.0.4.tar.bz2) = 35c1578f2f6728aa2ec92f34ada050e328694167
 Size (xmp-2.0.4.tar.bz2) = 314820 bytes
-SHA1 (patch-aa) = 22f7d1ef64fba6f0dc7bf77bd1db707538bca8aa
-SHA1 (patch-ab) = 308779c6a2facd18251a1fa33947dfacdaeb4680
-SHA1 (patch-ac) = 43c70f84a7b9b9aaed0dfdbd60aee9be6cf2d0ef
+SHA1 (patch-aa) = e5ce08ae036f947c2486dcf5def72bc0a65a6600
+SHA1 (patch-ab) = 9d4732f57cf045a3904b8d9627ccb866d39e0fb0
+SHA1 (patch-ac) = 0efcb2f094f149c56da96a6ba7ba9a59ed06dc4d
 SHA1 (patch-ad) = 7b2c1f5c10b4b8a766bcca7bc4d7d9f538e89db1
+SHA1 (patch-ae) = 251bd77372088b1e72a581c0c39e722aacb40a0e
diff --git a/audio/xmp/patches/patch-aa b/audio/xmp/patches/patch-aa
index 936c1a10faa..b8dca8f51dd 100644
--- a/audio/xmp/patches/patch-aa
+++ b/audio/xmp/patches/patch-aa
@@ -1,23 +1,15 @@
-$NetBSD: patch-aa,v 1.2 2002/01/29 07:41:28 martti Exp $
+$NetBSD: patch-aa,v 1.3 2002/12/22 17:05:51 jmmv Exp $
 
 --- Makefile.orig	Sat Jan 20 02:51:28 2001
 +++ Makefile	Mon Jan 28 15:30:21 2002
-@@ -16,6 +16,7 @@
- DDIRS	= lib docs etc src scripts debian modules
- CFILES	=
- DCFILES	= Makefile.rules.old config.log config.status config.cache
-+ETCDIR	= ${PREFIX}/etc
- 
- all: xmp
- 
 @@ -43,8 +44,8 @@
  
  install::
  	@echo
 -	@echo "  Installation complete. To customize, copy /etc/xmp.conf to"
 -	@echo "  \$$HOME/.xmp/xmp.conf and /etc/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
-+	@echo "  Installation complete. To customize, copy ${PREFIX}/etc/xmp.conf to"
-+	@echo "  \$$HOME/.xmp/xmp.conf and ${PREFIX}/etc/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
++	@echo "  Installation complete. To customize, copy ${ETC_DIR}/xmp.conf to"
++	@echo "  \$$HOME/.xmp/xmp.conf and ${ETC_DIR}/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
  	@echo
  	@echo "  Please report bugs to xmp-bugs@helllabs.org."
  	@echo
diff --git a/audio/xmp/patches/patch-ab b/audio/xmp/patches/patch-ab
index 96cbc024e71..4613f0a5b32 100644
--- a/audio/xmp/patches/patch-ab
+++ b/audio/xmp/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/01/29 07:41:28 martti Exp $
+$NetBSD: patch-ab,v 1.3 2002/12/22 17:05:52 jmmv Exp $
 
 --- src/player/readrc.c.orig	Wed Jan  3 11:50:08 2001
 +++ src/player/readrc.c	Mon Jan 28 15:28:59 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.2 2002/01/29 07:41:28 martti Exp $
  	if ((rc = fopen (myrc, "r")) == NULL) {
  #ifndef __EMX__
 -	    if ((rc = fopen ("/etc/xmp.conf", "r")) == NULL) {
-+	    if ((rc = fopen ("ETCDIR/xmp.conf", "r")) == NULL) {
++	    if ((rc = fopen (ETC_DIR "/xmp.conf", "r")) == NULL) {
  #else
  	    if ((rc = fopen ("xmp.conf", "r")) == NULL) {
  #endif
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 2002/01/29 07:41:28 martti Exp $
  #ifndef __EMX__
      sprintf (myrc, "%s/.xmp/modules.conf", home);
 -    parse_modconf (ctl, "/etc/xmp-modules.conf", crc, size);
-+    parse_modconf (ctl, "ETCDIR/xmp-modules.conf", crc, size);
++    parse_modconf (ctl, ETC_DIR "/xmp-modules.conf", crc, size);
  #else
      sprintf (myrc, "%s\\.xmp\\modules.conf", home);
      parse_modconf (ctl, "xmp-modules.conf", crc, size);
diff --git a/audio/xmp/patches/patch-ac b/audio/xmp/patches/patch-ac
index 549ddcad030..89f9894e65c 100644
--- a/audio/xmp/patches/patch-ac
+++ b/audio/xmp/patches/patch-ac
@@ -1,11 +1,19 @@
-$NetBSD: patch-ac,v 1.2 2002/01/29 07:41:28 martti Exp $
+$NetBSD: patch-ac,v 1.3 2002/12/22 17:05:52 jmmv Exp $
 
---- etc/Makefile.orig	Mon Jan 28 15:55:41 2002
-+++ etc/Makefile	Mon Jan 28 15:56:18 2002
-@@ -20,5 +20,5 @@
- 	@if [ -f $(DEST_DIR)/etc/xmp-modules.conf ]; then \
- 	    mv -f $(DEST_DIR)/etc/xmp-modules.conf $(DEST_DIR)/etc/xmp-modules.conf.old; \
- 	fi
+--- etc/Makefile.orig	Fri Dec 29 19:06:28 2000
++++ etc/Makefile
+@@ -13,12 +13,6 @@ subdist:: all
+ include ../Makefile.rules
+ 
+ install::
+-	@echo Installing xmp.conf and xmp-modules.conf in $(DEST_DIR)...
+-	@if [ -f $(DEST_DIR)/etc/xmp.conf ]; then \
+-	    mv -f $(DEST_DIR)/etc/xmp.conf $(DEST_DIR)/etc/xmp.conf.old; \
+-	fi
+-	@if [ -f $(DEST_DIR)/etc/xmp-modules.conf ]; then \
+-	    mv -f $(DEST_DIR)/etc/xmp-modules.conf $(DEST_DIR)/etc/xmp-modules.conf.old; \
+-	fi
 -	$(INSTALL) -m644 xmp.conf xmp-modules.conf $(DEST_DIR)/etc
-+	$(INSTALL) -m644 xmp.conf xmp-modules.conf ${PREFIX}/etc
++	@echo Installing xmp.conf and xmp-modules.conf in $(datadir)/examples/xmp...
++	$(INSTALL) -m644 xmp.conf xmp-modules.conf $(datadir)/examples/xmp
  
diff --git a/audio/xmp/patches/patch-ae b/audio/xmp/patches/patch-ae
new file mode 100644
index 00000000000..65788fd6945
--- /dev/null
+++ b/audio/xmp/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2002/12/22 17:05:52 jmmv Exp $
+
+--- Makefile.rules.in.orig	Sat Jan 20 02:51:53 2001
++++ Makefile.rules.in
+@@ -7,12 +7,14 @@ DATE	= Fri Jan 19 23:51:53 BRST 2001
+ DEST_DIR=
+ prefix	= $(DEST_DIR)@prefix@
+ exec_prefix= $(DEST_DIR)@prefix@
++datadir = @datadir@
++ETC_DIR = @sysconfdir@
+ BIN_DIR	= @bindir@
+ LIB_DIR = @libdir@
+ MAN_DIR	= @mandir@/man1
+ 
+ CC	= @CC@
+-CFLAGS	= -c @CFLAGS@ @DEFS@ @CINCS@
++CFLAGS	= -c @CFLAGS@ @DEFS@ @CINCS@ -DETC_DIR=\"${ETC_DIR}\"
+ LD	= @CC@
+ LDFLAGS	= -o$@ @LDFLAGS@
+ RANLIB	= @RANLIB@