[pkgsrc/trunk]: pkgsrc/mail/pine PKG_OPTIONS-ize openldap support. USE_OPENL...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/04ec1584f429
branches:  trunk
changeset: 483163:04ec1584f429
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Nov 08 17:10:24 2004 +0000

description:
PKG_OPTIONS-ize openldap support.  USE_OPENLDAP is still supported through
bsd.options.mk compatibility; "PKG_OPTIONS.pine+=ldap" is the new form.

diffstat:

 mail/pine/Makefile |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r da17850241d8 -r 04ec1584f429 mail/pine/Makefile
--- a/mail/pine/Makefile        Mon Nov 08 17:07:23 2004 +0000
+++ b/mail/pine/Makefile        Mon Nov 08 17:10:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2004/10/03 00:12:54 tv Exp $
+# $NetBSD: Makefile,v 1.96 2004/11/08 17:10:24 tv Exp $
 
 DISTNAME=       pine4.61
 PKGNAME=        pine-4.61
@@ -14,7 +14,6 @@
 
 LICENSE=       pine-license
 
-BUILD_DEFS+=   USE_OPENLDAP
 USE_BUILDLINK3=        YES
 USE_PKGINSTALL=        YES
 
@@ -41,10 +40,15 @@
 UNLIMIT_RESOURCES+=    datasize
 .endif
 
-.if defined(USE_OPENLDAP) && (${USE_OPENLDAP} == "YES")
+PKG_OPTIONS_VAR=       PKG_OPTIONS.pine
+PKG_SUPPORTED_OPTIONS= ldap
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mldap)
 .  include "../../databases/openldap/buildlink3.mk"
-LDAPCFLAGS=    LDAPCFLAGS="-DENABLE_LDAP"
-LDAPLIBS=      LDAPLIBS="-lldap -llber"
+PINE_LDAPCFLAGS=       LDAPCFLAGS="-DENABLE_LDAP"
+PINE_LDAPLIBS=         LDAPLIBS="-lldap -llber"
 .endif
 
 pre-patch:
@@ -64,7 +68,7 @@
 do-build:
        cd ${WRKSRC} && ${_ULIMIT_CMD}                                  \
        ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME}                      \
-               ${LDAPCFLAGS} ${LDAPLIBS}                               \
+               ${PINE_LDAPCFLAGS} ${PINE_LDAPLIBS}                     \
                PREFIX=${PREFIX}                                        \
                CC="${CC} ${CFLAGS} ${LDFLAGS}"