6 files changed, 26 insertions, 89 deletions
diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog
index 767f0deb45da..e537b4ce91cf 100644
--- a/x11-wm/ctwm/ChangeLog
+++ b/x11-wm/ctwm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/ctwm
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.10 2004/11/14 09:50:36 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.11 2005/07/31 07:59:10 usata Exp $
+
+*ctwm-3.7 (31 Jul 2005)
+
+  31 Jul 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/ctwm-3.7_alpha4-gentoo.diff, -ctwm-3.7_alpha4-r1.ebuild,
+  +ctwm-3.7.ebuild:
+  Version bumped. Thanks to J. O. Aho <hanssen_dk@hotmail.com>; bug #99980.
 
 *ctwm-3.7_alpha5 (14 Nov 2004)
 
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 4769c970a388..7c7e57f0d3b7 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9eb6b4113435f6163acecde9097ff65a ctwm-3.7_alpha5.ebuild 1105
-MD5 a5862e814db26ea9ff512243932b291b ctwm-3.6-r1.ebuild 1048
-MD5 42679fd1b5e0c3c6415b2702689469dd ChangeLog 1692
+MD5 a867cb1e9aa5cb40911a3d9820c6a470 ChangeLog 1929
+MD5 5b469b87802847cd61b8a90c29b90670 ctwm-3.7.ebuild 1139
 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 1f8fa198dcdb479bc56eb1e187784dda ctwm-3.7_alpha4-r1.ebuild 1111
-MD5 0bf2e7481cbc018b3789b2497a8a5de0 files/ctwm-3.7_alpha4-gentoo.diff 1881
+MD5 a5862e814db26ea9ff512243932b291b ctwm-3.6-r1.ebuild 1048
+MD5 9eb6b4113435f6163acecde9097ff65a ctwm-3.7_alpha5.ebuild 1105
+MD5 6752682809aa0c15d7e76cd6013da292 files/ctwm-3.6-r1-gentoo.diff 1329
 MD5 ac93af67c3e0962fa6e53f59e290b6c0 files/digest-ctwm-3.6-r1 123
+MD5 ac24a199346d0958f4fb50d81e213cb3 files/digest-ctwm-3.7 61
 MD5 11e5c7ab948805ff25230a38e9bb828f files/ctwm-3.7_alpha5-gentoo.diff 827
-MD5 1161ba997a9299f20a3e154ba80fb99e files/digest-ctwm-3.7_alpha4-r1 67
-MD5 6752682809aa0c15d7e76cd6013da292 files/ctwm-3.6-r1-gentoo.diff 1329
 MD5 b2328b3b7f7a512f0631c753fb185170 files/digest-ctwm-3.7_alpha5 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFBlyp0VWNWqTUmv+0RAkUdAJ9IGUfJmqtiGzHN3uu2GbZJgGz7ngCfajHv
-TnjrhxWhFdL/TjSLzSwCZ/Q=
-=Ugn0
+iD8DBQFC7IGkVWNWqTUmv+0RAnzjAJ9VCeEYptPkSg43WyIP0HefyH/FpgCeLGtq
+Qhjh5uuiuftxgQC0nFLgy4M=
+=XZIy
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/ctwm/ctwm-3.7_alpha4-r1.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
index 28577dae02d7..2af123832f05 100644
--- a/x11-wm/ctwm/ctwm-3.7_alpha4-r1.ebuild
+++ b/x11-wm/ctwm/ctwm-3.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7_alpha4-r1.ebuild,v 1.4 2004/06/24 23:40:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7.ebuild,v 1.1 2005/07/31 07:59:10 usata Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ MY_P="${P/_/-}"
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A clean, light window manager."
-#SRC_URI="http://ctwm.free.lp.se/dist/${MY_P}.tar.gz"
-SRC_URI="http://ctwm.free.lp.se/preview/${MY_P}.tar.gz"
+SRC_URI="http://ctwm.free.lp.se/dist/${MY_P}.tar.gz"
+#SRC_URI="http://ctwm.free.lp.se/preview/${MY_P}.tar.gz"
 HOMEPAGE="http://ctwm.free.lp.se/"
 
 SLOT="0"
@@ -21,13 +21,9 @@ LICENSE="MIT"
 DEPEND="virtual/x11
 	media-libs/jpeg"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
 src_compile() {
+	sed -i -e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" Imakefile || die
+	cp Imakefile.local-template Imakefile.local || die
 	xmkmf || die
 	make TWMDIR=/usr/share/${PN} || die
 }
diff --git a/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff
deleted file mode 100644
index b9b8876ca9b7..000000000000
--- a/x11-wm/ctwm/files/ctwm-3.7_alpha4-gentoo.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -urN ctwm-3.7-alpha4.ORIG/Imakefile ctwm-3.7-alpha4/Imakefile
---- ctwm-3.7-alpha4.ORIG/Imakefile	2003-03-01 01:36:35.000000000 +0900
-+++ ctwm-3.7-alpha4/Imakefile	2004-02-07 14:30:25.680991653 +0900
-@@ -161,7 +161,7 @@
- 
- AllTarget(ctwm)
- 
--SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)$(TWMDIR)'/system.ctwmrc"')
-+SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)/etc/X11/twm'/system.ctwmrc"')
- SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="'$(DESTDIR)$(TWMDIR)'/images"')
- #if !HasPutenv
- SpecialObjectRule(util.o,util.c,-DNOPUTENV)
-@@ -171,7 +171,7 @@
- 
- NormalLibraryTarget(ctwm, libctwm.o)
- ComplexProgramTarget(ctwm)
--InstallNonExecFile(system.ctwmrc,$(TWMDIR))
-+InstallNonExecFile(system.ctwmrc,/etc/X11/twm)
- #ifdef XPM
- install::
- 	MakeDir($(DESTDIR)$(TWMDIR)/images)
-diff -urN ctwm-3.7-alpha4.ORIG/gram.y ctwm-3.7-alpha4/gram.y
---- ctwm-3.7-alpha4.ORIG/gram.y	2003-02-21 04:27:28.000000000 +0900
-+++ ctwm-3.7-alpha4/gram.y	2004-02-07 14:30:43.643214568 +0900
-@@ -429,10 +429,10 @@
- 
- 		| WINDOW_GEOMETRIES 	 {  }
- 		  wingeom_list
--		  ;
- 
- 		| VIRTUAL_SCREENS      	{ }
- 		  geom_list
-+		  ;
- 
- noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
- 					    twmrc_error_prefix();
-@@ -700,7 +700,8 @@
- geom_entries	: /* Empty */
- 		| geom_entries geom_entry
- 		;
--geom_entry	: string { AddToList (&Scr->VirtualScreens, $1, "") }
-+geom_entry	: string { AddToList (&Scr->VirtualScreens, $1, ""); }
-+		;
- 
- squeeze		: SQUEEZE_TITLE { 
- 				    if (HasShape) Scr->SqueezeTitle = TRUE;
-@@ -849,8 +850,7 @@
- occupy_workspc_entry	: string {
- 				AddToClientsList ($1, client);
- 			  }
--                          ;
--
-+		;
- occupy_window_list	: LB occupy_window_entries RB {}
- 			;
- 
-@@ -861,7 +861,7 @@
- occupy_window_entry	: string {
- 				AddToClientsList (workspace, $1);
- 			  }
--
-+		;
- icon_list	: LB icon_entries RB {}
- 		;
- 
diff --git a/x11-wm/ctwm/files/digest-ctwm-3.7 b/x11-wm/ctwm/files/digest-ctwm-3.7
new file mode 100644
index 000000000000..32500f6196f9
--- /dev/null
+++ b/x11-wm/ctwm/files/digest-ctwm-3.7
@@ -0,0 +1 @@
+MD5 7276cb0a7d44df98de8e620ba5ae39fa ctwm-3.7.tar.gz 1139461
diff --git a/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4-r1 b/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4-r1
deleted file mode 100644
index 9d8999895166..000000000000
--- a/x11-wm/ctwm/files/digest-ctwm-3.7_alpha4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5dcd43f8e3112139e10d08b55c8aa3d5 ctwm-3.7-alpha4.tar.gz 661909