From: cvs2git <feedback@pld-linux.org>
Date: Wed, 11 Aug 2004 20:29:10 +0000 (+0000)
Subject: This commit was manufactured by cvs2git to create branch 'AC-branch'.
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=f239d4c5af8e54296c1dfd6502a0de51b484c641;hp=aaa6a45bc2817f5dcafb051ad3b54c79f716ca03;p=packages%2Faewm.git

This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2004-08-11 20:29:10 UTC havner <havner@pld-linux.org> '- s/lesstif/openmotif w BR'
Delete:
    aewm-etc_dir.patch
    aewm-home_etc.patch
---

diff --git a/aewm-etc_dir.patch b/aewm-etc_dir.patch
deleted file mode 100644
index 8a6d9d2..0000000
--- a/aewm-etc_dir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nru aewm-1.2.2/clients/lib/launch.c aewm-1.2.2.new/clients/lib/launch.c
---- aewm-1.2.2/clients/lib/launch.c	Sat Nov 23 23:41:14 2002
-+++ aewm-1.2.2.new/clients/lib/launch.c	Sat Mar 22 18:11:25 2003
-@@ -69,9 +69,13 @@
- {
-     char defrc_buf[BUF_SIZE];
-     FILE *rc;
--
-+    char *etc_dir = getenv("ETC_DIR");
-+    
-     if (rcfile && (rc = fopen(rcfile, "r"))) goto opened;
--    snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/clientsrc", getenv("HOME"));
-+    if (etc_dir)
-+        snprintf(defrc_buf, sizeof defrc_buf, "%s/aewm/clientsrc", etc_dir);
-+    else
-+        snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/clientsrc", getenv("HOME"));
-     if ((rc = fopen(defrc_buf, "r"))) goto opened;
-     if ((rc = fopen(DEF_RC, "r"))) goto opened;
- 
-diff -Nru aewm-1.2.2/init.c aewm-1.2.2.new/init.c
---- aewm-1.2.2/init.c	Sun Nov 24 00:02:51 2002
-+++ aewm-1.2.2.new/init.c	Sat Mar 22 18:09:32 2003
-@@ -277,9 +277,13 @@
- {
-     char defrc_buf[BUF_SIZE];
-     FILE *rc;
-+	char *etc_dir = getenv("ETC_DIR");
- 
-     if (rcfile && (rc = fopen(rcfile, "r"))) goto opened;
--    snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/aewmrc", getenv("HOME"));
-+    if (etc_dir)
-+        snprintf(defrc_buf, sizeof defrc_buf, "%s/aewm/aewmrc", etc_dir);
-+    else
-+        snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/aewmrc", getenv("HOME"));
-     if ((rc = fopen(defrc_buf, "r"))) goto opened;
-     if ((rc = fopen(DEF_RC, "r"))) goto opened;
- 
diff --git a/aewm-home_etc.patch b/aewm-home_etc.patch
deleted file mode 100644
index 2ff3ec1..0000000
--- a/aewm-home_etc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nru aewm-1.2.2/clients/lib/launch.c aewm-1.2.2.new/clients/lib/launch.c
---- aewm-1.2.2/clients/lib/launch.c	Sat Nov 23 23:41:14 2002
-+++ aewm-1.2.2.new/clients/lib/launch.c	Sat Mar 22 18:11:25 2003
-@@ -69,9 +69,13 @@
- {
-     char defrc_buf[BUF_SIZE];
-     FILE *rc;
--
-+    char *config_dir = getenv("CONFIG_DIR");
-+    
-     if (rcfile && (rc = fopen(rcfile, "r"))) goto opened;
--    snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/clientsrc", getenv("HOME"));
-+    if (config_dir)
-+        snprintf(defrc_buf, sizeof defrc_buf, "%s/aewm/clientsrc", config_dir);
-+    else
-+        snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/clientsrc", getenv("HOME"));
-     if ((rc = fopen(defrc_buf, "r"))) goto opened;
-     if ((rc = fopen(DEF_RC, "r"))) goto opened;
- 
-diff -Nru aewm-1.2.2/init.c aewm-1.2.2.new/init.c
---- aewm-1.2.2/init.c	Sun Nov 24 00:02:51 2002
-+++ aewm-1.2.2.new/init.c	Sat Mar 22 18:09:32 2003
-@@ -277,9 +277,13 @@
- {
-     char defrc_buf[BUF_SIZE];
-     FILE *rc;
-+	char *config_dir = getenv("CONFIG_DIR");
- 
-     if (rcfile && (rc = fopen(rcfile, "r"))) goto opened;
--    snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/aewmrc", getenv("HOME"));
-+    if (config_dir)
-+        snprintf(defrc_buf, sizeof defrc_buf, "%s/aewm/aewmrc", config_dir);
-+    else
-+        snprintf(defrc_buf, sizeof defrc_buf, "%s/.aewm/aewmrc", getenv("HOME"));
-     if ((rc = fopen(defrc_buf, "r"))) goto opened;
-     if ((rc = fopen(DEF_RC, "r"))) goto opened;
-