From 9ce234f051264d48878ebf2e51513c707d3d280c Mon Sep 17 00:00:00 2001 From: tnn Date: Fri, 14 Sep 2007 15:04:48 +0000 Subject: Update to sawfish-1.3.1, add DESTDIR support and update HOMEPAGE. * configure.in: version 1.3.1 - This version is to let people know that Sawfish is being revived by the community, and we are awaiting patches to be submitted for incoming 1.3.2 release * fixed possible buffer overflow in src/fonts.c (Yoshiaki Kasahara) 1.3.1 also has many updated translations and doc fixes. --- wm/sawfish/Makefile | 11 ++++++----- wm/sawfish/PLIST | 12 +++++++++++- wm/sawfish/distinfo | 11 +++++------ wm/sawfish/patches/patch-aa | 32 ++++++++++++++++---------------- wm/sawfish/patches/patch-ae | 26 -------------------------- 5 files changed, 38 insertions(+), 54 deletions(-) delete mode 100644 wm/sawfish/patches/patch-ae (limited to 'wm') diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index edf27ee9644..6c05f36a4a2 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.44 2007/06/18 23:42:00 tnn Exp $ +# $NetBSD: Makefile,v 1.45 2007/09/14 15:04:48 tnn Exp $ # DISTNAME= sawfish-${SF_VERS} -PKGREVISION= 1 -SF_VERS= 1.3 +SF_VERS= 1.3.1 CATEGORIES= x11 wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sawmill/} MAINTAINER= tnn@NetBSD.org -HOMEPAGE= http://sawmill.sourceforge.net/ +HOMEPAGE= http://sawfish.wikia.com/ COMMENT= Extensible window manager that is fully configurable in Lisp DEPENDS+= rep-gtk2>=0.18:../../x11/rep-gtk2 @@ -21,9 +20,11 @@ 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 -USE_TOOLS+= gmake makeinfo msgfmt pkg-config +PKG_DESTDIR_SUPPORT= user-destdir +USE_TOOLS+= gmake makeinfo msgfmt pkg-config autoconf automake USE_DIRS+= gnome2-1.5 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST index 7f673c35e9a..06c7df72a0f 100644 --- a/wm/sawfish/PLIST +++ b/wm/sawfish/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2007/06/05 09:09:58 tnn Exp $ +@comment $NetBSD: PLIST,v 1.11 2007/09/14 15:04:49 tnn Exp $ bin/sawfish bin/sawfish-client bin/sawfish-ui @@ -18,6 +18,7 @@ libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/selection.la libexec/sawfish/${SF_VERS}/${MACHINE_GNU_PLATFORM}/x.la share/gnome/wm-properties/Sawfish.desktop share/locale/am/LC_MESSAGES/sawfish.mo +share/locale/ar/LC_MESSAGES/sawfish.mo share/locale/az/LC_MESSAGES/sawfish.mo share/locale/be/LC_MESSAGES/sawfish.mo share/locale/bg/LC_MESSAGES/sawfish.mo @@ -26,8 +27,10 @@ share/locale/ca/LC_MESSAGES/sawfish.mo share/locale/cs/LC_MESSAGES/sawfish.mo share/locale/da/LC_MESSAGES/sawfish.mo share/locale/de/LC_MESSAGES/sawfish.mo +share/locale/dz/LC_MESSAGES/sawfish.mo share/locale/el/LC_MESSAGES/sawfish.mo share/locale/en_GB/LC_MESSAGES/sawfish.mo +share/locale/en_CA/LC_MESSAGES/sawfish.mo share/locale/es/LC_MESSAGES/sawfish.mo share/locale/et/LC_MESSAGES/sawfish.mo share/locale/eu/LC_MESSAGES/sawfish.mo @@ -40,17 +43,24 @@ share/locale/it/LC_MESSAGES/sawfish.mo share/locale/ja/LC_MESSAGES/sawfish.mo share/locale/ko/LC_MESSAGES/sawfish.mo share/locale/lv/LC_MESSAGES/sawfish.mo +share/locale/mk/LC_MESSAGES/sawfish.mo share/locale/ms/LC_MESSAGES/sawfish.mo +share/locale/nb/LC_MESSAGES/sawfish.mo +share/locale/ne/LC_MESSAGES/sawfish.mo share/locale/nl/LC_MESSAGES/sawfish.mo share/locale/nn/LC_MESSAGES/sawfish.mo share/locale/no/LC_MESSAGES/sawfish.mo +share/locale/pa/LC_MESSAGES/sawfish.mo share/locale/pl/LC_MESSAGES/sawfish.mo share/locale/pt/LC_MESSAGES/sawfish.mo share/locale/pt_BR/LC_MESSAGES/sawfish.mo share/locale/ro/LC_MESSAGES/sawfish.mo share/locale/ru/LC_MESSAGES/sawfish.mo +share/locale/rw/LC_MESSAGES/sawfish.mo share/locale/sk/LC_MESSAGES/sawfish.mo share/locale/sl/LC_MESSAGES/sawfish.mo +share/locale/sr/LC_MESSAGES/sawfish.mo +share/locale/sr@Latn/LC_MESSAGES/sawfish.mo share/locale/sv/LC_MESSAGES/sawfish.mo share/locale/tr/LC_MESSAGES/sawfish.mo share/locale/uk/LC_MESSAGES/sawfish.mo diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo index fb75c357b48..49518c6af18 100644 --- a/wm/sawfish/distinfo +++ b/wm/sawfish/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.10 2007/05/09 10:09:45 tnn Exp $ +$NetBSD: distinfo,v 1.11 2007/09/14 15:04:49 tnn Exp $ -SHA1 (sawfish-1.3.tar.gz) = b631c7b110a09c3a26f071f7a68be7de99575a1c -RMD160 (sawfish-1.3.tar.gz) = eef3b39bec21b4ede7a1af2fc9aa7714772d7d0c -Size (sawfish-1.3.tar.gz) = 1582279 bytes -SHA1 (patch-aa) = 92db44adf5c50a7eac1b9d09794f1a6cdbe42be4 +SHA1 (sawfish-1.3.1.tar.gz) = c204129b7b6fdf702580140c39f62c561683216a +RMD160 (sawfish-1.3.1.tar.gz) = 66de77629ad98e6205c13b7300928616d687c80a +Size (sawfish-1.3.1.tar.gz) = 1741281 bytes +SHA1 (patch-aa) = d2883ff092ce4fa86b20f9928dc004cf5bf61e75 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e -SHA1 (patch-ae) = 51325e250aa5cea10203bd215720f2f7f2a32347 diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa index 4d257164380..c44bbe6a364 100644 --- a/wm/sawfish/patches/patch-aa +++ b/wm/sawfish/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2007/05/09 10:09:45 tnn Exp $ +$NetBSD: patch-aa,v 1.6 2007/09/14 15:04:49 tnn Exp $ ---- configure.orig 2003-03-25 09:30:27.000000000 +0100 -+++ configure -@@ -643,7 +643,7 @@ esac +--- configure.in.orig 2007-09-14 16:36:00.000000000 +0200 ++++ configure.in +@@ -58,7 +58,7 @@ esac sawfishdir='${datadir}/sawfish' lispdir='${sawfishdir}/${version}/lisp' @@ -10,31 +10,31 @@ $NetBSD: patch-aa,v 1.5 2007/05/09 10:09:45 tnn Exp $ +localedir='${prefix}/${PKGLOCALEDIR}/locale' sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}' - # Extract the first word of "gcc", so it can be a program name with args. -@@ -2688,7 +2688,7 @@ cat >conftest <conftest <&5; then +if env REP_GTK_DONT_INITIALIZE=1 ${REP_ENV_PKGSRC} rep ./conftest 2>&5; then - echo "$ac_t""yes" 1>&6 + AC_MSG_RESULT([yes]) else - echo "$ac_t""no" 1>&6 -@@ -3387,7 +3387,7 @@ fi + AC_MSG_RESULT([no]) +@@ -264,7 +264,7 @@ AC_ARG_ENABLE(themer, if test "$enable_themer" = yes; then - echo $ac_n "checking for rep-gtk libglade wrapper""... $ac_c" 1>&6 - echo "configure:3390: checking for rep-gtk libglade wrapper" >&5 + 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 - echo "$ac_t""yes" 1>&6 + AC_MSG_RESULT([yes]) add_subdir "themer" else -@@ -3408,7 +3408,7 @@ fi +@@ -280,7 +280,7 @@ AC_ARG_ENABLE(gnome-widgets, + if test "$enable_gnome_widgets" != "no"; then - echo $ac_n "checking for rep-gtk GNOME wrappers""... $ac_c" 1>&6 - echo "configure:3411: checking for rep-gtk GNOME wrappers" >&5 + 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 - echo "$ac_t""yes" 1>&6 + AC_MSG_RESULT([yes]) REP_GTK_GNOME=yes else diff --git a/wm/sawfish/patches/patch-ae b/wm/sawfish/patches/patch-ae deleted file mode 100644 index 2926fce633d..00000000000 --- a/wm/sawfish/patches/patch-ae +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2007/03/17 16:50:50 rillig Exp $ - -gcc4 complains: -main.c:50: error: static declaration of 'prog_name' follows non-static declaration -sawmill_subrs.h:54: error: previous declaration of 'prog_name' was here - ---- src/main.c.orig 2002-04-10 05:59:54.000000000 +0200 -+++ src/main.c 2007-03-17 17:46:34.000000000 +0100 -@@ -46,9 +46,6 @@ - /* one of the ec_ values */ - int exit_code = ec_no_exit; - --/* Saved value of argv[0] */ --static char *prog_name; -- - DEFSYM(sawfish_directory, "sawfish-directory"); - DEFSYM(sawfish_lisp_lib_directory, "sawfish-lisp-lib-directory"); - DEFSYM(sawfish_site_lisp_directory, "sawfish-site-lisp-directory"); -@@ -333,6 +330,7 @@ main(int argc, char **argv) - char **old_argv; - int old_argc; - char *lang; -+ const char *prog_name; - - /* This will fork multiple copies, if necessary */ - multihead_init (&argc, &argv); -- cgit v1.2.3