Date: Thu, 22 Jan 2004 20:41:38 +0100 (CET) From: Jean-Yves Lefort <jylefort@brutele.be> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61747: Update port: mail/sylpheed-gtk2 to 0.9.8a.20040109 Message-ID: <20040122194138.79F7822E1B@jsite.lefort.net> Resent-Message-ID: <200401221950.i0MJoG07020438@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61747
>Category: ports
>Synopsis: Update port: mail/sylpheed-gtk2 to 0.9.8a.20040109
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 22 11:50:16 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Jean-Yves Lefort
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 4.9-RELEASE FreeBSD 4.9-RELEASE #0: Tue Dec 2 09:53:57 CET 2003 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/mail/sylpheed-gtk2/Makefile sylpheed-gtk2/Makefile
--- /usr/ports/mail/sylpheed-gtk2/Makefile Sat Sep 27 15:06:22 2003
+++ sylpheed-gtk2/Makefile Thu Jan 22 20:11:20 2004
@@ -2,28 +2,37 @@
# Date created: 25 September 2003
# Whom: Jean-Yves Lefort <jylefort@brutele.be>
#
-# $FreeBSD: ports/mail/sylpheed-gtk2/Makefile,v 1.1 2003/09/27 13:06:22 oliver Exp $
+# $FreeBSD$
#
PORTNAME= sylpheed-gtk2
-PORTVERSION= 0.9.5.20030906
+PORTVERSION= 0.9.8a.20040109
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= sylpheed-0.9.5-gtk2-20030906
+DISTNAME= sylpheed-${PORTVERSION:R}-gtk2-${PORTVERSION:E}
MAINTAINER= jylefort@brutele.be
-COMMENT= The GTK+ 2.0 port of a lightweight, featureful, and fast e-mail client
+COMMENT= The GTK+ 2.0 port of a lightweight, featureful and fast e-mail client
+
+LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext \
+ iconv.3:${PORTSDIR}/converters/libiconv
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_GNOME= gtk20
+USE_OPENSSL= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-CONFIGURE_ARGS= --prefix=${PREFIX} --enable-ipv6
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --enable-ssl
+
+OPTIONS= GPGME "GnuPG support (using GPGME)" no \
+ COMPFACE "X-Face support (using compface)" no \
+ JPILOT "JPilot support" no \
+ LDAP "LDAP support" no
.include <bsd.port.pre.mk>
@@ -31,13 +40,10 @@
LIB_DEPENDS+= gpgme.9:${PORTSDIR}/security/gpgme
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
CONFIGURE_ARGS+= --enable-gpgme
-.else
-CONFIGURE_ARGS+= --disable-gpgme
.endif
.if defined(WITH_COMPFACE)
LIB_DEPENDS+= compface.1:${PORTSDIR}/mail/faces
-CONFIGURE_ARGS+= --enable-compface
.else
CONFIGURE_ARGS+= --disable-compface
.endif
@@ -46,22 +52,11 @@
LIB_DEPENDS+= pisock.8:${PORTSDIR}/palm/pilot-link
RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot
CONFIGURE_ARGS+= --enable-jpilot
-.else
-CONFIGURE_ARGS+= --disable-jpilot
.endif
.if defined(WITH_LDAP)
LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client
CONFIGURE_ARGS+= --enable-ldap
-.else
-CONFIGURE_ARGS+= --disable-ldap
-.endif
-
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL= yes
-CONFIGURE_ARGS+= --enable-ssl
-.else
-CONFIGURE_ARGS+= --disable-ssl
.endif
MAKEFILES= Makefile.in \
@@ -76,18 +71,6 @@
manual/en/Makefile.in \
manual/ja/Makefile.in \
src/Makefile.in
-
-pre-everything::
- @${ECHO} ""
- @${ECHO} "You may use the following build options:"
- @${ECHO} ""
- @${ECHO} " WITH_GPGME=yes Enable GnuPG support using GPGME."
- @${ECHO} " WITH_COMPFACE=yes Enable X-Face support."
- @${ECHO} " WITH_JPILOT=yes Enable JPilot support."
- @${ECHO} " WITH_LDAP=yes Enable LDAP support."
- @${ECHO} ""
- @${ECHO} " WITHOUT_SSL=yes Disable OpenSSL support."
- @${ECHO} ""
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
diff -ruN /usr/ports/mail/sylpheed-gtk2/distinfo sylpheed-gtk2/distinfo
--- /usr/ports/mail/sylpheed-gtk2/distinfo Sat Sep 27 15:06:22 2003
+++ sylpheed-gtk2/distinfo Thu Jan 22 19:45:10 2004
@@ -1 +1 @@
-MD5 (sylpheed-0.9.5-gtk2-20030906.tar.gz) = ae2897cccae428cfbbe490d2e3d20500
+MD5 (sylpheed-0.9.8a-gtk2-20040109.tar.gz) = fcd6e7789f2ff1f990354d089f1a4dc1
diff -ruN /usr/ports/mail/sylpheed-gtk2/files/patch-aa sylpheed-gtk2/files/patch-aa
--- /usr/ports/mail/sylpheed-gtk2/files/patch-aa Sat Sep 27 15:06:22 2003
+++ sylpheed-gtk2/files/patch-aa Thu Jan 1 01:00:00 1970
@@ -1,20 +0,0 @@
---- src/defs.h.orig Thu Sep 25 11:14:02 2003
-+++ src/defs.h Thu Sep 25 11:15:26 2003
-@@ -64,7 +64,7 @@
- #define MARK_VERSION 2
-
- #define DEFAULT_SIGNATURE ".signature"
--#define DEFAULT_INC_PATH "/usr/bin/mh/inc"
-+#define DEFAULT_INC_PATH ""
- #define DEFAULT_INC_PROGRAM "inc"
- /* #define DEFAULT_INC_PATH "/usr/bin/imget" */
- /* #define DEFAULT_INC_PROGRAM "imget" */
-@@ -74,7 +74,7 @@
- #ifdef _PATH_MAILDIR
- # define DEFAULT_SPOOL_PATH _PATH_MAILDIR
- #else
--# define DEFAULT_SPOOL_PATH "/var/spool/mail"
-+# define DEFAULT_SPOOL_PATH "/var/mail"
- #endif
-
- #define BUFFSIZE 8192
diff -ruN /usr/ports/mail/sylpheed-gtk2/files/patch-ba sylpheed-gtk2/files/patch-ba
--- /usr/ports/mail/sylpheed-gtk2/files/patch-ba Sat Sep 27 15:06:22 2003
+++ sylpheed-gtk2/files/patch-ba Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig Thu Sep 25 12:15:12 2003
-+++ po/Makefile.in.in Thu Sep 25 12:16:23 2003
-@@ -106,7 +106,7 @@
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
-- lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+ lang=`echo $$cat | sed 's/\.mo$$//'`; \
- dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
- if test -r $$cat; then \
diff -ruN /usr/ports/mail/sylpheed-gtk2/files/patch-src::defs.h sylpheed-gtk2/files/patch-src::defs.h
--- /usr/ports/mail/sylpheed-gtk2/files/patch-src::defs.h Thu Jan 1 01:00:00 1970
+++ sylpheed-gtk2/files/patch-src::defs.h Thu Jan 22 20:24:53 2004
@@ -0,0 +1,20 @@
+--- src/defs.h.orig Sun Sep 7 06:09:06 2003
++++ src/defs.h Thu Jan 22 20:23:18 2004
+@@ -64,7 +64,7 @@
+ #define MARK_VERSION 2
+
+ #define DEFAULT_SIGNATURE ".signature"
+-#define DEFAULT_INC_PATH "/usr/bin/mh/inc"
++#define DEFAULT_INC_PATH ""
+ #define DEFAULT_INC_PROGRAM "inc"
+ /* #define DEFAULT_INC_PATH "/usr/bin/imget" */
+ /* #define DEFAULT_INC_PROGRAM "imget" */
+@@ -74,7 +74,7 @@
+ #ifdef _PATH_MAILDIR
+ # define DEFAULT_SPOOL_PATH _PATH_MAILDIR
+ #else
+-# define DEFAULT_SPOOL_PATH "/var/spool/mail"
++# define DEFAULT_SPOOL_PATH "/var/mail"
+ #endif
+
+ #define BUFFSIZE 8192
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040122194138.79F7822E1B>