[SM-Commit] GIT changes to master grimoire by Andraž Levstik (bfb7249fd25eb7e6274d590564fd3b5a17bbb8f8)

Andraž Levstik scm at sourcemage.org
Tue Jun 26 05:21:22 EDT 2007


GIT changes to master grimoire by Andraž Levstik <ruskie at mages.ath.cx>:

 ChangeLog                 |    4 ++++
 net/dictd/BUILD           |   35 +++++++++++++++++++++++++++++++++--
 net/dictd/CONFIGURE       |   19 +++++++++++++++++++
 net/dictd/DEPENDS         |   11 ++++++++++-
 net/dictd/DETAILS         |    7 +++----
 net/dictd/HISTORY         |    7 +++++++
 net/dictd/INSTALL         |    9 +++++++++
 wm-addons/dzen2/BUILD     |    2 +-
 wm-addons/dzen2/DEPENDS   |    6 +++++-
 wm-addons/dzen2/HISTORY   |    6 ++++++
 wm-addons/dzen2/INSTALL   |    1 -
 wm-addons/dzen2/PRE_BUILD |   14 ++++++++++++++
 wm-addons/slock/BUILD     |    1 +
 wm-addons/slock/DETAILS   |   13 +++++++++++++
 wm-addons/slock/HISTORY   |    2 ++
 wm-addons/slock/PRE_BUILD |    6 ++++++
 wm-addons/sselp/BUILD     |    1 +
 wm-addons/sselp/DETAILS   |   13 +++++++++++++
 wm-addons/sselp/HISTORY   |    2 ++
 wm-addons/sselp/PRE_BUILD |    6 ++++++
 20 files changed, 155 insertions(+), 10 deletions(-)

New commits:
commit bfb7249fd25eb7e6274d590564fd3b5a17bbb8f8
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    dictd: updateded version and various revamping

commit 3aa25f38b4fb0ec84396af99e12aacd4481fe630
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    sselp: new spell, simple X selection printer

commit de68c353510a12b52f0cfebd23336b2a5ca9fb55
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    Forgot the changelog

commit 06e1ae3516e06eac86acfca667667783503468ae
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    slock: new spell a simple X screen locker

commit ab9c91944e94090ab683ddcaa032ab8bdb4dd43f
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    dzen2: various fixes

diff --git a/ChangeLog b/ChangeLog
index a2f2881..bb168ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* wm-addons/slock: new spell, simple X screen locker
+	* wm-addons/sselp: new spell, simple X selection printer
+
 2007-06-25 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* printer/pdfjam: new spell, a set of scripts for generating pdf
 	  files
