diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-14 22:26:39 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-14 22:26:39 +0000 |
commit | f2cd74c0faf26743e05d239c36ca9b5fa1049430 (patch) | |
tree | 101c6cf1f62c9cf6e26ec8dd37f5d0073efe7d7e /x11-wm/sawfish2 | |
parent | Remove unneeded configure arg (diff) |
Update to 20020509 (version in GNOME2 RC2) after a repo-copies from
lang/librep, x11-toolkits/rep-gtk and x11-wm/sawfish.
Notes
Notes:
svn path=/head/; revision=59114
Diffstat (limited to 'x11-wm/sawfish2')
-rw-r--r-- | x11-wm/sawfish2/Makefile | 42 | ||||
-rw-r--r-- | x11-wm/sawfish2/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/sawfish2/files/patch-ae | 21 | ||||
-rw-r--r-- | x11-wm/sawfish2/files/patch-configure | 23 | ||||
-rw-r--r-- | x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl | 13 | ||||
-rw-r--r-- | x11-wm/sawfish2/pkg-plist | 57 |
6 files changed, 72 insertions, 86 deletions
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile index 09dda05b532f..f9b5ec4fd492 100644 --- a/x11-wm/sawfish2/Makefile +++ b/x11-wm/sawfish2/Makefile @@ -5,51 +5,37 @@ # $FreeBSD$ # -PORTNAME= sawfish -PORTVERSION= 1.0.1 +PORTNAME= sawfish2 +PORTVERSION= 2002.05.02 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/sawfish -#DIST_SUBDIR= gnome +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509 +DISTNAME= sawfish-${PORTVERSION:S/./-/g} +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep -BUILD_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk -RUN_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk +LIB_DEPENDS= rep.11:${PORTSDIR}/lang/librep2 +BUILD_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2 +RUN_DEPENDS= ${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2 GNUHOST= ${ARCH}-pc-freebsd${OSREL:C/\..*//} -PLIST_SUB= GNUHOST=${GNUHOST} VERSION=${PORTVERSION} +PLIST_SUB= GNUHOST=${GNUHOST} VERSION=2.0.pre1 +USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_IMLIB= yes -WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-readline \ --localstatedir=${PREFIX}/share \ - --datadir=${PREFIX}/share + --datadir=${PREFIX}/share \ + --enable-capplet \ + --disable-themer CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} -.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) -.undef WITHOUT_GNOME -.undef WITHOUT_ALL -WITH_GNOME= yes -.endif - -.include <bsd.port.pre.mk> - -.if defined(HAVE_GNOME) -USE_GNOME= yes -CONFIGURE_ARGS+=--enable-capplet -.else -CONFIGURE_ARGS+=--disable-capplet \ - --disable-gnome-widgets \ - --without-gdk-pixbuf -.endif - pre-patch: @${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ @@ -65,4 +51,4 @@ post-install: --entry="* sawfish: (sawfish). sawfish programming manual" \ ${PREFIX}/info/sawfish.info ${PREFIX}/info/dir -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/sawfish2/distinfo b/x11-wm/sawfish2/distinfo index 705cfda9c8f6..46cef6cfd163 100644 --- a/x11-wm/sawfish2/distinfo +++ b/x11-wm/sawfish2/distinfo @@ -1 +1 @@ -MD5 (sawfish-1.0.1.tar.gz) = b1587ea76cca08ec951f2536c17a307e +MD5 (gnome2/sawfish-2002-05-02.tar.bz2) = bb3b6a5dc19257bcbbdf3d8cd97eb8fd diff --git a/x11-wm/sawfish2/files/patch-ae b/x11-wm/sawfish2/files/patch-ae index de7e1b297997..07d12436ab5d 100644 --- a/x11-wm/sawfish2/files/patch-ae +++ b/x11-wm/sawfish2/files/patch-ae @@ -1,13 +1,16 @@ ---- capplet/Makefile.in.orig Wed Apr 26 21:12:29 2000 -+++ capplet/Makefile.in Tue Jun 13 16:02:14 2000 -@@ -29,9 +29,9 @@ - override CFLAGS += $(GNOME_CC_CFLAGS) - override LIBS += $(GNOME_CC_LIBS) + +$FreeBSD$ + +--- capplet/Makefile.in.orig Mon Apr 29 21:43:11 2002 ++++ capplet/Makefile.in Mon Apr 29 21:44:12 2002 +@@ -26,8 +26,8 @@ + srcdir=@srcdir@ + VPATH=@srcdir@:@top_srcdir@ --G_CC_DIR = $(GNOMEDIR)/share/control-center -+G_CC_DIR = $(GNOMEDIR)/share/gnome/control-center - G_MENU_DIR = $(GNOMEDIR)/share/gnome/apps/Settings +-G_CC_DIR = $(GNOMEDIR)/share/control-center-2.0/capplets -G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps ++G_CC_DIR = $(GNOMEDIR)/share/gnome/control-center-2.0/capplets +G_PIXMAP_DIR = $(GNOMEDIR)/share/gnome/pixmaps - all : sawfish-capplet + all : + diff --git a/x11-wm/sawfish2/files/patch-configure b/x11-wm/sawfish2/files/patch-configure new file mode 100644 index 000000000000..4a9b3bbe57aa --- /dev/null +++ b/x11-wm/sawfish2/files/patch-configure @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- configure 2002/04/29 19:09:14 1.1 ++++ configure 2002/04/29 19:08:47 +@@ -4607,7 +4607,7 @@ + if test "$enable_themer" = yes; then + echo "$as_me:4608: 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 libglade 2>&5; then ++ if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gtk -l gui/gtk-2/libglade 2>&5; then + echo "$as_me:4611: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + add_subdir "themer" +@@ -4630,7 +4630,7 @@ + if test "$enable_gnome_widgets" != "no"; then + echo "$as_me:4631: 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 gnomeui -l gdk-pixbuf -l gnome-canvas-pixbuf 2>&5; then ++ if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui/gtk-2/gnome-ui -l gui/gtk-2/gnome-canvas 2>&5; then + echo "$as_me:4634: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + REP_GTK_GNOME=yes diff --git a/x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl b/x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl new file mode 100644 index 000000000000..46e326127409 --- /dev/null +++ b/x11-wm/sawfish2/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- lisp/sawfish/ui/widgets/workspace-geometry.jl 2002/04/29 19:16:50 1.1 ++++ lisp/sawfish/ui/widgets/workspace-geometry.jl 2002/04/29 19:17:07 +@@ -28,7 +28,6 @@ + (open rep + gui.gtk-2.gtk + gui.gtk-2.gnome-canvas +- gui.gtk-2.gdk-pixbuf + rep.io.files + sawfish.gtk.widget + sawfish.ui.layout) diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist index 13d7f3060fea..e79c4a82d6f2 100644 --- a/x11-wm/sawfish2/pkg-plist +++ b/x11-wm/sawfish2/pkg-plist @@ -1,7 +1,5 @@ bin/sawfish -%%GNOME:%%bin/sawfish-capplet bin/sawfish-client -%%GNOME:%%bin/sawfish-themer bin/sawfish-ui @unexec install-info --delete %D/info/sawfish.info %D/info/dir info/sawfish.info @@ -11,8 +9,8 @@ info/sawfish.info-3 info/sawfish.info-4 info/sawfish.info-5 @exec install-info --section="X11 window manager" --entry="* sawfish: (sawfish). sawfish programming manual" %D/info/sawfish.info %D/info/dir -libexec/rep/%%GNUHOST%%/sawfish/client.so libexec/rep/%%GNUHOST%%/sawfish/client.la +libexec/rep/%%GNUHOST%%/sawfish/client.so libexec/sawfish/%%VERSION%%/%%GNUHOST%%/DOC libexec/sawfish/%%VERSION%%/%%GNUHOST%%/gradient.la libexec/sawfish/%%VERSION%%/%%GNUHOST%%/gradient.so @@ -33,46 +31,9 @@ libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.la libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.so libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.la libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.so -%%GNOME:%%share/gnome/apps/Settings/Sawfish/.directory -%%GNOME:%%share/gnome/apps/Settings/Sawfish/.order -%%GNOME:%%share/gnome/apps/Settings/Sawfish/appearance-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/bindings-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/focus-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/match-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/maximize-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/meta-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/misc-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/move-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/placement-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/sound-properties.desktop -%%GNOME:%%share/gnome/apps/Settings/Sawfish/workspace-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/.directory -%%GNOME:%%share/gnome/control-center/Sawfish/.order -%%GNOME:%%share/gnome/control-center/Sawfish/appearance-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/bindings-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/focus-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/match-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/maximize-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/meta-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/misc-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/move-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/placement-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/sound-properties.desktop -%%GNOME:%%share/gnome/control-center/Sawfish/workspace-properties.desktop -%%GNOME:%%share/gnome/pixmaps/sawfish-appearance.png -%%GNOME:%%share/gnome/pixmaps/sawfish-edgeflip.png -%%GNOME:%%share/gnome/pixmaps/sawfish-focus.png share/gnome/pixmaps/sawfish-logo.png -%%GNOME:%%share/gnome/pixmaps/sawfish-matched.png -%%GNOME:%%share/gnome/pixmaps/sawfish-minmax.png -%%GNOME:%%share/gnome/pixmaps/sawfish-misc.png -%%GNOME:%%share/gnome/pixmaps/sawfish-moveresize.png -%%GNOME:%%share/gnome/pixmaps/sawfish-placement.png -%%GNOME:%%share/gnome/pixmaps/sawfish-shortcuts.png -%%GNOME:%%share/gnome/pixmaps/sawfish-tooltips.png -%%GNOME:%%share/gnome/pixmaps/sawfish-workspaces.png -%%GNOME:%%share/gnome/wm-properties/Sawfish.desktop share/locale/az/LC_MESSAGES/sawfish.mo +share/locale/bg/LC_MESSAGES/sawfish.mo share/locale/ca/LC_MESSAGES/sawfish.mo share/locale/cs/LC_MESSAGES/sawfish.mo share/locale/da/LC_MESSAGES/sawfish.mo @@ -80,6 +41,8 @@ share/locale/de/LC_MESSAGES/sawfish.mo share/locale/el/LC_MESSAGES/sawfish.mo share/locale/en_GB/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 share/locale/fi/LC_MESSAGES/sawfish.mo share/locale/fr/LC_MESSAGES/sawfish.mo share/locale/ga/LC_MESSAGES/sawfish.mo @@ -88,7 +51,10 @@ share/locale/hu/LC_MESSAGES/sawfish.mo 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/ms/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/pl/LC_MESSAGES/sawfish.mo share/locale/pt/LC_MESSAGES/sawfish.mo @@ -187,6 +153,8 @@ share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/pair.jl share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/pair.jlc share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/program.jl share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/program.jlc +share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/scheme-boolean.jl +share/sawfish/%%VERSION%%/lisp/sawfish/gtk/widgets/scheme-boolean.jlc share/sawfish/%%VERSION%%/lisp/sawfish/ui/apply.jl share/sawfish/%%VERSION%%/lisp/sawfish/ui/apply.jlc share/sawfish/%%VERSION%%/lisp/sawfish/ui/config.jl @@ -205,8 +173,6 @@ share/sawfish/%%VERSION%%/lisp/sawfish/ui/shell.jl share/sawfish/%%VERSION%%/lisp/sawfish/ui/shell.jlc share/sawfish/%%VERSION%%/lisp/sawfish/ui/slot.jl share/sawfish/%%VERSION%%/lisp/sawfish/ui/slot.jlc -share/sawfish/%%VERSION%%/lisp/sawfish/ui/user-level.jl -share/sawfish/%%VERSION%%/lisp/sawfish/ui/user-level.jlc share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/command.jl share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/command.jlc share/sawfish/%%VERSION%%/lisp/sawfish/ui/widgets/event.jl @@ -438,7 +404,6 @@ share/sawfish/%%VERSION%%/sounds/clicked.wav share/sawfish/%%VERSION%%/sounds/gameover.wav share/sawfish/%%VERSION%%/sounds/slide.wav share/sawfish/%%VERSION%%/sounds/toggled.wav -%%GNOME:%%share/sawfish/%%VERSION%%/themer.glade share/sawfish/%%VERSION%%/themes/Crux/README share/sawfish/%%VERSION%%/themes/Crux/README.gl share/sawfish/%%VERSION%%/themes/Crux/active:bottom-left-border.png @@ -682,10 +647,6 @@ share/sawfish/%%VERSION%%/themes/smaker/theme.jl @dirrm share/sawfish/%%VERSION%%/lisp @dirrm share/sawfish/%%VERSION%% @dirrm share/sawfish -%%NOGNOME:%%@dirrm share/gnome/pixmaps -%%GNOME:%%@dirrm share/gnome/control-center/Sawfish -%%GNOME:%%@dirrm share/gnome/apps/Settings/Sawfish -%%NOGNOME:%%@dirrm share/gnome @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm/util @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish/wm @dirrm libexec/sawfish/%%VERSION%%/%%GNUHOST%%/sawfish |