[SM-Commit] GIT changes to master grimoire by Arjan Bouter (41057f31a063966c238e15192597a5d6340cf12f)

Arjan Bouter scm at sourcemage.org
Tue Sep 16 22:02:31 EDT 2008


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

 libs/libviper/DETAILS        |    6 +++---
 libs/libviper/HISTORY        |    4 ++++
 libs/libviper/PRE_BUILD      |    1 +
 windowmanagers/dwm/BUILD     |    2 +-
 windowmanagers/dwm/DEPENDS   |    1 +
 windowmanagers/dwm/DETAILS   |    6 +++---
 windowmanagers/dwm/HISTORY   |    5 +++++
 windowmanagers/dwm/PRE_BUILD |    7 +++++++
 windowmanagers/vwm/BUILD     |    4 +++-
 windowmanagers/vwm/DEPENDS   |    1 -
 windowmanagers/vwm/DETAILS   |    4 ++--
 windowmanagers/vwm/HISTORY   |    5 +++++
 windowmanagers/vwm/PRE_BUILD |   10 ++++++----
 windowmanagers/wm2/BUILD     |    3 +--
 windowmanagers/wm2/DETAILS   |   15 ++++++++-------
 windowmanagers/wm2/HISTORY   |    5 +++++
 windowmanagers/wm2/PREPARE   |    7 ++++---
 windowmanagers/wm2/PRE_BUILD |    6 ++++++
 18 files changed, 65 insertions(+), 27 deletions(-)

New commits:
commit 576d1a204ad654b0a5889a5c495eb866476fd432
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    vwm: version 1.3.5, removed dep on gpm and fixed Makefile

commit c9b99f490a737d44cd9eb3d97537a09f4b3542cf
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    libviper: version 1.3.2, fixed website url and Makefile

