Index: audio/nas/Makefile =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/audio/nas/Makefile,v retrieving revision 1.85 diff -u -r1.85 Makefile --- audio/nas/Makefile 29 Jun 2011 19:47:35 -0000 1.85 +++ audio/nas/Makefile 6 Oct 2011 09:29:55 -0000 @@ -1,13 +1,12 @@ # $NetBSD: Makefile,v 1.85 2011/06/29 19:47:35 hans Exp $ -DISTNAME= nas-1.9.1.src +DISTNAME= nas-1.9.3.src PKGNAME= ${DISTNAME:S/.src//} -PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nas/} MAINTAINER= markd@NetBSD.org -HOMEPAGE= http://nas.sourceforge.net +HOMEPAGE= http://nas.sourceforge.net/ COMMENT= Network Audio System LICENSE= mit # with no-advertisement clause @@ -19,7 +18,7 @@ MAKE_JOBS_SAFE= no WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_TOOLS+= gmake yacc lex +USE_TOOLS+= gmake yacc lex makedepend USE_IMAKE= yes PKG_SYSCONFSUBDIR= nas Index: audio/nas/distinfo =================================================================== RCS file: /e/cvsync/cvsync/pkgsrc/audio/nas/distinfo,v retrieving revision 1.27 diff -u -r1.27 distinfo --- audio/nas/distinfo 9 Jul 2009 19:10:25 -0000 1.27 +++ audio/nas/distinfo 6 Oct 2011 09:32:41 -0000 @@ -1,13 +1,11 @@ $NetBSD: distinfo,v 1.27 2009/07/09 19:10:25 hasso Exp $ -SHA1 (nas-1.9.1.src.tar.gz) = 1207a821676ca1b763a47e3c278262a64a626ba3 -RMD160 (nas-1.9.1.src.tar.gz) = 6d6aa05ae2376fbc8ff3145b73da1d28b190a856 -Size (nas-1.9.1.src.tar.gz) = 1454523 bytes -SHA1 (patch-aa) = f407891f0207d789c0e5bf7a455fd7798ce01fde -SHA1 (patch-ab) = d424b0970bd23584629f6a9bebea8b8c014462b5 +SHA1 (nas-1.9.3.src.tar.gz) = dca770ddd10936ad1f19bf3c51f941c10d7bf84b +RMD160 (nas-1.9.3.src.tar.gz) = 693c97658885a9bea02b27376c3a5a142b49e57a +Size (nas-1.9.3.src.tar.gz) = 1485222 bytes SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781 -SHA1 (patch-ad) = b889775d66e1de80fc9bc2563f9cc0ebf720ad71 SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543 SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a -SHA1 (patch-ag) = 73959e05169d6b1ed658228cddbca86e62e142be -SHA1 (patch-ah) = 62e0538441f4375b93169906e1cdc82ab045e5c5 +SHA1 (patch-lib_audio_Imakefile) = 5a90a36cba98483da80b8de29c40b0a6b490d5ea +SHA1 (patch-server_Imakefile) = 90e3f09b8dc3c3bef2af321d355b5ced9f6fc2d6 +SHA1 (patch-server_dda_voxware_auvoxware.c) = d0e923fd1d6fae2d8710907cc402c7d86cb32af5 Index: audio/nas/patches/patch-lib_audio_Imakefile =================================================================== RCS file: audio/nas/patches/patch-lib_audio_Imakefile diff -N audio/nas/patches/patch-lib_audio_Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/nas/patches/patch-lib_audio_Imakefile 6 Oct 2011 09:31:09 -0000 @@ -0,0 +1,27 @@ +$NetBSD$ + +Replacement of patches/patch-aa + +--- lib/audio/Imakefile.orig 2011-01-27 01:10:17.000000000 +0900 ++++ lib/audio/Imakefile 2011-10-06 18:15:26.000000000 +0900 +@@ -150,15 +150,15 @@ + XAULIB = -lXau + #endif + +-#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture) ++#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture) + REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm +-#endif + +-#if defined(cygwinArchitecture) ++#elif defined(cygwinArchitecture) + REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $(XTOOLLIB) $(XONLYLIB) + STD_INCLUDES = -I/usr/include +-#endif +- ++#else ++REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) ++#endif + + #if DoSharedLib + #if DoNormalLib Index: audio/nas/patches/patch-server_Imakefile =================================================================== RCS file: audio/nas/patches/patch-server_Imakefile diff -N audio/nas/patches/patch-server_Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/nas/patches/patch-server_Imakefile 6 Oct 2011 09:31:43 -0000 @@ -0,0 +1,45 @@ +$NetBSD$ + +Replacement of patches/patch-ab + +--- server/Imakefile.orig 2009-02-26 10:16:01.000000000 +0900 ++++ server/Imakefile 2011-10-06 18:18:11.000000000 +0900 +@@ -61,7 +61,7 @@ + #endif + + #ifdef NetBSDArchitecture +- SYSLIBS = -lossaudio ++ SYSLIBS = $(LIBOSSAUDIO) + #endif + + CBRT = +@@ -96,7 +96,7 @@ + #endif + + +-#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) ++#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) + # define CanBuildAuServer YES + + #if !defined(GNUMachArchitecture) +@@ -215,14 +215,19 @@ + $(RM) $(ALL) + + ETCDIR = NasConfigSearchPath ++ EGDIR = ${PREFIX}/share/examples/nas + + InstallManPage(nasd,$(MANDIR)) + #ifdef InstallGenManPage + InstallGenManPage(nasd.conf,$(FILEMANDIR),$(FILEMANSUFFIX)) + #else ++#ifdef InstallNamedTarget ++InstallNamedTarget(install.man,nasd.conf.man,$(INSTMANFLAGS),$(FILEMANDIR),nasd.conf.$(FILEMANSUFFIX)) ++#else + InstallManPage(nasd.conf,$(FILEMANDIR)) + #endif +-InstallNonExecFile(nasd.conf.eg,$(ETCDIR)) ++#endif ++InstallNonExecFile(nasd.conf.eg,$(EGDIR)) + + #else /* CanBuildAuServer */ + Index: audio/nas/patches/patch-server_dda_voxware_auvoxware.c =================================================================== RCS file: audio/nas/patches/patch-server_dda_voxware_auvoxware.c diff -N audio/nas/patches/patch-server_dda_voxware_auvoxware.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/nas/patches/patch-server_dda_voxware_auvoxware.c 6 Oct 2011 09:32:33 -0000 @@ -0,0 +1,83 @@ +$NetBSD$ + +Replacement of patches/patch-ad + +--- server/dda/voxware/auvoxware.c.orig 2009-02-26 10:16:00.000000000 +0900 ++++ server/dda/voxware/auvoxware.c 2011-10-06 18:21:41.000000000 +0900 +@@ -245,8 +245,13 @@ + 256, /* fragSize */ + 3, /* minFrags */ + 32, /* maxFrags */ ++#if defined(__NetBSD__) ++ "@DEVOSSAUDIO@", /* device */ ++ "/dev/mixer", /* mixer */ ++#else + "/dev/dsp1", /* device */ + "/dev/mixer1", /* mixer */ ++#endif + O_RDONLY, /* howToOpen */ + 1, /* autoOpen */ + 0, /* forceRate */ +@@ -266,7 +271,11 @@ + 256, /* fragSize */ + 3, /* minFrags */ + 32, /* maxFrags */ ++#if defined(__NetBSD__) ++ "@DEVOSSAUDIO@", /* device */ ++#else + "/dev/dsp", /* device */ ++#endif + "/dev/mixer", /* mixer */ + O_WRONLY, /* howToOpen */ + 1, /* autoOpen */ +@@ -875,7 +884,11 @@ + if (sndStatOut.fd == -1) { + while ((sndStatOut.fd = open(sndStatOut.device, + sndStatOut. ++#if defined(__FreeBSD__) || defined(__NetBSD__) ++ howToOpen | extramode, ++#else + howToOpen | O_SYNC | extramode, ++#endif + 0666)) == -1 && wait) { + osLogMsg("openDevice: waiting on output device\n"); + sleep(1); +@@ -1372,7 +1385,7 @@ + } + + +-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) ++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__) + inline + #endif + static void +@@ -1387,7 +1400,7 @@ + } + } + +-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) ++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__) + inline + #endif + static void +@@ -1450,7 +1463,7 @@ + AuUnBlockAudio(l); + } + +-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) ++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__) + inline + #endif + static void +@@ -1880,7 +1893,11 @@ + sndStatOut.device, sndStatOut.howToOpen); + + if ((fd = open(sndStatOut.device, ++#if defined(__FreeBSD__) || defined(__NetBSD__) ++ sndStatOut.howToOpen | extramode, ++#else + sndStatOut.howToOpen | O_SYNC | extramode, ++#endif + 0)) == -1) { + UNIDENTMSG; + osLogMsg("Init: Output open(%s) failed: %s\n",