Install example files in the examples tree. Fix references to installed

configuration files in the rplayd(8) manpage.  Bump PKGREVISION to 1.

4 files changed, 18 insertions, 54 deletions

diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index e349d86370a..f569655fc41 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2003/06/02 01:21:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.40 2003/06/06 10:31:08 jmmv Exp $
 #
 
 DISTNAME=	rplay-3.3.2
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://rplay.doit.org/pub/rplay/ \
 		http://rplay.doit.org/dist/
@@ -19,15 +20,24 @@ CONFIGURE_ENV+=		RPLAY_TARGET=generic	# XXX generic, or oss, or sun?
 
 INFO_FILES=	RPLAY.info RPTP.info librplay.info rplay.info
 RCD_SCRIPTS=	rplayd
+EGDIR=		${PREFIX}/share/examples/rplay
 
 pre-configure:
 	cd ${WRKSRC}/doc; for manpage in *.[0-9]; do			\
 		${SED}	-e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"	\
 			-e "s|/usr/local|${PREFIX}|g"			\
+			-e "s|/etc/rplay|${PKG_SYSCONFDIR}|g"		\
 			$${manpage} > $${manpage}.pdone;		\
 		${MV} -f $${manpage}.pdone $${manpage};			\
 	done
 
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+.for f in rplay.conf rplay.helpers rplay.hosts rplay.servers
+	${INSTALL_DATA} ${WRKSRC}/etc/$f ${EGDIR}
+.endfor
+.undef f
+
 .include "../../audio/gsm/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../devel/rx/buildlink2.mk"
diff --git a/audio/rplay/PLIST b/audio/rplay/PLIST
index a6767e39bce..c56c7698797 100644
--- a/audio/rplay/PLIST
+++ b/audio/rplay/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:02 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/06/06 10:31:08 jmmv Exp $
 etc/rc.d/rplayd
 bin/rplay
 bin/rptp
@@ -28,3 +28,8 @@ man/man5/rplay.hosts.5
 man/man5/rplay.servers.5
 man/man8/rplayd.8
 sbin/rplayd
+share/examples/rplay/rplay.conf
+share/examples/rplay/rplay.helpers
+share/examples/rplay/rplay.hosts
+share/examples/rplay/rplay.servers
+@dirrm share/examples/rplay
diff --git a/audio/rplay/distinfo b/audio/rplay/distinfo
index 6806c6ae9cd..82420c27560 100644
--- a/audio/rplay/distinfo
+++ b/audio/rplay/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/01/11 15:10:56 skrll Exp $
+$NetBSD: distinfo,v 1.4 2003/06/06 10:31:08 jmmv Exp $
 
 SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662
 Size (rplay-3.3.2.tar.gz) = 480015 bytes
@@ -9,7 +9,6 @@ SHA1 (patch-ad) = 395048f6f0d0c579dfe81a0a2a0556651305e07b
 SHA1 (patch-ae) = 5095335425d16e24831ee8bcaacc60b0ec4d00ee
 SHA1 (patch-af) = 12f6bc02de7fceb44b6390178429654ef85dcc5d
 SHA1 (patch-ag) = ce19208502a150b7b9808c8f1755d116c978a506
-SHA1 (patch-ah) = 5467533e62fdae9ee8903c7a0614d5f3a2fcf898
 SHA1 (patch-ai) = b95f7af868a2dcf4a46f8b0294cef97c277d1933
 SHA1 (patch-aj) = 47535315d2edecd578a0e5c59cdfdf9f2e9a9a4a
 SHA1 (patch-ak) = 283d43624c6aa6b8577fae84763fd7e7611259df
diff --git a/audio/rplay/patches/patch-ah b/audio/rplay/patches/patch-ah
deleted file mode 100644
index a4208e4b042..00000000000
--- a/audio/rplay/patches/patch-ah
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2000/01/26 22:11:36 jlam Exp $
-
---- doc/rplayd.8.orig	Tue Jul 14 18:35:23 1998
-+++ doc/rplayd.8	Tue Jan 18 16:15:39 2000
-@@ -125,7 +125,7 @@
- Linux uses cdrom[0-3] -> /dev/cdrom[0-3].
- .TP
- .I "\-C FILE, \-\-conf=FILE"
--Use FILE for rplay.conf (/etc/rplay/rplay.conf).
-+Use FILE for rplay.conf.
- .TP
- .I "\-T N, \-\-connection\-timeout=N"
- Close idle RPTP connections after N seconds, disabled with 0 (300).
-@@ -146,10 +146,10 @@
- Display helpful information.
- .TP
- .I "\-\-helpers=FILE"
--Use FILE for rplay.helpers (/etc/rplay/rplay.helpers).
-+Use FILE for rplay.helpers.
- .TP
- .I "\-H FILE, \-\-hosts=FILE"
--Use FILE for rplay.hosts (/etc/rplay/rplay.hosts).
-+Use FILE for rplay.hosts.
- .TP
- .I "\-\-inetd"
- Enable inetd mode. (disabled)
-@@ -191,7 +191,7 @@
- (--other-rptp-port may also be available)
- .TP
- .I "\-S FILE, \-\-servers=FILE"
--Use FILE for rplay.servers (/etc/rplay/rplay.servers).
-+Use FILE for rplay.servers.
- .TP
- .I "\-t N, \-\-timeout=N"
- Exit after N idle seconds, disabled with 0 (0).
-@@ -205,10 +205,10 @@
- .nf
- ~/.rplaydrc
- /tmp/.rplay-cache
--/usr/local/etc/rplay.conf
--/usr/local/etc/rplay.helpers
--/usr/local/etc/rplay.hosts
--/usr/local/etc/rplay.servers
-+/usr/pkg/etc/rplay.conf
-+/usr/pkg/etc/rplay.helpers
-+/usr/pkg/etc/rplay.hosts
-+/usr/pkg/etc/rplay.servers
- .fi
- .SH SEE ALSO
- .IR rplay.conf (5),