o update sylpheed-claws to to upstream version 0.8.9 o modify libtool handling o add new knob WITH_SA_PLUG to enable the spamassassin plugin new file: files/patch-tools-launch_phoenix
Lately Simon 'corecode' Schubert told: > >Synopsis: maintainer-update: mail/sylpheed-claws hold it. this is a exquisit example of don't-port-before-breakfast. eat this diff instead: Index: Makefile =================================================================== RCS file: /home/cvs/ports/sylpheed-claws/Makefile,v retrieving revision 1.33 diff -u -r1.33 Makefile --- Makefile 2003/01/15 03:16:52 1.33 +++ Makefile 2003/01/30 12:41:34 @@ -6,7 +6,7 @@ # PORTNAME= sylpheed-claws -PORTVERSION= 0.8.8 +PORTVERSION= 0.8.9 CATEGORIES= mail news ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sylpheed-claws @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --program-suffix="-claws" --enable-ipv6 -CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib" .if defined(WITH_PIXBUF) || defined(WITH_ALL) @@ -72,6 +72,13 @@ CONFIGURE_ARGS+= --enable-ldap CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g} .endif +.if defined(WITH_SA_PLUG) || defined(WITH_ALL) +RUN_DEPENDS+= spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin +CONFIGURE_ARGS+= --enable-spamassassin-plugin +PLIST_SUB+= SA_PLUG="" +.else +PLIST_SUB+= SA_PLUG="@comment " +.endif .if !defined(WITHOUT_SSL) USE_OPENSSL= yes CONFIGURE_ARGS+= --enable-openssl @@ -95,6 +102,7 @@ @${ECHO} " WITH_ASPELL Enable spell-checking support" @${ECHO} " WITH_JPILOT Enable JPilot support" @${ECHO} " WITH_LDAP Enable LDAP access support" + @${ECHO} " WITH_SA_PLUG Build Spamassassin plugin" @${ECHO} "" @${ECHO} " WITHOUT_SSL Disable OpenSSL support" @${ECHO} " WITHOUT_THEMES Don't install additional themes" @@ -116,9 +124,6 @@ @${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in .endif -pre-build: - @${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool - post-install: .if !defined(NOPORTDOCS) .for i in NEWS README README.jp README.claws RELEASE_NOTES.claws TODO TODO.jp tools/README.sylprint @@ -131,8 +136,8 @@ ${INSTALL_SCRIPT} OOo2sylpheed.pl calypso_convert.pl \ eud2gc.py filter_conv.pl gif2xface.pl google_msgid.pl \ gpg-sign-syl kmail2sylpheed.pl kmail2sylpheed_v2.pl \ - newscache_clean.pl outlook2sylpheed.pl tb2sylpheed \ - update-po uudec ${DATADIR} + launch_phoenix newscache_clean.pl outlook2sylpheed.pl \ + tb2sylpheed update-po uudec ${DATADIR} .if !defined(WITHOUT_THEMES) @${MKDIR} ${DATADIR}/themes @cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && for d in `find .`; do \ Index: distinfo =================================================================== RCS file: /home/cvs/ports/sylpheed-claws/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo 2003/01/15 03:16:52 1.13 +++ distinfo 2003/01/30 12:41:34 @@ -1,2 +1,2 @@ -MD5 (sylpheed-0.8.8claws.tar.bz2) = e61d2fcb760bd509194437c65214c4b8 +MD5 (sylpheed-0.8.9claws.tar.bz2) = c32f8a445b219694e827e7d370d6d487 MD5 (sylpheed-0.8.7claws-iconset.tar.gz) = 8159ffe656dc4256c1648fdd458945fb Index: pkg-plist =================================================================== RCS file: /home/cvs/ports/sylpheed-claws/pkg-plist,v retrieving revision 1.12 diff -u -r1.12 pkg-plist --- pkg-plist 2003/01/15 03:16:52 1.12 +++ pkg-plist 2003/01/30 12:41:34 @@ -2,6 +2,8 @@ bin/sylpheed-switcher bin/sylprint.pl etc/sylprint.rc.example +%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so +%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.so %%PORTDOCS%%share/doc/sylpheed-claws/NEWS %%PORTDOCS%%share/doc/sylpheed-claws/README %%PORTDOCS%%share/doc/sylpheed-claws/README.claws @@ -165,6 +167,7 @@ share/sylpheed-claws/gpg-sign-syl share/sylpheed-claws/kmail2sylpheed.pl share/sylpheed-claws/kmail2sylpheed_v2.pl +share/sylpheed-claws/launch_phoenix share/sylpheed-claws/newscache_clean.pl share/sylpheed-claws/outlook2sylpheed.pl share/sylpheed-claws/tb2sylpheed @@ -770,3 +773,5 @@ %%PORTDOCS%%@dirrm share/doc/sylpheed-claws/faq/de %%PORTDOCS%%@dirrm share/doc/sylpheed-claws/faq %%PORTDOCS%%@dirrm share/doc/sylpheed-claws +%%SA_PLUG%%@dirrm lib/sylpheed-claws/plugins +%%SA_PLUG%%@dirrm lib/sylpheed-claws Index: files/patch-configure =================================================================== RCS file: /home/cvs/ports/sylpheed-claws/files/patch-configure,v retrieving revision 1.12 diff -u -r1.12 patch-configure --- files/patch-configure 2003/01/15 03:16:52 1.12 +++ files/patch-configure 2003/01/30 12:41:34 @@ -1,6 +1,6 @@ ---- configure.orig Thu Dec 26 12:42:31 2002 -+++ configure Fri Dec 27 22:36:31 2002 -@@ -1501,7 +1501,7 @@ +--- configure.orig Fri Jan 24 13:41:56 2003 ++++ configure Thu Jan 30 03:24:00 2003 +@@ -1502,7 +1502,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. @@ -9,7 +9,7 @@ MAJOR_VERSION=0 MINOR_VERSION=8 -@@ -1999,7 +1999,7 @@ +@@ -2000,7 +2000,7 @@ fi @@ -18,7 +18,15 @@ SYLPHEED_GNOME_TRUE= SYLPHEED_GNOME_FALSE='#' else -@@ -12093,9 +12093,9 @@ +@@ -8472,6 +8472,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -12094,9 +12095,9 @@ localedir='${prefix}/${DATADIRNAME}/locale' Index: files/patch-src-common-Makefile.in =================================================================== RCS file: /home/cvs/ports/sylpheed-claws/files/patch-src-common-Makefile.in,v retrieving revision 1.1 diff -u -r1.1 patch-src-common-Makefile.in --- files/patch-src-common-Makefile.in 2003/01/15 03:16:52 1.1 +++ files/patch-src-common-Makefile.in 2003/01/30 12:41:34 @@ -1,11 +1,11 @@ ---- src/common/Makefile.in.orig Thu Dec 26 12:42:26 2002 -+++ src/common/Makefile.in Fri Dec 27 22:47:48 2002 +--- src/common/Makefile.in.orig Fri Jan 24 13:41:49 2003 ++++ src/common/Makefile.in Thu Jan 30 01:34:01 2003 @@ -58,7 +58,7 @@ CFLAGS = @CFLAGS@ CPP = @CPP@ -CPPFLAGS = \ +CPPFLAGS = @CPPFLAGS@ \ + $(GLIB_CFLAGS) \ + $(OPENSSL_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" - - CYGPATH_W = @CYGPATH_W@ Index: files/patch-tools-launch_phoenix =================================================================== RCS file: patch-tools-launch_phoenix diff -N patch-tools-launch_phoenix --- /dev/null Thu Jan 30 13:30:18 2003 +++ patch-tools-launch_phoenix Thu Jan 30 13:41:34 2003 @@ -0,0 +1,17 @@ +--- tools/launch_phoenix.orig Wed Jan 8 10:53:19 2003 ++++ tools/launch_phoenix Thu Jan 30 01:31:21 2003 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + # Copyright © 2002 Mohammed Sameer <Uniball@linux-egypt.org> + # +@@ -39,7 +39,7 @@ + + STR=`phoenix -remote "ping()" 2>&1 | grep No` + #echo $STR +-if [[ "$STR" == "No running window found." ]]; then ++if [ "$STR" = "No running window found." ]; then + phoenix_new; + else + phoenix_running; cheers simon -- /"\ http://corecode.ath.cx/#donate \ / \ ASCII Ribbon Campaign / \ Against HTML Mail and News
State Changed From-To: open->closed Committed, thanks!