Attachment #26080 for bug #44482

View | Details | Raw Unified | Return to bug 44482
Collapse All | Expand All




#

PORTNAME=	nas
PORTVERSION=	1.6
CATEGORIES=	audio
MASTER_SITES=	http://radscan.com/nas/
EXTRACT_SUFX=	.src.tar.gz

XMKMF=		xmkmf
INSTALLS_SHLIB=	yes

.include <bsd.port.pre.mk>

.include "${.CURDIR}/Makefile.man"

post-patch:
	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} \
		${REINPLACE_CMD} -e "s|<malloc.h>|<stdlib.h>|g"

post-install:
	@${SED} -e 's:/usr/X11R6:${PREFIX}:g' ${PKGMESSAGE}

.include "Makefile.man"
.include <bsd.port.mk>

Line 1 Link Here

(-)audio/nas/distinfo (-1 / +1 lines)
1	MD5 (nas-1.5.src.tar.gz) = 0726f5537b576d4d2c80208ae8b24946	1	MD5 (nas-1.6.src.tar.gz) = 08b54fbf3af8c2ffab39f6f84f2ab337




--- server/dda/voxware/auvoxware.c.orig	Thu Jul 25 09:42:28 2002
+++ server/dda/voxware/auvoxware.c	Sat Oct 26 02:54:26 2002
@@ -133,7 +133,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef SVR4
+#if !defined(SVR4) && !defined(__FreeBSD__)
 #include <getopt.h>
 #endif
 #include <sys/types.h>
@@ -171,16 +171,11 @@
 #include <sys/param.h>
 #include <assert.h>
 

 #endif
 
 #include <audio/audio.h>
@@ -659,7 +654,11 @@
 
     if(sndStatOut.fd == -1)
     {
        while ((sndStatOut.fd = open(sndStatOut.device, 
+#if defined(__FreeBSD__)
+				    sndStatOut.howToOpen|extramode, 
+#else
 				    sndStatOut.howToOpen|O_SYNC|extramode, 
+#endif
 				    0666)) == -1 && wait)
        {
            osLogMsg("openDevice: waiting on output device\n");
@@ -1310,6 +1309,11 @@
@@ -1269,6 +1268,11 @@
 /*
  * Setup soundcard at maximum audio quality.
  */
+
+#if defined(__FreeBSD__)
+#define NO_16_BIT_SAMPLING
+#endif
+
 static void setupSoundcard(sndStatPtr)
 SndStat* sndStatPtr;
 {
@@ -1472,7 +1476,11 @@
 	  osLogMsg("openDevice OUT %s mode %d\n", 
 		   sndStatOut.device, sndStatOut.howToOpen);
 	
 	if ((fd = open(sndStatOut.device, 
+#if defined(__FreeBSD__)
+		       sndStatOut.howToOpen|extramode, 0)) == -1)
+#else
 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
+#endif
 	  {
 	    UNIDENTMSG;




--- 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 {




--- ./lib/audio/Alibint.c.orig	Sat Sep  7 17:07:48 2002
+++ ./lib/audio/Alibint.c	Sat Sep  7 17:07:58 2002
@@ -1349,8 +1349,8 @@
 {
 #if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__)
     extern char *sys_errlist[];
-#endif
     extern int sys_nerr;
+#endif
     char *s = (char *)((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
 
     return (s ? s : "no such error");




$FreeBSD: ports/audio/nas/files/patch-server_os_utils.c,v 1.1 2002/05/25 17:37:32 trevor Exp $

 utils.c:124: conflicting types for `sbrk'
 /usr/include/unistd.h:212: previous declaration of `sbrk'

--- server/os/utils.c.orig	Sat May 25 10:07:51 2002
+++ server/os/utils.c	Sat May 25 10:21:48 2002
@@ -120,7 +120,7 @@ static mutex print_lock
 
 void ddxUseMsg(void);
 
-#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX)
+#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX) && !defined(__FreeBSD__)
 extern char *sbrk();
 #endif


Return to bug 44482

Lines 6-12 Link Here

(-)audio/nas/Makefile (-6 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= nas	8	PORTNAME= nas
9	PORTVERSION= 1.5	9	PORTVERSION= 1.6
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://radscan.com/nas/	11	MASTER_SITES= http://radscan.com/nas/
12	EXTRACT_SUFX= .src.tar.gz	12	EXTRACT_SUFX= .src.tar.gz
Lines 20-29 Link Here
20	XMKMF= xmkmf	20	XMKMF= xmkmf
21	INSTALLS_SHLIB= yes	21	INSTALLS_SHLIB= yes
22		22
23	.include <bsd.port.pre.mk>
24
25	.include "${.CURDIR}/Makefile.man"
26
27	post-patch:	23	post-patch:
28	@${FIND} ${WRKSRC} -name '*.[ch]' \| ${XARGS} \	24	@${FIND} ${WRKSRC} -name '*.[ch]' \| ${XARGS} \
29	${REINPLACE_CMD} -e "s\|<malloc.h>\|<stdlib.h>\|g"	25	${REINPLACE_CMD} -e "s\|<malloc.h>\|<stdlib.h>\|g"
Lines 31-34 Link Here
31	post-install:	27	post-install:
32	@${SED} -e 's:/usr/X11R6:${PREFIX}:g' ${PKGMESSAGE}	28	@${SED} -e 's:/usr/X11R6:${PREFIX}:g' ${PKGMESSAGE}
33		29
34	.include <bsd.port.post.mk>	30	.include "Makefile.man"
		31	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)audio/nas/files/patch-ab (-16 / +25 lines)
1	--- ./server/dda/voxware/auvoxware.c.orig Sun Apr 29 17:11:08 2001	1	--- server/dda/voxware/auvoxware.c.orig Thu Jul 25 09:42:28 2002
2	+++ ./server/dda/voxware/auvoxware.c Sat Sep 7 17:02:34 2002	2	+++ server/dda/voxware/auvoxware.c Sat Oct 26 02:54:26 2002
3	@@ -154,16 +154,11 @@	3	@@ -133,7 +133,7 @@
		4
		5	#include <stdio.h>
		6	#include <stdlib.h>
		7	-#ifndef SVR4
		8	+#if !defined(SVR4) && !defined(__FreeBSD__)
		9	#include <getopt.h>
		10	#endif
		11	#include <sys/types.h>
		12	@@ -171,16 +171,11 @@
4	#include <sys/param.h>	13	#include <sys/param.h>
5	#include <assert.h>	14	#include <assert.h>
6		15
Lines 21-58 Link Here
21	#endif	30	#endif
22		31
23	#include <audio/audio.h>	32	#include <audio/audio.h>
24	@@ -624,7 +619,11 @@	33	@@ -659,7 +654,11 @@
25
26	if(sndStatOut.fd == -1)	34	if(sndStatOut.fd == -1)
27	{	35	{
28	+#ifdef __FreeBSD__	36	while ((sndStatOut.fd = open(sndStatOut.device,
29	+ while ((sndStatOut.fd = open(sndStatOut.device, sndStatOut.howToOpen, 0666)) == -1 && wait)	37	+#if defined(__FreeBSD__)
		38	+ sndStatOut.howToOpen\|extramode,
30	+#else	39	+#else
31	while ((sndStatOut.fd = open(sndStatOut.device, sndStatOut.howToOpen\|O_SYNC, 0666)) == -1 && wait)	40	sndStatOut.howToOpen\|O_SYNC\|extramode,
32	+#endif	41	+#endif
		42	0666)) == -1 && wait)
33	{	43	{
34	osLogMsg("openDevice: waiting on output device\n");	44	osLogMsg("openDevice: waiting on output device\n");
35	sleep(1);	45	@@ -1310,6 +1309,11 @@
36	@@ -1269,6 +1268,11 @@
37	/*	46	/*
38	* Setup soundcard at maximum audio quality.	47	* Setup soundcard at maximum audio quality.
39	*/	48	*/
40	+	49	+
41	+#ifdef __FreeBSD__	50	+#if defined(__FreeBSD__)
42	+#define NO_16_BIT_SAMPLING	51	+#define NO_16_BIT_SAMPLING
43	+#endif	52	+#endif
44	+	53	+
45	static void setupSoundcard(sndStatPtr)	54	static void setupSoundcard(sndStatPtr)
46	SndStat* sndStatPtr;	55	SndStat* sndStatPtr;
47	{	56	{
48	@@ -1425,7 +1429,11 @@	57	@@ -1472,7 +1476,11 @@
49	osLogMsg("openDevice OUT %s mode %d\n",
50	sndStatOut.device, sndStatOut.howToOpen);	58	sndStatOut.device, sndStatOut.howToOpen);
51		59
52	+#ifdef __FreeBSD__	60	if ((fd = open(sndStatOut.device,
53	+ if ((fd = open(sndStatOut.device, sndStatOut.howToOpen, 0)) == -1)	61	+#if defined(__FreeBSD__)
		62	+ sndStatOut.howToOpen\|extramode, 0)) == -1)
54	+#else	63	+#else
55	if ((fd = open(sndStatOut.device, sndStatOut.howToOpen\|O_SYNC, 0)) == -1)	64	sndStatOut.howToOpen\|O_SYNC\|extramode, 0)) == -1)
56	+#endif	65	+#endif
57	{	66	{
58	UNIDENTMSG;	67	UNIDENTMSG;

Lines 1-12 Link Here

(-)audio/nas/files/patch-ac (-12 lines)
1	--- lib/audio/Astreams.c.orig Sun May 9 10:10:05 1999
2	+++ lib/audio/Astreams.c Sat Mar 25 15:20:42 2000
3	@@ -52,7 +52,9 @@
4	#include <sys/stropts.h>
5
6	extern int errno;
7	+#if !defined(BSD)
8	extern char *sys_errlist[];
9	+#endif
10
11	/* stolen from <X11/Xproto.h> */
12	typedef struct {

Lines 1-12 Link Here

(-)audio/nas/files/patch-ah (-12 lines)
1	--- ./lib/audio/Alibint.c.orig Sat Sep 7 17:07:48 2002
2	+++ ./lib/audio/Alibint.c Sat Sep 7 17:07:58 2002
3	@@ -1349,8 +1349,8 @@
4	{
5	#if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__)
6	extern char *sys_errlist[];
7	-#endif
8	extern int sys_nerr;
9	+#endif
10	char s = (char )((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
11
12	return (s ? s : "no such error");

Lines 1-16 Link Here

(-)audio/nas/files/patch-server_os_utils.c (-16 lines)
1	$FreeBSD: ports/audio/nas/files/patch-server_os_utils.c,v 1.1 2002/05/25 17:37:32 trevor Exp $
2
3	utils.c:124: conflicting types for `sbrk'
4	/usr/include/unistd.h:212: previous declaration of `sbrk'
5
6	--- server/os/utils.c.orig Sat May 25 10:07:51 2002
7	+++ server/os/utils.c Sat May 25 10:21:48 2002
8	@@ -120,7 +120,7 @@ static mutex print_lock
9
10	void ddxUseMsg(void);
11
12	-#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX)
13	+#if !defined(SVR4) && !defined(hpux) && !defined(linux) && !defined(AMOEBA) && !defined(_MINIX) && !defined(__FreeBSD__)
14	extern char *sbrk();
15	#endif
16