o update to 3.5.2c.

o sort pkg-plist.

PR:		30724
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 64 insertions, 66 deletions

diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 2798a2d42066..ef351b6e3657 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	ctwm
-PORTVERSION=	3.5.2b
+PORTVERSION=	3.5.2c
 CATEGORIES=	x11-wm
-MASTER_SITES=	ftp://slhp1.epfl.ch/pub/
+MASTER_SITES=	http://slhp1.epfl.ch/public/ctwm/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,8 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-MAKE_ENV=	LOCALBASE=${LOCALBASE}
-
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		ctwm.1
diff --git a/x11-wm/ctwm/distinfo b/x11-wm/ctwm/distinfo
index 7a2969771f9d..ffe97a1536dc 100644
--- a/x11-wm/ctwm/distinfo
+++ b/x11-wm/ctwm/distinfo
@@ -1,2 +1,2 @@
-MD5 (ctwm-3.5.2b.tar.gz) = 7a77c6669ade274631d65d25537c9bd1
+MD5 (ctwm-3.5.2c.tar.gz) = dd8d88639422e797fb77789f69cafab2
 MD5 (ctwm-images.tar.gz) = 4b0c784213af4afa2d736773863e53b4
diff --git a/x11-wm/ctwm/files/patch-aa b/x11-wm/ctwm/files/patch-aa
index 430b53e4ab45..f0cffd45a747 100644
--- a/x11-wm/ctwm/files/patch-aa
+++ b/x11-wm/ctwm/files/patch-aa
@@ -1,5 +1,5 @@
-*** Imakefile.orig	Mon Oct  4 15:51:08 1999
---- Imakefile	Sun Feb 13 19:01:33 2000
+*** Imakefile.orig	Mon May 15 21:47:10 2000
+--- Imakefile	Sat Sep 22 11:50:14 2001
 ***************
 *** 11,17 ****
   #undef  USE_SOUND
@@ -31,8 +31,8 @@
          LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
   
   #ifdef XPM
-!       XPMLIBDIR = -L/usr/X11R6/lib
-!       XPMINCDIR = -I/usr/X11R6/include
+!       XPMLIBDIR = -L$(USRLIBDIR)
+!       XPMINCDIR = -I$(INCROOT)
   
        XPMDEFINES = -DXPM
            XPMLIB = $(XPMLIBDIR) -lXpm
diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist
index d7fb445458eb..86ea2c6eaa5e 100644
--- a/x11-wm/ctwm/pkg-plist
+++ b/x11-wm/ctwm/pkg-plist
@@ -1,39 +1,10 @@
 bin/ctwm
-lib/X11/twm/system.ctwmrc
-lib/X11/twm/images/arthur.xpm
-lib/X11/twm/images/claude.xpm
-lib/X11/twm/images/datebook.xpm
-lib/X11/twm/images/emacs.xpm
-lib/X11/twm/images/hpterm.xpm
-lib/X11/twm/images/mail0.xpm
-lib/X11/twm/images/mail1.xpm
-lib/X11/twm/images/pixmap.xpm
-lib/X11/twm/images/postit.xpm
-lib/X11/twm/images/unknown.xpm
-lib/X11/twm/images/xarchie.xpm
-lib/X11/twm/images/xedit.xpm
-lib/X11/twm/images/xgopher.xpm
-lib/X11/twm/images/xman.xpm
-lib/X11/twm/images/xrn.xpm
-lib/X11/twm/images/xterm.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/cdrom1.xpm
-lib/X11/twm/images/nothing.xpm
-lib/X11/twm/images/term.xpm
-lib/X11/twm/images/unread.xpm
-lib/X11/twm/images/xcalc.xpm
-lib/X11/twm/images/xcalc2.xpm
-lib/X11/twm/images/xgrab.xpm
-lib/X11/twm/images/xhpcalc.xpm
-lib/X11/twm/images/xmail.xpm
-lib/X11/twm/images/xnomail.xpm
-lib/X11/twm/images/xrn.goodnews.xpm
-lib/X11/twm/images/xrn.nonews.xpm
-lib/X11/twm/images/welcome.xpm
-lib/X11/twm/images/xftp.xpm
+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/3dcircle.xpm
 lib/X11/twm/images/3ddimple.xpm
 lib/X11/twm/images/3ddot.xpm
@@ -41,15 +12,15 @@ lib/X11/twm/images/3dfeet.xpm
 lib/X11/twm/images/3dleopard.xpm
 lib/X11/twm/images/3dpie.xpm
 lib/X11/twm/images/3dpyramid.xpm
-lib/X11/twm/images/background8.xpm
 lib/X11/twm/images/3dslant.xpm
-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/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/3D_Menu15.xpm
-lib/X11/twm/images/3D_Resize15.xpm
-lib/X11/twm/images/3D_Zoom15.xpm
 lib/X11/twm/images/ball10.xpm
 lib/X11/twm/images/ball11.xpm
 lib/X11/twm/images/ball12.xpm
@@ -61,6 +32,29 @@ 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
@@ -70,24 +64,30 @@ 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/skull.xpm
-lib/X11/twm/images/spider.xpm
-lib/X11/twm/images/nt1.xpm
-lib/X11/twm/images/nt2.xpm
-lib/X11/twm/images/audio_editor.xpm
-lib/X11/twm/images/clipboard.xpm
-lib/X11/twm/images/ghostview.xpm
+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/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/welcome.xwd
+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/system.ctwmrc
 @dirrm lib/X11/twm/images
 @unexec rmdir %D/lib/X11/twm 2>/dev/null || true