diff options
| author | jlam <jlam@pkgsrc.org> | 2001-12-11 15:43:15 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-12-11 15:43:15 +0000 |
| commit | c76d68713686047e5cd0f81b628fda2803a86ff2 (patch) | |
| tree | a151bd6a10e75e9e3327afd24422669392845a46 | |
| parent | 780160254eed730c64d52cb2bf72968d85afc90f (diff) | |
| download | pkgsrc-c76d68713686047e5cd0f81b628fda2803a86ff2.tar.gz | |
Use xpm/buildlink.mk instead of USE_XPM, and find the xpm headers in
${BUILDLINK_DIR}. This fixes the problem noted in pkg/14910 by Robert Elz
<kre@munnari.OZ.AU>.
| -rw-r--r-- | graphics/xbmbrowser/Makefile | 4 | ||||
| -rw-r--r-- | graphics/xbmbrowser/distinfo | 4 | ||||
| -rw-r--r-- | graphics/xbmbrowser/patches/patch-aa | 36 |
3 files changed, 18 insertions, 26 deletions
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile index 3c6e7963cf4..3125bd0a026 100644 --- a/graphics/xbmbrowser/Makefile +++ b/graphics/xbmbrowser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/02/16 15:22:35 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2001/12/11 15:43:15 jlam Exp $ # FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp # @@ -12,6 +12,6 @@ COMMENT= View complete directories of X bitmaps and X pixmaps USE_IMAKE= YES USE_GMAKE= YES -USE_XPM= YES +.include "../../graphics/xpm/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/xbmbrowser/distinfo b/graphics/xbmbrowser/distinfo index c14311e3b11..2fadab1c31c 100644 --- a/graphics/xbmbrowser/distinfo +++ b/graphics/xbmbrowser/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:28 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/12/11 15:43:15 jlam Exp $ SHA1 (xbmbrowser5.1.tar.gz) = b7e6ed6509fbf985dc4348cb45c67047cd5e87dc Size (xbmbrowser5.1.tar.gz) = 74397 bytes -SHA1 (patch-aa) = 14d7eed132f6d1c488c4667e305cb1dff6dd247a +SHA1 (patch-aa) = 98edc27685bc7c49e351dc444249c5b19093146b diff --git a/graphics/xbmbrowser/patches/patch-aa b/graphics/xbmbrowser/patches/patch-aa index 630ecdcb13d..16f9e4c8e76 100644 --- a/graphics/xbmbrowser/patches/patch-aa +++ b/graphics/xbmbrowser/patches/patch-aa @@ -1,23 +1,15 @@ -$NetBSD: patch-aa,v 1.1 2001/04/05 15:55:48 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2001/12/11 15:43:15 jlam Exp $ -*** Imakefile.orig Fri Aug 4 05:19:36 1995 ---- Imakefile Wed Sep 6 13:53:32 1995 -*************** -*** 17,24 **** - # -DNO_TRANS_COLOR Turn off setting the `none' color in xpixmaps - - DO_XPMS = -DDO_XPMS -! XPM_INC = -I/usr/include/X11 -! XPM_LIB = -L$(LIBDIR)/xpm -lXpm - - - # If you need this uncomment (particularly on decstations) ---- 17,24 ---- - # -DNO_TRANS_COLOR Turn off setting the `none' color in xpixmaps - - DO_XPMS = -DDO_XPMS -! XPM_INC = -I/usr/X11R6/include/X11 -! XPM_LIB = -lXpm - - - # If you need this uncomment (particularly on decstations) +--- Imakefile.orig Thu Aug 3 23:19:36 1995 ++++ Imakefile +@@ -17,8 +17,8 @@ + # -DNO_TRANS_COLOR Turn off setting the `none' color in xpixmaps + + DO_XPMS = -DDO_XPMS +- XPM_INC = -I/usr/include/X11 +- XPM_LIB = -L$(LIBDIR)/xpm -lXpm ++ XPM_INC = -I${BUILDLINK_DIR}/include/X11 ++ XPM_LIB = -lXpm + + + # If you need this uncomment (particularly on decstations) |