Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (81a2d76861122707639c7f4e4aa89a363322eae0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (81a2d76861122707639c7f4e4aa89a363322eae0)
  • Date: Tue, 16 Sep 2008 15:28:13 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

dev/null |binary
windowmanagers/aewm++/HISTORY | 3
windowmanagers/aewm++/PRE_BUILD | 8 ++
windowmanagers/awesome/DEPENDS | 19 ++---
windowmanagers/awesome/DETAILS | 2
windowmanagers/awesome/HISTORY | 4 +
windowmanagers/awesome/awesome-2.3.2.tar.bz2.sig | 0
windowmanagers/awesome/awesome-2.3.4.tar.bz2.sig |binary
windowmanagers/blackbox/DEPENDS | 11 ++-
windowmanagers/blackbox/HISTORY | 3
windowmanagers/evilwm/DEPENDS | 2
windowmanagers/evilwm/HISTORY | 3
windowmanagers/jwm/BUILD | 2
windowmanagers/jwm/CONFIGURE | 6 +
windowmanagers/jwm/DEPENDS | 59 ++++++++--------
windowmanagers/jwm/HISTORY | 5 +
windowmanagers/jwm/INSTALL | 2
windowmanagers/openbox/DEPENDS | 13 +++
windowmanagers/openbox/HISTORY | 3
windowmanagers/pekwm/BUILD | 5 -
windowmanagers/pekwm/CONFIGURE | 21 +----
windowmanagers/pekwm/DEPENDS | 36 +++++++--
windowmanagers/pekwm/DETAILS | 8 --
windowmanagers/pekwm/HISTORY | 9 ++
windowmanagers/pekwm/INSTALL | 2
windowmanagers/pwm/BUILD | 4 -
windowmanagers/pwm/HISTORY | 5 +
windowmanagers/pwm/PRE_BUILD | 3
windowmanagers/pwm/pwm.patch | 84
+++++++++++++++++++++++
windowmanagers/pwm/sgl-Makefile | 74 --------------------
windowmanagers/windowmaker/BUILD | 10 +-
windowmanagers/windowmaker/DEPENDS | 41 +++++++++--
windowmanagers/windowmaker/DETAILS | 2
windowmanagers/windowmaker/HISTORY | 5 +
windowmanagers/wmii/DEPENDS | 2
windowmanagers/wmii/HISTORY | 3
windowmanagers/yeahwm/DEPENDS | 4 -
windowmanagers/yeahwm/HISTORY | 3
38 files changed, 297 insertions(+), 169 deletions(-)

New commits:
commit 3e2e26a2bf0bea0b0da855cfe48d22ceee72a157
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

openbox: added optional deps on libxcursor and libsm

commit 1933da257b720932feea9e11afda56d7bb32a9e4
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

windowmaker: fixed modular xorg dependencies and building on x86_84

commit ed6c8090693018991ec700546c33dcf8e306d581
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

pwm: it builds again ;)
replaced the makefile with a patch that fixes more and use the systems
asprintf instead of the incompatible version in the tarball.

commit 8bd98ada92b1016e564e9353ec12eee443d3aa81
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

jwm: added/fixed modular xorg deps, added options for confirmation
dialogs and icons, obey INSTALL_ROOT, use install_config_file for the
menu

commit 666688caf279a616770814a39b27e9e7f63ee54d
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

blackbox: added missing modular xorg dependencies

commit c0a94d2a2cc082e2c686836cbdc2e2e9955cd0a5
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

yeahwm: fixed modular xorg dependencies

commit 3f8d4a2c585fa4f5eb51c9dd1afc22b29cb99ce6
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

awesome: version 2.3.4 and now uses proper modular xorg deps

commit c4cb7b1506769ad064e45dc1cc2862024de037ad
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

pekwm: version 0.1.7, added proper modular xorg + missing dependencies
and options

commit a9bcf7418c647d71bf46f8fd6dfbdb8530ba9998
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

aewm++: builds again, added a couple of missing includes

commit a7cc2337aac2e1dc8a89865a46d5a33ec162b109
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

wmii: removed && from the last line

commit 12233a757a1cf021e040ad7d003d01e866ab5e28
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

evilwm: removed && from the last line

diff --git a/windowmanagers/aewm++/HISTORY b/windowmanagers/aewm++/HISTORY
index ab814b7..13399e4 100644
--- a/windowmanagers/aewm++/HISTORY
+++ b/windowmanagers/aewm++/HISTORY
@@ -1,3 +1,6 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_BUILD: added missing includes
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/windowmanagers/aewm++/PRE_BUILD b/windowmanagers/aewm++/PRE_BUILD
index 9bb78bd..5ed1be9 100755
--- a/windowmanagers/aewm++/PRE_BUILD
+++ b/windowmanagers/aewm++/PRE_BUILD
@@ -1,3 +1,11 @@
default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit '8a\
+#include <string.h>\' windowmanager.cc &&
+sedit '8a\
+#include <string.h>\' client.cc &&
+sedit '8a\
+#include <string.h>\' main.cc &&
+
patch -p 1 -d ${SOURCE_DIRECTORY} < \
${SCRIPT_DIRECTORY}/aewm++-1.1.5-Makefile.patch
diff --git a/windowmanagers/awesome/DEPENDS b/windowmanagers/awesome/DEPENDS
index 349ff82..4788bf7 100755
--- a/windowmanagers/awesome/DEPENDS
+++ b/windowmanagers/awesome/DEPENDS
@@ -1,21 +1,18 @@
depends cairo &&
+depends pango &&
depends confuse &&
depends pkgconfig &&
depends X11-LIBS &&
+depends libxrandr &&
+depends libxinerama &&

message "Awesome depends on either Imlib2 or gtk+2," &&
message "If you say y to both, it will build with GTK+2" &&
optional_depends imlib2 '' '' 'Build against imlib2?' &&
optional_depends gtk+2 '--with-gtk' '' 'Build against GTK+2?' &&

-optional_depends xmlto '' '' 'For manpage generation' &&
-optional_depends asciidoc '' '' 'Create the manpage?' &&
-optional_depends doxygen '' '' 'Create the developer docs?' &&
-
-. $GRIMOIRE/FUNCTIONS &&
-
-if check_if_xorg_modular_libs; then
- depends libxft &&
- depends libxinerama &&
- depends libxrandr
-fi
+optional_depends xmlto '' '' 'For manpage generation' &&
+optional_depends docbook-xsl '' '' 'For manpage generation' &&
+optional_depends asciidoc '' '' 'For manpage generation' &&
+optional_depends graphviz '' '' 'For the sourcecode reference' &&
+optional_depends doxygen '' '' 'For the sourcecode reference'
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
index 07e0295..f638997 100755
--- a/windowmanagers/awesome/DETAILS
+++ b/windowmanagers/awesome/DETAILS
@@ -1,5 +1,5 @@
SPELL=awesome
- VERSION=2.3.2
+ VERSION=2.3.4
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 8482955..3c8bdc9 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,7 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 2.3.4
+ * DEPENDS: proper modular xorg deps
+
2008-06-26 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: version 2.3.2

diff --git a/windowmanagers/awesome/awesome-2.3.2.tar.bz2.sig
b/windowmanagers/awesome/awesome-2.3.2.tar.bz2.sig
deleted file mode 100644
index 786d8c1..0000000
Binary files a/windowmanagers/awesome/awesome-2.3.2.tar.bz2.sig and /dev/null
differ
diff --git a/windowmanagers/awesome/awesome-2.3.4.tar.bz2.sig
b/windowmanagers/awesome/awesome-2.3.4.tar.bz2.sig
new file mode 100644
index 0000000..91b2710
Binary files /dev/null and b/windowmanagers/awesome/awesome-2.3.4.tar.bz2.sig
differ
diff --git a/windowmanagers/blackbox/DEPENDS b/windowmanagers/blackbox/DEPENDS
index c81d6dc..1556b19 100755
--- a/windowmanagers/blackbox/DEPENDS
+++ b/windowmanagers/blackbox/DEPENDS
@@ -2,4 +2,13 @@ depends xorg-libs &&
if [ "${BLACKBOX_CVS}" == "y" ] ; then
depends libtool &&
depends automake
-fi
+fi &&
+
+optional_depends libxext \
+ '--enable-shape --enable-shm' \
+ '--disable-shape --disable-shm' \
+ "For SHAPE and Shm extension support." &&
+
+optional_depends libxft \
+ '--enable-xft' '--disable-xft' \
+ "For X FreeType extension support."
diff --git a/windowmanagers/blackbox/HISTORY b/windowmanagers/blackbox/HISTORY
index 9731a1b..e307930 100644
--- a/windowmanagers/blackbox/HISTORY
+++ b/windowmanagers/blackbox/HISTORY
@@ -1,3 +1,6 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added missing modular xorg dependencies
+
2008-08-29 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: switched non-functional cvs download to nightly snapshots
* BUILD: removed
diff --git a/windowmanagers/evilwm/DEPENDS b/windowmanagers/evilwm/DEPENDS
index 1a312b7..4e82cd0 100755
--- a/windowmanagers/evilwm/DEPENDS
+++ b/windowmanagers/evilwm/DEPENDS
@@ -11,4 +11,4 @@ fi &&
optional_depends "MOTIF" \
"USEMOTIF" \
"" \
- "Use Motif hints to find if a window should be
borderless?" &&
+ "Use Motif hints to find if a window should be borderless?"
diff --git a/windowmanagers/evilwm/HISTORY b/windowmanagers/evilwm/HISTORY
index c20c65c..e7a3cd0 100644
--- a/windowmanagers/evilwm/HISTORY
+++ b/windowmanagers/evilwm/HISTORY
@@ -1,3 +1,6 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: removed leftover &&
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
No need to check if using modular X as that's all that's available
now
diff --git a/windowmanagers/jwm/BUILD b/windowmanagers/jwm/BUILD
new file mode 100755
index 0000000..edf193f
--- /dev/null
+++ b/windowmanagers/jwm/BUILD
@@ -0,0 +1,2 @@
+OPTS="$JWM_CONFIRM $JWM_ICONS $OPTS"
+default_build
diff --git a/windowmanagers/jwm/CONFIGURE b/windowmanagers/jwm/CONFIGURE
new file mode 100755
index 0000000..82f72f7
--- /dev/null
+++ b/windowmanagers/jwm/CONFIGURE
@@ -0,0 +1,6 @@
+config_query_option JWM_CONFIRM \
+ "Enable confirmation dialogs?" y \
+ "--enable-confirm" "--disable-confirm" &&
+config_query_option JWM_ICONS \
+ "Enable icon support?" y \
+ "--enable-icons" "--disable-icons"
diff --git a/windowmanagers/jwm/DEPENDS b/windowmanagers/jwm/DEPENDS
index cdb1c54..7c755dc 100755
--- a/windowmanagers/jwm/DEPENDS
+++ b/windowmanagers/jwm/DEPENDS
@@ -1,34 +1,39 @@
depends xorg-libs &&

-optional_depends libxext \
- "" \
- "--disable-shape" \
- "X shape and render extensions" &&
-
-optional_depends libxinerama \
- "" \
- "--disable-xinerama" \
- "Xinerama support" &&
-
-optional_depends libxpm \
- "" \
- "--disable-xpm" \
- "XPM image support" &&
-
-optional_depends libxft \
- "" \
- "--disable-xft" \
- "antialiased and true type fonts support"
-
-optional_depends jpeg \
- "" \
- "--disable-jpeg" \
+optional_depends libxext \
+ "--enable-shape" \
+ "--disable-shape" \
+ "X shape extension" &&
+
+optional_depends libxrender \
+ "--enable-xrender" \
+ "--disable-xrender" \
+ "X render extension" &&
+
+optional_depends libxft \
+ "--enable-xft" \
+ "--disable-xft" \
+ "X FreeType extension" &&
+
+optional_depends libxinerama \
+ "--enable-xinerama" \
+ "--disable-xinerama" \
+ "Xinerama support" &&
+
+optional_depends libxpm \
+ "--enable-xpm" \
+ "--disable-xpm" \
+ "XPM image support" &&
+
+optional_depends jpeg \
+ "--enable-jpeg" \
+ "--disable-jpeg" \
"JPEG image support" &&

-optional_depends libpng \
- "" \
- "--disable-png" \
- "PNG image support" &&
+optional_depends libpng \
+ "--enable-png" \
+ "--disable-png" \
+ "PNG image support" &&

