diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-11-04 11:10:55 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-11-04 11:10:55 +0000 |
| commit | a6e4ceb3241a9fefcd48bb59bee346dbf6a8fe64 (patch) | |
| tree | cfd422eb6a0ad8d0b19372085b57566804ae1d79 /x11-wm/wmg | |
| parent | - Reenable perl stuff of net/silc-client (diff) | |
- Fix build on -current
PR: 58883
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=93054
Diffstat (limited to 'x11-wm/wmg')
| -rw-r--r-- | x11-wm/wmg/Makefile | 14 | ||||
| -rw-r--r-- | x11-wm/wmg/files/patch-aa | 29 |
2 files changed, 6 insertions, 37 deletions
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile index 927fd0862190..2f91fa57f84a 100644 --- a/x11-wm/wmg/Makefile +++ b/x11-wm/wmg/Makefile @@ -17,16 +17,14 @@ COMMENT= Small GTK-based GNOME-compliant window manager 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 --git a/x11-wm/wmg/files/patch-aa b/x11-wm/wmg/files/patch-aa deleted file mode 100644 index cd359eaaefae..000000000000 --- a/x11-wm/wmg/files/patch-aa +++ /dev/null @@ -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; - } - } |