2 files changed, 22 insertions, 10 deletions
diff --git a/x11/apwal/files/patch-Makefile b/x11/apwal/files/patch-Makefile
index 4a9219aaba19..ab7dbe8e84a2 100644
--- a/x11/apwal/files/patch-Makefile
+++ b/x11/apwal/files/patch-Makefile
@@ -1,21 +1,22 @@
---- Makefile.orig	Wed Nov 26 11:46:50 2003
-+++ Makefile	Wed Nov 26 12:20:34 2003
-@@ -5,11 +5,11 @@
+--- Makefile.orig	Sun Dec 19 21:23:27 2004
++++ Makefile	Thu Dec 23 10:05:09 2004
+@@ -5,8 +5,8 @@
  CFLAGS=-g -Wall -Werror `pkg-config --cflags gtk+-2.0 gthread-2.0` -DGTK_DISABLE_DEPRECATED -DAPWAL_DEBUG
  LDFLAGS=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
  else
 -CFLAGS=-O2 `pkg-config --cflags gtk+-2.0 gthread-2.0`
 -LDFLAGS=-O2 `pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
 +CFLAGS+=`pkg-config --cflags gtk+-2.0 gthread-2.0`
-+LDFLAGS+=`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
++LDFLAGS+=-`pkg-config --libs gtk+-2.0 gthread-2.0` `xml2-config --libs`
  endif
  
--OBJS=main.o app.o launcher.o editor.o property.o \
-+OBJS=group_member.o main.o app.o launcher.o editor.o property.o \
-      gtkstuff.o sysstuff.o iconsel.o cereimg.o fromgtk2src/gtkmarshalers.o \
-      apwalapp.o iconsel_interface.o filesel.o xmlrc.o iconlist.o log.o about.o \
-      apwalpref.o 
-@@ -28,7 +28,7 @@
+ OBJS=main.o app.o launcher.o editor.o property.o \
+@@ -24,11 +24,11 @@
+ ifdef APWAL_DEBUG
+ all: checktraceformat apwal tags
+ apwal: $(OBJS)
+-	gcc -o $@ $^ $(LDFLAGS)
++	$(CC) -o $@ $^ $(LDFLAGS)
  else
  all: apwal
  apwal: $(OBJS)
diff --git a/x11/apwal/files/patch-main.c b/x11/apwal/files/patch-main.c
new file mode 100644
index 000000000000..fbe01c31ad85
--- /dev/null
+++ b/x11/apwal/files/patch-main.c
@@ -0,0 +1,11 @@
+--- main.c.orig	Thu Dec 23 09:57:45 2004
++++ main.c	Thu Dec 23 09:58:02 2004
+@@ -43,7 +43,7 @@
+     int i;
+     for (i = 1; i < argc; i++)
+     {
+-      TRACE();
++      TRACE("%s","");
+       if (strstr(argv[i], "--edit") != NULL)
+       {
+         launch_editor = TRUE;