cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix build on -stable

Browse Source 
- Support CC/CFLAGS/MAKE/X11BASE properly

PR:		ports/52274
Submitted by:	Ports Fury
This commit is contained in:
Eric Anholt 2003-05-15 19:47:55 +00:00
parent c652592b58
commit 9dd3782cc9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=81050
6 changed files with 79 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
games/xtux/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= xtux
PORTVERSION= 2003.03.06
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,42 +16,51 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
COMMENT= Humorous Arcade game for X
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_XPM= yes
CFLAGS+= -DDATADIR=\\\"${PREFIX}/share/xtux\\\"
WRKSRC= ${WRKDIR}/xtux
USE_REINPLACE= yes
USE_GMAKE= yes
MAKE_ENV= CPP="${CC} -E"
CFLAGS+= -DDATADIR=\\\"${DATADIR}\\\"
post-patch:
@${FIND} ${WRKSRC}/src -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
's|^CC|#CC|g ; \
s|^CFLAGS|#CFLAGS|g ; \
s|^CPP|#CPP|g ; \
s|^MAKE|#MAKE|g ; \
s|/usr/X11R6|$${X11BASE}|g'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xtux ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/tux_serv ${PREFIX}/bin
@strip ${PREFIX}/bin/xtux ${PREFIX}/bin/tux_serv
@${MKDIR} ${PREFIX}/share/xtux/demos
@${MKDIR} ${PREFIX}/share/xtux/images/entities
@${MKDIR} ${PREFIX}/share/xtux/images/events
@${MKDIR} ${PREFIX}/share/xtux/images/items
@${MKDIR} ${PREFIX}/share/xtux/images/weapons
@${MKDIR} ${PREFIX}/share/xtux/images/tiles
@${MKDIR} ${PREFIX}/share/xtux/maps
@${MKDIR} ${DATADIR}/demos
@${MKDIR} ${DATADIR}/images/entities
@${MKDIR} ${DATADIR}/images/events
@${MKDIR} ${DATADIR}/images/items
@${MKDIR} ${DATADIR}/images/weapons
@${MKDIR} ${DATADIR}/images/tiles
@${MKDIR} ${DATADIR}/maps
${INSTALL_DATA} ${WRKSRC}/data/*.table ${PREFIX}/share/xtux
${INSTALL_DATA} ${WRKSRC}/data/*.table ${DATADIR}
.for file in ascii.txt bios entities weapons
${INSTALL_DATA} ${WRKSRC}/data/${file} ${PREFIX}/share/xtux
${INSTALL_DATA} ${WRKSRC}/data/${file} ${DATADIR}
.endfor
.for dir in entities events items weapons tiles .
${INSTALL_DATA} ${WRKSRC}/data/images/${dir}/*.xpm \
${PREFIX}/share/xtux/images/${dir}
${DATADIR}/images/${dir}
.endfor
${INSTALL_DATA} ${WRKSRC}/data/demos/*.xtdem \
${PREFIX}/share/xtux/demos
${INSTALL_DATA} ${WRKSRC}/data/maps/*.map \
${PREFIX}/share/xtux/maps
${INSTALL_DATA} ${WRKSRC}/data/demos/*.xtdem ${DATADIR}/demos
${INSTALL_DATA} ${WRKSRC}/data/maps/*.map ${DATADIR}/maps
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/xtux
${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/xtux
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xtux
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
.endif
.include <bsd.port.mk>

50
games/xtux/files/patch-aa
View File

@ -1,5 +1,5 @@
--- Makefile.orig Sun Nov 19 12:52:12 2000
+++ Makefile Tue Feb 6 09:35:36 2001
--- Makefile.orig Wed Feb 5 00:59:01 2003
+++ Makefile Thu May 15 19:59:20 2003
@@ -5,7 +5,7 @@
#============================================================#
@ -9,11 +9,49 @@
#Eg you might want to put the data files here......
#DATADIR = /usr/share/games/xtux
@@ -14,7 +14,7 @@
SV_SRC_DIR = src/server
@@ -15,36 +15,36 @@
CL_SRC_DIR = src/client
GZ_SRC_DIR = src/ggz
-MAKE = @make -C
+MAKE = @gmake -C
+#MAKE = @make -C
all: common ggz client server
clean:
- $(MAKE) $(CM_SRC_DIR) clean
- $(MAKE) $(SV_SRC_DIR) clean
- $(MAKE) $(CL_SRC_DIR) clean
- $(MAKE) $(GZ_SRC_DIR) clean
+ $(MAKE) -C $(CM_SRC_DIR) clean
+ $(MAKE) -C $(SV_SRC_DIR) clean
+ $(MAKE) -C $(CL_SRC_DIR) clean
+ $(MAKE) -C $(GZ_SRC_DIR) clean
common:
@echo
@echo " ************* Building COMMON lib *************"
@echo
- $(MAKE) $(CM_SRC_DIR) $(MFLAGS)
+ $(MAKE) -C $(CM_SRC_DIR) $(MFLAGS)
server:
@echo
@echo " ************* Building SERVER *************"
@echo
- $(MAKE) $(SV_SRC_DIR) $(MFLAGS)
+ $(MAKE) -C $(SV_SRC_DIR) $(MFLAGS)
client:
@echo
@echo " ************* Building CLIENT *************"
@echo
- $(MAKE) $(CL_SRC_DIR) $(MFLAGS)
+ $(MAKE) -C $(CL_SRC_DIR) $(MFLAGS)
ggz:
@echo
@echo " ************* Building GGZ *************"
@echo
- $(MAKE) $(GZ_SRC_DIR) $(MFLAGS)
+ $(MAKE) -C $(GZ_SRC_DIR) $(MFLAGS)
all: common client server

9
games/xtux/files/patch-ac
View File

@ -1,9 +0,0 @@
--- src/common/Makefile.orig Sun Feb 4 11:57:32 2001
+++ src/common/Makefile Tue Feb 6 09:42:15 2001
@@ -1,7 +1,6 @@
# Makefile for stuff that's common between server & client.
CC = gcc
-CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
AR = ar
RANLIB = ranlib

12
games/xtux/files/patch-ad
View File

@ -1,12 +0,0 @@
--- src/client/Makefile.orig Sun Nov 19 12:53:00 2000
+++ src/client/Makefile Sat Dec 23 07:53:09 2000
@@ -20,9 +20,6 @@
# Where to put the XTux client binary.
BINARY = $(TOPLEVEL_PATH)/xtux
-# Flags used when compiling
-CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
-
# Paths to header files
X11_INC = -I$(X11_PATH)/include
COMMON_INC = -I$(COMMON_PATH)

11
games/xtux/files/patch-ae
View File

@ -1,11 +0,0 @@
--- src/server/Makefile.orig Sun Nov 19 12:51:56 2000
+++ src/server/Makefile Sat Dec 23 07:53:27 2000
@@ -16,9 +16,6 @@
# Where to put the XTux client binary.
BINARY = $(TOPLEVEL_PATH)/tux_serv
-# Flags used when compiling
-CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
-
# Paths to header files
COMMON_INC = -I$(COMMON_PATH)

7
games/xtux/files/patch-af
View File

@ -1,8 +1,9 @@
--- src/common/timing.c.orig Fri May 9 15:21:25 2003
+++ src/common/timing.c Fri May 9 15:35:10 2003
@@ -1,6 +1,11 @@
--- src/common/timing.c.orig Mon Feb 17 12:10:07 2003
+++ src/common/timing.c Thu May 15 20:03:11 2003
@@ -1,6 +1,12 @@
#include <sys/time.h>
#include <unistd.h>
+#include <sys/param.h>
+#if __FreeBSD_version >= 500000
#include <stdint.h>
+#else