ports/79814: ports/x11/xlockmore Makefile broken [patch]

[Helge Oldach]

>Number:         79814
>Category:       ports
>Synopsis:       ports/x11/xlockmore Makefile broken [patch]
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 12 05:20:28 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:

System: FreeBSD localhost 4.11-STABLE FreeBSD 4.11-STABLE #2115: Wed Apr 6 18:33:41 CEST 2005 toor at localhost:/usr/obj/usr/src/sys/GENERIC i386

>Description:

ports/x11/xlockmore fails to build after Makefile 1.91. Trivial patch below.

>How-To-Repeat:

# cd /usr/ports/x11/xlockmore
# make
"/usr/ports/x11/xlockmore/Makefile", line 37: Malformed conditional (${ARCH} == "amd64")
"/usr/ports/x11/xlockmore/Makefile", line 37: Need an operator
"/usr/ports/x11/xlockmore/Makefile", line 39: if-less else
"/usr/ports/x11/xlockmore/Makefile", line 39: Need an operator
"/usr/ports/x11/xlockmore/Makefile", line 41: if-less endif
"/usr/ports/x11/xlockmore/Makefile", line 41: Need an operator
make: fatal errors encountered -- cannot continue
# 

>Fix:

--- Makefile~	Tue Apr 12 00:11:51 2005
+++ Makefile	Tue Apr 12 07:06:58 2005
@@ -34,6 +34,8 @@
 USE_XPM=	yes
 MAN1=		xlock.1
 
+.include <bsd.port.pre.mk>
+
 .if ${ARCH} == "amd64"
 WITH_MESAGL=	no
 .else
@@ -60,8 +62,6 @@
 .endif
 
 CONFIGURE_ENV+=		XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}"
-
-.include <bsd.port.pre.mk>
 
 .if defined(WITH_DISABLE_ALLOW_ROOT)
 CONFIGURE_ARGS+=	--disable-allow-root
>Release-Note:
>Audit-Trail:
>Unformatted: