diff options
| author | garbled <garbled@pkgsrc.org> | 1998-08-27 14:06:07 +0000 |
|---|---|---|
| committer | garbled <garbled@pkgsrc.org> | 1998-08-27 14:06:07 +0000 |
| commit | 2896fa84839e6dd520f152478fdf78c4e92832a2 (patch) | |
| tree | 3115d0a8e4b3ee5696c7b5301ba6b7da2728485f /games/maelstrom | |
| parent | c9ab23f10f42c84d11c879ea409a82917542b8e0 (diff) | |
| download | pkgsrc-2896fa84839e6dd520f152478fdf78c4e92832a2.tar.gz | |
Remove a ton of cruft relating to ELF building of pkgs. The trick I had
previously used with OBJECT_FMT is not necc. with the revelation that
-Wl,-R works. Also fixed alot of PREFIX -> X11BASE typos.
Diffstat (limited to 'games/maelstrom')
| -rw-r--r-- | games/maelstrom/Makefile | 6 | ||||
| -rw-r--r-- | games/maelstrom/patches/patch-aa | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile index e814fb84b3c..dad3a80fbb0 100644 --- a/games/maelstrom/Makefile +++ b/games/maelstrom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:56 tsarna Exp $ +# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:08 garbled Exp $ DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz PKGNAME= maelstrom-2.0.6 @@ -35,7 +35,3 @@ post-install: ${INSTALL_PROGRAM} ${WRKSRC}/netplayd/netplayd ${PREFIX}/bin/Maelstrom_netplayd .include "../../mk/bsd.pkg.mk" -.if (${OBJECT_FMT} == "ELF") -RPATH= -Wl,-R,${PREFIX}/lib -.endif -MAKE_ENV+= RPATH=${RPATH} diff --git a/games/maelstrom/patches/patch-aa b/games/maelstrom/patches/patch-aa index 2deaf762dee..e417ecdb09e 100644 --- a/games/maelstrom/patches/patch-aa +++ b/games/maelstrom/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:42 agc Exp $ +$NetBSD: patch-aa,v 1.4 1998/08/27 14:06:09 garbled Exp $ --- Makeflags.orig Mon Jul 14 20:32:13 1997 +++ Makeflags Mon Aug 3 00:50:27 1998 @@ -14,8 +14,8 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:42 agc Exp $ -INSTALL = install +LOGIC = netlogic -+XPMINCLUDE = -I$(PREFIX)/include -+XPMLINKDIR = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib ++XPMINCLUDE = -I$(X11BASE)/include ++XPMLINKDIR = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib + +BINDIR = $(PREFIX)/bin +LIBDIR = $(PREFIX)/share/maelstrom @@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:42 agc Exp $ +CFLAGS = $(OPTIMIZE) $(INCLUDES) $(FEATURES) \ + -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\" +EXTRALIBS = -+X11LINKDIR = $(RPATH) -L$(X11BASE)/lib ++X11LINKDIR = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib +X11LIBS = -lX11 -lXext -lXpm +CSUMLIB = +LIBS = $(EXTRALIBS) $(XPMLINKDIR) $(X11LINKDIR) $(X11LIBS) $(CSUMLIB) |