diff options
| author | steve <steve@FreeBSD.org> | 2000-09-05 09:15:08 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 2000-09-05 09:15:08 +0800 |
| commit | 58cabbbdfbe5932d43679f6c46d6fec4c17b9a2b (patch) | |
| tree | 52ad497b4bf3c446c733f311fafb3f2fd1177819 /games | |
| parent | 2a3e865aa310dfb307c42d8fd12485c49a3f98fd (diff) | |
| download | freebsd-ports-gnome-58cabbbdfbe5932d43679f6c46d6fec4c17b9a2b.tar.gz freebsd-ports-gnome-58cabbbdfbe5932d43679f6c46d6fec4c17b9a2b.tar.zst freebsd-ports-gnome-58cabbbdfbe5932d43679f6c46d6fec4c17b9a2b.zip | |
- Support CFLAGS/PREFIX/X11BASE properly
PR: 21034
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
Diffstat (limited to 'games')
| -rw-r--r-- | games/xworm/Makefile | 12 | ||||
| -rw-r--r-- | games/xworm/files/patch-aa | 22 | ||||
| -rw-r--r-- | games/xworm/files/patch-ab | 6 |
3 files changed, 24 insertions, 16 deletions
diff --git a/games/xworm/Makefile b/games/xworm/Makefile index 4101ce273f0a..b4b018916e2c 100644 --- a/games/xworm/Makefile +++ b/games/xworm/Makefile @@ -9,19 +9,19 @@ PORTNAME= xworm PORTVERSION= 1.02 CATEGORIES= games MASTER_SITES= http://www.ekran.no/archive/x/ -DISTNAME= xworm102 +DISTNAME= ${PORTNAME}102 MAINTAINER= ports@FreeBSD.org -ALL_TARGET= freebsd -USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/XWorm +USE_X_PREFIX= yes +ALL_TARGET= freebsd do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin - @ ${MKDIR} ${PREFIX}/share/xworm + ${INSTALL_PROGRAM} ${WRKSRC}/xworm ${PREFIX}/bin + @${MKDIR} ${PREFIX}/share/xworm .for file in font grid raw - @ ${INSTALL_DATA} ${WRKSRC}/xworm.${file} ${PREFIX}/share/xworm + ${INSTALL_DATA} ${WRKSRC}/xworm.${file} ${PREFIX}/share/xworm .endfor .include <bsd.port.mk> diff --git a/games/xworm/files/patch-aa b/games/xworm/files/patch-aa index b3f04e379a6b..6e3dca373109 100644 --- a/games/xworm/files/patch-aa +++ b/games/xworm/files/patch-aa @@ -1,18 +1,26 @@ ---- Makefile.orig Wed May 7 11:28:12 1997 -+++ Makefile Sun Sep 27 12:19:42 1998 -@@ -6,21 +6,26 @@ +--- Makefile.orig Thu May 8 01:28:12 1997 ++++ Makefile Sat Aug 12 03:01:04 2000 +@@ -1,26 +1,31 @@ + # Makefile for XWorm. + + #CC = cc +-CC = gcc ++CC ?= gcc + HPFLAGS = -O -D_HPUX_SOURCE SUNFLAGS = -O LINUXFLAGS = -O -+FREEBSDFLAGS= -O -DPREFIX=\"/usr/X11R6/share/xworm\" ++FREEBSDFLAGS= ${CFLAGS} -DXWORMDIR=\"${PREFIX}/share/xworm\" - INCDIR = -I/usr/include/X11R5 -I/usr/include -I/usr/X11R6/include +-INCDIR = -I/usr/include/X11R5 -I/usr/include -I/usr/X11R6/include ++INCDIR = -I${X11BASE}/include HPLINK = -L/usr/local/lib/X11R5 -lXt -lX11 -lm SUNLINK = -L/usr/local/lib/X11R5 -lXt -lX11 -lm -lsocket -lnsl -lICE -lSM - LINUXLINK = -L/usr/X11R6/lib -lXt -lX11 -lm +-LINUXLINK = -L/usr/X11R6/lib -lXt -lX11 -lm ++LINUXLINK = -L${X11BASE}/lib -lXt -lX11 -lm +.if ${PORTOBJFORMAT} == "elf" -+LINUXLINK+= -Wl,-rpath,$(X11BASE)/lib ++LINUXLINK+= -Wl,-rpath,${X11BASE}/lib +.endif all: diff --git a/games/xworm/files/patch-ab b/games/xworm/files/patch-ab index 73bc78c790f1..5fb4597d4260 100644 --- a/games/xworm/files/patch-ab +++ b/games/xworm/files/patch-ab @@ -18,9 +18,9 @@ +#define PREFIX "." +#endif + -+#define gridfile PREFIX "/xworm.grid" -+#define fontfile PREFIX "/xworm.font" -+#define logofile PREFIX "/xworm.raw" ++#define gridfile XWORMDIR "/xworm.grid" ++#define fontfile XWORMDIR "/xworm.font" ++#define logofile XWORMDIR "/xworm.raw" #define maxQ 5000 /* max queue */ #define NCOLORS 15 /* number of colours */ |