diff options
-rw-r--r-- | x11-wm/ctwm/ChangeLog | 12 | ||||
-rw-r--r-- | x11-wm/ctwm/Manifest | 4 | ||||
-rw-r--r-- | x11-wm/ctwm/ctwm-3.7_alpha5.ebuild | 53 | ||||
-rw-r--r-- | x11-wm/ctwm/files/ctwm-3.6-gentoo.diff | 56 | ||||
-rw-r--r-- | x11-wm/ctwm/files/ctwm-3.7_alpha5-gentoo.diff | 21 | ||||
-rw-r--r-- | x11-wm/ctwm/files/digest-ctwm-3.7_alpha5 | 1 |
6 files changed, 89 insertions, 58 deletions
diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog index 16ce24f898fb..767f0deb45da 100644 --- a/x11-wm/ctwm/ChangeLog +++ b/x11-wm/ctwm/ChangeLog @@ -1,6 +1,12 @@ # 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.9 2004/06/24 23:40:17 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.10 2004/11/14 09:50:36 usata Exp $ + +*ctwm-3.7_alpha5 (14 Nov 2004) + + 14 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> -files/ctwm-3.6-gentoo.diff, + +files/ctwm-3.7_alpha5-gentoo.diff, +ctwm-3.7_alpha5.ebuild: + Version bumped. 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ctwm-3.6-r1.ebuild, ctwm-3.7_alpha4-r1.ebuild: @@ -10,6 +16,10 @@ files/ctwm-3.6-r1-gentoo.diff, files/ctwm-3.7_alpha4-gentoo.diff: Fixed compile error when >=sys-devel/bison-1.875, closing bug #40599 + 07 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> + files/ctwm-3.6-r1-gentoo.diff, files/ctwm-3.7_alpha4-gentoo.diff: + Fixed compile error when >=sys-devel/bison-1.875, closing bug #40599 + 06 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ctwm-3.6-r1.ebuild: Marked as stable diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest index f88aad1a2b6c..c96596d07ce0 100644 --- a/x11-wm/ctwm/Manifest +++ b/x11-wm/ctwm/Manifest @@ -1,5 +1,6 @@ +MD5 1f8fa198dcdb479bc56eb1e187784dda ctwm-3.7_alpha5.ebuild 1111 MD5 a5862e814db26ea9ff512243932b291b ctwm-3.6-r1.ebuild 1048 -MD5 a47e3bdfd871e762b1b2044a20d67e99 ChangeLog 1312 +MD5 8b490b6bb892ea577b800b2f7bf1f754 ChangeLog 1502 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163 MD5 1f8fa198dcdb479bc56eb1e187784dda ctwm-3.7_alpha4-r1.ebuild 1111 MD5 2bf6805304e3e475eba4dae4818102e4 files/ctwm-3.6-gentoo.diff 1169 @@ -7,3 +8,4 @@ MD5 0bf2e7481cbc018b3789b2497a8a5de0 files/ctwm-3.7_alpha4-gentoo.diff 1881 MD5 ac93af67c3e0962fa6e53f59e290b6c0 files/digest-ctwm-3.6-r1 123 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 diff --git a/x11-wm/ctwm/ctwm-3.7_alpha5.ebuild b/x11-wm/ctwm/ctwm-3.7_alpha5.ebuild new file mode 100644 index 000000000000..e1803db2da0a --- /dev/null +++ b/x11-wm/ctwm/ctwm-3.7_alpha5.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7_alpha5.ebuild,v 1.1 2004/11/14 09:50:36 usata Exp $ + +inherit eutils + +IUSE="" + +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" +HOMEPAGE="http://ctwm.free.lp.se/" + +SLOT="0" +KEYWORDS="~x86 ~ppc" +LICENSE="MIT" + +DEPEND="virtual/x11 + media-libs/jpeg" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.diff +} + +src_compile() { + xmkmf || die + make TWMDIR=/usr/share/${PN} || die +} + +src_install() { + make BINDIR=/usr/bin \ + MANPATH=/usr/share/man \ + TWMDIR=/usr/share/${PN} \ + DESTDIR=${D} install || die + + make MANPATH=/usr/share/man \ + DOCHTMLDIR=/usr/share/doc/${PF}/html \ + DESTDIR=${D} install.man || die + + echo "#!/bin/sh" > ${T}/ctwm + echo "/usr/bin/ctwm" >> ${T}/ctwm + + exeinto /etc/X11/Sessions + doexe ${T}/ctwm + + dodoc CHANGES README* TODO* PROBLEMS + dodoc *.ctwmrc* +} diff --git a/x11-wm/ctwm/files/ctwm-3.6-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.6-gentoo.diff deleted file mode 100644 index 20d84c197a24..000000000000 --- a/x11-wm/ctwm/files/ctwm-3.6-gentoo.diff +++ /dev/null @@ -1,56 +0,0 @@ ---- Imakefile-orig 2001-12-11 16:38:52.000000000 +0100 -+++ Imakefile 2003-05-08 14:22:20.000000000 +0200 -@@ -9,7 +9,7 @@ - #undef DEBUG - #undef IMCONV - #undef USE_SOUND --#define XPM -+#undef XPM - #define USEM4 - #undef X11R6 - #undef I18N ---- gram.y-orig 2001-12-11 16:38:52.000000000 +0100 -+++ gram.y 2003-05-08 13:11:55.000000000 +0200 -@@ -427,6 +427,7 @@ - - | WINDOW_GEOMETRIES { } - wingeom_list -+ ; - - noarg : KEYWORD { if (!do_single_keyword ($1)) { - twmrc_error_prefix(); -@@ -683,8 +684,8 @@ - | wingeom_entries wingeom_entry - ; - --wingeom_entry : string string { AddToList (&Scr->WindowGeometries, $1, $2) } -- -+wingeom_entry : string string { AddToList (&Scr->WindowGeometries, $1, $2); } -+ ; - - - squeeze : SQUEEZE_TITLE { -@@ -835,6 +836,7 @@ - AddToClientsList ($1, client); - } - -+ ; - occupy_window_list : LB occupy_window_entries RB {} - ; - -@@ -845,7 +847,7 @@ - occupy_window_entry : string { - AddToClientsList (workspace, $1); - } -- -+ ; - icon_list : LB icon_entries RB {} - ; - -@@ -962,6 +964,7 @@ - RemoveDQuote(ptr); - $$ = (unsigned char*)ptr; - } -+ ; - number : NUMBER { $$ = $1; } - ; diff --git a/x11-wm/ctwm/files/ctwm-3.7_alpha5-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.7_alpha5-gentoo.diff new file mode 100644 index 000000000000..0cdf25cc5ad2 --- /dev/null +++ b/x11-wm/ctwm/files/ctwm-3.7_alpha5-gentoo.diff @@ -0,0 +1,21 @@ +diff -urN ctwm-3.7-alpha5.ORIG/Imakefile ctwm-3.7-alpha5/Imakefile +--- ctwm-3.7-alpha5.ORIG/Imakefile 2004-06-09 18:31:35.000000000 +0900 ++++ ctwm-3.7-alpha5/Imakefile 2004-11-14 18:36:41.093501472 +0900 +@@ -174,7 +174,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) +@@ -184,7 +184,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 --git a/x11-wm/ctwm/files/digest-ctwm-3.7_alpha5 b/x11-wm/ctwm/files/digest-ctwm-3.7_alpha5 new file mode 100644 index 000000000000..8d29b2e44c63 --- /dev/null +++ b/x11-wm/ctwm/files/digest-ctwm-3.7_alpha5 @@ -0,0 +1 @@ +MD5 35bb6d83853b8d6d0d9adc84da12c922 ctwm-3.7-alpha5.tar.gz 679158 |