From 08f3a2e7d169f4d87fa78a7f63cd0135b25c9851 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 15 Apr 2003 10:28:45 +0000 Subject: Move gtk2-pan to pan directory. --- news/pan/Makefile | 32 ++++++++++++++++---------------- news/pan/PLIST | 7 +++++-- news/pan/distinfo | 11 +++++------ news/pan/patches/patch-aa | 37 ------------------------------------- news/pan/patches/patch-ac | 43 ------------------------------------------- news/pan/patches/patch-ag | 6 +++--- news/pan/patches/patch-ah | 26 ++++++++++++++++++++++++++ 7 files changed, 55 insertions(+), 107 deletions(-) delete mode 100644 news/pan/patches/patch-aa delete mode 100644 news/pan/patches/patch-ac create mode 100644 news/pan/patches/patch-ah (limited to 'news') diff --git a/news/pan/Makefile b/news/pan/Makefile index f7d8b986ab9..9d0875dc48e 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -1,30 +1,30 @@ -# $NetBSD: Makefile,v 1.18 2003/01/10 07:44:21 cjep Exp $ +# $NetBSD: Makefile,v 1.19 2003/04/15 10:28:45 wiz Exp $ # -DISTNAME= pan-0.11.4 -PKGREVISION= 2 -CATEGORIES= news gnome -MASTER_SITES= http://pan.rebelbase.com/download/releases/${DISTNAME:C/pan-//}/SOURCE/ -EXTRACT_SUFX= .tar.bz2 +DISTNAME= pan-0.13.4 +CATEGORIES= news +MASTER_SITES= http://pan.rebelbase.com/download/releases/${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 +DEPENDS+= gnome2-dirs>=1.0:../../misc/gnome2-dirs BUILD_USES_MSGFMT= YES +USE_PERL5= build USE_BUILDLINK2= YES USE_PKGLOCALEDIR= YES -USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ENV+= LOCALEDIR="${PKGLOCALEDIR}" - -.include "../../mk/bsd.prefs.mk" -.if ${OPSYS} != "SunOS" LIBS= -lcompat -.endif +.include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" -.include "../../x11/gnome-core/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink2.mk" +.include "../../net/gnet/buildlink2.mk" +.include "../../textproc/gtkspell/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../x11/gtk2/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/pan/PLIST b/news/pan/PLIST index 4871381972b..bfb352ac6df 100644 --- a/news/pan/PLIST +++ b/news/pan/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.5 2002/10/02 03:42:06 rh Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/04/15 10:28:45 wiz Exp $ bin/pan share/gnome/apps/Internet/pan.desktop +${PKGLOCALEDIR}/locale/am/LC_MESSAGES/pan.mo ${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 @@ -17,6 +19,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/pan.mo +${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/pan.mo @@ -28,7 +31,7 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/sp/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/pan.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/pan.mo +${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 b635ba1763d..3cc0935af01 100644 --- a/news/pan/distinfo +++ b/news/pan/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.8 2002/10/27 08:31:54 rh Exp $ +$NetBSD: distinfo,v 1.9 2003/04/15 10:28:45 wiz Exp $ -SHA1 (pan-0.11.4.tar.bz2) = 3ffd3fedd960637ce883a587619ae6e9dee3979e -Size (pan-0.11.4.tar.bz2) = 1629832 bytes -SHA1 (patch-aa) = f2c47a0f7b121b90f2078044b4182752f02b3655 -SHA1 (patch-ac) = f895add1fe570ce617da7715dcfc394bb687f4f4 -SHA1 (patch-ag) = 68d7be7a16bbfbf02f0df29c669140d49c5de35f +SHA1 (pan-0.13.4.tar.bz2) = d8e13268f89723796bfd36b07cce6b14ee81c724 +Size (pan-0.13.4.tar.bz2) = 1639281 bytes +SHA1 (patch-ag) = 4ba365c425f5f754346465d857178331ab47e307 +SHA1 (patch-ah) = 0d383f75c7f6f9ab8413cad65461362db66b57c3 diff --git a/news/pan/patches/patch-aa b/news/pan/patches/patch-aa deleted file mode 100644 index 67d4f55f2fe..00000000000 --- a/news/pan/patches/patch-aa +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2002/10/02 03:42:06 rh Exp $ - ---- configure.orig Mon Jul 15 04:21:08 2002 -+++ configure -@@ -4711,7 +4711,7 @@ fi - - - --ALL_LINGUAS="ca da de el en_GB es et fi fr ga gl hu it ja ko lt no nl pl pt pt_BR ru sk sl sp sr sv tr uk zh_CN" -+ALL_LINGUAS="ca da de el en_GB es et fi fr ga gl hu it ja ko lt no nl pl pt pt_BR ru sk sl sp sr sv uk zh_CN" - echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 - echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_stdc+set}" = set; then -@@ -6689,12 +6689,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} - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=${LOCALEDIR} - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - INSTOBJEXT=.mo -@@ -6964,7 +6964,7 @@ echo "${ECHO_T}found xgettext program is - # 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 deleted file mode 100644 index 9443534e071..00000000000 --- a/news/pan/patches/patch-ac +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2002/10/27 08:31:54 rh Exp $ - ---- pan/pan.c.orig Mon Jul 15 04:04:34 2002 -+++ pan/pan.c -@@ -43,6 +43,27 @@ - #include - #include - -+#ifdef __NetBSD__ -+#include -+ -+#ifdef _PTH_PTHREAD_H_ -+#include -+ -+/* -+ * Pth is non-preemptive, so we yield the processor periodically -+ */ -+ -+gint -+pth_nbschedule (gpointer data) -+{ -+ pthread_yield_np(); -+ -+ return TRUE; -+} -+#endif -+#endif -+ -+ - static gint save_session (GnomeClient * client, - gint phase, - GnomeSaveStyle save_style, -@@ -197,6 +218,10 @@ main (int argc, char *argv[]) - newsrc_import (s, newsrc_filename, newsrc_port_subscribed_only); - } - } -+ -+#ifdef _PTH_PTHREAD_H_ -+ gtk_timeout_add (200, pth_nbschedule, NULL); -+#endif - - gtk_main (); - diff --git a/news/pan/patches/patch-ag b/news/pan/patches/patch-ag index c4255b29a95..0a6a7196128 100644 --- a/news/pan/patches/patch-ag +++ b/news/pan/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2002/03/01 02:25:37 fredb Exp $ +$NetBSD: patch-ag,v 1.3 2003/04/15 10:28:46 wiz Exp $ ---- pan/text.c.orig Wed Feb 6 22:58:14 2002 +--- pan/text.c.orig Fri Sep 27 23:02:36 2002 +++ pan/text.c -@@ -21,6 +21,7 @@ +@@ -20,6 +20,7 @@ #include #include diff --git a/news/pan/patches/patch-ah b/news/pan/patches/patch-ah new file mode 100644 index 00000000000..f8d1d60f3f8 --- /dev/null +++ b/news/pan/patches/patch-ah @@ -0,0 +1,26 @@ +$NetBSD: patch-ah,v 1.1 2003/04/15 10:28:46 wiz Exp $ + +--- pan/sockets.c.orig Wed Feb 12 19:37:43 2003 ++++ pan/sockets.c Sun Mar 30 21:33:25 2003 +@@ -86,6 +86,9 @@ + int port) + { + PanSocket * sock; ++# ifdef SIGPIPE ++ struct sigaction sig; ++# endif + + /* sanity clause */ + g_return_val_if_fail (is_nonempty_string (server_name), NULL); +@@ -94,7 +97,10 @@ + + /* needed on Unix */ + # ifdef SIGPIPE +- sigignore (SIGPIPE); ++ sig.sa_handler = SIG_IGN; ++ sig.sa_flags = 0; ++ sigprocmask(0, NULL, &sig.sa_mask); ++ sigaction(SIGPIPE, &sig, NULL); + # endif + + /* create the socket */ -- cgit v1.2.3