ports/58883: Update port: x11-wm/wmg

[KATO Tsuguru]

>Number:         58883
>Category:       ports
>Synopsis:       Update port: x11-wm/wmg
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 03 07:30:15 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build on -current

Remove file:
files/patch-aa

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11-wm/wmg/Makefile x11-wm/wmg/Makefile
--- /usr/ports/x11-wm/wmg/Makefile	Mon Nov  3 14:39:39 2003
+++ x11-wm/wmg/Makefile	Mon Nov  3 16:00:11 2003
@@ -17,16 +17,14 @@
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
-USE_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 
-.include <bsd.port.pre.mk>
+CFLAGS+=	-fpermissive
 
-.if ${OSVERSION} > 500000
-BROKEN=		"Does not compile"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/x11-wm/wmg/files/patch-aa x11-wm/wmg/files/patch-aa
--- /usr/ports/x11-wm/wmg/files/patch-aa	Thu Oct  5 16:17:31 2000
+++ x11-wm/wmg/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,29 +0,0 @@
---- src/Client.C.orig	Tue Nov 23 01:59:43 1999
-+++ src/Client.C	Tue Nov 23 02:01:29 1999
-@@ -320,7 +320,7 @@
- 
- 
- char *Client::getProperty(Atom a) {
--    unsigned char *p;
-+    char *p;
- 
-     if (a == XA_WM_NAME || XA_WM_ICON_NAME) {
-         XTextProperty xtp;
-@@ -335,7 +335,7 @@
-         if (st != 0) {
-             XmbTextPropertyToTextList(display(), &xtp, &cl, &n);
-             if(cl){
--                p = (unsigned char *)malloc(
-+                p = (char *)malloc(
-                         sizeof (unsigned char) * (strlen(cl[0]) + 1)
-                     );
-                 strcpy(p, cl[0]);
-@@ -344,7 +344,7 @@
-         }
-     }
-     else{
--        if(getProperty_aux(display(), m_window, a, XA_STRING, 100L, &p) <= 0) {
-+        if(getProperty_aux(display(), m_window, a, XA_STRING, 100L, &(unsigned char *)p) <= 0) {
-             return NULL;
-         }
-     }
>Release-Note:
>Audit-Trail:
>Unformatted: