Date: Tue, 28 Mar 2000 10:06:31 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17645: Update port: audio/nas to 1.4 Message-ID: <200003281806.KAA39377@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17645
>Category: ports
>Synopsis: Update port: audio/nas to 1.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 28 10:10:07 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.4
- Add WWW: line into pkg/DESCR
New file:
patches/patch-af
Remove file:
patches/patch-ba
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/audio/nas/Makefile audio/nas/Makefile
--- /usr/ports/audio/nas/Makefile Tue Aug 31 15:40:38 1999
+++ audio/nas/Makefile Sat Mar 25 16:22:03 2000
@@ -1,16 +1,17 @@
# New ports collection makefile for: nas (formerly netaudio)
-# Version required: 1.2p1
+# Version required: 1.4
# Date created: 03 Nov 1994
# Whom: jkh
#
# $FreeBSD: ports/audio/nas/Makefile,v 1.12 1999/08/31 06:40:38 mharo Exp $
#
-DISTNAME= nas-1.2p5
-PKGNAME= nas-1.2.5
+DISTNAME= nas-1.4
CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
+MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+ http://radscan.com/nas/
MASTER_SITE_SUBDIR= audio/nas
+EXTRACT_SUFX= .src.tar.gz
MAINTAINER= ports@FreeBSD.org
@@ -19,10 +20,9 @@
# no need to "xmkmf -a" and create the Makefiles twice -- see above
XMKMF= xmkmf
-MAN1= AUVoxConfig.1 auconvert.1 auctl.1 audemo.1 audial.1 auedit.1 auinfo.1 \
- aupanel.1 auphone.1 auplay.1 aurecord.1 auscope.1 auserver.1 autool.1 \
- auvoxware.1 auwave.1 checkmail.1 issndfile.1 nas.1 playbucket.1 \
- soundtoh.1
+MAN1= auconvert.1 auctl.1 audemo.1 audial.1 auedit.1 auinfo.1 aupanel.1 \
+ auphone.1 auplay.1 aurecord.1 auscope.1 autool.1 auvoxware.1 auwave.1 \
+ checkmail.1 issndfile.1 nas.1 playbucket.1 soundtoh.1
MAN3= AuAnyEvent.3 AuBucketAttributes.3 AuCloseServer.3 \
AuConvertDataToShort.3 AuConvertShortToData.3 AuCreateBucket.3 \
AuCreateFlow.3 AuDataFormats.3 AuDataTypes.3 AuDefineToFormat.3 \
@@ -68,5 +68,13 @@
SoundFlushFile.3 SoundOpenFileForReading.3 SoundOpenFileForWriting.3 \
SoundReadFile.3 SoundRewindFile.3 SoundSeekFile.3 \
SoundStringToFileFormat.3 SoundTellFile.3 SoundWriteFile.3
+
+post-patch:
+ @find ${WRKSRC} -name '*.[ch]' | xargs \
+ ${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
+
+post-install:
+ ${LDCONFIG} -m ${PREFIX}/lib
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -urN /usr/ports/audio/nas/files/md5 audio/nas/files/md5
--- /usr/ports/audio/nas/files/md5 Thu Oct 3 23:06:34 1996
+++ audio/nas/files/md5 Fri Mar 24 04:40:24 2000
@@ -1 +1 @@
-MD5 (nas-1.2p5.tar.gz) = 27c7118347dd71dd32a7f27d7e6d44bc
+MD5 (nas-1.4.src.tar.gz) = 8b9280377d0ad404afbaa5a93f213bc5
diff -urN /usr/ports/audio/nas/patches/patch-ab audio/nas/patches/patch-ab
--- /usr/ports/audio/nas/patches/patch-ab Sat Oct 5 13:09:09 1996
+++ audio/nas/patches/patch-ab Sat Mar 25 15:42:12 2000
@@ -1,16 +1,38 @@
-*** server/dda/voxware/auvoxware.c.orig Thu Nov 3 11:24:11 1994
---- server/dda/voxware/auvoxware.c Thu Nov 3 11:24:50 1994
-***************
-*** 755,760 ****
---- 755,765 ----
- /*
- * Setup soundcard at maximum audio quality.
- */
-+
-+ #ifdef __FreeBSD__
-+ #define NO_16_BIT_SAMPLING
-+ #endif
-+
- static void setupSoundcard(sndStatPtr)
- SndStat* sndStatPtr;
- {
+--- server/dda/voxware/auvoxware.c.orig Sun Mar 5 11:40:55 2000
++++ server/dda/voxware/auvoxware.c Sat Mar 25 15:18:36 2000
+@@ -610,7 +610,11 @@
+
+ if(sndStatOut.fd == -1)
+ {
++#ifdef __FreeBSD__
++ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait)
++#else
+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait)
++#endif
+ {
+ osLogMsg("openDevice: waiting on output device\n");
+ sleep(1);
+@@ -1230,6 +1234,11 @@
+ /*
+ * Setup soundcard at maximum audio quality.
+ */
++
++#ifdef __FreeBSD__
++#define NO_16_BIT_SAMPLING
++#endif
++
+ static void setupSoundcard(sndStatPtr)
+ SndStat* sndStatPtr;
+ {
+@@ -1380,7 +1389,11 @@
+
+ AL_initialized = AuTrue;
+
++#ifdef __FreeBSD__
++ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) {
++#else
+ if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) {
++#endif
+ UNIDENTMSG;
+ return AuFalse;
+ }
diff -urN /usr/ports/audio/nas/patches/patch-ac audio/nas/patches/patch-ac
--- /usr/ports/audio/nas/patches/patch-ac Sat Oct 5 13:09:14 1996
+++ audio/nas/patches/patch-ac Sat Mar 25 15:21:00 2000
@@ -1,12 +1,12 @@
-*** ./lib/audio/Astreams.c.orig Thu Nov 3 11:58:30 1994
---- ./lib/audio/Astreams.c Thu Nov 3 11:58:52 1994
-***************
-*** 52,58 ****
- #include <sys/stropts.h>
-
- extern int errno;
-- extern char *sys_errlist[];
-
- /* stolen from <X11/Xproto.h> */
- typedef struct {
---- 52,57 ----
+--- lib/audio/Astreams.c.orig Sun May 9 10:10:05 1999
++++ lib/audio/Astreams.c Sat Mar 25 15:20:42 2000
+@@ -52,7 +52,9 @@
+ #include <sys/stropts.h>
+
+ extern int errno;
++#if !defined(BSD)
+ extern char *sys_errlist[];
++#endif
+
+ /* stolen from <X11/Xproto.h> */
+ typedef struct {
diff -urN /usr/ports/audio/nas/patches/patch-ad audio/nas/patches/patch-ad
--- /usr/ports/audio/nas/patches/patch-ad Sat Oct 5 13:09:15 1996
+++ audio/nas/patches/patch-ad Sat Mar 25 15:21:43 2000
@@ -1,55 +1,11 @@
-*** clients/audio/auedit/Graph.c.orig Wed Dec 6 10:11:03 1995
---- clients/audio/auedit/Graph.c Sat Oct 5 11:37:52 1996
-***************
-*** 28,34 ****
- */
-
- #ifndef WIN32
-! #include <values.h>
- #else /* WIN32 */
- #define MAXSHORT 0x7fff
- #endif /* WIN32 */
---- 28,34 ----
- */
-
- #ifndef WIN32
-! #include <limits.h>
- #else /* WIN32 */
- #define MAXSHORT 0x7fff
- #endif /* WIN32 */
-***************
-*** 322,329 ****
-
- for (x = 0; x < (int) w->core.width; x++)
- {
-! minY = MAXSHORT;
-! maxY = -MAXSHORT;
-
- for (; (int) k == x && p < end; k += w->graph.hscale)
- {
---- 322,329 ----
-
- for (x = 0; x < (int) w->core.width; x++)
- {
-! minY = SHRT_MAX;
-! maxY = SHRT_MIN;
-
- for (; (int) k == x && p < end; k += w->graph.hscale)
- {
-***************
-*** 391,397 ****
- GraphWidget w;
- {
- w->graph.vscale = (float) w->core.height / w->graph.numTracks /
-! (MAXSHORT - -MAXSHORT + 1);
-
- w->graph.hscale = (float) ((int) w->core.width - 1) /
- (w->graph.end - w->graph.start);
---- 391,397 ----
- GraphWidget w;
- {
- w->graph.vscale = (float) w->core.height / w->graph.numTracks /
-! (SHRT_MAX - SHRT_MIN + 1);
-
- w->graph.hscale = (float) ((int) w->core.width - 1) /
- (w->graph.end - w->graph.start);
+--- clients/audio/auedit/Graph.c.orig Mon Oct 25 02:24:08 1999
++++ clients/audio/auedit/Graph.c Sat Mar 25 14:56:23 2000
+@@ -28,7 +28,7 @@
+ */
+
+ #ifndef WIN32
+-# ifdef __NetBSD__
++# if defined(__NetBSD__) || defined(__FreeBSD__)
+ # include <limits.h>
+ # define MAXSHORT SHRT_MAX
+ # define MINSHORT SHRT_MIN
diff -urN /usr/ports/audio/nas/patches/patch-ae audio/nas/patches/patch-ae
--- /usr/ports/audio/nas/patches/patch-ae Sat Jul 27 16:13:36 1996
+++ audio/nas/patches/patch-ae Sat Mar 25 15:22:04 2000
@@ -1,25 +1,19 @@
-*** lib/audio/Imakefile Tue Feb 13 12:18:13 1996
---- lib/audio/Imakefile Tue Feb 13 10:21:19 1996
-***************
-*** 66,73 ****
- #endif /* ProjectX < 5 */
-
- EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
-
- DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
-! CONN_DEFINES = ConnectionFlags
- INSTALLFLAGS += $(INSTINCFLAGS)
-
---- 66,78 ----
- #endif /* ProjectX < 5 */
-
-+ #if HasBSD44Sockets
-+ SOCK_DEFINES = -DBSD44SOCKETS
-+ #endif
-+
-+
- EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
-
- DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
-! CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
- INSTALLFLAGS += $(INSTINCFLAGS)
+--- lib/audio/Imakefile.orig Sat Jan 1 18:28:13 2000
++++ lib/audio/Imakefile Sat Mar 25 14:56:19 2000
+@@ -64,10 +64,15 @@
+ COMPAT_OBJS = AuGetBest.o
+ #endif /* ProjectX < 5 */
+
++#if HasBSD44Sockets
++ SOCK_DEFINES = -DBSD44SOCKETS
++#endif
++
++
+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
+
+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
+- CONN_DEFINES = ConnectionFlags
++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
+
+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \
+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
diff -urN /usr/ports/audio/nas/patches/patch-af audio/nas/patches/patch-af
--- /usr/ports/audio/nas/patches/patch-af Thu Jan 1 09:00:00 1970
+++ audio/nas/patches/patch-af Sat Mar 25 15:42:48 2000
@@ -0,0 +1,9 @@
+--- config/NetAudio.def.orig Sun Feb 13 05:31:14 2000
++++ config/NetAudio.def Fri Mar 24 04:55:49 2000
+@@ -8,5 +8,5 @@
+
+ XCOMM Directory where NAS will look for it's config file(s)
+ #ifndef NasConfigSearchPath
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc
+ #endif
diff -urN /usr/ports/audio/nas/patches/patch-ba audio/nas/patches/patch-ba
--- /usr/ports/audio/nas/patches/patch-ba Mon May 25 16:25:37 1998
+++ audio/nas/patches/patch-ba Thu Jan 1 09:00:00 1970
@@ -1,22 +0,0 @@
---- include/audio/Imakefile.org Tue Nov 4 18:40:01 1997
-+++ include/audio/Imakefile Tue Nov 4 18:40:01 1997
-@@ -37,7 +37,7 @@
- MakeDir($(BUILDINCDIR:/=\))
- #endif /* WIN32 */
-
--BuildIncludes($(HEADERS),audio,..)
-+BuildIncludes($(HEADERS),audio,.)
-
- #if ProjectX < 5 /* X11R4 doesn't make dir explicitly */
- #ifndef MakeDir
---- lib/audio/Imakefile.org Tue Nov 4 18:21:00 1997
-+++ lib/audio/Imakefile Tue Nov 4 18:21:00 1997
-@@ -125,7 +125,7 @@
-
- #endif
-
--BuildIncludes($(HEADERS),audio,..)
-+BuildIncludes($(HEADERS),audio,.)
- InstallMultiple($(HEADERS),$(INCDIR))
- #if ProjectX >= 5
- InstallNonExecFile(AuErrorDB,$(LIBDIR))
diff -urN /usr/ports/audio/nas/pkg/DESCR audio/nas/pkg/DESCR
--- /usr/ports/audio/nas/pkg/DESCR Mon Feb 6 01:26:52 1995
+++ audio/nas/pkg/DESCR Fri Mar 24 04:37:07 2000
@@ -1,5 +1,7 @@
- The Network Audio System is designed for playing,
- recording, and manipulating audio data over a network.
- Like the X Window System, it uses the client/server model to
- separate applications from the specific drivers that control
- audio input and output devices.
+The Network Audio System is designed for playing,
+recording, and manipulating audio data over a network.
+Like the X Window System, it uses the client/server model to
+separate applications from the specific drivers that control
+audio input and output devices.
+
+WWW: http://radscan.com/nas.html
diff -urN /usr/ports/audio/nas/pkg/MESSAGE audio/nas/pkg/MESSAGE
--- /usr/ports/audio/nas/pkg/MESSAGE Thu Jan 1 09:00:00 1970
+++ audio/nas/pkg/MESSAGE Sat Mar 25 16:09:42 2000
@@ -0,0 +1,11 @@
+**************************************************
+**************************************************
+NOTE:
+
+Be sure to create a /usr/X11R6/etc/nasd.conf file; use
+/usr/X11R6/etc/nasd.conf.eg as a starting point.
+It should work fine as is.
+
+**************************************************
+**************************************************
+
diff -urN /usr/ports/audio/nas/pkg/PLIST audio/nas/pkg/PLIST
--- /usr/ports/audio/nas/pkg/PLIST Mon May 31 15:29:18 1999
+++ audio/nas/pkg/PLIST Sat Mar 25 15:55:23 2000
@@ -1,4 +1,3 @@
-bin/au
bin/auconvert
bin/auctl
bin/audemo
@@ -11,12 +10,13 @@
bin/aurecord
bin/auscope
bin/autool
-bin/auvoxware
bin/auwave
bin/checkmail
bin/issndfile
+bin/nasd
bin/playbucket
bin/soundtoh
+etc/nasd.conf.eg
include/audio/8svx.h
include/audio/Afuncproto.h
include/audio/Afuncs.h
@@ -38,7 +38,10 @@
include/audio/soundlib.h
include/audio/voc.h
include/audio/wave.h
-lib/AUVoxConfig.eg
lib/X11/AuErrorDB
lib/libaudio.a
+lib/libaudio.so
+lib/libaudio.so.1
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
@dirrm include/audio
diff -urN /usr/ports/audio/nas/scripts/configure audio/nas/scripts/configure
--- /usr/ports/audio/nas/scripts/configure Mon Nov 7 10:52:02 1994
+++ audio/nas/scripts/configure Thu Jan 1 09:00:00 1970
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-chmod -R +w ${WRKSRC}
-echo -n "Removing disgusting malloc.h includes. Please wait.."
-for i in `find ${WRKSRC} -name '*.[ch]' | xargs fgrep -l malloc.h`; do
- sed -e 's/malloc.h/stdlib.h/' < $i > $i.bak && mv $i.bak $i
-done
-echo " Done."
-
-echo -n "Ensuring Install uses the -c flag. Please wait.."
-for i in `find ${WRKSRC} -name 'Imakefile' | xargs fgrep -l INSTALLFLAGS`; do
- sed -e 's/INSTALLFLAGS = \$(INSTINCFLAGS)/INSTALLFLAGS \+= \$(INSTINCFLAGS)/' < $i > $i.bak && mv $i.bak $i
-done
-echo " Done."
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200003281806.KAA39377>