diff options
Diffstat (limited to 'wm/sawfish')
| -rw-r--r-- | wm/sawfish/Makefile | 5 | ||||
| -rw-r--r-- | wm/sawfish/distinfo | 4 | ||||
| -rw-r--r-- | wm/sawfish/patches/patch-aa | 46 |
3 files changed, 27 insertions, 28 deletions
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index 2b1a9929a60..0f3e6bd0b6f 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2008/01/21 02:34:28 tnn Exp $ +# $NetBSD: Makefile,v 1.47 2008/01/21 12:05:52 tnn Exp $ # DISTNAME= sawfish-${SF_VERS} @@ -20,11 +20,10 @@ MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} CONFIGURE_ENV+= REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q} MAKE_ENV+= REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q} GNU_CONFIGURE= yes -CONFIGURE_SCRIPT= ./autogen.sh CONFIGURE_ARGS+= --disable-themer PKG_DESTDIR_SUPPORT= user-destdir -USE_TOOLS+= gmake makeinfo msgfmt pkg-config autoconf automake +USE_TOOLS+= gmake makeinfo msgfmt pkg-config USE_DIRS+= gnome2-1.5 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo index 3838f9af127..15282118fa6 100644 --- a/wm/sawfish/distinfo +++ b/wm/sawfish/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.13 2008/01/21 02:34:29 tnn Exp $ +$NetBSD: distinfo,v 1.14 2008/01/21 12:05:52 tnn Exp $ SHA1 (sawfish-1.3.2.tar.gz) = b7b2b222c305a6a2b2f98f92499271a585e5b04f RMD160 (sawfish-1.3.2.tar.gz) = 3dc71d5744e6df04cba8cb9c1387b67708ad5122 Size (sawfish-1.3.2.tar.gz) = 1950794 bytes -SHA1 (patch-aa) = d2883ff092ce4fa86b20f9928dc004cf5bf61e75 +SHA1 (patch-aa) = 1861de9c9c0135db7edf9db8c035732d2ef18556 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa index c44bbe6a364..2c9f41d40a0 100644 --- a/wm/sawfish/patches/patch-aa +++ b/wm/sawfish/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2007/09/14 15:04:49 tnn Exp $ +$NetBSD: patch-aa,v 1.7 2008/01/21 12:05:52 tnn Exp $ ---- configure.in.orig 2007-09-14 16:36:00.000000000 +0200 -+++ configure.in -@@ -58,7 +58,7 @@ esac +--- configure.orig 2008-01-20 20:14:48.000000000 +0100 ++++ configure +@@ -1937,7 +1937,7 @@ esac sawfishdir='${datadir}/sawfish' lispdir='${sawfishdir}/${version}/lisp' @@ -10,31 +10,31 @@ $NetBSD: patch-aa,v 1.6 2007/09/14 15:04:49 tnn Exp $ +localedir='${prefix}/${PKGLOCALEDIR}/locale' sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}' - dnl Checks for programs. -@@ -159,7 +159,7 @@ cat >conftest <<EOF + ac_ext=c +@@ -6727,7 +6727,7 @@ cat >conftest <<EOF (error (throw 'quit 1))) EOF -if REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then -+if env REP_GTK_DONT_INITIALIZE=1 ${REP_ENV_PKGSRC} rep ./conftest 2>&5; then - AC_MSG_RESULT([yes]) ++if env ${REP_ENV_PKGSRC} REP_GTK_DONT_INITIALIZE=1 rep ./conftest 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } else - AC_MSG_RESULT([no]) -@@ -264,7 +264,7 @@ AC_ARG_ENABLE(themer, +@@ -7565,7 +7565,7 @@ fi if test "$enable_themer" = yes; then - dnl configure redirects &5 to config.log - AC_MSG_CHECKING([for rep-gtk libglade wrapper]) -- if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then -+ if env REP_GTK_DONT_INITIALIZE=1 ${REP_ENV_PKGSRC} rep --batch -l gui.gtk.libglade 2>&5; then - AC_MSG_RESULT([yes]) + { echo "$as_me:$LINENO: checking for rep-gtk libglade wrapper" >&5 + echo $ECHO_N "checking for rep-gtk libglade wrapper... $ECHO_C" >&6; } +- if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then ++ if env ${REP_ENV_PKGSRC} REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk.libglade 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } add_subdir "themer" - else -@@ -280,7 +280,7 @@ AC_ARG_ENABLE(gnome-widgets, - +@@ -7588,7 +7588,7 @@ fi if test "$enable_gnome_widgets" != "no"; then - AC_MSG_CHECKING([for rep-gtk GNOME wrappers]) -- if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk-2.gnome-ui 2>&5; then -+ if env REP_GTK_DONT_INITIALIZE=1 ${REP_ENV_PKGSRC} rep --batch -l gui.gtk-2.gnome-ui 2>&5; then - AC_MSG_RESULT([yes]) + { echo "$as_me:$LINENO: checking for rep-gtk GNOME wrappers" >&5 + echo $ECHO_N "checking for rep-gtk GNOME wrappers... $ECHO_C" >&6; } +- if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk-2.gnome-ui 2>&5; then ++ if env ${REP_ENV_PKGSRC} REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk-2.gnome-ui 2>&5; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } REP_GTK_GNOME=yes - else |