development/ming: Updated for version 0.4.2

4 files changed, 30 insertions, 15 deletions

diff --git a/development/ming/README b/development/ming/README
index a840aa7b0038..d45e0221bb71 100644
--- a/development/ming/README
+++ b/development/ming/README
@@ -8,5 +8,5 @@ away all of the mundane specifics of the SWF file format.
 
 This package contains the c++, perl, python, php and tcl-plugin.
 To enable the php-plugin you have to add
-  extension=php_ming.so
-to the appropriate place in /etc/httpd/php.ini
\ No newline at end of file
+	extension=php_ming.so
+to the appropriate place in /etc/httpd/php.ini
diff --git a/development/ming/ming.SlackBuild b/development/ming/ming.SlackBuild
index 3921e703747a..0b28ee6d6ccc 100644
--- a/development/ming/ming.SlackBuild
+++ b/development/ming/ming.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ming
-VERSION=0.4.0.rc1
+VERSION=0.4.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -52,8 +52,10 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# static library is activated because the perl extension needs it
+# Fix a misplaced \" in the php_ext Makefile.in that prevents installation
+patch -p1 < $CWD/php_ext-Makefile.in.patch 
 
+# static library is activated because the perl extension needs it
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -63,14 +65,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --enable-static \
   --enable-tcl \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
+make install DESTDIR=$PKG
 
 cd php_ext
-  make install-strip prefix=$PKG/usr
+  make install DESTDIR=$PKG
 cd -
 
 cd py_ext
@@ -83,8 +84,10 @@ cd perl_ext
   make install DESTDIR=$PKG
 cd -
 
-mv $PKG/usr/share/man/man3/* $PKG/usr/man/man3/
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
+mv $PKG/usr/share/man/man3/* $PKG/usr/man/man3/
 rm -rf $PKG/usr/share
 
 # Remove perlocal.pod and .packlist from $PKG
@@ -92,10 +95,10 @@ rm -rf $PKG/usr/share
       find $PKG -name "$i" -exec rm -rf {} \;
   done
   # Remove empty directory
-  rm -rf $PKG/usr/lib/perl5/5.8.8/
+  rmdir --parents $PKG/usr/lib/perl5/5.10.0/i486-linux-thread-multi 2>/dev/null || true
 )
 
-( cd $PKG/usr/man
+( cd $PKG/usr/man || exit 1
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
diff --git a/development/ming/ming.info b/development/ming/ming.info
index 82b3400443a0..99634e335892 100644
--- a/development/ming/ming.info
+++ b/development/ming/ming.info
@@ -1,8 +1,8 @@
 PRGNAM="ming"
-VERSION="0.4.0.rc1"
+VERSION="0.4.2"
 HOMEPAGE="http://www.libming.org"
-DOWNLOAD="http://downloads.sourceforge.net/ming/ming-0.4.0.rc1.tar.bz2"
-MD5SUM="3353ae645623e9e9be9a87e7eb9fa4a1"
+DOWNLOAD="http://downloads.sourceforge.net/ming/ming-0.4.2.tar.bz2"
+MD5SUM="41f091dee0384a432aa05aca1ec7699b"
 MAINTAINER="ppr:kut"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="rworkman"
diff --git a/development/ming/php_ext-Makefile.in.patch b/development/ming/php_ext-Makefile.in.patch
new file mode 100644
index 000000000000..664359f2b02d
--- /dev/null
+++ b/development/ming/php_ext-Makefile.in.patch
@@ -0,0 +1,12 @@
+diff -Nur ming-0.4.2.orig/php_ext/Makefile.in ming-0.4.2/php_ext/Makefile.in
+--- ming-0.4.2.orig/php_ext/Makefile.in	2008-09-17 19:59:59.000000000 -0500
++++ ming-0.4.2/php_ext/Makefile.in	2009-01-05 09:24:44.012689279 -0600
+@@ -359,7 +359,7 @@
+ 
+ install: all
+ 	$(INSTALL) -d "$(DESTDIR)"/`php-config --extension-dir`
+-	$(INSTALL) -m 755 tmp/modules/ming.so" "$(DESTDIR)"/`php-config --extension-dir`
++	$(INSTALL) -m 755 tmp/modules/ming.so "$(DESTDIR)"/`php-config --extension-dir`
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: