[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5a7ff20d94c17bd4dc20849c6557f4e98a28079c)

Vlad Glagolev scm at sourcemage.org
Sat Mar 3 05:33:26 EST 2012


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 x11/slim/BUILD     |    2 +-
 x11/slim/DEPENDS   |   11 ++++++++++-
 x11/slim/DETAILS   |    5 +++--
 x11/slim/HISTORY   |    7 +++++++
 x11/slim/INSTALL   |    1 -
 x11/slim/PRE_BUILD |    9 +--------
 6 files changed, 22 insertions(+), 13 deletions(-)

New commits:
commit 5a7ff20d94c17bd4dc20849c6557f4e98a28079c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    slim: => 1.3.3

diff --git a/x11/slim/BUILD b/x11/slim/BUILD
index 92ec966..e013b8d 100755
--- a/x11/slim/BUILD
+++ b/x11/slim/BUILD
@@ -1 +1 @@
-make $OPTS DESTDIR="$TRACK_ROOT/" CC=gcc CXX=g++
+cmake_build
diff --git a/x11/slim/DEPENDS b/x11/slim/DEPENDS
index b4c8875..446a0d7 100755
--- a/x11/slim/DEPENDS
+++ b/x11/slim/DEPENDS
@@ -1,4 +1,5 @@
 depends -sub CXX gcc &&
+depends cmake &&
 depends fontconfig &&
 depends freetype2 &&
 depends JPEG &&
@@ -11,6 +12,14 @@ depends libxext &&
 depends libxrender &&
 depends libice &&
 
-optional_depends linux-pam "USE_PAM=1" "" "for PAM support" &&
+optional_depends linux-pam \
+                 "-DUSE_PAM=ON" \
+                 "-DUSE_PAM=OFF" \
+                 "for PAM support" &&
+
+optional_depends consolekit \
+                 "-DUSE_CONSOLEKIT=ON" \
+                 "-DUSE_CONSOLEKIT=OFF" \
+                 "for ConsoleKit support" &&
 
 suggest_depends xterm "" "" "for console login"
diff --git a/x11/slim/DETAILS b/x11/slim/DETAILS
index 29006fc..d1515b8 100755
--- a/x11/slim/DETAILS
+++ b/x11/slim/DETAILS
@@ -1,10 +1,11 @@
            SPELL=slim
-         VERSION=1.3.2
+         VERSION=1.3.3
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://download.berlios.de/slim/$SOURCE
-     SOURCE_HASH=sha512:80b443878cb45725b4b19783d3881544a591836118dbd95e6bd37a7e25ce47c00c78f3369d1cd4e03481e719be2be04952f6b279a79695d6a4201b5216bf5feb
+   SOURCE_URL[1]=http://slim.berlios.de/releases/$SOURCE
+     SOURCE_HASH=sha512:a146ef6f1c25a6d317a81934da04ba02f3985842665883b1a2764d33079b00752a686f14d0d18b20bf9bba1d80a7c183c9d318664d1b7e2f7eec09d3d9eaa346
         WEB_SITE=http://slim.berlios.de/
         KEYWORDS="x11"
          ENTERED=20050518
diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index 2f2b098..42c1e15 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,10 @@
+2012-03-03 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.3.3
+	* DEPENDS: added cmake, optional consolekit dependency and flags
+	* BUILD: cmake_build
+	* INSTALL: removed
+	* PRE_BUILD: corrected version; removed dirty hacks
+
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
 	  sub-depends on CXX (scripted)
diff --git a/x11/slim/INSTALL b/x11/slim/INSTALL
deleted file mode 100755
index 13c372d..0000000
--- a/x11/slim/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make DESTDIR="$INSTALL_ROOT/" install
diff --git a/x11/slim/PRE_BUILD b/x11/slim/PRE_BUILD
index a8181e8..f03dec0 100755
--- a/x11/slim/PRE_BUILD
+++ b/x11/slim/PRE_BUILD
@@ -1,13 +1,6 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-sed -i -e "s:^CXXFLAGS=\(.*\):CXXFLAGS=\1 ${CXXFLAGS}:" \
-    -e "s:^CFLAGS=\(.*\):CFLAGS=\1 ${CFLAGS}:" \
-    -e "s:^MANDIR=.*:MANDIR=${INSTALL_ROOT}/usr/share/man:" \
-    -e "s:/usr/X11R6:${INSTALL_ROOT}/usr:" \
-    -e "s:-lpng12 ::" \
-    Makefile &&
-
-sed -i "s:X11R6\/::g" "$SOURCE_DIRECTORY/slim.conf" &&
+sed -i "s:PATCH \"2\":PATCH \"3\":" CMakeLists.txt &&
 
 patch -p0 < "$SPELL_DIRECTORY/gcc43.patch"


More information about the SM-Commit mailing list