Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Alexander Tsamutali (9acc8a144423d18ca52c936306016128898cfa71)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Alexander Tsamutali <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Alexander Tsamutali (9acc8a144423d18ca52c936306016128898cfa71)
  • Date: Mon, 10 Dec 2007 22:38:51 -0600

GIT changes to master grimoire by Alexander Tsamutali <astsmtl AT gmail.com>:

haskell/haskell-x11/DETAILS | 4 ++--
haskell/haskell-x11/HISTORY | 3 +++
windowmanagers/xmonad/CONFIGURE | 5 -----
windowmanagers/xmonad/DETAILS | 4 ++--
windowmanagers/xmonad/HISTORY | 6 ++++++
windowmanagers/xmonad/INSTALL | 5 ++++-
windowmanagers/xmonad/POST_REMOVE | 2 ++
windowmanagers/xmonad/POST_RESURRECT | 14 ++++++++++++++
windowmanagers/xmonad/PRE_BUILD | 13 -------------
windowmanagers/xmonad/PRE_RESURRECT | 7 +++++++
windowmanagers/xmonad/ghc-6.8.patch | 19 -------------------
11 files changed, 40 insertions(+), 42 deletions(-)

New commits:
commit 9acc8a144423d18ca52c936306016128898cfa71
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

windowmanagers/xmonad: updated to 0.5

commit f9b7af77306ec9dd3c51991327ecb768f35b0806
Author: Alexander Tsamutali <astsmtl AT gmail.com>
Commit: Alexander Tsamutali <astsmtl AT gmail.com>

haskell/haskell-x11: updated to 1.4.0

diff --git a/haskell/haskell-x11/DETAILS b/haskell/haskell-x11/DETAILS
index 11cb5ab..69e431b 100755
--- a/haskell/haskell-x11/DETAILS
+++ b/haskell/haskell-x11/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-x11
- VERSION=1.3.0
+ VERSION=1.4.0
SOURCE="X11-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/X11/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:5a12796f9f5332c06375f366e0592df0b08dc6e1dedd3195e69a11cef670e340acf9fd0e5674abe1bc944a2aa631166a80b594dc278bbd77d1094de65cec4cc1
+
SOURCE_HASH=sha512:1bd6051c530fa93d8903abd889a03c7fc32177eec68677fc6fccceb77af868646602e7186530d9f5cd153da338e751d23bda982ec615d3b2da5268efd0c8791b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/X11-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-x11/HISTORY b/haskell/haskell-x11/HISTORY
index 75e3a4f..301db76 100644
--- a/haskell/haskell-x11/HISTORY
+++ b/haskell/haskell-x11/HISTORY
@@ -1,3 +1,6 @@
+2007-12-10 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 1.4.0
+
2007-12-04 Alexander Tsamutali <astsmtl AT gmail.com>
* DETAILS: updated spell to 1.3.0

diff --git a/windowmanagers/xmonad/CONFIGURE b/windowmanagers/xmonad/CONFIGURE
deleted file mode 100755
index 287f190..0000000
--- a/windowmanagers/xmonad/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query MY_CONFIG "Do you want to supply your own Config.hs?" y
-if [ "$MY_CONFIG" == "y" ] ; then
- config_query_string MY_CONFIG_PATH "Please enter path to your Config.hs"
~/xmonad/Config.hs
-fi
-config_query EDIT_CONFIG "Do you want to edit Config.hs?" y
diff --git a/windowmanagers/xmonad/DETAILS b/windowmanagers/xmonad/DETAILS
index c1a2511..634cb32 100755
--- a/windowmanagers/xmonad/DETAILS
+++ b/windowmanagers/xmonad/DETAILS
@@ -1,8 +1,8 @@
SPELL=xmonad
- VERSION=0.4.1
+ VERSION=0.5
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:7bb9557a9c865a97123ab8055ca72d2a5773c061d9b86a38dd743fd13f0f494a7155612fff386e8820abe4acb75406b4d145063c5691ef65a7819b7fd47864c8
+
SOURCE_HASH=sha512:78d67e1237c92ad94cce5d42ebc21115f09eeffe4db1e9865b1a4ae79bce124c6d68ab115bf7d406b2e9e7d9092096495506cfc5686e4217d144331784b69e56
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://xmonad.org";
LICENSE[0]=BSD3
diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index 44f68dc..a8057ad 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,9 @@
+2007-12-10 Alexander Tsamutali <astsmtl AT gmail.com>
+ * DETAILS: updated spell to 0.5
+ * CONFIGURE, PRE_BUILD, ghc-6.8.patch: removed
+ * INSTALL, POST_REMOVE, PRE_RESURRECT, POST_RESURRECT:
+ a set of procedures on package.conf
+
2007-12-06 Alexander Tsamutali <astsmtl AT gmail.com>
* PRE_BUILD, ghc-6.8.patch: fixed building with ghc-6.8

