diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
| commit | 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /audio/snd | |
| parent | 70004632b203c88d357d29ec8f217d1caa85f9c7 (diff) | |
| download | pkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz | |
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'audio/snd')
| -rw-r--r-- | audio/snd/Makefile | 3 | ||||
| -rw-r--r-- | audio/snd/distinfo | 4 | ||||
| -rw-r--r-- | audio/snd/patches/patch-ae | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/audio/snd/Makefile b/audio/snd/Makefile index 2bb15d71894..34f0af599c0 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/07/16 19:50:50 nra Exp $ +# $NetBSD: Makefile,v 1.23 2001/08/29 22:41:01 jlam Exp $ # DISTNAME= snd @@ -27,4 +27,5 @@ do-install: .include "../../graphics/xpm/buildlink.mk" .include "../../x11/lesstif/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/snd/distinfo b/audio/snd/distinfo index b16561dc4b3..3a26f7cfa5f 100644 --- a/audio/snd/distinfo +++ b/audio/snd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/06/30 21:14:10 jlam Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:01 jlam Exp $ SHA1 (snd.tar.gz) = cb48922170602f30553b604bda039974c1706b65 Size (snd.tar.gz) = 735422 bytes @@ -6,7 +6,7 @@ SHA1 (patch-aa) = 3aa0e5bcc54730628d220515919d8dbf11951c1a SHA1 (patch-ab) = de7027da166eda24e9f19c8ffc86192027e7eee1 SHA1 (patch-ac) = d3073b7d102abcd05d7588b57eb8a053f20b74a7 SHA1 (patch-ad) = 19a185e3e5a9800e56c904c06613b5d9645e6d17 -SHA1 (patch-ae) = c4b33c31fb70107f0501228f3c1f66512febd945 +SHA1 (patch-ae) = 3366a8151ceab8a835e18417d61cb5d8a62d4bd0 SHA1 (patch-af) = a8cf1931093397bcf88be08d36bd11efd9d4c161 SHA1 (patch-ag) = 7a19ce85c0c45ef2844ca22bca74de9238aa3ad1 SHA1 (patch-ah) = f744861a8736e4acf498a751b42708e0922d5ff2 diff --git a/audio/snd/patches/patch-ae b/audio/snd/patches/patch-ae index d9c10022176..fbe7108bd83 100644 --- a/audio/snd/patches/patch-ae +++ b/audio/snd/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.7 2001/06/30 21:14:10 jlam Exp $ +$NetBSD: patch-ae,v 1.8 2001/08/29 22:41:01 jlam Exp $ --- makefile.netbsd.orig Mon Aug 9 19:22:24 1999 +++ makefile.netbsd Mon Aug 9 19:25:36 1999 @@ -6,8 +6,8 @@ $NetBSD: patch-ae,v 1.7 2001/06/30 21:14:10 jlam Exp $ +# Snd make file for NetBSD, assuming Motif is available (audio currently stubbed out) + +#CC = gcc -+#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${X11BASE}/include -I${BUILDLINK_DIR}/include -+CFLAGS += -DXPM -DHAVE_OSS -I${X11BASE}/include -I${BUILDLINK_DIR}/include ++#CFLAGS = -O2 -DXPM -DHAVE_OSS -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include ++CFLAGS += -DXPM -DHAVE_OSS -I${BUILDLINK_X11_DIR}/include -I${BUILDLINK_DIR}/include +CFLAGS += -g + +LIBS = ${LDFLAGS} -lMrm -lXm -lXpm -lXmu -lSM -lXt -lXext -lX11 -lm -lossaudio |