cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- rplay.info -> rplayd.info

Browse Source 
- use better filenames for patches and use unified diffs
- remove post-build target
- in cdrom.c, stop trying to use /dev/acd
This commit is contained in:
brad 2000-09-21 08:40:59 +00:00
parent 8241b36525
commit e8409eaa1c
16 changed files with 205 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/rplay/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2000/09/21 07:47:06 brad Exp $ # $OpenBSD: Makefile,v 1.17 2000/09/21 08:40:59 brad Exp $
DISTNAME= rplay-3.3.0 DISTNAME= rplay-3.3.0
CATEGORIES= audio CATEGORIES= audio
@ -20,6 +20,9 @@ USE_GMAKE= Yes
SYSCONFDIR= /etc/rplay SYSCONFDIR= /etc/rplay
CONFIGURE_STYLE= gnu dest CONFIGURE_STYLE= gnu dest
post-extract:
@cd ${WRKSRC}/doc && mv rplay.texi rplayd.texi
post-configure: post-configure:
.for ff in rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplayd.8 .for ff in rplay.conf.5 rplay.helpers.5 rplay.hosts.5 rplayd.8
@cd ${WRKSRC}/doc; \ @cd ${WRKSRC}/doc; \
@ -27,7 +30,4 @@ post-configure:
mv ${ff}.tmp ${ff} mv ${ff}.tmp ${ff}
.endfor .endfor
post-build:
@cd ${WRKSRC}/doc && ${MAKE_PROGRAM} info
.include <bsd.port.mk> .include <bsd.port.mk>

30
audio/rplay/patches/patch-aa
View File

@ -1,30 +0,0 @@
*** configure.orig Thu Jun 18 13:29:36 1998
--- configure Thu Jun 25 23:21:29 1998
***************
*** 3239,3244 ****
--- 3239,3246 ----
fi
fi
+ echo "Setting appropriate target for OpenBSD..."
+ RPLAY_TARGET="generic"
if test -z "$RPLAY_TARGET"; then
echo 'Sorry, I could not figure out what type of system you have.'
***************
*** 3268,3274 ****
fi
! BUILD_TARGETS="include lib rx adpcm gsm librplay rplayd rplay rptp doc"
subdirs="rx"
--- 3270,3276 ----
fi
! BUILD_TARGETS="include lib rx adpcm librplay rplayd rplay rptp doc"
subdirs="rx"

44
audio/rplay/patches/patch-ab
View File

@ -1,44 +0,0 @@
*** rplayd/Makefile.in.orig Tue Jun 16 14:00:04 1998
--- rplayd/Makefile.in Thu Jun 25 23:23:46 1998
***************
*** 1,4 ****
--- 1,5 ----
include @RPLAY_TOP@/Makefile.config
+ bindir= $(exec_prefix)/sbin
srcdir = @srcdir@
VPATH = @srcdir@
***************
*** 9,15 ****
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS= @srcdir@/../mkinstalldirs
! CPPFLAGS = $(CC_OPTIONS) -I. -I../include -I@srcdir@ -I@srcdir@/../include -I@srcdir@/../lib -I@srcdir@/../adpcm -I@srcdir@/../gsm -I@srcdir@/../rx @DEFS@ \
-DRPLAY_CONF=\"${sysconfdir}/rplay.conf\" \
-DRPLAY_HOSTS=\"${sysconfdir}/rplay.hosts\" \
-DRPLAY_SERVERS=\"${sysconfdir}/rplay.servers\" \
--- 10,16 ----
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS= @srcdir@/../mkinstalldirs
! CPPFLAGS = $(CC_OPTIONS) -I. -I../include -I@srcdir@ -I@srcdir@/../include -I@srcdir@/../lib -I@srcdir@/../adpcm -I/usr/local/include/ -I@srcdir@/../rx @DEFS@ \
-DRPLAY_CONF=\"${sysconfdir}/rplay.conf\" \
-DRPLAY_HOSTS=\"${sysconfdir}/rplay.hosts\" \
-DRPLAY_SERVERS=\"${sysconfdir}/rplay.servers\" \
***************
*** 22,28 ****
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
! -L../adpcm -ladpcm -L../gsm -lgsm -L../rx -lrx @LDFLAGS@ @LIBS@ -lm
TARGET= rplayd
--- 23,29 ----
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
! -L../adpcm -ladpcm -L/usr/local/lib -lgsm -L../rx -lrx @LDFLAGS@ @LIBS@ -lm
TARGET= rplayd