diff --git a/windowmanagers/xmonad/INSTALL b/windowmanagers/xmonad/INSTALL
index 0d81129..57421e3 100755
--- a/windowmanagers/xmonad/INSTALL
+++ b/windowmanagers/xmonad/INSTALL
@@ -1 +1,4 @@
-runhaskell Setup.lhs install
+runhaskell Setup.lhs install &&
+SHARE_DIR=${INSTALL_ROOT}/usr/share/${SPELL} &&
+mkdir -vp $SHARE_DIR &&
+cp -v xmonad.cabal $SHARE_DIR
diff --git a/windowmanagers/xmonad/POST_REMOVE
b/windowmanagers/xmonad/POST_REMOVE
new file mode 100755
index 0000000..bf7211f
--- /dev/null
+++ b/windowmanagers/xmonad/POST_REMOVE
@@ -0,0 +1,2 @@
+message "${MESSAGE_COLOR}Unregistering package with
ghc-pkg...${DEFAULT_COLOR}"
+ghc-pkg unregister xmonad
diff --git a/windowmanagers/xmonad/POST_RESURRECT
b/windowmanagers/xmonad/POST_RESURRECT
new file mode 100755
index 0000000..63946c7
--- /dev/null
+++ b/windowmanagers/xmonad/POST_RESURRECT
@@ -0,0 +1,14 @@
+# We need to restore package.conf and package.conf.old after resurrection.
+# Also we need to register package with ghc-pkg.
+
+message "${MESSAGE_COLOR}Restoring package.conf and
package.conf.old...${DEFAULT_COLOR}"
+GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
+GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
+mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
+mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
+
+message "${MESSAGE_COLOR}Registering package with ghc-pkg...${DEFAULT_COLOR}"
+CABAL_FILE=${INSTALL_ROOT}/usr/share/xmonad/xmonad.cabal
+ghc-pkg register --force-files $CABAL_FILE
+message "${MESSAGE_COLOR}Exposing package with ghc-pkg...${DEFAULT_COLOR}"
+ghc-pkg expose xmonad
diff --git a/windowmanagers/xmonad/PRE_BUILD b/windowmanagers/xmonad/PRE_BUILD
deleted file mode 100755
index 59a6b50..0000000
--- a/windowmanagers/xmonad/PRE_BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-default_pre_build &&
-
-patch -p0 < ${SPELL_DIRECTORY}/ghc-6.8.patch &&
-
-CONFIG=${SOURCE_DIRECTORY}/Config.hs
-
-if [ "$MY_CONFIG" == "y" ] ; then
- cp -v $MY_CONFIG_PATH $CONFIG
-fi &&
-
-if [ "$EDIT_CONFIG" == "y" ] ; then
- $EDITOR $CONFIG
-fi
diff --git a/windowmanagers/xmonad/PRE_RESURRECT
b/windowmanagers/xmonad/PRE_RESURRECT
new file mode 100755
index 0000000..96595c8
--- /dev/null
+++ b/windowmanagers/xmonad/PRE_RESURRECT
@@ -0,0 +1,7 @@
+# We need to backup package.conf and package.conf.old before resurrection
+
+message "${MESSAGE_COLOR}Backuping package.conf and
package.conf.old...${DEFAULT_COLOR}"
+GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
+GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
+cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
+cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
diff --git a/windowmanagers/xmonad/ghc-6.8.patch
b/windowmanagers/xmonad/ghc-6.8.patch
deleted file mode 100644
index 7c4f55a..0000000
--- a/windowmanagers/xmonad/ghc-6.8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xmonad-0.4.1/xmonad-orig.cabal 2007-12-06 21:29:32.000000000 +0500
-+++ xmonad-0.4.1/xmonad.cabal 2007-12-06 21:31:03.000000000 +0500
-@@ -17,14 +17,14 @@
- license-file: LICENSE
- author: Spencer Janssen
- maintainer: sjanssen AT cse.unl.edu
--build-depends: base>=2.0, mtl>=1.0, unix>=1.0, X11==1.3.0
-+build-depends: base>=2.0, mtl>=1.0, unix>=1.0, X11==1.3.0, containers
- extra-source-files: README TODO tests/loc.hs tests/Properties.hs
man/xmonad.1.in
- Config.hs-boot util/GenerateManpage.hs man/xmonad.1
man/xmonad.html
-
- executable: xmonad
- main-is: Main.hs
- other-modules: Config Operations StackSet XMonad
--ghc-options: -funbox-strict-fields -O2 -fasm -Wall -optl-Wl,-s
-+ghc-options: -funbox-strict-fields -O2 -fasm -Wall -optl-Wl,-s
-XPatternGuards -XExistentialQuantification -XMultiParamTypeClasses
-XTypeSynonymInstances -fglasgow-exts
- ghc-prof-options: -prof -auto-all
- extensions: GeneralizedNewtypeDeriving
- -- Also requires deriving Typeable, PatternGuards



  • [SM-Commit] GIT changes to master grimoire by Alexander Tsamutali (9acc8a144423d18ca52c936306016128898cfa71), Alexander Tsamutali, 12/10/2007

Archive powered by MHonArc 2.6.24.

Top of Page