5 files changed, 35 insertions, 84 deletions
diff --git a/development/ahven/ahven.SlackBuild b/development/ahven/ahven.SlackBuild
index 308b130a27..bb4d06feb0 100644
--- a/development/ahven/ahven.SlackBuild
+++ b/development/ahven/ahven.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # ahven package build script (written by zhu.qunying@gmail.com)
-# Copyright 2012, Zhu Qun-Ying
+# Copyright 2012-2017 Zhu Qun-Ying
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,87 +21,63 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ahven
-VERSION=${VERSION:-2.2}
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
-    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
     *) ARCH=$(uname -m) ;;
   esac
-  export ARCH
 fi
 
-if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=i386
-elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=i386
-elif [ "$ARCH" = "i586" ]; then
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  LIB_ARCH=i386
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
   LIBDIRSUFFIX=""
-  LIB_ARCH=i386
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=s390
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  LIB_ARCH=amd64
-elif [ "$ARCH" = "armv7hl" ]; then
-  SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
-  LIBDIRSUFFIX=""
-  LIB_ARCH=armv7hl
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-  LIB_ARCH=$ARCH
 fi
 
-case "$ARCH" in
-    arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
-    *)    TARGET=$ARCH-slackware-linux ;;
-esac
-
-
-CWD=$(pwd)
-TMP=${TMP:-"/tmp/SBo"}
-PKG=${TMP}/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \; || exit 1
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p0 < $CWD/path.patch
-if [ "$ARCH" == "x86_64" ]; then
-    patch -p0 < $CWD/gpr-path.patch
-fi
+make DESTDIR=$PKG prefix=/usr libdir=/usr/lib$LIBDIRSUFFIX
+
+make DESTDIR=$PKG prefix=/usr libdir=/usr/lib$LIBDIRSUFFIX install
 
-make PREFIX=/usr LIBDIR=/usr/lib$LIBDIRSUFFIX
+mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/gnat
+sed -e "s/@prefix@/\/usr/" -e "s/@libdir@/\/usr\/lib$LIBDIRSUFFIX/g" \
+  $CWD/ahven.gpr > $PKG/usr/lib$LIBDIRSUFFIX/gnat/ahven.gpr
 
-make PREFIX=$PKG/usr LIBDIR=$PKG/usr/lib$LIBDIRSUFFIX install
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst ROADMAP NEWS LICENSE doc/tutorial examples $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/ahven/ahven.gpr b/development/ahven/ahven.gpr
new file mode 100644
index 0000000000..37d10529d5
--- /dev/null
+++ b/development/ahven/ahven.gpr
@@ -0,0 +1,8 @@
+library project Ahven is
+   for Library_Name     use "ahven";
+   for Library_Kind     use "dynamic";
+   for Source_Dirs      use ("@prefix@/include/ahven");
+   for Library_Dir      use "@libdir@";
+   for Library_ALI_Dir  use "@libdir@/ahven";
+   for Externally_Built use "true";
+end Ahven;
diff --git a/development/ahven/ahven.info b/development/ahven/ahven.info
index 336d154da9..2748a078a7 100644
--- a/development/ahven/ahven.info
+++ b/development/ahven/ahven.info
@@ -1,8 +1,8 @@
 PRGNAM="ahven"
-VERSION="2.2"
+VERSION="2.6"
 HOMEPAGE="http://ahven.stronglytyped.org/"
-DOWNLOAD="http://downloads.sourceforge.net/ahven/ahven-2.2.tar.gz"
-MD5SUM="f001dfbd206fb417c9f7dd886f917848"
+DOWNLOAD="http://www.ahven-framework.com/releases/ahven-2.6.tar.gz"
+MD5SUM="776d3da3cd30a9c8d7db1f84f55c8381"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/ahven/gpr-path.patch b/development/ahven/gpr-path.patch
deleted file mode 100644
index 9e4099bfb6..0000000000
--- a/development/ahven/gpr-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnat/ahven.gpr.org	2012-04-24 23:00:52.596107594 -0700
-+++ gnat/ahven.gpr	2012-04-24 23:01:02.927107188 -0700
-@@ -4,7 +4,7 @@
- 
-    for Source_Dirs use ("../../include/ahven");
- 
--   for Library_Dir use "../../lib/ahven";
-+   for Library_Dir use "../../lib64/ahven";
-    for Library_Name use "ahven";
-    for Library_Kind use "static";
- 
diff --git a/development/ahven/path.patch b/development/ahven/path.patch
deleted file mode 100644
index fd8403e65b..0000000000
--- a/development/ahven/path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.org	2012-04-24 22:51:05.485128589 -0700
-+++ Makefile	2012-04-24 22:53:29.216123458 -0700
-@@ -91,15 +91,15 @@
- install_lib:
- 	mkdir -p $(PREFIX)/include/ahven
- 	mkdir -p $(LIBDIR)/ahven
--	mkdir -p $(PREFIX)/lib/gnat
-+	mkdir -p $(LIBDIR)/gnat
- 	$(INSTALL) -m 644 $(SOURCES) $(PREFIX)/include/ahven
- 	$(INSTALL) -m 444 $(ALI_FILES) $(LIBDIR)/ahven
- 	$(INSTALL) -m 644 lib/$(STATIC_LIBRARY) $(LIBDIR)/ahven
--	$(INSTALL) -m 644 $(GPR_FILE) $(PREFIX)/lib/gnat
-+	$(INSTALL) -m 644 $(GPR_FILE) $(LIBDIR)/gnat
- 
- install_docs:
--	mkdir -p $(PREFIX)/share/doc/ahven
--	cp -r doc/manual/en/build/html $(PREFIX)/share/doc/ahven
-+	mkdir -p $(PREFIX)/doc/ahven
-+	cp -r doc/manual/en/build/html $(PREFIX)/doc/ahven
- 
- check: build_tests
- 	./tester -c