3 files changed, 35 insertions, 12 deletions
diff --git a/source/a/pcmciautils/pcmciautils-017.tar.sign b/source/a/pcmciautils/pcmciautils-017.tar.sign
deleted file mode 100644
index cd492c77b..000000000
--- a/source/a/pcmciautils/pcmciautils-017.tar.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBLRLP8yGugalF9Dw4RAn4EAJ96T5HaIjfdqhIfp2/GeL18BgylOwCfZA+R
-sWw0NvzDaf3ZKhgHZHNmGLs=
-=A5s6
------END PGP SIGNATURE-----
diff --git a/source/a/pcmciautils/pcmciautils-018.tar.sign b/source/a/pcmciautils/pcmciautils-018.tar.sign
new file mode 100644
index 000000000..2f4105796
--- /dev/null
+++ b/source/a/pcmciautils/pcmciautils-018.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVdEN7AAoJEJqXYIlMjaMNMIoP/1rBoqXynp4+o5/tnYbjSFwT
+09+fnA0V4xiuRxDszMT1IteZi3JTgn8ltlYoxug+yzxynDoYRFKXrGkDvIDN+pao
+lPDr9b6QvWfoVPGXYG6W1026UojkoNjdH6gJSW2P6P8Y7/K1NWDSvKM7kd8+Of2A
+16LUYh7LBu7MhUKft1QXVy5qxxZTiceXar7kOpY9UeP3VoNVhxEQ7UkLcTTt+Bsv
+8PCsIfPJ2m4CvQRLDXtTg8G71ZOkiuc305inluf63jsIiSJztlU3IUC+i38No23j
+moZbGIW7QDjzoMGJSDYLCtDi4OhrDpYEYc9xwkAb3p/F9cLOPtTBB1cHlNcOk/KV
+D4yWiB1eWK3dl0mIPz2th4cLKnbAxt52rlXP7PfDrC4vmue6KGPDuhhDS92gtEiI
+pKsXWfDFYIcCzFwwKPzuFBipweAzLwvARW8x1KCMSmKVNXoroGcGzKM4PXllZkiL
+XrBS1qt5YJWT648JwdMbFHPa86klXqOz51jT1DchwiFqbXd/qI32POlz2qmWuvaf
+Mp2E30u0Mwi/2EA4aBiSiRP222rZoHh8ZpxnilRrUG7ewW+Q1F1bOVw07mSACQ11
+tQZa4FfT5GP6rqurgJX1Uw8NKRg68vBKK2Y0hvzS7RLvJbG6/T1JkSVBXy07T1gE
+sUVy7nZl1p9UnbJRgAZ5
+=NhTa
+-----END PGP SIGNATURE-----
diff --git a/source/a/pcmciautils/pcmciautils.SlackBuild b/source/a/pcmciautils/pcmciautils.SlackBuild
index fa4581720..2a492d447 100755
--- a/source/a/pcmciautils/pcmciautils.SlackBuild
+++ b/source/a/pcmciautils/pcmciautils.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-017}
+VERSION=${VERSION:-018}
 BUILD=${BUILD:-1}
 
 # 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 ) ;;
@@ -43,11 +43,25 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-pcmciautils
 
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf pcmciautils-$VERSION
-tar xvf $CWD/pcmciautils-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/pcmciautils-$VERSION.tar.xz || exit 1
 cd pcmciautils-$VERSION
 chown -R root.root .
 find . \
@@ -56,7 +70,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make $NUMJOBS || make || exit 1
+CFLAGS="$SLKCFLAGS" make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 ( cd $PKG