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

(-)nas/Makefile (-3 / +5 lines)
Lines 6-23 Link Here
6
#
6
#
7
7
8
PORTNAME=	nas
8
PORTNAME=	nas
9
PORTVERSION=	1.8
9
PORTVERSION=	1.9.1
10
PORTREVISION=	1
11
CATEGORIES=	audio
10
CATEGORIES=	audio
12
MASTER_SITES=	http://nas.codebrilliance.com/nas/
11
MASTER_SITES=	SF
13
EXTRACT_SUFX=	.src.tar.gz
12
EXTRACT_SUFX=	.src.tar.gz
14
13
15
MAINTAINER=	multimedia@FreeBSD.org
14
MAINTAINER=	multimedia@FreeBSD.org
16
COMMENT=	Network Audio System
15
COMMENT=	Network Audio System
17
16
18
USE_IMAKE=	yes
17
USE_IMAKE=	yes
18
USE_XORG=	x11 xext xt xau sm ice xp xpm xmu xaw
19
USE_LDCONFIG=	yes
19
USE_LDCONFIG=	yes
20
MAKE_ENV+=	COMPRESS_CMD="${COMPRESS_CMD:S/c//}"
20
MAKE_ENV+=	COMPRESS_CMD="${COMPRESS_CMD:S/c//}"
21
MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
22
21
PKGMESSAGE=	${WRKDIR}/pkg-message
23
PKGMESSAGE=	${WRKDIR}/pkg-message
22
SUB_FILES=	pkg-message
24
SUB_FILES=	pkg-message
23
25
(-)nas/Makefile.man (-1 lines)
Lines 12-18 Link Here
12
	aurecord.1 \
12
	aurecord.1 \
13
	auscope.1 \
13
	auscope.1 \
14
	autool.1 \
14
	autool.1 \
15
	auvoxware.1 \
16
	auwave.1 \
15
	auwave.1 \
17
	checkmail.1 \
16
	checkmail.1 \
18
	issndfile.1 \
17
	issndfile.1 \
(-)nas/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (nas-1.8.src.tar.gz) = 7e5ecab75a48c75b0c6305fcced34a97
1
MD5 (nas-1.9.1.src.tar.gz) = d975efefba50b985446bb2c2cb4ee91f
2
SHA256 (nas-1.8.src.tar.gz) = e9b1e17f469c5db04f693c233886b78fce92fb48fe967976257eebadb09eb98d
2
SHA256 (nas-1.9.1.src.tar.gz) = df25cc35f119deb05e42b01b541d7cd2f47f14dffb787637756c2911d995308a
3
SIZE (nas-1.8.src.tar.gz) = 1290578
3
SIZE (nas-1.9.1.src.tar.gz) = 1454523
(-)nas/files/patch-ab (-24 / +24 lines)
Lines 1-5 Link Here
1
--- server/dda/voxware/auvoxware.c.orig	Sat Oct 23 08:44:47 2004
1
--- server/dda/voxware/auvoxware.c.orig	2008-05-14 22:35:08.000000000 +0400
2
+++ server/dda/voxware/auvoxware.c	Mon Nov 15 21:13:49 2004
2
+++ server/dda/voxware/auvoxware.c	2008-05-14 22:40:32.000000000 +0400
3
@@ -133,7 +133,7 @@
3
@@ -133,7 +133,7 @@
4
 
4
 
5
 #include <stdio.h>
5
 #include <stdio.h>
Lines 9-15 Link Here
9
 #include <getopt.h>
9
 #include <getopt.h>
10
 #endif
10
 #endif
11
 #include <sys/types.h>
11
 #include <sys/types.h>
12
@@ -177,7 +177,9 @@
12
@@ -183,7 +183,9 @@
13
 # else
13
 # else
14
 #  include <machine/soundcard.h>
14
 #  include <machine/soundcard.h>
15
 # endif
15
 # endif
Lines 19-37 Link Here
19
 #else
19
 #else
20
 # ifdef __NetBSD__
20
 # ifdef __NetBSD__
21
 #  include <sys/ioctl.h>
21
 #  include <sys/ioctl.h>
22
@@ -670,7 +672,11 @@
22
@@ -875,7 +877,11 @@
23
   if(sndStatOut.fd == -1)
23
         if (sndStatOut.fd == -1) {
24
     {
24
             while ((sndStatOut.fd = open(sndStatOut.device,
25
       while ((sndStatOut.fd = open(sndStatOut.device, 
25
                                          sndStatOut.
26
+#if defined(__FreeBSD__)
26
+#if defined(__FreeBSD__)
27
+                                   sndStatOut.howToOpen|extramode, 
27
+                                         howToOpen | extramode,
28
+#else
28
+#else
29
                                    sndStatOut.howToOpen|O_SYNC|extramode, 
29
                                          howToOpen | O_SYNC | extramode,
30
+#endif
30
+#endif
31
                                    0666)) == -1 && wait)
31
                                          0666)) == -1 && wait) {
32
         {
32
                 osLogMsg("openDevice: waiting on output device\n");
33
           osLogMsg("openDevice: waiting on output device\n");
33
                 sleep(1);
34
@@ -1330,6 +1334,11 @@
34
@@ -1618,6 +1624,11 @@
35
 /*
35
 /*
36
  * Setup soundcard at maximum audio quality.
36
  * Setup soundcard at maximum audio quality.
37
  */
37
  */
Lines 40-57 Link Here
40
+#define NO_16_BIT_SAMPLING
40
+#define NO_16_BIT_SAMPLING
41
+#endif
41
+#endif
42
+
42
+
43
 static void setupSoundcard(sndStatPtr)
43
 static void
44
 SndStat* sndStatPtr;
44
 setupSoundcard(SndStat * sndStatPtr)
45
 {
45
 {
46
@@ -1571,7 +1580,11 @@
46
@@ -1880,7 +1891,11 @@
47
 		   sndStatOut.device, sndStatOut.howToOpen);
47
                              sndStatOut.device, sndStatOut.howToOpen);
48
 	
48
 
49
 	if ((fd = open(sndStatOut.device, 
49
                 if ((fd = open(sndStatOut.device,
50
+#if defined(__FreeBSD__)
50
+#if defined(__FreeBSD__)
51
+		       sndStatOut.howToOpen|extramode, 0)) == -1)
51
+                               sndStatOut.howToOpen | extramode,
52
+#else
52
+#else
53
 		       sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
53
                                sndStatOut.howToOpen | O_SYNC | extramode,
54
+#endif
54
+#endif
55
 	  {
55
                                0)) == -1) {
56
 	    UNIDENTMSG;
56
                     UNIDENTMSG;
57
             osLogMsg("Output open(%s) failed: %s\n",
57
                     osLogMsg("Init: Output open(%s) failed: %s\n",
(-)nas/files/patch-clients_audio_auphone_auphone.c (-18 / +29 lines)
Lines 1-61 Link Here
1
--- clients/audio/auphone/auphone.c	Sat Jul 20 21:13:30 2002
1
--- clients/audio/auphone/auphone.c.orig	2007-06-16 23:03:12.000000000 +0400
2
+++ clients/audio/auphone/auphone.c	Mon Oct 10 11:32:46 2005
2
+++ clients/audio/auphone/auphone.c	2008-05-14 22:44:05.000000000 +0400
3
@@ -28,4 +28,5 @@
3
@@ -27,6 +27,7 @@
4
  * $NCDId: @(#)auphone.c,v 1.10 1996/05/07 20:13:12 greg Exp $
4
  */
5
  */
5
 
6
 
6
+#include <inttypes.h>
7
+#include <inttypes.h>
7
 #include <stdio.h>
8
 #include <stdio.h>
8
 #include <stdlib.h>
9
 #include <stdlib.h>
9
@@ -218,7 +219,7 @@
10
 
11
@@ -219,13 +220,12 @@
12
                *ringoutData,
10
                *busyData;
13
                *busyData;
11
 
14
 
12
-static int
15
-static int
13
+static intptr_t
16
+static intptr_t
14
 fatalError(message, arg)
17
 fatalError(const char *message, const char *arg)
15
-char           *message,
16
+const char     *message,
17
                *arg;
18
 {
18
 {
19
@@ -226,5 +227,4 @@
19
     fprintf(stderr, message, arg);
20
     fprintf(stderr, "\n");
20
     fprintf(stderr, "\n");
21
     exit(1);
21
     exit(1);
22
-    return 0;
22
-    return 0;
23
 }
23
 }
24
 
24
 
25
@@ -240,5 +240,5 @@
25
 static void
26
@@ -237,7 +237,7 @@
27
     {
26
 	g->bufSize = e->num_bytes;
28
 	g->bufSize = e->num_bytes;
27
 
29
 
28
-	if (!(g->buf = (char *) malloc(g->bufSize)))
30
-	if (!(g->buf = (char *) malloc(g->bufSize)))
29
+	if (!(g->buf = malloc(g->bufSize)))
31
+	if (!(g->buf = malloc(g->bufSize)))
30
 	    fatalError("malloc failed");
32
 	    fatalError("malloc failed", NULL);
31
     }
33
     }
32
@@ -252,6 +252,6 @@
34
     else
35
@@ -249,8 +249,8 @@
36
 
33
 	g->bufSize += e->num_bytes;
37
 	g->bufSize += e->num_bytes;
34
 
38
 
35
-	if (!(g->buf = (char *) realloc(g->buf, g->bufSize)))
39
-	if (!(g->buf = (char *) realloc(g->buf, g->bufSize)))
36
-	    fatalError("malloc failed");
40
-	    fatalError("malloc failed", NULL);
37
+	if (!(g->buf = realloc(g->buf, g->bufSize)))
41
+	if (!(g->buf = realloc(g->buf, g->bufSize)))
38
+	    fatalError("realloc failed");
42
+	    fatalError("remalloc failed", NULL);
39
     }
43
     }
40
 
44
 
41
@@ -918,5 +918,5 @@
45
     n = AuReadElement(g->local.aud, e->flow, e->element_num, e->num_bytes,
46
@@ -871,7 +871,7 @@
47
 adjustVolume(Widget w, XtPointer gp, XtPointer volp)
42
 {
48
 {
43
     GlobalDataPtr   g = (GlobalDataPtr)gp;
49
     GlobalDataPtr   g = (GlobalDataPtr)gp;
44
-    int             vol = (int)volp;
50
-    int             vol = (int)volp;
45
+    intptr_t        vol = (intptr_t)volp;
51
+    intptr_t        vol = (intptr_t)volp;
46
     AuElementParameters parms;
52
     AuElementParameters parms;
47
 
53
 
48
@@ -940,5 +940,5 @@
54
     if (!g->local.volFlow)
55
@@ -890,7 +890,7 @@
56
 adjustInputGain(Widget w, XtPointer gp, XtPointer gainp)
49
 {
57
 {
50
     GlobalDataPtr   g = (GlobalDataPtr)gp;
58
     GlobalDataPtr   g = (GlobalDataPtr)gp;
51
-    int             gain = (int)gainp;
59
-    int             gain = (int)gainp;
52
+    intptr_t        gain = (intptr_t)gainp;
60
+    intptr_t        gain = (intptr_t)gainp;
53
     ServerPtr       l = &g->local;
61
     ServerPtr       l = &g->local;
54
     AuDeviceAttributes da;
62
     AuDeviceAttributes da;
55
@@ -1129,5 +1129,5 @@
63
 
64
@@ -1065,7 +1065,7 @@
65
 	if (!(s = SoundOpenFileForReading(ring)))
56
 	    fatalError("Can't open ring %s", ring);
66
 	    fatalError("Can't open ring %s", ring);
57
 
67
 
58
-	if (!(chunk = (char *) malloc(CHUNK_SIZE)))
68
-	if (!(chunk = (char *) malloc(CHUNK_SIZE)))
59
+	if (!(chunk = malloc(CHUNK_SIZE)))
69
+	if (!(chunk = malloc(CHUNK_SIZE)))
60
 	    fatalError("malloc failed");
70
 	    fatalError("malloc failed", NULL);
61
 
71
 
72
 	sprintf(buf, "%s %d", RINGIN, volume);
(-)nas/files/patch-server_dda_voxware_config.c (-66 / +102 lines)
Lines 1-97 Link Here
1
--- server/dda/voxware/config.c	Fri Jul 12 00:44:16 2002
1
--- server/dda/voxware/config.c.orig	2007-06-16 23:03:22.000000000 +0400
2
+++ server/dda/voxware/config.c	Mon Oct 10 10:25:22 2005
2
+++ server/dda/voxware/config.c	2008-05-14 22:49:23.000000000 +0400
3
@@ -6,4 +6,5 @@
3
@@ -5,6 +5,7 @@
4
  */
4
 
5
 
5
 #include <fcntl.h>
6
 #include <fcntl.h>
6
+#include <inttypes.h>
7
+#include <inttypes.h>
7
 #include "nasconf.h"
8
 #include "nasconf.h"
8
 #include "config.h"
9
 #include "config.h"
9
@@ -27,5 +28,5 @@
10
 #include "aulog.h"
10
     {
11
@@ -27,7 +28,7 @@
11
     case CONF_SET_SECTION:
12
-      num = (int) value;
13
+      num = (intptr_t) value;
14
 
12
 
15
       if (num == INPUTSECTION)
13
     switch (token) {
16
@@ -40,10 +41,10 @@
14
     case CONF_SET_SECTION:
15
-        num = (int) value;
16
+        num = (intptr_t) value;
17
 
17
 
18
     case FORCERATE :
18
         if (num == INPUTSECTION) {      /* we're in the input section */
19
-      num = (int) value;
19
             confStat = &sndStatIn;
20
+      num = (intptr_t) value;
20
@@ -37,12 +38,12 @@
21
       confStat->forceRate = num ;
21
         break;
22
       break;
22
 
23
 
23
     case FORCERATE:
24
     case GAIN :
24
-        num = (int) value;
25
-      num = (int) value;
25
+        num = (intptr_t) value;
26
+      num = (intptr_t) value;
26
         confStat->forceRate = num;
27
       /* the default is 50, so if it's just out of range, don't
27
         break;
28
 	 reset it */
28
 
29
@@ -56,10 +57,10 @@
29
     case GAINSCALE:
30
 
30
-        num = (int) value;
31
     case AUTOOPEN :
31
+        num = (intptr_t) value;
32
-      num = (int) value;
32
         if (num < 0 || num > 100)
33
+      num = (intptr_t) value;
33
             osLogMsg("config: gain scaling must be within the range 0-100\n");
34
       confStat->autoOpen = num;
34
         else
35
       break;
35
@@ -50,7 +51,7 @@
36
 
36
         break;
37
     case READWRITE :
37
 
38
-      num = (int) value;
38
     case GAIN:
39
+      num = (intptr_t) value;
39
-        num = (int) value;
40
       if (confStat == &sndStatIn) {
40
+        num = (intptr_t) value;
41
 	confStat->howToOpen = (num ? O_RDWR : O_RDONLY);
41
         /* the default is 50, so if it's just out of range, don't
42
@@ -85,5 +86,5 @@
42
            reset it */
43
         if (num < 0 || num > 100)
44
@@ -61,12 +62,12 @@
45
         break;
46
 
47
     case AUTOOPEN:
48
-        num = (int) value;
49
+        num = (intptr_t) value;
50
         confStat->autoOpen = num;
51
         break;
52
 
53
     case READWRITE:
54
-        num = (int) value;
55
+        num = (intptr_t) value;
56
         if (confStat == &sndStatIn) {
57
             confStat->howToOpen = (num ? O_RDWR : O_RDONLY);
58
         } else {
59
@@ -89,7 +90,7 @@
60
         break;
43
 
61
 
44
     case WORDSIZE:
62
     case WORDSIZE:
45
-      num = (int) value;
63
-        num = (int) value;
46
+      num = (intptr_t) value;
64
+        num = (intptr_t) value;
47
 
65
 
48
       if (num != 8 && num != 16) 
66
         if (num != 8 && num != 16) {
49
@@ -97,5 +98,5 @@
67
             osLogMsg("config: Wordsize (%d) not 8 or 16, setting to 8\n",
68
@@ -100,7 +101,7 @@
69
         break;
50
 
70
 
51
     case FRAGSIZE:
71
     case FRAGSIZE:
52
-      num = (int) value;
72
-        num = (int) value;
53
+      num = (intptr_t) value;
73
+        num = (intptr_t) value;
54
 
74
 
55
       {
75
         {
56
@@ -122,5 +123,5 @@
76
             int i, j, k;
77
@@ -125,7 +126,7 @@
78
         break;
57
 
79
 
58
     case MINFRAGS:
80
     case MINFRAGS:
59
-      num = (int) value;
81
-        num = (int) value;
60
+      num = (intptr_t) value;
82
+        num = (intptr_t) value;
61
 
83
 
62
       if (num < 2 || num > 32) 
84
         if (num < 2 || num > 32) {
63
@@ -137,5 +138,5 @@
85
             osLogMsg("config: Minfrags out of range - setting to 2\n");
86
@@ -138,7 +139,7 @@
87
         break;
64
 
88
 
65
     case MAXFRAGS:
89
     case MAXFRAGS:
66
-      num = (int) value;
90
-        num = (int) value;
67
+      num = (intptr_t) value;
91
+        num = (intptr_t) value;
68
 
92
 
69
       if (num < 2 || num > 32) 
93
         if (num < 2 || num > 32) {
70
@@ -152,5 +153,5 @@
94
             osLogMsg("config: Maxfrags out of range - setting to 32\n");
95
@@ -151,7 +152,7 @@
96
         break;
71
 
97
 
72
     case NUMCHANS:
98
     case NUMCHANS:
73
-      num = (int) value;
99
-        num = (int) value;
74
+      num = (intptr_t) value;
100
+        num = (intptr_t) value;
75
 
101
 
76
       if (num != 1 && num != 2) 
102
         if (num != 1 && num != 2) {
77
@@ -164,5 +165,5 @@
103
             osLogMsg("config: Number of channels wrong, setting to 1\n");
104
@@ -161,25 +162,25 @@
105
         break;
78
 
106
 
79
     case MAXRATE:
107
     case MAXRATE:
80
-      num = (int) value;
108
-        num = (int) value;
81
+      num = (intptr_t) value;
109
+        num = (intptr_t) value;
82
 
110
 
83
       confStat->maxSampleRate = num;
111
         confStat->maxSampleRate = num;
84
@@ -170,5 +171,5 @@
112
         break;
85
 
113
 
86
     case MINRATE:
114
     case MINRATE:
87
-      num = (int) value;
115
-        num = (int) value;
88
+      num = (intptr_t) value;
116
+        num = (intptr_t) value;
89
 
117
 
90
       confStat->minSampleRate = num;
118
         confStat->minSampleRate = num;
91
@@ -176,5 +177,5 @@
119
         break;
92
 
120
 
93
     case MIXERINIT:
121
     case MIXERINIT:
94
-      num = (int) value;
122
-        num = (int) value;
95
+      num = (intptr_t) value;
123
+        num = (intptr_t) value;
124
 
125
         VOXMixerInit = num;
126
         break;
127
 
128
     case REINITMIXER:
129
-        num = (int) value;
130
+        num = (intptr_t) value;
96
 
131
 
97
       VOXMixerInit = num;
132
         VOXReInitMixer = num;
133
         break;
(-)nas/files/patch-server_dia_gram.y (-39 / +44 lines)
Lines 1-64 Link Here
1
--- server/dia/gram.y	Mon Dec 22 21:00:04 2003
1
--- server/dia/gram.y.orig	2007-06-16 23:03:22.000000000 +0400
2
+++ server/dia/gram.y	Mon Oct 10 10:46:03 2005
2
+++ server/dia/gram.y	2008-05-14 22:51:53.000000000 +0400
3
@@ -4,4 +4,5 @@
3
@@ -3,6 +3,7 @@
4
 
4
 
5
 
5
 %{
6
 %{
6
+#include <inttypes.h>
7
+#include <inttypes.h>
7
 #include <stdio.h>
8
 #include <stdio.h>
8
 #include <stdlib.h>
9
 #include <stdlib.h>
9
@@ -15,5 +16,5 @@
10
 #include <string.h>
11
@@ -14,14 +15,14 @@
12
 #include "misc.h"
10
 
13
 
11
 static char	*ptr;
14
 static char     *ptr;
12
-static int parsebool(char *str);
15
-static int parsebool(char *str);
13
+static intptr_t parsebool(const char *str);
16
+static intptr_t parsebool(const char *str);
14
 extern int yylineno;
17
 extern int yylineno;
15
 
18
 
16
@@ -22,5 +23,5 @@
19
 %}
20
 
17
 %union
21
 %union
18
 {
22
 {
19
-    int num;
23
-    int num;
20
+    intptr_t num;
24
+    intptr_t num;
21
     char *ptr;
25
     char *ptr;
22
 };
26
 };
23
@@ -239,30 +240,21 @@
27
 
28
@@ -250,30 +251,21 @@
29
     *o = '\0';
24
 }
30
 }
25
 
31
 
26
-static int parsebool(char *str)
32
-static int
33
-parsebool(char *str)
27
+static intptr_t
34
+static intptr_t
28
+parsebool(const char *str)
35
+parsebool(const char *str)
29
 {
36
 {
30
-  char *s;
37
-    char *s;
31
-
38
-
32
-  s = str;
39
-    s = str;
33
-
40
-
34
-  if (s == NULL)
41
-    if (s == NULL)
35
+  if (str == NULL)
42
+    if (str == NULL)
36
     return(-1);
43
         return (-1);
37
 
44
 
38
-  while(*s)
45
-    while (*s) {
39
-    {
46
-        *s = (char) tolower(*s);
40
-      *s = (char)tolower(*s);
47
-        s++;
41
-      s++;
42
-    }
48
-    }
43
-
49
-
44
-  if (((char *)strstr("false", str) != NULL) ||
50
-    if (((char *) strstr("false", str) != NULL) ||
45
-      ((char *)strstr("no", str) != NULL)    ||
51
-        ((char *) strstr("no", str) != NULL) ||
46
-      ((char *)strstr("0", str) != NULL)     ||
52
-        ((char *) strstr("0", str) != NULL) ||
47
-      ((char *)strstr("off", str) != NULL))
53
-        ((char *) strstr("off", str) != NULL)) {
48
+  if (((char *)strcasestr("false", str) != NULL) ||
54
+    if (((char *) strcasestr("false", str) != NULL) ||
49
+      ((char *)strcasestr("no", str) != NULL)    ||
55
+        ((char *) strcasestr("no", str) != NULL) ||
50
+      ((char *)strcasestr("0", str) != NULL)     ||
56
+        ((char *) strcasestr("0", str) != NULL) ||
51
+      ((char *)strcasestr("off", str) != NULL))
57
+        ((char *) strcasestr("off", str) != NULL)) {
52
     {
58
         return (FALSE);
53
       return(FALSE);
59
-    } else if (((char *) strstr("true", str) != NULL) ||
54
     }
60
-               ((char *) strstr("yes", str) != NULL) ||
55
-  else if (((char *)strstr("true", str) != NULL) ||
61
-               ((char *) strstr("1", str) != NULL) ||
56
-           ((char *)strstr("yes", str) != NULL)  ||
62
-               ((char *) strstr("on", str) != NULL)) {
57
-           ((char *)strstr("1", str) != NULL)    ||
63
+    } else if (((char *) strcasestr("true", str) != NULL) ||
58
-           ((char *)strstr("on", str) != NULL))
64
+               ((char *) strcasestr("yes", str) != NULL) ||
59
+  else if (((char *)strcasestr("true", str) != NULL) ||
65
+               ((char *) strcasestr("1", str) != NULL) ||
60
+           ((char *)strcasestr("yes", str) != NULL)  ||
66
+               ((char *) strcasestr("on", str) != NULL)) {
61
+           ((char *)strcasestr("1", str) != NULL)    ||
67
         return (TRUE);
62
+           ((char *)strcasestr("on", str) != NULL))
68
     } else {
63
     {
69
         fprintf(stderr, "parsebool(): error parsing '%s', \n\t%s\n",
64
       return(TRUE);
(-)nas/files/patch-useXt (-4 / +8 lines)
Lines 1-8 Link Here
1
--- lib/audio/Imakefile	Sat Jun  4 16:08:54 2005
1
--- lib/audio/Imakefile.orig	2008-05-14 22:57:01.000000000 +0400
2
+++ lib/audio/Imakefile	Mon Oct 10 15:38:24 2005
2
+++ lib/audio/Imakefile	2008-05-14 22:57:08.000000000 +0400
3
@@ -152,5 +152,3 @@
3
@@ -150,9 +150,7 @@
4
 XAULIB = -lXau
5
 #endif
4
 
6
 
5
-#if defined(LinuxArchitecture)
7
-#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__)
6
 REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm 
8
 REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm 
7
-#endif
9
-#endif
8
 
10
 
11
 #if defined(cygwinArchitecture)
12
 REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $(XTOOLLIB) $(XONLYLIB)

Return to bug 123684