***

       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, 20 insertions, 26 deletions

diff --git a/games/garith/Makefile b/games/garith/Makefile
index 75ac9ca..7a5113f 100644
--- a/games/garith/Makefile
+++ b/games/garith/Makefile
@@ -12,18 +12,21 @@ MASTER_SITES=	http://www.cnm-vra.com/micah/garith/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gdk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-ALL_TARGET=
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+ALL_TARGET=	# empty
 USE_X_PREFIX=	yes
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 WRKSRC=		${WRKDIR}/garith
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/garith ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/garith ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/garith
+	@${MKDIR} ${PREFIX}/share/doc/garith
 .for file in BUGS COPYING HISTORY README TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/garith
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/garith
 .endfor
 .endif
 
diff --git a/games/garith/files/patch-aa b/games/garith/files/patch-aa
index 8b3b574..19fb332 100644
--- a/games/garith/files/patch-aa
+++ b/games/garith/files/patch-aa
@@ -1,14 +1,17 @@
 --- Makefile.orig	Thu Sep 18 13:03:00 1997
-+++ Makefile	Fri Mar 19 18:15:00 1999
-@@ -1,26 +1,22 @@
++++ Makefile	Wed Mar 29 21:49:16 2000
+@@ -1,16 +1,16 @@
  # Makefile adapted from that in the GMix distribution, thanks.
- CC=gcc
-+GTK_FLAGS=`gtk12-config --cflags` `gtk12-config  --libs` 
- LINK=gcc
- INCDIR=
- LIBDIR=-L/usr/X11R6/lib
+-CC=gcc
+-LINK=gcc
+-INCDIR=
+-LIBDIR=-L/usr/X11R6/lib
 -LDLIBS=-lgnome -lgnomeui -lgdk -lgtk -lglib -lm
 -OPTFLAGS= -m486 -O2 -Wall
++CC?=gcc
++LINK=$(CC)
++INCDIR=`${GTK_CONFIG} --cflags`
++LIBDIR=`${GTK_CONFIG} --libs`
 +#LDLIBS=-lgnome -lgnomeui -lgdk -lgtk -lglib -lm
 +#OPTFLAGS= -m486 -O2 -Wall
  DEST=garith
@@ -17,19 +20,7 @@
  SRCS=garith.c
  
 -CFLAGS=  $(OPTFLAGS) $(DEFINES) $(INCDIR)
-+CFLAGS=  $(OPTFLAGS) $(DEFINES) $(INCDIR) $(GTK_FLAGS)
++CFLAGS+=  $(OPTFLAGS) $(DEFINES) $(INCDIR)
  LFLAGS= $(LIBDIR) $(LDLIBS)
  
--$(DEST) : $(OBJS)
--	$(LINK) $(CFLAGS) -o $@ $(OBJS) $(LFLAGS)
-+$(DEST) : garith.c
-+	$(CC) -Wall $(GTK_FLAGS) garith.c -o garith ${CFLAGS}
- 
- clean:
- 	rm -f *~
- 	rm -f *.o $(DEST)
--
--.c.o:
--	$(CC) $(CFLAGS) -c $<
--
--garith.o: garith.c
+ $(DEST) : $(OBJS)