diff options
| author | hubertf <hubertf> | 2000-05-05 15:25:16 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2000-05-05 15:25:16 +0000 |
| commit | 02e7c205bc399ed9c0c839d8fba596d4dc771531 (patch) | |
| tree | ad63b75c4ec796a5dd4f69795012673ad6beafa4 /games/xworm | |
| parent | 215c055ec4695afebc007c71368abe36ce8daba9 (diff) | |
| download | pkgsrc-02e7c205bc399ed9c0c839d8fba596d4dc771531.tar.gz | |
use X11BASE properly, fix for ELF, and move to LOCALBASE
Diffstat (limited to 'games/xworm')
| -rw-r--r-- | games/xworm/Makefile | 6 | ||||
| -rw-r--r-- | games/xworm/files/patch-sum | 4 | ||||
| -rw-r--r-- | games/xworm/patches/patch-aa | 25 |
3 files changed, 19 insertions, 16 deletions
diff --git a/games/xworm/Makefile b/games/xworm/Makefile index 51dbc3cf462..91077ae6460 100644 --- a/games/xworm/Makefile +++ b/games/xworm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 1999/03/28 23:54:41 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2000/05/05 15:25:16 hubertf Exp $ # FreeBSD Id: Makefile,v 1.3 1998/08/05 09:31:04 asami Exp # @@ -9,8 +9,8 @@ MASTER_SITES= http://www.ekran.no/archive/x/ MAINTAINER= root@garbled.net -ALL_TARGET= freebsd -USE_X11BASE= yes +ALL_TARGET= bsd +USE_X11= yes WRKSRC= ${WRKDIR}/XWorm do-install: diff --git a/games/xworm/files/patch-sum b/games/xworm/files/patch-sum index 05bd48e73b6..78328ed6296 100644 --- a/games/xworm/files/patch-sum +++ b/games/xworm/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:04 agc Exp $ +$NetBSD: patch-sum,v 1.2 2000/05/05 15:25:17 hubertf Exp $ -MD5 (patch-aa) = ad9be97255e81150fdc2992250b174f4 +MD5 (patch-aa) = e49c231606807ce8515a504ee4467459 MD5 (patch-ab) = 722de095afd5cd9369fcaa12a481203b diff --git a/games/xworm/patches/patch-aa b/games/xworm/patches/patch-aa index 1b045f76875..5a7aa0e7055 100644 --- a/games/xworm/patches/patch-aa +++ b/games/xworm/patches/patch-aa @@ -1,18 +1,21 @@ -$NetBSD: patch-aa,v 1.1.1.1 1998/11/04 21:20:50 garbled Exp $ ---- Makefile.orig Wed May 7 09:28:12 1997 -+++ Makefile Wed Nov 4 13:23:53 1998 -@@ -6,8 +6,9 @@ +--- Makefile.orig Wed May 7 18:28:12 1997 ++++ Makefile Fri May 5 17:19:44 2000 +@@ -6,21 +6,24 @@ HPFLAGS = -O -D_HPUX_SOURCE SUNFLAGS = -O LINUXFLAGS = -O -+FREEBSDFLAGS= -O -DPREFIX=\"${PREFIX}/share/xworm\" ++BSDFLAGS= -O -DPREFIX=\"${PREFIX}/share/xworm\" -INCDIR = -I/usr/include/X11R5 -I/usr/include -I/usr/X11R6/include -+INCDIR = -I/usr/include/X11R5 -I/usr/include -I${PREFIX}/include ++INCDIR = -I${X11BASE}/include -I/usr/include -I${PREFIX}/include HPLINK = -L/usr/local/lib/X11R5 -lXt -lX11 -lm SUNLINK = -L/usr/local/lib/X11R5 -lXt -lX11 -lm -lsocket -lnsl -lICE -lSM -@@ -18,9 +19,10 @@ + LINUXLINK = -L/usr/X11R6/lib -lXt -lX11 -lm ++BSDLINK = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lX11 -lm + + all: + @echo "Makefile for XWorm v1.02 - written by The Last Viking (C) 1995-97 Ekran Design." @echo " " @echo "type:" @echo " " @@ -22,17 +25,17 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/04 21:20:50 garbled Exp $ + @echo " make hp [HP/UX and similar systems]" + @echo " make sun [Sun-Os/SUN systems]" + @echo " make linux [linux systems]" -+ @echo " make freebsd [FreeBSD systems]" ++ @echo " make bsd [BSD systems]" @echo " " @echo "xworm.font, xworm.grid and xworm.raw has to be in the same directory as xworm" @echo "please check the Makefile if you have problems compiling the program" -@@ -33,6 +35,9 @@ +@@ -33,6 +36,9 @@ linux: xworm.c $(CC) $(LINUXFLAGS) $(INCDIR) xworm.c -o xworm $(LINUXLINK) + -+freebsd: xworm.c -+ $(CC) $(FREEBSDFLAGS) $(INCDIR) xworm.c -o xworm $(LINUXLINK) ++bsd: xworm.c ++ $(CC) $(BSDFLAGS) $(INCDIR) xworm.c -o xworm $(BSDLINK) clean: rm -f core xworm |