***

       games/affenspiel
       - Support CC properly
       ***
       games/battalion
       - Support PREFIX properly
       ***
       games/block
       - Support CC/CFLAGS properly
       ***
       games/blue
       - Support CC/CFLAGS properly
       - Add WWW: line into pkg/DESCR

       New file:
       patches/patch-aa
       ***
       games/bs
       - Add WWW: line into pkg/DESCR
       ***
       games/columns
       - Support CXXFLAGS properly
       - Support sdl-config
       ***
       games/empire
       - Exclude GPL doc from package
       - Add WWW: line into pkg/DESCR
       ***
       games/freesweep to 0.87
       - Update to version 0.87
       ***
       games/galaxis
       - Support CC properly
       - Add WWW: line into pkg/DESCR
       ***
       games/garith
       - Support CC/CFLAGS properly
       - Support GTK_CONFIG
       ***
       games/gemdropx to 0.7
       - Update to version 0.7
       ***
       games/gtkballs
       - Exclude GPL doc from package
       - Support GTK_CONFIG
       ***
       games/icbm3d
       - Update WWW: line of pkg/DESCR
       ***
       games/mirrormagic
       - Support CC/X11BASE properly
       ***
       games/phalanx to 22
       - Update to version 22
       - Add WWW: line into pkg/DESCR
       ***
       games/spellcast
       - Update MASTER_SITES and WWW: line of pkg/DESCR
       - Support CFLAGS properly
       - Exclude GPL doc from package
       ***
       games/starlanes
       - Support CC properly
       - Exclude GPL doc from package
       ***
       games/xdigger to 1.0.10
       - Update to version 1.0.10

       New file:
       patches/patch-ad  patches/patch-ae
       ***
       games/xtron
       - Support PREFIX properly
       - Exclude GPL doc from package
       ***
       games/xtruco
       - Support CC/CFLAGS/X11BASE properly
       ***
       games/xvier
       - Support X11BASE properly
       ***

PR: 17741
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>

2 files changed, 16 insertions, 15 deletions

diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index 42e364a1eb60..377e3bbd9261 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -6,17 +6,17 @@
 # $FreeBSD$
 #
 
-DISTNAME=		xtruco
-PKGNAME=		xtruco-1.0
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+DISTNAME=	xtruco
+PKGNAME=	xtruco-1.0
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-USE_X_PREFIX=		yes
+USE_X_PREFIX=	yes
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xtruco ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xtruco ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/games/xtruco/files/patch-aa b/games/xtruco/files/patch-aa
index 9fc59b65d658..fad5bbb28e4d 100644
--- a/games/xtruco/files/patch-aa
+++ b/games/xtruco/files/patch-aa
@@ -1,32 +1,33 @@
---- Makefile	Mon Oct 21 19:18:27 1996
-+++ /home/andy/tmp/wrk/Makefile	Sat Mar 14 20:08:33 1998
-@@ -6,17 +6,17 @@
+--- Makefile.orig	Tue Oct 22 04:18:27 1996
++++ Makefile	Fri Mar 31 05:23:20 2000
+@@ -6,17 +6,18 @@
  #                              #
  ################################
  
 -INCLUDES	= -I/usr/X11/include
-+INCLUDES	= -I/usr/X11R6/include
++INCLUDES	= -I${X11BASE}/include
  
  # Remove '-DIPC_OK' if you have problems with 'shared-memory' (IPC routines)
  OPC		= -DIPC_OK
  
 -LIBRARIES	= -lX11 -L/usr/X11/lib
-+LIBRARIES	= -lX11 -L/usr/X11R6/lib
++LIBRARIES	= -lX11 -L${X11BASE}/lib
  
  CFILES		= xtruco.c bitmap.c cursor.c display.c event.c gc.c pixmap.c\
  		  topwind.c window.c color.c button.c font.c read.c
  
 -CC		= gcc -O2 -g -Dlinux -DX11R6 $(INCLUDES) $(OPC)
-+CC		= gcc -DX11R6 $(INCLUDES) $(OPC)
++CC		?= gcc
++CFLAGS		+= -DX11R6 $(INCLUDES) $(OPC)
  
  PROG=xtruco
  
-@@ -25,7 +25,7 @@
+@@ -25,7 +26,7 @@
  OBJS=$(CFILES:.c=.o)
  
  all:	$(OBJS)
 -	$(CC) -o $(PROG) $(LIBRARIES) $(OBJS)
-+	$(CC) ${CFLAGS} -o $(PROG) $(LIBRARIES) $(OBJS)
++	$(CC) $(CFLAGS) -o $(PROG) $(LIBRARIES) $(OBJS)
  #	strip ${PROG}
  
  clean: