8 files changed, 76 insertions, 39 deletions

diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index 6805eb22acb5..e4f7ec9aad3b 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -20,18 +20,13 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	flathill@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12	\
-		icq.0:${PORTSDIR}/japanese/libicq
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+LIB_DEPENDS=	icq.0:${PORTSDIR}/japanese/libicq
 
 USE_X_PREFIX=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gnome --disable-nls
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/japanese/gicq/files/patch-ac b/japanese/gicq/files/patch-ac
new file mode 100644
index 000000000000..d819618939b4
--- /dev/null
+++ b/japanese/gicq/files/patch-ac
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Mon Sep  6 23:36:43 1999
++++ Makefile.in	Mon Sep  6 23:37:18 1999
+@@ -116,8 +116,8 @@
+ 
+ SUBDIRS = macros intl po pixmaps src doc
+ 
+-sysdir   = $(datadir)/gnome/apps/Applications
+-sys_DATA = gicq.desktop
++@INSIDE_GNOME_COMMON_TRUE@sysdir   = $(datadir)/gnome/apps/Applications
++@INSIDE_GNOME_COMMON_TRUE@sys_DATA = gicq.desktop
+ 
+ EXTRA_DIST = gicq.desktop
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/japanese/gicq/files/patch-ad b/japanese/gicq/files/patch-ad
new file mode 100644
index 000000000000..b23db8901736
--- /dev/null
+++ b/japanese/gicq/files/patch-ad
@@ -0,0 +1,12 @@
+--- doc/Makefile.in.orig	Mon Sep  6 23:46:58 1999
++++ doc/Makefile.in	Mon Sep  6 23:48:32 1999
+@@ -114,7 +114,8 @@
+ ZVT_LIBS = @ZVT_LIBS@
+ l = @l@
+ 
+-gicq_helpdir = $(datadir)/gnome/help/gicq/C
++@INSIDE_GNOME_COMMON_TRUE@gicq_helpdir = $(datadir)/gnome/help/gicq/C
++@INSIDE_GNOME_COMMON_FALSE@gicq_helpdir = $(datadir)/doc/gicq/C
+ 
+ gicq_help_DATA = 	\
+ 	index.html	\
diff --git a/japanese/gicq/pkg-plist b/japanese/gicq/pkg-plist
index a8425957eda3..c430b9e74093 100644
--- a/japanese/gicq/pkg-plist
+++ b/japanese/gicq/pkg-plist
@@ -1,6 +1,5 @@
 bin/gicq
