Date: Thu, 30 Jan 2003 04:50:03 -0800 (PST) From: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/47670: maintainer-update: mail/sylpheed-claws Message-ID: <200301301250.h0UCo3n3050075@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/47670; it has been noted by GNATS.
From: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/47670: maintainer-update: mail/sylpheed-claws
Date: Thu, 30 Jan 2003 13:43:36 +0100
--=.447tzX,P10CD)(
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 @@
#
=20
PORTNAME=3D sylpheed-claws
-PORTVERSION=3D 0.8.8
+PORTVERSION=3D 0.8.9
CATEGORIES=3D mail news ipv6
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=3D sylpheed-claws
@@ -33,7 +33,7 @@
=20
CONFIGURE_ARGS=3D --program-suffix=3D"-claws" --enable-ipv6
=20
-CONFIGURE_ENV=3D CFLAGS=3D"${CFLAGS}" CPPFLAGS=3D"-I${LOCALBASE}/include" \
+CONFIGURE_ENV=3D CFLAGS=3D"${CFLAGS}" CPPFLAGS=3D"${CPPFLAGS} -I${LOCALBAS=
E}/include" \
LIBS=3D"-L${X11BASE}/lib -L${LOCALBASE}/lib"
=20
.if defined(WITH_PIXBUF) || defined(WITH_ALL)
@@ -72,6 +72,13 @@
CONFIGURE_ARGS+=3D --enable-ldap
CONFIGURE_ENV+=3D PTHREAD_LIBS=3D${PTHREAD_LIBS:S/"//g}
.endif
+.if defined(WITH_SA_PLUG) || defined(WITH_ALL)
+RUN_DEPENDS+=3D spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
+CONFIGURE_ARGS+=3D --enable-spamassassin-plugin
+PLIST_SUB+=3D SA_PLUG=3D""
+.else
+PLIST_SUB+=3D SA_PLUG=3D"@comment "
+.endif
.if !defined(WITHOUT_SSL)
USE_OPENSSL=3D yes
CONFIGURE_ARGS+=3D --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}/Makefi=
le.in
.endif
=20
-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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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) =3D e61d2fcb760bd509194437c65214c4b8
+MD5 (sylpheed-0.8.9claws.tar.bz2) =3D c32f8a445b219694e827e7d370d6d487
MD5 (sylpheed-0.8.7claws-iconset.tar.gz) =3D 8159ffe656dc4256c1648fdd45894=
5fb
Index: pkg-plist
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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=3D"$SHELL $ac_aux_dir/configure" # This should be Cygnus con=
figure.
=20
=20
@@ -9,7 +9,7 @@
=20
MAJOR_VERSION=3D0
MINOR_VERSION=3D8
-@@ -1999,7 +1999,7 @@
+@@ -2000,7 +2000,7 @@
fi
=20
=20
@@ -18,7 +18,15 @@
SYLPHEED_GNOME_TRUE=3D
SYLPHEED_GNOME_FALSE=3D'#'
else
-@@ -12093,9 +12093,9 @@
+@@ -8472,6 +8472,7 @@
+=20
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS=3D"$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+=20
+ # Always use our own libtool.
+ LIBTOOL=3D'$(SHELL) $(top_builddir)/libtool'
+@@ -12094,9 +12095,9 @@
localedir=3D'${prefix}/${DATADIRNAME}/locale'
=20
=20
Index: files/patch-src-common-Makefile.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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 =3D @CFLAGS@
CPP =3D @CPP@
=20
-CPPFLAGS =3D \
+CPPFLAGS =3D @CPPFLAGS@ \
+ $(GLIB_CFLAGS) \
+ $(OPENSSL_CFLAGS) \
-DLOCALEDIR=3D\""$(localedir)"\"
-=20
- CYGPATH_W =3D @CYGPATH_W@
Index: files/patch-tools-launch_phoenix
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
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
+=20
+ # Copyright =A9 2002 Mohammed Sameer <Uniball@linux-egypt.org>=20
+ #
+@@ -39,7 +39,7 @@
+=20
+ STR=3D`phoenix -remote "ping()" 2>&1 | grep No`
+ #echo $STR
+-if [[ "$STR" =3D=3D "No running window found." ]]; then
++if [ "$STR" =3D "No running window found." ]; then
+ phoenix_new;
+ else
+ phoenix_running;
cheers
simon
--=20
/"\ http://corecode.ath.cx/#donate
\ /
\ ASCII Ribbon Campaign
/ \ Against HTML Mail and News
--=.447tzX,P10CD)(
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE+OR38r5S+dk6z85oRArfiAJ40N7yzxwGd8fAqxXvyTd/Hv9qHnwCgwIpN
aOGy7NTSqL7lQfJ24ZVNjwY=
=gyW5
-----END PGP SIGNATURE-----
--=.447tzX,P10CD)(--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301301250.h0UCo3n3050075>