3 files changed, 15 insertions, 59 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 4f038e5c33f1..161844c673ef 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xlockmore
-# Version required:     4.03.1
+# Version required:     4.04
 # Date created:		9 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.19 1997/07/21 07:03:22 tg Exp $
+# $Id: Makefile,v 1.20 1997/07/30 08:02:42 tg Exp $
 #
 
-DISTNAME=       xlockmore-4.03.1
+DISTNAME=       xlockmore-4.04
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -15,6 +15,16 @@ MAINTAINER=	ports@freebsd.org
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-USE_IMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+= --without-gl --without-motif --without-sx --without-mesagl \
+		--without-editres --without-dtsaver --without-rplay \
+		--without-nas
+USE_X11=	yes
+MAN1=		xlock.1
+
+do-install:
+	@(cd ${WRKSRC}/modes; make install)
+	@chown root:bin ${PREFIX}/bin/xlock
+	@chmod 4751 ${PREFIX}/bin/xlock
 
 .include <bsd.port.mk>
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index 4c79ad673f5b..735c5ad1d134 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1 +1 @@
-MD5 (xlockmore-4.03.1.tar.gz) = 3e4ccb48d0798d3a4ceaf62eda5cb54b
+MD5 (xlockmore-4.04.tar.gz) = 8034b42cd66f40d19925208e439fcb8c
diff --git a/x11/xlockmore/files/patch-aa b/x11/xlockmore/files/patch-aa
deleted file mode 100644
index f552cda5bff5..000000000000
--- a/x11/xlockmore/files/patch-aa
+++ /dev/null
@@ -1,54 +0,0 @@
---- Imakefile.orig	Fri Jun 13 20:14:21 1997
-+++ Imakefile	Mon Jun 30 09:33:33 1997
-@@ -44,7 +44,7 @@
- 
- XCOMM Only the image.c and bat.c modes use this.
- XCOMM If your system has libXpm, remove the 'XCOMM ' from the next line.
--XCOMM #define XpmLibrary
-+#define XpmLibrary
- 
- #ifdef XpmLibrary
-           XPMDEF = -DUSE_XPM
-@@ -59,7 +59,7 @@
- 
- XCOMM If you get an error "Cannot find libXpm" while linking, set XPMLIBPATH
- XCOMM to the directory libXpm.* is in.  Below is a guess.
--          XPMLIB = -L/usr/local/lib -lXpm
-+          XPMLIB = -lXpm
- 
- #endif
- 
-@@ -174,8 +174,8 @@
- XCOMM SRANDDEF = -DSRAND=srand48
- XCOMM LRANDDEF = -DLRAND=lrand48
- 
--XCOMM SRANDDEF = -DSRAND=srandom
--XCOMM LRANDDEF = -DLRAND=random
-+SRANDDEF = -DSRAND=srandom
-+LRANDDEF = -DLRAND=random
- 
- XCOMM Least desirable RNG
- XCOMM SRANDDEF = -DSRAND=srand
-@@ -370,11 +370,11 @@
- XCOMM  -DSTAFF_NETGROUP=\"/etc/xlock.netgroup\"  Netgroup that is exempt
- 
- XCOMM May have to combine in one long line if "+=" does not work
--        OPTDEF = -DUSE_VROOT -DALWAYS_ALLOW_ROOT -DUSE_BOMB
-+XCOMM        OPTDEF = -DUSE_VROOT -DALWAYS_ALLOW_ROOT -DUSE_BOMB
- XCOMM        OPTDEF += -DUSE_SYSLOG -DSYSLOG_FACILITY=LOG_AUTH
- XCOMM        OPTDEF += -DSYSLOG_WARNING=LOG_WARNING
- XCOMM        OPTDEF += -DSYSLOG_NOTICE=LOG_NOTICE -DSYSLOG_INFO=LOG_INFO
--XCOMM        OPTDEF += -DUSE_MOUSE_MOTION
-+        OPTDEF += -DUSE_MOUSE_MOTION
- XCOMM        OPTDEF += -DUSE_MULTIPLE_ROOT
- XCOMM        OPTDEF += -DUSE_OLD_EVENT_LOOP
- XCOMM        OPTDEF += -DUSE_XLOCKRC
-@@ -403,7 +403,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