12 files changed, 89 insertions, 33 deletions

diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index 478c9518bc4e..b134e502131c 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhx
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkhx
@@ -20,6 +20,7 @@ LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf:install \
 USE_XLIB=	yes
 USE_GLIB=	yes
 USE_GTK=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}
 
diff --git a/net-p2p/gtkhx/distinfo b/net-p2p/gtkhx/distinfo
index 2b26888b6218..5523d7389001 100644
--- a/net-p2p/gtkhx/distinfo
+++ b/net-p2p/gtkhx/distinfo
@@ -1 +1 @@
-MD5 (gtkhx-0.9.1.tar.gz) = 4fead053517c9ba58fb68ab18ecb5d11
+MD5 (gtkhx-0.9.2.tar.gz) = 90b05bd3b4d6b25527e4f7bc4d779630
diff --git a/net-p2p/gtkhx/files/patch-Makefile.in b/net-p2p/gtkhx/files/patch-Makefile.in
new file mode 100644
index 000000000000..ba5d9946c3d5
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	Tue Feb 19 22:14:44 2002
++++ Makefile.in	Fri Mar 15 17:01:22 2002
+@@ -16,7 +16,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
++prefix = ${PREFIX}
+ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
+@@ -102,7 +102,7 @@
+ icon_DATA = icons.rsrc
+ 
+ man_DATA = gtkhx.1
+-mandir = $(prefix)/share/man/man1
++mandir = $(prefix)/man/man1
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
diff --git a/net-p2p/gtkhx/files/patch-aa b/net-p2p/gtkhx/files/patch-aa
deleted file mode 100644
index bd4b5384b0dd..000000000000
--- a/net-p2p/gtkhx/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Mon Jan 21 23:48:37 2002
-+++ configure	Sat Feb  9 20:17:35 2002
-@@ -4894,7 +4894,6 @@
- 	fi
- fi
- 
--ipv6=yes
- if test "$ipv6" = yes; then
- 	for ac_func in getaddrinfo
- do
diff --git a/net-p2p/gtkhx/files/patch-ab b/net-p2p/gtkhx/files/patch-ab
deleted file mode 100644
index 3f288c9f272a..000000000000
--- a/net-p2p/gtkhx/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Jan 21 23:48:37 2002
-+++ Makefile.in	Sat Feb  9 20:20:37 2002
-@@ -101,7 +101,7 @@
- install_sh = @install_sh@
- sedpath = @sedpath@
- unamepath = @unamepath@
--mandir = $(prefix)/share/man/man1
-+mandir = $(prefix)/man/man1
- 
- SUBDIRS = po intl src sounds plugins
- 
diff --git a/net-p2p/gtkhx/files/patch-ac b/net-p2p/gtkhx/files/patch-ac
deleted file mode 100644
index 5a8da4c3dc90..000000000000
--- a/net-p2p/gtkhx/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/plugin.c.orig	Sun Feb 10 01:16:45 2002
-+++ src/plugin.c	Sun Feb 10 01:17:00 2002
-@@ -24,6 +24,7 @@
- 
- #define PLUGIN_C
- 
-+#include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <gtk/gtk.h>
diff --git a/net-p2p/gtkhx/files/patch-configure b/net-p2p/gtkhx/files/patch-configure
new file mode 100644
index 000000000000..c5fafe9fa02b
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Feb 19 22:14:44 2002
++++ configure	Thu Mar 14 15:37:50 2002
+@@ -4888,7 +4888,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  compress = yes ; LIBS="$LIBS -lz" ;
++  compress=yes ; LIBS="$LIBS -lz" ;
+    cat >> confdefs.h <<\EOF
+ #define CONFIG_COMPRESS 1
+ EOF
diff --git a/net-p2p/gtkhx/files/patch-intl::Makefile.in b/net-p2p/gtkhx/files/patch-intl::Makefile.in
new file mode 100644
index 000000000000..053249b00b75
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-intl::Makefile.in
@@ -0,0 +1,11 @@
+--- intl/Makefile.in.orig	Tue Feb 19 22:14:43 2002
++++ intl/Makefile.in	Fri Mar 15 13:43:30 2002
+@@ -26,7 +26,7 @@
+ top_builddir = ..
+ VPATH = @srcdir@
+ 
+-prefix = @prefix@
++prefix = ${PREFIX}
+ exec_prefix = @exec_prefix@
+ transform = @program_transform_name@
+ libdir = @libdir@
diff --git a/net-p2p/gtkhx/files/patch-plugins::Makefile.in b/net-p2p/gtkhx/files/patch-plugins::Makefile.in
new file mode 100644
index 000000000000..62b3aa4cd2ef
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-plugins::Makefile.in
@@ -0,0 +1,11 @@
+--- plugins/Makefile.in.orig	Tue Feb 19 22:14:43 2002
++++ plugins/Makefile.in	Fri Mar 15 13:43:31 2002
+@@ -16,7 +16,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
++prefix = ${PREFIX}
+ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
diff --git a/net-p2p/gtkhx/files/patch-po::Makefile.in.in b/net-p2p/gtkhx/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..4ae550855ddc
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-po::Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Tue Feb 19 22:14:43 2002
++++ po/Makefile.in.in	Fri Mar 15 13:43:31 2002
+@@ -20,7 +20,7 @@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ 
+-prefix = @prefix@
++prefix = ${PREFIX}
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ localedir = $(datadir)/locale
diff --git a/net-p2p/gtkhx/files/patch-sounds::Makefile.in b/net-p2p/gtkhx/files/patch-sounds::Makefile.in
new file mode 100644
index 000000000000..61230086aadd
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-sounds::Makefile.in
@@ -0,0 +1,11 @@
+--- sounds/Makefile.in.orig	Tue Feb 19 22:14:43 2002
++++ sounds/Makefile.in	Fri Mar 15 13:43:31 2002
+@@ -16,7 +16,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
++prefix = ${PREFIX}
+ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
diff --git a/net-p2p/gtkhx/files/patch-src::Makefile.in b/net-p2p/gtkhx/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..4dd3e26b3d1f
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-src::Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Tue Feb 19 22:14:43 2002
++++ src/Makefile.in	Fri Mar 15 13:43:31 2002
+@@ -16,7 +16,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
++prefix = ${PREFIX}
+ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@