2 files changed, 37 insertions, 24 deletions
diff --git a/multimedia/minidlna/minidlna.SlackBuild b/multimedia/minidlna/minidlna.SlackBuild
index 7b7b77430b..7f5157634c 100644
--- a/multimedia/minidlna/minidlna.SlackBuild
+++ b/multimedia/minidlna/minidlna.SlackBuild
@@ -22,10 +22,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# revision date 2012/09/15
+# revision date 2013/11/18
 
 PRGNAM=minidlna
-VERSION=${VERSION:-1.0.25}
+VERSION=${VERSION:-1.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,34 +62,47 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}_src.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -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 {} \;
-
-# Let Makefile accept our CFLAGS and make it verbose
-sed \
-  -e "/^CFLAGS/s/=/+=/" \
-  -e "s/@\$(CC)/\$(CC)/g" \
-  -i Makefile
-
-CFLAGS="$SLKCFLAGS" make
+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" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-tivo \
+  --enable-netgear \
+  --enable-readynas \
+  --build=$ARCH-slackware-linux
+
 make install DESTDIR=$PKG
-make install-conf DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-# Rename configuration file to .new
-mv $PKG/etc/$PRGNAM.conf $PKG/etc/$PRGNAM.conf.new
+# Include the config file
+mkdir -p $PKG/etc
+cat $PRGNAM.conf > $PKG/etc/$PRGNAM.conf.new
+
+# Include the manual pages
+mkdir -p $PKG/usr/man/man{5,8}
+cat minidlna.conf.5 > $PKG/usr/man/man5/minidlna.conf.5
+cat minidlnad.8 > $PKG/usr/man/man8/minidlnad.8
+gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  INSTALL LICENCE* NEWS README TODO  \
+  AUTHORS COPYING ChangeLog INSTALL LICENCE* NEWS README TODO  \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/multimedia/minidlna/minidlna.info b/multimedia/minidlna/minidlna.info
index f028350a43..f97f46d88b 100644
--- a/multimedia/minidlna/minidlna.info
+++ b/multimedia/minidlna/minidlna.info
@@ -1,8 +1,8 @@
 PRGNAM="minidlna"
-VERSION="1.0.25"
+VERSION="1.1.1"
 HOMEPAGE="http://minidlna.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/minidlna/minidlna_1.0.25_src.tar.gz"
-MD5SUM="d966256baf2f9b068b9de871ab5dade5"
+DOWNLOAD="http://downloads.sourceforge.net/minidlna/minidlna-1.1.1.tar.gz"
+MD5SUM="653405555ac3f8eb4aacc54c1be7b5fa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ffmpeg"