[Midnightbsd-cvs] mports [19086] trunk/security/cyrus-sasl2-saslauthd: fixup depends
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 23 19:22:04 EDT 2015
Revision: 19086
http://svnweb.midnightbsd.org/mports/?rev=19086
Author: laffer1
Date: 2015-05-23 19:22:04 -0400 (Sat, 23 May 2015)
Log Message:
-----------
fixup depends
Modified Paths:
--------------
trunk/security/cyrus-sasl2-saslauthd/Makefile
Added Paths:
-----------
trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.in
Removed Paths:
-------------
trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
Modified: trunk/security/cyrus-sasl2-saslauthd/Makefile
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/Makefile 2015-05-23 21:36:43 UTC (rev 19085)
+++ trunk/security/cyrus-sasl2-saslauthd/Makefile 2015-05-23 23:22:04 UTC (rev 19086)
@@ -2,11 +2,10 @@
PORTNAME= saslauthd
PORTVERSION= 2.1.26
+PORTREVISION= 1
CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
- ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
- http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/
-MASTER_SITE_SUBDIR= . OLD-VERSIONS/sasl
+MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
+ http://cyrusimap.org/releases/
PKGNAMEPREFIX= cyrus-sasl-
DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
@@ -14,6 +13,7 @@
COMMENT= SASL authentication server for cyrus-sasl2
LICENSE= bsd4
+LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
@@ -20,11 +20,10 @@
CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2
DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo
PATCHDIR= ${CYRUS_SASL2_DIR}/files
-INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/saslauthd
+INSTALL_WRKSRC= ${WRKSRC}/saslauthd
DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2
-USE_RC_SUBR= saslauthd.sh
-
+USE_RC_SUBR= saslauthd
USE_OPENSSL= yes
GNU_CONFIGURE= yes
@@ -31,6 +30,7 @@
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \
--with-plugindir=${PREFIX}/lib/sasl2 \
--with-dbpath=${PREFIX}/etc/sasldb2 \
+ --with-lib-subdir=lib \
--includedir=${PREFIX}/include \
--mandir=${MANPREFIX}/man \
--enable-static \
@@ -39,48 +39,45 @@
--with-rc4=openssl \
--with-saslauthd=${SASLAUTHD_RUNPATH} \
--disable-krb4
+CONFIGURE_ENV+= andrew_cv_runpath_switch=none
-OPTIONS= BDB "Use Berkeley DB" off \
- OPENLDAP "Use OpenLDAP" off \
- HTTPFORM "Enable HTTP form authentication" off
+OPTIONS_DEFINE= BDB DOCS 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_USE= BDB=yes
+BDB_CONFIGURE_OFF= --with-dblib=ndbm
+OPENLDAP_DESC= Use OpenLDAP
+OPENLDAP_USE= OPENLDAP=yes
+OPENLDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE}
+HTTPFORM_DESC= Enable HTTP form authentication
+HTTPFORM_CONFIGURE_ENABLE=httpform
-.include <bsd.mport.options.mk>
+.include <bsd.port.pre.mk>
-.if defined(WITH_BDB)
-USE_BDB= yes
+.if ${PORT_OPTIONS:MBDB}
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 defined(WITH_OPENLDAP)
+.if ${PORT_OPTIONS:MOPENLDAP}
.if defined(WITH_OPENLDAP_VER)
WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER}
.endif
-USE_OPENLDAP= yes
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
.endif
-.if defined(WITH_HTTPFORM)
-CONFIGURE_ARGS+=--enable-httpform
-.endif
-
.if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so)
CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME} --with-gss_impl=mit
+LDFLAGS+= -R${KRB5_HOME}/lib
.elif !defined(WITHOUT_GSSAPI) && defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
CONFIGURE_ARGS+=--enable-gssapi=${HEIMDAL_HOME} --with-gss_impl=heimdal
.elif !defined(WITHOUT_GSSAPI) && exists(/usr/lib/libkrb5.a)
-CONFIGURE_ARGS+=--enable-gssapi
+CONFIGURE_ARGS+=--enable-gssapi=/usr
+CFLAGS+= -nostdinc -I/usr/include
.else
CONFIGURE_ARGS+=--disable-gssapi
.endif
-.include <bsd.port.pre.mk>
-
.if ${OPENSSLBASE} == /usr
CONFIGURE_ARGS+=--with-openssl=yes
.else
@@ -123,10 +120,11 @@
${MKDIR} -m 770 ${SASLAUTHD_RUNPATH}
${CHOWN} ${CYRUS_USER}:mail ${SASLAUTHD_RUNPATH}
.endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}/saslauthd
.for file in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} ${DOCSDIR}/saslauthd
+ @${INSTALL_DATA} ${WRKSRC}/saslauthd/${file} \
+ ${DOCSDIR}/saslauthd
.endfor
.endif
Copied: trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.in (from rev 19085, trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in)
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.in (rev 0)
+++ trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.in 2015-05-23 23:22:04 UTC (rev 19086)
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# $MidnightBSD$
+
+# PROVIDE: saslauthd
+# REQUIRE: DAEMON
+# BEFORE: mail imap
+# KEYWORD: shutdown
+
+# Define these saslauthd_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/saslauthd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+saslauthd_enable=${saslauthd_enable:-"NO"} # Enable saslauthd
+saslauthd_flags=${saslauthd_flags:-"-a pam"} # Flags to saslauthd program
+#saslauthd_runpath="%%SASLAUTHD_RUNPATH%%" # Working directory
+#saslauthd_program="%%PREFIX%%/sbin/saslauthd" # Location of saslauthd
+
+. /etc/rc.subr
+
+name="saslauthd"
+rcvar=saslauthd_enable
+command="%%PREFIX%%/sbin/${name}"
+
+load_rc_config $name
+
+if [ -z "$saslauthd_runpath" ]; then
+ pidfile="%%SASLAUTHD_RUNPATH%%/${name}.pid"
+else
+ pidfile="${saslauthd_runpath}/${name}.pid"
+ command_args="-m ${saslauthd_runpath}"
+fi
+
+run_rc_command "$1"
Deleted: trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
===================================================================
--- trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in 2015-05-23 21:36:43 UTC (rev 19085)
+++ trunk/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in 2015-05-23 23:22:04 UTC (rev 19086)
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# $MidnightBSD$
-
-# PROVIDE: saslauthd
-# REQUIRE: DAEMON
-# BEFORE: mail imap
-# KEYWORD: shutdown
-
-# Define these saslauthd_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-# /etc/rc.conf.d/saslauthd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-saslauthd_enable=${saslauthd_enable:-"NO"} # Enable saslauthd
-saslauthd_flags=${saslauthd_flags:-"-a pam"} # Flags to saslauthd program
-#saslauthd_runpath="%%SASLAUTHD_RUNPATH%%" # Working directory
-#saslauthd_program="%%PREFIX%%/sbin/saslauthd" # Location of saslauthd
-
-. %%RC_SUBR%%
-
-name="saslauthd"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-
-load_rc_config $name
-
-if [ -z "$saslauthd_runpath" ]; then
- pidfile="%%SASLAUTHD_RUNPATH%%/${name}.pid"
-else
- pidfile="${saslauthd_runpath}/${name}.pid"
- command_args="-m ${saslauthd_runpath}"
-fi
-
-run_rc_command "$1"
More information about the Midnightbsd-cvs
mailing list