summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv>2004-11-08 17:10:24 +0000
committertv <tv>2004-11-08 17:10:24 +0000
commitfba566efba9f48485c13f598c336002f3706edbc (patch)
treea82de5debd83ebd5502e2d20a6b17da2538a8893
parented70653eb3614b1ed63352bb59793c3ab3d8968f (diff)
downloadpkgsrc-fba566efba9f48485c13f598c336002f3706edbc.tar.gz
PKG_OPTIONS-ize openldap support. USE_OPENLDAP is still supported through
bsd.options.mk compatibility; "PKG_OPTIONS.pine+=ldap" is the new form.
-rw-r--r--mail/pine/Makefile16
1 files changed, 10 insertions, 6 deletions
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 98904599339..a6af7fd18b9 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -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 @@ COMMENT= Program for Internet News and E-mail
LICENSE= pine-license
-BUILD_DEFS+= USE_OPENLDAP
USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
@@ -41,10 +40,15 @@ CFLAGS+= -O
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-configure:
do-build:
cd ${WRKSRC} && ${_ULIMIT_CMD} \
${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \
- ${LDAPCFLAGS} ${LDAPLIBS} \
+ ${PINE_LDAPCFLAGS} ${PINE_LDAPLIBS} \
PREFIX=${PREFIX} \
CC="${CC} ${CFLAGS} ${LDFLAGS}"