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 /wm/windowmaker | |
| 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 'wm/windowmaker')
| -rw-r--r-- | wm/windowmaker/Makefile | 7 | ||||
| -rw-r--r-- | wm/windowmaker/distinfo | 4 | ||||
| -rw-r--r-- | wm/windowmaker/patches/patch-ab | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 04ac7093ca8..9d2b5156405 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/08/26 10:32:23 skrll Exp $ +# $NetBSD: Makefile,v 1.18 2001/08/29 22:41:25 jlam Exp $ DISTNAME= WindowMaker-0.65.1 PKGNAME= windowmaker-0.65.1 @@ -15,6 +15,10 @@ BUILD_DEPENDS+= automake>=1.4:../../devel/automake BUILD_USES_MSGFMT= yes USE_BUILDLINK_ONLY= YES +REPLACE_BUILDLINK= WINGs/get-wings-flags +REPLACE_BUILDLINK+= WINGs/get-wutil-flags +REPLACE_BUILDLINK+= wrlib/get-wraster-flags + USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_X11BASE= YES @@ -88,4 +92,5 @@ post-install: .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo index 71820d393bb..f42f74decf2 100644 --- a/wm/windowmaker/distinfo +++ b/wm/windowmaker/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2001/08/18 18:13:27 tron Exp $ +$NetBSD: distinfo,v 1.12 2001/08/29 22:41:25 jlam Exp $ SHA1 (WindowMaker-0.65.1.tar.bz2) = 2600498e72ba3fc5a8fd9fb27ac1261b89c42826 Size (WindowMaker-0.65.1.tar.bz2) = 1916105 bytes SHA1 (patch-aa) = 3d0ee91d9c7a98be2ff49614567c2af96178445a -SHA1 (patch-ab) = 7b24ac2787ad675ba7da64444889a5334ea71a31 +SHA1 (patch-ab) = 5fdc12fc8b4f30d484bf2882ca6392cbf6d24482 SHA1 (patch-ac) = 8e4b85dc9b8b3cf211b6c76dbca46f60308ac591 SHA1 (patch-ad) = f2ef4b942be333deb7f5f00e00653beb3081888e SHA1 (patch-ae) = 13c09a0cf40eb20d7866cd4855bbfe91cfc11fb0 diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab index 47cc00bbbe8..71e768f8cc1 100644 --- a/wm/windowmaker/patches/patch-ab +++ b/wm/windowmaker/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2001/08/18 18:13:28 tron Exp $ +$NetBSD: patch-ab,v 1.7 2001/08/29 22:41:25 jlam Exp $ --- configure.in.orig Mon Jul 23 21:43:34 2001 +++ configure.in Sat Aug 18 19:57:49 2001 @@ -61,8 +61,8 @@ $NetBSD: patch-ab,v 1.6 2001/08/18 18:13:28 tron Exp $ -LIBRARY_SEARCH_PATH="$lib_search_path" -HEADER_SEARCH_PATH="$inc_search_path" -+LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${X11BASE}/lib" -+HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${X11BASE}/include" ++LIBRARY_SEARCH_PATH="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib" ++HEADER_SEARCH_PATH="-I${BUILDLINK_DIR}/include -I${BUILDLINK_X11_DIR}/include" AC_SUBST(LIBRARY_SEARCH_PATH) AC_SUBST(HEADER_SEARCH_PATH) |