diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 2413a75bfdd..685dfb93f46 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,24 +1,28 @@ -# $OpenBSD: Makefile,v 1.18 2000/10/22 14:02:56 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2001/02/06 01:32:04 kevlo Exp $ -DISTNAME= rplay-3.3.0 +DISTNAME= rplay-3.3.2 CATEGORIES= audio -NEED_VERSION= 1.330 -MASTER_SITES= http://rplay.doit.org/dist/ +NEED_VERSION= 1.353 HOMEPAGE= http://rplay.doit.org/ -LIB_DEPENDS= gsm.1.0::audio/gsm - -MAINTAINER= Angelos D. Keromytis +MAINTAINER= Kevin Lo PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -USE_GMAKE= Yes +MASTER_SITES= ${HOMEPAGE}/dist/ + +LIB_DEPENDS= gsm.1.0::audio/gsm + SYSCONFDIR= /etc/rplay CONFIGURE_STYLE= gnu dest +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +CONFIGURE_ARGS+= --enable-static +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" post-extract: @cd ${WRKSRC}/doc && mv rplay.texi rplayd.texi diff --git a/audio/rplay/files/md5 b/audio/rplay/files/md5 index 4cab9c84371..bb0eabdf0c1 100644 --- a/audio/rplay/files/md5 +++ b/audio/rplay/files/md5 @@ -1,3 +1,3 @@ -MD5 (rplay-3.3.0.tar.gz) = b5b11ca32cff46c33e8f77320250ed14 -RMD160 (rplay-3.3.0.tar.gz) = bd8028654406d2b48552024b233ccef72b3c2368 -SHA1 (rplay-3.3.0.tar.gz) = d46b98ec26e719459051e633085a24ca0af2117c +MD5 (rplay-3.3.2.tar.gz) = e39888f6bea32e1c8cf4a8880b416e56 +RMD160 (rplay-3.3.2.tar.gz) = e5c740eade2cc770ea78c8f53020fa6d78f59861 +SHA1 (rplay-3.3.2.tar.gz) = 80b8001998a6f9837773f26285afffd609df2662 diff --git a/audio/rplay/patches/patch-configure b/audio/rplay/patches/patch-configure index 8e5915518a1..edcc78193b5 100644 --- a/audio/rplay/patches/patch-configure +++ b/audio/rplay/patches/patch-configure @@ -1,20 +1,12 @@ ---- configure.orig Thu Jun 18 13:29:36 1998 -+++ configure Thu Sep 21 03:49:06 2000 -@@ -3239,6 +3239,8 @@ +--- configure.orig Wed Jun 9 06:26:19 1999 ++++ configure Mon Feb 5 17:12:50 2001 +@@ -2630,6 +2630,9 @@ 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" diff --git a/audio/rplay/patches/patch-rplayd_Makefile.in b/audio/rplay/patches/patch-rplayd_Makefile.in index b90b73dc0a8..6395270da39 100644 --- a/audio/rplay/patches/patch-rplayd_Makefile.in +++ b/audio/rplay/patches/patch-rplayd_Makefile.in @@ -1,30 +1,30 @@ ---- rplayd/Makefile.in.orig Tue Jun 16 14:00:04 1998 -+++ rplayd/Makefile.in Thu Sep 21 03:54:28 2000 +--- rplayd/Makefile.in.orig Wed Jun 9 06:27:43 1999 ++++ rplayd/Makefile.in Mon Feb 5 17:24:16 2001 @@ -1,4 +1,5 @@ include @RPLAY_TOP@/Makefile.config -+bindir= $(exec_prefix)/sbin ++bindir= $(exec_prefix)/sbin srcdir = @srcdir@ VPATH = @srcdir@ -@@ -9,7 +10,7 @@ - INSTALL_DATA = @INSTALL_DATA@ - MKINSTALLDIRS= @srcdir@/../mkinstalldirs +@@ -11,7 +12,7 @@ --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@ \ + CPPFLAGS = $(CC_OPTIONS) -I. -I../include -I${srcdir} -I${srcdir}/../include \ + -I${srcdir}/../lib -I${srcdir}/../adpcm \ +- @GSM_INCS@ \ ++ -I/usr/local/include \ + @RX_INCS@ @DEFS@ \ -DRPLAY_CONF=\"${sysconfdir}/rplay.conf\" \ -DRPLAY_HOSTS=\"${sysconfdir}/rplay.hosts\" \ - -DRPLAY_SERVERS=\"${sysconfdir}/rplay.servers\" \ -@@ -22,7 +23,7 @@ +@@ -25,7 +26,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 @GSM_LIBS@ -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 @@ +@@ -54,7 +55,6 @@ install: all $(MKINSTALLDIRS) $(sbindir) $(INSTALL_PROGRAM) $(TARGET) $(sbindir)/$(TARGET) diff --git a/audio/rplay/patches/patch-rplayd_cdrom.c b/audio/rplay/patches/patch-rplayd_cdrom.c index a170bfb2c77..f09d657402b 100644 --- a/audio/rplay/patches/patch-rplayd_cdrom.c +++ b/audio/rplay/patches/patch-rplayd_cdrom.c @@ -1,24 +1,24 @@ ---- rplayd/cdrom.c.orig Sun Jun 21 14:08:03 1998 -+++ rplayd/cdrom.c Thu Sep 21 03:57:11 2000 +--- rplayd/cdrom.c.orig Mon Feb 5 15:15:21 2001 ++++ rplayd/cdrom.c Mon Feb 5 15:19:17 2001 @@ -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 */ + {"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 */ + {"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 ++ {"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 }; diff --git a/audio/rplay/pkg/PFRAG.shared b/audio/rplay/pkg/PFRAG.shared new file mode 100644 index 00000000000..414235fd5d9 --- /dev/null +++ b/audio/rplay/pkg/PFRAG.shared @@ -0,0 +1,3 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1 2001/02/06 01:32:12 kevlo Exp $ +lib/librplay.so +DYNLIBDIR(%B) diff --git a/audio/rplay/pkg/PLIST b/audio/rplay/pkg/PLIST index 2a11ce58655..474c7df5e35 100644 --- a/audio/rplay/pkg/PLIST +++ b/audio/rplay/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2000/09/21 08:41:01 brad Exp $ +@comment $OpenBSD: PLIST,v 1.10 2001/02/06 01:32:12 kevlo Exp $ bin/rplay bin/rptp include/rplay.h @@ -15,6 +15,7 @@ info/rplayd.info @exec install-info --info-dir=%D/info %D/info/librplay.info @exec install-info --info-dir=%D/info %D/info/rplayd.info lib/librplay.a +%%SHARED%% man/man1/rplay.1 man/man1/rptp.1 man/man5/rplay.conf.5