37
audio/rplay/patches/patch-ac
View File

@ -1,37 +0,0 @@
*** rplayd/cdrom.c.orig Thu Jun 25 23:49:47 1998
--- rplayd/cdrom.c Thu Jun 25 23:50:41 1998
***************
*** 46,59 ****
{ "cdrom1:", "/vol/dev/aliases/cdrom1", 0, 0 },
{ "cdrom2:", "/vol/dev/aliases/cdrom2", 0, 0 },
{ "cdrom3:", "/vol/dev/aliases/cdrom3", 0, 0 },
! #else /* not solaris */
! #if defined (linux)
{ "cdrom:", "/dev/cdrom", 0, 0 },
{ "cdrom0:", "/dev/cdrom0", 0, 0 },
{ "cdrom1:", "/dev/cdrom1", 0, 0 },
{ "cdrom2:", "/dev/cdrom2", 0, 0 },
{ "cdrom3:", "/dev/cdrom3", 0, 0 },
! #endif /* linux */
#endif
};
--- 46,63 ----
{ "cdrom1:", "/vol/dev/aliases/cdrom1", 0, 0 },
{ "cdrom2:", "/vol/dev/aliases/cdrom2", 0, 0 },
{ "cdrom3:", "/vol/dev/aliases/cdrom3", 0, 0 },
! #elif defined (linux)
{ "cdrom:", "/dev/cdrom", 0, 0 },
{ "cdrom0:", "/dev/cdrom0", 0, 0 },
{ "cdrom1:", "/dev/cdrom1", 0, 0 },
{ "cdrom2:", "/dev/cdrom2", 0, 0 },
{ "cdrom3:", "/dev/cdrom3", 0, 0 },
! #elif defined (__OpenBSD__)
! { "cdrom:", "/dev/cd0", 0, 0 },
! { "cdrom0:", "/dev/acd0", 0, 0 },
! { "cdrom1:", "/dev/cd1", 0, 0 },
! { "cdrom2:", "/dev/acd1", 0, 0 },
! { "cdrom3:", "/dev/cd2", 0, 0 },
#endif
};

15
audio/rplay/patches/patch-ad
View File

@ -1,15 +0,0 @@
*** include/config.h.in.orig Thu Apr 9 21:28:20 1998
--- include/config.h.in Thu Apr 9 21:28:38 1998
***************
*** 179,184 ****
--- 179,188 ----
#define HAVE_CDDA
#endif /* Solaris 2.x */
+ #if defined (__OpenBSD__)
+ #define HAVE_CDROM
+ #endif
+
#if defined (linux)
#define HAVE_OSS
#define HAVE_CDROM

18
audio/rplay/patches/patch-ah
View File

@ -1,18 +0,0 @@
--- doc/rplay.texi.orig Mon Jun 29 20:04:35 1998
+++ doc/rplay.texi Sat Apr 8 18:34:19 2000
@@ -6,9 +6,15 @@
@finalout
@end iftex
@setchapternewpage odd
+@dircategory Programming & development tools
@c %**end of header
@ifinfo
+@format
+START-INFO-DIR-ENTRY
+* Rplay: (rplay). Rplay Network Audio System
+END-INFO-DIR-ENTRY
+@end format
This file documents the rplay Network Audio System.

20
audio/rplay/patches/patch-configure Normal file
View File

@ -0,0 +1,20 @@
--- configure.orig Thu Jun 18 13:29:36 1998
+++ configure Thu Sep 21 03:49:06 2000
@@ -3239,6 +3239,8 @@
fi
fi
+echo "Setting appropriate target for OpenBSD..."
+RPLAY_TARGET="generic"
if test -z "$RPLAY_TARGET"; then
echo 'Sorry, I could not figure out what type of system you have.'
@@ -3268,7 +3270,7 @@
fi
-BUILD_TARGETS="include lib rx adpcm gsm librplay rplayd rplay rptp doc"
+BUILD_TARGETS="include lib rx adpcm librplay rplayd rplay rptp doc"
subdirs="rx"

