From owner-svn-ports-head@FreeBSD.ORG Sun Oct 13 17:36:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 713C9A2C; Sun, 13 Oct 2013 17:36:32 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4E2302DDF; Sun, 13 Oct 2013 17:36:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9DHaWJA096795; Sun, 13 Oct 2013 17:36:32 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9DHaVp1096792; Sun, 13 Oct 2013 17:36:31 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201310131736.r9DHaVp1096792@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sun, 13 Oct 2013 17:36:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330241 - in head/security: cyrus-sasl2-ldapdb cyrus-sasl2-saslauthd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2013 17:36:32 -0000 Author: ume Date: Sun Oct 13 17:36:31 2013 New Revision: 330241 URL: http://svnweb.freebsd.org/changeset/ports/330241 Log: - enable stage. - use modern OPTIONS helper. - use modern LIB_DEPENDS format. Modified: head/security/cyrus-sasl2-ldapdb/Makefile head/security/cyrus-sasl2-saslauthd/Makefile head/security/cyrus-sasl2-saslauthd/pkg-plist Modified: head/security/cyrus-sasl2-ldapdb/Makefile ============================================================================== --- head/security/cyrus-sasl2-ldapdb/Makefile Sun Oct 13 17:04:48 2013 (r330240) +++ head/security/cyrus-sasl2-ldapdb/Makefile Sun Oct 13 17:36:31 2013 (r330241) @@ -14,16 +14,14 @@ COMMENT= SASL LDAPDB auxprop plugin LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 +LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files INSTALL_WRKSRC= ${WRKSRC}/plugins - USE_LDCONFIG= yes - USE_AUTOTOOLS= libtool USE_OPENSSL= yes GNU_CONFIGURE= yes @@ -59,7 +57,6 @@ PLIST_FILES= lib/sasl2/libldapdb.a \ lib/sasl2/libldapdb.so \ lib/sasl2/libldapdb.so.3 -NO_STAGE= yes .include .if ${OPENSSLBASE} == /usr Modified: head/security/cyrus-sasl2-saslauthd/Makefile ============================================================================== --- head/security/cyrus-sasl2-saslauthd/Makefile Sun Oct 13 17:04:48 2013 (r330240) +++ head/security/cyrus-sasl2-saslauthd/Makefile Sun Oct 13 17:36:31 2013 (r330241) @@ -14,7 +14,7 @@ COMMENT= SASL authentication server for LICENSE= BSD LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 +LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo @@ -22,15 +22,11 @@ PATCHDIR= ${CYRUS_SASL2_DIR}/files INSTALL_WRKSRC= ${WRKSRC}/saslauthd DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2 - # This doesn't work due to absence of .al support in our libtool #USE_AUTOTOOLS= libtool #LIBTOOLFILES= ${CONFIGURE_SCRIPT} saslauthd/configure -MAN8= saslauthd.8 - USE_RC_SUBR= saslauthd - USE_OPENSSL= yes GNU_CONFIGURE= yes @@ -48,21 +44,21 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/e CONFIGURE_ENV+= andrew_cv_runpath_switch=none OPTIONS_DEFINE= BDB OPENLDAP HTTPFORM +BDB_CONFIGURE_ON= --with-dblib=berkeley \ + --with-bdb-libdir=${BDB_LIB_DIR} \ + --with-bdb-incdir=${BDB_INCLUDE_DIR} \ + --with-bdb=${BDB_LIB_NAME} +BDB_CONFIGURE_OFF= --with-dblib=ndbm OPENLDAP_DESC= Use OpenLDAP +OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} HTTPFORM_DESC= Enable HTTP form authentication +HTTPFORM_CONFIGURE_ENABLE=httpform -NO_STAGE= yes .include .if ${PORT_OPTIONS:MBDB} USE_BDB= yes INVALID_BDB_VER=2 -CONFIGURE_ARGS+=--with-dblib=berkeley \ - --with-bdb-libdir=${BDB_LIB_DIR} \ - --with-bdb-incdir=${BDB_INCLUDE_DIR} \ - --with-bdb=${BDB_LIB_NAME} -.else -CONFIGURE_ARGS+=--with-dblib=ndbm .endif .if ${PORT_OPTIONS:MOPENLDAP} @@ -70,11 +66,6 @@ CONFIGURE_ARGS+=--with-dblib=ndbm WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} .endif USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MHTTPFORM} -CONFIGURE_ARGS+=--enable-httpform .endif .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so) @@ -119,26 +110,21 @@ do-build: post-install: @${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/saslcache \ - ${PREFIX}/sbin/saslcache + ${STAGEDIR}${PREFIX}/sbin/saslcache @${INSTALL_PROGRAM} ${WRKSRC}/saslauthd/testsaslauthd \ - ${PREFIX}/sbin/testsaslauthd + ${STAGEDIR}${PREFIX}/sbin/testsaslauthd .if ${SASLAUTHD_RUNPATH} != /var/run/saslauthd @${ECHO_MSG} "" @${ECHO_MSG} "SASLAUTHD_RUNPATH was specified." @${ECHO_MSG} "Make sure you create ${SASLAUTHD_RUNPATH}." @${ECHO_MSG} "" -.else - ${MKDIR} -m 770 ${SASLAUTHD_RUNPATH} - ${CHOWN} ${CYRUS_USER}:mail ${SASLAUTHD_RUNPATH} .endif .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/saslauthd + @${MKDIR} ${STAGEDIR}${DOCSDIR}/saslauthd .for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} ${DOCSDIR}/saslauthd + @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} \ + ${STAGEDIR}${DOCSDIR}/saslauthd .endfor .endif - @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} \ - POST-INSTALL - @${CAT} ${PKGMESSAGE} .include Modified: head/security/cyrus-sasl2-saslauthd/pkg-plist ============================================================================== --- head/security/cyrus-sasl2-saslauthd/pkg-plist Sun Oct 13 17:04:48 2013 (r330240) +++ head/security/cyrus-sasl2-saslauthd/pkg-plist Sun Oct 13 17:36:31 2013 (r330241) @@ -1,3 +1,4 @@ +man/man8/saslauthd.8.gz sbin/saslauthd sbin/saslcache sbin/testsaslauthd