diff options
| author | reg <reg@FreeBSD.org> | 2000-10-05 15:17:31 +0800 |
|---|---|---|
| committer | reg <reg@FreeBSD.org> | 2000-10-05 15:17:31 +0800 |
| commit | 68dad4980b984b6c03859651af5eefb37c1c9d90 (patch) | |
| tree | a1b402b639681e7623529a2295404459e0d45edf /x11-wm | |
| parent | 30fb8569371544b140cbfbe9d8d545a551b7a815 (diff) | |
| download | freebsd-ports-gnome-68dad4980b984b6c03859651af5eefb37c1c9d90.tar.gz freebsd-ports-gnome-68dad4980b984b6c03859651af5eefb37c1c9d90.tar.zst freebsd-ports-gnome-68dad4980b984b6c03859651af5eefb37c1c9d90.zip | |
Implement USE_GNOME, part 2.
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/gnome2wmaker/Makefile | 12 | ||||
| -rw-r--r-- | x11-wm/wmg/Makefile | 11 | ||||
| -rw-r--r-- | x11-wm/wmg/files/patch-aa | 34 |
3 files changed, 29 insertions, 28 deletions
diff --git a/x11-wm/gnome2wmaker/Makefile b/x11-wm/gnome2wmaker/Makefile index 5741fb0a75f9..c1c92b6ce58c 100644 --- a/x11-wm/gnome2wmaker/Makefile +++ b/x11-wm/gnome2wmaker/Makefile @@ -12,19 +12,11 @@ MASTER_SITES= http://ulli.linuxbox.com/gnome2wmaker/ MAINTAINER= reg@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - wmaker:${PORTSDIR}/x11-wm/windowmaker -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ - wmaker:${PORTSDIR}/x11-wm/windowmaker - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker USE_BZIP2= yes USE_X_PREFIX= yes +USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.mk> 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; + } + } |