- Drop gettext-old dependency;

- fix with new neon;
- convert to GNOMENG.

4 files changed, 50 insertions, 9 deletions

diff --git a/www/encompass/Makefile b/www/encompass/Makefile
index 93037e3d0acf..d2e83e156a77 100644
--- a/www/encompass/Makefile
+++ b/www/encompass/Makefile
@@ -16,22 +16,18 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	msgfmt-old:${PORTSDIR}/devel/gettext-old
 LIB_DEPENDS=	neon.22:${PORTSDIR}/www/neon
 
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs gtkhtml
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		MSGFMT="${LOCALBASE}/bin/msgfmt-old" \
-		XGETTEXT="${LOCALBASE}/bin/xgettext-old"
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ENV=	OLD_PO_FILE_INPUT=1
 
-pre-patch:
+post-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 \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/www/encompass/files/patch-po::it.po b/www/encompass/files/patch-po::it.po
new file mode 100644
index 000000000000..a7b5dff64612
--- /dev/null
+++ b/www/encompass/files/patch-po::it.po
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- po/it.po	2002/09/25 06:29:46	1.1
++++ po/it.po	2002/09/25 06:30:15
+@@ -200,11 +200,6 @@
+ msgid "Go Back"
+ msgstr "Indietro"
+ 
+-#: src/toolbar.c:133
+-#, fuzzy
+-msgid "Forward"
+-msgstr "Avanti"
+-
+ #: src/toolbar.c:144
+ msgid "Stop loading"
+ msgstr "Arresta il caricamento"
diff --git a/www/encompass/files/patch-src::encompass.c b/www/encompass/files/patch-src::encompass.c
new file mode 100644
index 000000000000..07998950aab3
--- /dev/null
+++ b/www/encompass/files/patch-src::encompass.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/encompass.c	2002/09/25 06:35:35	1.1
++++ src/encompass.c	2002/09/25 06:35:46
+@@ -256,7 +256,7 @@
+   data_mtx = g_mutex_new();
+   gtk_mtx = g_mutex_new();
+   gdk_rgb_init ();
+-  sock_init();
++  ne_sock_init();
+ 	ne_debug_init (stdout, NE_DBG_SOCKET);
+ 
+   gnome_vfs_init();
diff --git a/www/encompass/files/patch-src::menu.c b/www/encompass/files/patch-src::menu.c
new file mode 100644
index 000000000000..d02bdd55eecf
--- /dev/null
+++ b/www/encompass/files/patch-src::menu.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/menu.c	2002/09/25 06:35:35	1.1
++++ src/menu.c	2002/09/25 06:35:50
+@@ -26,7 +26,7 @@
+   gnome_config_pop_prefix();
+   
+   gnome_vfs_shutdown();
+-  sock_exit();
++  ne_sock_exit();
+ 
+   gtk_main_quit();
+ }