summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-11-14 09:50:36 +0000
committerMamoru Komachi <usata@gentoo.org>2004-11-14 09:50:36 +0000
commit988c5f2f60c8bf78688f6ada4f3aff8da9e4abc4 (patch)
tree334036eac979e0ae7f042cb11d6cd3d0142ae367 /x11-wm/ctwm/files
parentStable on ppc-macos. (Manifest recommit) (diff)
downloadgentoo-2-988c5f2f60c8bf78688f6ada4f3aff8da9e4abc4.tar.gz
gentoo-2-988c5f2f60c8bf78688f6ada4f3aff8da9e4abc4.tar.bz2
gentoo-2-988c5f2f60c8bf78688f6ada4f3aff8da9e4abc4.zip
Version bumped.
Diffstat (limited to 'x11-wm/ctwm/files')
-rw-r--r--x11-wm/ctwm/files/ctwm-3.6-gentoo.diff56
-rw-r--r--x11-wm/ctwm/files/ctwm-3.7_alpha5-gentoo.diff21
-rw-r--r--x11-wm/ctwm/files/digest-ctwm-3.7_alpha51
3 files changed, 22 insertions, 56 deletions
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