41
audio/rplay/patches/patch-doc_Makefile.in Normal file
View File

@ -0,0 +1,41 @@
--- doc/Makefile.in.orig Thu Sep 21 03:59:48 2000
+++ doc/Makefile.in Thu Sep 21 04:01:11 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

4
audio/rplay/patches/patch-ae → audio/rplay/patches/patch-doc_RPLAY.texi
View File

@ -1,5 +1,5 @@
--- doc/RPLAY.texi.orig Mon Jun 29 20:04:34 1998 --- doc/RPLAY.texi.orig Mon Jun 29 14:04:34 1998
+++ doc/RPLAY.texi Sat Apr 8 18:32:48 2000 +++ doc/RPLAY.texi Thu Sep 21 04:07:42 2000
@@ -6,9 +6,15 @@ @@ -6,9 +6,15 @@
@finalout @finalout
@end iftex @end iftex

4
audio/rplay/patches/patch-af → audio/rplay/patches/patch-doc_RPTP.texi
View File

@ -1,5 +1,5 @@
--- doc/RPTP.texi.orig Mon Jun 29 20:04:34 1998 --- doc/RPTP.texi.orig Mon Jun 29 14:04:34 1998
+++ doc/RPTP.texi Sat Apr 8 18:33:12 2000 +++ doc/RPTP.texi Thu Sep 21 04:07:44 2000
@@ -7,9 +7,15 @@ @@ -7,9 +7,15 @@
@finalout @finalout
@end iftex @end iftex

4
audio/rplay/patches/patch-ag → audio/rplay/patches/patch-doc_librplay.texi
View File

@ -1,5 +1,5 @@
--- doc/librplay.texi.orig Mon Jun 29 20:04:35 1998 --- doc/librplay.texi.orig Mon Jun 29 14:04:35 1998
+++ doc/librplay.texi Sat Apr 8 18:33:46 2000 +++ doc/librplay.texi Thu Sep 21 04:07:46 2000
@@ -6,9 +6,15 @@ @@ -6,9 +6,15 @@
@finalout @finalout
@end iftex @end iftex

59
audio/rplay/patches/patch-doc_rplayd.texi Normal file
View File

@ -0,0 +1,59 @@
--- doc/rplayd.texi.orig Thu Sep 21 04:05:43 2000
+++ doc/rplayd.texi Thu Sep 21 04:05:48 2000
@@ -1,14 +1,20 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
-@setfilename rplay.info
+@setfilename rplayd.info
@settitle rplay
@iftex
@finalout
@end iftex
@setchapternewpage odd
+@dircategory Programming & development tools
@c %**end of header
@ifinfo
+@format
+START-INFO-DIR-ENTRY
+* rplayd: (rplayd). Rplay Network Audio System
+END-INFO-DIR-ENTRY
+@end format
This file documents the rplay Network Audio System.
@@ -71,7 +77,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 +167,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

13
audio/rplay/patches/patch-include_config.h.in Normal file
View File

@ -0,0 +1,13 @@
--- include/config.h.in.orig Sun Jun 21 14:12:25 1998
+++ include/config.h.in Thu Sep 21 03:49:08 2000
@@ -167,6 +167,10 @@
#define HAVE_CDDA
#endif /* Solaris 2.x */
+#if defined (__OpenBSD__)
+#define HAVE_CDROM
+#endif
+
#if defined (linux)
#define HAVE_OSS
#define HAVE_CDROM

34
audio/rplay/patches/patch-rplayd_Makefile.in Normal file
View File

@ -0,0 +1,34 @@
--- rplayd/Makefile.in.orig Tue Jun 16 14:00:04 1998
+++ rplayd/Makefile.in Thu Sep 21 03:54:28 2000
@@ -1,4 +1,5 @@
include @RPLAY_TOP@/Makefile.config
+bindir= $(exec_prefix)/sbin
srcdir = @srcdir@
VPATH = @srcdir@
@@ -9,7 +10,7 @@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS= @srcdir@/../mkinstalldirs
-CPPFLAGS = $(CC_OPTIONS) -I. -I../include -I@srcdir@ -I@srcdir@/../include -I@srcdir@/../lib -I@srcdir@/../adpcm -I@srcdir@/../gsm -I@srcdir@/../rx @DEFS@ \
+CPPFLAGS = $(CC_OPTIONS) -I. -I../include -I@srcdir@ -I@srcdir@/../include -I@srcdir@/../lib -I@srcdir@/../adpcm -I/usr/local/include/ -I@srcdir@/../rx @DEFS@ \
-DRPLAY_CONF=\"${sysconfdir}/rplay.conf\" \
-DRPLAY_HOSTS=\"${sysconfdir}/rplay.hosts\" \
-DRPLAY_SERVERS=\"${sysconfdir}/rplay.servers\" \
@@ -22,7 +23,7 @@
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
- -L../adpcm -ladpcm -L../gsm -lgsm -L../rx -lrx @LDFLAGS@ @LIBS@ -lm
+ -L../adpcm -ladpcm -L/usr/local/lib -lgsm -L../rx -lrx @LDFLAGS@ @LIBS@ -lm
TARGET= rplayd
@@ -42,7 +43,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)

24
audio/rplay/patches/patch-rplayd_cdrom.c Normal file
View File

@ -0,0 +1,24 @@
--- rplayd/cdrom.c.orig Sun Jun 21 14:08:03 1998
+++ rplayd/cdrom.c Thu Sep 21 03:57:11 2000
@@ -46,14 +46,18 @@
{ "cdrom1:", "/vol/dev/aliases/cdrom1", 0, 0 },
{ "cdrom2:", "/vol/dev/aliases/cdrom2", 0, 0 },
{ "cdrom3:", "/vol/dev/aliases/cdrom3", 0, 0 },
-#else /* not solaris */
-#if defined (linux)
+#elif defined (linux)
{ "cdrom:", "/dev/cdrom", 0, 0 },
{ "cdrom0:", "/dev/cdrom0", 0, 0 },
{ "cdrom1:", "/dev/cdrom1", 0, 0 },
{ "cdrom2:", "/dev/cdrom2", 0, 0 },
{ "cdrom3:", "/dev/cdrom3", 0, 0 },
-#endif /* linux */
+#elif defined (__OpenBSD__)
+ { "cdrom:", "/dev/cd0", 0, 0 },
+ { "cdrom0:", "/dev/cd0", 0, 0 },
+ { "cdrom1:", "/dev/cd1", 0, 0 },
+ { "cdrom2:", "/dev/cd2", 0, 0 },
+ { "cdrom3:", "/dev/cd3", 0, 0 },
#endif
};

8
audio/rplay/pkg/PLIST
View File

@ -1,19 +1,19 @@
@comment $OpenBSD: PLIST,v 1.8 2000/09/21 07:47:07 brad Exp $ @comment $OpenBSD: PLIST,v 1.9 2000/09/21 08:41:01 brad Exp $
bin/rplay bin/rplay
bin/rptp bin/rptp
include/rplay.h include/rplay.h
@unexec install-info --delete --info-dir=%D/info %D/info/RPLAY.info @unexec install-info --delete --info-dir=%D/info %D/info/RPLAY.info
@unexec install-info --delete --info-dir=%D/info %D/info/RPTP.info @unexec install-info --delete --info-dir=%D/info %D/info/RPTP.info
@unexec install-info --delete --info-dir=%D/info %D/info/librplay.info @unexec install-info --delete --info-dir=%D/info %D/info/librplay.info
@unexec install-info --delete --info-dir=%D/info %D/info/rplay.info @unexec install-info --delete --info-dir=%D/info %D/info/rplayd.info
info/RPLAY.info info/RPLAY.info
info/RPTP.info info/RPTP.info
info/librplay.info info/librplay.info
info/rplay.info info/rplayd.info
@exec install-info --info-dir=%D/info %D/info/RPLAY.info @exec install-info --info-dir=%D/info %D/info/RPLAY.info
@exec install-info --info-dir=%D/info %D/info/RPTP.info @exec install-info --info-dir=%D/info %D/info/RPTP.info
@exec install-info --info-dir=%D/info %D/info/librplay.info @exec install-info --info-dir=%D/info %D/info/librplay.info
@exec install-info --info-dir=%D/info %D/info/rplay.info @exec install-info --info-dir=%D/info %D/info/rplayd.info
lib/librplay.a lib/librplay.a
man/man1/rplay.1 man/man1/rplay.1
man/man1/rptp.1 man/man1/rptp.1