Attachment #9544 for bug #19521

View | Details | Raw Unified | Return to bug 19521
Collapse All | Expand All




#

PORTNAME=	rplay
PORTVERSION=	3.3.2
CATEGORIES=	audio
MASTER_SITES=	http://rplay.doit.org/dist/



LIB_DEPENDS=	gsm.1:${PORTSDIR}/audio/gsm

INSTALLS_SHLIB=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib"

MAN1=		rplay.1 rptp.1
MAN5=		rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplay.servers.5
MAN8=		rplayd.8

INFO_FILES=	RPLAY.info RPTP.info librplay.info rplayd.info

post-extract:
	@${CP} ${WRKSRC}/doc/rplay.texi ${WRKSRC}/doc/rplayd.texi

post-install:
.for info in ${INFO_FILES}
	@install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
.endfor
.if !exists(${PREFIX}/etc/rc.d/rplayd.sh)
	@${ECHO} "===>   Installing ${PREFIX}/etc/rc.d/rplayd.sh startup file"
	@${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/rplayd.sh
	@${ECHO} "[ -x ${PREFIX}/sbin/rplayd ] && ( ${PREFIX}/sbin/rplayd & ) && ${ECHO} -n ' rplayd'" >> ${PREFIX}/etc/rc.d/rplayd.sh
	@${CHMOD} 751 ${PREFIX}/etc/rc.d/rplayd.sh
.endif
.if !exists(${PREFIX}/etc/rplay.hosts)
	@${ECHO} localhost > ${PREFIX}/etc/rplay.hosts
.endif

.include <bsd.port.mk>

Line 1 Link Here

(-)audio/rplay/files/md5 (-1 / +1 lines)
1	MD5 (rplay-3.2.0b6.tar.gz) = d8346e6f132193d076341de0d9fa35ca	1	MD5 (rplay-3.3.2.tar.gz) = e39888f6bea32e1c8cf4a8880b416e56




*** configure.bak	Fri Feb  2 03:30:38 1996
--- configure	Fri Jun 13 19:14:52 1997
***************
*** 2589,2597 ****
  
  
  if test "$no_x" = "yes" -o "$HAVE_FORMS" = "no"; then
! 	BUILD_TARGETS="include lib adpcm gsm librplay rplayd rplay rptp doc"
  else
! 	BUILD_TARGETS="include lib adpcm gsm librplay rplayd rplay rptp xrplay doc"
  fi
  
  
--- 2589,2597 ----
  
  
  if test "$no_x" = "yes" -o "$HAVE_FORMS" = "no"; then
! 	BUILD_TARGETS="include lib adpcm librplay rplayd rplay rptp doc"
  else
! 	BUILD_TARGETS="include lib adpcm librplay rplayd rplay rptp xrplay doc"
  fi
  
  




--- rplayd/Makefile.in.orig	Wed Jun  9 15:27:43 1999
+++ rplayd/Makefile.in	Wed Jun 21 23:04:00 2000
@@ -54,7 +54,6 @@
 install:	all
 		$(MKINSTALLDIRS) $(sbindir)
 		$(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
-		@test -x $(bindir)/$(TARGET) && echo "" && echo "    Note: Consider removing $(bindir)/$(TARGET)" && echo ""
 
 uninstall:
 		$(RM) $(bindir)/$(TARGET)
***************
*** 9,21 ****
  MKINSTALLDIRS= @srcdir@/../mkinstalldirs
  
  CPPFLAGS=	$(CC_OPTIONS) -I. -I../include -I@srcdir@ -I@srcdir@/../include -I@srcdir@/../lib \
! 		-I@srcdir@/../adpcm -I@srcdir@/../gsm @DEFS@
  
  .c.o:
  		$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
  
  LDFLAGS=	$(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
! 		-L../adpcm -ladpcm -L../gsm -lgsm @LDFLAGS@ @LIBS@ -lm
  
  TARGET=		rplayd
  
--- 10,22 ----
  MKINSTALLDIRS= @srcdir@/../mkinstalldirs
  
  CPPFLAGS=	$(CC_OPTIONS) -I. -I../include -I@srcdir@ -I@srcdir@/../include -I@srcdir@/../lib \
! 		-I@srcdir@/../adpcm -I/usr/local/include @DEFS@
  
  .c.o:
  		$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
  
  LDFLAGS=	$(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
! 		-L../adpcm -ladpcm -L/usr/local/lib -lgsm @LDFLAGS@ @LIBS@ -lm
  
  TARGET=		rplayd
  

Line 0 Link Here

(-)audio/rplay/patches/patch-ac (+10 lines)
	1	--- Makefile.config.in.orig Thu Aug 13 15:12:59 1998
	2	+++ Makefile.config.in Wed Jun 21 22:26:35 2000
	3	@@ -43,6 +43,7 @@
	4	#CC_OPTIONS= -O -cckr # SGI
	5	#CC_OPTIONS= -O # generic
	6	#CC_OPTIONS= -g # debug
	7	+CC_OPTIONS= @CPPFLAGS@
	8
	9	##
	10	## Extra linker options.




--- doc/Makefile.in.orig	Wed Jul 15 07:35:23 1998
+++ doc/Makefile.in	Thu Jun 22 00:41:13 2000
@@ -23,15 +23,15 @@
 .texi.html:
 	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $<
 
-all:
+all: info
 
-info: RPLAY.info RPTP.info librplay.info rplay.info
+info: RPLAY.info RPTP.info librplay.info rplayd.info
 
-dvi: RPLAY.dvi RPTP.dvi librplay.dvi rplay.dvi
+dvi: RPLAY.dvi RPTP.dvi librplay.dvi rplayd.dvi
 
-ps: RPLAY.ps RPTP.ps librplay.ps rplay.ps
+ps: RPLAY.ps RPTP.ps librplay.ps rplayd.ps
 
-html: RPLAY.html RPTP.html librplay.html rplay.html
+html: RPLAY.html RPTP.html librplay.html rplayd.html
 
 man:
 	./genman rplay.1.in
@@ -50,7 +50,7 @@
 	-$(INSTALL_DATA) RPLAY.info $(infodir)/RPLAY.info
 	-$(INSTALL_DATA) RPTP.info $(infodir)/RPTP.info
 	-$(INSTALL_DATA) librplay.info $(infodir)/librplay.info
-	-$(INSTALL_DATA) rplay.info $(infodir)/rplay.info
+	-$(INSTALL_DATA) rplayd.info $(infodir)/rplayd.info
 
 uninstall:
 	-$(RM) $(mandir)/man1/rplay.1
@@ -63,7 +63,7 @@
 	-$(RM) $(infodir)/RPLAY.info
 	-$(RM) $(infodir)/RPTP.info
 	-$(RM) $(infodir)/librplay.info
-	-$(RM) $(infodir)/rplay.info
+	-$(RM) $(infodir)/rplayd.info
 
 clean:
 	$(RM) *~ *.bak *.orig




--- doc/RPLAY.texi.orig	Wed Jul 15 07:35:23 1998
+++ doc/RPLAY.texi	Wed Jun 21 22:38:54 2000
@@ -2,6 +2,10 @@
 @c %**start of header
 @setfilename RPLAY.info
 @settitle The RPLAY Protocol
+@dircategory Network Audio Systems
+@direntry
+* RPLAY Protocol: (RPLAY)	The RPLAY Protocol
+@end direntry
 @iftex
 @finalout
 @end iftex




--- doc/RPTP.texi.orig	Wed Jul 15 07:35:23 1998
+++ doc/RPTP.texi	Wed Jun 21 22:38:56 2000
@@ -2,6 +2,10 @@
 @c %**start of header
 @setfilename RPTP.info
 @settitle The RPTP Protocol
+@dircategory Network Audio Systems
+@direntry
+* RPTP: (RPTP)			RPTP Protocol
+@end direntry
 @defindex ev
 @iftex
 @finalout




--- doc/librplay.texi.orig	Wed Jul 15 07:35:23 1998
+++ doc/librplay.texi	Wed Jun 21 22:38:58 2000
@@ -2,6 +2,10 @@
 @c %**start of header
 @setfilename librplay.info
 @settitle The rplay Programmer's Manual
+@dircategory Network Audio Systems
+@direntry
+* librplay: (librplay)		The rplay Programmer's Manual
+@end direntry
 @iftex
 @finalout
 @end iftex




--- doc/rplayd.texi.orig	Wed Jul 15 07:35:23 1998
+++ doc/rplayd.texi	Thu Jun 22 01:20:50 2000
@@ -1,7 +1,11 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
-@setfilename rplay.info
+@setfilename rplayd.info
 @settitle rplay
+@dircategory Network Audio Systems
+@direntry
+* rplayd: (rplayd)		RPlay
+@end direntry
 @iftex
 @finalout
 @end iftex
@@ -71,7 +75,6 @@
 * rplayd::                      The rplay audio server.
 * rplay::                       A sample RPLAY client.
 * rptp::                        A sample RPTP client.
-* xrplay::                      A X Windows rplay audio control panel.
 @end menu
 
 @node Overview, rplayd, Top, Top
@@ -162,25 +165,12 @@
 attempt to determine whether or not the server has the sound before
 using the network.
 
-@node rptp, xrplay, rplay, Top
+@node rptp,  , rplay, Top
 @chapter rptp
 rptp is a simple RPTP client that communicates with rplayd using the
 RPTP protocol.  Several commands can be issued to control rplayd and
 report its status.  See the output of the rptp help command for a list
 of available commands.
-
-@node xrplay,  , rptp, Top
-@chapter xrplay
-rplay control panel which includes CD player-like buttons, volume
-control, a simple vu meter, and a sound progess bar.  Sounds can be
-played, paused, continued, and stopped using the appropriate buttons.
-
-xrplay is also useful as a sound file player and can be used with web
-browsers and other applications that use external programs to play
-sounds.
-
-xrplay communicates with the local (or remote) rplayd using the RPTP
-protocol.
 
 @bye
 




--- doc/rplayd.8.orig	Wed Jul 15 07:35:23 1998
+++ doc/rplayd.8	Wed Jun 21 22:39:07 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).




--- librplay/Makefile.in.orig	Tue Mar 23 11:38:38 1999
+++ librplay/Makefile.in	Thu Jun 22 00:07:42 2000
@@ -19,11 +19,12 @@
 		$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 TARGET=		$(LIBRPLAY_NAME)
+SOVER=		1
 SRCS=		rplay.c rptp.c async.c
 OBJS=		rplay.o rptp.o async.o
 SHAREDOBJS=	rplay.lo rptp.lo async.lo
 
-all:		$(TARGET) librplay.so
+all:		$(TARGET) librplay.so.$(SOVER)
 
 #
 # Use the following for SunOS 4.1.x, Solaris 2.x, Linux, NetBSD
@@ -32,8 +33,9 @@
 		$(AR) rcv $@ $?
 		$(RANLIB) $@
 
-librplay.so:	$(SHAREDOBJS)
-		$(CC) -o $@ $(SHAREDOBJS) $(LDFLAGS)
+librplay.so.$(SOVER):	$(SHAREDOBJS)
+		$(CC) -o $@ -Wl,-soname,$@ $(SHAREDOBJS) $(LDFLAGS)
+		ln -sf $@ librplay.so
 
 #
 # For HP-UX comment above and uncomment below.
@@ -50,7 +52,8 @@
 install:	all
 		$(MKINSTALLDIRS) $(libdir)
 		$(INSTALL_DATA) $(TARGET) $(libdir)
-		$(INSTALL_DATA) librplay.so $(libdir)
+		$(INSTALL_DATA) librplay.so.$(SOVER) $(libdir)
+		ln -sf librplay.so.$(SOVER) $(libdir)/librplay.so
 
 uninstall:
 		$(RM) $(libdir)/$(TARGET)




--- rplayd/sound.h.orig	Wed Jun  9 15:27:44 1999
+++ rplayd/sound.h	Wed Jun 21 22:29:37 2000
@@ -170,9 +170,9 @@
     int gsm_bit_frame_bytes;	/* Number of bytes in gsm_bit_frame */
     int gsm_fixed_buffer_size;
 #endif /* HAVE_GSM */
-#ifdef HAVE_CDROM
+#if defined(HAVE_CDROM) || defined(HAVE_HELPERS)
     int pid;
-#endif /* HAVE_CDROM */
+#endif /* HAVE_CDROM || HAVE_HELPERS */
 }
 SINDEX;
 




--- rplayd/spool.c.orig	Thu Mar 11 06:14:38 1999
+++ rplayd/spool.c	Wed Jun 21 23:20:13 2000
@@ -1127,8 +1127,8 @@
 				spool_flow_pause(sp);
 			    }
 			}
