Rearrange the Makefile logic so that we can easily create Cyrus SASL 2.x

plugin packages.

2 files changed, 98 insertions, 73 deletions

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index b509c353103..f7d60cb0b36 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,100 +1,48 @@
-# $NetBSD: Makefile,v 1.9 2003/02/27 13:18:06 seb Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/19 22:25:05 jlam Exp $
 
-DISTNAME=		cyrus-sasl-2.1.12
-SVR4_PKGNAME=		csasl
-CATEGORIES=		security
-MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-			ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
+.include "Makefile.common"
 
-MAINTAINER=		chris@netbsd.org
-HOMEPAGE=		http://asg.web.cmu.edu/sasl/
-COMMENT=		Simple Authentication and Security Layer
+SVR4_PKGNAME=	csasl
+COMMENT=	Simple Authentication and Security Layer
 
-USE_BUILDLINK2=		YES
-USE_PKGINSTALL=		YES
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
-
-.include "../../mk/bsd.prefs.mk"
-
-# CYRUS_USER		username of the Cyrus administrator
-# CYRUS_GROUP		group of the Cyrus administrator
-#
-CYRUS_USER?=		cyrus
-CYRUS_GROUP?=		mail
-FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
-
-HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
-# /var/run/saslauthd matches the default value in configure.
-SASLSOCKETDIR=		/var/run/saslauthd
-FILES_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
-PLIST_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
-
-BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
-
-PLIST_SRC=		${PKGDIR}/PLIST.common
-
-CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR}
-CONFIGURE_ARGS+=	--with-dblib=ndbm
-CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
-CONFIGURE_ARGS+=	--with-plugindir=${PREFIX}/lib/sasl2
-CONFIGURE_ARGS+=	--with-rc4
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+PLIST_SRC+=		${PKGDIR}/PLIST.common
 
 # Authentication mechanisms
 CONFIGURE_ARGS+=	--enable-anon		# ANONYMOUS
-CONFIGURE_ARGS+=	--enable-cram		# CRAM-MD5
-CONFIGURE_ARGS+=	--enable-digest		# DIGEST-MD5
-CONFIGURE_ARGS+=	--disable-login		# --- no LOGIN
 CONFIGURE_ARGS+=	--enable-plain		# PLAIN
-CONFIGURE_ARGS+=	--disable-scram		# --- no SCRAM-MD5
-CONFIGURE_ARGS+=	--disable-sia		# --- no SIA
-CONFIGURE_ARGS+=	--disable-srp		# --- no SRP
-CONFIGURE_ARGS+=	--disable-krb4		# --- no KERBEROS_V4
+CONFIGURE_ARGS+=	--enable-cram		# CRAM-MD5
 CONFIGURE_ARGS+=	--enable-otp		# OTP
 
+CONFIGURE_ARGS+=	--enable-digest		# DIGEST-MD5
+CONFIGURE_ARGS+=	--with-rc4
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+.include "../../security/openssl/buildlink2.mk"
+
+# saslauthd needs to find libraries for different authentication mechanisms.
+.if defined(USE_PAM)
+.  include "../../security/PAM/buildlink2.mk"
+BUILD_DEFS+=		USE_PAM
+CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
+.endif
+
 .if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
 CONFIGURE_ARGS+=	--enable-gssapi=/usr	# GSSAPI
 PLIST_SRC+=		${PKGDIR}/PLIST.krb5
 .  if exists(/usr/include/krb5/krb5-types.h)
-CPPFLAGS+=	-I/usr/include/krb5
+CPPFLAGS+=		-I/usr/include/krb5
 .  endif
-.else
-CONFIGURE_ARGS+=	--disable-gssapi	# --- no GSSAPI
 .endif
 
 PLIST_SRC+=		${PKGDIR}/PLIST.plugins
 
-.if defined(USE_PAM)
-.  include "../../security/PAM/buildlink2.mk"
-BUILD_DEFS+=		USE_PAM
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
-.else
-CONFIGURE_ARGS+=	--without-pam
-.endif
-
+USE_PKGINSTALL=		YES
 PKG_GROUPS=		${CYRUS_GROUP}
 PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
 RCD_SCRIPTS=		saslauthd
-OWN_DIRS=		${PREFIX}/lib/sasl2
-
-# clean up a bit to help package maintainer produce patch files
-post-extract:
-	${_PKG_SILENT}${_PKG_DEBUG}			\
-	${FIND} ${WRKSRC} -type f -name "*.orig" | ${XARGS} ${RM}
-
-# Left here as reference for patch makers...
-#pre-configure:
-#	cd ${WRKSRC};					\
-#	${ACLOCAL} -I cmulocal -I config;		\
-#	${AUTOHEADER};					\
-#	${AUTOMAKE} -a --gnu -i ;			\
-#	${AUTOCONF}
+OWN_DIRS=		${PLUGINDIR}
 
 post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
 
-.include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
new file mode 100644
index 00000000000..05ffc11a03d
--- /dev/null
+++ b/security/cyrus-sasl2/Makefile.common
@@ -0,0 +1,77 @@
+# $NetBSD: Makefile.common,v 1.1 2003/03/19 22:25:05 jlam Exp $
+#
+# This Makefile fragment should be included _below_ and SASL_PLUGIN
+# definition and _above_ any CONFIGURE_ARGS definitions.
+
+DISTNAME=	cyrus-sasl-2.1.12
+CATEGORIES=	security
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
+		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
+
+MAINTAINER=	chris@netbsd.org
+HOMEPAGE=	http://asg.web.cmu.edu/sasl/
+
+DISTINFO_FILE=		${.CURDIR}/../cyrus-sasl2/distinfo
+FILESDIR=		${.CURDIR}/../cyrus-sasl2/files
+PATCHDIR=		${.CURDIR}/../cyrus-sasl2/patches
+
+.if defined(SASL_PLUGIN) && !empty(SASL_PLUGIN:M[yY][eE][sS])
+DEPENDS+=		cyrus-sasl>=2.1.12
+.endif
+
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
+LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
+
+.include "../../mk/bsd.prefs.mk"
+
+# CYRUS_USER		username of the Cyrus administrator
+# CYRUS_GROUP		group of the Cyrus administrator
+#
+CYRUS_USER?=		cyrus
+CYRUS_GROUP?=		mail
+FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
+
+HTMLDIR=		${PREFIX}/share/doc/html/cyrus-sasl
+PLUGINDIR=		${PREFIX}/lib/sasl2
+# /var/run/saslauthd matches the default value in configure.
+SASLSOCKETDIR=		/var/run/saslauthd
+FILES_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
+PLIST_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
+
+BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
+
+CONFIGURE_ARGS+=	--with-saslauthd=${SASLSOCKETDIR}
+CONFIGURE_ARGS+=	--with-dblib=ndbm
+CONFIGURE_ARGS+=	--with-dbpath=${PKG_SYSCONFDIR}/sasldb
+CONFIGURE_ARGS+=	--with-plugindir=${PLUGINDIR}
+
+# Authentication mechanisms
+CONFIGURE_ARGS+=	--disable-anon		# ANONYMOUS
+CONFIGURE_ARGS+=	--disable-cram		# CRAM-MD5
+CONFIGURE_ARGS+=	--disable-digest	# DIGEST-MD5
+CONFIGURE_ARGS+=	--disable-login		# LOGIN
+CONFIGURE_ARGS+=	--disable-ntlm		# NTLM
+CONFIGURE_ARGS+=	--disable-plain		# PLAIN
+CONFIGURE_ARGS+=	--disable-scram		# SCRAM-MD5
+CONFIGURE_ARGS+=	--disable-sia		# SIA
+CONFIGURE_ARGS+=	--disable-srp		# SRP
+CONFIGURE_ARGS+=	--disable-krb4		# KERBEROS_V4
+CONFIGURE_ARGS+=	--disable-gssapi	# GSSAPI
+CONFIGURE_ARGS+=	--disable-otp		# OTP
+CONFIGURE_ARGS+=	--without-pam
+
+# clean up a bit to help package maintainer produce patch files
+post-extract:
+	${_PKG_SILENT}${_PKG_DEBUG}			\
+	${FIND} ${WRKSRC} -type f -name "*.orig" | ${XARGS} ${RM}
+
+# Left here as reference for patch makers...
+#pre-configure:
+#	cd ${WRKSRC};					\
+#	${ACLOCAL} -I cmulocal -I config;		\
+#	${AUTOHEADER};					\
+#	${AUTOMAKE} -a --gnu -i ;			\
+#	${AUTOCONF}