summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgarbled <garbled@pkgsrc.org>1998-08-27 14:06:07 +0000
committergarbled <garbled@pkgsrc.org>1998-08-27 14:06:07 +0000
commit2896fa84839e6dd520f152478fdf78c4e92832a2 (patch)
tree3115d0a8e4b3ee5696c7b5301ba6b7da2728485f
parentc9ab23f10f42c84d11c879ea409a82917542b8e0 (diff)
downloadpkgsrc-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
-rw-r--r--games/battalion/Makefile7
-rw-r--r--games/battalion/patches/patch-aa6
-rw-r--r--games/finalbattle/Makefile6
-rw-r--r--games/finalbattle/patches/patch-aa6
-rw-r--r--games/gemdropx/Makefile6
-rw-r--r--games/gemdropx/patches/patch-ab6
-rw-r--r--games/golddig/Makefile6
-rw-r--r--games/golddig/patches/patch-aa6
-rw-r--r--games/imaze/Makefile6
-rw-r--r--games/imaze/patches/patch-aa8
-rw-r--r--games/maelstrom/Makefile6
-rw-r--r--games/maelstrom/patches/patch-aa8
-rw-r--r--games/xevil/Makefile6
-rw-r--r--games/xevil/patches/patch-aa6
14 files changed, 30 insertions, 59 deletions
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 8911c141089..95851d04de0 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/08/23 20:30:51 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/08/27 14:06:07 garbled Exp $
#
DISTNAME= battalion
@@ -37,8 +37,3 @@ pre-clean:
@${RM} -rf ${WRKDIR}/battalionSUN4
.include "../../mk/bsd.pkg.mk"
-
-.if (${OBJECT_FMT} == "ELF")
-RPATH= -Wl,-rpath,${PREFIX}/lib
-.endif
-MAKE_ENV+= RPATH=${RPATH}
diff --git a/games/battalion/patches/patch-aa b/games/battalion/patches/patch-aa
index 7818dffa4e4..5265e35472b 100644
--- a/games/battalion/patches/patch-aa
+++ b/games/battalion/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:38 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:09 garbled Exp $
--- Makefile.orig Thu Jan 16 09:31:58 1997
+++ Makefile Sat Jul 25 09:22:54 1998
@@ -31,14 +31,14 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:38 agc Exp $
# ------------------------------------------------------------
-CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
-
-+CFLAGS = -O $(DEFS) -I$(PREFIX)/include -I./.
++CFLAGS = -O $(DEFS) -I$(X11BASE)/include -I./.
+DATADIR = $(PREFIX)/share/battalion/
+DEFS = -DDATADIR=\"$(DATADIR)\"
@@ -99,3 +100,3 @@
# ------------------------------------------------------------
-LIBFLAGS =
-+LIBFLAGS = $(RPATH) -L$(PREFIX)/lib -lcompat
++LIBFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lcompat
@@ -117,2 +118,4 @@
$(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB)
diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile
index 52827230838..b1d37e113be 100644
--- a/games/finalbattle/Makefile
+++ b/games/finalbattle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:54 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:07 garbled Exp $
#
DISTNAME= finalbattle.0.0
@@ -15,7 +15,3 @@ WRKSRC= ${WRKDIR}/final
USE_X11= yes
.include "../../mk/bsd.pkg.mk"
-.if (${OBJECT_FMT} == "ELF")
-RPATH= -Wl,-rpath,${PREFIX}/lib
-.endif
-MAKE_ENV+= RPATH=${RPATH}
diff --git a/games/finalbattle/patches/patch-aa b/games/finalbattle/patches/patch-aa
index b4a04b38f88..3928c94551a 100644
--- a/games/finalbattle/patches/patch-aa
+++ b/games/finalbattle/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:40 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:09 garbled Exp $
--- makefile.orig Thu Apr 2 21:55:07 1998
+++ makefile Sun Jul 26 06:51:44 1998
@@ -9,12 +9,12 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:40 agc Exp $
-#XLIB=-L/usr/openwin/lib -lX11
-XLIB=-L/usr/X11/lib -lX11
-
-+XLIB= $(RPATH) -L$(PREFIX)/lib -lX11
++XLIB= -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11
+INSTALLROOT=$(PREFIX)
+DATA=$(PREFIX)/share/finalbattle
+SPRITES=$(PREFIX)/share/finalbattle/sprites
+DEFS=-DSPRITES=\"$(SPRITES)\" -DDATA=\"$(DATA)\"
-+CFLAGS+= -I$(PREFIX)/include $(DEFS)
++CFLAGS+= -I$(X11BASE)/include $(DEFS)
@@ -27,2 +29,18 @@
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index e4d6e8d8cf5..9a317712224 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:55 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:08 garbled Exp $
#
DISTNAME= gemdropx
@@ -15,7 +15,3 @@ WRKSRC= ${WRKDIR}/gemdropx
USE_X11= yes
.include "../../mk/bsd.pkg.mk"
-.if (${OBJECT_FMT} == "ELF")
-RPATH= -Wl,-rpath,${PREFIX}/lib
-.endif
-MAKE_ENV+= RPATH=${RPATH}
diff --git a/games/gemdropx/patches/patch-ab b/games/gemdropx/patches/patch-ab
index 8a5e2662f15..64064fbab30 100644
--- a/games/gemdropx/patches/patch-ab
+++ b/games/gemdropx/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:41 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/08/27 14:06:09 garbled Exp $
--- makefile.orig Fri Nov 21 23:56:59 1997
+++ makefile Sat Jul 25 06:50:05 1998
@@ -16,8 +16,8 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 10:40:41 agc Exp $
+GFX=$(PREFIX)/share/gemdropx/gfx
+SOUNDS=$(PREFIX)/share/gemdropx/sounds
+
-+XLIB= $(RPATH) -L$(PREFIX)/lib -lX11 -lm -lcompat
-+XINC= -I$(PREFIX)/include
++XLIB= -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11 -lm -lcompat
++XINC= -I$(X11BASE)/include
+CFLAGS= $(XINC) -DSOUNDS=\"$(SOUNDS)\" -DGFX=\"$(GFX)\"
@@ -29,11 +30,15 @@
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index ebd0babf452..887683e9628 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/07/26 22:13:16 frueauf Exp $
+# $NetBSD: Makefile,v 1.2 1998/08/27 14:06:08 garbled Exp $
#
DISTNAME= golddig2
@@ -14,7 +14,3 @@ post-extract:
${RM} ${WRKSRC}/golddig ${WRKSRC}/makelev ${WRKSRC}/*.o
.include "../../mk/bsd.pkg.mk"
-.if (${OBJECT_FMT} == "ELF")
-RPATH= -Wl,-rpath,${PREFIX}/lib
-.endif
-MAKE_ENV+= RPATH=${RPATH}
diff --git a/games/golddig/patches/patch-aa b/games/golddig/patches/patch-aa
index ee73978382b..da315166d99 100644
--- a/games/golddig/patches/patch-aa
+++ b/games/golddig/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:41 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:09 garbled Exp $
--- Makefile.orig Tue Feb 8 21:11:37 1994
+++ Makefile Sun Jul 26 07:39:28 1998
@@ -17,11 +17,11 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:41 agc Exp $
@@ -30,6 +30,6 @@
#CFLAGS = -O
-CFLAGS = -O2 -W -Wreturn-type -Wunused -finline-functions -D__USE_BSD_SIGNAL
-+CFLAGS = -O2 -W -Wreturn-type -Wunused -finline-functions -D__USE_BSD_SIGNAL -I$(PREFIX)/include
++CFLAGS = -O2 -W -Wreturn-type -Wunused -finline-functions -D__USE_BSD_SIGNAL -I$(X11BASE)/include
#CFLAGS = -g
#LDFLAGS = -L /usr/X11/lib -lbsd -s
-LDFLAGS = -L /usr/X11/lib -s
-+LDFLAGS = $(RPATH) -L$(PREFIX)/lib
++LDFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
@@ -38,13 +38,12 @@
install: all
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 1424afb30ac..67bad1366fa 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:16:55 tsarna Exp $
+# $NetBSD: Makefile,v 1.4 1998/08/27 14:06:08 garbled Exp $
DISTNAME= imaze1.3
PKGNAME= imaze-1.3
@@ -20,7 +20,3 @@ post-build:
cd ${WRKSRC} && /bin/pax -rf ${DISTDIR}/imaze-sounds.tar
.include "../../mk/bsd.pkg.mk"
-.if (${OBJECT_FMT} == "ELF")
-RPATH= -Wl,-rpath,${PREFIX}/lib
-.endif
-MAKE_ENV+= RPATH=${RPATH}
diff --git a/games/imaze/patches/patch-aa b/games/imaze/patches/patch-aa
index 0a450a64a8a..8c64d7873f1 100644
--- a/games/imaze/patches/patch-aa
+++ b/games/imaze/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:41 agc Exp $
+$NetBSD: patch-aa,v 1.4 1998/08/27 14:06:09 garbled Exp $
--- source/Makefile.orig Thu Feb 22 23:01:18 1996
+++ source/Makefile Fri Jul 31 00:43:52 1998
@@ -38,8 +38,8 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:41 agc Exp $
-MOTIFLIBS=-lXm -lXt -lX11
-MOTIFINCLUDES=
-+MOTIFLIBS=-L$(PREFIX)/lib -lXm -lXt -lX11
-+MOTIFINCLUDES=-I$(PREFIX)/include
++MOTIFLIBS=-L$(X11BASE)/lib -lXm -lXt -lX11
++MOTIFINCLUDES=-I$(X11BASE)/include
GRAFLIBS=$($(GRAF)LIBS)
GRAFINCLUDES=$($(GRAF)INCLUDES)
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:41 agc Exp $
GRAF=NONE
-LDFLAGS=
-+LDFLAGS=$(RPATH)
++LDFLAGS= -Wl,-R$(X11BASE)/lib
CFLAGS=$(GRAFINCLUDES) $(COPT) $(DEFINES) $(SYSDEFS)
# bis hier Optionen eintragen
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)
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 49faefcb135..54761a58ace 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/20 15:16:58 tsarna Exp $
+# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:08 garbled Exp $
DISTNAME= xevil1.5.1e
PKGNAME= xevil-1.5.1e
@@ -17,7 +17,3 @@ MAKE_ENV= HOSTTYPE="netbsd" \
USE_X11= yes
.include "../../mk/bsd.pkg.mk"
-.if (${OBJECT_FMT} == "ELF")
-RPATH= -Wl,-R,${PREFIX}/lib
-.endif
-MAKE_ENV+= RPATH=${RPATH}
diff --git a/games/xevil/patches/patch-aa b/games/xevil/patches/patch-aa
index f14a7284a6d..0d77bc94903 100644
--- a/games/xevil/patches/patch-aa
+++ b/games/xevil/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:44 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:10 garbled Exp $
--- Makefile.orig Tue Oct 1 19:50:59 1996
+++ Makefile Fri Jul 31 09:49:41 1998
@@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:44 agc Exp $
-DEBUG_OPT = -g# #-DPRINT_ERRORS
-LINK_OPT = #-O
+DEBUG_OPT = -O# #-DPRINT_ERRORS
-+LINK_OPT = $(RPATH)#-O
++LINK_OPT = -Wl,-R$(X11BASE)/lib #-O
#SRC_DIR and WORK_DIR are only used for `make workdir`
SRC_DIR = /mit/hardts/src/X/xevil1.4.9
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 10:40:44 agc Exp $
+netbsd:
+ @$(MAKE) CC="c++" \
+CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8" \
-+INCL_DIRS=-I$(PREFIX)/include LIBS_DIRS=-L$(PREFIX)/lib \
++INCL_DIRS=-I$(X11BASE)/include LIBS_DIRS=-L$(X11BASE)/lib \
+LIBS="-lX11 -lm" $(TARGETS)
hp700:
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 10:23:08 +0000