Update pan to 0.13.0. Updates and bugfixes are too numerous to list here,

but most importantly, pan now uses GTK2 instead of GNOME for its widgets.

5 files changed, 58 insertions, 76 deletions

diff --git a/news/pan/Makefile b/news/pan/Makefile
index aa95e2f9156..e78dc0ea456 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,26 +1,34 @@
-# $NetBSD: Makefile,v 1.9 2002/09/23 23:56:28 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/25 04:58:44 rh Exp $
 #
 
-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
+DISTNAME=		pan-0.13.0
+CATEGORIES=		news
+MASTER_SITES=		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 Gnome
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://pan.rebelbase.com/
+COMMENT=		Newsreader for GTK2
 
 BUILD_USES_MSGFMT=	YES
 
+USE_PERL5=		build
+USE_X11=		YES
 USE_BUILDLINK2=		YES
-USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		LOCALEDIR="${PKGLOCALEDIR}"
 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/gnome-core/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 "../../mk/bsd.pkg.mk"
diff --git a/news/pan/PLIST b/news/pan/PLIST
index 92dbe3bdf66..6ca87e69665 100644
--- a/news/pan/PLIST
+++ b/news/pan/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/01 02:25:36 fredb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/25 04:58:44 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
@@ -32,4 +33,3 @@ ${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 903d809cbbd..0bcc37df89d 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/03/01 02:25:36 fredb Exp $
+$NetBSD: distinfo,v 1.5 2002/09/25 04:58:45 rh Exp $
 
-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 (pan-0.13.0.tar.bz2) = 4dc181be689545430da46b92b617235c79b2feb2
+Size (pan-0.13.0.tar.bz2) = 1681379 bytes
+SHA1 (patch-aa) = af92c7b190dbc68149063f5df1233550be4ff79e
 SHA1 (patch-ag) = 68d7be7a16bbfbf02f0df29c669140d49c5de35f
diff --git a/news/pan/patches/patch-aa b/news/pan/patches/patch-aa
index a4bded92514..828acfc4f4a 100644
--- a/news/pan/patches/patch-aa
+++ b/news/pan/patches/patch-aa
@@ -1,28 +1,43 @@
-$NetBSD: patch-aa,v 1.3 2002/03/01 02:25:36 fredb Exp $
+$NetBSD: patch-aa,v 1.4 2002/09/25 04:58:45 rh Exp $
 
---- configure.orig	Tue Dec  4 23:47:08 2001
+--- configure.orig	Sun Aug 18 11:58:03 2002
 +++ configure
-@@ -6387,12 +6387,12 @@
+@@ -6166,12 +6166,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    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
-@@ -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
+ 	      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
diff --git a/news/pan/patches/patch-ac b/news/pan/patches/patch-ac
deleted file mode 100644
index 0457c4983d3..00000000000
--- a/news/pan/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/03/01 02:25:37 fredb 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 ();
-