ports/60393: [PATCH] Makefile of security/cyrus-sasl2 is broken (both on -CURRENT and -STABLE)

[Oleg Sharoiko]

>Number:         60393
>Category:       ports
>Synopsis:       [PATCH] Makefile of security/cyrus-sasl2 is broken (both on -CURRENT and -STABLE)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 19 00:20:19 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Oleg Sharoiko
>Release:        FreeBSD 5.2-BETA i386
>Organization:
Computer Center of Rostov State University
>Environment:
System: FreeBSD brain.cc.rsu.ru 5.2-BETA FreeBSD 5.2-BETA #0: Tue Dec 2 13:24:13 MSK 2003 os at brain.cc.rsu.ru:/usr/obj/usr/src/sys/brain.athlon-xp.HEAD.2003-12-02 i386


	
>Description:

	The Makefile of security/cyrus-sasl2 is broken:

make, /usr/ports/security/cyrus-sasl2 # make
"Makefile", line 123: Malformed conditional (!defined(WITHOUT_GSSAPI) && (defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105) && exists(/usr/lib/libkrb5.a))
make: fatal errors encountered -- cannot continue

	There seems to be two bugs:

	1. Space is required after 500105 in order make don't treat it as a string "500105)" but as a number 500105 and a closing bracket

	2. bsd.port.pre.mk should be included before the use of $OSVERSION
	
>How-To-Repeat:
	cd /usr/ports/security/cyrus-sasl2
	make
>Fix:

	Apply the patch:

--- Makefile	Fri Dec 19 07:48:16 2003
+++ Makefile.fixed	Fri Dec 19 10:36:49 2003
@@ -116,18 +116,18 @@
 CONFIGURE_ARGS+=--enable-ntlm
 .endif
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_GSSAPI) && defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a)
 CONFIGURE_ARGS+=--enable-gssapi=${KRB5_HOME}
 .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) && (defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105) && exists(/usr/lib/libkrb5.a)
+.elif !defined(WITHOUT_GSSAPI) && (defined(MAKE_KERBEROS5) || ( ${OSVERSION} > 500105 )) && exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=--enable-gssapi
 .else
 CONFIGURE_ARGS+=--disable-gssapi
 GSSAPI=	"@comment "
 .endif
-
-.include <bsd.port.pre.mk>
 
 # KERBEROS 4 was removed in FreeBSD 5.0-CURRENT
 .if ${OSVERSION} > 500105

>Release-Note:
>Audit-Trail:
>Unformatted: