Upgrade to version 3.11.

4 files changed, 66 insertions, 20 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index dbdb4eac1819..11b62e90d53f 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,17 +1,23 @@
 # New ports collection makefile for:	xlockmore
-# Version required:     3.9
+# Version required:     3.11
 # Date created:		9 November 1994
 # Whom:			smace
 #
 # $id: Makefile,v 1.0 1994/11/09 00:00:00 smace Exp $
 #
 
-DISTNAME=       xlockmore-3.9
-PKGNAME=        xlockmore-3.9
-CATEGORIES+=	x11
+DISTNAME=       xlockmore-3.11
 MASTER_SITES+=  ftp://crl.dec.com/pub/X11/contrib/applications/
 MASTER_SITES+=	ftp://ftp.x.org/contrib/applications/
 
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${DISTNAME}.patches
+PATCH_DIST_STRIP=	-p1
+
+MAINTAINER=	ports@freebsd.org
+
+LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
+
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index be70693903ea..4fce21751ff2 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1 +1,2 @@
-MD5 (xlockmore-3.9.tar.gz) = 368dab072738f765896d6ce805d777e0
+MD5 (xlockmore-3.11.tar.gz) = 103b44c2a0333dbb740f10b124c67fd0
+MD5 (xlockmore-3.11.patches) = 651abafe7c168579aa39c2471b225184
diff --git a/x11/xlockmore/files/patch-aa b/x11/xlockmore/files/patch-aa
index 8affee5658c5..f3f89ad50b24 100644
--- a/x11/xlockmore/files/patch-aa
+++ b/x11/xlockmore/files/patch-aa
@@ -1,12 +1,54 @@
-*** resource.c.orig	Tue Jul 23 08:45:25 1996
---- resource.c	Tue Jul 23 08:45:31 1996
-***************
-*** 890,896 ****
-  				struct hostent *host;
-  				char      **hp;
-  				int         badhost = 1;
-- 				extern int  gethostname(char *, size_t);
-  
-  				if (gethostname(hostname, MAXHOSTNAMELEN))
-  					error("%s: Can not get local hostname.\n");
---- 890,895 ----
+--- Imakefile.orig	Mon Oct  7 17:16:40 1996
++++ Imakefile	Sat Nov  2 14:09:57 1996
+@@ -8,7 +8,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 = -DHAS_XPM
+@@ -16,11 +16,11 @@
+ XCOMM If you get an error "Cannot find xpm.h" while compiling, set
+ XCOMM XPMINC to the directory X11/xpm.h is in.  If your xpm.h is not in a
+ XCOMM X11 directory, edit the xpm modes to reflect this.  Below is a guess.
+-          XPMINC = -I/usr/local/include
++XCOMM          XPMINC = -I/usr/local/include
+ 
+ XCOMM If you get an error "Connot 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
+ 
+@@ -270,9 +270,9 @@
+ XCOMM  -DSTAFF_FILE=\"/etc/xlock.staff\"  file of staff who are exempt
+ 
+ XCOMM May have to combine in one long line if "+=" does not work
+-        OPTDEF = -DUSE_VROOT -DALWAYS_ALLOW_ROOT
++XCOMM        OPTDEF = -DUSE_VROOT -DALWAYS_ALLOW_ROOT
+ XCOMM        OPTDEF += -DSYSLOG
+-XCOMM        OPTDEF += -DMOUSE_MOTION
++        OPTDEF += -DMOUSE_MOTION
+ XCOMM        OPTDEF += -DMULTIPLE_ROOT
+ XCOMM        OPTDEF += -DOLD_EVENT_LOOP
+ XCOMM        0PTDEF += -DUSE_XLOCKRC
+@@ -291,14 +291,14 @@
+    MEDIUMPIXMAP = m-$(PIXMAPTYPE)
+ XCOMM     EYESBITMAP = $(MEDIUMBITMAP)
+     IMAGEBITMAP = $(MEDIUMBITMAP)
+-XCOMM     LIFEBITMAP = $(SMALLBITMAP)
++     LIFEBITMAP = $(SMALLBITMAP)
+    LIFE1DBITMAP = $(TINYBITMAP)
+      MAZEBITMAP = $(LARGEBITMAP)
+    PUZZLEBITMAP = $(LARGEBITMAP)
+      EYESBITMAP = m-grelb
+ XCOMM    IMAGEBITMAP = l-bob
+ XCOMM    IMAGEBITMAP = m-xlock
+-     LIFEBITMAP = s-grelb
++XCOMM     LIFEBITMAP = s-grelb
+ XCOMM     MAZEBITMAP = m-xlock
+     IMAGEPIXMAP = $(MEDIUMPIXMAP)
+    PUZZLEPIXMAP = $(MEDIUMPIXMAP)
diff --git a/x11/xlockmore/pkg-plist b/x11/xlockmore/pkg-plist
index f39aadb3a959..ea72ae70ab5e 100644
--- a/x11/xlockmore/pkg-plist
+++ b/x11/xlockmore/pkg-plist
@@ -1,6 +1,3 @@
-@cwd /usr/X11R6
 lib/X11/app-defaults/XLock
 man/man1/xlock.1.gz
-@owner root
-@mode 4555
 bin/xlock