commit a4956add859a47a224df9ff49d8cdcc8b0de524f
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    wm2: cvs version only (release won't build), split BUILD into PRE_BUILD

commit 371682f37df07f93c2bf2a35e35fe39c12cadbf5
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    dwm: version 5.2 and added xinerama as an option

diff --git a/libs/libviper/DETAILS b/libs/libviper/DETAILS
index 229b7a5..24c173f 100755
--- a/libs/libviper/DETAILS
+++ b/libs/libviper/DETAILS
@@ -1,10 +1,10 @@
            SPELL=libviper
-         VERSION=1.3.0
+         VERSION=1.3.2
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:dac9b7365e32ee8b033903303bd81a01a8cae1bd93f8b9fcfabd797518ca0c50284edb7f83dea13e124d04b63549af2030647dbb330f42c5e79c0fc42cf32c13
-        WEB_SITE=http://www.sourceforge.net/projects/libpseudo/
+     SOURCE_HASH=sha512:8e4dd40ba030946e8fe91389226381fc94a58708cd2c52f8d4a2617aa74fc48ae1f80cfa0cda51ababdb19619d67d1f8905773d1d4fc72d26f0f3180bf975d95
+        WEB_SITE=http://www.sourceforge.net/projects/libviper/
          ENTERED=20080117
       LICENSE[0]=GPL
         KEYWORDS="library window text mode"
diff --git a/libs/libviper/HISTORY b/libs/libviper/HISTORY
index 5cda019..8200363 100644
--- a/libs/libviper/HISTORY
+++ b/libs/libviper/HISTORY
@@ -1,2 +1,6 @@
+2008-09-17 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 1.3.2, fixed website url
+	* PRE_BUILD: fix the Makefile
+
 2008-01-17 Arjan Bouter <abouter at sourcemage.org>
 	* BUILD,CONFIGURE,DETAILS,DEPENDS,PRE_BUILD,HISTORY: added spell
diff --git a/libs/libviper/PRE_BUILD b/libs/libviper/PRE_BUILD
index 6e7a716..bb82fec 100755
--- a/libs/libviper/PRE_BUILD
+++ b/libs/libviper/PRE_BUILD
@@ -1,3 +1,4 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
+sedit 's/-D_VIPER_MOUSE_GPM //' Makefile &&
 sedit "s#/usr/local#$INSTALL_ROOT/usr#g" Makefile
diff --git a/windowmanagers/dwm/BUILD b/windowmanagers/dwm/BUILD
index e6fe4f7..8f58e6d 100755
--- a/windowmanagers/dwm/BUILD
+++ b/windowmanagers/dwm/BUILD
@@ -1 +1 @@
-make install
+make
diff --git a/windowmanagers/dwm/DEPENDS b/windowmanagers/dwm/DEPENDS
index fab6942..180f50c 100755
--- a/windowmanagers/dwm/DEPENDS
+++ b/windowmanagers/dwm/DEPENDS
@@ -1 +1,2 @@
 depends  xorg-libs  
+optional_depends libxinerama '' '' 'For Xinerama support'
diff --git a/windowmanagers/dwm/DETAILS b/windowmanagers/dwm/DETAILS
index 66ec6c0..f85e230 100755
--- a/windowmanagers/dwm/DETAILS
+++ b/windowmanagers/dwm/DETAILS
@@ -1,8 +1,8 @@
            SPELL=dwm
-         VERSION=5.0.1
+         VERSION=5.2
           SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://suckless.org/download/${SOURCE}
-     SOURCE_HASH=sha512:a9f048c47dbaba7317ddfb901bbdea616d08546ddc9044872b73b5f0dc5a8cce5d06826fae11aed9cecded3b9bb97cdfd437eec12319fcbd6178054d45553470
+   SOURCE_URL[0]=http://code.suckless.org/dl/dwm/${SOURCE}
+     SOURCE_HASH=sha512:3be1fcf56dbea99bb2b47ddfab4b78f43c11f1067275f4dddd8e797fad36ac978d64660d0eac95b5d52de6f59e736f05c3626564fb4bb870a3a1c929729b2462
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://dwm.suckless.org/
          ENTERED=20060923
diff --git a/windowmanagers/dwm/HISTORY b/windowmanagers/dwm/HISTORY
index c2956ae..8fb216d 100644
--- a/windowmanagers/dwm/HISTORY
+++ b/windowmanagers/dwm/HISTORY
@@ -1,3 +1,8 @@
+2008-09-17 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 5.2
+	* BUILD: just make, not install
+	* DEPENDS,PRE_BUILD: added optional xinerama support
+
 2008-06-26 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 5.0.1
 	* dwm-2.6.tar.gz.sig: removed
diff --git a/windowmanagers/dwm/PRE_BUILD b/windowmanagers/dwm/PRE_BUILD
index 49581ff..a969182 100755
--- a/windowmanagers/dwm/PRE_BUILD
+++ b/windowmanagers/dwm/PRE_BUILD
@@ -3,3 +3,10 @@ cd ${SOURCE_DIRECTORY} &&
 
 #right install paths
 sedit "s/\/usr\/local/${INSTALL_ROOT}\/usr/" config.mk 
+
+if ( is_depends_enabled $SPELL libxinerama ); then
+  message "Leaving Xinerama enabled"
+else
+  sedit 's/^XINERAMA/#XINERAMA/g' config.mk &&
+  message "Xinerama disabled"
+fi
diff --git a/windowmanagers/vwm/BUILD b/windowmanagers/vwm/BUILD
index 5bbe5e1..5a02ea8 100755
--- a/windowmanagers/vwm/BUILD
+++ b/windowmanagers/vwm/BUILD
@@ -1,3 +1,4 @@
+make_single &&
 if [[ "$VIPER_WIDE" = 'y' ]]; then
   make wide &&
   if [[ "$VIPER_SYSMON" = 'y' ]]; then
@@ -10,4 +11,5 @@ else
     cd modules/sysmon &&
     make
   fi
-fi
+fi &&
+make_normal
diff --git a/windowmanagers/vwm/DEPENDS b/windowmanagers/vwm/DEPENDS
index e58637d..f915ce5 100755
--- a/windowmanagers/vwm/DEPENDS
+++ b/windowmanagers/vwm/DEPENDS
@@ -2,7 +2,6 @@ depends  glib2      &&
 depends  libpseudo  &&
 depends  libviper   &&
 depends  ncurses    &&
-depends  gpm        &&
 if [[ "$VIPER_SYSMON" = 'y' ]]; then
   depends libgtop2
 fi
diff --git a/windowmanagers/vwm/DETAILS b/windowmanagers/vwm/DETAILS
index eb85f48..ea8b5d3 100755
--- a/windowmanagers/vwm/DETAILS
+++ b/windowmanagers/vwm/DETAILS
@@ -1,9 +1,9 @@
            SPELL=vwm
-         VERSION=1.2.3
+         VERSION=1.3.5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:637af393dc937a15a5c0872a19134ef9cc443195c224b29f76192a68251f1ba2b10abb34349f6550fd388bf285714c8e2e363576f2224a4baf5aee78ce39c6b7
+     SOURCE_HASH=sha512:12f0c6723dfc57e15063eaa4fb4cf1ec07fd02bfe070a4049c3e3de9ab926290639e58f57953e986d4cd76fe3b16400f89d62c8d8f8a98f962cfca62eb779548
         WEB_SITE=http://vwm.sourceforge.net/
          ENTERED=20080117
       LICENSE[0]=GPL
diff --git a/windowmanagers/vwm/HISTORY b/windowmanagers/vwm/HISTORY
index d1d9224..a64d342 100644
--- a/windowmanagers/vwm/HISTORY
+++ b/windowmanagers/vwm/HISTORY
@@ -1,3 +1,8 @@
+2008-09-17 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS: version 1.3.5
+	* DEPENDS: no longer depends on gpm
+	* PRE_BUILD: removed obsolete sedits
+
 2008-01-17 Arjan Bouter <abouter at sourcemage.org>
 	* BUILD,CONFIGURE,DETAILS,DEPENDS,
 	  HISTORY,INSTALL,PRE_BUILD: added spell
diff --git a/windowmanagers/vwm/PRE_BUILD b/windowmanagers/vwm/PRE_BUILD
index 61c68e9..5136fb0 100755
--- a/windowmanagers/vwm/PRE_BUILD
+++ b/windowmanagers/vwm/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-sedit 's%#include <vwm.h>%#include "../../vwm.h"%' modules/ptyterm/pty_term.h &&
-if [[ "$VIPER_SYSMON" = 'y' ]]; then
-  sedit 's%#include <vwm.h>%#include "../../vwm.h"%' modules/sysmon/system_monitor.c
-fi
+sedit 's/-D_VIPER_MOUSE_GPM //' Makefile
+
+#sedit 's%#include <vwm.h>%#include "../../vwm.h"%' modules/ptyterm/pty_term.h &&
+#if [[ "$VIPER_SYSMON" = 'y' ]]; then
+#  sedit 's%#include <vwm.h>%#include "../../vwm.h"%' modules/sysmon/system_monitor.c
+#fi
diff --git a/windowmanagers/wm2/BUILD b/windowmanagers/wm2/BUILD
index 08f4b5f..a8fed3e 100755
--- a/windowmanagers/wm2/BUILD
+++ b/windowmanagers/wm2/BUILD
@@ -1,3 +1,2 @@
-sed -i 's/\#define SIGNAL_CALLBACK_TYPE (void (\*)(\.\.\.))/\#define SIGNAL_CALLBACK_TYPE (void (\*)(int))/g' ${SOURCE_DIRECTORY}/General.h &&
 make depend &&
-make
\ No newline at end of file
+make
diff --git a/windowmanagers/wm2/DETAILS b/windowmanagers/wm2/DETAILS
index 61c2e88..9384e6b 100755
--- a/windowmanagers/wm2/DETAILS
+++ b/windowmanagers/wm2/DETAILS
@@ -1,5 +1,6 @@
            SPELL=wm2
-if  [[  "$WM2_CVS" == "y"  ]];  then
+         WM2_CVS=y
+#if  [[  "$WM2_CVS" == "y"  ]];  then
     if  [[  "$WM2_CVS_AUTOUPDATE"  =  "y"  ]];  then
          VERSION=$(date +%Y%m%d)
     else
@@ -9,12 +10,12 @@ if  [[  "$WM2_CVS" == "y"  ]];  then
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-cvsroot
    SOURCE_URL[0]=cvs://:pserver:anonymous@wm2.cvs.sourceforge.net:/cvsroot/wm2:wm2
    SOURCE_IGNORE=volatile
-else
-         VERSION=4
-          SOURCE=${SPELL}-${VERSION}.tar.gz
-   SOURCE_URL[0]=http://www.all-day-breakfast.com/$SPELL/${SOURCE}
-     SOURCE_HASH=sha512:9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9
-fi
+#else
+#         VERSION=4
+#          SOURCE=${SPELL}-${VERSION}.tar.gz
+#   SOURCE_URL[0]=http://www.all-day-breakfast.com/$SPELL/${SOURCE}
+#     SOURCE_HASH=sha512:9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9
+#fi
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://www.all-day-breakfast.com/wm2/
          ENTERED=20040821
diff --git a/windowmanagers/wm2/HISTORY b/windowmanagers/wm2/HISTORY
index f469c1c..0196a87 100644
--- a/windowmanagers/wm2/HISTORY
+++ b/windowmanagers/wm2/HISTORY
@@ -1,3 +1,8 @@
+2008-09-17 Arjan Bouter <abouter at sourcemage.org>
+	* DETAILS,PREPARE: only cvs version will build
+	* BUILD: split into PRE_BUILD
+	* PRE_BUILD: added
+
 2008-03-18 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/windowmanagers/wm2/PREPARE b/windowmanagers/wm2/PREPARE
index 10adb9f..79414f5 100755
--- a/windowmanagers/wm2/PREPARE
+++ b/windowmanagers/wm2/PREPARE
@@ -1,4 +1,5 @@
-config_query  WM2_CVS  "Do you want the CVS version?"  n &&
-if  [  "$WM2_CVS"  ==  "y"  ];  then
+#only the CVS version will build
+#config_query  WM2_CVS  "Do you want the CVS version?"  n &&
+#if  [  "$WM2_CVS"  ==  "y"  ];  then
   config_query  WM2_CVS_AUTOUPDATE  "Automatically update $SPELL on system-update?"  n
-fi
+#fi
diff --git a/windowmanagers/wm2/PRE_BUILD b/windowmanagers/wm2/PRE_BUILD
new file mode 100755
index 0000000..4c246f4
--- /dev/null
+++ b/windowmanagers/wm2/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build     &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's/\#define SIGNAL_CALLBACK_TYPE (void (\*)(\.\.\.))/\#define SIGNAL_CALLBACK_TYPE (void (\*)(int))/g' ${SOURCE_DIRECTORY}/General.h &&
+sedit '6a\
+#include <linux/stddef.h>\' Border.C 
+



More information about the SM-Commit mailing list