-share/gnome/help/gicq/C/index.html
-share/gnome/help/gicq/C/topic.dat
-@dirrm share/gnome/help/gicq/C
-@dirrm share/gnome/help/gicq
-share/gnome/apps/Applications/gicq.desktop
+share/doc/gicq/C/index.html
+share/doc/gicq/C/topic.dat
+@dirrm share/doc/gicq/C
+@dirrm share/doc/gicq
diff --git a/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile
index 19eb0766c4a7..37a448a27677 100644
--- a/japanese/gtkicq/Makefile
+++ b/japanese/gtkicq/Makefile
@@ -16,18 +16,14 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	stanaka@bb.mbn.or.jp
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-BUILD_DEPENDS=	${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode \
-		${LOCALBASE}/include/jlib.h:${PORTSDIR}/japanese/libjcode
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+BUILD_DEPENDS=	${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GTK=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-gnome
+CONFIGURE_ARGS=	--without-gnome --datadir=${PREFIX}/share/gtkicq
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/japanese/gtkicq/files/patch-ac b/japanese/gtkicq/files/patch-ac
new file mode 100644
index 000000000000..d5847b83f31f
--- /dev/null
+++ b/japanese/gtkicq/files/patch-ac
@@ -0,0 +1,23 @@
+--- src/Makefile.in.orig	Tue Sep  7 00:01:12 1999
++++ src/Makefile.in	Tue Sep  7 00:06:29 1999
+@@ -115,14 +115,14 @@
+ EXTRA_DIST =  	GtkICQ.desktop			GtkICQ.gnorba			gnome-gtkicq.xpm		applet.c
+ 
+ 
+-Utilitiesdir = $(datadir)/applets/Network
+-Utilities_DATA = GtkICQ.desktop
++@INSIDE_GNOME_COMMON_TRUE@Utilitiesdir = $(datadir)/applets/Network
++@INSIDE_GNOME_COMMON_TRUE@Utilities_DATA = GtkICQ.desktop
+ 
+-Iconsdir = $(datadir)/pixmaps
+-Icons_DATA = gnome-gtkicq.xpm
++@INSIDE_GNOME_COMMON_TRUE@Iconsdir = $(datadir)/pixmaps
++@INSIDE_GNOME_COMMON_TRUE@Icons_DATA = gnome-gtkicq.xpm
+ 
+-gnorbadir = $(sysconfdir)/CORBA/servers
+-gnorba_DATA = GtkICQ.gnorba
++@INSIDE_GNOME_COMMON_TRUE@gnorbadir = $(sysconfdir)/CORBA/servers
++@INSIDE_GNOME_COMMON_TRUE@gnorba_DATA = GtkICQ.gnorba
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/japanese/gtkicq/pkg-plist b/japanese/gtkicq/pkg-plist
index 18e0961ab8f1..02db91d80240 100644
--- a/japanese/gtkicq/pkg-plist
+++ b/japanese/gtkicq/pkg-plist
@@ -1,19 +1,18 @@
 bin/gtkicq
-share/pixmaps/gtkicq-auth.xpm
-share/pixmaps/gtkicq-away.xpm
-share/pixmaps/gtkicq-blank.xpm
-share/pixmaps/gtkicq-chat.xpm
-share/pixmaps/gtkicq-chat2.xpm
-share/pixmaps/gtkicq-dnd.xpm
-share/pixmaps/gtkicq-ffc.xpm
-share/pixmaps/gtkicq-inv.xpm
-share/pixmaps/gtkicq-message.xpm
-share/pixmaps/gtkicq-na.xpm
-share/pixmaps/gtkicq-nomess.xpm
-share/pixmaps/gtkicq-occ.xpm
-share/pixmaps/gtkicq-offline.xpm
-share/pixmaps/gtkicq-online.xpm
-share/pixmaps/gtkicq-url.xpm
-share/pixmaps/gnome-gtkicq.xpm
-share/applets/Network/GtkICQ.desktop
-etc/CORBA/servers/GtkICQ.gnorba
+share/gtkicq/pixmaps/gtkicq-auth.xpm
+share/gtkicq/pixmaps/gtkicq-away.xpm
+share/gtkicq/pixmaps/gtkicq-blank.xpm
+share/gtkicq/pixmaps/gtkicq-chat.xpm
+share/gtkicq/pixmaps/gtkicq-chat2.xpm
+share/gtkicq/pixmaps/gtkicq-dnd.xpm
+share/gtkicq/pixmaps/gtkicq-ffc.xpm
+share/gtkicq/pixmaps/gtkicq-inv.xpm
+share/gtkicq/pixmaps/gtkicq-message.xpm
+share/gtkicq/pixmaps/gtkicq-na.xpm
+share/gtkicq/pixmaps/gtkicq-nomess.xpm
+share/gtkicq/pixmaps/gtkicq-occ.xpm
+share/gtkicq/pixmaps/gtkicq-offline.xpm
+share/gtkicq/pixmaps/gtkicq-online.xpm
+share/gtkicq/pixmaps/gtkicq-url.xpm
+@dirrm share/gtkicq/pixmaps
+@dirrm share/gtkicq
diff --git a/japanese/word/Makefile b/japanese/word/Makefile
index cdaf5ac1d9df..c78bc4bc0a40 100644
--- a/japanese/word/Makefile
+++ b/japanese/word/Makefile
@@ -12,14 +12,14 @@ MASTER_SITES=	http://www.linet.gr.jp/~mituiwa/
 
 MAINTAINER=	sada@FreeBSD.ORG
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+USE_GTK=	yes
 
 DOCDIR=		${PREFIX}/share/doc/ja-word
 EXAMPLEDIR=	${PREFIX}/share/examples/ja-word
 
 do-build:
 	(cd ${WRKSRC}; \
-	 ${CC} -o word `gtk12-config --cflags` `gtk12-config --libs` word.c )
+	 ${CC} -o word `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` word.c )
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/word ${PREFIX}/bin