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 /cad/felt | |
| 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 'cad/felt')
| -rw-r--r-- | cad/felt/Makefile | 3 | ||||
| -rw-r--r-- | cad/felt/distinfo | 4 | ||||
| -rw-r--r-- | cad/felt/patches/patch-aa | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/cad/felt/Makefile b/cad/felt/Makefile index 838b808f75d..eebc4dc777c 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/08/23 04:26:51 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:04 jlam Exp $ DISTNAME= felt-3.05.src PKGNAME= felt-3.05 @@ -38,4 +38,5 @@ post-install: .include "../../devel/readline/buildlink.mk" .include "../../mk/xaw.buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/felt/distinfo b/cad/felt/distinfo index d3c5ef60171..328c450c426 100644 --- a/cad/felt/distinfo +++ b/cad/felt/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2001/08/23 04:26:51 jlam Exp $ +$NetBSD: distinfo,v 1.7 2001/08/29 22:41:05 jlam Exp $ SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b Size (felt-3.05.src.tar.gz) = 956901 bytes SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784 Size (felt-3.05.ps.gz) = 626985 bytes -SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab +SHA1 (patch-aa) = d04579e0f1801341391a551ae797358089cff91a SHA1 (patch-ab) = 60feea9b0b0af2b71b2a8780227eccbd223b12c5 diff --git a/cad/felt/patches/patch-aa b/cad/felt/patches/patch-aa index 226d81ab97d..60d5024d3b3 100644 --- a/cad/felt/patches/patch-aa +++ b/cad/felt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2001/05/22 16:48:59 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2001/08/29 22:41:05 jlam Exp $ --- etc/Makefile.conf.orig Sat Mar 4 20:37:06 2000 +++ etc/Makefile.conf Tue May 22 12:21:18 2001 @@ -42,5 +42,5 @@ $NetBSD: patch-aa,v 1.5 2001/05/22 16:48:59 jlam Exp $ -X11INC = /usr/X11R6/include -X11LIB = /usr/X11R6/lib +X11DEF = ${PREFIX}/lib/X11/app-defaults -+X11INC = ${X11BASE}/include -+X11LIB = ${X11BASE}/lib ++X11INC = ${BUILDLINK_X11_DIR}/include ++X11LIB = ${BUILDLINK_X11_DIR}/lib |