svn commit: r409673 - in head/security: cyrus-sasl2 cyrus-sasl2-gssapi cyrus-sasl2-ldapdb cyrus-sasl2-srp

[Hajimu UMEMOTO]

Author: ume
Date: Sat Feb 27 17:02:11 2016
New Revision: 409673
URL: https://svnweb.freebsd.org/changeset/ports/409673

Log:
  Move PLIST_FILES for plugins into cyrus-sasl2/Makefile.common.

Modified:
  head/security/cyrus-sasl2-gssapi/Makefile
  head/security/cyrus-sasl2-ldapdb/Makefile
  head/security/cyrus-sasl2-srp/Makefile
  head/security/cyrus-sasl2/Makefile.common

Modified: head/security/cyrus-sasl2-gssapi/Makefile
==============================================================================
--- head/security/cyrus-sasl2-gssapi/Makefile	Sat Feb 27 16:19:53 2016	(r409672)
+++ head/security/cyrus-sasl2-gssapi/Makefile	Sat Feb 27 17:02:11 2016	(r409673)
@@ -23,9 +23,6 @@ GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--enable-gssapi="${GSSAPIBASEDIR}" \
 				--with-gss_impl=mit
 
-PLIST_FILES=	lib/sasl2/libgssapiv2.a \
-		lib/sasl2/libgssapiv2.so \
-		lib/sasl2/libgssapiv2.so.3 \
-		lib/sasl2/libgssapiv2.so.3.0.0
+CYRUS_BUILD_TARGET=		gssapiv2
 
 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"

Modified: head/security/cyrus-sasl2-ldapdb/Makefile
==============================================================================
--- head/security/cyrus-sasl2-ldapdb/Makefile	Sat Feb 27 16:19:53 2016	(r409672)
+++ head/security/cyrus-sasl2-ldapdb/Makefile	Sat Feb 27 17:02:11 2016	(r409673)
@@ -12,9 +12,4 @@ WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 
 CONFIGURE_ARGS+=--enable-ldapdb --with-ldap=${LOCALBASE}
 
-PLIST_FILES=	lib/sasl2/libldapdb.a \
-		lib/sasl2/libldapdb.so \
-		lib/sasl2/libldapdb.so.3 \
-		lib/sasl2/libldapdb.so.3.0.0
-
 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"

Modified: head/security/cyrus-sasl2-srp/Makefile
==============================================================================
--- head/security/cyrus-sasl2-srp/Makefile	Sat Feb 27 16:19:53 2016	(r409672)
+++ head/security/cyrus-sasl2-srp/Makefile	Sat Feb 27 17:02:11 2016	(r409673)
@@ -11,9 +11,4 @@ OPTIONS_DEFAULT=		SRP_SETPASS
 SRP_SETPASS_DESC=		setting SRP secrets with saslpasswd
 SRP_SETPASS_CONFIGURE_ENABLE=	srp-setpass
 
-PLIST_FILES=	lib/sasl2/libsrp.a \
-		lib/sasl2/libsrp.so \
-		lib/sasl2/libsrp.so.3 \
-		lib/sasl2/libsrp.so.3.0.0
-
 .include "${.CURDIR}/../../security/cyrus-sasl2/Makefile.common"

Modified: head/security/cyrus-sasl2/Makefile.common
==============================================================================
--- head/security/cyrus-sasl2/Makefile.common	Sat Feb 27 16:19:53 2016	(r409672)
+++ head/security/cyrus-sasl2/Makefile.common	Sat Feb 27 17:02:11 2016	(r409673)
@@ -49,9 +49,9 @@ DISTINFO_FILE=	${CYRUS_SASL2_DIR}/distin
 PATCHDIR=	${CYRUS_SASL2_DIR}/files
 
 .if defined(PKGNAMESUFFIX)
-CYRUS_BUILD_TARGET=	${PKGNAMESUFFIX:S/^-//}
+CYRUS_BUILD_TARGET?=	${PKGNAMESUFFIX:S/^-//}
 .else
-CYRUS_BUILD_TARGET=	${PORTNAME}
+CYRUS_BUILD_TARGET?=	${PORTNAME}
 .endif
 
 .if ${CYRUS_BUILD_TARGET} != "cyrus-sasl" && ${CYRUS_BUILD_TARGET} != "saslauthd"
@@ -61,6 +61,11 @@ LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/sec
 USES=		libtool:build
 CONFIGURE_ARGS+=--with-dblib=none
 
+PLIST_FILES+=	lib/sasl2/lib${CYRUS_BUILD_TARGET}.a \
+		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so \
+		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so.3 \
+		lib/sasl2/lib${CYRUS_BUILD_TARGET}.so.3.0.0
+
 .endif
 
 .include <bsd.port.pre.mk>