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 /graphics/gd | |
| 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 'graphics/gd')
| -rw-r--r-- | graphics/gd/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index f783f3b4138..c9f3d5ced7f 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/06/28 20:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2001/08/29 22:41:16 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp # @@ -11,7 +11,6 @@ HOMEPAGE= http://www.boutell.com/gd/ COMMENT= graphics library for fast PNG creation USE_BUILDLINK_ONLY= YES -USE_X11= YES USE_LIBTOOL= YES REPLACE_PERL= bdftogd @@ -23,7 +22,6 @@ MAKE_ENV+= EXTRA_LIBS="-lsocket -lnsl" CPPFLAGS+= -I${BUILDLINK_DIR}/include/freetype # freetype.h CPPFLAGS+= -I${BUILDLINK_DIR}/include/X11 # xpm.h -CPPFLAGS+= -I${X11BASE}/include # When the API changes and breaks binary-compatibility with the previous # version, increment the MAJOR by 1 and reset the MINOR to 0. Otherwise, @@ -38,4 +36,5 @@ MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |