Upgrade to 3.4 patchlevel 2

4 files changed, 103 insertions, 94 deletions

diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 7cce74633710..398942f6a138 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	ctwm
-# Version required:	3.3
+# Version required:	3.4
 # Date created:		13 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.8 1995/04/12 20:30:59 asami Exp $
+# $Id: Makefile,v 1.9 1995/11/09 05:55:29 asami Exp $
 #
 
-DISTNAME=	ctwm-3.3
+DISTNAME=	ctwm-3.4pl2
+PKGNAME=	ctwm-3.4.2
 CATEGORIES+=	x11
 MASTER_SITES=	ftp://ftp.x.org/contrib/window_managers/
-EXTRACT_SUFX=	.tar.Z
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
diff --git a/x11-wm/ctwm/distinfo b/x11-wm/ctwm/distinfo
index beb7ddfa975e..e8491e131379 100644
--- a/x11-wm/ctwm/distinfo
+++ b/x11-wm/ctwm/distinfo
@@ -1 +1 @@
-MD5 (ctwm-3.3.tar.Z) = 2ff78374ce4a24b5527c5c83e1917b07
+MD5 (ctwm-3.4pl2.tar.gz) = 4cc5e8da53fffe6f9e3b8ecca2319696
diff --git a/x11-wm/ctwm/files/patch-aa b/x11-wm/ctwm/files/patch-aa
index 2bb0c27cc431..aca61e317224 100644
--- a/x11-wm/ctwm/files/patch-aa
+++ b/x11-wm/ctwm/files/patch-aa
@@ -1,11 +1,11 @@
-*** Imakefile.orig	Wed Jan  4 18:10:33 1995
---- Imakefile	Sat Feb 11 11:48:41 1995
+*** Imakefile.orig	Sun Sep 15 00:25:16 1996
+--- Imakefile	Sun Sep 15 00:28:49 1996
 ***************
-*** 10,24 ****
-  #undef  IMCONV
+*** 11,25 ****
   #undef  USE_SOUND
   #define XPM
   #define USEM4
+! #undef X11R6
   
            YFLAGS = -d
           DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
@@ -17,18 +17,18 @@
   
        XPMDEFINES = -DXPM
            XPMLIB = $(XPMLIBDIR) -lXpm
---- 10,24 ----
-  #undef  IMCONV
+--- 11,25 ----
   #undef  USE_SOUND
   #define XPM
-  #define  USEM4
+  #define USEM4
+! #define X11R6
   
            YFLAGS = -d
           DEPLIBS = $(DEPXMULIB) $(DEPEXTENSIONLIB) $(DEPXLIB)
          LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
   
   #ifdef XPM
-!       XPMLIBDIR = -L /usr/X11R6/lib
+!       XPMLIBDIR = -L/usr/X11R6/lib
 !       XPMINCDIR = -I/usr/X11R6/include
   
        XPMDEFINES = -DXPM
diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist
index 704dc70ff498..d278aef0e0ff 100644
--- a/x11-wm/ctwm/pkg-plist
+++ b/x11-wm/ctwm/pkg-plist
@@ -2,84 +2,92 @@
 bin/ctwm
 lib/X11/twm/system.ctwmrc
 man/man1/ctwm.1.gz
-lib/X11/twm/images/3D_Expand15.xpm
-lib/X11/twm/images/3D_Iconify15.xpm
-lib/X11/twm/images/3D_Lightning15.xpm
-lib/X11/twm/images/3D_Menu15.xpm
-lib/X11/twm/images/3D_Resize15.xpm
-lib/X11/twm/images/3D_Zoom15.xpm
-lib/X11/twm/images/IslandD.xpm
-lib/X11/twm/images/IslandW.xpm
-lib/X11/twm/images/LRom.xpm
-lib/X11/twm/images/LRom1.xpm
-lib/X11/twm/images/arthur.xpm
-lib/X11/twm/images/audio_editor.xpm
-lib/X11/twm/images/background8.xpm
-lib/X11/twm/images/ball1.xpm
-lib/X11/twm/images/ball10.xpm
-lib/X11/twm/images/ball11.xpm
-lib/X11/twm/images/ball12.xpm
-lib/X11/twm/images/ball2.xpm
-lib/X11/twm/images/ball3.xpm
-lib/X11/twm/images/ball4.xpm
-lib/X11/twm/images/ball5.xpm
-lib/X11/twm/images/ball6.xpm
-lib/X11/twm/images/ball7.xpm
-lib/X11/twm/images/ball8.xpm
-lib/X11/twm/images/ball9.xpm
-lib/X11/twm/images/cdrom1.xpm
-lib/X11/twm/images/claude.xpm
-lib/X11/twm/images/clipboard.xpm
-lib/X11/twm/images/datebook.xpm
-lib/X11/twm/images/emacs.xpm
-lib/X11/twm/images/ghostview.xpm
-lib/X11/twm/images/gnu-emacs1.xpm
-lib/X11/twm/images/gnu-emacs2.xpm
-lib/X11/twm/images/gnu-emacs3.xpm
-lib/X11/twm/images/gnu-emacs4.xpm
-lib/X11/twm/images/gnu-emacs5.xpm
-lib/X11/twm/images/gnu-emacs6.xpm
-lib/X11/twm/images/gnu-emacs7.xpm
-lib/X11/twm/images/hpterm.xpm
-lib/X11/twm/images/mail0.xpm
-lib/X11/twm/images/mail1.xpm
-lib/X11/twm/images/nothing.xpm
-lib/X11/twm/images/nt1.xpm
-lib/X11/twm/images/nt2.xpm
-lib/X11/twm/images/pixmap.xpm
-lib/X11/twm/images/postit.xpm
-lib/X11/twm/images/skull.xpm
-lib/X11/twm/images/spider.xpm
-lib/X11/twm/images/supman1.xbm
-lib/X11/twm/images/supman2.xbm
-lib/X11/twm/images/supman3.xbm
-lib/X11/twm/images/supman4.xbm
-lib/X11/twm/images/supman5.xbm
-lib/X11/twm/images/supman6.xbm
-lib/X11/twm/images/supman7.xbm
-lib/X11/twm/images/supman8.xbm
-lib/X11/twm/images/supman9.xbm
-lib/X11/twm/images/term.xpm
-lib/X11/twm/images/unknown.xpm
-lib/X11/twm/images/unknown1.xpm
-lib/X11/twm/images/unread.xpm
-lib/X11/twm/images/welcome.xpm
-lib/X11/twm/images/welcome.xwd
-lib/X11/twm/images/xarchie.xpm
-lib/X11/twm/images/xcalc.xpm
-lib/X11/twm/images/xcalc2.xpm
-lib/X11/twm/images/xedit.xpm
-lib/X11/twm/images/xftp.xpm
-lib/X11/twm/images/xgopher.xpm
-lib/X11/twm/images/xgrab.xpm
-lib/X11/twm/images/xhpcalc.xpm
-lib/X11/twm/images/xirc.xpm
-lib/X11/twm/images/xmail.xpm
-lib/X11/twm/images/xman.xpm
-lib/X11/twm/images/xmosaic.xpm
-lib/X11/twm/images/xnomail.xpm
-lib/X11/twm/images/xrn-compose.xpm
-lib/X11/twm/images/xrn.goodnews.xpm
-lib/X11/twm/images/xrn.nonews.xpm
-lib/X11/twm/images/xrn.xpm
-lib/X11/twm/images/xterm.xpm
+lib/X11/twm/images/xpm/3D_Expand15.xpm
+lib/X11/twm/images/xpm/3D_Iconify15.xpm
+lib/X11/twm/images/xpm/3D_Lightning15.xpm
+lib/X11/twm/images/xpm/3D_Menu15.xpm
+lib/X11/twm/images/xpm/3D_Resize15.xpm
+lib/X11/twm/images/xpm/3D_Zoom15.xpm
+lib/X11/twm/images/xpm/3dcircle.xpm
+lib/X11/twm/images/xpm/3ddimple.xpm
+lib/X11/twm/images/xpm/3ddot.xpm
+lib/X11/twm/images/xpm/3dfeet.xpm
+lib/X11/twm/images/xpm/3dleopard.xpm
+lib/X11/twm/images/xpm/3dpie.xpm
+lib/X11/twm/images/xpm/3dpyramid.xpm
+lib/X11/twm/images/xpm/3dslant.xpm
+lib/X11/twm/images/xpm/IslandD.xpm
+lib/X11/twm/images/xpm/IslandW.xpm
+lib/X11/twm/images/xpm/LRom.xpm
+lib/X11/twm/images/xpm/LRom1.xpm
+lib/X11/twm/images/xpm/arthur.xpm
+lib/X11/twm/images/xpm/audio_editor.xpm
+lib/X11/twm/images/xpm/background8.xpm
+lib/X11/twm/images/xpm/ball1.xpm
+lib/X11/twm/images/xpm/ball10.xpm
+lib/X11/twm/images/xpm/ball11.xpm
+lib/X11/twm/images/xpm/ball12.xpm
+lib/X11/twm/images/xpm/ball2.xpm
+lib/X11/twm/images/xpm/ball3.xpm
+lib/X11/twm/images/xpm/ball4.xpm
+lib/X11/twm/images/xpm/ball5.xpm
+lib/X11/twm/images/xpm/ball6.xpm
+lib/X11/twm/images/xpm/ball7.xpm
+lib/X11/twm/images/xpm/ball8.xpm
+lib/X11/twm/images/xpm/ball9.xpm
+lib/X11/twm/images/xpm/cdrom1.xpm
+lib/X11/twm/images/xpm/claude.xpm
+lib/X11/twm/images/xpm/clipboard.xpm
+lib/X11/twm/images/xpm/datebook.xpm
+lib/X11/twm/images/xpm/emacs.xpm
+lib/X11/twm/images/xpm/ghostview.xpm
+lib/X11/twm/images/xpm/gnu-emacs1.xpm
+lib/X11/twm/images/xpm/gnu-emacs2.xpm
+lib/X11/twm/images/xpm/gnu-emacs3.xpm
+lib/X11/twm/images/xpm/gnu-emacs4.xpm
+lib/X11/twm/images/xpm/gnu-emacs5.xpm
+lib/X11/twm/images/xpm/gnu-emacs6.xpm
+lib/X11/twm/images/xpm/gnu-emacs7.xpm
+lib/X11/twm/images/xpm/hpterm.xpm
+lib/X11/twm/images/xpm/mail0.xpm
+lib/X11/twm/images/xpm/mail1.xpm
+lib/X11/twm/images/xpm/nothing.xpm
+lib/X11/twm/images/xpm/nt1.xpm
+lib/X11/twm/images/xpm/nt2.xpm
+lib/X11/twm/images/xpm/pixmap.xpm
+lib/X11/twm/images/xpm/postit.xpm
+lib/X11/twm/images/xpm/skull.xpm
+lib/X11/twm/images/xpm/spider.xpm
+lib/X11/twm/images/xpm/supman1.xbm
+lib/X11/twm/images/xpm/supman2.xbm
+lib/X11/twm/images/xpm/supman3.xbm
+lib/X11/twm/images/xpm/supman4.xbm
+lib/X11/twm/images/xpm/supman5.xbm
+lib/X11/twm/images/xpm/supman6.xbm
+lib/X11/twm/images/xpm/supman7.xbm
+lib/X11/twm/images/xpm/supman8.xbm
+lib/X11/twm/images/xpm/supman9.xbm
+lib/X11/twm/images/xpm/term.xpm
+lib/X11/twm/images/xpm/unknown.xpm
+lib/X11/twm/images/xpm/unknown1.xpm
+lib/X11/twm/images/xpm/unread.xpm
+lib/X11/twm/images/xpm/welcome.xpm
+lib/X11/twm/images/xpm/welcome.xwd
+lib/X11/twm/images/xpm/xarchie.xpm
+lib/X11/twm/images/xpm/xcalc.xpm
+lib/X11/twm/images/xpm/xcalc2.xpm
+lib/X11/twm/images/xpm/xedit.xpm
+lib/X11/twm/images/xpm/xftp.xpm
+lib/X11/twm/images/xpm/xgopher.xpm
+lib/X11/twm/images/xpm/xgrab.xpm
+lib/X11/twm/images/xpm/xhpcalc.xpm
+lib/X11/twm/images/xpm/xirc.xpm
+lib/X11/twm/images/xpm/xmail.xpm
+lib/X11/twm/images/xpm/xman.xpm
+lib/X11/twm/images/xpm/xmosaic.xpm
+lib/X11/twm/images/xpm/xnomail.xpm
+lib/X11/twm/images/xpm/xrn-compose.xpm
+lib/X11/twm/images/xpm/xrn.goodnews.xpm
+lib/X11/twm/images/xpm/xrn.nonews.xpm
+lib/X11/twm/images/xpm/xrn.xpm
+lib/X11/twm/images/xpm/xterm.xpm