[42338] trunk/dports/security/cyrus-sasl2

[nox at macports.org]

Revision: 42338
          http://trac.macports.org/changeset/42338
Author:   nox at macports.org
Date:     2008-11-19 06:14:26 -0800 (Wed, 19 Nov 2008)
Log Message:
-----------
cyrus-sasl2 (closes #17158):
 * Removed superfluous configure arguments.
 * Removed obsolete patches.
 * Framework installation is now disabled through the adequate `--disable-macos-framework`.
 * Enabled parallel build.
 * Added a pre-build test to ensure any previous installed version of cyrus-sasl2 is deactivated.
 * Added variant descriptions.

Modified Paths:
--------------
    trunk/dports/security/cyrus-sasl2/Portfile

Removed Paths:
-------------
    trunk/dports/security/cyrus-sasl2/files/

Modified: trunk/dports/security/cyrus-sasl2/Portfile
===================================================================
--- trunk/dports/security/cyrus-sasl2/Portfile	2008-11-19 12:51:54 UTC (rev 42337)
+++ trunk/dports/security/cyrus-sasl2/Portfile	2008-11-19 14:14:26 UTC (rev 42338)
@@ -26,62 +26,61 @@
 depends_lib		port:openssl \
 				port:zlib
 
-patchfiles		patch-Makefile.in \
-			patch-include_Makefile.in \
-			patch-lib_Makefile.in
-
 default_variants	+kerberos
 
-configure.args	--sysconfdir=${prefix}/etc \
+configure.args \
 		--mandir=${prefix}/share/man \
-		--libexecdir=${prefix}/lib \
-		--includedir=${prefix}/include \
 		--with-openssl=${prefix} \
 		--with-dbpath=${prefix}/etc/sasldb2 \
 		--with-plugindir=${prefix}/lib/sasl2 \
 		--with-saslauthd=${prefix}/var/state/saslauthd \
 		--with-pwcheck=${prefix}/var/pwcheck \
-		--enable-checkapop \
-		--enable-cram \
-		--enable-digest \
-		--enable-otp \
+		--disable-macos-framework \
 		--enable-srp \
 		--enable-srp-setpass \
-		--enable-plain \
-		--enable-anon \
 		--enable-login \
-		--enable-auth-sasldb \
 		--enable-ntlm \
 		--with-rc4=openssl
 
-post-configure {
-	# On darwin, -L/usr/lib pulls in Apple's own non-suitable sasl libraries
-	reinplace s|-L/usr/lib||g ${worksrcpath}/utils/Makefile
+use_parallel_build  yes
+
+pre-build {
+    if {[file exists ${prefix}/lib/libsasl2.dylib]} {
+        ui_error "cyrus-sasl2 must be deactivated before upgrade."
+        error "Please run `sudo port deactivate cyrus-sasl2` and try again."
+    }
 }
 
+destroot.keepdirs \
+    ${destroot}${prefix}/var/state/saslauthd \
+    ${destroot}${prefix}/var/pwcheck
+
 post-destroot {
-	      xinstall -d -m 755 ${destroot}${prefix}/share/doc
-	      file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
-	      xinstall -d -m 755 ${destroot}${prefix}/var/state/saslauthd
-	      xinstall -d -m 755 ${destroot}${prefix}/var/pwcheck
-	      destroot.keepdirs ${destroot}${prefix}/var/state/saslauthd \
-	      ${destroot}${prefix}/var/pwcheck
+    xinstall -d \
+        ${destroot}${prefix}/share/doc \
+        ${destroot}${prefix}/var/state/saslauthd \
+	    ${destroot}${prefix}/var/pwcheck
+
+    file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name}
 }
 
 platform darwin {}
 platform freebsd {}
-variant kerberos {
+variant kerberos description "Enable Kerberos support (default)" {
+    configure.args-append   --enable-gssapi \
+                            --enable-keep-db-open
+
 	if {[variant_isset darwin]} {
-		configure.args-append --enable-gssapi --with-gss_impl=mit
+		configure.args-append --with-gss_impl=mit
 	}
 	if {[variant_isset freebsd]} {
-		configure.args-append --enable-gssapi --with-gss_impl=heimdal
+		configure.args-append --with-gss_impl=heimdal
 	}
 }
 
-variant sql	{ configure.args-append --enable-sql }
+variant sql description "Enable SQL support" { configure.args-append --enable-sql }
 
-variant static	{ configure.args-append --enable-static }
+variant static description "Build static library" { configure.args-append --enable-static }
 
 livecheck.check regex
 livecheck.url   http://ftp.andrew.cmu.edu/pub/cyrus-mail/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081119/d15682bb/attachment.html>