Date: Thu, 15 May 2003 22:17:42 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/52274: Update port: games/xtux Message-ID: <20030515221742.359d85dc.tkato@prontomail.com> Resent-Message-ID: <200305151320.h4FDKEWD090587@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 52274
>Category: ports
>Synopsis: Update port: games/xtux
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 15 06:20:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build on -stable
- Support CC/CFLAGS/MAKE/X11BASE properly
Remove file:
files/patch-ac
files/patch-ad
files/patch-ae
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/xtux/Makefile games/xtux/Makefile
--- /usr/ports/games/xtux/Makefile Mon May 5 19:08:28 2003
+++ games/xtux/Makefile Thu May 15 20:17:44 2003
@@ -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 @@
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>
diff -urN /usr/ports/games/xtux/files/patch-aa games/xtux/files/patch-aa
--- /usr/ports/games/xtux/files/patch-aa Fri Feb 9 01:24:51 2001
+++ games/xtux/files/patch-aa Thu May 15 19:59:39 2003
@@ -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
diff -urN /usr/ports/games/xtux/files/patch-ac games/xtux/files/patch-ac
--- /usr/ports/games/xtux/files/patch-ac Fri Feb 9 01:24:51 2001
+++ games/xtux/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -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
diff -urN /usr/ports/games/xtux/files/patch-ad games/xtux/files/patch-ad
--- /usr/ports/games/xtux/files/patch-ad Fri Feb 9 01:24:52 2001
+++ games/xtux/files/patch-ad Thu Jan 1 09:00:00 1970
@@ -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)
diff -urN /usr/ports/games/xtux/files/patch-ae games/xtux/files/patch-ae
--- /usr/ports/games/xtux/files/patch-ae Fri Feb 9 01:24:52 2001
+++ games/xtux/files/patch-ae Thu Jan 1 09:00:00 1970
@@ -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)
diff -urN /usr/ports/games/xtux/files/patch-af games/xtux/files/patch-af
--- /usr/ports/games/xtux/files/patch-af Sat May 10 07:33:20 2003
+++ games/xtux/files/patch-af Thu May 15 20:03:23 2003
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030515221742.359d85dc.tkato>