[pkgsrc/trunk]: pkgsrc/mail/sylpheed Switch to using PKG_OPTIONS, rather than...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6861895bb61f
branches:  trunk
changeset: 491542:6861895bb61f
user:      chris <chris%pkgsrc.org@localhost>
date:      Fri Mar 25 12:05:09 2005 +0000

description:
Switch to using PKG_OPTIONS, rather than USE_X defines.

Should be no functional change.

diffstat:

 mail/sylpheed/Makefile |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 7f5aef8345aa -r 6861895bb61f mail/sylpheed/Makefile
--- a/mail/sylpheed/Makefile    Fri Mar 25 12:00:58 2005 +0000
+++ b/mail/sylpheed/Makefile    Fri Mar 25 12:05:09 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2005/03/25 02:10:52 chris Exp $
+# $NetBSD: Makefile,v 1.74 2005/03/25 12:05:09 chris Exp $
 
 DISTNAME=      sylpheed-1.0.4
 CATEGORIES=    mail news x11
@@ -29,10 +29,12 @@
 PKG_SYSCONFSUBDIR=     sylpheed
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
-.include "../../mk/bsd.prefs.mk"
-BUILD_DEFS+=           USE_INET6 USE_OPENLDAP USE_JPILOT
+PKG_OPTIONS_VAR=        PKG_OPTIONS.sylpheed
+PKG_SUPPORTED_OPTIONS=  jpilot ldap inet6
 
-.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
@@ -45,12 +47,12 @@
 .  include "../../mail/faces/buildlink3.mk"
 .endif
 
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
+.if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=       --enable-ldap
 .include "../../databases/openldap/buildlink3.mk"
 .endif
 
-.if defined(USE_JPILOT) && ${USE_JPILOT} == YES
+.if !empty(PKG_OPTIONS:Mjpilot)
 CONFIGURE_ARGS+=       --enable-jpilot
 .include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../comms/jpilot/buildlink3.mk"