system/ZoneMinder: Updated for version 1.30.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 15 insertions, 30 deletions

diff --git a/system/ZoneMinder/ZoneMinder.SlackBuild b/system/ZoneMinder/ZoneMinder.SlackBuild
index b659efa583..7fad4633e2 100644
--- a/system/ZoneMinder/ZoneMinder.SlackBuild
+++ b/system/ZoneMinder/ZoneMinder.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ZoneMinder
-VERSION=${VERSION:-1.27.0}
+VERSION=${VERSION:-1.30.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,7 +36,7 @@ CGIROOT=${CGIROOT:-"/srv/httpd/cgi-bin"}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -47,8 +47,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"
@@ -67,7 +67,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 tar xvf $CWD/cambozola-$CAMBOZOLA_VERSION.tar.gz
 unzip $CWD/jscalendar-$JSCALENDAR_VERSION.zip
@@ -78,39 +78,24 @@ 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 {} \;
 
-# Regenerate files for automake/autoconf.
-./bootstrap.sh
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc/zm \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux \
-  --with-libarch=lib${LIBDIRSUFFIX} \
-  --with-mysql=/usr \
-  --with-ffmpeg=/usr \
-  --with-webdir=$DOCROOT \
-  --with-cgidir=$CGIROOT \
-  --with-webuser=$DOCOWN \
-  --with-webgroup=$DOCGRP \
-  --disable-debug \
-  --enable-mmap=yes
+cd $TMP/$PRGNAM-$VERSION
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_LIBRARY_PATH=/usr/lib${LIBDIRSUFFIX} \
+	-DZM_WEBDIR=$DOCROOT \
+	-DZM_CGIDIR=$CGIROOT \
+	-DZM_WEB_USER=$DOCOWN \
+	-DZM_WEB_GROUP=$DOCGRP .
 
 make
 make install DESTDIR=$PKG INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3
 
-# Strip binaries
 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
 
-# Compress manpages
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-# Remove junk files and dirs
 find $PKG -name perllocal.pod \
   -o -name ".packlist" \
   -o -name "*.bs" \
@@ -130,10 +115,11 @@ mkdir -p $PKG/etc/logrotate.d/
 cat $CWD/zm_logrotate > $PKG/etc/logrotate.d/zm.new
 
 # Install apache config
-sed "s%@DOCROOT@%$DOCROOT%" $CWD/zm_apache.conf > $PKG/etc/zm/zm_apache.conf.new
+mkdir -p $PKG/etc/httpd/extra
+cp $TMP/$PRGNAM-$VERSION/misc/apache.conf $PKG/etc/httpd/extra/zm.conf.new
 
 # Do not clobber the config file
-mv $PKG/etc/zm/zm.conf $PKG/etc/zm/zm.conf.new
+mv $PKG/etc/zm.conf $PKG/etc/zm.conf.new
 
 # Install startup script
 install -D -m 644 scripts/zm $PKG/etc/rc.d/rc.zm.new
@@ -153,7 +139,6 @@ mkdir -p $PKG/tmp
 chmod 777 $PKG/tmp
 chmod +t $PKG/tmp
 
-# Copy documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog INSTALL NEWS TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild