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 /games/pacman | |
| 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 'games/pacman')
| -rw-r--r-- | games/pacman/Makefile | 5 | ||||
| -rw-r--r-- | games/pacman/distinfo | 4 | ||||
| -rw-r--r-- | games/pacman/patches/patch-aa | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/games/pacman/Makefile b/games/pacman/Makefile index 396fe42f9b8..9ebdf68da8a 100644 --- a/games/pacman/Makefile +++ b/games/pacman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2001/06/30 11:27:17 zuntum Exp $ +# $NetBSD: Makefile,v 1.13 2001/08/29 22:41:14 jlam Exp $ DISTNAME= Pacman-0.3-CVS-00-11-17 PKGNAME= Pacman-0.3 @@ -16,8 +16,6 @@ USE_X11BASE= yes GNU_CONFIGURE= yes USE_GMAKE= yes -CFLAGS+= -I${X11BASE}/include - # needs a valid X display to compile its datafiles .ifndef DISPLAY IS_INTERACTIVE= yes @@ -36,4 +34,5 @@ pre-build: fi; .include "../../graphics/clanlib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/pacman/distinfo b/games/pacman/distinfo index c0fa651d5fb..5935d8517d9 100644 --- a/games/pacman/distinfo +++ b/games/pacman/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/06/30 11:27:17 zuntum Exp $ +$NetBSD: distinfo,v 1.4 2001/08/29 22:41:14 jlam Exp $ SHA1 (Pacman-0.3-CVS-00-11-17.tar.gz) = 0d30f2ae3410d2df7b3fecb5cce732ba3022041d Size (Pacman-0.3-CVS-00-11-17.tar.gz) = 62257 bytes -SHA1 (patch-aa) = 03ae72b67b3d268ecdc8d37ad00497a96725cf71 +SHA1 (patch-aa) = 28103a483316c870325e63f378ea36955b029b84 SHA1 (patch-ab) = 8d20c41dfb1a010586a3ebfb3ab4e7f675b93400 diff --git a/games/pacman/patches/patch-aa b/games/pacman/patches/patch-aa index f75ce16f942..dbc5f7646de 100644 --- a/games/pacman/patches/patch-aa +++ b/games/pacman/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/06/30 11:27:17 zuntum Exp $ +$NetBSD: patch-aa,v 1.4 2001/08/29 22:41:14 jlam Exp $ --- Makefile.in.orig Wed Oct 6 02:19:37 1999 +++ Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2001/06/30 11:27:17 zuntum Exp $ OBJF = .build/pacman.o .build/objects.o .build/fontblowup.o DATAFILES = pacman.dat -EXTERN_LIBS = -lclanCore -+EXTERN_LIBS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lclanCore \ ++EXTERN_LIBS = -L${BUILDLINK_X11_DIR}/lib -Wl,-R$(X11BASE)/lib -lclanCore \ + -L${BUILDLINK_DIR}/lib -Wl,-R$(LOCALBASE)/lib -lHermes -lpth -lz all: pacman $(DATAFILES) |