diff options
| -rw-r--r-- | x11/xlockmore/Makefile | 10 | ||||
| -rw-r--r-- | x11/xlockmore/distinfo | 3 | ||||
| -rw-r--r-- | x11/xlockmore/files/patch-aa | 57 |
3 files changed, 35 insertions, 35 deletions
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 9874f4ad47ce..2e953d714104 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,20 +1,16 @@ # New ports collection makefile for: xlockmore -# Version required: 3.11 +# Version required: 3.12 # Date created: 9 November 1994 # Whom: smace # -# $Id: Makefile,v 1.11 1996/11/18 09:56:35 asami Exp $ +# $Id: Makefile,v 1.12 1996/11/19 00:52:18 asami Exp $ # -DISTNAME= xlockmore-3.11 +DISTNAME= xlockmore-3.12 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= ${DISTNAME}.patches -PATCH_DIST_STRIP= -p1 - MAINTAINER= ports@freebsd.org LIB_DEPENDS= Xpm\\.4\\.:${PORTSDIR}/graphics/xpm diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index 4fce21751ff2..521e80164a21 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,2 +1 @@ -MD5 (xlockmore-3.11.tar.gz) = 103b44c2a0333dbb740f10b124c67fd0 -MD5 (xlockmore-3.11.patches) = 651abafe7c168579aa39c2471b225184 +MD5 (xlockmore-3.12.tar.gz) = 91194fa5b7e58330e8dfac7ec0e4d4eb diff --git a/x11/xlockmore/files/patch-aa b/x11/xlockmore/files/patch-aa index f3f89ad50b24..6680862c2b58 100644 --- a/x11/xlockmore/files/patch-aa +++ b/x11/xlockmore/files/patch-aa @@ -1,20 +1,13 @@ ---- Imakefile.orig Mon Oct 7 17:16:40 1996 -+++ Imakefile Sat Nov 2 14:09:57 1996 -@@ -8,7 +8,7 @@ +--- Imakefile.orig Thu Nov 14 19:52:37 1996 ++++ Imakefile Sat Nov 30 12:34:41 1996 +@@ -17,13 +17,13 @@ - 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. + XCOMM XPMINC to the directory X11/xpm.h is in. Below is a guess. - XPMINC = -I/usr/local/include +XCOMM XPMINC = -I/usr/local/include + XCOMM SGI's ViewKit (use with -DHAS_XPMINC) + XCOMM XPMINC = -I/usr/include/Vk XCOMM If you get an error "Connot find libXpm" while linking, set XPMLIBPATH XCOMM to the directory libXpm.* is in. Below is a guess. @@ -23,8 +16,26 @@ #endif -@@ -270,9 +270,9 @@ - XCOMM -DSTAFF_FILE=\"/etc/xlock.staff\" file of staff who are exempt +@@ -35,7 +35,7 @@ + XCOMM You must copy it out of the hackers directory. + XCOMM It is there because it is experimental. + XCOMM If your system has libXm, remove the 'XCOMM ' from the next line. +-#define XmLibrary ++XCOMM #define XmLibrary + + #ifdef XmLibrary + XCOMM If its not with your X11 stuff you should set the following +@@ -148,7 +148,7 @@ + + XCOMM Uncomment to use hackers modes. It may make xlock unstable. + XCOMM Please do not uncomment for precompiled distributions. +-#define Hackers ++XCOMM #define Hackers + + #ifdef Hackers + XCOMM If you only want some of these you must remove the ones you do +@@ -322,9 +322,9 @@ + 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 @@ -35,20 +46,14 @@ XCOMM OPTDEF += -DMULTIPLE_ROOT XCOMM OPTDEF += -DOLD_EVENT_LOOP XCOMM 0PTDEF += -DUSE_XLOCKRC -@@ -291,14 +291,14 @@ - MEDIUMPIXMAP = m-$(PIXMAPTYPE) - XCOMM EYESBITMAP = $(MEDIUMBITMAP) +@@ -350,8 +350,8 @@ IMAGEBITMAP = $(MEDIUMBITMAP) --XCOMM LIFEBITMAP = $(SMALLBITMAP) -+ LIFEBITMAP = $(SMALLBITMAP) - LIFE1DBITMAP = $(TINYBITMAP) - MAZEBITMAP = $(LARGEBITMAP) - PUZZLEBITMAP = $(LARGEBITMAP) - EYESBITMAP = m-grelb 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 - IMAGEPIXMAP = $(MEDIUMPIXMAP) - PUZZLEPIXMAP = $(MEDIUMPIXMAP) |