optional_depends fribidi \
"" \
diff --git a/windowmanagers/jwm/HISTORY b/windowmanagers/jwm/HISTORY
index 6e74d05..e06635c 100644
--- a/windowmanagers/jwm/HISTORY
+++ b/windowmanagers/jwm/HISTORY
@@ -1,3 +1,8 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added/fixed modular xorg dependencies
+ * CONFIGURE, BUILD: added options for icons and confirmation dialogs
+ * INSTALL: use install_config_file for the menu and obey INSTALL_ROOT
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
No need to check if using modular X as that's all that's available
now
diff --git a/windowmanagers/jwm/INSTALL b/windowmanagers/jwm/INSTALL
index 8dc0b80..a16682e 100755
--- a/windowmanagers/jwm/INSTALL
+++ b/windowmanagers/jwm/INSTALL
@@ -1,3 +1,3 @@
default_install &&
install_wmfiles &&
-install -m 0644 jwmrc-menu /etc/
+install_config_file jwmrc-menu $INSTALL_ROOT/etc/jwmrc-menu
diff --git a/windowmanagers/openbox/DEPENDS b/windowmanagers/openbox/DEPENDS
index ea9a914..5eb5cd2 100755
--- a/windowmanagers/openbox/DEPENDS
+++ b/windowmanagers/openbox/DEPENDS
@@ -1,8 +1,19 @@
-depends xorg-libs &&
+depends xorg-libs &&
depends fontconfig &&
depends glib2 &&
depends libxml2 &&
depends pango &&
+depends libxfixes &&
+
+optional_depends libxcursor \
+ "--enable-xcursor" \
+ "--disable-xcursor" \
+ "for Xcursor extension support" &&
+
+optional_depends libsm \
+ "--enable-session-management" \
+ "--disable-session-management" \
+ "for session management support" &&

optional_depends startup-notification \
"--enable-startup-notification" \
diff --git a/windowmanagers/openbox/HISTORY b/windowmanagers/openbox/HISTORY
index 28cd35a..dfe0858 100644
--- a/windowmanagers/openbox/HISTORY
+++ b/windowmanagers/openbox/HISTORY
@@ -1,3 +1,6 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added optional deps on libxcursor and libsm
+
2008-05-29 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: updated spell to 3.4.7.2

diff --git a/windowmanagers/pekwm/BUILD b/windowmanagers/pekwm/BUILD
index 457ad1c..eb8f920 100755
--- a/windowmanagers/pekwm/BUILD
+++ b/windowmanagers/pekwm/BUILD
@@ -1,5 +1,2 @@
-[ "$HARBOUR" = y ] && OPTS="$OPTS --enable-harbour"
-[ "$XINERAMA" = y ] && OPTS="$OPTS --enable-xinerama"
-
-./autogen.sh
+OPTS="$PEKWM_HARBOUR $PEKWM_MENU $OPTS"
default_build
diff --git a/windowmanagers/pekwm/CONFIGURE b/windowmanagers/pekwm/CONFIGURE
index bf6d93e..c2f74de 100755
--- a/windowmanagers/pekwm/CONFIGURE
+++ b/windowmanagers/pekwm/CONFIGURE
@@ -1,15 +1,6 @@
-if ! grep -q "HARBOUR" $SPELL_CONFIG ; then
- if query "Enable harbour support?" y ; then
- echo "HARBOUR=y" >> $SPELL_CONFIG
- else
- echo "HARBOUR=n" >> $SPELL_CONFIG
- fi
-fi
-
-if ! grep -q "XINERAMA" $SPELL_CONFIG ; then
- if query "Enable xinerama support?" n ; then
- echo "XINERAMA=y" >> $SPELL_CONFIG
- else
- echo "XINERAMA=n" >> $SPELL_CONFIG
- fi
-fi
+config_query_option PEKWM_HARBOUR \
+ "Enable harbour (dockapp) support?" y \
+ "--enable-harbour" "--disable-harbour" &&
+config_query_option PEKWM_MENU \
+ "Enable menu support?" y \
+ "--enable-menus" "--disable-menus"
diff --git a/windowmanagers/pekwm/DEPENDS b/windowmanagers/pekwm/DEPENDS
index de79ffa..e8c1428 100755
--- a/windowmanagers/pekwm/DEPENDS
+++ b/windowmanagers/pekwm/DEPENDS
@@ -1,13 +1,31 @@
-depends xorg-libs &&
+depends xorg-libs &&

