Slackware 14.2slackware-14.2

Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!

The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2.  The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system.  Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Have fun!  :-)

4 files changed, 58 insertions, 9 deletions

diff --git a/source/l/netpbm/config.mk b/source/l/netpbm/config.mk
index f5ace50f0..9f7089a53 100644
--- a/source/l/netpbm/config.mk
+++ b/source/l/netpbm/config.mk
@@ -658,5 +658,4 @@ TIFFLIB = libtiff.so
 JPEGLIB = libjpeg.so
 ZLIB = libz.so
 X11LIB = libX11.so
-LINUXSVGALIB = libvga.so
 NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
diff --git a/source/l/netpbm/netpbm-noppmtompeg.patch b/source/l/netpbm/netpbm-noppmtompeg.patch
new file mode 100644
index 000000000..58b7fa8ef
--- /dev/null
+++ b/source/l/netpbm/netpbm-noppmtompeg.patch
@@ -0,0 +1,23 @@
+diff -up netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg netpbm-10.47.12/buildtools/manpage.mk
+--- netpbm-10.47.12/buildtools/manpage.mk.noppmtompeg	2010-04-27 09:54:52.121522491 -0400
++++ netpbm-10.47.12/buildtools/manpage.mk	2010-04-27 09:55:10.337642487 -0400
+@@ -251,7 +251,6 @@ MAN1 = \
+ 	ppmtolj.1 \
+ 	ppmtomap.1 \
+ 	ppmtomitsu.1 \
+-	ppmtompeg.1 \
+ 	ppmtoneo.1 \
+ 	ppmtopcx.1 \
+ 	ppmtopgm.1 \
+diff -up netpbm-10.47.12/converter/ppm/Makefile.noppmtompeg netpbm-10.47.12/converter/ppm/Makefile
+--- netpbm-10.47.12/converter/ppm/Makefile.noppmtompeg	2010-04-27 09:55:20.293517254 -0400
++++ netpbm-10.47.12/converter/ppm/Makefile	2010-04-27 09:55:41.534642567 -0400
+@@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
+ 
+ include $(BUILDDIR)/config.mk
+ 
+-SUBDIRS = hpcdtoppm ppmtompeg
++SUBDIRS = hpcdtoppm
+ 
+ PORTBINARIES =	411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
+ 		leaftoppm mtvtoppm neotoppm \
diff --git a/source/l/netpbm/netpbm-pnmtops.patch b/source/l/netpbm/netpbm-pnmtops.patch
new file mode 100644
index 000000000..31bce9e29
--- /dev/null
+++ b/source/l/netpbm/netpbm-pnmtops.patch
@@ -0,0 +1,13 @@
+diff --git a/converter/other/Makefile b/converter/other/Makefile
+index 7aefda1..0d998f6 100644
+--- a/converter/other/Makefile
++++ b/converter/other/Makefile
+@@ -121,7 +121,7 @@ PORTBINARIES =  avstopam bmptopnm fitstopnm \
+ 		pamtowinicon pamtoxvmini \
+ 		pbmtopgm pdbimgtopam pfmtopam \
+ 	        pgmtopbm pgmtoppm ppmtopgm pnmtoddif \
+-		pnmtopclxl pnmtorast \
++		pnmtopclxl pnmtops pnmtorast \
+ 		pnmtosgi pnmtosir pamtotga pnmtoxwd \
+ 		rasttopnm rlatopam sgitopnm sirtopnm srftopam sunicontopnm \
+ 		winicontopam xwdtopnm zeisstopnm
diff --git a/source/l/netpbm/netpbm.SlackBuild b/source/l/netpbm/netpbm.SlackBuild
index fedaffddb..2619ef503 100755
--- a/source/l/netpbm/netpbm.SlackBuild
+++ b/source/l/netpbm/netpbm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2007, 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,21 +22,21 @@
 
 
 PKGNAM=netpbm
-VERSION=${VERSION:-10.49.02}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-10.66.02}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -60,6 +60,9 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION
 
+zcat $CWD/netpbm-noppmtompeg.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/netpbm-pnmtops.patch.gz | patch -p1 --verbose || exit 1
+
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -92,9 +95,20 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   cd usr
   mkdir -p doc/netpbm-$VERSION
   mv VERSION bin/doc.url doc/netpbm-$VERSION
-  ( cd lib ; ln -sf libnetpbm.so.10 libnetpbm.so )
+  if [ -r lib/libnetpbm.so.11 ]; then
+    ( cd lib ; rm -f libnetpbm.so ; ln -sf libnetpbm.so.11 libnetpbm.so )
+  else
+    echo "ERROR:  libnetpbm.so.11 not found."
+    echo "Please edit the correct library major version into the build script"
+    exit 1
+  fi
   mv lib lib${LIBDIRSUFFIX}
-  rm -rf config_template link misc pkginfo man/man1/manweb.1 man/web
+  # Remove junk directories:
+  rm -rf link misc
+  # Remove manweb related files:
+  rm -rf bin/manweb man/man1/manweb.1* man/web
+  # Any other files in /usr are junk:
+  rm --verbose * 2> /dev/null
 )
 
 # Compress and link manpages, if any: