1 files changed, 48 insertions, 41 deletions
diff --git a/source/x/m17n-lib/m17n-lib.SlackBuild b/source/x/m17n-lib/m17n-lib.SlackBuild
index 02a5d29dc..82cc38ad3 100755
--- a/source/x/m17n-lib/m17n-lib.SlackBuild
+++ b/source/x/m17n-lib/m17n-lib.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN  USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN  USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,14 +33,24 @@
 # -----------------------------------------------------------------------------
 
 
-PRGNAM=m17n-lib
+PKGNAM=m17n-lib
 SHORTNAM=m17n
-VERSION=${VERSION:-1.5.4}
-DBVERSION=${DBVERSION:-1.5.4}
-DOCVERSION=${DOCVERSION:-1.5.2}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-1.6.1}
+DBVERSION=${DBVERSION:-1.6.1}
+# Won't build && are not maintained for current version
+#DOCVERSION=${DOCVERSION:-1.5.5}
 BUILD=${BUILD:-1}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
@@ -49,11 +59,11 @@ DOCS_DOC="AUTHORS COPYING ChangeLog INSTALL NEWS README"
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
-SOURCE[0]="$CWD/${PRGNAM}-${VERSION}.tar.gz"
-SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.gz"
-SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.gz"
+SOURCE[0]="$CWD/${PKGNAM}-${VERSION}.tar.xz"
+SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.xz"
+#SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.xz"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -73,19 +83,16 @@ elif [ "$ARCH" = "armel" ]; then
 fi
 
 rm -rf $PKG
-mkdir -p $TMP/build-${PRGNAM} $PKG
+mkdir -p $TMP/build-${PKGNAM} $PKG
 
-cd $TMP/build-${PRGNAM}
+cd $TMP/build-${PKGNAM}
 for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
-  tar -xvf ${SOURCE[$i]} || exit 1
+  tar xvf ${SOURCE[$i]} || exit 1
 done
 chown -R root:root *
 chmod -R u+w,go+r-w,a-s *
-# Patch the docs makefile:
-( cd $SHORTNAM-docs-$DOCVERSION
-  cat $CWD/${SHORTNAM}-docs_makefile.patch | patch -p0 --verbose || exit 1
-)
-cd ${PRGNAM}-${VERSION}
+
+cd ${PKGNAM}-${VERSION}
 # Add the missing internal-flt.h file:
 [ ! -r src/internal-flt.h ] && cp $CWD/internal-flt.h src/
 
@@ -125,32 +132,32 @@ make $NUMJOBS || make || exit 1
 make DESTDIR=$PKG install || exit 1
 cd ..
 
-# Compile and install the m17n user documentation:
-echo "Building the m17n user docs..."
-cd ${SHORTNAM}-docs-${DOCVERSION}
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --mandir=/usr/man \
-  --program-prefix= \
-  --program-suffix= \
-  --build=$ARCH-slackware-linux
-make $NUMJOBS || make || exit 1
-make DESTDIR=$PKG install || exit 1
-cd ..
+## Compile and install the m17n user documentation:
+#echo "Building the m17n user docs..."
+#cd ${SHORTNAM}-docs-${DOCVERSION}
+#CXXFLAGS="$SLKCFLAGS" \
+#CFLAGS="$SLKCFLAGS" \
+#./configure \
+#  --prefix=/usr \
+#  --libdir=/usr/lib${LIBDIRSUFFIX} \
+#  --localstatedir=/var \
+#  --sysconfdir=/etc \
+#  --mandir=/usr/man \
+#  --program-prefix= \
+#  --program-suffix= \
+#  --build=$ARCH-slackware-linux
+#make $NUMJOBS || make || exit 1
+#make DESTDIR=$PKG install || exit 1
+#cd ..
 
 # Add package documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{db,docs}
-cd ${PRGNAM}-${VERSION}
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/{db,docs}
+cd ${PKGNAM}-${VERSION}
+cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION
 cd ../${SHORTNAM}-db-${DBVERSION}
-cp -a $DOCS_DB $PKG/usr/doc/$PRGNAM-$VERSION/db
+cp -a $DOCS_DB $PKG/usr/doc/$PKGNAM-$VERSION/db
 cd ../${SHORTNAM}-docs-${DOCVERSION}
-cp -a $DOCS_DOC $PKG/usr/doc/$PRGNAM-$VERSION/docs
+cp -a $DOCS_DOC $PKG/usr/doc/$PKGNAM-$VERSION/docs
 cd ..
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
@@ -178,5 +185,5 @@ fi
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz