aboutsummaryrefslogtreecommitdiff
path: root/x11-wm/wmg
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-10-05 07:17:31 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-10-05 07:17:31 +0000
commitc76cf46929051f9dd322487d888c82f104026e6d (patch)
treef415aeddadc6782b1474ebd88710bfa86cf08711 /x11-wm/wmg
parentb7bdcd418e7aca3dd98409e16a4c4ae9bc289d02 (diff)
downloadports-c76cf46929051f9dd322487d888c82f104026e6d.tar.gz
ports-c76cf46929051f9dd322487d888c82f104026e6d.zip
Notes
Diffstat (limited to 'x11-wm/wmg')
-rw-r--r--x11-wm/wmg/Makefile11
-rw-r--r--x11-wm/wmg/files/patch-aa34
2 files changed, 27 insertions, 18 deletions
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 7842a2c982e6..a80e4e5d4bdd 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -14,21 +14,12 @@ DISTNAME= wmG-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
-LIB_DEPENDS= gdk_imlib.5:${PORTSDIR}/graphics/imlib \
- esd.2:${PORTSDIR}/audio/esound \
- gnome.4:${PORTSDIR}/x11/gnomelibs
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
USE_X_PREFIX= yes
USE_XPM= yes
USE_GMAKE= yes
+USE_GNOME= yes
USE_LIBTOOL= yes
-LIBTOOLFILES= configure
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>
diff --git a/x11-wm/wmg/files/patch-aa b/x11-wm/wmg/files/patch-aa
index 4f3cdab5e12d..cd359eaaefae 100644
--- a/x11-wm/wmg/files/patch-aa
+++ b/x11-wm/wmg/files/patch-aa
@@ -1,11 +1,29 @@
---- src/Client.C.orig Sat Feb 5 18:11:15 2000
-+++ src/Client.C Sat Feb 5 18:11:31 2000
-@@ -339,7 +339,7 @@
- p = (unsigned char *)malloc(
+--- 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]);
-+ strcpy((char *)p, cl[0]);
- XFreeStringList(cl);
- }
+ 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;
+ }
+ }