-#endif /* HAVE_CDROM */
 		    }
+#endif /* HAVE_CDROM */
 		}
 		else
 		{




--- rx/Makefile.in.orig	Wed Jun 21 22:57:55 2000
+++ rx/Makefile.in	Wed Jun 21 22:59:43 2000
@@ -64,11 +64,11 @@
 all: librx.a
 
 install: all
-	test -d $(libdir) || mkdir $(libdir)
-	test -d $(includedir) || mkdir $(includedir)
-	$(INSTALL) librx.a $(libdir)/librx.a
-	$(RANLIB) $(libdir)/librx.a
-	$(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
+#	test -d $(libdir) || mkdir $(libdir)
+#	test -d $(includedir) || mkdir $(includedir)
+#	$(INSTALL) librx.a $(libdir)/librx.a
+#	$(RANLIB) $(libdir)/librx.a
+#	$(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
 
 
 uninstall:

Lines 4-6 Link Here

(-)audio/rplay/pkg/DESCR (+2 lines)
4	HP9000/710 and now FreeBSD. The rplay clients and client library should	4	HP9000/710 and now FreeBSD. The rplay clients and client library should
5	work on any system that supports Berkeley sockets. The X Window	5	work on any system that supports Berkeley sockets. The X Window
6	System is not required.	6	System is not required.
		7
		8	WWW: http://rplay.doit.org/




etc/rplay.hosts
bin/rplay
bin/rptp
@comment requires XForms
@comment bin/xrplay
sbin/rplayd
include/rplay.h
lib/librplay.a
lib/librplay.so
lib/librplay.so.1
@unexec install-info --delete %D/info/RPLAY.info %D/info/dir
@unexec install-info --delete %D/info/RPTP.info %D/info/dir
@unexec install-info --delete %D/info/librplay.info %D/info/dir
@unexec install-info --delete %D/info/rplayd.info %D/info/dir
info/RPLAY.info
info/RPTP.info
info/librplay.info
info/rplayd.info
@exec install-info %D/info/RPLAY.info %D/info/dir
@exec install-info %D/info/RPTP.info %D/info/dir
@exec install-info %D/info/librplay.info %D/info/dir
@exec install-info %D/info/rplayd.info %D/info/dir

Lines 1-8 Link Here

(-)audio/rplay/scripts/configure (-8 lines)
1	#!/bin/sh
2
3	chmod -R +w ${WRKSRC}
4	echo -n "Removing disgusting malloc.h includes. Please wait.."
5	for i in `find ${WRKSRC} -name '*.[ch]' \| xargs fgrep -l malloc.h`; do
6	sed -e 's/malloc.h/stdlib.h/' < $i > $i.bak && mv $i.bak $i
7	done
8	echo " Done."

Return to bug 19521

Lines 6-12 Link Here

(-)audio/rplay/Makefile (-14 / +26 lines)
6	#	6	#
7		7
8	PORTNAME= rplay	8	PORTNAME= rplay
9	PORTVERSION= 3.2.0b6	9	PORTVERSION= 3.3.2
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://rplay.doit.org/dist/	11	MASTER_SITES= http://rplay.doit.org/dist/
12		12
Lines 14-33 Link Here
14		14
15	LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm	15	LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
16		16
17	HAS_CONFIGURE= yes	17	INSTALLS_SHLIB= yes
18	USE_GMAKE= yes	18	GNU_CONFIGURE= yes
19	MAN1= rplay.1 xrplay.1 rplayd.1 rptp.1	19	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
20	MAN5= rplay.conf.5 rplay.hosts.5 rplay.servers.5	20	LIBS="-L${LOCALBASE}/lib"
		21
		22	MAN1= rplay.1 rptp.1
		23	MAN5= rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplay.servers.5
		24	MAN8= rplayd.8
		25
		26	INFO_FILES= RPLAY.info RPTP.info librplay.info rplayd.info
		27
		28	post-extract:
		29	@${CP} ${WRKSRC}/doc/rplay.texi ${WRKSRC}/doc/rplayd.texi
21		30
22	post-install:	31	post-install:
23	@if [ ! -f ${PREFIX}/etc/rc.d/rplayd.sh ]; then \	32	.for info in ${INFO_FILES}
24	${ECHO} "Installing ${PREFIX}/etc/rc.d/rplayd.sh startup file."; \	33	@install-info ${PREFIX}/info/${info} ${PREFIX}/info/dir
25	${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/rplayd.sh; \	34	.endfor
26	${ECHO} "[ -x ${PREFIX}/sbin/rplayd ] && ( ${PREFIX}/sbin/rplayd & ) && ${ECHO} -n ' rplayd'" >> ${PREFIX}/etc/rc.d/rplayd.sh; \	35	.if !exists(${PREFIX}/etc/rc.d/rplayd.sh)
27	${CHMOD} 751 ${PREFIX}/etc/rc.d/rplayd.sh; \	36	@${ECHO} "===> Installing ${PREFIX}/etc/rc.d/rplayd.sh startup file"
28	fi	37	@${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/rplayd.sh
29	@if [ ! -f ${PREFIX}/etc/rplay.hosts ]; then \	38	@${ECHO} "[ -x ${PREFIX}/sbin/rplayd ] && ( ${PREFIX}/sbin/rplayd & ) && ${ECHO} -n ' rplayd'" >> ${PREFIX}/etc/rc.d/rplayd.sh
30	${ECHO} localhost > ${PREFIX}/etc/rplay.hosts; \	39	@${CHMOD} 751 ${PREFIX}/etc/rc.d/rplayd.sh
31	fi	40	.endif
		41	.if !exists(${PREFIX}/etc/rplay.hosts)
		42	@${ECHO} localhost > ${PREFIX}/etc/rplay.hosts
		43	.endif
32		44
33	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-23 Link Here

(-)audio/rplay/patches/patch-aa (-23 lines)
1	*** configure.bak Fri Feb 2 03:30:38 1996
2	--- configure Fri Jun 13 19:14:52 1997
3	***************
4	* 2589,2597 **
5
6
7	if test "$no_x" = "yes" -o "$HAVE_FORMS" = "no"; then
8	! BUILD_TARGETS="include lib adpcm gsm librplay rplayd rplay rptp doc"
9	else
10	! BUILD_TARGETS="include lib adpcm gsm librplay rplayd rplay rptp xrplay doc"
11	fi
12
13
14	--- 2589,2597 ----
15
16
17	if test "$no_x" = "yes" -o "$HAVE_FORMS" = "no"; then
18	! BUILD_TARGETS="include lib adpcm librplay rplayd rplay rptp doc"
19	else
20	! BUILD_TARGETS="include lib adpcm librplay rplayd rplay rptp xrplay doc"
21	fi
22
23

Lines 1-39 Link Here

(-)audio/rplay/patches/patch-ab (-39 / +10 lines)
1	*** rplayd/Makefile.in.orig Fri Feb 2 03:13:57 1996	1	--- rplayd/Makefile.in.orig Wed Jun 9 15:27:43 1999
2	--- rplayd/Makefile.in Fri Jun 13 19:31:38 1997	2	+++ rplayd/Makefile.in Wed Jun 21 23:04:00 2000
3	***************	3	@@ -54,7 +54,6 @@
4	* 1,4 **	4	install: all
5	--- 1,5 ----	5	$(MKINSTALLDIRS) $(sbindir)
6	include @RPLAY_TOP@/Makefile.config	6	$(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET)
7	+ bindir= $(exec_prefix)/sbin	7	- @test -x $(bindir)/$(TARGET) && echo "" && echo " Note: Consider removing $(bindir)/$(TARGET)" && echo ""
8		8
9	srcdir = @srcdir@	9	uninstall:
10	VPATH = @srcdir@	10	$(RM) $(bindir)/$(TARGET)
11	***************
12	* 9,21 **
13	MKINSTALLDIRS= @srcdir@/../mkinstalldirs
14
15	CPPFLAGS= $(CC_OPTIONS) -I. -I../include -I@srcdir@ -I@srcdir@/../include -I@srcdir@/../lib \
16	! -I@srcdir@/../adpcm -I@srcdir@/../gsm @DEFS@
17
18	.c.o:
19	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
20
21	LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
22	! -L../adpcm -ladpcm -L../gsm -lgsm @LDFLAGS@ @LIBS@ -lm
23
24	TARGET= rplayd
25
26	--- 10,22 ----
27	MKINSTALLDIRS= @srcdir@/../mkinstalldirs
28
29	CPPFLAGS= $(CC_OPTIONS) -I. -I../include -I@srcdir@ -I@srcdir@/../include -I@srcdir@/../lib \
30	! -I@srcdir@/../adpcm -I/usr/local/include @DEFS@
31
32	.c.o:
33	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
34
35	LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
36	! -L../adpcm -ladpcm -L/usr/local/lib -lgsm @LDFLAGS@ @LIBS@ -lm
37
38	TARGET= rplayd
39

Line 0 Link Here

(-)audio/rplay/patches/patch-ad (+41 lines)
	1	--- doc/Makefile.in.orig Wed Jul 15 07:35:23 1998
	2	+++ doc/Makefile.in Thu Jun 22 00:41:13 2000
	3	@@ -23,15 +23,15 @@
	4	.texi.html:
	5	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $<
	6
	7	-all:
	8	+all: info
	9
	10	-info: RPLAY.info RPTP.info librplay.info rplay.info
	11	+info: RPLAY.info RPTP.info librplay.info rplayd.info
	12
	13	-dvi: RPLAY.dvi RPTP.dvi librplay.dvi rplay.dvi
	14	+dvi: RPLAY.dvi RPTP.dvi librplay.dvi rplayd.dvi
	15
	16	-ps: RPLAY.ps RPTP.ps librplay.ps rplay.ps
	17	+ps: RPLAY.ps RPTP.ps librplay.ps rplayd.ps
	18
	19	-html: RPLAY.html RPTP.html librplay.html rplay.html
	20	+html: RPLAY.html RPTP.html librplay.html rplayd.html
	21
	22	man:
	23	./genman rplay.1.in
	24	@@ -50,7 +50,7 @@
	25	-$(INSTALL_DATA) RPLAY.info $(infodir)/RPLAY.info
	26	-$(INSTALL_DATA) RPTP.info $(infodir)/RPTP.info
	27	-$(INSTALL_DATA) librplay.info $(infodir)/librplay.info
	28	- -$(INSTALL_DATA) rplay.info $(infodir)/rplay.info
	29	+ -$(INSTALL_DATA) rplayd.info $(infodir)/rplayd.info
	30
	31	uninstall:
	32	-$(RM) $(mandir)/man1/rplay.1
	33	@@ -63,7 +63,7 @@
	34	-$(RM) $(infodir)/RPLAY.info
	35	-$(RM) $(infodir)/RPTP.info
	36	-$(RM) $(infodir)/librplay.info
	37	- -$(RM) $(infodir)/rplay.info
	38	+ -$(RM) $(infodir)/rplayd.info
	39
	40	clean:
	41	$(RM) ~ .bak *.orig

Line 0 Link Here

(-)audio/rplay/patches/patch-ae (+13 lines)
	1	--- doc/RPLAY.texi.orig Wed Jul 15 07:35:23 1998
	2	+++ doc/RPLAY.texi Wed Jun 21 22:38:54 2000
	3	@@ -2,6 +2,10 @@
	4	@c %**start of header
	5	@setfilename RPLAY.info
	6	@settitle The RPLAY Protocol
	7	+@dircategory Network Audio Systems
	8	+@direntry
	9	+* RPLAY Protocol: (RPLAY) The RPLAY Protocol
	10	+@end direntry
	11	@iftex
	12	@finalout
	13	@end iftex

Line 0 Link Here

(-)audio/rplay/patches/patch-af (+13 lines)
	1	--- doc/RPTP.texi.orig Wed Jul 15 07:35:23 1998
	2	+++ doc/RPTP.texi Wed Jun 21 22:38:56 2000
	3	@@ -2,6 +2,10 @@
	4	@c %**start of header
	5	@setfilename RPTP.info
	6	@settitle The RPTP Protocol
	7	+@dircategory Network Audio Systems
	8	+@direntry
	9	+* RPTP: (RPTP) RPTP Protocol
	10	+@end direntry
	11	@defindex ev
	12	@iftex
	13	@finalout

Line 0 Link Here

(-)audio/rplay/patches/patch-ag (+13 lines)
	1	--- doc/librplay.texi.orig Wed Jul 15 07:35:23 1998
	2	+++ doc/librplay.texi Wed Jun 21 22:38:58 2000
	3	@@ -2,6 +2,10 @@
	4	@c %**start of header
	5	@setfilename librplay.info
	6	@settitle The rplay Programmer's Manual
	7	+@dircategory Network Audio Systems
	8	+@direntry
	9	+* librplay: (librplay) The rplay Programmer's Manual
	10	+@end direntry
	11	@iftex
	12	@finalout
	13	@end iftex

Line 0 Link Here

(-)audio/rplay/patches/patch-ah (+50 lines)
	1	--- doc/rplayd.texi.orig Wed Jul 15 07:35:23 1998
	2	+++ doc/rplayd.texi Thu Jun 22 01:20:50 2000
	3	@@ -1,7 +1,11 @@
	4	\input texinfo @c --texinfo--
	5	@c %**start of header
	6	-@setfilename rplay.info
	7	+@setfilename rplayd.info
	8	@settitle rplay
	9	+@dircategory Network Audio Systems
	10	+@direntry
	11	+* rplayd: (rplayd) RPlay
	12	+@end direntry
	13	@iftex
	14	@finalout
	15	@end iftex
	16	@@ -71,7 +75,6 @@
	17	* rplayd:: The rplay audio server.
	18	* rplay:: A sample RPLAY client.
	19	* rptp:: A sample RPTP client.
	20	-* xrplay:: A X Windows rplay audio control panel.
	21	@end menu
	22
	23	@node Overview, rplayd, Top, Top
	24	@@ -162,25 +165,12 @@
	25	attempt to determine whether or not the server has the sound before
	26	using the network.
	27
	28	-@node rptp, xrplay, rplay, Top
	29	+@node rptp, , rplay, Top
	30	@chapter rptp
	31	rptp is a simple RPTP client that communicates with rplayd using the
	32	RPTP protocol. Several commands can be issued to control rplayd and
	33	report its status. See the output of the rptp help command for a list
	34	of available commands.
	35	-
	36	-@node xrplay, , rptp, Top
	37	-@chapter xrplay
	38	-rplay control panel which includes CD player-like buttons, volume
	39	-control, a simple vu meter, and a sound progess bar. Sounds can be
	40	-played, paused, continued, and stopped using the appropriate buttons.
	41	-
	42	-xrplay is also useful as a sound file player and can be used with web
	43	-browsers and other applications that use external programs to play
	44	-sounds.
	45	-
	46	-xrplay communicates with the local (or remote) rplayd using the RPTP
	47	-protocol.
	48
	49	@bye
	50

Line 0 Link Here

(-)audio/rplay/patches/patch-ai (+33 lines)
	1	--- doc/rplayd.8.orig Wed Jul 15 07:35:23 1998
	2	+++ doc/rplayd.8 Wed Jun 21 22:39:07 2000
	3	@@ -125,7 +125,7 @@
	4	Linux uses cdrom[0-3] -> /dev/cdrom[0-3].
	5	.TP
	6	.I "\-C FILE, \-\-conf=FILE"
	7	-Use FILE for rplay.conf (/etc/rplay/rplay.conf).
	8	+Use FILE for rplay.conf.
	9	.TP
	10	.I "\-T N, \-\-connection\-timeout=N"
	11	Close idle RPTP connections after N seconds, disabled with 0 (300).
	12	@@ -146,10 +146,10 @@
	13	Display helpful information.
	14	.TP
	15	.I "\-\-helpers=FILE"
	16	-Use FILE for rplay.helpers (/etc/rplay/rplay.helpers).
	17	+Use FILE for rplay.helpers.
	18	.TP
	19	.I "\-H FILE, \-\-hosts=FILE"
	20	-Use FILE for rplay.hosts (/etc/rplay/rplay.hosts).
	21	+Use FILE for rplay.hosts.
	22	.TP
	23	.I "\-\-inetd"
	24	Enable inetd mode. (disabled)
	25	@@ -191,7 +191,7 @@
	26	(--other-rptp-port may also be available)
	27	.TP
	28	.I "\-S FILE, \-\-servers=FILE"
	29	-Use FILE for rplay.servers (/etc/rplay/rplay.servers).
	30	+Use FILE for rplay.servers.
	31	.TP
	32	.I "\-t N, \-\-timeout=N"
	33	Exit after N idle seconds, disabled with 0 (0).

Line 0 Link Here

(-)audio/rplay/patches/patch-aj (+38 lines)
	1	--- librplay/Makefile.in.orig Tue Mar 23 11:38:38 1999
	2	+++ librplay/Makefile.in Thu Jun 22 00:07:42 2000
	3	@@ -19,11 +19,12 @@
	4	$(CC) -c -fPIC $(CPPFLAGS) $(CFLAGS) -o $@ $<
	5
	6	TARGET= $(LIBRPLAY_NAME)
	7	+SOVER= 1
	8	SRCS= rplay.c rptp.c async.c
	9	OBJS= rplay.o rptp.o async.o
	10	SHAREDOBJS= rplay.lo rptp.lo async.lo
	11
	12	-all: $(TARGET) librplay.so
	13	+all: $(TARGET) librplay.so.$(SOVER)
	14
	15	#
	16	# Use the following for SunOS 4.1.x, Solaris 2.x, Linux, NetBSD
	17	@@ -32,8 +33,9 @@
	18	$(AR) rcv $@ $?
	19	$(RANLIB) $@
	20
	21	-librplay.so: $(SHAREDOBJS)
	22	- $(CC) -o $@ $(SHAREDOBJS) $(LDFLAGS)
	23	+librplay.so.$(SOVER): $(SHAREDOBJS)
	24	+ $(CC) -o $@ -Wl,-soname,$@ $(SHAREDOBJS) $(LDFLAGS)
	25	+ ln -sf $@ librplay.so
	26
	27	#
	28	# For HP-UX comment above and uncomment below.
	29	@@ -50,7 +52,8 @@
	30	install: all
	31	$(MKINSTALLDIRS) $(libdir)
	32	$(INSTALL_DATA) $(TARGET) $(libdir)
	33	- $(INSTALL_DATA) librplay.so $(libdir)
	34	+ $(INSTALL_DATA) librplay.so.$(SOVER) $(libdir)
	35	+ ln -sf librplay.so.$(SOVER) $(libdir)/librplay.so
	36
	37	uninstall:
	38	$(RM) $(libdir)/$(TARGET)

Line 0 Link Here

(-)audio/rplay/patches/patch-ak (+14 lines)
	1	--- rplayd/sound.h.orig Wed Jun 9 15:27:44 1999
	2	+++ rplayd/sound.h Wed Jun 21 22:29:37 2000
	3	@@ -170,9 +170,9 @@
	4	int gsm_bit_frame_bytes; /* Number of bytes in gsm_bit_frame */
	5	int gsm_fixed_buffer_size;
	6	#endif /* HAVE_GSM */
	7	-#ifdef HAVE_CDROM
	8	+#if defined(HAVE_CDROM) \|\| defined(HAVE_HELPERS)
	9	int pid;
	10	-#endif /* HAVE_CDROM */
	11	+#endif /* HAVE_CDROM \|\| HAVE_HELPERS */
	12	}
	13	SINDEX;
	14

Line 0 Link Here

(-)audio/rplay/patches/patch-al (+12 lines)
	1	--- rplayd/spool.c.orig Thu Mar 11 06:14:38 1999
	2	+++ rplayd/spool.c Wed Jun 21 23:20:13 2000
	3	@@ -1127,8 +1127,8 @@
	4	spool_flow_pause(sp);
	5	}
	6	}
	7	-#endif /* HAVE_CDROM */
	8	}
	9	+#endif /* HAVE_CDROM */
	10	}
	11	else
	12	{

Line 0 Link Here

(-)audio/rplay/patches/patch-am (+19 lines)
	1	--- rx/Makefile.in.orig Wed Jun 21 22:57:55 2000
	2	+++ rx/Makefile.in Wed Jun 21 22:59:43 2000
	3	@@ -64,11 +64,11 @@
	4	all: librx.a
	5
	6	install: all
	7	- test -d $(libdir) \|\| mkdir $(libdir)
	8	- test -d $(includedir) \|\| mkdir $(includedir)
	9	- $(INSTALL) librx.a $(libdir)/librx.a
	10	- $(RANLIB) $(libdir)/librx.a
	11	- $(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
	12	+# test -d $(libdir) \|\| mkdir $(libdir)
	13	+# test -d $(includedir) \|\| mkdir $(includedir)
	14	+# $(INSTALL) librx.a $(libdir)/librx.a
	15	+# $(RANLIB) $(libdir)/librx.a
	16	+# $(INSTALL) $(srcdir)/inst-rxposix.h $(includedir)/rxposix.h
	17
	18
	19	uninstall:

Lines 2-17 Link Here

(-)audio/rplay/pkg/PLIST (-6 / +10 lines)
2	etc/rplay.hosts	2	etc/rplay.hosts
3	bin/rplay	3	bin/rplay
4	bin/rptp	4	bin/rptp
5	@comment requires XForms
6	@comment bin/xrplay
7	sbin/rplayd	5	sbin/rplayd
8	include/rplay.h	6	include/rplay.h
9	lib/librplay.a	7	lib/librplay.a
10	@unexec install-info --delete %D/info/librplay.info %D/info/dir	8	lib/librplay.so
11	@unexec install-info --delete %D/info/rplay.info %D/info/dir	9	lib/librplay.so.1
12	@unexec install-info --delete %D/info/RPLAY.info %D/info/dir	10	@unexec install-info --delete %D/info/RPLAY.info %D/info/dir
13	@unexec install-info --delete %D/info/RPTP.info %D/info/dir	11	@unexec install-info --delete %D/info/RPTP.info %D/info/dir
14	info/librplay.info	12	@unexec install-info --delete %D/info/librplay.info %D/info/dir
15	info/rplay.info	13	@unexec install-info --delete %D/info/rplayd.info %D/info/dir
16	info/RPLAY.info	14	info/RPLAY.info
17	info/RPTP.info	15	info/RPTP.info
		16	info/librplay.info
		17	info/rplayd.info
		18	@exec install-info %D/info/RPLAY.info %D/info/dir
		19	@exec install-info %D/info/RPTP.info %D/info/dir
		20	@exec install-info %D/info/librplay.info %D/info/dir
		21	@exec install-info %D/info/rplayd.info %D/info/dir