- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config

- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly

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

5 files changed, 30 insertions, 29 deletions

diff --git a/games/hex/Makefile b/games/hex/Makefile
index f8f0884bf473..6ab48d968bc3 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -13,29 +13,30 @@ MASTER_SITES=	http://www.nott.ac.uk/~psystrj/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
-		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
 
-USE_X_PREFIX=	YES
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-USE_GMAKE=	YES
 WRKSRC=		${WRKDIR}/${DISTNAME}
-
-pre-install:
-	@${MKDIR} ${PREFIX}/share/hex
-	@${MKDIR} ${PREFIX}/share/hex/levels
-	@${MKDIR} ${PREFIX}/share/hex/graphics
+USE_X_PREFIX=	YES
+USE_GMAKE=	YES
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/hex ${PREFIX}/bin/hex
-	@${INSTALL_DATA} ${WRKSRC}/HISTORY ${PREFIX}/share/hex/HISTORY
-	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/hex/README
-	@${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/hex/TODO
+	${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 \
+	${INSTALL_DATA} ${WRKSRC}/graphics/ball${i}.png \
 			 ${PREFIX}/share/hex/graphics/ball${i}.png
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/levels/Level1 \
+	@${MKDIR} ${PREFIX}/share/hex/levels
+	${INSTALL_DATA} ${WRKSRC}/levels/Level1 \
 			 ${PREFIX}/share/hex/levels/Level1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/hex
+.for file in HISTORY README TODO
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hex
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/hex/files/patch-ac b/games/hex/files/patch-ac
index ef00d2dd9927..379521b6dbb7 100644
--- a/games/hex/files/patch-ac
+++ b/games/hex/files/patch-ac
@@ -11,11 +11,11 @@
  
  .c.o:
 -	$(CC) `gtk-config --cflags` -c $*.c -o $*.o
-+	$(CC) $(CFLAGS) `gtk12-config --cflags` -c $*.c -o $*.o
++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $*.c -o $*.o
  
  hex: $(OBJS)
 -	$(CC) $(LIBS) `gtk-config --libs` $(OBJS)  -o $@
-+	$(CC) $(LIBS) `gtk12-config --libs` $(OBJS)  -o $@
++	$(CC) $(LIBS) `$(GTK_CONFIG) --libs` $(OBJS)  -o $@
  
  clean: 
  	rm -f *~ *.o hex
diff --git a/games/hex/pkg-plist b/games/hex/pkg-plist
index 58d0f267b5f2..86bb3435740b 100644
--- a/games/hex/pkg-plist
+++ b/games/hex/pkg-plist
@@ -1,5 +1,7 @@
 bin/hex
-share/hex/levels/Level1
+share/doc/hex/HISTORY
+share/doc/hex/README
+share/doc/hex/TODO
 share/hex/graphics/ball0.png
 share/hex/graphics/ball1.png
 share/hex/graphics/ball2.png
@@ -9,9 +11,8 @@ share/hex/graphics/ball5.png
 share/hex/graphics/ball6.png
 share/hex/graphics/ball7.png
 share/hex/graphics/ball8.png
-share/hex/README
-share/hex/TODO
-share/hex/HISTORY
+share/hex/levels/Level1
 @dirrm share/hex/levels
 @dirrm share/hex/graphics
 @dirrm share/hex
+@dirrm share/doc/hex
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index c17554563e90..a9829c89b9b3 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -13,12 +13,11 @@ MASTER_SITES=	ftp://ftp.linuxgames.com/xqf/
 MAINTAINER=	steve@farrell.org
 
 RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
-LIB_DEPENDS=    gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
-MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-.ifdef CC
-MAKE_ENV+=	CC="${CC}"
-.endif
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/games/xqf/files/patch-aa b/games/xqf/files/patch-aa
index ca7fccaa8f75..1f9cf6f14d5f 100644
--- a/games/xqf/files/patch-aa
+++ b/games/xqf/files/patch-aa
@@ -8,8 +8,8 @@
 -CFLAGS	= -O2 -g -Wall `gtk-config --cflags` $(EXTRA_CFLAGS)
 -LDFLAGS	= `gtk-config --libs`
 +CC	?= gcc
-+CFLAGS	+= -Wall `gtk12-config --cflags` $(EXTRA_CFLAGS)
-+LDFLAGS	= `gtk12-config --libs`
++CFLAGS	+= `$(GTK_CONFIG) --cflags` $(EXTRA_CFLAGS)
++LDFLAGS	= `$(GTK_CONFIG) --libs`
  
 -INSTALL_ROOT = /usr/local
 +INSTALL_ROOT = ${PREFIX}
@@ -21,7 +21,7 @@
  
  install:
 -	install -s -m 755 -g root -o root $(TARGET) $(INSTALL_ROOT)/bin
-+	${INSTALL_PROGRAM} $(TARGET) $(INSTALL_ROOT)/bin
++	${BSD_INSTALL_PROGRAM} $(TARGET) $(INSTALL_ROOT)/bin
  
  dist-clean clean:
  	rm -f *.[oasi] *~ core $(TARGET) Makefile.old