# Remove files that should be hard linked, in case they are not
if [ -d ${INSTALL_ROOT}/usr/share/zoneinfo ]; then
@@ -20,7 +19,7 @@ zic -y ./yearistype -d
${INSTALL_ROOT}/usr/share/zoneinfo/right -L leapseconds $
#If you want POSIX compatibility, use "America/New_York".
zic -y ./yearistype -d ${INSTALL_ROOT}/usr/share/zoneinfo -p
America/New_York &&
if [ $SET_LOCALTIME == "y" ]; then
if [ -z "$LOCAL_TIMEZONE" ]; then
diff --git a/net/ipset/BUILD b/net/ipset/BUILD
index f5c9db3..c5ec8e5 100755
--- a/net/ipset/BUILD
+++ b/net/ipset/BUILD
@@ -1,8 +1,10 @@
if [[ ${VERSION/.*} == 4 ]]; then
make PREFIX="$INSTALL_ROOT/usr"
else
- ./autogen.sh &&
-
+ OPTS="$IPSET_OPTS $OPTS" &&
default_build &&
- make modules
+
+ if list_find "$IPSET_OPTS" "--with-kmod"; then
+ make modules
+ fi
fi
diff --git a/net/ipset/CONFIGURE b/net/ipset/CONFIGURE
new file mode 100755
index 0000000..ba5cd1f
--- /dev/null
+++ b/net/ipset/CONFIGURE
@@ -0,0 +1,5 @@
+if [[ ${VERSION/.*} != 4 ]]; then
+ config_query_option IPSET_OPTS "Do you want to compile $SPELL kernel
modules?" $IPSET_KMOD \
+ "--with-kmod" \
+ "--without-kmod"
+fi
diff --git a/net/ipset/DETAILS b/net/ipset/DETAILS
index 63b3efa..3b6c38e 100755
--- a/net/ipset/DETAILS
+++ b/net/ipset/DETAILS
@@ -6,9 +6,9 @@ if is_version_less $(get_kernel_version) 2.6.35; then
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_HASH=sha512:ccac555257600b8fd2e229426514582e6f3f04000b4f2bc704d28efdae0869c1c6952ddb9a833a32e49604d16a4a9aa0a5ea847d469a31e567e84f36b76e19f2
else
- VERSION=6.12.1
+ VERSION=6.20.1
SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:cd3ef90c56a3e7fd70d95cc021f41a01c25a175f22f7157705b37391f92829a7f55bef37c3a98b0544b5814d597b1a02513328ba3dc91929f4b7642dd1c1ebaa
+
SOURCE_HASH=sha512:3fda3a71c18c8d5f9567038fc72f95abec81b4c789fbca7f7b9c032b15000cfbd2829f11a07f2f9ad2afcff54d6851923caff0917b2ead73756673a6b3667565
fi
SOURCE_URL[0]=http://ipset.netfilter.org/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/ipset/FINAL b/net/ipset/FINAL
new file mode 100755
index 0000000..34afa43
--- /dev/null
+++ b/net/ipset/FINAL
@@ -0,0 +1,3 @@
+if [[ ${VERSION/.*} == 4 ]] || list_find "$IPSET_OPTS" "--with-kmod"; then
+ depmod -a
+fi
diff --git a/net/ipset/HISTORY b/net/ipset/HISTORY
index 3cf0c9e..4491d0b 100644
--- a/net/ipset/HISTORY
+++ b/net/ipset/HISTORY
@@ -1,3 +1,12 @@
+2013-12-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6.20.1 (2.6 branch)
+ * BUILD: dropped deprecated autogen.sh run; use IPSET_OPTS
+ * FINAL: added, to run depmod for registering modules
+ * CONFIGURE: added, to choose modules compilation
+ * PREPARE: added, to detect ip_set kernel module for 2.6 branch and
+ default answer in CONFIGURE
+ * PRE_BUILD: replaced sed with sedit
+
2012-05-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 6.12.1
diff --git a/net/ipset/INSTALL b/net/ipset/INSTALL
index 9e463c3..a177b2a 100755
--- a/net/ipset/INSTALL
+++ b/net/ipset/INSTALL
@@ -2,5 +2,8 @@ if [[ ${VERSION/.*} == 4 ]]; then
make PREFIX="$INSTALL_ROOT/usr" install
else
default_install &&
- make modules_install
+
+ if list_find "$IPSET_OPTS" "--with-kmod"; then
+ make modules_install
+ fi
fi
diff --git a/net/ipset/PREPARE b/net/ipset/PREPARE
new file mode 100755
index 0000000..c0e0c57
--- /dev/null
+++ b/net/ipset/PREPARE
@@ -0,0 +1,10 @@
+. $GRIMOIRE/FUNCTIONS &&
+
+persistent_add IPSET_KMOD &&
+
+if [[ $(get_sorcery_kernel_config CONFIG_IP_SET) != y ]] && [[
$(get_sorcery_kernel_config CONFIG_IP_SET) != m ]]; then
+ message "${MESSAGE_COLOR}You don't have ipset modules enabled in you
kernel; compiling external modules is highly recommended.${DEFAULT_COLOR}" &&
+ IPSET_KMOD=y
+else
+ IPSET_KMOD=n
+fi
diff --git a/net/ipset/PRE_BUILD b/net/ipset/PRE_BUILD
index c420cc0..23e69b6 100755
--- a/net/ipset/PRE_BUILD
+++ b/net/ipset/PRE_BUILD
@@ -2,7 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
if [[ ${VERSION/.*} == 4 ]]; then
- sed -i "s:/man:/share/man:;s:share/man8:man8:" Makefile
+ sedit "s:/man:/share/man:;s:share/man8:man8:" Makefile
else
cd "$INSTALL_ROOT/usr/src/linux" &&
diff --git a/net/libmnl/DETAILS b/net/libmnl/DETAILS
index 4891d64..ea9af1f 100755
--- a/net/libmnl/DETAILS
+++ b/net/libmnl/DETAILS
@@ -1,5 +1,5 @@
SPELL=libmnl
- VERSION=1.0.1
+ VERSION=1.0.3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://www.netfilter.org/projects/$SPELL/files/$SOURCE
diff --git a/net/libmnl/HISTORY b/net/libmnl/HISTORY
index 718fc5b..d832e2c 100644
--- a/net/libmnl/HISTORY
+++ b/net/libmnl/HISTORY
@@ -1,2 +1,5 @@
+2013-12-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.3
+
2011-09-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: spell created
diff --git a/net/ssocks/BUILD b/net/ssocks/BUILD
new file mode 100755
index 0000000..c8651fe
--- /dev/null
+++ b/net/ssocks/BUILD
@@ -0,0 +1,5 @@
+if is_depends_enabled "$SPELL" openssl; then
+ LIBS="$LIBS -lssl -lcrypto" default_build
+else
+ default_build
+fi
diff --git a/net/ssocks/DETAILS b/net/ssocks/DETAILS
index 9362e37..937d444 100755
--- a/net/ssocks/DETAILS
+++ b/net/ssocks/DETAILS
@@ -1,9 +1,9 @@
SPELL=ssocks
- VERSION=0.0.13
+ VERSION=0.0.14
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:58c2e5fe965aabb83ebc3d748da114b7c886dd383e3ef4c22dfddace75a5fc498534d88aa51315f0c9aaadfebf7f4dac21864baeacf44ebb9d77d6588347ea40
+
SOURCE_HASH=sha512:8d9f63dfa7636db64ae456b620c34a098a99c6a1e52a8ab5ea145c57970711a9139861efa409b7471d8cc3d4b04183963991ff1225e421bb1d146ee21db8abdd
WEB_SITE=http://ssocks.sourceforge.net/
ENTERED=20130207
LICENSE[0]=MIT
diff --git a/net/ssocks/HISTORY b/net/ssocks/HISTORY
index a223322..c4e7cc5 100644
--- a/net/ssocks/HISTORY
+++ b/net/ssocks/HISTORY
@@ -1,3 +1,7 @@
+2013-12-24 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fix LIBS, must include -lcrypto with -lssl
+ * DETAILS: updated spell to 0.0.14
+
2013-02-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.0.13
* ssl.patch: dropped, fixed by upstream
diff --git a/python-pypi/setuptools/DETAILS b/python-pypi/setuptools/DETAILS
index f19db56..bba6f75 100755
--- a/python-pypi/setuptools/DETAILS
+++ b/python-pypi/setuptools/DETAILS
@@ -1,6 +1,6 @@
SPELL=setuptools
- VERSION=1.4.2
-
SOURCE_HASH=sha512:cb22d191333fd1ad4d4ca0359a120e367e646f1b4334e7457c417d37d6260d5c747d3d5342135832a1b42eefbf1da4cd94b1a7875b3d5ddea58d047b872f0ac3
+ VERSION=2.0.1
+
SOURCE_HASH=sha512:9caa190889870f7c7c46a3fddd86ce306423051cd08a7a2eb6c0b317645fa0ddfde1f2e10025f13209e785aa817c0bd46c81aba63a3874f09e5c68d59315b91f
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://pypi.python.org/packages/source/s/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/setuptools/HISTORY b/python-pypi/setuptools/HISTORY
index ede6dd6..fcc3582 100644
--- a/python-pypi/setuptools/HISTORY
+++ b/python-pypi/setuptools/HISTORY
@@ -1,3 +1,6 @@
+2013-12-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.1
+
2013-12-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.4.2
diff --git a/ruby-raa/ruby-2.1/BUILD b/ruby-raa/ruby-2.1/BUILD
new file mode 100755
index 0000000..2789a74
--- /dev/null
+++ b/ruby-raa/ruby-2.1/BUILD
@@ -0,0 +1,3 @@
+OPTS="$OPTS --enable-shared --enable-pthread" &&
+CFLAGS="${CFLAGS/-fomit-frame-pointer/}" &&
+default_build
diff --git a/ruby-raa/ruby-2.1/CONFIGURE b/ruby-raa/ruby-2.1/CONFIGURE
new file mode 100755
index 0000000..c2d0f1e
--- /dev/null
+++ b/ruby-raa/ruby-2.1/CONFIGURE
@@ -0,0 +1,8 @@
+message "Building documentation can take a long time and" &&
+message "consume a lot of memory." &&
+if spell_ok ruby; then
+ persistent_read ruby RUBY_DOCS RUBY_DOCS_DEF
+fi &&
+config_query RUBY_DOCS \
+ "Do you want to build documentation?" \
+ ${RUBY_DOCS_DEF:-n}
diff --git a/ruby-raa/ruby-2.1/CONFLICTS b/ruby-raa/ruby-2.1/CONFLICTS
new file mode 100755
index 0000000..abd55db
--- /dev/null
+++ b/ruby-raa/ruby-2.1/CONFLICTS
@@ -0,0 +1,5 @@
+conflicts ruby y
+conflicts ruby-1.8
+conflicts ruby-1.9
+conflicts ruby-2.0
+conflicts ruby-enterprise-edition
diff --git a/ruby-raa/ruby-2.1/DEPENDS b/ruby-raa/ruby-2.1/DEPENDS
new file mode 100755
index 0000000..8c5f8c3
--- /dev/null
+++ b/ruby-raa/ruby-2.1/DEPENDS
@@ -0,0 +1,6 @@
+optional_depends doxygen "" "--disable-install-doc" "install documentation"
&&
+optional_depends db "" "" "for db support" &&
+optional_depends gdbm "" "" "for gdbm support" &&
+optional_depends tk "" "" "for tk support" &&
+optional_depends libyaml "" "" "for YAML output (recommended)" &&
+optional_depends openssl "" "" "for ssl and hashing modules"
diff --git a/ruby-raa/ruby-2.1/DETAILS b/ruby-raa/ruby-2.1/DETAILS
new file mode 100755
index 0000000..99a2c94
--- /dev/null
+++ b/ruby-raa/ruby-2.1/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=ruby-2.1
+ PACKAGE=ruby
+ VERSION=2.1.0
+
SOURCE_HASH=sha512:61ff65af074f3df937914431b6d4cb9f6e1d99d3079e41c8bf10b3fb505f1f644a5a7f7620310a01838925816e8a9b6d8f9a5d8b75e977741b05d5dbd6961ef8
+ SECURITY_PATCH=0
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+ SOURCE=$PACKAGE-$VERSION.tar.bz2
+ SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/$PACKAGE/$BRANCH/$SOURCE
+ SOURCE_URL[1]=http://mirrors.ibiblio.org/$PACKAGE/$BRANCH/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$PACKAGE-$VERSION"
+ LICENSE[0]=GPL
+ KEYWORDS="devel"
+ WEB_SITE=http://www.ruby-lang.org/
+ ENTERED=20131225
+ SHORT="interpreted scripting language"
+cat << EOF
+Ruby is the interpreted scripting language for quick and easy object-oriented
+programming. It has many features to process text files and to do system
+management tasks. It is simple, straight foward extensible and portable.
+EOF
diff --git a/ruby-raa/ruby-2.1/HISTORY b/ruby-raa/ruby-2.1/HISTORY
new file mode 100644
index 0000000..ac22595
--- /dev/null
+++ b/ruby-raa/ruby-2.1/HISTORY
@@ -0,0 +1,3 @@
+2013-12-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.0
+ spell created, copied from ruby-2.0
diff --git a/ruby-raa/ruby-2.1/INSTALL b/ruby-raa/ruby-2.1/INSTALL
new file mode 100755
index 0000000..7bd4719
--- /dev/null
+++ b/ruby-raa/ruby-2.1/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+
+if [[ $RUBY_DOCS == y ]]; then
+ make install-doc
+fi
diff --git a/ruby-raa/ruby-2.1/PROVIDES b/ruby-raa/ruby-2.1/PROVIDES
new file mode 100755
index 0000000..a62e12a
--- /dev/null
+++ b/ruby-raa/ruby-2.1/PROVIDES
@@ -0,0 +1 @@
+RUBY
diff --git a/science-libs/avogadrolibs/DETAILS
b/science-libs/avogadrolibs/DETAILS
index 74f0de9..6e69775 100755
--- a/science-libs/avogadrolibs/DETAILS
+++ b/science-libs/avogadrolibs/DETAILS
@@ -1,10 +1,10 @@
SPELL=avogadrolibs
- VERSION=0.7.0
-
SOURCE_HASH=sha512:df7a5de580cd9aba40cfb776f4bd21ade1312eeac0a510243fd73eb53fce58b62b3cfd547a4e1f0e6f671c9cb16f55c443f2544d0f76e46f950901695f0f1c4a
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.7.2
+
SOURCE_HASH=sha512:32e94c124d650f0aaae9df6216a2c9082ab184915cfc7acab5abd8ab688d7934b6941411fd93fb0ea962d4bb7d9ea85df64872c47154841fcfce60627cd120e2
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.openchemistry.org
- SOURCE_URL[0]=$WEB_SITE/files/v${VERSION%.?}/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/avogadro/$SOURCE
LICENSE[0]=BSD
ENTERED=20130713
KEYWORDS="chemistry editory"
diff --git a/science-libs/avogadrolibs/HISTORY
b/science-libs/avogadrolibs/HISTORY
index a62eec6..d9bd5af 100644
--- a/science-libs/avogadrolibs/HISTORY
+++ b/science-libs/avogadrolibs/HISTORY
@@ -1,3 +1,7 @@
+2013-12-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.2
+ use sourceforge
+
2013-12-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.0
diff --git a/science-libs/molequeue/DETAILS b/science-libs/molequeue/DETAILS
index d405f00..a2709a8 100755
--- a/science-libs/molequeue/DETAILS
+++ b/science-libs/molequeue/DETAILS
@@ -1,10 +1,10 @@
SPELL=molequeue
- VERSION=0.7.0
-
SOURCE_HASH=sha512:988e968f59de8582ab4103f0f7a8117af10144079fcdcc56a1aff7e7a3b57e1b634884def08431b80f011d5811dbdaf9d98fe924ccbbc2195bb80788f9b59648
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=0.7.1
+
SOURCE_HASH=sha512:fc10af30f95a076d10a38adb19ce688f61ff0f32f00e1b7c2f533758151bd40965a0717babfd3df71388327b5957706d6dec3fe348caff7f0f535bd9ea64828f
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.openchemistry.org
- SOURCE_URL[0]=$WEB_SITE/files/v${VERSION%.?}/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
LICENSE[0]=BSD
ENTERED=20130713
KEYWORDS="chemistry"
diff --git a/science-libs/molequeue/HISTORY b/science-libs/molequeue/HISTORY
index 00cf664..1dcbabc 100644
--- a/science-libs/molequeue/HISTORY
+++ b/science-libs/molequeue/HISTORY
@@ -1,3 +1,7 @@
+2013-12-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.7.1
+ use sourceforge for download
+
2013-12-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.7.0