diff options
| author | salo <salo> | 2006-07-09 21:30:57 +0000 |
|---|---|---|
| committer | salo <salo> | 2006-07-09 21:30:57 +0000 |
| commit | 254e96c0cb2d00e89670214507c94f5e4f7b3dda (patch) | |
| tree | bb52daeb9cc860efe0e6d1bed774f2f2386c137f /audio | |
| parent | c047c9179fc18587f8d5111054316e3190b8262f (diff) | |
| download | pkgsrc-254e96c0cb2d00e89670214507c94f5e4f7b3dda.tar.gz | |
Pullup ticket 1733 - requested by minskim
portability fixes for nas
Revisions pulled up:
- pkgsrc/audio/nas/Makefile 1.62, 1.63
- pkgsrc/audio/nas/distinfo 1.18
- pkgsrc/audio/nas/patches/patch-aa 1.9
Module Name: pkgsrc
Committed By: jlam
Date: Fri Jul 7 22:10:07 UTC 2006
Modified Files:
pkgsrc/audio/nas: Makefile
Log Message:
Add an explicit run-time dependency on perl because these packages
install perl scripts. Bump the PKGREVISION for the dependency change.
---
Module Name: pkgsrc
Committed By: minskim
Date: Fri Jul 7 23:20:20 UTC 2006
Modified Files:
pkgsrc/audio/nas: Makefile
Log Message:
Run configure with env variables set by pkgsrc. Previously, it was imake
that ran configure, which failed on Darwin because imake didn't pass all
variables in CONFIGURE_ENV.
This fixes PR 33812. The package still does not build on Darwin due to
link errors.
---
Module Name: pkgsrc
Committed By: minskim
Date: Sat Jul 8 00:27:56 UTC 2006
Modified Files:
pkgsrc/audio/nas: distinfo
Added Files:
pkgsrc/audio/nas/patches: patch-aa
Log Message:
Add required link options for Darwin.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/nas/Makefile | 8 | ||||
| -rw-r--r-- | audio/nas/distinfo | 3 | ||||
| -rw-r--r-- | audio/nas/patches/patch-aa | 15 |
3 files changed, 23 insertions, 3 deletions
diff --git a/audio/nas/Makefile b/audio/nas/Makefile index 5d291d9b801..9b6ae3d5b55 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2006/06/17 11:47:47 markd Exp $ +# $NetBSD: Makefile,v 1.61.2.1 2006/07/09 21:30:57 salo Exp $ DISTNAME= nas-1.8.src PKGNAME= ${DISTNAME:S/.src//} +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://nas.codebrilliance.com/nas/ \ ftp://ftp.uni-duisburg.de/Sound/NAS/ @@ -15,7 +16,7 @@ DEPENDS+= p5-perl-headers-${OS_VERSION}{,nb*}:../../devel/p5-perl-headers PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -USE_TOOLS+= gmake +USE_TOOLS+= gmake perl:run USE_IMAKE= yes PKG_SYSCONFSUBDIR= nas @@ -59,4 +60,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.server . endif .endif +pre-configure: + cd ${WRKSRC}/config && ${SETENV} ${CONFIGURE_ENV} ./configure + .include "../../mk/bsd.pkg.mk" diff --git a/audio/nas/distinfo b/audio/nas/distinfo index 2f3563bee91..bac52f4f309 100644 --- a/audio/nas/distinfo +++ b/audio/nas/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.17 2006/06/17 11:47:48 markd Exp $ +$NetBSD: distinfo,v 1.17.2.1 2006/07/09 21:30:57 salo Exp $ SHA1 (nas-1.8.src.tar.gz) = 6752861196f0b11db93572d935dc87bc6c0da348 RMD160 (nas-1.8.src.tar.gz) = c7c99d7c3f66d8255bd5708325bd5c71c73b0a47 Size (nas-1.8.src.tar.gz) = 1290578 bytes +SHA1 (patch-aa) = 4026d90594cf31b15624a3c8cb72316978224113 SHA1 (patch-ab) = f86037dc3a52cff543ee077d7f0d0a97cf24d9ff SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d SHA1 (patch-ad) = 5918e8188c8400fc7133c3ae4016d99c7c7594fa diff --git a/audio/nas/patches/patch-aa b/audio/nas/patches/patch-aa new file mode 100644 index 00000000000..4e3820e2439 --- /dev/null +++ b/audio/nas/patches/patch-aa @@ -0,0 +1,15 @@ +$NetBSD: patch-aa,v 1.8.22.1 2006/07/09 21:30:57 salo Exp $ + +--- lib/audio/Imakefile.orig 2005-06-04 13:08:54.000000000 -0700 ++++ lib/audio/Imakefile +@@ -159,6 +159,10 @@ REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $ + STD_INCLUDES = -I/usr/include + #endif + ++#if defined(DarwinArchitecture) ++REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) ++#endif ++ + + #if DoSharedLib + #if DoNormalLib |