diff options
| author | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
| commit | b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /games/lincity | |
| parent | 68d93d0286e46619b54c9d917dbf553bc889a6e5 (diff) | |
| download | pkgsrc-b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae.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 'games/lincity')
| -rw-r--r-- | games/lincity/Makefile | 3 | ||||
| -rw-r--r-- | games/lincity/distinfo | 4 | ||||
| -rw-r--r-- | games/lincity/patches/patch-aa | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/games/lincity/Makefile b/games/lincity/Makefile index c0897edef36..9e36ace7c66 100644 --- a/games/lincity/Makefile +++ b/games/lincity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/06/30 10:39:06 zuntum Exp $ +# $NetBSD: Makefile,v 1.9 2001/08/29 22:41:12 jlam Exp $ # DISTNAME= lincity-1.11 @@ -24,4 +24,5 @@ pre-build: post-install: ${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6 +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/lincity/distinfo b/games/lincity/distinfo index b24f95c8dd5..cac0657a036 100644 --- a/games/lincity/distinfo +++ b/games/lincity/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:30 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/08/29 22:41:12 jlam Exp $ SHA1 (lincity-1.11.tar.gz) = b3b7fb00fffea90352fa5e5c6b7bf76d49cd493b Size (lincity-1.11.tar.gz) = 475037 bytes -SHA1 (patch-aa) = ac8b6a23b0167f98bf21bbdea7966f99aec3f61a +SHA1 (patch-aa) = 0f318f35627fc592a0f995e1cab99997c3ac79b8 SHA1 (patch-ab) = 09860dec60aefe24c020aa3daf130512ec893d09 diff --git a/games/lincity/patches/patch-aa b/games/lincity/patches/patch-aa index 3a65321f8dd..d3fda5e7c8f 100644 --- a/games/lincity/patches/patch-aa +++ b/games/lincity/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2000/08/12 06:30:49 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2001/08/29 22:41:12 jlam Exp $ --- Makefile.orig Thu Feb 25 23:17:38 1999 +++ Makefile Sat Aug 12 00:38:42 2000 @@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.2 2000/08/12 06:30:49 jlam Exp $ -LC_XFLAGS = $(CFLAGS) -DLC_X11 -LC_XLIBS = -lXExExt -lXext -lX11 -+LC_XFLAGS = $(CFLAGS) -I${X11BASE}/include -DLC_X11 ++LC_XFLAGS = $(CFLAGS) -I${BUILDLINK_X11_DIR}/include -DLC_X11 +LC_XLIBS = ${LDFLAGS} -lXExExt -lXext -lX11 XOBJS = xmain.o xmouse.o xscreen.o xmps.o xtypeinit.o xengine.o\ |