ports/88328: update x11/xlockmore to 5.20.1

[Andrew Pantyukhin]

>Number:         88328
>Category:       ports
>Synopsis:       update x11/xlockmore to 5.20.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 01 13:20:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Pantyukhin
>Release:        FreeBSD 5.4-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD proxy.gubkin.ru 5.4-RELEASE-p8 FreeBSD 5.4-RELEASE-p8 #6: Thu Oct 20 19:33:42 MSD 2005 sat at proxy.gubkin.ru:/usr/obj/usr/src/sys/SATPROXYGUB i386


	
>Description:
	- Update to 5.20.1
	- Make portlint happy
	
>How-To-Repeat:
	
>Fix:

	

--- xlock.diff begins here ---
diff -urN /usr/ports/x11/xlockmore/Makefile xlockmore/Makefile
--- /usr/ports/x11/xlockmore/Makefile	Wed Aug 31 18:41:48 2005
+++ xlockmore/Makefile	Tue Nov  1 13:49:24 2005
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xlockmore
-PORTVERSION=	5.19
-CATEGORIES?=	x11
+PORTVERSION=	5.20.1
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		http://www.tux.org/~bagleyd/latest/
 
@@ -34,7 +34,9 @@
 USE_XPM=	yes
 MAN1=		xlock.1
 
-.if ${MACHINE_ARCH} == "amd64"
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == amd64
 WITH_MESAGL=	no
 .else
 WITH_MESAGL?=	yes
@@ -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
diff -urN /usr/ports/x11/xlockmore/distinfo xlockmore/distinfo
--- /usr/ports/x11/xlockmore/distinfo	Wed Aug 31 18:41:48 2005
+++ xlockmore/distinfo	Tue Nov  1 13:51:01 2005
@@ -1,2 +1,2 @@
-MD5 (xlockmore-5.19.tar.bz2) = c80ae7689bf8683033ec08b652e24d83
-SIZE (xlockmore-5.19.tar.bz2) = 1749886
+MD5 (xlockmore-5.20.1.tar.bz2) = 0c8a85bc6e6a993f331f26563bacb1a7
+SIZE (xlockmore-5.20.1.tar.bz2) = 1769008
diff -urN /usr/ports/x11/xlockmore/files/patch-aa xlockmore/files/patch-aa
--- /usr/ports/x11/xlockmore/files/patch-aa	Wed Jul 24 15:53:21 2002
+++ xlockmore/files/patch-aa	Tue Nov  1 13:51:18 2005
@@ -1,6 +1,6 @@
 --- xlock/XLock.ad.orig	Fri Dec 14 17:51:13 2001
 +++ xlock/XLock.ad	Mon Apr 15 16:08:11 2002
-@@ -60,10 +60,10 @@
+@@ -61,10 +61,10 @@
  
  ! For marquee & nose modes
  !XLock.program: fortune -o
--- xlock.diff ends here ---


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