PR: 16869

Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
Approved by:	port's maintainer

          - Fix CATEGORIES/LIB_DEPENDS
          - Support CC/CFLAGS/PREFIX properly
          - Support imlib-config
          - Add USE_X_PREFIX
          - Remove USE_GMAKE
          - Move post-install message to pkg/MESSAGE
          - Add WWW: line and remove version number from pkg/DESCR

4 files changed, 41 insertions, 22 deletions

diff --git a/games/xphotohunter/Makefile b/games/xphotohunter/Makefile
index 80651776d857..8248e84a869e 100644
--- a/games/xphotohunter/Makefile
+++ b/games/xphotohunter/Makefile
@@ -7,22 +7,16 @@
 #
 
 DISTNAME=	xphotohunter-1.4
-CATEGORIES=	chinese games
+CATEGORIES=	games
 MASTER_SITES=	http://www.oz.nthu.edu.tw/~u860905/Xphotohunter/
 
 MAINTAINER=	clive@CirX.ORG
 
-LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
+LIB_DEPENDS=	gdk_imlib.5:${PORTSDIR}/graphics/imlib
 
-USE_GMAKE=	yes
+USE_X_PREFIX=	yes
 
 post-install:
-	@${ECHO} "========================================================="
-	@${ECHO} "Notice: to see Chinese fonts correctly, you must set 2"
-	@${ECHO} "environment variables :"
-	@${ECHO} "LC_CTYPE=zh_TW.Big5"
-	@${ECHO} "LC_MESSAGES=zh_TW.Big5"
-	@${ECHO} " "
-	@${ECHO} "========================================================="
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/games/xphotohunter/files/patch-aa b/games/xphotohunter/files/patch-aa
index c08ecab0ec52..08de1c2028b8 100644
--- a/games/xphotohunter/files/patch-aa
+++ b/games/xphotohunter/files/patch-aa
@@ -1,25 +1,43 @@
---- Makefile.orig	Sat Sep 25 00:57:55 1999
-+++ Makefile	Fri Oct  8 03:09:28 1999
-@@ -5,19 +5,19 @@
+--- Makefile.orig	Sat Sep 25 01:57:55 1999
++++ Makefile	Sun Feb 20 21:41:12 2000
+@@ -1,29 +1,29 @@
+ # XPhotoHunter v1.4
+ 
+ # If you want to install data in another directory, edit the following line. 
+-DATADIR=/usr/local/share/xphotohunter
++DATADIR=${PREFIX}/share/xphotohunter
  # If you want to install executive files in another directory, edit the following line. 
- BINDIR=/usr/local/bin
+-BINDIR=/usr/local/bin
++BINDIR=${PREFIX}/bin
  # Where your locale dir is
 -LOCALEDIR=/usr/share/locale
-+LOCALEDIR=/usr/local/share/locale
++LOCALEDIR=${PREFIX}/share/locale
  
  SHELL=sh
- CC=gcc 
+-CC=gcc 
++CC?=gcc 
  DEFS=-DDATA_DIR=\"$(DATADIR)\"
  #INCLUDES=-I./ -I/usr/include -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/local/include
  #INCLUDES=-I./ -I/usr/include -I/usr/X11R6/include -I/usr/local/include `gtk-config --cflags`  
 -INCLUDES=`gtk-config --cflags`
-+INCLUDES=`gtk12-config --cflags`
++INCLUDES=`imlib-config --cflags-gdk`
  # The sequence of the "-l" is important when you compile staticly. 
  #LIBS=-L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib -lgtk -lgdk_imlib -lgdk -lglib -ljpeg -ltiff -lpng \
  #           -lz -lgif  -lXi -lXext -lX11 -lm
  #LIBS=-L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib `gtk-config --libs`
 -LIBS=-lgdk_imlib -ljpeg -ltiff -lpng -lz -lgif  `gtk-config --libs` -lXi -lXext -lX11 -lm
-+LIBS=-lgdk_imlib -ljpeg -ltiff -lpng -lz -lungif  `gtk12-config --libs` -lXi -lXext -lX11 -lm
- CFLAGS= -g -O2 -Wall 
+-CFLAGS= -g -O2 -Wall 
++LIBS=`imlib-config --libs-gdk`
++CFLAGS?= -g -O2 -Wall 
+ 
+-INSTALL = /usr/bin/install -c
+-INSTALL_DIR= $(INSTALL) -d -m 755
+-INSTALL_BIN = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL ?= /usr/bin/install -c
++INSTALL_DIR= mkdir -p
++INSTALL_BIN = ${BSD_INSTALL_PROGRAM}
++INSTALL_DATA = ${BSD_INSTALL_DATA}
+ RM=rm -fr
  
- INSTALL = /usr/bin/install -c
+ SRCS=main.c handler.c
diff --git a/games/xphotohunter/pkg-descr b/games/xphotohunter/pkg-descr
index c009e6e5ac30..bdccff1140fb 100644
--- a/games/xphotohunter/pkg-descr
+++ b/games/xphotohunter/pkg-descr
@@ -1,8 +1,8 @@
 
-                  XPhotoHunter v1.3
+                  XPhotoHunter
 
     This is a game under Unix X-window. The contents of the game is the
 same with the Windows95 version "Photohunter". The player has to find
 out differences between two pictures.
 
-for more information, see http://www.oz.nthu.edu.tw/~u860905/Xphotohunter/
+WWW: http://www.oz.nthu.edu.tw/~u860905/Xphotohunter/
diff --git a/games/xphotohunter/pkg-message b/games/xphotohunter/pkg-message
new file mode 100644
index 000000000000..0d38cef8424b
--- /dev/null
+++ b/games/xphotohunter/pkg-message
@@ -0,0 +1,7 @@
+=========================================================
+Notice: to see Chinese fonts correctly, you must set 2
+environment variables :
+LC_CTYPE=zh_TW.Big5
+LC_MESSAGES=zh_TW.Big5
+
+=========================================================