5 files changed, 37 insertions, 21 deletions

diff --git a/news/pan2/Makefile b/news/pan2/Makefile
index 57ca28fb9f83..c684ca9e0945 100644
--- a/news/pan2/Makefile
+++ b/news/pan2/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	pan
-PORTVERSION=	0.7.6
+PORTVERSION=	0.8.0
 CATEGORIES=	news gnome
-MASTER_SITES=	ftp://source.rebelbase.com/pub/pan/${PORTVERSION}/ \
-		ftp://source.rebelbase.com/pub/pan/obsolete/
+MASTER_SITES=	ftp://source.rebelbase.com/pub/pan/${PORTVERSION}/
 
-MAINTAINER=	jedgar@FreeBSD.org
+MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
 
@@ -20,21 +19,12 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-x
-CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Must have FreeBSD-3.0 or greater due to"
-	@${ECHO} "the use of the pthread library."
-	@${ECHO}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/news/pan2/distinfo b/news/pan2/distinfo
index 08338f73ae0c..7b8a4da30fc4 100644
--- a/news/pan2/distinfo
+++ b/news/pan2/distinfo
@@ -1 +1 @@
-MD5 (pan-0.7.6.tar.bz2) = 86e78384bc6e696f74de5ab5a1cebe1e
+MD5 (pan-0.8.0.tar.bz2) = e67739a6b041e41c06415e7230202321
diff --git a/news/pan2/files/patch-ag b/news/pan2/files/patch-ag
new file mode 100644
index 000000000000..a66ebdeae8fe
--- /dev/null
+++ b/news/pan2/files/patch-ag
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon May  1 22:44:54 2000
++++ Makefile.in	Wed May  3 14:44:53 2000
+@@ -110,7 +110,7 @@
+ 
+ EXTRA_DIST = autogen.sh CREDITS ChangeLog pan.desktop pan.spec pan.png
+ 
+-Productivitydir = $(datadir)/gnome/apps/Internet
++Productivitydir = $(datadir)/apps/Internet
+ Productivity_DATA = pan.desktop
+ 
+ icon_DATA = pan.png
diff --git a/news/pan2/files/patch-ah b/news/pan2/files/patch-ah
new file mode 100644
index 000000000000..7cef68e0faa7
--- /dev/null
+++ b/news/pan2/files/patch-ah
@@ -0,0 +1,11 @@
+--- pan/Makefile.in.orig	Tue May  9 13:27:56 2000
++++ pan/Makefile.in	Tue May 16 17:44:07 2000
+@@ -116,7 +116,7 @@
+ 
+ SUBDIRS = dialogs xpm
+ 
+-INCLUDES =  	-I$(top_srcdir) 					-I$(top_srcdir)/uulib 					-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DLOCALEDIR=\"$(datadir)/locale\" 			$(GNOME_INCLUDEDIR) 					$(GLIB_CFLAGS) 						@CPPFLAGS@
++INCLUDES =  	-I$(top_srcdir) 					-I$(top_srcdir)/uulib 					-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" 		-DLOCALEDIR=\"$(prefix)/share/locale\" 			$(GNOME_INCLUDEDIR) 					$(GLIB_CFLAGS) 						@CPPFLAGS@
+ 
+ 
+ bin_PROGRAMS = pan
diff --git a/news/pan2/pkg-plist b/news/pan2/pkg-plist
index 8f91ce3d1834..5395f76e62c8 100644
--- a/news/pan2/pkg-plist
+++ b/news/pan2/pkg-plist
@@ -1,13 +1,17 @@
 bin/pan
+share/gnome/apps/Internet/pan.desktop
+share/gnome/pixmaps/pan.png
+share/gnome/pixmaps/pan_druid.xpm
 share/locale/da/LC_MESSAGES/pan.mo
 share/locale/de/LC_MESSAGES/pan.mo
 share/locale/es/LC_MESSAGES/pan.mo
+share/locale/fi/LC_MESSAGES/pan.mo
 share/locale/fr/LC_MESSAGES/pan.mo
 share/locale/it/LC_MESSAGES/pan.mo
 share/locale/ja/LC_MESSAGES/pan.mo
 share/locale/ko/LC_MESSAGES/pan.mo
 share/locale/no/LC_MESSAGES/pan.mo
 share/locale/pl/LC_MESSAGES/pan.mo
-share/locale/se/LC_MESSAGES/pan.mo
+share/locale/ru/LC_MESSAGES/pan.mo
 share/locale/sr/LC_MESSAGES/pan.mo
-share/gnome/apps/Internet/pan.desktop
+share/locale/sv/LC_MESSAGES/pan.mo