Back out pan update and revert back to 0.11.2nb2. It appears that PTL2 is

too unstable to warrant a wholesale update from 0.11 (gnome) to 0.13 (gtk2)
pan-0.13.0 to be re-imported as gtk2-pan.

5 files changed, 79 insertions, 61 deletions

diff --git a/news/pan/Makefile b/news/pan/Makefile
index 74bc19baa54..dfbbe09a8f2 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,34 +1,26 @@
-# $NetBSD: Makefile,v 1.11 2002/09/25 05:58:45 rh Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/02 03:08:50 rh Exp $
 #
 
-DISTNAME=		pan-0.13.0
-CATEGORIES=		news
-MASTER_SITES=		http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	pan-0.11.2
+PKGREVISION=	2
+CATEGORIES=	news gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/pan/} \
+		http://pan.rebelbase.com/download/${DISTNAME:C/pan-//}/SOURCE/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		rh@netbsd.org
-HOMEPAGE=		http://pan.rebelbase.com/
-COMMENT=		Newsreader for GTK2
+MAINTAINER=	rh@netbsd.org
+HOMEPAGE=	http://pan.rebelbase.com/
+COMMENT=	Newsreader for Gnome
 
 BUILD_USES_MSGFMT=	YES
 
-USE_PERL5=		build
-USE_X11=		YES
-USE_BUILDLINK2=		YES
+USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		LOCALEDIR="${PKGLOCALEDIR}"
+CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
 LIBS=			-lcompat
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../textproc/gtkspell/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
-CC=			${PREFIX}/bin/ptlgcc
-.include "../../devel/ptl2/buildlink2.mk"
-.endif
-
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../x11/gnome-core/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/pan/PLIST b/news/pan/PLIST
index 6ca87e69665..9ef23163489 100644
--- a/news/pan/PLIST
+++ b/news/pan/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/25 04:58:44 rh Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/10/02 03:08:50 rh Exp $
 bin/pan
 share/gnome/apps/Internet/pan.desktop
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/pan.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/pan.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/pan.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/pan.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/pan.mo
@@ -33,3 +32,4 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/pan.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/pan.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/pan.mo
 share/pixmaps/pan.png
+share/pixmaps/pan_druid.xpm
diff --git a/news/pan/distinfo b/news/pan/distinfo
index 0bcc37df89d..c584d0a4766 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/09/25 04:58:45 rh Exp $
+$NetBSD: distinfo,v 1.6 2002/10/02 03:08:50 rh Exp $
 
-SHA1 (pan-0.13.0.tar.bz2) = 4dc181be689545430da46b92b617235c79b2feb2
-Size (pan-0.13.0.tar.bz2) = 1681379 bytes
-SHA1 (patch-aa) = af92c7b190dbc68149063f5df1233550be4ff79e
+SHA1 (pan-0.11.2.tar.bz2) = dc843dbaa850be6cc1746391af3951b85232a960
+Size (pan-0.11.2.tar.bz2) = 1544901 bytes
+SHA1 (patch-aa) = 29080471e76735bb6fbb1b24fbf45eb767cf41e1
+SHA1 (patch-ac) = 825d04b8bc60409313fa6f199b231160327d0957
 SHA1 (patch-ag) = 68d7be7a16bbfbf02f0df29c669140d49c5de35f
diff --git a/news/pan/patches/patch-aa b/news/pan/patches/patch-aa
index 828acfc4f4a..0f05cb45acc 100644
--- a/news/pan/patches/patch-aa
+++ b/news/pan/patches/patch-aa
@@ -1,43 +1,28 @@
-$NetBSD: patch-aa,v 1.4 2002/09/25 04:58:45 rh Exp $
+$NetBSD: patch-aa,v 1.5 2002/10/02 03:08:51 rh Exp $
 
---- configure.orig	Sun Aug 18 11:58:03 2002
+--- configure.orig	Tue Dec  4 23:47:08 2001
 +++ configure
-@@ -6166,12 +6166,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6387,12 +6387,12 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    CATOBJEXT=.gmo
--	         DATADIRNAME=share
-+	         DATADIRNAME=${LOCALEDIR}
+-		   DATADIRNAME=share
++		   DATADIRNAME=${LOCALEDIR}
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
  CATOBJEXT=.mo
--	         DATADIRNAME=lib
-+	         DATADIRNAME=${LOCALEDIR}
+-		   DATADIRNAME=lib
++		   DATADIRNAME=${LOCALEDIR}
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	      INSTOBJEXT=.mo
-@@ -6918,20 +6918,20 @@ fi
-         echo "$as_me:$LINENO: checking for gtkspell-2.0 = 2.0.0" >&5
- echo $ECHO_N "checking for gtkspell-2.0 = 2.0.0... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "gtkspell-2.0 = 2.0.0" ; then
-+        if $PKG_CONFIG --exists "gtkspell-2.0 >= 2.0.0" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking GTKSPELL_CFLAGS" >&5
- echo $ECHO_N "checking GTKSPELL_CFLAGS... $ECHO_C" >&6
--            GTKSPELL_CFLAGS=`$PKG_CONFIG --cflags "gtkspell-2.0 = 2.0.0"`
-+            GTKSPELL_CFLAGS=`$PKG_CONFIG --cflags "gtkspell-2.0 >= 2.0.0"`
-             echo "$as_me:$LINENO: result: $GTKSPELL_CFLAGS" >&5
- echo "${ECHO_T}$GTKSPELL_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking GTKSPELL_LIBS" >&5
- echo $ECHO_N "checking GTKSPELL_LIBS... $ECHO_C" >&6
--            GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell-2.0 = 2.0.0"`
-+            GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell-2.0 >= 2.0.0"`
-             echo "$as_me:$LINENO: result: $GTKSPELL_LIBS" >&5
- echo "${ECHO_T}$GTKSPELL_LIBS" >&6
-         else
+ 		INSTOBJEXT=.mo
+@@ -6659,7 +6659,7 @@
+       # We need to process the po/ directory.
+       POSUB=po
+     else
+-      DATADIRNAME=share
++      DATADIRNAME=${LOCALEDIR}
+       nls_cv_header_intl=intl/libintl.h
+       nls_cv_header_libgt=intl/libgettext.h
+     fi
diff --git a/news/pan/patches/patch-ac b/news/pan/patches/patch-ac
new file mode 100644
index 00000000000..da20c3f5786
--- /dev/null
+++ b/news/pan/patches/patch-ac
@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.5 2002/10/02 03:08:51 rh Exp $
+
+--- pan/pan.c.orig	Fri Nov  9 10:53:07 2001
++++ pan/pan.c
+@@ -42,6 +42,24 @@
+ #include <pan/thread-watch.h>
+ #include <pan/util.h>
+ 
++#ifdef __NetBSD__
++#include <gtk/gtk.h>
++#include <pthread.h>
++
++/*
++ * NetBSD uses non-preemptive pth, so we yield the processor periodically
++ */
++
++gint
++pth_nbschedule (gpointer data)
++{
++	pthread_yield_np();
++
++	return TRUE;
++}
++#endif
++
++
+ static gint save_session (GnomeClient        * client,
+ 			  gint                 phase,
+ 			  GnomeSaveStyle       save_style,
+@@ -196,6 +214,10 @@
+ 				newsrc_import (s, newsrc_filename, newsrc_port_subscribed_only);
+ 		}
+ 	}
++
++#ifdef __NetBSD__
++	gtk_timeout_add (200, pth_nbschedule, NULL);
++#endif
+ 
+ 	gtk_main ();
+