From 862f44a5fe54cbaf39e474fc734eef31b7684977 Mon Sep 17 00:00:00 2001
From: Volker Stolz <vs@FreeBSD.org>
Date: Thu, 23 Dec 2004 09:08:40 +0000
Subject: [PATCH] Update to 0.4.5

---
 x11/apwal/Makefile             |  3 +--
 x11/apwal/distinfo             |  4 ++--
 x11/apwal/files/patch-Makefile | 21 +++++++++++----------
 x11/apwal/files/patch-main.c   | 11 +++++++++++
 4 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 x11/apwal/files/patch-main.c

diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 5dff0ed81f94..54539bca64ca 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apwal
-PORTVERSION=	0.4.4
-PORTREVISION=	3
+PORTVERSION=	0.4.5
 CATEGORIES=	x11
 MASTER_SITES=	http://apwal.free.fr/download/
 
diff --git a/x11/apwal/distinfo b/x11/apwal/distinfo
index 2fcbb73b18b4..d8a2204028b3 100644
--- a/x11/apwal/distinfo
+++ b/x11/apwal/distinfo
@@ -1,2 +1,2 @@
-MD5 (apwal-0.4.4.tar.gz) = 87327fd1665d64c58b675708de1f0067
-SIZE (apwal-0.4.4.tar.gz) = 104938
+MD5 (apwal-0.4.5.tar.gz) = 2f15a1a680f842d8373a1c2725b53130
+SIZE (apwal-0.4.5.tar.gz) = 73999
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;