Skip site navigation (1)Skip section navigation (2)
Date:      Mon,  4 Sep 2000 12:08:51 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/21031: Update port: games/hex
Message-ID:  <20000904190851.C1FF237B424@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         21031
>Category:       ports
>Synopsis:       Update port: games/hex
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 04 12:10:09 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support PREFIX properly
- Remove USE_GMAKE

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/hex/Makefile games/hex/Makefile
--- /usr/ports/games/hex/Makefile	Sat Jul  8 06:53:20 2000
+++ games/hex/Makefile	Wed Aug  9 03:41:49 2000
@@ -13,25 +13,20 @@
 
 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 -urN /usr/ports/games/hex/patches/patch-aa games/hex/patches/patch-aa
--- /usr/ports/games/hex/patches/patch-aa	Sat Aug 14 12:52:28 1999
+++ games/hex/patches/patch-aa	Wed Aug  9 02:55:47 2000
@@ -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 -urN /usr/ports/games/hex/patches/patch-ab games/hex/patches/patch-ab
--- /usr/ports/games/hex/patches/patch-ab	Sat Aug 14 12:52:28 1999
+++ games/hex/patches/patch-ab	Wed Aug  9 02:55:04 2000
@@ -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 -urN /usr/ports/games/hex/patches/patch-ac games/hex/patches/patch-ac
--- /usr/ports/games/hex/patches/patch-ac	Sat Jul  8 06:53:20 2000
+++ games/hex/patches/patch-ac	Wed Aug  9 03:28:17 2000
@@ -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


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000904190851.C1FF237B424>