[pkgsrc/trunk]: pkgsrc Update mail/sylpheed-gtk2 to 0.9.12.20040918, this is ...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f7e5e73d9dcd
branches:  trunk
changeset: 482198:f7e5e73d9dcd
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Oct 21 21:27:29 2004 +0000

description:
Update mail/sylpheed-gtk2 to 0.9.12.20040918, this is a bugfix release.
While I'm here, convert to use bsd.options.mk.

diffstat:

 doc/CHANGES                 |   3 ++-
 mail/sylpheed-gtk2/Makefile |  44 +++++++++++++++++++++++---------------------
 mail/sylpheed-gtk2/distinfo |   6 +++---
 3 files changed, 28 insertions(+), 25 deletions(-)

diffs (98 lines):

diff -r d877c0a6ace7 -r f7e5e73d9dcd doc/CHANGES
--- a/doc/CHANGES       Thu Oct 21 21:25:23 2004 +0000
+++ b/doc/CHANGES       Thu Oct 21 21:27:29 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7515 2004/10/21 19:55:04 tv Exp $
+$NetBSD: CHANGES,v 1.7516 2004/10/21 21:27:29 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -4806,3 +4806,4 @@
        Updated lsof to 4.73 [atatat 2004-10-21]
        Added py-pgnotify-0.1 [darcy 2004-10-21]
        Updated rsync to 2.6.3 [tv 2004-10-21]
+       Updated sylpheed-gtk2 to 0.9.12.20040918 [xtraeme 2004-10-21]
diff -r d877c0a6ace7 -r f7e5e73d9dcd mail/sylpheed-gtk2/Makefile
--- a/mail/sylpheed-gtk2/Makefile       Thu Oct 21 21:25:23 2004 +0000
+++ b/mail/sylpheed-gtk2/Makefile       Thu Oct 21 21:27:29 2004 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/10/03 00:12:55 tv Exp $
+# $NetBSD: Makefile,v 1.19 2004/10/21 21:27:29 xtraeme Exp $
 #
 
-DISTNAME=      sylpheed-0.9.12-gtk2-20040622
-PKGNAME=       sylpheed-gtk2-0.9.12.0.1
-PKGREVISION=   1
+DISTNAME=      sylpheed-0.9.12-gtk2-20040918
+PKGNAME=       sylpheed-gtk2-0.9.12.20040918
 CATEGORIES=    mail x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=sylpheed-gtk2/}
 
@@ -30,16 +29,8 @@
 CONFIGURE_ARGS+=       --enable-compface
 
 PKG_SYSCONFSUBDIR=     sylpheed
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+=           USE_INET6 USE_OPENLDAP USE_JPILOT
-
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=       --enable-ipv6
-.else
-CONFIGURE_ARGS+=       --disable-ipv6
-.endif
 
 FACES_IS_INSTALLED!=   ${PKG_INFO} -e faces || ${ECHO}
 .if empty(FACES_IS_INSTALLED)
@@ -48,19 +39,30 @@
 .  include "../../mail/faces/buildlink3.mk"
 .endif
 
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
-CONFIGURE_ARGS+=       --enable-ldap
-.include "../../databases/openldap/buildlink3.mk"
+EGDIR=         ${PREFIX}/share/examples/sylpheed
+CONF_FILES=    ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.sylpheed-gtk2
+PKG_SUPPORTED_OPTIONS= jpilot openldap inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mjpilot)
+CONFIGURE_ARGS+=       --enable-jpilot
+.  include "../../comms/pilot-link-libs/buildlink3.mk"
+.  include "../../comms/jpilot/buildlink3.mk"
 .endif
 
-.if defined(USE_JPILOT) && ${USE_JPILOT} == YES
-CONFIGURE_ARGS+=       --enable-jpilot
-.include "../../comms/pilot-link-libs/buildlink3.mk"
-.include "../../comms/jpilot/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mopenldap)
+CONFIGURE_ARGS+=       --enable-ldap
+.  include "../../databases/openldap/buildlink3.mk"
 .endif
 
-EGDIR=         ${PREFIX}/share/examples/sylpheed
-CONF_FILES=    ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=       --enable-ipv6
+.else
+CONFIGURE_ARGS+=       --disable-ipv6
+.endif
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
diff -r d877c0a6ace7 -r f7e5e73d9dcd mail/sylpheed-gtk2/distinfo
--- a/mail/sylpheed-gtk2/distinfo       Thu Oct 21 21:25:23 2004 +0000
+++ b/mail/sylpheed-gtk2/distinfo       Thu Oct 21 21:27:29 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/09/01 12:12:14 recht Exp $
+$NetBSD: distinfo,v 1.8 2004/10/21 21:27:29 xtraeme Exp $
 
-SHA1 (sylpheed-0.9.12-gtk2-20040622.tar.gz) = ba20a927ebd8ee6442cbebc9433c599bf9cf814e
-Size (sylpheed-0.9.12-gtk2-20040622.tar.gz) = 3375655 bytes
+SHA1 (sylpheed-0.9.12-gtk2-20040918.tar.gz) = ab9c7ca3c49b86077c257bae4f44943c537516be
+Size (sylpheed-0.9.12-gtk2-20040918.tar.gz) = 3377968 bytes