diff options
author | reg <reg@FreeBSD.org> | 2000-10-05 15:22:56 +0800 |
---|---|---|
committer | reg <reg@FreeBSD.org> | 2000-10-05 15:22:56 +0800 |
commit | 05b7017f031a0b7ec77897d1ff4479959829076e (patch) | |
tree | 26ae85d09c84baa372a2949e4ad9d1546c408c7e /x11-wm/wmakerconf | |
parent | 68dad4980b984b6c03859651af5eefb37c1c9d90 (diff) | |
download | freebsd-ports-gnome-05b7017f031a0b7ec77897d1ff4479959829076e.tar.gz freebsd-ports-gnome-05b7017f031a0b7ec77897d1ff4479959829076e.tar.zst freebsd-ports-gnome-05b7017f031a0b7ec77897d1ff4479959829076e.zip |
Implement WANT_GNOME.
Diffstat (limited to 'x11-wm/wmakerconf')
-rw-r--r-- | x11-wm/wmakerconf/Makefile | 31 | ||||
-rw-r--r-- | x11-wm/wmakerconf/files/patch-aa | 10 | ||||
-rw-r--r-- | x11-wm/wmakerconf/files/patch-ab | 22 |
3 files changed, 36 insertions, 27 deletions
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile index 123ad2e48f0f..a7b920b5d896 100644 --- a/x11-wm/wmakerconf/Makefile +++ b/x11-wm/wmakerconf/Makefile @@ -12,34 +12,33 @@ MASTER_SITES= http://ulli.linuxave.net/wmakerconf/ MAINTAINER= dr@domix.de -RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker \ - rpm:${PORTSDIR}/misc/rpm \ - bunzip2:${PORTSDIR}/archivers/bzip2 \ - wget:${PORTSDIR}/ftp/wget -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - Imlib.5:${PORTSDIR}/graphics/imlib \ - PropList.2:${PORTSDIR}/devel/libPropList \ +RUN_DEPENDS= rpm:${PORTSDIR}/misc/rpm \ + bunzip2:${PORTSDIR}/archivers/bzip2 +LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ png.4:${PORTSDIR}/graphics/png \ wraster.3:${PORTSDIR}/x11-wm/windowmaker \ wmfun.0:${PORTSDIR}/x11-wm/windowmaker -BUILD_DEPENDS= bunzip2:${PORTSDIR}/archivers/bzip2 \ - wget:${PORTSDIR}/ftp/wget -GNU_CONFIGURE= yes -USE_GMAKE= yes USE_BZIP2= yes -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes +USE_PERL5= yes +USE_GMAKE= yes USE_XPM= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" +USE_IMLIB= yes +WANT_GNOME= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-wmakerdir="${X11BASE}/share/WindowMaker" + +.include <bsd.port.pre.mk> -.if exists(${X11BASE}/bin/gnome-config) -RUN_DEPENDS+= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter +.if defined(HAVE_GNOME) +BUILD_DEPENDS+= gnome2wmaker:${PORTSDIR}/x11-wm/gnome2wmaker +RUN_DEPENDS+= gnome2wmaker:${PORTSDIR}/x11-wm/gnome2wmaker PLIST_SUB+= GNOME:="" .else PLIST_SUB+= GNOME:="@comment " .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-wm/wmakerconf/files/patch-aa b/x11-wm/wmakerconf/files/patch-aa new file mode 100644 index 000000000000..0c4a504e26da --- /dev/null +++ b/x11-wm/wmakerconf/files/patch-aa @@ -0,0 +1,10 @@ +--- scripts/wget.pl.orig Thu Mar 16 09:11:14 2000 ++++ scripts/wget.pl Fri Apr 7 22:06:14 2000 +@@ -1,6 +1,6 @@ + #! /usr/bin/perl + quit ("Wget not installed") if $wwwget eq ""; + +-$rc = system ("$wwwget --quiet -c --tries=0 -O$tmpfile '$url'"); ++$rc = system ("$wwwget --q -o $tmpfile '$url'"); + + quit ("HTTP response error.") if $rc; diff --git a/x11-wm/wmakerconf/files/patch-ab b/x11-wm/wmakerconf/files/patch-ab index 8698e267b2fc..54de78f5e6dc 100644 --- a/x11-wm/wmakerconf/files/patch-ab +++ b/x11-wm/wmakerconf/files/patch-ab @@ -1,11 +1,11 @@ ---- configure.orig Thu Jun 29 10:44:12 2000 -+++ configure Thu Jun 29 10:44:16 2000 -@@ -964,7 +964,7 @@ - echo $ac_n "checking for GNOME apps directory""... $ac_c" 1>&6 - echo "configure:966: checking for GNOME apps directory" >&5 - GNOMEAPPS=`$gnomecfg --datadir` -- GNOMEAPPS="$GNOMEAPPS/gnome/apps/Settings" -+ GNOMEAPPS="$GNOMEAPPS/apps/Settings" - GNOMEAPP="wmakerconf.desktop" - echo "$ac_t""$GNOMEAPPS" 1>&6 - fi +--- configure.orig Sun Jan 23 06:43:09 2000 ++++ configure Mon Jan 31 01:07:06 2000 +@@ -2807,7 +2807,7 @@ + www_support="yes" + else + echo "$ac_t"""no"" 1>&6 +- for ac_prog in lynx wget ++ for ac_prog in lynx fetch + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 |