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/clanlib/patches | |
| 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/clanlib/patches')
| -rw-r--r-- | graphics/clanlib/patches/patch-aa | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/graphics/clanlib/patches/patch-aa b/graphics/clanlib/patches/patch-aa index 4b6bd869c75..601ddb98ac8 100644 --- a/graphics/clanlib/patches/patch-aa +++ b/graphics/clanlib/patches/patch-aa @@ -1,17 +1,22 @@ -$NetBSD: patch-aa,v 1.4 2001/06/30 11:26:32 zuntum Exp $ ---- Makefile.conf.in.orig Thu Dec 14 19:27:08 2000 -+++ Makefile.conf.in Thu Dec 14 19:28:06 2000 -@@ -13,11 +13,11 @@ +$NetBSD: patch-aa,v 1.5 2001/08/29 22:41:16 jlam Exp $ + +--- Makefile.conf.in.orig Sun Apr 9 08:17:58 2000 ++++ Makefile.conf.in +@@ -13,7 +13,7 @@ BIN_PREFIX = @bindir@ TARGET_PREFIX = @libdir@/ClanLib -INCLUDE_DIRS = -I Sources @x_includes@ -+INCLUDE_DIRS = -I Sources @x_includes@ -I$(BUILDLINK_DIR)/include ++INCLUDE_DIRS = -I Sources @CPPFLAGS@ @x_includes@ COMP_OPTIONS = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS @DEFS@ @comp_mode@ --LINK_CORE = @libs@ -+LINK_CORE = -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib @libs@ +@@ -21,7 +21,7 @@ OBJF_NONDYN = @objf_nondyn@ +-LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX) ++LINK_COMMAND = $(CXX) -shared -fPIC -Wl,-rpath,$(TARGET_PREFIX) @LDFLAGS@ + + Libs/Intermediate/%.o : %.cpp + @echo "Compiling $<" |