Assume that we need to link with -lXt -lXau if we're not on any of the platforms explicitly defined. Should fix build on SunOS.diff -r1.22 -r1.23 pkgsrc/audio/nas/distinfo
(tnn)
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: distinfo,v 1.22 2007/12/25 19:48:42 markd Exp $ | 1 | $NetBSD: distinfo,v 1.23 2008/05/31 13:32:04 tnn Exp $ | |
2 | 2 | |||
3 | SHA1 (nas-1.9.src.tar.gz) = 2ee3151c71a6667bd996a0f1cda18a8b9d7cb0c7 | 3 | SHA1 (nas-1.9.src.tar.gz) = 2ee3151c71a6667bd996a0f1cda18a8b9d7cb0c7 | |
4 | RMD160 (nas-1.9.src.tar.gz) = a691f10d557bd676bbc2e9f0db949169815446aa | 4 | RMD160 (nas-1.9.src.tar.gz) = a691f10d557bd676bbc2e9f0db949169815446aa | |
5 | Size (nas-1.9.src.tar.gz) = 1471635 bytes | 5 | Size (nas-1.9.src.tar.gz) = 1471635 bytes | |
6 | SHA1 (patch-aa) = b57fe377c3939a67b86e234e06d0bd84bbd92d28 | 6 | SHA1 (patch-aa) = d5dbebf1f718a905df07f76473058699c8f58604 | |
7 | SHA1 (patch-ab) = d424b0970bd23584629f6a9bebea8b8c014462b5 | 7 | SHA1 (patch-ab) = d424b0970bd23584629f6a9bebea8b8c014462b5 | |
8 | SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d | 8 | SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d | |
9 | SHA1 (patch-ad) = 43e71c079c79560172fce434e3a6f2b12ce3f596 | 9 | SHA1 (patch-ad) = 43e71c079c79560172fce434e3a6f2b12ce3f596 | |
10 | SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543 | 10 | SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543 | |
11 | SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a | 11 | SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a | |
12 | SHA1 (patch-ag) = 99a8c9af8385d0ce9c4c08f09b4ae41a2ba268ab | 12 | SHA1 (patch-ag) = 99a8c9af8385d0ce9c4c08f09b4ae41a2ba268ab |
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | $NetBSD: patch-aa,v 1.10 2007/11/10 02:41:34 wiz Exp $ | 1 | $NetBSD: patch-aa,v 1.11 2008/05/31 13:32:04 tnn Exp $ | |
2 | 2 | |||
3 | --- lib/audio/Imakefile.orig 2006-08-14 01:10:05.000000000 +0000 | 3 | --- lib/audio/Imakefile.orig 2006-08-14 03:10:05.000000000 +0200 | |
4 | +++ lib/audio/Imakefile | 4 | +++ lib/audio/Imakefile | |
5 | @@ -150,7 +150,7 @@ XAULIB = | 5 | @@ -150,14 +150,14 @@ XAULIB = | |
6 | XAULIB = -lXau | 6 | XAULIB = -lXau | |
7 | #endif | 7 | #endif | |
8 | 8 | |||
9 | -#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) | 9 | -#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) | |
10 | +#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) || defined(NetBSDArchitecture) | 10 | +#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) || defined(NetBSDArchitecture) | |
11 | REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm | 11 | REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm | |
12 | #endif | 12 | -#endif | |
13 | 13 | - | ||
14 | @@ -159,6 +159,10 @@ REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $ | 14 | -#if defined(cygwinArchitecture) | |
15 | +#elif defined(cygwinArchitecture) | |||
16 | REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $(XTOOLLIB) $(XONLYLIB) | |||
15 | STD_INCLUDES = -I/usr/include | 17 | STD_INCLUDES = -I/usr/include | |
16 | #endif | 18 | -#endif | |
17 | 19 | +#else | ||
18 | +#if defined(DarwinArchitecture) | 20 | +REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) | |
19 | +REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) | |||
20 | +#endif | 21 | +#endif | |
21 | + | 22 | ||
22 | 23 | |||
23 | #if DoSharedLib | 24 | #if DoSharedLib | |
24 | #if DoNormalLib |