4 files changed, 35 insertions, 32 deletions

diff --git a/games/hex/Makefile b/games/hex/Makefile
index 6ab48d968bc3..27fe809255fd 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -13,25 +13,20 @@ MASTER_SITES=	http://www.nott.ac.uk/~psystrj/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_X_PREFIX=	YES
-USE_GMAKE=	YES
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+MAKE_ENV=	GRAPHICPATH="${GRAPHICPATH}" LEVELPATH="${LEVELPATH}"
+
+GRAPHICPATH=	${PREFIX}/share/hex/graphics
+LEVELPATH=	${PREFIX}/share/hex/levels
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hex ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/hex/graphics
-.for i in 0 1 2 3 4 5 6 7 8
-	${INSTALL_DATA} ${WRKSRC}/graphics/ball${i}.png \
-			 ${PREFIX}/share/hex/graphics/ball${i}.png
-.endfor
-	@${MKDIR} ${PREFIX}/share/hex/levels
-	${INSTALL_DATA} ${WRKSRC}/levels/Level1 \
-			 ${PREFIX}/share/hex/levels/Level1
+	@${MKDIR} ${GRAPHICPATH}
+	${INSTALL_DATA} ${WRKSRC}/graphics/*.png ${GRAPHICPATH}
+	@${MKDIR} ${LEVELPATH}
+	${INSTALL_DATA} ${WRKSRC}/levels/Level1 ${LEVELPATH}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/hex
 .for file in HISTORY README TODO
diff --git a/games/hex/files/patch-aa b/games/hex/files/patch-aa
index 6d54475b4816..c00792cac4bb 100644
--- a/games/hex/files/patch-aa
+++ b/games/hex/files/patch-aa
@@ -1,11 +1,12 @@
---- hex.c	Wed Aug  4 19:36:00 1999
-+++ hex.c.new	Mon Aug  9 23:02:44 1999
-@@ -17,7 +17,7 @@
+--- hex.c.orig	Thu Aug  5 08:36:00 1999
++++ hex.c	Wed Aug  9 02:55:38 2000
+@@ -17,7 +17,9 @@
  #include <string.h>
  #include <ctype.h>
  
--#define LEVELPATH "./levels/"
-+#define LEVELPATH "/usr/X11R6/share/hex/levels/"
++#ifndef LEVELPATH
+ #define LEVELPATH "./levels/"
++#endif
  
  #define XSIZE 8 
  #define YSIZE 12
diff --git a/games/hex/files/patch-ab b/games/hex/files/patch-ab
index 747fae578649..023e818c6d78 100644
--- a/games/hex/files/patch-ab
+++ b/games/hex/files/patch-ab
@@ -1,10 +1,12 @@
---- hex.h	Fri Aug  6 17:27:05 1999
-+++ hex.h.new	Mon Aug  9 23:10:17 1999
-@@ -1,5 +1,5 @@
--#define GRAPHICPATH "./graphics/"
--#define LEVELPATH "./levels/"
-+#define GRAPHICPATH "/usr/X11R6/share/hex/graphics/"
-+#define LEVELPATH "/usr/X11R6/share/hex/levels/"
+--- hex.h.orig	Sat Aug  7 06:27:05 1999
++++ hex.h	Wed Aug  9 02:54:56 2000
+@@ -1,5 +1,9 @@
++#ifndef GRAPHICPATH
+ #define GRAPHICPATH "./graphics/"
++#endif
++#ifndef LEVELPATH
+ #define LEVELPATH "./levels/"
++#endif
  
  #define XSIZE 8
  #define YSIZE 12 // add 1 for the ceiling line
diff --git a/games/hex/files/patch-ac b/games/hex/files/patch-ac
index 379521b6dbb7..7936e63d64a1 100644
--- a/games/hex/files/patch-ac
+++ b/games/hex/files/patch-ac
@@ -1,21 +1,26 @@
---- Makefile.orig	Fri Aug 13 20:42:49 1999
-+++ Makefile	Fri Aug 13 20:43:18 1999
-@@ -1,4 +1,4 @@
+--- Makefile.orig	Fri Aug  6 20:56:10 1999
++++ Makefile	Wed Aug  9 03:01:56 2000
+@@ -1,16 +1,19 @@
 -CC = gcc -Wall -O6 -g 
 +#CC = gcc -Wall -O6 -g 
  
  SRCS = main.c levels.c grid.c player.c touching.c gtkstuff.c plot.c graphics.c 
  OBJS = $(SRCS:.c=.o)
-@@ -7,10 +7,10 @@
+-LIBS = -lm -lgdk_imlib 
++CFLAGS += -DGRAPHICPATH=\"${GRAPHICPATH}\" -DLEVELPATH=\"${LEVELPATH}\"
++#LIBS = -lm -lgdk_imlib
++GDK_IMLIB_CFLAGS = `imlib-config --cflags-gdk`
++GDK_IMLIB_LIBS = `imlib-config --libs-gdk`
+ 
  all: hex
  
  .c.o:
 -	$(CC) `gtk-config --cflags` -c $*.c -o $*.o
-+	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $*.c -o $*.o
++	$(CC) $(CFLAGS) $(GDK_IMLIB_CFLAGS) -c $*.c -o $*.o
  
  hex: $(OBJS)
 -	$(CC) $(LIBS) `gtk-config --libs` $(OBJS)  -o $@
-+	$(CC) $(LIBS) `$(GTK_CONFIG) --libs` $(OBJS)  -o $@
++	$(CC) $(LIBS) $(GDK_IMLIB_LIBS) $(OBJS)  -o $@
  
  clean: 
  	rm -f *~ *.o hex