ports/64191: cyrus-sasl2 port Makefile doesn't obey Makefile.local

[George Hartzell]

>Number:         64191
>Category:       ports
>Synopsis:       cyrus-sasl2 port Makefile doesn't obey Makefile.local
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 12 20:20:09 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     George Hartzell
>Release:        5.2.1
>Organization:
>Environment:
(bloop)[4:19am]cyrus-sasl2>>uname -a
FreeBSD bloop.alerce.com 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #0: Mon Mar  8 04:06:53 PST 2004     root at bloop.alerce.com:/usr/obj/usr/src/sys/BLOOP  i386

>Description:
Trying to set make options (e.g. WITH_BDB_VER=42) doesn't work.
>How-To-Repeat:
Create a Makefile.local that contains the line
WITH_BDB_VER=42 (make sure it's not in /etc/make.conf or
one of the portupgrade config files).  Notice that it's ignored.
>Fix:
Move the include of bsd.port.pre.mk above the lines that test
for the various useful conditions.

(bloop)[4:19am]cyrus-sasl2>>rcsdiff -c 2 Makefile
rcsdiff: RCS/2,v: No such file or directory
===================================================================
RCS file: Makefile,v
retrieving revision 1.1
diff -c -r1.1 Makefile
*** Makefile    2004/03/13 12:07:47     1.1
--- Makefile    2004/03/13 12:08:12
***************
*** 54,59 ****
--- 54,61 ----
                --with-rc4=openssl \
                --with-saslauthd
  
+ .include <bsd.port.pre.mk>
+ 
  .if defined(WITH_BDB_VER)
  .if ${WITH_BDB_VER} == 3
  LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3
***************
*** 140,147 ****
  .else
  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}
--- 142,147 ----

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