From owner-freebsd-gnome Tue Oct 15 5: 9:44 2002 Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B10937B401 for ; Tue, 15 Oct 2002 05:09:39 -0700 (PDT) Received: from httpd.terions.de (static62-99-146-055.adsl.inode.at [62.99.146.55]) by mx1.FreeBSD.org (Postfix) with SMTP id 302A243EAC for ; Tue, 15 Oct 2002 05:09:35 -0700 (PDT) (envelope-from martin.klaffenboeck@gmx.at) Received: (qmail 27582 invoked from network); 15 Oct 2002 12:11:38 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by 127.0.0.1 with SMTP; 15 Oct 2002 12:11:38 -0000 Subject: Re: Pan 0.13.1 From: Martin =?ISO-8859-1?Q?Klaffenb=F6ck?= To: Joe Marcus Clarke Cc: gnome@freebsd.org In-Reply-To: <1034683243.426.9.camel@martin> References: <1034683243.426.9.camel@martin> Content-Type: multipart/mixed; boundary="=-SZhwyidKQK1Ibi/L2+qk" Organization: Message-Id: <1034683898.426.16.camel@martin> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.1.1 (Preview Release) Date: 15 Oct 2002 14:11:38 +0200 Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-SZhwyidKQK1Ibi/L2+qk Content-Type: text/plain; charset=ISO8859-1 Content-Transfer-Encoding: 8bit Am Di, 2002-10-15 um 14.00 schrieb Martin Klaffenböck: > Hi Joe, > > I hope I'm not to late, I was glad that I could do some work for you. > > Here is a patch for the pan2 port, it's updatet from 0.13.0 to 0.13.1. > (It works here with 'patch < pan2.patch' in the /usr/ports/news > directory.) There seems to be something wrong, the patch 'patch < pan2.patch' works, but there are some troubles: ===> Applying FreeBSD patches for pan2-0.13.1 I can't seem to find a patch in there anywhere. I deleted files/patch-Makefile because not a Makefile will be patched, it's a Makefile.in. So I created a new file: files/patch-Makefile.in But my diff didnt get that..? How do I correctly create a diff for a whole port, where files are deleted and other files come new? I tryed 'diff -Nur pan2.orig pan2' What should I do correctly? So for this time I'll send you a shell archive for my pan2 attachment, so dont overwrite your existing pan, you cannot diff anymore. Martin -- Martin Klaffenböck --=-SZhwyidKQK1Ibi/L2+qk Content-Disposition: attachment; filename=pan2.sh Content-Type: text/x-sh; name=pan2.sh; charset=ISO8859-1 Content-Transfer-Encoding: 7bit # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # pan2 # pan2/files # pan2/files/patch-configure # pan2/files/patch-pan::filters::filter-phrase.h # pan2/files/patch-Makefile.in # pan2/Makefile # pan2/distinfo # pan2/pkg-comment # pan2/pkg-descr # pan2/pkg-plist # echo c - pan2 mkdir -p pan2 > /dev/null 2>&1 echo c - pan2/files mkdir -p pan2/files > /dev/null 2>&1 echo x - pan2/files/patch-configure sed 's/^X//' >pan2/files/patch-configure << 'END-of-pan2/files/patch-configure' X--- configure.orig Tue Oct 15 13:38:05 2002 X+++ configure Tue Oct 15 13:38:05 2002 X@@ -5419,7 +5419,7 @@ X echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6 X GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0.4 X gobject-2.0 >= 2.0.4 X- gthread-2.0 >= 2.0.4"` X+ gthread-2.0 >= 2.0.4" | sed -e 's|-Wl,--export-dynamic||g'` X echo "$as_me:5423: result: $GLIB_LIBS" >&5 X echo "${ECHO_T}$GLIB_LIBS" >&6 X else X@@ -5518,7 +5518,7 @@ X X echo "$as_me:5519: checking GTK_LIBS" >&5 X echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 X- GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0.5"` X+ GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0.5" | sed -e 's|-Wl,--export-dynamic||g'` X echo "$as_me:5522: result: $GTK_LIBS" >&5 X echo "${ECHO_T}$GTK_LIBS" >&6 X else X@@ -5611,7 +5611,7 @@ X X echo "$as_me:5612: checking XML_LIBS" >&5 X echo $ECHO_N "checking XML_LIBS... $ECHO_C" >&6 X- XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.4.22"` X+ XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.4.22" | sed -e 's|-Wl,--export-dynamic||g'` X echo "$as_me:5615: result: $XML_LIBS" >&5 X echo "${ECHO_T}$XML_LIBS" >&6 X else X@@ -5715,7 +5715,7 @@ X X echo "$as_me:5716: checking GTKSPELL_LIBS" >&5 X echo $ECHO_N "checking GTKSPELL_LIBS... $ECHO_C" >&6 X- GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell-2.0 >= 2.0.2"` X+ GTKSPELL_LIBS=`$PKG_CONFIG --libs "gtkspell-2.0 >= 2.0.2" | sed -e 's|-Wl,--export-dynamic||g'` X echo "$as_me:5719: result: $GTKSPELL_LIBS" >&5 X echo "${ECHO_T}$GTKSPELL_LIBS" >&6 X else END-of-pan2/files/patch-configure echo x - pan2/files/patch-pan::filters::filter-phrase.h sed 's/^X//' >pan2/files/patch-pan::filters::filter-phrase.h << 'END-of-pan2/files/patch-pan::filters::filter-phrase.h' X X$FreeBSD: ports/news/pan2/files/patch-pan::filters::filter-phrase.h,v 1.2 2001/11/13 11:16:30 sobomax Exp $ X X--- pan/filters/filter-phrase.h.orig Thu Oct 25 18:49:53 2001 X+++ pan/filters/filter-phrase.h Tue Nov 13 12:33:06 2001 X@@ -25,7 +25,7 @@ X #define __FILTER_PHRASE_H__ X X #include X-#include X+#include X X #include X END-of-pan2/files/patch-pan::filters::filter-phrase.h echo x - pan2/files/patch-Makefile.in sed 's/^X//' >pan2/files/patch-Makefile.in << 'END-of-pan2/files/patch-Makefile.in' X--- Makefile.in.orig Tue Oct 15 13:26:30 2002 X+++ Makefile.in Tue Oct 15 13:26:49 2002 X@@ -107,7 +107,7 @@ X XML_CFLAGS = @XML_CFLAGS@ X XML_LIBS = @XML_LIBS@ X X-SUBDIRS = po gmime pan docs tests X+SUBDIRS = po gmime pan docs X X DESKTOP_IN_FILES = pan.desktop.in X DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop) END-of-pan2/files/patch-Makefile.in echo x - pan2/Makefile sed 's/^X//' >pan2/Makefile << 'END-of-pan2/Makefile' X# New ports collection makefile for: pan2 X# Date created: 19 August 2002 X# Whom: Joe Marcus Clarke X# X# $FreeBSD: ports/news/pan2/Makefile,v 1.64 2002/09/20 17:07:11 marcus Exp $ X# X XPORTNAME= pan2 XPORTVERSION= 0.13.1 XCATEGORIES= news gnome XMASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/SOURCE/ \ X http://pan.rebelbase.com/download/obsolete/${PORTVERSION}/SOURCE/ \ X ${MASTER_SITE_GNOME} X XMASTER_SITE_SUBDIR= sources/pan/0.13 XDISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} XDIST_SUBDIR= gnome2 X XMAINTAINER= gnome@FreeBSD.org X XLIB_DEPENDS= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 \ X xml2.5:${PORTSDIR}/textproc/libxml2 X XUSE_BZIP2= yes XUSE_X_PREFIX= yes XUSE_GMAKE= yes XUSE_GNOMENG= yes XUSE_GNOME= gnomeprefix gnomehack XUSE_LIBTOOL= yes XCONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ X LIBS="-L${LOCALBASE}/lib -lgnuregex -lcompat" XCONFIGURE_ARGS= --enable-html XCONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} X Xpost-patch: X @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ X s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure X X.include END-of-pan2/Makefile echo x - pan2/distinfo sed 's/^X//' >pan2/distinfo << 'END-of-pan2/distinfo' XMD5 (gnome2/pan-0.13.1.tar.bz2) = 7c46a27d30fc3f83ada9efd0d2df7509 END-of-pan2/distinfo echo x - pan2/pkg-comment sed 's/^X//' >pan2/pkg-comment << 'END-of-pan2/pkg-comment' XThreaded GNOME 2 newsreader based on Agent for Windows END-of-pan2/pkg-comment echo x - pan2/pkg-descr sed 's/^X//' >pan2/pkg-descr << 'END-of-pan2/pkg-descr' XA powerful and easy to use newsreader for GNOME 2. X XPan has many features for easy reading and posting, displaying Xand saving attachments, and offline newsreading. X XWWW: http://pan.rebelbase.com/ END-of-pan2/pkg-descr echo x - pan2/pkg-plist sed 's/^X//' >pan2/pkg-plist << 'END-of-pan2/pkg-plist' Xbin/pan Xshare/gnome/apps/Internet/pan.desktop Xshare/gnome/pixmaps/pan.png Xshare/locale/ca/LC_MESSAGES/pan.mo Xshare/locale/cs/LC_MESSAGES/pan.mo Xshare/locale/da/LC_MESSAGES/pan.mo Xshare/locale/de/LC_MESSAGES/pan.mo Xshare/locale/el/LC_MESSAGES/pan.mo Xshare/locale/en_GB/LC_MESSAGES/pan.mo Xshare/locale/es/LC_MESSAGES/pan.mo Xshare/locale/et/LC_MESSAGES/pan.mo Xshare/locale/fi/LC_MESSAGES/pan.mo Xshare/locale/fr/LC_MESSAGES/pan.mo Xshare/locale/ga/LC_MESSAGES/pan.mo Xshare/locale/gl/LC_MESSAGES/pan.mo Xshare/locale/hu/LC_MESSAGES/pan.mo Xshare/locale/it/LC_MESSAGES/pan.mo Xshare/locale/ja/LC_MESSAGES/pan.mo Xshare/locale/ko/LC_MESSAGES/pan.mo Xshare/locale/lt/LC_MESSAGES/pan.mo Xshare/locale/nl/LC_MESSAGES/pan.mo Xshare/locale/no/LC_MESSAGES/pan.mo Xshare/locale/pl/LC_MESSAGES/pan.mo Xshare/locale/pt/LC_MESSAGES/pan.mo Xshare/locale/pt_BR/LC_MESSAGES/pan.mo Xshare/locale/ru/LC_MESSAGES/pan.mo Xshare/locale/sk/LC_MESSAGES/pan.mo Xshare/locale/sl/LC_MESSAGES/pan.mo Xshare/locale/sp/LC_MESSAGES/pan.mo Xshare/locale/sr/LC_MESSAGES/pan.mo Xshare/locale/sv/LC_MESSAGES/pan.mo Xshare/locale/tr/LC_MESSAGES/pan.mo Xshare/locale/uk/LC_MESSAGES/pan.mo Xshare/locale/zh_CN/LC_MESSAGES/pan.mo END-of-pan2/pkg-plist exit --=-SZhwyidKQK1Ibi/L2+qk-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message