From d31c50870d0bee042ce660e445c9294a59a3a65b Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 30 Jun 2016 20:26:57 +0000
Subject: Slackware 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!  :-)
---
 source/d/pkg-config/doinst.sh             | 13 ++++++++-----
 source/d/pkg-config/pkg-config.SlackBuild |  8 ++++----
 source/d/pkg-config/scripts/pkgconfig.csh |  4 ++--
 source/d/pkg-config/scripts/pkgconfig.sh  |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'source/d/pkg-config')

diff --git a/source/d/pkg-config/doinst.sh b/source/d/pkg-config/doinst.sh
index c8adcd317..06ebcafc0 100644
--- a/source/d/pkg-config/doinst.sh
+++ b/source/d/pkg-config/doinst.sh
@@ -1,6 +1,9 @@
-if [ ! -L usr/share/pkgconfig ]; then
-  mkdir -p usr/lib/pkgconfig 2> /dev/null
-  mv usr/share/pkgconfig/* usr/lib/pkgconfig 2> /dev/null
-  rmdir usr/share/pkgconfig 2> /dev/null
-  ( cd usr/share ; ln -sf ../lib/pkgconfig . 2> /dev/null )
+# Break the /usr/share/pkgconfig symlinks, if it exists.
+# Then move the .pc files to the standard location.
+if [ -L usr/share/pkgconfig ]; then
+  rm usr/share/pkgconfig
+  mkdir -p usr/share/pkgconfig
+  grep usr/share/pkgconfig var/log/packages/* | grep '\.pc$' | cut -f 2 -d : | cut -f 4 -d / | while read movefile ; do
+    mv usr/lib/pkgconfig/$movefile usr/share/pkgconfig 1> /dev/null 2> /dev/null
+  done
 fi
diff --git a/source/d/pkg-config/pkg-config.SlackBuild b/source/d/pkg-config/pkg-config.SlackBuild
index 0c42ef575..595e97594 100755
--- a/source/d/pkg-config/pkg-config.SlackBuild
+++ b/source/d/pkg-config/pkg-config.SlackBuild
@@ -22,12 +22,12 @@
 
 PKGNAM=pkg-config
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # 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 ) ;;
@@ -42,8 +42,8 @@ PKG=$TMP/package-pkg-config
 rm -rf $PKG
 mkdir -p $TMP $PKG/usr
 
-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"
diff --git a/source/d/pkg-config/scripts/pkgconfig.csh b/source/d/pkg-config/scripts/pkgconfig.csh
index 477a93a76..da9a45a60 100755
--- a/source/d/pkg-config/scripts/pkgconfig.csh
+++ b/source/d/pkg-config/scripts/pkgconfig.csh
@@ -1,6 +1,6 @@
 #!/bin/csh
 if ( $?PKG_CONFIG_PATH ) then
-    setenv PKG_CONFIG_PATH ${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig
+    setenv PKG_CONFIG_PATH ${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig
 else
-    setenv PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+    setenv PKG_CONFIG_PATH /usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 endif
diff --git a/source/d/pkg-config/scripts/pkgconfig.sh b/source/d/pkg-config/scripts/pkgconfig.sh
index c3f350313..96e07c4fa 100755
--- a/source/d/pkg-config/scripts/pkgconfig.sh
+++ b/source/d/pkg-config/scripts/pkgconfig.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ ! "$PKG_CONFIG_PATH" = "" ]; then
-  PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig
+  PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig
 else
-  PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+  PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 fi
 export PKG_CONFIG_PATH
-- 
cgit v1.2.3