-sedit 's/lucidasans-10/fixed/g' ${SOURCE_DIRECTORY}/windowlab.h &&
+if ! is_depends_enabled $SPELL libxext ; then
+ sedit 's/DEFINES += -DSHAPE/#DEFINES += -DSHAPE/' Makefile
+ if is_depends_enabled $SPELL libxft ; then
+ message "freetype support needs libxext, keeping -lXext enabled"
+ else
+ sedit 's/EXTRA_LIBS += -lXext/#EXTRA_LIBS += -lXext/' Makefile
+ fi
+fi &&
-if echo ${OPTS} | grep -q USEMOTIF ; then
- sedit 's/\#DEFINES\ +=\ -DMWM\_HINTS/DEFINES\ +=\ -DMWM\_HINTS/g'
${SOURCE_DIRECTORY}/Makefile
+if is_depends_enabled $SPELL libxft ; then
+ sedit 's/#DEFINES += -DXFT/DEFINES += -DXFT/' Makefile
+ sedit 's/#EXTRA_INC += `pkg-config --cflags xft`/EXTRA_INC += `pkg-config
--cflags xft`/' Makefile
+ sedit 's/#EXTRA_LIBS += `pkg-config --libs xft`/EXTRA_LIBS += `pkg-config
--libs xft`/' Makefile
fi
diff --git a/windowmanagers/windowlab/makefile.patch
b/windowmanagers/windowlab/makefile.patch
index 79218e6..68e577f 100644
--- a/windowmanagers/windowlab/makefile.patch
+++ b/windowmanagers/windowlab/makefile.patch
@@ -1,25 +1,25 @@
---- Makefile.orig 2008-03-16 20:31:25.000000000 +0000
-+++ Makefile 2008-03-16 20:36:46.000000000 +0000
-@@ -9,9 +9,10 @@
+--- Makefile 2009-11-05 22:04:45.000000000 +0100
++++ Makefile.fixed 2009-12-18 17:07:37.000000000 +0100
+@@ -5,18 +5,18 @@
+ EXTRA_LIBS += -lXext
+
+ # Set this to the hardcoded location of all files if it's not /
+-PREFIX = /usr/local
++PREFIX = /usr
+
+ # Set this to the directory, below PREFIX, where man pages
+ # are expected. Below this directory, the target "install"
+ # will put "windowlab.1x" in section "man1".
+-MANBASE = /man
++MANBASE = /share/man
# Set this to the location of the X installation you want to compile against
XROOT = /usr/X11R6
-+INSTALL_ROOT = /usr
- # Set this to the location of the global configuration files
--SYSCONFDIR = $(PREFIX)/etc/X11/windowlab
-+SYSCONFDIR = $(PREFIX)/etc/windowlab
+ # Some flexibility for configuration location
+-CONFPREFIX = $(PREFIX)
++CONFPREFIX = /
+ CONFDIR = /etc/X11/windowlab
- # Information about the location of the menurc file
- ifndef MENURC
-@@ -39,8 +40,8 @@
- CFLAGS = -g -O2 -Wall -W
- endif
-
--BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin
--MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/man/man1
-+BINDIR = $(DESTDIR)$(PREFIX)$(INSTALL_ROOT)/bin
-+MANDIR = $(DESTDIR)$(PREFIX)$(INSTALL_ROOT)/man/man1
- CFGDIR = $(DESTDIR)$(SYSCONFDIR)
- INCLUDES = -I$(XROOT)/include $(EXTRA_INC)
- LDPATH = -L$(XROOT)/lib
+ # Set this to the location of the global configuration files
+
diff --git a/windowmanagers/windowlab/windowlab-1.34.tar.sig
b/windowmanagers/windowlab/windowlab-1.34.tar.sig
deleted file mode 100644
index 92f79fa..0000000
Binary files a/windowmanagers/windowlab/windowlab-1.34.tar.sig and /dev/null
differ
diff --git a/wm-addons/sawfish-pager/BUILD b/wm-addons/sawfish-pager/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/wm-addons/sawfish-pager/BUILD
@@ -0,0 +1 @@
+make
diff --git a/wm-addons/sawfish-pager/DEPENDS b/wm-addons/sawfish-pager/DEPENDS
new file mode 100755
index 0000000..fc861d4
--- /dev/null
+++ b/wm-addons/sawfish-pager/DEPENDS
@@ -0,0 +1 @@
+depends sawfish
diff --git a/wm-addons/sawfish-pager/DETAILS b/wm-addons/sawfish-pager/DETAILS
new file mode 100755
index 0000000..5658ed3
--- /dev/null
+++ b/wm-addons/sawfish-pager/DETAILS
@@ -0,0 +1,14 @@
+ SPELL=sawfish-pager
+ VERSION=0.7a
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/pager/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:47fcc1085b0a58f2666f5428ba0f4ae085246eed30aff82355440d7258bf0a3f2af672faf9d2523d6a31e9dce468647be87cc1f9f33692bac57370d3339c4d2e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://sourceforge.net/projects/sawfish-pager/"
+ LICENSE[0]=GPL
+ ENTERED=20091218
+ SHORT="Sawfish's native pager"
+cat << EOF
+sawfish.wm.ext.pager is a c/lisp extension that provides a functional
+desktop pager for the sawfish window manager.
+EOF
diff --git a/wm-addons/sawfish-pager/HISTORY b/wm-addons/sawfish-pager/HISTORY
new file mode 100644
index 0000000..7b0be81
--- /dev/null
+++ b/wm-addons/sawfish-pager/HISTORY
@@ -0,0 +1,3 @@
+2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: spell created
+
diff --git a/x11-toolkits/rep-gtk2/BUILD b/x11-toolkits/rep-gtk2/BUILD
deleted file mode 100755
index 677ce62..0000000
--- a/x11-toolkits/rep-gtk2/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-sedit
's/gtk_radio_menu_item_new_with_label_from_widget/rep_gtk_radio_menu_item_new_with_label_from_widget/'
rep-gtk.h &&
-sedit
's/gtk_radio_menu_item_new_with_mnemonic_from_widget/rep_gtk_radio_menu_item_new_with_mnemonic_from_widget/'
rep-gtk.h &&
-sedit
's/gtk_radio_menu_item_new_from_widget/rep_gtk_radio_menu_item_new_from_widget/'
rep-gtk.h &&
-sedit 's/gtk_pixmap_new_interp/rep_gtk_pixmap_new_interp/' rep-gtk.h &&
-sedit
's/gtk_radio_menu_item_new_with_label_from_widget/rep_gtk_radio_menu_item_new_with_label_from_widget/'
gtk-compat.c &&
-sedit
's/gtk_radio_menu_item_new_with_mnemonic_from_widget/rep_gtk_radio_menu_item_new_with_mnemonic_from_widget/'
gtk-compat.c &&
-sedit
's/gtk_radio_menu_item_new_from_widget/rep_gtk_radio_menu_item_new_from_widget/'
gtk-compat.c &&
-sedit 's/gtk_pixmap_new_interp/rep_gtk_pixmap_new_interp/' gtk-compat.c &&
-
-default_build
diff --git a/x11-toolkits/rep-gtk2/DETAILS b/x11-toolkits/rep-gtk2/DETAILS
index 2d3726d..a0be2ef 100755
--- a/x11-toolkits/rep-gtk2/DETAILS
+++ b/x11-toolkits/rep-gtk2/DETAILS
@@ -1,23 +1,10 @@
SPELL=rep-gtk2
-if [ "${REPGTK_CVS}" == "y" ]; then
- if [ "${REPGTK_AUTOUPDATE}" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=cvs
- fi
- SOURCE=${SPELL}-cvs.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvs
- SOURCE_URL[0]=svn_http://svn.gnome.org/svn/rep-gtk/trunk:rep-gtk-svn
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-else
- VERSION=0.18.6r2
+ VERSION=0.90.0
BRANCH=`echo ${VERSION}|cut -d . -f 1,2`
SOURCE=rep-gtk-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/rep-gtk-${VERSION}
SOURCE_URL[0]=${SOURCEFORGE_URL}/rep-gtk/${SOURCE}
-
SOURCE_HASH=sha512:3aab9bd9b602dad39a3811cdd7ca8abd4e2a274125077fa43f1c0bc818678b7a43ea4cd57c11115fc4b7244ae23df4ed9abca8d84abc3a83f4e55a82a5348969
-fi
+
SOURCE_HASH=sha512:7c588d69425923ddeca272f69a3c22fb65b94dbba20de3ed79d8e709b6c3f370dc9b497500f4f008ea244d9058be114b4f740687e9838285c8a74d9c411e8a53
WEB_SITE=http://sawfish.wikia.com/wiki/Rep-GTK
LICENSE[0]=GPL
ENTERED=20020510
diff --git a/x11-toolkits/rep-gtk2/HISTORY b/x11-toolkits/rep-gtk2/HISTORY
index 874c9dd..7482235 100644
--- a/x11-toolkits/rep-gtk2/HISTORY
+++ b/x11-toolkits/rep-gtk2/HISTORY
@@ -1,3 +1,7 @@
+2009-12-18 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.90.0, removed cvs option
+ * PREPARE, BUILD: removed, no longer needed
+
2009-11-03 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 0.18.6r2, switched to sha512 hash
diff --git a/x11-toolkits/rep-gtk2/PREPARE b/x11-toolkits/rep-gtk2/PREPARE
deleted file mode 100755
index c738d18..0000000
--- a/x11-toolkits/rep-gtk2/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query REPGTK_CVS "Use SVN code?" n &&
-
-if [ "${REPGTK_CVS}" == "y" ]; then
- config_query REPGTK_AUTOUPDATE "Get SVN update every time?" n
-fi
-
[SM-Commit] GIT changes to master grimoire by Arjan Bouter (eee2e03078310aa823d6a01239a52ea41ac0d065),
Arjan Bouter, 12/18/2009