diff options
-rw-r--r-- | libraries/ocaml-batteries/ocaml-batteries.SlackBuild | 18 | ||||
-rw-r--r-- | libraries/ocaml-batteries/ocaml-batteries.info | 8 |
2 files changed, 16 insertions, 10 deletions
diff --git a/libraries/ocaml-batteries/ocaml-batteries.SlackBuild b/libraries/ocaml-batteries/ocaml-batteries.SlackBuild index 47b981522bc9..9a9ef2044685 100644 --- a/libraries/ocaml-batteries/ocaml-batteries.SlackBuild +++ b/libraries/ocaml-batteries/ocaml-batteries.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ocaml-batteries -VERSION=1.4.1 +VERSION=${VERSION:-2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,15 +62,21 @@ rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . -chmod -R u+w,go+r-w,a-s . +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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ make all -make doc +#make doc -mkdir -p $PKG/$(ocamlfind printconf destdir) -make install DESTDIR=$PKG/$(ocamlfind printconf destdir) +OCAMLFIND_DESTDIR="$PKG/$(ocamlfind printconf destdir)" +sed "s|PATH_INSTALL=|PATH_INSTALL=$PKG/|" -i Makefile +mkdir -p "${OCAMLFIND_DESTDIR}" +OCAMLFIND_DESTDIR="${OCAMLFIND_DESTDIR}" DESTDIR="$PKG" PREFIX="/usr" make install mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION make install-doc DOCROOT=$PKG/usr/doc/$PRGNAM-$VERSION @@ -81,7 +87,7 @@ find $PKG -print0 | xargs -0 file \ || true cp -a \ - ChangeLog FAQ LICENSE README* VERSION \ + ChangeLog FAQ LICENSE README* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/ocaml-batteries/ocaml-batteries.info b/libraries/ocaml-batteries/ocaml-batteries.info index f197006eeee0..355c7018d54f 100644 --- a/libraries/ocaml-batteries/ocaml-batteries.info +++ b/libraries/ocaml-batteries/ocaml-batteries.info @@ -1,10 +1,10 @@ PRGNAM="ocaml-batteries" -VERSION="1.4.1" +VERSION="2.1" HOMEPAGE="http://batteries.forge.ocamlcore.org/" -DOWNLOAD="https://forge.ocamlcore.org/frs/download.php/684/batteries-1.4.1.tar.gz" -MD5SUM="733d602a3a25ba9c4366eec9356fe5fb" +DOWNLOAD="http://forge.ocamlcore.org/frs/download.php/1218/batteries-2.1.tar.gz" +MD5SUM="95567687a675107e58c66b93b9ea9bb1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ocaml-camomile ocaml-findlib" +REQUIRES="ocaml-bisect ocaml-camomile ocaml-findlib" MAINTAINER="Jockey S. Kyd" EMAIL="jockey.kyd@gmail.com" |