* Update to 0.13.94

* Add a patch to prevent a crash under -CURRENT [1]
* Convert to new GNOME infrastructure

Submitted by:	Pav Lucistnik <pav@oook.cz> [1]

5 files changed, 20 insertions, 37 deletions

diff --git a/news/pan2/Makefile b/news/pan2/Makefile
index bd2504872ab8..3999c006f2d9 100644
--- a/news/pan2/Makefile
+++ b/news/pan2/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	pan2
-PORTVERSION=	0.13.93
+PORTVERSION=	0.13.94
 CATEGORIES=	news gnome
 MASTER_SITES=	http://pan.rebelbase.com/download/releases/${PORTVERSION}/SOURCE/ \
 		http://pan.rebelbase.com/download/obsolete/${PORTVERSION}/SOURCE/ \
 		${MASTER_SITE_GNOME}
-
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/0.13
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
@@ -20,18 +19,16 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Threaded GNOME 2 newsreader based on Agent for Windows
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		gnet-glib2.7:${PORTSDIR}/net/gnet-glib2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gnometarget libxml2
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -lgnuregex -lcompat"
 CONFIGURE_ARGS=	--enable-html
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/news/pan2/distinfo b/news/pan2/distinfo
index 0e83690e8e2f..398125a15301 100644
--- a/news/pan2/distinfo
+++ b/news/pan2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pan-0.13.93.tar.bz2) = 87a82f1166a56eaaa99b0fd953928d56
+MD5 (gnome2/pan-0.13.94.tar.bz2) = cf3954dcd4aa47efce6d4e88eb430626
diff --git a/news/pan2/files/patch-Makefile.in b/news/pan2/files/patch-Makefile.in
index 8354b60acb19..80edafd14ff3 100644
--- a/news/pan2/files/patch-Makefile.in
+++ b/news/pan2/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Thu Jan 16 22:33:02 2003
-+++ Makefile.in	Thu Jan 16 22:33:48 2003
-@@ -110,7 +110,7 @@
- XML_CFLAGS = @XML_CFLAGS@
- XML_LIBS = @XML_LIBS@
- 
+--- Makefile.in.orig	Mon Apr 21 20:48:52 2003
++++ Makefile.in	Mon Apr 21 20:49:25 2003
+@@ -128,7 +128,7 @@
+ am__include = @am__include@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
 -SUBDIRS = po gmime pan docs tests
 +SUBDIRS = po gmime pan docs
  
diff --git a/news/pan2/files/patch-pan_base_group.c b/news/pan2/files/patch-pan_base_group.c
new file mode 100644
index 000000000000..02880cdbbc2a
--- /dev/null
+++ b/news/pan2/files/patch-pan_base_group.c
@@ -0,0 +1,11 @@
+--- pan/base/group.c.orig	Mon Apr 21 20:52:11 2003
++++ pan/base/group.c	Mon Apr 21 20:52:32 2003
+@@ -206,7 +206,7 @@
+ groups_set_subscribed (Group ** groups, gint qty, gboolean subscribed)
+ {
+ 	Group ** changed;
+-	Server * server;
++	Server * server = NULL;
+ 	const ServerGroupsType type = SERVER_GROUPS_SUBSCRIBED|SERVER_GROUPS_UNSUBSCRIBED;
+ 	int changed_qty = 0;
+ 	int i;
diff --git a/news/pan2/files/patch-pan_sockets.c b/news/pan2/files/patch-pan_sockets.c
deleted file mode 100644
index 16fe3c356dc7..000000000000
--- a/news/pan2/files/patch-pan_sockets.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- pan/sockets.c.orig	Thu Feb 27 13:15:49 2003
-+++ pan/sockets.c	Thu Feb 27 13:24:02 2003
-@@ -86,6 +86,9 @@
-                 int              port)
- {
- 	PanSocket * sock;
-+#ifdef SIGPIPE
-+	struct sigaction sv;
-+#endif
- 
- 	/* sanity clause */
- 	g_return_val_if_fail (is_nonempty_string (server_name), NULL);
-@@ -94,7 +97,11 @@
- 
- 	/* needed on Unix */
- #	ifdef SIGPIPE
--	sigignore (SIGPIPE);
-+	memset(&sv, 0, sizeof(sv));
-+	sv.sa_handler = SIG_IGN;
-+	sigemptyset(&sv.sa_mask);
-+	sv.sa_flags = SA_RESTART;
-+	sigaction(SIGPIPE, &sv, NULL);
- #	endif
- 
- 	/* create the socket */