diff --git a/net/dictd/BUILD b/net/dictd/BUILD
index feceeab..5dd9052 100755
--- a/net/dictd/BUILD
+++ b/net/dictd/BUILD
@@ -1,3 +1,34 @@
-make_single    &&
-default_build  &&
+#OPTS=${OPTS/--without-system-utf8-funcs}            &&
+#OPTS=${OPTS/--disable-dictorg}                      &&
+#OPTS=${OPTS/--enable-plugin}                        &&
+if [[ $DICTD_REGEXP == tre ]] ; then
+LDFLAGS='-ltre'
+fi                                                  &&
+if [[ $DICTD_REGEXP == pcre ]] ; then
+LDFLAGS='-lpcre -lpcreposix'                        &&
+OPTS="--with-regex-include='pcreposix.h' $OPTS"
+fi                                                  &&
+if [[ $DICTD_REGEXP == builtin ]] ; then
+OPTS="--with-local-regex $OPTS"
+fi                                                  &&
+OPTS="$DICTD_OPTS $OPTS"                            &&
+OPTS="--build=${BUILD} $OPTS"                       &&
+[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
+
+./configure --prefix=${TRACK_ROOT}/usr              \
+            --sysconfdir=${TRACK_ROOT}/etc          \
+            --localstatedir=${TRACK_ROOT}/var       \
+            --mandir=${TRACK_ROOT}/usr/share/man    \
+            --infodir=${TRACK_ROOT}/usr/share/info  \
+            $OPTS                                   &&
+make_single                                         &&
+if list_find $DICTD_BUILD "client"
+then
+  make dict colorit dictzip dictfmt plugins
+elif list_find $DICTD_BUILD "server"
+then
+  make dictd plugins
+else
+  make
+fi                                                  &&
 make_normal
diff --git a/net/dictd/CONFIGURE b/net/dictd/CONFIGURE
new file mode 100755
index 0000000..c7a4417
--- /dev/null
+++ b/net/dictd/CONFIGURE
@@ -0,0 +1,19 @@
+config_query_option DICTD_OPTS                                \
+                    "Use predefined dict servers" y           \
+                    "--enable-dictorg"                        \
+                    "--disable-dictorg"                       &&
+config_query_option DICTD_OPTS                                \
+                    "With plugin support" y                   \
+                    "--enable-plugin"                         \
+                    "--disable-plugin"                        &&
+config_query_option DICTD_OPTS                                \
+                    "Use system wcXXX and mbXXX functions" y  \
+                    "--with-system-utf8-funcs"                \
+                    "--without-system-utf8-funcs"             &&
+config_query_list DICTD_REGEXP                                \
+                  "Which regexp library do you wish to use?"  \
+                  libc tre pcre builtin                       &&
+. $GRIMOIRE/config_query_multi.function
+config_query_multi DICTD_BUILD                                \
+                   "What part do you wish to build?"          \
+                   both client server
diff --git a/net/dictd/DEPENDS b/net/dictd/DEPENDS
index edcc614..0725b25 100755
--- a/net/dictd/DEPENDS
+++ b/net/dictd/DEPENDS
@@ -1 +1,10 @@
-depends libtool
+optional_depends libdbi                       \
+                 ""                           \
+                 ""                           \
+                 "Enable DBI plugin support"  &&
+depends libtool                               &&
+if [[ $DICTD_REGEXP == pcre ]] ||
+   [[ $DICTD_REGEXP == tre ]]
+then
+  depends $DICTD_REGEXP
+fi
diff --git a/net/dictd/DETAILS b/net/dictd/DETAILS
index d6e63c7..91c8e8b 100755
--- a/net/dictd/DETAILS
+++ b/net/dictd/DETAILS
@@ -1,12 +1,11 @@
            SPELL=dictd
-         VERSION=1.9.15
+         VERSION=1.10.9
           SOURCE=${SPELL}-$VERSION.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/$SPELL-$VERSION
-   SOURCE_URL[0]=ftp://ftp.dict.org/pub/dict/$SOURCE
-     SOURCE_HASH=sha512:aae94a672c7345efff4252a729d42aa103eb651d1ee01a4f8cb8852a68e7c5dab0f2ddf84981bdcf050c39f987e11a73fec3adf79183f0a693b45574e7a511d2
+   SOURCE_URL[0]=$SOURCEFORGE_URL/dict/$SOURCE
+     SOURCE_HASH=sha512:851af0e9db895ef1126014ab8cfddc63f3a4f5d88adde74efc7b834008af05b6db7f08eb4e6e37079b3119f579ed815d0826d2c04b198c8f893c829a7722a05c
         WEB_SITE=http://www.dict.org/
          ENTERED=20020807
-         UPDATED=20030822
       LICENSE[0]=GPL
         KEYWORDS="net"
            SHORT="Client/server for the Dictionary Server Protocol"
diff --git a/net/dictd/HISTORY b/net/dictd/HISTORY
index 5450c9a..973047d 100644
--- a/net/dictd/HISTORY
+++ b/net/dictd/HISTORY
@@ -1,3 +1,10 @@
+2007-06-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS: version update 1.10.9 change to SF
+	* DEPENDS: revamping
+	* BUILD: revamping
+	* INSTALL: added
+	* CONFIGURE: options added
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/net/dictd/INSTALL b/net/dictd/INSTALL
new file mode 100755
index 0000000..bfeb4eb
--- /dev/null
+++ b/net/dictd/INSTALL
@@ -0,0 +1,9 @@
+if list_find $DICTD_BUILD "client"
+then
+  make install.dict install.colorit install.dictzip install.dictfmt install.plugins install.libs install.includes
+elif list_find $DICTD_BUILD "server"
+then
+  make dictd install.libs install.includes install.plugins
+else
+  make install
+fi
diff --git a/wm-addons/dzen2/BUILD b/wm-addons/dzen2/BUILD
index c9dda20..8f58e6d 100755
--- a/wm-addons/dzen2/BUILD
+++ b/wm-addons/dzen2/BUILD
@@ -1 +1 @@
-make PREFIX=${INSTALL_ROOT}/usr
+make
diff --git a/wm-addons/dzen2/DEPENDS b/wm-addons/dzen2/DEPENDS
index 1dde63f..23aa599 100755
--- a/wm-addons/dzen2/DEPENDS
+++ b/wm-addons/dzen2/DEPENDS
@@ -1 +1,5 @@
-depends X11-LIBS 
+. $GRIMOIRE/FUNCTIONS
+depends X11-LIBS  &&
+if check_if_xorg_modular_libs ; then
+  optional_depends libxinerama "" "" "Enable Xinerama support?"
+fi
diff --git a/wm-addons/dzen2/HISTORY b/wm-addons/dzen2/HISTORY
index 2e37cda..72ce4e3 100644
--- a/wm-addons/dzen2/HISTORY
+++ b/wm-addons/dzen2/HISTORY
@@ -1,3 +1,9 @@
+2007-06-26 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DEPENDS: added libxinerama
+	* PRE_BUILD: added to fix flags and libs
+	* BUILD: removed some stuff
+	* INSTALL: removed
+
 2007-06-25 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: version 0.5.0
 
diff --git a/wm-addons/dzen2/INSTALL b/wm-addons/dzen2/INSTALL
deleted file mode 100755
index 621f3f8..0000000
--- a/wm-addons/dzen2/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-make PREFIX=${INSTALL_ROOT}/usr install
diff --git a/wm-addons/dzen2/PRE_BUILD b/wm-addons/dzen2/PRE_BUILD
new file mode 100755
index 0000000..cda5f9d
--- /dev/null
+++ b/wm-addons/dzen2/PRE_BUILD
@@ -0,0 +1,14 @@
+. $GRIMOIRE/is_depends_enabled.function
+. $GRIMOIRE/FUNCTIONS
+default_pre_build                                                  &&
+cd $SOURCE_DIRECTORY                                               &&
+sedit "s:^PREFIX.*:PREFIX= ${INSTALL_ROOT}/usr:" config.mk         &&
+if check_if_xorg_modular_libs ; then
+if is_depends_enabled libxinerama ; then
+sedit "s:^LIBS = \(.*\):LIBS = \1 -lxinerama:" config.mk           &&
+sedit "s:^CFLAGS = \(.*\):CFLAGS = \1 -DDZEN_XINERAMA:" config.mk
+fi
+fi                                                                 &&
+sedit "s:^CFLAGS = -Os \(.*\):CFLAGS = \1 $CFLAGS:" config.mk      &&
+sedit "s:^LDFLAGS = \(.*\):LDFLAGS = \1 $LDFLAGS:" config.mk
+
diff --git a/wm-addons/slock/BUILD b/wm-addons/slock/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/wm-addons/slock/BUILD
@@ -0,0 +1 @@
+make
diff --git a/wm-addons/slock/DETAILS b/wm-addons/slock/DETAILS
new file mode 100755
index 0000000..85525cf
--- /dev/null
+++ b/wm-addons/slock/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=slock
+         VERSION=0.6
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://www.suckless.org/download/${SOURCE}
+     SOURCE_HASH=sha512:3f95ae12f1c69985a0bddf296427ba70c8b1570a317968951c6f41834f5f8f6b76ef24c053b541100d209becd7702a449a48b8ebab0e322c7a16f4528d5159be
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.suckless.org/wiki/tools/xlib"
+      LICENSE[0]=MIT
+         ENTERED=20070625
+           SHORT="simple X screen locker"
+cat << EOF
+simple X screen locker
+EOF
diff --git a/wm-addons/slock/HISTORY b/wm-addons/slock/HISTORY
new file mode 100644
index 0000000..ecc7bb5
--- /dev/null
+++ b/wm-addons/slock/HISTORY
@@ -0,0 +1,2 @@
+2007-06-25 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS, PRE_BUILD, BUILD, HISTORY: created spell
diff --git a/wm-addons/slock/PRE_BUILD b/wm-addons/slock/PRE_BUILD
new file mode 100755
index 0000000..77ecd20
--- /dev/null
+++ b/wm-addons/slock/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build                                                  &&
+cd $SOURCE_DIRECTORY                                               &&
+sedit "s:^PREFIX.*:PREFIX= ${INSTALL_ROOT}/usr:" config.mk         &&
+sedit "s:^CFLAGS = -Os \(.*\):CFLAGS = \1 $CFLAGS:" config.mk      &&
+sedit "s:^LDFLAGS = \(.*\):LDFLAGS = \1 $LDFLAGS:" config.mk
+
diff --git a/wm-addons/sselp/BUILD b/wm-addons/sselp/BUILD
new file mode 100755
index 0000000..8f58e6d
--- /dev/null
+++ b/wm-addons/sselp/BUILD
@@ -0,0 +1 @@
+make
diff --git a/wm-addons/sselp/DETAILS b/wm-addons/sselp/DETAILS
new file mode 100755
index 0000000..d7f0081
--- /dev/null
+++ b/wm-addons/sselp/DETAILS
@@ -0,0 +1,13 @@
+           SPELL=sselp
+         VERSION=0.1
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://www.suckless.org/download/${SOURCE}
+     SOURCE_HASH=sha512:b3659814acf7cb2a1f413a70a388b668c4ba52b096ba2eb0aeeef66b4b56ce9a5e83a4d44b04e4dad029c0e614e3d04d7383db0bd73bb696030ac07a7fe7a84b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.suckless.org/wiki/tools/xlib"
+      LICENSE[0]=MIT
+         ENTERED=20070625
+           SHORT="simple X selection printer"
+cat << EOF
+simple X selection printer
+EOF
diff --git a/wm-addons/sselp/HISTORY b/wm-addons/sselp/HISTORY
new file mode 100644
index 0000000..ecc7bb5
--- /dev/null
+++ b/wm-addons/sselp/HISTORY
@@ -0,0 +1,2 @@
+2007-06-25 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* DETAILS, PRE_BUILD, BUILD, HISTORY: created spell
diff --git a/wm-addons/sselp/PRE_BUILD b/wm-addons/sselp/PRE_BUILD
new file mode 100755
index 0000000..77ecd20
--- /dev/null
+++ b/wm-addons/sselp/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build                                                  &&
+cd $SOURCE_DIRECTORY                                               &&
+sedit "s:^PREFIX.*:PREFIX= ${INSTALL_ROOT}/usr:" config.mk         &&
+sedit "s:^CFLAGS = -Os \(.*\):CFLAGS = \1 $CFLAGS:" config.mk      &&
+sedit "s:^LDFLAGS = \(.*\):LDFLAGS = \1 $LDFLAGS:" config.mk
+



More information about the SM-Commit mailing list