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/xevil | |
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/xevil')
-rw-r--r-- | games/xevil/Makefile | 6 | ||||
-rw-r--r-- | games/xevil/patches/patch-aa | 6 |
2 files changed, 4 insertions, 8 deletions
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: |