11 files changed, 51 insertions, 102 deletions

diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index 94ff75de81de..db6bd8c3614a 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -6,29 +6,23 @@
 #
 
 PORTNAME=	gtkhx
-PORTVERSION=	0.9.3
-PORTREVISION=	6
+PORTVERSION=	0.9.4
 CATEGORIES=	net-p2p
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkhx
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A GTK+ version of Hx, a UNIX Hotline Client
 
-USE_XLIB=	yes
-USE_GNOME=	gdkpixbuf
+USE_GNOME=	gdkpixbuf gnomehack gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-libiconv-prefix=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gtkhx.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if !defined(WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
 USE_GETTEXT=	yes
@@ -37,4 +31,14 @@ PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=--disable-nls
 .endif
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-I/usr/local/include||g ; \
+		 s|-L/usr/local/lib||g ; \
+		 s|^mandir =.*$$|mandir = $${prefix}/man/man1|g'
+	@${REINPLACE_CMD} -e 's|^CC =|#CC =|g' ${WRKSRC}/plugins/eliza/Makefile
+	@${REINPLACE_CMD} -e 's|^CC=|#CC=|g ; \
+		 s|$$CFLAGS -O2|$$CFLAGS|g ; \
+		 s|-g -Wall|$$CFLAGS -Wall|g' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/net-p2p/gtkhx/distinfo b/net-p2p/gtkhx/distinfo
index 6780c87ce060..391bc2d8aec0 100644
--- a/net-p2p/gtkhx/distinfo
+++ b/net-p2p/gtkhx/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtkhx-0.9.3.tar.gz) = 3ba38e64b5040b0b615087e1ef5d18fd
-SHA256 (gtkhx-0.9.3.tar.gz) = ccbc0a2c8f7e77671f000426b4b587a874bcb0bf9b9b9b04644b057a4f3f8c01
-SIZE (gtkhx-0.9.3.tar.gz) = 562708
+MD5 (gtkhx-0.9.4.tar.gz) = d61d7dc2df66d934464e0bb8cd0fe45e
+SHA256 (gtkhx-0.9.4.tar.gz) = b6dc5f2c8e23a7e78bf81eee73f29878f028def7c1552cd83466abf274ae1db2
+SIZE (gtkhx-0.9.4.tar.gz) = 579966
diff --git a/net-p2p/gtkhx/files/patch-Makefile.in b/net-p2p/gtkhx/files/patch-Makefile.in
deleted file mode 100644
index ba5d9946c3d5..000000000000
--- a/net-p2p/gtkhx/files/patch-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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-intl::Makefile.in b/net-p2p/gtkhx/files/patch-intl::Makefile.in
deleted file mode 100644
index 053249b00b75..000000000000
--- a/net-p2p/gtkhx/files/patch-intl::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 62b3aa4cd2ef..000000000000
--- a/net-p2p/gtkhx/files/patch-plugins::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 4ae550855ddc..000000000000
--- a/net-p2p/gtkhx/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 61230086aadd..000000000000
--- a/net-p2p/gtkhx/files/patch-sounds::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 4dd3e26b3d1f..000000000000
--- a/net-p2p/gtkhx/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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@
diff --git a/net-p2p/gtkhx/files/patch-src::xfers.c b/net-p2p/gtkhx/files/patch-src::xfers.c
deleted file mode 100644
index a63102e158fa..000000000000
--- a/net-p2p/gtkhx/files/patch-src::xfers.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/xfers.c.orig	Fri Mar 22 16:26:04 2002
-+++ src/xfers.c	Tue Mar 26 17:39:53 2002
-@@ -611,7 +611,9 @@
- 				pthread_join(htxf->tid, &thread_retval);
- 			}
- #ifdef USE_IPV6
--			freeaddrinfo(htxf->listen_addr);
-+			if(htxf->listen_addr) {
-+				freeaddrinfo(htxf->listen_addr);
-+			}
- #endif
- 			g_free(htxf);
- 			if (nxfers > (i+1)) {
diff --git a/net-p2p/gtkhx/files/patch-src__files.c b/net-p2p/gtkhx/files/patch-src__files.c
new file mode 100644
index 000000000000..d7150d1539a2
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-src__files.c
@@ -0,0 +1,20 @@
+--- src/files.c.orig	Tue Apr  8 05:05:31 2003
++++ src/files.c	Sun Jan  6 01:52:06 2008
+@@ -1000,7 +1000,7 @@
+ 	gtk_hlist_clear(GTK_HLIST(files_list));
+ 
+ 	for (fh = cfl->fh; (guint32)((char *)fh - (char *)cfl->fh) < cfl->fhlen;
+-		 (char *)fh += fh->len + SIZEOF_HL_DATA_HDR) {
++		 fh = (char *)fh + fh->len + SIZEOF_HL_DATA_HDR) {
+ 		fh->fnlen = ntohl(fh->fnlen);
+ 		fh->len = ntohs(fh->len);
+ 		fh->fsize = ntohl(fh->fsize);
+@@ -1304,7 +1304,7 @@
+ 		return 0;
+ 
+ 	for (fh = cfl->fh; (guint32)((char *)fh - (char *)cfl->fh) < cfl->fhlen;
+-		 (char *)fh += fh->len + SIZEOF_HL_DATA_HDR) {
++		 fh = (char *)fh + fh->len + SIZEOF_HL_DATA_HDR) {
+ 		if ((int)fh->fnlen == len && !strncmp(fh->fname, ent, len))
+ 			return 1;
+ 	}
diff --git a/net-p2p/gtkhx/files/patch-src__hx.h b/net-p2p/gtkhx/files/patch-src__hx.h
new file mode 100644
index 000000000000..5a10948e68cc
--- /dev/null
+++ b/net-p2p/gtkhx/files/patch-src__hx.h
@@ -0,0 +1,13 @@
+--- src/hx.h.orig	Tue Apr  8 05:05:31 2003
++++ src/hx.h	Fri Jan 11 01:49:32 2008
+@@ -172,10 +172,6 @@
+ 
+ extern char **hxd_environ;
+ 
+-#if !defined(HAVE_INET_NTOA_R)
+-extern int inet_ntoa_r (struct in_addr in, char *buf, size_t buflen);
+-#endif
+-
+ #ifndef HAVE_LOCALTIME_R
+ extern struct tm *localtime_r (const time_t *t, struct tm *tm);
+ #endif