summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--development/omake/omake-warn-error.diff11
-rw-r--r--development/omake/omake.SlackBuild32
-rw-r--r--development/omake/omake.info8
3 files changed, 16 insertions, 35 deletions
diff --git a/development/omake/omake-warn-error.diff b/development/omake/omake-warn-error.diff
deleted file mode 100644
index 3392c8f311..0000000000
--- a/development/omake/omake-warn-error.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- orig/lib/build/OCaml.om 2010-03-30 10:18:37 +0000
-+++ work/lib/build/OCaml.om 2010-03-30 12:41:33 +0000
-@@ -170,7 +170,7 @@
- #
- declare OCAMLDEPFLAGS
- public.OCAMLPPFLAGS =
--public.OCAMLFLAGS = -warn-error A
-+public.OCAMLFLAGS =
- public.OCAMLCFLAGS = -g
- public.OCAMLOPTFLAGS =
- public.OCAMLCPPFLAGS =
diff --git a/development/omake/omake.SlackBuild b/development/omake/omake.SlackBuild
index 32931e5db7..7bcea6cfbd 100644
--- a/development/omake/omake.SlackBuild
+++ b/development/omake/omake.SlackBuild
@@ -23,15 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=omake
-VERSION=${VERSION:-0.9.8.6}
+VERSION=${VERSION:-0.10.3}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-SRCVER=${VERSION}-0.rc1
-
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -42,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,9 +59,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,22 +69,16 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix things for newer OCaml
-patch -p1 <$CWD/omake-warn-error.diff
-
-# No configure, manual it is..
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-PREFIX=/usr \
-LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-INSTALL_ROOT=$PKG \
-make install
+# the newer omake doesn't want to respect our LIBDIRSUFFIX
+./configure --prefix /usr
+make -j1 all
+make -j1 install INSTALL_ROOT=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.txt COMMENTS INSTALL LICENSE LICENSE.OMake doc/* \
+cp -a ChangeLog COMMENTS INSTALL LICENSE LICENSE.OMake doc/* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/omake/omake.info b/development/omake/omake.info
index b33d0a1ce2..1721b9dd8f 100644
--- a/development/omake/omake.info
+++ b/development/omake/omake.info
@@ -1,8 +1,8 @@
PRGNAM="omake"
-VERSION="0.9.8.6"
-HOMEPAGE="http://omake.metaprl.org/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/omake-0.9.8.6-0.rc1.tar.gz"
-MD5SUM="fe39a476ef4e33b7ba2ca77a6bcaded2"
+VERSION="0.10.3"
+HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
+DOWNLOAD="https://github.com/ocaml-omake/omake/archive/omake-0.10.3/omake-0.10.3.tar.gz"
+MD5SUM="134b1ea51a5cd90d32fec7ad27e82aa5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="ocaml-findlib"