Update to 0.3.0.

8 files changed, 54 insertions, 81 deletions

diff --git a/www/encompass/Makefile b/www/encompass/Makefile
index d972d42b47d8..a54febcd4279 100644
--- a/www/encompass/Makefile
+++ b/www/encompass/Makefile
@@ -6,23 +6,30 @@
 #
 
 PORTNAME=	encompass
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	www gnome
-MASTER_SITES=	http://www.geocities.com/lordzephyroth/
+MASTER_SITES=	ftp://ftp.one.net/pub/users/dobez/
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		gtkhtml.5:${PORTSDIR}/www/gtkhtml \
+LIB_DEPENDS=	gtkhtml.5:${PORTSDIR}/www/gtkhtml \
 		glibwww.1:${PORTSDIR}/www/glibwww \
-		gconf-1.1:${PORTSDIR}/devel/gconf
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+		gconf-1.1:${PORTSDIR}/devel/gconf \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		gnomeprint.13:${PORTSDIR}/print/gnomeprint
+RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
 
+USE_GNOME=	yes
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAKE_ENV=	MKDIR="${MKDIR}"
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|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/distinfo b/www/encompass/distinfo
index 640ddd21aab7..e67895777d23 100644
--- a/www/encompass/distinfo
+++ b/www/encompass/distinfo
@@ -1 +1 @@
-MD5 (encompass-0.2.0.tar.gz) = 1b1bf742f7a0a62d17d226c11015e6be
+MD5 (encompass-0.3.0.tar.gz) = 7b2efe71c4ec14395888a7d7e65eff6f
diff --git a/www/encompass/files/patch-aa b/www/encompass/files/patch-aa
deleted file mode 100644
index 1e610d778517..000000000000
--- a/www/encompass/files/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
---- Makefile.orig	Fri Aug 25 09:40:37 2000
-+++ Makefile	Fri Sep 15 08:56:07 2000
-@@ -1,11 +1,11 @@
--CC = gcc
-+#CC = gcc
- RM = rm -rf
--CFLAGS = -g `gnome-config --cflags gtk gnome gnomeui gtkhtml glibwww oaf` \
--  `libwww-config --cflags`
-+CFLAGS += `$(X11BASE)/bin/gnome-config --cflags gtk gnome gnomeui gtkhtml glibwww oaf` \
-+  `$(LOCALBASE)/bin/libwww-config --cflags`
- LDFLAGS = 
--LIBS = `gnome-config --libs gtk gnome gnomeui gtkhtml glibwww oaf` \
--  `libwww-config --libs`
--prefix = `gnome-config --prefix`
-+LIBS = `$(X11BASE)/bin/gnome-config --libs gtk gnome gnomeui gtkhtml glibwww oaf` \
-+  `$(LOCALBASE)/bin/libwww-config --libs`
-+prefix = $(PREFIX)
- INSTALL = $(prefix)/bin/install -c
- exec_prefix = ${prefix}
- bindir = $(exec_prefix)/bin
-@@ -18,13 +18,16 @@
- all: encompass
- 
- install: all
--	strip encompass
--	$(INSTALL) encompass $(bindir)/encompass
--	cp -rf ../encompass.desktop $(prefix)/share/gnome/apps/Internet/encompass.desktop
--	cp -rf ../pixmaps/ $(prefix)/share/
--	cp -rf ../help/ $(prefix)/share/gnome/
--	cp -rf ../sounds/ $(prefix)/share/
--	cp -rf ../encompass.soundlist /etc/sound/events/
-+	$(BSD_INSTALL_PROGRAM) encompass $(bindir)/encompass
-+	$(BSD_INSTALL_DATA) ../encompass.desktop $(prefix)/share/gnome/apps/Internet/encompass.desktop
-+	$(MKDIR) $(prefix)/share/gnome/pixmaps/encompass
-+	$(BSD_INSTALL_DATA) ../pixmaps/encompass.png $(prefix)/share/gnome/pixmaps/
-+	$(BSD_INSTALL_DATA) ../pixmaps/encompass/* $(prefix)/share/gnome/pixmaps/encompass/
-+	$(MKDIR) $(prefix)/share/gnome/help/encompass/C
-+	$(BSD_INSTALL_DATA) ../help/encompass/C/* $(prefix)/share/gnome/help/encompass/C/
-+	$(MKDIR) $(prefix)/share/gnome/sounds/encompass
-+	$(BSD_INSTALL_DATA) ../sounds/encompass/* $(prefix)/share/gnome/sounds/encompass/
-+	$(BSD_INSTALL_DATA) ../encompass.soundlist $(prefix)/etc/sound/events/
- 
- uninstall:
- 	$(RM) $(bindir)/encompass \
diff --git a/www/encompass/files/patch-ab b/www/encompass/files/patch-ab
deleted file mode 100644
index 9db672dcfe49..000000000000
--- a/www/encompass/files/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
---- config.h.orig	Fri Aug 25 09:40:37 2000
-+++ config.h	Fri Sep 15 08:57:40 2000
-@@ -6,6 +6,9 @@
- 
- #include <sys/stat.h>
- #include <netdb.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- 
- #include <libgnomeprint/gnome-print.h>
-@@ -24,7 +27,7 @@
- #include <WWWStream.h>
- #include <WWWInit.h>
- 
--#include <glibwww2/glibwww.h>
-+#include <glibwww/glibwww.h>
- 
- #include "html.h"
- #include "menu.h"
diff --git a/www/encompass/files/patch-ac b/www/encompass/files/patch-ac
new file mode 100644
index 000000000000..d25f13f441b6
--- /dev/null
+++ b/www/encompass/files/patch-ac
@@ -0,0 +1,11 @@
+--- src/Makefile.in	2000/12/01 14:14:28	1.1
++++ src/Makefile.in	2000/12/01 14:15:24
+@@ -117,7 +117,7 @@
+ gnomedatadir = @gnomedatadir@
+ l = @l@
+ 
+-INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	-I/usr/include/w3c-libwww
++INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	$(LIBWWW_CFLAGS)
+ 
+ 
+ bin_PROGRAMS = encompass
diff --git a/www/encompass/files/patch-ad b/www/encompass/files/patch-ad
new file mode 100644
index 000000000000..608c52c155df
--- /dev/null
+++ b/www/encompass/files/patch-ad
@@ -0,0 +1,10 @@
+--- config.h.in	2000/12/01 14:19:23	1.1
++++ config.h.in	2000/12/01 14:19:33
+@@ -136,7 +136,6 @@
+ #undef HAVE_UNISTD_H
+ 
+ /* Define if you have the <w3c-libwww/WWWSSL.h> header file.  */
+-#undef HAVE_W3C_LIBWWW_WWWSSL_H
+ 
+ /* Define if you have the i library (-li).  */
+ #undef HAVE_LIBI
diff --git a/www/encompass/files/patch-ae b/www/encompass/files/patch-ae
new file mode 100644
index 000000000000..c56a9cd0bb47
--- /dev/null
+++ b/www/encompass/files/patch-ae
@@ -0,0 +1,11 @@
+--- Makefile.in	2000/12/01 14:27:47	1.1
++++ Makefile.in	2000/12/01 14:28:02
+@@ -122,7 +122,7 @@
+ pixmapdir = $(gnomedatadir)/pixmaps
+ pixmap_DATA = encompass.png
+ 
+-desktopdir = $(gnomedatadir)/gnome/apps/Internet
++desktopdir = $(gnomedatadir)/apps/Internet
+ desktop_DATA = encompass.desktop
+ 
+ soundlistdir = $(sysconfdir)/sound/events
diff --git a/www/encompass/pkg-plist b/www/encompass/pkg-plist
index 15b079b3dba3..bc99f0c308db 100644
--- a/www/encompass/pkg-plist
+++ b/www/encompass/pkg-plist
@@ -1,15 +1,14 @@
 bin/encompass
 etc/sound/events/encompass.soundlist
 share/gnome/apps/Internet/encompass.desktop
-share/gnome/help/encompass/C/docbook.css
-share/gnome/help/encompass/C/index.html
-share/gnome/help/encompass/C/topic.dat
 share/gnome/pixmaps/encompass.png
 share/gnome/pixmaps/encompass/32.png
 share/gnome/pixmaps/encompass/bookmarks.png
+share/gnome/pixmaps/encompass/encompass-logo.jpg
+share/gnome/pixmaps/encompass/url.png
 share/gnome/sounds/encompass/clicked.wav
 share/gnome/sounds/encompass/urldone.wav
+share/locale/de/LC_MESSAGES/encompass.mo
+share/locale/ru/LC_MESSAGES/encompass.mo
 @dirrm share/gnome/sounds/encompass
 @dirrm share/gnome/pixmaps/encompass
-@dirrm share/gnome/help/encompass/C
-@dirrm share/gnome/help/encompass