update to version 3.3.0

This commit is contained in:
angelos 1998-06-26 03:55:51 +00:00
parent 455f1ae169
commit f2e6bed00c
6 changed files with 74 additions and 48 deletions

View File

@ -1,12 +1,12 @@
# OpenBSD makefile for: rplay - Network audio player
# Version required: 3.3.0a1
# Version required: 3.3.0
# Date created: December 4, 1997
# Whom: Angelos D. Keromytis
#
# $OpenBSD: Makefile,v 1.2 1998/04/10 01:32:02 angelos Exp $
# $OpenBSD: Makefile,v 1.3 1998/06/26 03:55:51 angelos Exp $
#
DISTNAME= rplay-3.3.0a1
DISTNAME= rplay-3.3.0
CATEGORIES= audio
MASTER_SITES= http://rplay.doit.org/dist/

View File

@ -1 +1 @@
MD5 (rplay-3.3.0a1.tar.gz) = c5cb5d14dbeb50d3abf169af15766847
MD5 (rplay-3.3.0.tar.gz) = abd9779381c7de33f3f99fd514f9c36f

View File

@ -1,8 +1,8 @@
*** configure.orig Thu Feb 1 19:30:38 1996
--- configure Mon Dec 29 20:39:33 1997
*** configure.orig Thu Jun 18 13:29:36 1998
--- configure Thu Jun 25 23:21:29 1998
***************
*** 2560,2565 ****
--- 2560,2567 ----
*** 3239,3244 ****
--- 3239,3246 ----
fi
fi
@ -12,23 +12,19 @@
if test -z "$RPLAY_TARGET"; then
echo 'Sorry, I could not figure out what type of system you have.'
***************
*** 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"
*** 3268,3274 ****
fi
--- 2591,2599 ----
! BUILD_TARGETS="include lib rx adpcm gsm librplay rplayd rplay rptp doc"
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"
subdirs="rx"
--- 3270,3276 ----
fi
! BUILD_TARGETS="include lib rx adpcm librplay rplayd rplay rptp doc"
subdirs="rx"

View File

@ -1,5 +1,5 @@
*** rplayd/Makefile.in.orig Fri Feb 2 03:13:57 1996
--- rplayd/Makefile.in Fri Jun 13 19:31:38 1997
*** 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 ----
@ -9,31 +9,36 @@
srcdir = @srcdir@
VPATH = @srcdir@
***************
*** 9,21 ****
*** 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 @DEFS@
! 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
.c.o:
! 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 @LDFLAGS@ @LIBS@ -lm
! -L../adpcm -ladpcm -L../gsm -lgsm -L../rx -lrx @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:
--- 23,29 ----
$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
LDFLAGS= $(LD_OPTIONS) -L../librplay -lrplay -L../lib -lrp \
! -L../adpcm -ladpcm -L/usr/local/lib -lgsm @LDFLAGS@ @LIBS@ -lm
! -L../adpcm -ladpcm -L/usr/local/lib -lgsm -L../rx -lrx @LDFLAGS@ @LIBS@ -lm
TARGET= rplayd

View File

@ -1,15 +1,37 @@
*** lib/regex.h.orig Thu Dec 4 21:11:50 1997
--- lib/regex.h Thu Dec 4 21:12:03 1997
*** rplayd/cdrom.c.orig Thu Jun 25 23:49:47 1998
--- rplayd/cdrom.c Thu Jun 25 23:50:41 1998
***************
*** 474,481 ****
--- 474,483 ----
*** 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
};
/* 4.2 bsd compatibility. */
#ifndef __FreeBSD__
+ #ifndef __OpenBSD__
extern char *re_comp _RE_ARGS ((_CONST_ char *));
extern int re_exec _RE_ARGS ((_CONST_ char *));
+ #endif
#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
};
/* POSIX compatibility. */

View File

@ -9,10 +9,13 @@ info/librplay.info
info/rplay.info
info/RPLAY.info
info/RPTP.info
etc/rplay.hosts
man/man1/rplay.1
man/man1/rplayd.1
man/man1/rplayd.8
man/man1/xrplay.1
man/man1/rptp.1
man/man5/rplay.conf.5
man/man5/rplay.helpers.5
man/man5/rplay.hosts.5
man/man5/rplay.servers.5
etc/rc.d/rplayd.sh