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 /converters/wv | |
| 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 'converters/wv')
| -rw-r--r-- | converters/wv/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 2d768854a44..1bdf961a3ab 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/07/13 04:49:10 kei Exp $ +# $NetBSD: Makefile,v 1.12 2001/08/29 22:41:08 jlam Exp $ # DISTNAME= wv-0.6.5 @@ -13,11 +13,10 @@ COMMENT= Microsoft Word 6, 7, 8, and 9 (95/97/2000) doc to HTML/LaTeX converter #CONFLICTS+= libgetopt-* USE_BUILDLINK_ONLY= YES -USE_X11= YES +REPLACE_BUILDLINK= wv-incconfig wv-libconfig + USE_GMAKE= YES GNU_CONFIGURE= YES - -EVAL_PREFIX= XPMDIR=xpm MAKE_ENV+= RM="${RM} -f" post-install: @@ -28,7 +27,8 @@ post-install: .include "../../converters/libiconv/buildlink.mk" .include "../../devel/glib/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../graphics/libwmf/buildlink.mk" .include "../../graphics/ImageMagick/buildlink.mk" +.include "../../graphics/libwmf/buildlink.mk" +.include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |