Update to 1.0.21

1 files changed, 68 insertions, 15 deletions

diff --git a/minidlna/build/minidlna.SlackBuild b/minidlna/build/minidlna.SlackBuild
index a0f737a8..f7439ade 100755
--- a/minidlna/build/minidlna.SlackBuild
+++ b/minidlna/build/minidlna.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -32,6 +32,11 @@
 # Changelog:   
 # 1.0.18-1:    20/Dec/2010 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
+# 20101223-1:  23/Dec/2010 by Eric Hameleers <alien@slackware.com>
+#              * Update to a git build, since the release of 'stable' tarballs
+#                seems to stagnate.
+# 1.0.21-1:    11/aug/2011 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh minidlna.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -42,7 +47,9 @@
 # Set initial variables:
 
 PRGNAM=minidlna
-VERSION=${VERSION:-1.0.18}
+VERSION=${VERSION:-1.0.21}
+#VERSION=${VERSION:-HEAD}
+[ "$VERSION" = "HEAD"  ] && SRCVER=$(date +%Y%m%d) || SRCVER=$VERSION
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -57,8 +64,48 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE[0]="$SRCDIR/${PRGNAM}_${VERSION}_src.tar.gz"
-SRCURL[0]="http://sourceforge.net/projects/${PRGNAM}/files/${PRGNAM}/${VERSION}/${PRGNAM}_${VERSION}_src.tar.gz/download"
+SOURCE[0]="$SRCDIR/${PRGNAM}_${SRCVER}_src.tar.gz"
+if [ "$VERSION" != "HEAD" ]; then
+  SRCURL[0]="http://sourceforge.net/projects/${PRGNAM}/files/${PRGNAM}/${SRCVER}/${PRGNAM}_${SRCVER}_src.tar.gz/download"
+else
+  SRCURL[0]=""
+fi
+
+# Use the src_checkout() function if no downloadable tarball exists.
+# This function checks out sources from SVN/CVS and creates a tarball of them.
+src_checkout() {
+  # Param #1 : index in the SOURCE[] array.
+  # Param #2 : full path to where SOURCE[$1] tarball should be created.
+  # Determine the tarball extension:
+  PEXT=$(echo "${2}" | sed -r -e 's/.*[^.].(tar.xz|tar.gz|tar.bz2|tgz).*/\1/')
+  case "$PEXT" in
+    "tar.xz") TARCOMP="J" ;;
+    "tar.gz") TARCOMP="z" ;;
+    "tgz") TARCOMP="z" ;;
+    "tar.bz2") TARCOMP="j" ;;
+    *) echo "Archive can only have extension 'tar.xz', '.tar.gz' '.tar.bz2' or '.tgz'" ; exit 1 ;;
+  esac
+  # Determine the directory name to create for the archive root:
+  PBASE=$(basename ${2} .${PEXT})
+  # Determine the directory where we create our checkout:
+  CODIR=$(dirname ${2})
+  case ${1} in
+  0) # CVS checkout:
+     RETDIR=$(pwd)
+     mkdir -p $CODIR/${PRGNAM}_temp_checkout_$$ \
+       && cd $CODIR/${PRGNAM}_temp_checkout_$$
+     cvs -d:pserver:anonymous@minidlna.cvs.sourceforge.net:/cvsroot/minidlna co -P minidlna \
+       && mv minidlna ${PBASE} \
+       && find ${PBASE} -type d -name '.cvs' -depth | xargs rm -rf \
+       && chown -R root:root ${PBASE} \
+       && tar -${TARCOMP}cf ${2} ${PBASE}
+     cd $RETDIR
+     rm -rf $CODIR/${PRGNAM}_temp_checkout_$$ || true
+     ;;
+  *) # Do nothing
+     ;;
+  esac
+}
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -122,6 +169,12 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
         exit 1
       fi
     else
+      # Try if we have a SVN/CVS download routine for ${SOURCE[$i]}
+      echo "Will checkout sources to $(dirname $SOURCE[$i])"
+      src_checkout $i "${SOURCE[$i]}" \
+        2>&1 > $OUTPUT/checkout-$(basename ${SOURCE[$i]}).log
+    fi
+    if [ ! -f "${SOURCE[$i]}" -o ! -s "${SOURCE[$i]}" ]; then
       echo "File '$(basename ${SOURCE[$i]})' not available. Aborting the build."
       exit 1
     fi
@@ -136,7 +189,7 @@ fi
 # --- PACKAGE BUILDING ---
 
 echo "++"
-echo "|| $PRGNAM-$VERSION"
+echo "|| $PRGNAM-$SRCVER"
 echo "++"
 
 cd $TMP/tmp-$PRGNAM
@@ -144,7 +197,7 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
   tar -xvf ${SOURCE[$i]}
 done
-cd ${PRGNAM}
+cd ${PRGNAM} || cd ${PRGNAM}*
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
@@ -157,7 +210,7 @@ sed -i \
   -e '/^minidlna/s/ *$(LIBS)//' \
   Makefile
 make PREFIX=/usr 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-make PREFIX=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
 # Do not clobber an existing configuration:
 mv $PKG/etc/minidlna.conf{,.new}
@@ -187,10 +240,10 @@ config etc/minidlna.conf.new
 EOINS
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$SRCVER
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$SRCVER || true
+cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$SRCVER/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$SRCVER
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Strip binaries (if any):
@@ -204,12 +257,12 @@ cat $SRCDIR/slack-required > $PKG/install/slack-required
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
+md5sum ${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
-cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${SRCVER}-${ARCH}-${BUILD}${TAG}.dep
 
 # Restore the original umask:
 umask ${_UMASK_}