From 4acc6fb2a411b291c9c210d82bafe7c62e71c77d Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Wed, 24 Oct 2007 23:37:25 +0000 Subject: Presenting GNOME 2.20.1 and all related works for FreeBSD. The official GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338 --- x11-wm/expocity/Makefile | 2 +- x11-wm/expocity/pkg-plist | 216 ++++++++++++++--------------- x11-wm/heliodor/Makefile | 2 +- x11-wm/heliodor/files/patch-src_main.c | 10 ++ x11-wm/icewm/Makefile | 5 +- x11-wm/metacity/Makefile | 6 +- x11-wm/metacity/distinfo | 6 +- x11-wm/metacity/files/patch-configure | 10 +- x11-wm/metacity/pkg-plist | 246 +++++++++++++++++---------------- x11-wm/sawfish/Makefile | 7 +- x11-wm/sawfish/files/patch-ae | 12 +- x11-wm/sawfish/files/patch-af | 11 -- x11-wm/sawfish/pkg-plist | 45 +++--- x11-wm/selectwm/Makefile | 2 + 14 files changed, 295 insertions(+), 285 deletions(-) create mode 100644 x11-wm/heliodor/files/patch-src_main.c delete mode 100644 x11-wm/sawfish/files/patch-af (limited to 'x11-wm') diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile index 8ec35c2f3dfb..2638e4fa0396 100644 --- a/x11-wm/expocity/Makefile +++ b/x11-wm/expocity/Makefile @@ -7,7 +7,7 @@ PORTNAME= expocity PORTVERSION= 2.6.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm MASTER_SITES= http://www.pycage.de/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 diff --git a/x11-wm/expocity/pkg-plist b/x11-wm/expocity/pkg-plist index d06af82a9937..e0868d962050 100644 --- a/x11-wm/expocity/pkg-plist +++ b/x11-wm/expocity/pkg-plist @@ -14,97 +14,97 @@ lib/libmetacity-private.so lib/libmetacity-private.so.0 libdata/pkgconfig/libmetacity-private.pc libexec/metacity-dialog -share/gnome/expocity/glade/metacity-properties.glade -share/gnome/expocity/icons/metacity-window-demo.png -share/gnome/pixmaps/metacity-properties.png -share/gnome/themes/AgingGorilla/metacity-1/active-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-close-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-close-menu-icon.png -share/gnome/themes/AgingGorilla/metacity-1/active-maximize-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png -share/gnome/themes/AgingGorilla/metacity-1/active-menu-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-minimize-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png -share/gnome/themes/AgingGorilla/metacity-1/inactive-close-button.png -share/gnome/themes/AgingGorilla/metacity-1/inactive-maximize-button.png -share/gnome/themes/AgingGorilla/metacity-1/inactive-menu-button.png -share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png -share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml -share/gnome/themes/Atlanta/metacity-1/metacity-theme-1.xml -share/gnome/themes/Bright/metacity-1/metacity-theme-1.xml -share/gnome/themes/Crux/metacity-1/active-border-top-left-border.png -share/gnome/themes/Crux/metacity-1/active-border-top-right-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-left-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-left-corner.png -share/gnome/themes/Crux/metacity-1/active-bottom-mid-left-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-mid-right-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-right-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-right-corner.png -share/gnome/themes/Crux/metacity-1/active-button-prelight.png -share/gnome/themes/Crux/metacity-1/active-button-pressed.png -share/gnome/themes/Crux/metacity-1/active-button.png -share/gnome/themes/Crux/metacity-1/active-close-button.png -share/gnome/themes/Crux/metacity-1/active-left-border.png -share/gnome/themes/Crux/metacity-1/active-left-top-border-shaded.png -share/gnome/themes/Crux/metacity-1/active-left-top-border.png -share/gnome/themes/Crux/metacity-1/active-maximize-button.png -share/gnome/themes/Crux/metacity-1/active-menu-button-prelight.png -share/gnome/themes/Crux/metacity-1/active-menu-button-pressed.png -share/gnome/themes/Crux/metacity-1/active-menu-button.png -share/gnome/themes/Crux/metacity-1/active-minimize-button.png -share/gnome/themes/Crux/metacity-1/active-restore-button.png -share/gnome/themes/Crux/metacity-1/active-right-border.png -share/gnome/themes/Crux/metacity-1/active-right-top-border-shaded.png -share/gnome/themes/Crux/metacity-1/active-right-top-border.png -share/gnome/themes/Crux/metacity-1/active-top-center-left.png -share/gnome/themes/Crux/metacity-1/active-top-center-mid-left.png -share/gnome/themes/Crux/metacity-1/active-top-center-mid-right.png -share/gnome/themes/Crux/metacity-1/active-top-center-right.png -share/gnome/themes/Crux/metacity-1/active-top-left-border.png -share/gnome/themes/Crux/metacity-1/active-top-left-corner.png -share/gnome/themes/Crux/metacity-1/active-top-mid-left-border.png -share/gnome/themes/Crux/metacity-1/active-top-mid-right-border.png -share/gnome/themes/Crux/metacity-1/active-top-right-border.png -share/gnome/themes/Crux/metacity-1/active-top-right-corner.png -share/gnome/themes/Crux/metacity-1/inactive-border-top-left-border.png -share/gnome/themes/Crux/metacity-1/inactive-border-top-right-border.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-left-border.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-left-corner.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-mid-border.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-right-border.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-right-corner.png -share/gnome/themes/Crux/metacity-1/inactive-button-prelight.png -share/gnome/themes/Crux/metacity-1/inactive-button-pressed.png -share/gnome/themes/Crux/metacity-1/inactive-button.png -share/gnome/themes/Crux/metacity-1/inactive-close-button.png -share/gnome/themes/Crux/metacity-1/inactive-left-border.png -share/gnome/themes/Crux/metacity-1/inactive-left-top-border-shaded.png -share/gnome/themes/Crux/metacity-1/inactive-left-top-border.png -share/gnome/themes/Crux/metacity-1/inactive-maximize-button.png -share/gnome/themes/Crux/metacity-1/inactive-menu-button-prelight.png -share/gnome/themes/Crux/metacity-1/inactive-menu-button-pressed.png -share/gnome/themes/Crux/metacity-1/inactive-menu-button.png -share/gnome/themes/Crux/metacity-1/inactive-minimize-button.png -share/gnome/themes/Crux/metacity-1/inactive-restore-button.png -share/gnome/themes/Crux/metacity-1/inactive-right-border.png -share/gnome/themes/Crux/metacity-1/inactive-right-top-border-shaded.png -share/gnome/themes/Crux/metacity-1/inactive-right-top-border.png -share/gnome/themes/Crux/metacity-1/inactive-top-center-left.png -share/gnome/themes/Crux/metacity-1/inactive-top-center-mid.png -share/gnome/themes/Crux/metacity-1/inactive-top-center-right.png -share/gnome/themes/Crux/metacity-1/inactive-top-left-border.png -share/gnome/themes/Crux/metacity-1/inactive-top-left-corner.png -share/gnome/themes/Crux/metacity-1/inactive-top-mid-border.png -share/gnome/themes/Crux/metacity-1/inactive-top-right-border.png -share/gnome/themes/Crux/metacity-1/inactive-top-right-corner.png -share/gnome/themes/Crux/metacity-1/metacity-theme-1.xml -share/gnome/themes/Esco/metacity-1/metacity-theme-1.xml -share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml -share/gnome/themes/Simple/metacity-1/close.png -share/gnome/themes/Simple/metacity-1/maximize.png -share/gnome/themes/Simple/metacity-1/maximized.png -share/gnome/themes/Simple/metacity-1/metacity-theme-1.xml -share/gnome/themes/Simple/metacity-1/minimize.png +share/expocity/glade/metacity-properties.glade +share/expocity/icons/metacity-window-demo.png +share/pixmaps/metacity-properties.png +share/themes/AgingGorilla/metacity-1/active-button.png +share/themes/AgingGorilla/metacity-1/active-close-button.png +share/themes/AgingGorilla/metacity-1/active-close-menu-icon.png +share/themes/AgingGorilla/metacity-1/active-maximize-button.png +share/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png +share/themes/AgingGorilla/metacity-1/active-menu-button.png +share/themes/AgingGorilla/metacity-1/active-minimize-button.png +share/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png +share/themes/AgingGorilla/metacity-1/inactive-close-button.png +share/themes/AgingGorilla/metacity-1/inactive-maximize-button.png +share/themes/AgingGorilla/metacity-1/inactive-menu-button.png +share/themes/AgingGorilla/metacity-1/inactive-minimize-button.png +share/themes/AgingGorilla/metacity-1/metacity-theme-1.xml +share/themes/Atlanta/metacity-1/metacity-theme-1.xml +share/themes/Bright/metacity-1/metacity-theme-1.xml +share/themes/Crux/metacity-1/active-border-top-left-border.png +share/themes/Crux/metacity-1/active-border-top-right-border.png +share/themes/Crux/metacity-1/active-bottom-left-border.png +share/themes/Crux/metacity-1/active-bottom-left-corner.png +share/themes/Crux/metacity-1/active-bottom-mid-left-border.png +share/themes/Crux/metacity-1/active-bottom-mid-right-border.png +share/themes/Crux/metacity-1/active-bottom-right-border.png +share/themes/Crux/metacity-1/active-bottom-right-corner.png +share/themes/Crux/metacity-1/active-button-prelight.png +share/themes/Crux/metacity-1/active-button-pressed.png +share/themes/Crux/metacity-1/active-button.png +share/themes/Crux/metacity-1/active-close-button.png +share/themes/Crux/metacity-1/active-left-border.png +share/themes/Crux/metacity-1/active-left-top-border-shaded.png +share/themes/Crux/metacity-1/active-left-top-border.png +share/themes/Crux/metacity-1/active-maximize-button.png +share/themes/Crux/metacity-1/active-menu-button-prelight.png +share/themes/Crux/metacity-1/active-menu-button-pressed.png +share/themes/Crux/metacity-1/active-menu-button.png +share/themes/Crux/metacity-1/active-minimize-button.png +share/themes/Crux/metacity-1/active-restore-button.png +share/themes/Crux/metacity-1/active-right-border.png +share/themes/Crux/metacity-1/active-right-top-border-shaded.png +share/themes/Crux/metacity-1/active-right-top-border.png +share/themes/Crux/metacity-1/active-top-center-left.png +share/themes/Crux/metacity-1/active-top-center-mid-left.png +share/themes/Crux/metacity-1/active-top-center-mid-right.png +share/themes/Crux/metacity-1/active-top-center-right.png +share/themes/Crux/metacity-1/active-top-left-border.png +share/themes/Crux/metacity-1/active-top-left-corner.png +share/themes/Crux/metacity-1/active-top-mid-left-border.png +share/themes/Crux/metacity-1/active-top-mid-right-border.png +share/themes/Crux/metacity-1/active-top-right-border.png +share/themes/Crux/metacity-1/active-top-right-corner.png +share/themes/Crux/metacity-1/inactive-border-top-left-border.png +share/themes/Crux/metacity-1/inactive-border-top-right-border.png +share/themes/Crux/metacity-1/inactive-bottom-left-border.png +share/themes/Crux/metacity-1/inactive-bottom-left-corner.png +share/themes/Crux/metacity-1/inactive-bottom-mid-border.png +share/themes/Crux/metacity-1/inactive-bottom-right-border.png +share/themes/Crux/metacity-1/inactive-bottom-right-corner.png +share/themes/Crux/metacity-1/inactive-button-prelight.png +share/themes/Crux/metacity-1/inactive-button-pressed.png +share/themes/Crux/metacity-1/inactive-button.png +share/themes/Crux/metacity-1/inactive-close-button.png +share/themes/Crux/metacity-1/inactive-left-border.png +share/themes/Crux/metacity-1/inactive-left-top-border-shaded.png +share/themes/Crux/metacity-1/inactive-left-top-border.png +share/themes/Crux/metacity-1/inactive-maximize-button.png +share/themes/Crux/metacity-1/inactive-menu-button-prelight.png +share/themes/Crux/metacity-1/inactive-menu-button-pressed.png +share/themes/Crux/metacity-1/inactive-menu-button.png +share/themes/Crux/metacity-1/inactive-minimize-button.png +share/themes/Crux/metacity-1/inactive-restore-button.png +share/themes/Crux/metacity-1/inactive-right-border.png +share/themes/Crux/metacity-1/inactive-right-top-border-shaded.png +share/themes/Crux/metacity-1/inactive-right-top-border.png +share/themes/Crux/metacity-1/inactive-top-center-left.png +share/themes/Crux/metacity-1/inactive-top-center-mid.png +share/themes/Crux/metacity-1/inactive-top-center-right.png +share/themes/Crux/metacity-1/inactive-top-left-border.png +share/themes/Crux/metacity-1/inactive-top-left-corner.png +share/themes/Crux/metacity-1/inactive-top-mid-border.png +share/themes/Crux/metacity-1/inactive-top-right-border.png +share/themes/Crux/metacity-1/inactive-top-right-corner.png +share/themes/Crux/metacity-1/metacity-theme-1.xml +share/themes/Esco/metacity-1/metacity-theme-1.xml +share/themes/Metabox/metacity-1/metacity-theme-1.xml +share/themes/Simple/metacity-1/close.png +share/themes/Simple/metacity-1/maximize.png +share/themes/Simple/metacity-1/maximized.png +share/themes/Simple/metacity-1/metacity-theme-1.xml +share/themes/Simple/metacity-1/minimize.png share/gnome/wm-properties/metacity.desktop share/locale/am/LC_MESSAGES/metacity.mo share/locale/ar/LC_MESSAGES/metacity.mo @@ -160,22 +160,22 @@ share/locale/vi/LC_MESSAGES/metacity.mo share/locale/wa/LC_MESSAGES/metacity.mo share/locale/zh_CN/LC_MESSAGES/metacity.mo share/locale/zh_TW/LC_MESSAGES/metacity.mo -@dirrm share/gnome/themes/Simple/metacity-1 -@dirrm share/gnome/themes/Simple -@dirrm share/gnome/themes/Metabox/metacity-1 -@dirrm share/gnome/themes/Metabox -@dirrm share/gnome/themes/AgingGorilla/metacity-1 -@dirrm share/gnome/themes/AgingGorilla -@dirrm share/gnome/themes/Esco/metacity-1 -@dirrm share/gnome/themes/Esco -@dirrm share/gnome/themes/Crux/metacity-1 -@dirrm share/gnome/themes/Crux -@dirrm share/gnome/themes/Bright/metacity-1 -@dirrm share/gnome/themes/Bright -@dirrm share/gnome/themes/Atlanta/metacity-1 -@dirrm share/gnome/themes/Atlanta -@dirrm share/gnome/expocity/icons -@dirrm share/gnome/expocity/glade -@dirrm share/gnome/expocity +@dirrm share/themes/Simple/metacity-1 +@dirrm share/themes/Simple +@dirrm share/themes/Metabox/metacity-1 +@dirrm share/themes/Metabox +@dirrm share/themes/AgingGorilla/metacity-1 +@dirrm share/themes/AgingGorilla +@dirrm share/themes/Esco/metacity-1 +@dirrm share/themes/Esco +@dirrm share/themes/Crux/metacity-1 +@dirrm share/themes/Crux +@dirrm share/themes/Bright/metacity-1 +@dirrm share/themes/Bright +@dirrm share/themes/Atlanta/metacity-1 +@dirrm share/themes/Atlanta +@dirrm share/expocity/icons +@dirrm share/expocity/glade +@dirrm share/expocity @dirrm include/metacity-1/metacity-private @dirrm include/metacity-1 diff --git a/x11-wm/heliodor/Makefile b/x11-wm/heliodor/Makefile index f7cf79e9fed8..10aaa05c11b1 100644 --- a/x11-wm/heliodor/Makefile +++ b/x11-wm/heliodor/Makefile @@ -7,7 +7,7 @@ PORTNAME= heliodor PORTVERSION= 0.2.1 -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= http://releases.beryl-project.org/${PORTVERSION}/ diff --git a/x11-wm/heliodor/files/patch-src_main.c b/x11-wm/heliodor/files/patch-src_main.c new file mode 100644 index 000000000000..06875d232632 --- /dev/null +++ b/x11-wm/heliodor/files/patch-src_main.c @@ -0,0 +1,10 @@ +--- src/main.c.orig 2007-03-17 15:46:59.000000000 -0400 ++++ src/main.c 2007-06-11 15:04:58.000000000 -0400 +@@ -3342,7 +3342,6 @@ action_menu_map (WnckWindow *win, + return; + case WNCK_WINDOW_NORMAL: + case WNCK_WINDOW_DIALOG: +- case WNCK_WINDOW_MODAL_DIALOG: + case WNCK_WINDOW_TOOLBAR: + case WNCK_WINDOW_MENU: + case WNCK_WINDOW_UTILITY: diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index 8ccf3fcd8fae..518fc4f5b019 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -7,6 +7,7 @@ PORTNAME= icewm PORTVERSION= 1.2.32 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= SF @@ -101,8 +102,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ - 's|/usr/share/control|${LOCALBASE}/share/gnome/control|g ; \ - s|/usr/share/app|${LOCALBASE}/share/gnome/app|g ; \ + 's|/usr/share/control|${LOCALBASE}/share/control|g ; \ + s|/usr/share/app|${LOCALBASE}/share/app|g ; \ s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' \ ${WRKSRC}/src/gnome2.cc diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 03792b10b653..270983187e97 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -3,11 +3,11 @@ # Whom: Garrett Rooney # # $FreeBSD$ -# $MCom: ports/x11-wm/metacity/Makefile,v 1.101 2007/03/14 04:17:20 marcus Exp $ +# $MCom: ports/x11-wm/metacity/Makefile,v 1.115 2007/09/16 17:06:07 ahze Exp $ # PORTNAME= metacity -PORTVERSION= 2.18.5 +PORTVERSION= 2.20.0 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -27,7 +27,7 @@ USE_AUTOTOOLS= libtool:15 USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-render -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index b7c6f2ff7fd0..ec26414a40d9 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/metacity-2.18.5.tar.bz2) = 7928172bf41f6b63976a62554a699674 -SHA256 (gnome2/metacity-2.18.5.tar.bz2) = e611746caa24138d96c48d9bd6b71005d3c893433fcaf1890d37aa0e7d13930d -SIZE (gnome2/metacity-2.18.5.tar.bz2) = 1949393 +MD5 (gnome2/metacity-2.20.0.tar.bz2) = e9c6317c85db019ac2d832dd9f45f536 +SHA256 (gnome2/metacity-2.20.0.tar.bz2) = e07a68c1015b8e77879c5f7ac492b3b622afeaf95eaef06180e8f7387836f08d +SIZE (gnome2/metacity-2.20.0.tar.bz2) = 1882886 diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure index 9c810e0e2c36..f38f1ce514c1 100644 --- a/x11-wm/metacity/files/patch-configure +++ b/x11-wm/metacity/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Mar 13 23:11:45 2007 -+++ configure Tue Mar 13 23:13:04 2007 -@@ -29363,7 +29363,6 @@ echo "${ECHO_T}$have_xrender" >&6; } +--- configure.orig 2007-09-16 11:47:50.000000000 -0400 ++++ configure 2007-09-16 11:48:17.000000000 -0400 +@@ -28087,7 +28087,6 @@ if test x$have_xrender = xyes; then echo "Building with Render" @@ -8,10 +8,10 @@ fi fi ## have_composite -@@ -34431,7 +34430,7 @@ metacity-$VERSION: +@@ -33175,7 +33174,7 @@ " - METACITY_MINOR_VERSION=18 + METACITY_MINOR_VERSION=20 -if test $(( $(echo $METACITY_MINOR_VERSION) %2)) == "1"; then +if test $(( $(echo $METACITY_MINOR_VERSION) %2)) = "1"; then stable_version=$(( ($METACITY_MINOR_VERSION / 2) * 2)) diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index d24bd8719dec..bfd30f331423 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -15,109 +15,8 @@ lib/libmetacity-private.so lib/libmetacity-private.so.0 libdata/pkgconfig/libmetacity-private.pc libexec/metacity-dialog -share/gnome/metacity/icons/metacity-window-demo.png -share/gnome/themes/AgingGorilla/metacity-1/active-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-close-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-close-menu-icon.png -share/gnome/themes/AgingGorilla/metacity-1/active-maximize-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png -share/gnome/themes/AgingGorilla/metacity-1/active-menu-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-minimize-button.png -share/gnome/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png -share/gnome/themes/AgingGorilla/metacity-1/inactive-close-button.png -share/gnome/themes/AgingGorilla/metacity-1/inactive-maximize-button.png -share/gnome/themes/AgingGorilla/metacity-1/inactive-menu-button.png -share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png -share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml -share/gnome/themes/Atlanta/metacity-1/metacity-theme-1.xml -share/gnome/themes/Bright/metacity-1/metacity-theme-1.xml -share/gnome/themes/Bright/metacity-1/metacity-theme-2.xml -share/gnome/themes/Crux/metacity-1/active-above-button.png -share/gnome/themes/Crux/metacity-1/active-border-top-left-border.png -share/gnome/themes/Crux/metacity-1/active-border-top-right-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-left-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-left-corner.png -share/gnome/themes/Crux/metacity-1/active-bottom-mid-left-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-mid-right-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-right-border.png -share/gnome/themes/Crux/metacity-1/active-bottom-right-corner.png -share/gnome/themes/Crux/metacity-1/active-button-prelight.png -share/gnome/themes/Crux/metacity-1/active-button-pressed.png -share/gnome/themes/Crux/metacity-1/active-button.png -share/gnome/themes/Crux/metacity-1/active-close-button.png -share/gnome/themes/Crux/metacity-1/active-left-border.png -share/gnome/themes/Crux/metacity-1/active-left-top-border-shaded.png -share/gnome/themes/Crux/metacity-1/active-left-top-border.png -share/gnome/themes/Crux/metacity-1/active-maximize-button.png -share/gnome/themes/Crux/metacity-1/active-menu-button-prelight.png -share/gnome/themes/Crux/metacity-1/active-menu-button-pressed.png -share/gnome/themes/Crux/metacity-1/active-menu-button.png -share/gnome/themes/Crux/metacity-1/active-minimize-button.png -share/gnome/themes/Crux/metacity-1/active-restore-button.png -share/gnome/themes/Crux/metacity-1/active-right-border.png -share/gnome/themes/Crux/metacity-1/active-right-top-border-shaded.png -share/gnome/themes/Crux/metacity-1/active-right-top-border.png -share/gnome/themes/Crux/metacity-1/active-shade-button.png -share/gnome/themes/Crux/metacity-1/active-stick-button.png -share/gnome/themes/Crux/metacity-1/active-top-center-left.png -share/gnome/themes/Crux/metacity-1/active-top-center-mid-left.png -share/gnome/themes/Crux/metacity-1/active-top-center-mid-right.png -share/gnome/themes/Crux/metacity-1/active-top-center-right.png -share/gnome/themes/Crux/metacity-1/active-top-left-border.png -share/gnome/themes/Crux/metacity-1/active-top-left-corner.png -share/gnome/themes/Crux/metacity-1/active-top-mid-left-border.png -share/gnome/themes/Crux/metacity-1/active-top-mid-right-border.png -share/gnome/themes/Crux/metacity-1/active-top-right-border.png -share/gnome/themes/Crux/metacity-1/active-top-right-corner.png -share/gnome/themes/Crux/metacity-1/active-unabove-button.png -share/gnome/themes/Crux/metacity-1/active-unshade-button.png -share/gnome/themes/Crux/metacity-1/active-unstick-button.png -share/gnome/themes/Crux/metacity-1/inactive-above-button.png -share/gnome/themes/Crux/metacity-1/inactive-border-top-left-border.png -share/gnome/themes/Crux/metacity-1/inactive-border-top-right-border.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-left-border.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-left-corner.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-mid-border.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-right-border.png -share/gnome/themes/Crux/metacity-1/inactive-bottom-right-corner.png -share/gnome/themes/Crux/metacity-1/inactive-button-prelight.png -share/gnome/themes/Crux/metacity-1/inactive-button-pressed.png -share/gnome/themes/Crux/metacity-1/inactive-button.png -share/gnome/themes/Crux/metacity-1/inactive-close-button.png -share/gnome/themes/Crux/metacity-1/inactive-left-border.png -share/gnome/themes/Crux/metacity-1/inactive-left-top-border-shaded.png -share/gnome/themes/Crux/metacity-1/inactive-left-top-border.png -share/gnome/themes/Crux/metacity-1/inactive-maximize-button.png -share/gnome/themes/Crux/metacity-1/inactive-menu-button-prelight.png -share/gnome/themes/Crux/metacity-1/inactive-menu-button-pressed.png -share/gnome/themes/Crux/metacity-1/inactive-menu-button.png -share/gnome/themes/Crux/metacity-1/inactive-minimize-button.png -share/gnome/themes/Crux/metacity-1/inactive-restore-button.png -share/gnome/themes/Crux/metacity-1/inactive-right-border.png -share/gnome/themes/Crux/metacity-1/inactive-right-top-border-shaded.png -share/gnome/themes/Crux/metacity-1/inactive-right-top-border.png -share/gnome/themes/Crux/metacity-1/inactive-shade-button.png -share/gnome/themes/Crux/metacity-1/inactive-stick-button.png -share/gnome/themes/Crux/metacity-1/inactive-top-center-left.png -share/gnome/themes/Crux/metacity-1/inactive-top-center-mid.png -share/gnome/themes/Crux/metacity-1/inactive-top-center-right.png -share/gnome/themes/Crux/metacity-1/inactive-top-left-border.png -share/gnome/themes/Crux/metacity-1/inactive-top-left-corner.png -share/gnome/themes/Crux/metacity-1/inactive-top-mid-border.png -share/gnome/themes/Crux/metacity-1/inactive-top-right-border.png -share/gnome/themes/Crux/metacity-1/inactive-top-right-corner.png -share/gnome/themes/Crux/metacity-1/inactive-unabove-button.png -share/gnome/themes/Crux/metacity-1/inactive-unshade-button.png -share/gnome/themes/Crux/metacity-1/inactive-unstick-button.png -share/gnome/themes/Crux/metacity-1/metacity-theme-1.xml -share/gnome/themes/Crux/metacity-1/metacity-theme-2.xml -share/gnome/themes/Esco/metacity-1/metacity-theme-1.xml -share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml -share/gnome/themes/Simple/metacity-1/close.png -share/gnome/themes/Simple/metacity-1/maximize.png -share/gnome/themes/Simple/metacity-1/maximized.png -share/gnome/themes/Simple/metacity-1/metacity-theme-1.xml -share/gnome/themes/Simple/metacity-1/minimize.png +share/gnome-control-center/keybindings/50-metacity-desktop-key.xml +share/gnome-control-center/keybindings/50-metacity-key.xml share/gnome/wm-properties/metacity.desktop share/locale/am/LC_MESSAGES/metacity.mo share/locale/ar/LC_MESSAGES/metacity.mo @@ -170,6 +69,7 @@ share/locale/nb/LC_MESSAGES/metacity.mo share/locale/ne/LC_MESSAGES/metacity.mo share/locale/nl/LC_MESSAGES/metacity.mo share/locale/nn/LC_MESSAGES/metacity.mo +share/locale/oc/LC_MESSAGES/metacity.mo share/locale/or/LC_MESSAGES/metacity.mo share/locale/pa/LC_MESSAGES/metacity.mo share/locale/pl/LC_MESSAGES/metacity.mo @@ -178,6 +78,7 @@ share/locale/pt_BR/LC_MESSAGES/metacity.mo share/locale/ro/LC_MESSAGES/metacity.mo share/locale/ru/LC_MESSAGES/metacity.mo share/locale/rw/LC_MESSAGES/metacity.mo +share/locale/si/LC_MESSAGES/metacity.mo share/locale/sk/LC_MESSAGES/metacity.mo share/locale/sl/LC_MESSAGES/metacity.mo share/locale/sq/LC_MESSAGES/metacity.mo @@ -195,30 +96,137 @@ share/locale/xh/LC_MESSAGES/metacity.mo share/locale/zh_CN/LC_MESSAGES/metacity.mo share/locale/zh_HK/LC_MESSAGES/metacity.mo share/locale/zh_TW/LC_MESSAGES/metacity.mo -@dirrm share/gnome/themes/Simple/metacity-1 -@dirrm share/gnome/themes/Simple -@dirrm share/gnome/themes/Metabox/metacity-1 -@dirrm share/gnome/themes/Metabox -@dirrm share/gnome/themes/Esco/metacity-1 -@dirrm share/gnome/themes/Esco -@dirrm share/gnome/themes/Crux/metacity-1 -@dirrm share/gnome/themes/Crux -@dirrm share/gnome/themes/Bright/metacity-1 -@dirrm share/gnome/themes/Bright -@dirrm share/gnome/themes/Atlanta/metacity-1 -@dirrm share/gnome/themes/Atlanta -@dirrm share/gnome/themes/AgingGorilla/metacity-1 -@dirrm share/gnome/themes/AgingGorilla -@dirrm share/gnome/metacity/icons -@dirrm share/gnome/metacity +%%DATADIR%%/icons/metacity-window-demo.png +share/themes/AgingGorilla/metacity-1/active-button.png +share/themes/AgingGorilla/metacity-1/active-close-button.png +share/themes/AgingGorilla/metacity-1/active-close-menu-icon.png +share/themes/AgingGorilla/metacity-1/active-maximize-button.png +share/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png +share/themes/AgingGorilla/metacity-1/active-menu-button.png +share/themes/AgingGorilla/metacity-1/active-minimize-button.png +share/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png +share/themes/AgingGorilla/metacity-1/inactive-close-button.png +share/themes/AgingGorilla/metacity-1/inactive-maximize-button.png +share/themes/AgingGorilla/metacity-1/inactive-menu-button.png +share/themes/AgingGorilla/metacity-1/inactive-minimize-button.png +share/themes/AgingGorilla/metacity-1/metacity-theme-1.xml +share/themes/Atlanta/metacity-1/metacity-theme-1.xml +share/themes/Bright/metacity-1/metacity-theme-1.xml +share/themes/Bright/metacity-1/metacity-theme-2.xml +share/themes/Crux/metacity-1/active-above-button.png +share/themes/Crux/metacity-1/active-border-top-left-border.png +share/themes/Crux/metacity-1/active-border-top-right-border.png +share/themes/Crux/metacity-1/active-bottom-left-border.png +share/themes/Crux/metacity-1/active-bottom-left-corner.png +share/themes/Crux/metacity-1/active-bottom-mid-left-border.png +share/themes/Crux/metacity-1/active-bottom-mid-right-border.png +share/themes/Crux/metacity-1/active-bottom-right-border.png +share/themes/Crux/metacity-1/active-bottom-right-corner.png +share/themes/Crux/metacity-1/active-button-prelight.png +share/themes/Crux/metacity-1/active-button-pressed.png +share/themes/Crux/metacity-1/active-button.png +share/themes/Crux/metacity-1/active-close-button.png +share/themes/Crux/metacity-1/active-left-border.png +share/themes/Crux/metacity-1/active-left-top-border-shaded.png +share/themes/Crux/metacity-1/active-left-top-border.png +share/themes/Crux/metacity-1/active-maximize-button.png +share/themes/Crux/metacity-1/active-menu-button-prelight.png +share/themes/Crux/metacity-1/active-menu-button-pressed.png +share/themes/Crux/metacity-1/active-menu-button.png +share/themes/Crux/metacity-1/active-minimize-button.png +share/themes/Crux/metacity-1/active-restore-button.png +share/themes/Crux/metacity-1/active-right-border.png +share/themes/Crux/metacity-1/active-right-top-border-shaded.png +share/themes/Crux/metacity-1/active-right-top-border.png +share/themes/Crux/metacity-1/active-shade-button.png +share/themes/Crux/metacity-1/active-stick-button.png +share/themes/Crux/metacity-1/active-top-center-left.png +share/themes/Crux/metacity-1/active-top-center-mid-left.png +share/themes/Crux/metacity-1/active-top-center-mid-right.png +share/themes/Crux/metacity-1/active-top-center-right.png +share/themes/Crux/metacity-1/active-top-left-border.png +share/themes/Crux/metacity-1/active-top-left-corner.png +share/themes/Crux/metacity-1/active-top-mid-left-border.png +share/themes/Crux/metacity-1/active-top-mid-right-border.png +share/themes/Crux/metacity-1/active-top-right-border.png +share/themes/Crux/metacity-1/active-top-right-corner.png +share/themes/Crux/metacity-1/active-unabove-button.png +share/themes/Crux/metacity-1/active-unshade-button.png +share/themes/Crux/metacity-1/active-unstick-button.png +share/themes/Crux/metacity-1/inactive-above-button.png +share/themes/Crux/metacity-1/inactive-border-top-left-border.png +share/themes/Crux/metacity-1/inactive-border-top-right-border.png +share/themes/Crux/metacity-1/inactive-bottom-left-border.png +share/themes/Crux/metacity-1/inactive-bottom-left-corner.png +share/themes/Crux/metacity-1/inactive-bottom-mid-border.png +share/themes/Crux/metacity-1/inactive-bottom-right-border.png +share/themes/Crux/metacity-1/inactive-bottom-right-corner.png +share/themes/Crux/metacity-1/inactive-button-prelight.png +share/themes/Crux/metacity-1/inactive-button-pressed.png +share/themes/Crux/metacity-1/inactive-button.png +share/themes/Crux/metacity-1/inactive-close-button.png +share/themes/Crux/metacity-1/inactive-left-border.png +share/themes/Crux/metacity-1/inactive-left-top-border-shaded.png +share/themes/Crux/metacity-1/inactive-left-top-border.png +share/themes/Crux/metacity-1/inactive-maximize-button.png +share/themes/Crux/metacity-1/inactive-menu-button-prelight.png +share/themes/Crux/metacity-1/inactive-menu-button-pressed.png +share/themes/Crux/metacity-1/inactive-menu-button.png +share/themes/Crux/metacity-1/inactive-minimize-button.png +share/themes/Crux/metacity-1/inactive-restore-button.png +share/themes/Crux/metacity-1/inactive-right-border.png +share/themes/Crux/metacity-1/inactive-right-top-border-shaded.png +share/themes/Crux/metacity-1/inactive-right-top-border.png +share/themes/Crux/metacity-1/inactive-shade-button.png +share/themes/Crux/metacity-1/inactive-stick-button.png +share/themes/Crux/metacity-1/inactive-top-center-left.png +share/themes/Crux/metacity-1/inactive-top-center-mid.png +share/themes/Crux/metacity-1/inactive-top-center-right.png +share/themes/Crux/metacity-1/inactive-top-left-border.png +share/themes/Crux/metacity-1/inactive-top-left-corner.png +share/themes/Crux/metacity-1/inactive-top-mid-border.png +share/themes/Crux/metacity-1/inactive-top-right-border.png +share/themes/Crux/metacity-1/inactive-top-right-corner.png +share/themes/Crux/metacity-1/inactive-unabove-button.png +share/themes/Crux/metacity-1/inactive-unshade-button.png +share/themes/Crux/metacity-1/inactive-unstick-button.png +share/themes/Crux/metacity-1/metacity-theme-1.xml +share/themes/Crux/metacity-1/metacity-theme-2.xml +share/themes/Esco/metacity-1/metacity-theme-1.xml +share/themes/Metabox/metacity-1/metacity-theme-1.xml +share/themes/Simple/metacity-1/close.png +share/themes/Simple/metacity-1/maximize.png +share/themes/Simple/metacity-1/maximized.png +share/themes/Simple/metacity-1/metacity-theme-1.xml +share/themes/Simple/metacity-1/minimize.png +@dirrm share/themes/Simple/metacity-1 +@dirrm share/themes/Simple +@dirrm share/themes/Metabox/metacity-1 +@dirrm share/themes/Metabox +@dirrm share/themes/Esco/metacity-1 +@dirrm share/themes/Esco +@dirrm share/themes/Crux/metacity-1 +@dirrm share/themes/Crux +@dirrm share/themes/Bright/metacity-1 +@dirrm share/themes/Bright +@dirrm share/themes/Atlanta/metacity-1 +@dirrm share/themes/Atlanta +@dirrm share/themes/AgingGorilla/metacity-1 +@dirrm share/themes/AgingGorilla +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%% @dirrm include/metacity-1/metacity-private @dirrm include/metacity-1 @dirrmtry share/locale/zh_HK/LC_MESSAGES @dirrmtry share/locale/zh_HK @dirrmtry share/locale/xh/LC_MESSAGES @dirrmtry share/locale/xh +@dirrmtry share/locale/si/LC_MESSAGES +@dirrmtry share/locale/si @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/oc/LC_MESSAGES +@dirrmtry share/locale/oc @dirrmtry share/locale/mr/LC_MESSAGES @dirrmtry share/locale/mr @dirrmtry share/locale/mg/LC_MESSAGES diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile index e9a9e0469f50..b063aa15609d 100644 --- a/x11-wm/sawfish/Makefile +++ b/x11-wm/sawfish/Makefile @@ -3,11 +3,12 @@ # Whom: Yukihiro Nakai # # $FreeBSD$ -# $MCom: ports/x11-wm/sawfish/Makefile,v 1.1 2006/07/18 17:01:14 ahze Exp $ +# $MCom: ports/x11-wm/sawfish/Makefile,v 1.5 2007/10/10 22:57:29 mezz Exp $ +# PORTNAME= sawfish PORTVERSION= 1.3 -PORTREVISION= 14 +PORTREVISION= 16 PORTEPOCH= 2 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -36,7 +37,7 @@ CONFIGURE_ARGS= --with-readline \ --enable-capplet \ --disable-themer \ --with-esd -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} diff --git a/x11-wm/sawfish/files/patch-ae b/x11-wm/sawfish/files/patch-ae index 9ad8909b2ac8..ccd0bc67f4b6 100644 --- a/x11-wm/sawfish/files/patch-ae +++ b/x11-wm/sawfish/files/patch-ae @@ -1,13 +1,11 @@ ---- capplet/Makefile.in.orig Sun Jan 12 21:30:41 2003 -+++ capplet/Makefile.in Wed Feb 8 04:25:14 2006 -@@ -26,8 +26,8 @@ +--- capplet/Makefile.in.orig 2007-10-10 17:59:01.000000000 -0500 ++++ capplet/Makefile.in 2007-10-10 17:59:24.000000000 -0500 +@@ -26,7 +26,7 @@ srcdir=@srcdir@ VPATH=@srcdir@:@top_srcdir@ -G_CC_DIR = $(GNOMEDIR)/share/control-center-2.0/capplets --G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps -+G_CC_DIR = $(GNOMEDIR)/share/gnome/applications -+G_PIXMAP_DIR = $(GNOMEDIR)/share/gnome/pixmaps ++G_CC_DIR = $(GNOMEDIR)/share/applications + G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps all : - diff --git a/x11-wm/sawfish/files/patch-af b/x11-wm/sawfish/files/patch-af deleted file mode 100644 index baaf30e26c3a..000000000000 --- a/x11-wm/sawfish/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/Makefile.in 2000/09/21 13:09:15 1.1 -+++ scripts/Makefile.in 2000/09/21 13:09:33 -@@ -34,7 +34,7 @@ - SUBSTS := -e "s|__lispdir__|$(lispdir)|" \ - -e "s|__version__|$(version)|" - --G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps -+G_PIXMAP_DIR = $(GNOMEDIR)/share/gnome/pixmaps - - %.jlc : %.jl - $(REP_ENVIRON) rep compiler -f compile-batch $< diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist index 5dfcd8ffc5df..364b03deaea3 100644 --- a/x11-wm/sawfish/pkg-plist +++ b/x11-wm/sawfish/pkg-plist @@ -23,28 +23,28 @@ libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.la libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.so libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.la libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.so -share/gnome/applications/appearance-properties.desktop -share/gnome/applications/bindings-properties.desktop -share/gnome/applications/focus-properties.desktop -share/gnome/applications/match-properties.desktop -share/gnome/applications/maximize-properties.desktop -share/gnome/applications/misc-properties.desktop -share/gnome/applications/move-properties.desktop -share/gnome/applications/placement-properties.desktop -share/gnome/applications/sound-properties.desktop -share/gnome/applications/workspace-properties.desktop -share/gnome/pixmaps/sawfish-appearance.png -share/gnome/pixmaps/sawfish-edgeflip.png -share/gnome/pixmaps/sawfish-focus.png -share/gnome/pixmaps/sawfish-logo.png -share/gnome/pixmaps/sawfish-matched.png -share/gnome/pixmaps/sawfish-minmax.png -share/gnome/pixmaps/sawfish-misc.png -share/gnome/pixmaps/sawfish-moveresize.png -share/gnome/pixmaps/sawfish-placement.png -share/gnome/pixmaps/sawfish-shortcuts.png -share/gnome/pixmaps/sawfish-tooltips.png -share/gnome/pixmaps/sawfish-workspaces.png +share/applications/appearance-properties.desktop +share/applications/bindings-properties.desktop +share/applications/focus-properties.desktop +share/applications/match-properties.desktop +share/applications/maximize-properties.desktop +share/applications/misc-properties.desktop +share/applications/move-properties.desktop +share/applications/placement-properties.desktop +share/applications/sound-properties.desktop +share/applications/workspace-properties.desktop +share/pixmaps/sawfish-appearance.png +share/pixmaps/sawfish-edgeflip.png +share/pixmaps/sawfish-focus.png +share/pixmaps/sawfish-logo.png +share/pixmaps/sawfish-matched.png +share/pixmaps/sawfish-minmax.png +share/pixmaps/sawfish-misc.png +share/pixmaps/sawfish-moveresize.png +share/pixmaps/sawfish-placement.png +share/pixmaps/sawfish-shortcuts.png +share/pixmaps/sawfish-tooltips.png +share/pixmaps/sawfish-workspaces.png share/gnome/wm-properties/Sawfish.desktop share/locale/am/LC_MESSAGES/sawfish.mo share/locale/az/LC_MESSAGES/sawfish.mo @@ -680,3 +680,4 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo @dirrm libexec/sawfish/%%VERSION%% @dirrm libexec/sawfish @dirrm libexec/rep/%%GNUHOST%%/sawfish +@dirrmtry share/applications diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile index b5e853a47141..d93ba3565b75 100644 --- a/x11-wm/selectwm/Makefile +++ b/x11-wm/selectwm/Makefile @@ -28,5 +28,7 @@ post-patch: @${REINPLACE_CMD} -e 's,-O2,${CFLAGS},g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,^CFLAGS =,CFLAGS +=,' -e 's,-O2,,' \ ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|#define G.*DISABLE_DEPRECATED||g' \ + ${WRKSRC}/src/define.h .include -- cgit v1.2.3