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

diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 8b52d083c631..5cfbe1d43c58 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -17,12 +17,15 @@ MAINTAINER=	cjh@kr.freebsd.org
 
 LIB_DEPENDS=    gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
+GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_X_PREFIX=	YES
-GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
-CONFIGURE_ENV=	GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
-		GTK_CONFIG=${X11BASE}/bin/gtk12-config
-CONFIGURE_ARGS+= --with-hangul-keyboard=2
+GNU_CONFIGURE=	YES
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ARGS=	--with-hangul-keyboard=2
+MAKE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
 # gnome panel applet support
 .if defined(WITH_GNOME_APPLET)
@@ -33,15 +36,15 @@ CONFIGURE_ARGS+= --enable-gnome-applet
 
 post-build:
 	@cd ${WRKSRC}/hanjadic; \
-	${MAKE}
+	${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hanjadic/hanja-hwp2ami ${PREFIX}/bin
 
 	# patch XLC_LOCALE for ko_KR.EUC(harmless)
-	if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE ]; then \
-		${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \
-			${PREFIX}/lib/X11/locale/ko/XLC_LOCALE.orig; \
+	if [ -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE; then \
+	${MV} -f ${PREFIX}/lib/X11/locale/ko/XLC_LOCALE \
+		${PREFIX}/lib/X11/locale/ko/XLC_LOCALE.orig; \
 	fi
 	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
 		${PREFIX}/lib/X11/locale/ko/
@@ -50,7 +53,7 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/XLC_LOCALE \
 		${PREFIX}/share/doc/ami
 
-.for NAME in AUTHORS README NEWS COPYING ChangeLog
+.for NAME in AUTHORS README NEWS ChangeLog
 	${INSTALL_DATA} ${WRKSRC}/${NAME} \
 		${PREFIX}/share/doc/ami
 .endfor
diff --git a/korean/ami/files/patch-ca b/korean/ami/files/patch-ca
index 15cc9dfbced9..bd385d8d598d 100644
--- a/korean/ami/files/patch-ca
+++ b/korean/ami/files/patch-ca
@@ -1,10 +1,11 @@
---- hanjadic/Makefile~	Thu Jul  1 03:31:25 1999
-+++ hanjadic/Makefile	Tue Jul 13 21:16:53 1999
+--- hanjadic/Makefile.orig	Fri Nov 26 23:20:56 1999
++++ hanjadic/Makefile	Sat Jul  1 19:44:26 2000
 @@ -1,5 +1,5 @@
  
- CC = gcc
+-CC = gcc
 -CFLAGS = -g -O2 `glib-config --cflags`
-+CFLAGS = -g -O2 `glib12-config --cflags`
++CC ?= gcc
++CFLAGS += `$(GLIB_CONFIG) --cflags`
  hanja-hwp2ami: hanja-hwp2ami.o
 -	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib-config --libs`
-+	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o `glib12-config --libs`
++	$(CC) -o hanja-hwp2ami hanja-hwp2ami.o `$(GLIB_CONFIG) --libs`
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index b75cae8be117..3380da644829 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -39,6 +39,5 @@ share/doc/ami/XLC_LOCALE
 share/doc/ami/AUTHORS
 share/doc/ami/README
 share/doc/ami/NEWS
-share/doc/ami/COPYING
 share/doc/ami/ChangeLog
 @dirrm share/doc/ami
diff --git a/korean/gau/Makefile b/korean/gau/Makefile
index 6829993b1db1..9ed341289fc3 100644
--- a/korean/gau/Makefile
+++ b/korean/gau/Makefile
@@ -17,14 +17,16 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	cjh@kr.freebsd.org
 
-LIB_DEPENDS=    gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 RUN_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz \
 		${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=  GLIB_CONFIG=${LOCALBASE}/bin/glib12-config \
-		GTK_CONFIG=${X11BASE}/bin/gtk12-config
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/korean/gau/files/patch-bb b/korean/gau/files/patch-bb
index 49757d7b1644..6e8b8a45e91a 100644
--- a/korean/gau/files/patch-bb
+++ b/korean/gau/files/patch-bb
@@ -5,7 +5,7 @@
  
  grimview: grimview.o $(zilla)
 -	gcc -o grimview grimview.o $(zilla) `gtk-config --libs` -ljpeg
-+	gcc -o grimview grimview.o $(zilla) `gtk12-config --libs` -ljpeg
++	$(CC) $(CFLAGS) -o grimview grimview.o $(zilla) `$(GTK_CONFIG) --libs` -ljpeg
  .c.o:
 -	gcc -Wall `gtk-config --cflags` -c $<
-+	gcc -Wall `gtk12-config --cflags` -c $<
++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -c $<