+optional_depends libxext "--enable-shape" "--disable-shape"
\
+ "Enable Shape extension?"
&&
+
+optional_depends libxinerama "--enable-xinerama" "--disable-xinerama"
\
+ "Enable xinerama extension?"
&&
+
+optional_depends libxrandr "--enable-xrandr" "--disable-xrandr"
\
+ "Enable Randr extension?"
&&
+
+optional_depends libxft "--enable-xft" "--disable-xft"
\
+ "Enable X FreeType extension?"
&&
+
+optional_depends libxpm "--enable-xpm" "--disable-xpm"
\
+ "Enable XPM image support?"
&&
+
+optional_depends jpeg "--enable-jpeg" "--disable-jpeg"
\
+ "Enable JPEG image support?"
&&
+
+optional_depends libpng "--enable-png" "--disable-png"
\
+ "Enable PNG image support?"
&&
+
+optional_depends imlib2 \
+ "--enable-imlib2"
\
+ "--disable-imlib2"
\
+ "Enable imlib2 image support."
&&
optional_depends pcre
\
"--enable-pcre"
\
"--disable-pcre"
\
- "Enable support for Perl compatible regular expressions."
&&
-
-optional_depends imlib2
\
- "--enable-imlib2"
\
- "--disable-imlib2"
\
- "Enable imlib2 support."
&&
-
-depends automake
+ "Enable support for Perl compatible regular expressions."
diff --git a/windowmanagers/pekwm/DETAILS b/windowmanagers/pekwm/DETAILS
index 68ca194..df1dcfb 100755
--- a/windowmanagers/pekwm/DETAILS
+++ b/windowmanagers/pekwm/DETAILS
@@ -1,10 +1,8 @@
SPELL=pekwm
- VERSION=0.1.6
+ VERSION=0.1.7
SOURCE=$SPELL-$VERSION.tar.bz2
-# moved temporarily
-# SOURCE_URL[0]=http://pekwm.org/files/$SOURCE
- SOURCE_URL[0]=http://projects.pekdon.net/files/download/15
-
SOURCE_HASH=sha512:c9d4d382c6cb9b558e9850e0bcddd1b573cd544eda15c983a01313f8a1301111aba1c0c98d745a8b66c7517b71527818e3493c22b7862d0573728cd54e1c20ae
+ SOURCE_URL[0]=http://pekwm.org/projects/3/files/$SOURCE
+
SOURCE_HASH=sha512:17d8cf3d188fb66c94dd252e7a9aec7c749191c7c6054779c750bbb3466f5212d3815d18e57179b198e859cd5d08c5128d5a8da9f0404c9e07de079230631a7d
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION/
WEB_SITE=http://pekwm.org
ENTERED=20030808
diff --git a/windowmanagers/pekwm/HISTORY b/windowmanagers/pekwm/HISTORY
index a5a160a..e488532 100644
--- a/windowmanagers/pekwm/HISTORY
+++ b/windowmanagers/pekwm/HISTORY
@@ -1,3 +1,12 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version 0.1.7
+ * BUILD: rewritten for new CONFIGURE options
+ * DEPENDS: added proper modular xorg deps
+ and removed dep on automake
+ * CONFIGURE: uses config_query_option now
+ * INSTALL: removed a lot of unneeded spaces.
+ I know, a cosmetic change ;)
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/windowmanagers/pekwm/INSTALL b/windowmanagers/pekwm/INSTALL
index c514af8..88255cc 100755
--- a/windowmanagers/pekwm/INSTALL
+++ b/windowmanagers/pekwm/INSTALL
@@ -1,2 +1,2 @@
-default_install &&
+default_install &&
install_wmfiles
diff --git a/windowmanagers/pwm/BUILD b/windowmanagers/pwm/BUILD
index afaa3b6..69e58fb 100755
--- a/windowmanagers/pwm/BUILD
+++ b/windowmanagers/pwm/BUILD
@@ -1,3 +1 @@
-cp $SCRIPT_DIRECTORY/sgl-Makefile \
- $SOURCE_DIRECTORY/Makefile &&
-make PREFIX=/usr
+HAS_SYSTEM_ASPRINTF=y make PREFIX=/usr
diff --git a/windowmanagers/pwm/HISTORY b/windowmanagers/pwm/HISTORY
index 64209e0..3278a7d 100644
--- a/windowmanagers/pwm/HISTORY
+++ b/windowmanagers/pwm/HISTORY
@@ -1,3 +1,8 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * sgl-makefile: replaced by pwm.patch
+ * PRE_BUILD: separated from BUILD
+ * BUILD: use system asprintf
+
2008-06-05 Arjan Bouter <abouter AT sourcemage.org>
* sgl-makefile: fixed manpage and doc install dirs
* DETAILS: patchlevel=1
diff --git a/windowmanagers/pwm/PRE_BUILD b/windowmanagers/pwm/PRE_BUILD
new file mode 100755
index 0000000..64cadb7
--- /dev/null
+++ b/windowmanagers/pwm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/pwm.patch
diff --git a/windowmanagers/pwm/pwm.patch b/windowmanagers/pwm/pwm.patch
new file mode 100644
index 0000000..ae61d87
--- /dev/null
+++ b/windowmanagers/pwm/pwm.patch
@@ -0,0 +1,84 @@
+diff -Naur ./pwm-20070720/Makefile pwm-20070720-fixed/Makefile
+--- ./pwm-20070720/Makefile 2007-07-20 16:16:40.000000000 +0200
++++ pwm-20070720-fixed/Makefile 2008-09-16 19:30:32.149219983 +0200
+@@ -3,17 +3,16 @@
+ ##
+
+ # System-specific configuration is in system.mk
+-include system-inc.mk
++include system.mk
+
+ ######################################
+
+ SUBDIRS=libtu
+ LIBS += -L./libtu -ltu -lm $(X11_LIBS) -lX11
+ INCLUDES += -I./libtu/include $(X11_INCLUDES)
+-DEFINES += -DETCDIR=\"$(ETCDIR)\"
++DEFINES += -DPREFIX=\"$(PREFIX)\"
+ CFLAGS += $(XOPEN_SOURCE)
+ TO_REALCLEAN += pwm.1x
+-TO_CLEAN += $(OBJS)
+
+ OBJS= main.o draw.o font.o frame.o event.o clientwin.o thing.o \
+ property.o pointer.o key.o moveres.o cursor.o function.o \
+@@ -21,6 +20,11 @@
+ readconfig.o menudata.o dock.o frameid.o placement.o \
+ binding.o winlist.o mwmhints.o signal.o winprops.o
+
++BINDIR=$(PREFIX)/bin
++ETCDIR=/etc
++MANDIR=$(PREFIX)/share/man/man1
++DOCDIR=$(PREFIX)/share/doc
++
+ TARGETS=pwm
+
+ ######################################
+@@ -36,20 +40,20 @@
+ sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1x
+
+ _install:
+- $(INSTALLDIR) $(BINDIR)
++ $(INSTALL) -d $(BINDIR)
+ $(INSTALL) -m $(BIN_MODE) pwm $(BINDIR)
+ $(STRIP) $(BINDIR)/pwm
+
+- $(INSTALLDIR) $(MANDIR)/man1
+- $(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR)/man1
++ $(INSTALL) -d $(MANDIR)
++ $(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR)
+
+- $(INSTALLDIR) $(DOCDIR)
+- $(INSTALLDIR) $(DOCDIR)/pwm
++ $(INSTALL) -d $(DOCDIR)
++ $(INSTALL) -d $(DOCDIR)/pwm
+ $(INSTALL) -m $(DATA_MODE) config.txt $(DOCDIR)/pwm
+ $(INSTALL) -m $(DATA_MODE) LICENSE $(DOCDIR)/pwm
+
+- $(INSTALLDIR) $(ETCDIR)
+- $(INSTALLDIR) $(ETCDIR)/pwm
++ $(INSTALL) -d $(ETCDIR)
++ $(INSTALL) -d $(ETCDIR)/pwm
+ for i in etc/pwm/*.conf; do \
+ $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/pwm; \
+ done
+diff -Naur ./pwm-20070720/system.mk pwm-20070720-fixed/system.mk
+--- ./pwm-20070720/system.mk 2006-05-17 08:50:33.000000000 +0200
++++ pwm-20070720-fixed/system.mk 2008-09-16 19:30:32.159210367 +0200
+@@ -7,13 +7,13 @@
+ ## Installation paths
+ ##
+
+-PREFIX=/usr/local
++PREFIX=/usr
+
+ # No need to modify these usually
+ BINDIR=$(PREFIX)/bin
+-ETCDIR=$(PREFIX)/etc
+-MANDIR=$(PREFIX)/man
+-DOCDIR=$(PREFIX)/doc
++ETCDIR=/etc
++MANDIR=$(PREFIX)/share/man
++DOCDIR=$(PREFIX)/share/doc
+ # Not used
+ INCDIR=$(PREFIX)/include
+ LIBDIR=$(PREFIX)/lib
diff --git a/windowmanagers/pwm/sgl-Makefile b/windowmanagers/pwm/sgl-Makefile
deleted file mode 100755
index c4a38e1..0000000
--- a/windowmanagers/pwm/sgl-Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-##
-## PWM Makefile
-##
-
-# System-specific configuration is in system.mk
-include system.mk
-
-######################################
-
-SUBDIRS=libtu
-LIBS += -L./libtu -ltu -lm $(X11_LIBS) -lX11
-INCLUDES += -I./libtu/include $(X11_INCLUDES)
-DEFINES += -DPREFIX=\"$(PREFIX)\"
-CFLAGS += $(XOPEN_SOURCE)
-TO_REALCLEAN += pwm.1x
-
-OBJS= main.o draw.o font.o frame.o event.o clientwin.o thing.o \
- property.o pointer.o key.o moveres.o cursor.o function.o \
- exec.o focus.o workspace.o winobj.o screen.o menu.o \
- readconfig.o menudata.o dock.o frameid.o placement.o \
- binding.o winlist.o mwmhints.o signal.o winprops.o
-
-BINDIR=$(PREFIX)/bin
-ETCDIR=/etc
-MANDIR=$(PREFIX)/share/man/man1
-DOCDIR=$(PREFIX)/share/doc
-
-TARGETS=pwm
-
-######################################
-
-include rules.mk
-
-######################################
-
-pwm: $(OBJS) pwm.1x
- $(CC) $(OBJS) $(LDFLAGS) -o $@
-
-pwm.1x: pwm.1x.in
- sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1x
-
-_install:
- $(INSTALL) -d $(BINDIR)
- $(INSTALL) -m $(BIN_MODE) pwm $(BINDIR)
- $(STRIP) $(BINDIR)/pwm
-
- $(INSTALL) -d $(MANDIR)
- $(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR)
-
- $(INSTALL) -d $(DOCDIR)
- $(INSTALL) -d $(DOCDIR)/pwm
- $(INSTALL) -m $(DATA_MODE) config.txt $(DOCDIR)/pwm
- $(INSTALL) -m $(DATA_MODE) LICENSE $(DOCDIR)/pwm
-
- $(INSTALL) -d $(ETCDIR)
- $(INSTALL) -d $(ETCDIR)/pwm
- for i in etc/pwm/*.conf; do \
- $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/pwm; \
- done
- @ if test -f $(ETCDIR)/pwm/pwm.conf ; then \
- echo "$(ETCDIR)/pwm/pwm.conf already exists. Not installing
one."; \
- else \
- echo "Installing sample configuration file
$(ETCDIR)/pwm/pwm.conf"; \
- $(INSTALL) -m $(DATA_MODE) etc/pwm/sample.conf
$(ETCDIR)/pwm/pwm.conf; \
- fi
-
-
-# Disclaimer: I don't have either Gnome or KDE.
-
-install-gnomede: support/PWM.desktop
- $(INSTALL) -m $(DATA_MODE) support/PWM.desktop \
- `gnome-config --datadir`/gnome/wm-properties
-
-install-gnome: install install-gnomede
diff --git a/windowmanagers/windowmaker/BUILD
b/windowmanagers/windowmaker/BUILD
index dfc5b48..a6a90d1 100755
--- a/windowmanagers/windowmaker/BUILD
+++ b/windowmanagers/windowmaker/BUILD
@@ -1,9 +1,9 @@
-if [ ${SMGL_COMPAT_ARCHS[1]} != alpha ]; then
- message "disabling PIC on non-alpha arch" &&
- OPTS="--without-pic ${OPTS}" &&
- disable_pic force &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == alpha ]] || [[ "${SMGL_COMPAT_ARGS[1]}"
!= x86_64 ]]; then
+ message "we are on alpha or x66_64, letting it PIC" &&
default_build
else
- message "we are on alpha, letting it PIC" &&
+ message "disabling PIC on non-alpha or non-x86_64 arch" &&
+ OPTS="--without-pic ${OPTS}" &&
+ disable_pic force &&
default_build
fi
diff --git a/windowmanagers/windowmaker/DEPENDS
b/windowmanagers/windowmaker/DEPENDS
index 8b6bc23..6a82297 100755
--- a/windowmanagers/windowmaker/DEPENDS
+++ b/windowmanagers/windowmaker/DEPENDS
@@ -1,13 +1,42 @@
depends xorg-libs &&
-depends tiff &&
-depends libpng &&
-depends libxft &&
depends zlib &&
-depends jpeg &&
-depends giflib &&
+depends libxft &&
+
+if [[ "${WINDOWMAKER_CVS}" == "y" ]]; then
+ depends CVS
+fi &&

if [[ "${WINDOWMAKER_CVS}" == "y" ]] || [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64
]]; then
depends CVS &&
depends libtool &&
depends autoconf
-fi
+fi &&
+
+optional_depends libxext \
+ '--enable-shape --enable-shm' \
+ '--disable-shape --disable-shm' \
+ "Enable SHAPE and Shm extension support?" &&
+
+optional_depends libxinerama \
+ '--enable-xinerama' '--disable-xinerama' \
+ "Enable Xinerama extension support?" &&
+
+optional_depends jpeg \
+ '--enable-jpeg' '--disable-jpeg' \
+ "Enable JPEG image support?" &&
+
+optional_depends giflib \
+ '--enable-gif' '--disable-gif' \
+ "Enable GIF image support?" &&
+
+optional_depends libxpm \
+ '--enable-xpm' '--disable-xpm' \
+ "Enable XPM image support?" &&
+
+optional_depends libpng \
+ '--enable-png' '--disable-png' \
+ "Enable PNG image support?" &&
+
+optional_depends tiff \
+ '--enable-tiff' '--disable-tiff' \
+ "Enable TIFF image support?"
diff --git a/windowmanagers/windowmaker/DETAILS
b/windowmanagers/windowmaker/DETAILS
index 78c1b9c..3c49495 100755
--- a/windowmanagers/windowmaker/DETAILS
+++ b/windowmanagers/windowmaker/DETAILS
@@ -19,14 +19,12 @@ else
SOURCE_DIRECTORY=$BUILD_DIRECTORY/WindowMaker-$VERSION
SOURCE_URL[0]=ftp://www.windowmaker.info/pub/source/release/$SOURCE
SOURCE_URL[1]=http://download.sourcemage.org/mirror/$SOURCE
-
SOURCE_HASH=sha256:b431ce9f47c5d4cd52ab5b8298cff56fd5700d6e6052b149e19b6c567e526db1

SOURCE_HASH=sha512:8efd60d85928caba0b3228165210686646c70efa21fe8a0f774c3c2e5bc2ab05d5cc489fba4b92f5739a3a8cdeff2c08d9c2a114a09d679ed64f812c8ad51774
fi
WEB_SITE=http://www.windowmaker.info
LICENSE[0]=GPL
LICENSE[1]=http://windowmaker.info/disclaimer.html
ENTERED=20010922
- UPDATED=20021113
KEYWORDS="windowmanagers"
SHORT="X11 window manager, similar to NeXTSTEP"
cat << EOF
diff --git a/windowmanagers/windowmaker/HISTORY
b/windowmanagers/windowmaker/HISTORY
index df81989..471e409 100644
--- a/windowmanagers/windowmaker/HISTORY
+++ b/windowmanagers/windowmaker/HISTORY
@@ -1,3 +1,8 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: added modular xorg deps and made the image libs optional
+ * BUILD,PRE_BUILD: repaired x86_64 build
+ * DETAILS: removed sha256sum and UPDATED
+
2008-07-12 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: depends on giflib, provider deprecated

diff --git a/windowmanagers/wmii/DEPENDS b/windowmanagers/wmii/DEPENDS
index 705bdc8..6175293 100755
--- a/windowmanagers/wmii/DEPENDS
+++ b/windowmanagers/wmii/DEPENDS
@@ -4,4 +4,4 @@ depends xorg-libs &&
optional_depends plan9port \
"" "" "to support configuration with rc shell script" &&
optional_depends dmenu \
-"" "" "for dynamic menus (of programs and actions)" &&
+"" "" "for dynamic menus (of programs and actions)"
diff --git a/windowmanagers/wmii/HISTORY b/windowmanagers/wmii/HISTORY
index 1b31497..ddb8cd9 100644
--- a/windowmanagers/wmii/HISTORY
+++ b/windowmanagers/wmii/HISTORY
@@ -1,3 +1,6 @@
+2008-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: removed leftover &&
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/windowmanagers/yeahwm/DEPENDS b/windowmanagers/yeahwm/DEPENDS
index 28c71f6..9f8065b 100755
--- a/windowmanagers/yeahwm/DEPENDS
+++ b/windowmanagers/yeahwm/DEPENDS
@@ -1 +1,3 @@
-depends xorg-libs
+depends xorg-libs &&
+depends libxext &&
+depends libxinerama
diff --git a/windowmanagers/yeahwm/HISTORY b/windowmanagers/yeahwm/HISTORY
index 428c8b9..53c3661 100644
--- a/windowmanagers/yeahwm/HISTORY
+++ b/windowmanagers/yeahwm/HISTORY
@@ -1,3 +1,6 @@
+2009-09-16 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: fixed modular xorg deps
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs




  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (81a2d76861122707639c7f4e4aa89a363322eae0), Arjan Bouter, 09/16/2008

Archive powered by MHonArc 2.6.24.

Top of Page