Upgrade to 4.02.

- flag-freebsd.h is now in the xlockmore distribution.
- xlock now works with Xauthority

3 files changed, 16 insertions, 30 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 6db39087977f..4f3748fb6fdf 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xlockmore
-# Version required:     4.01
+# Version required:     4.02
 # Date created:		9 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.16 1997/02/20 07:26:26 tg Exp $
+# $Id: Makefile,v 1.17 1997/04/03 07:18:07 tg Exp $
 #
 
-DISTNAME=       xlockmore-4.01
+DISTNAME=       xlockmore-4.02
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -17,7 +17,4 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
 
-post-extract:
-	@cp ${FILESDIR}/flag-freebsd.h ${WRKSRC}/flags
-
 .include <bsd.port.mk>
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index acaa6df358f5..c93b045b1c7c 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1 +1 @@
-MD5 (xlockmore-4.01.tar.gz) = 093ffefe3637e7484640b3f68d828815
+MD5 (xlockmore-4.02.tar.gz) = c158e6b4b99b3cff4b52b39219dbfe0e
diff --git a/x11/xlockmore/files/patch-aa b/x11/xlockmore/files/patch-aa
index 3d5fff377dbf..4d6b740d1fc3 100644
--- a/x11/xlockmore/files/patch-aa
+++ b/x11/xlockmore/files/patch-aa
@@ -1,5 +1,5 @@
---- Imakefile.orig	Mon Feb 10 18:13:32 1997
-+++ Imakefile	Wed Feb 19 18:08:29 1997
+--- Imakefile.orig	Wed Apr 16 05:36:21 1997
++++ Imakefile	Fri Apr 18 09:04:31 1997
 @@ -35,7 +35,7 @@
  
  XCOMM Only the image.c and bat.c modes use this.
@@ -29,7 +29,7 @@
  
  XCOMM Least desirable RNG
  XCOMM SRANDDEF = -DSRAND=srand
-@@ -363,9 +363,9 @@
+@@ -374,9 +381,9 @@
  XCOMM  -DSTAFF_NETGROUP=\"/etc/xlock.netgroup\"  Netgroup that is exempt
  
  XCOMM May have to combine in one long line if "+=" does not work
@@ -41,23 +41,12 @@
  XCOMM        OPTDEF += -DUSE_MULTIPLE_ROOT
  XCOMM        OPTDEF += -DUSE_OLD_EVENT_LOOP
  XCOMM        OPTDEF += -DUSE_XLOCKRC
-@@ -377,7 +377,7 @@
- XCOMM        OPTDEF += -DSTAFF_NETGROUP=\"/etc/xlock.netgroup\"
- 
- XCOMM Here is your chance to override the default icon:
--       FLAGBITS = $(FLAGTYPE)
-+       FLAGBITS = freebsd
- XCOMM     TINYBITMAP = $(BITMAPTYPE)
-      TINYBITMAP = t-x11
-     SMALLBITMAP = s-$(BITMAPTYPE)
-@@ -390,8 +390,8 @@
-     IMAGEBITMAP = $(MEDIUMBITMAP)
- XCOMM    IMAGEBITMAP = l-bob
- XCOMM    IMAGEBITMAP = m-xlock
--XCOMM     LIFEBITMAP = $(SMALLBITMAP)
--     LIFEBITMAP = s-grelb
-+     LIFEBITMAP = $(SMALLBITMAP)
-+XCOMM     LIFEBITMAP = s-grelb
-    LIFE1DBITMAP = $(TINYBITMAP)
-      MAZEBITMAP = $(LARGEBITMAP)
- XCOMM     MAZEBITMAP = m-xlock
+@@ -404,7 +411,7 @@
+ XCOMM IMAGEBITMAP = l-bob #Slackware icon
+ XCOMM IMAGEBITMAP = m-xlock #XLock icon
+ XCOMM LIFEBITMAP = $(SMALLBITMAP)
+-LIFEBITMAP = s-grelb
++LIFEBITMAP = $(SMALLBITMAP)
+ LIFE1DBITMAP = $(TINYBITMAP)
+ MAZEBITMAP = $(LARGEBITMAP)
+ XCOMM MAZEBITMAP = m-xlock