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/wsoundserver | |
| 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/wsoundserver')
| -rw-r--r-- | audio/wsoundserver/Makefile | 12 | ||||
| -rw-r--r-- | audio/wsoundserver/distinfo | 4 | ||||
| -rw-r--r-- | audio/wsoundserver/patches/patch-ac | 4 |
3 files changed, 6 insertions, 14 deletions
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile index 00a3e03d875..6ef0f15b147 100644 --- a/audio/wsoundserver/Makefile +++ b/audio/wsoundserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/07/24 10:39:01 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/08/29 22:41:01 jlam Exp $ # DISTNAME= WSoundServer-0.4.0 @@ -18,15 +18,6 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../mk/bsd.prefs.mk" - -.if (${OPSYS} == SunOS) -CPPFLAGS+= -I${X11BASE}/include -MAKE_ENV+= OSSAUDIO_LIBS= -.else -MAKE_ENV+= OSSAUDIO_LIBS=-lossaudio -.endif - post-patch: @cd ${WRKSRC}/doc && for f in *; do \ ${SED} "s/1x/1/g" $$f > $$f.tmp && ${MV} $$f.tmp $$f; \ @@ -46,4 +37,5 @@ post-install: .include "../../devel/libdockapp/buildlink.mk" .include "../../wm/windowmaker/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/wsoundserver/distinfo b/audio/wsoundserver/distinfo index 351e6025807..f9cafd34f62 100644 --- a/audio/wsoundserver/distinfo +++ b/audio/wsoundserver/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2001/07/24 10:39:01 jlam Exp $ +$NetBSD: distinfo,v 1.5 2001/08/29 22:41:02 jlam Exp $ SHA1 (WSoundServer-0.4.0.tar.gz) = b414025f0f19e66cd9146546ecf634564941b1e4 Size (WSoundServer-0.4.0.tar.gz) = 147044 bytes -SHA1 (patch-ac) = a8968a49ad6d2e3ae755e7f980704819c15d9654 +SHA1 (patch-ac) = 8595912bdc913dae46c82bc3a59fc96318350982 SHA1 (patch-ad) = 998cc4b2f87c4bce4d8c32e42aa9c06134633252 SHA1 (patch-ae) = 3a008dc50f6e78070ceb78b1f564d7c94be2dfea SHA1 (patch-af) = 1ea20d0e00d19a2c23bb8e07cdf182e43db28ca8 diff --git a/audio/wsoundserver/patches/patch-ac b/audio/wsoundserver/patches/patch-ac index 9cc9c7ae240..40a70bb48f9 100644 --- a/audio/wsoundserver/patches/patch-ac +++ b/audio/wsoundserver/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2001/07/07 17:15:06 tron Exp $ +$NetBSD: patch-ac,v 1.3 2001/08/29 22:41:02 jlam Exp $ --- wslib/Makefile.in.orig Fri Mar 31 22:10:25 2000 +++ wslib/Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.2 2001/07/07 17:15:06 tron Exp $ libwsound.la: $(libwsound_la_OBJECTS) $(libwsound_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS) -+ $(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS) $(OSSAUDIO_LIBS) ++ $(LINK) -rpath $(libdir) $(libwsound_la_LDFLAGS) $(libwsound_la_OBJECTS) $(libwsound_la_LIBADD) $(LIBS) ${LIBOSSAUDIO} mostlyclean-noinstPROGRAMS: |