6 files changed, 49 insertions, 12 deletions

diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 5c13ee234466..5c20dfa13d6e 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gtkhtml
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gtkhtml
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
@@ -18,6 +19,7 @@ LIB_DEPENDS=	glibwww.1:${PORTSDIR}/www/glibwww \
 		gal.19:${PORTSDIR}/x11-toolkits/gal \
 		ghttp.1:${PORTSDIR}/www/libghttp
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMECTRL=	yes
@@ -25,13 +27,13 @@ INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gconf=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LIBS="-L${LOCALBASE}/lib -lgnuregex"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo
index 5c69f43fd746..3ab24d7437bb 100644
--- a/www/libgtkhtml/distinfo
+++ b/www/libgtkhtml/distinfo
@@ -1 +1 @@
-MD5 (gtkhtml-1.0.1.tar.gz) = 7cc1be71408d3cfe17e9fb7f2709dd17
+MD5 (gnome/gtkhtml-1.0.2.tar.bz2) = 2220ffd7834c52177708599579531c23
diff --git a/www/libgtkhtml/files/patch-po::Makefile.in.in b/www/libgtkhtml/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..42f683d3e699
--- /dev/null
+++ b/www/libgtkhtml/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2002/03/25 14:35:10	1.1
++++ po/Makefile.in.in	2002/03/25 14:35:35
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/www/libgtkhtml/files/patch-src::htmlsearch.h b/www/libgtkhtml/files/patch-src::htmlsearch.h
new file mode 100644
index 000000000000..f4a96db5ce60
--- /dev/null
+++ b/www/libgtkhtml/files/patch-src::htmlsearch.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/htmlsearch.h	2002/03/25 14:12:56	1.1
++++ src/htmlsearch.h	2002/03/25 14:13:16
+@@ -24,7 +24,7 @@
+ #define _HTML_SEARCH_H_
+ 
+ #include <sys/types.h>
+-#include <regex.h>
++#include <gnuregex.h>
+ #include "htmltypes.h"
+ 
+ struct _HTMLSearch {
diff --git a/www/libgtkhtml/files/patch-src::htmltext.c b/www/libgtkhtml/files/patch-src::htmltext.c
new file mode 100644
index 000000000000..0cfe711701ba
--- /dev/null
+++ b/www/libgtkhtml/files/patch-src::htmltext.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/htmltext.c	2002/03/25 14:12:56	1.1
++++ src/htmltext.c	2002/03/25 14:13:10
+@@ -25,7 +25,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/types.h>
+-#include <regex.h>
++#include <gnuregex.h>
+ #include <gal/widgets/e-unicode.h>
+ 
+ #include "htmltext.h"
diff --git a/www/libgtkhtml/pkg-plist b/www/libgtkhtml/pkg-plist
index d7ae99d37ed7..68c688d2eaa5 100644
--- a/www/libgtkhtml/pkg-plist
+++ b/www/libgtkhtml/pkg-plist
@@ -143,14 +143,6 @@ share/gnome/html/gtkhtml-sections.txt
 share/gnome/html/gtkhtml.hierarchy
 share/gnome/html/gtkhtml.sgml
 share/gnome/html/gtkhtml.types
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-enums.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-stream.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-types.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtmlembedded.html
-share/gnome/html/gtkhtml/gtkhtml.html
-share/gnome/html/gtkhtml/index.html
-share/gnome/html/gtkhtml/license.html
-share/gnome/html/gtkhtml/r27.html
 share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
 share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
 share/gnome/ui/GNOME_GtkHTML_Editor.xml
@@ -160,6 +152,7 @@ share/locale/da/LC_MESSAGES/gtkhtml.mo
 share/locale/de/LC_MESSAGES/gtkhtml.mo
 share/locale/el/LC_MESSAGES/gtkhtml.mo
 share/locale/es/LC_MESSAGES/gtkhtml.mo
+share/locale/eu/LC_MESSAGES/gtkhtml.mo
 share/locale/fi/LC_MESSAGES/gtkhtml.mo
 share/locale/fr/LC_MESSAGES/gtkhtml.mo
 share/locale/gl/LC_MESSAGES/gtkhtml.mo