misc/xclip: Updated for version 0.12

4 files changed, 74 insertions, 35 deletions

diff --git a/misc/xclip/README b/misc/xclip/README
index 77e918b7fbeb..fad01b777db1 100644
--- a/misc/xclip/README
+++ b/misc/xclip/README
@@ -1,7 +1,8 @@
-Command-line interface to the X Clipboard
+Command line interface to the X11 Clipboard
 
-xclip is a command line utility that is designed to run on any system
-with an X11 implementation. It can read data from standard input or a
-file and place it in an X selection for pasting into other X
-applications. xclip can also print an X selection to standard output,
-which can then be redirected to a file or another program.
+xclip is a command line utility that is designed to run on any system with an
+X11 implementation. It provides an interface to X selections ("the clipboard")
+from the command line. It can read data from standard in or a file and place it
+in an X selection for pasting into other X applications. xclip can also print
+an X selection to standard out, which can then be redirected to a file or
+another program.
diff --git a/misc/xclip/slack-desc b/misc/xclip/slack-desc
index fbc4925b94ea..864fe3203291 100644
--- a/misc/xclip/slack-desc
+++ b/misc/xclip/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-     |-----handy-ruler------------------------------------------------------|
-xclip: xclip (Command-line interface to the X Clipboard)
-xclip: 
+     |-----handy-ruler--------------------------------------------------------|
+xclip: xclip (command-line interface to the X clipboard)
+xclip:
 xclip: xclip is a command line utility that is designed to run on any system
-xclip: with an X11 implementation. It can read data from standard input or a
-xclip: file and place it in an X selection for pasting into other X
-xclip: applications. xclip can also print an X selection to standard output,
+xclip: with an X11 implementation. It provides an interface to X selections
+xclip: ("the clipboard") from the command line. It can read data from standard
+xclip: in or a file and place it in an X selection for pasting into other X
+xclip: applications. xclip can also print an X selection to standard out,
 xclip: which can then be redirected to a file or another program.
 xclip:
 xclip: Homepage: http://sourceforge.net/projects/xclip/
 xclip:
-xclip:
diff --git a/misc/xclip/xclip.SlackBuild b/misc/xclip/xclip.SlackBuild
index 1885023eacc4..9c12fb2d6fdf 100644
--- a/misc/xclip/xclip.SlackBuild
+++ b/misc/xclip/xclip.SlackBuild
@@ -1,12 +1,30 @@
 #!/bin/sh
-
 # Slackware build script for xclip
 
+# Copyright 2009 Grigorios Bouzakis <grbzks@xsmail.com>                                                                                                                                                           
+# All rights reserved.                                                                                                                                                                                            
+#                                                                                                                                                                                                                 
+# Permission to use, copy, modify, and distribute this software for any purpose                                                                                                                                   
+# with or without fee is hereby granted, provided that the above copyright                                                                                                                                        
+# notice and this permission notice appear in all copies.                                                                                                                                                         
+#                                                                                                                                                                                                                 
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,                                                                                                                                    
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND                                                                                                                                    
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE                                                                                                                                          
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY                                                                                                                                          
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES                                                                                                                                      
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;                                                                                                                                    
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND                                                                                                                                     
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT                                                                                                                                      
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF                                                                                                                                        
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 PRGNAM=xclip
-VERSION=0.11
+VERSION=${VERSION:-0.12}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -14,46 +32,64 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+DOCS="COPYING ChangeLog README"
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-  ./configure \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --with-perl=/usr/bin/perl \
   --mandir=/usr/man \
-  --enable-eps \
-  --enable-gif \
-  --enable-png \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-CFLAGS=$SLKCFLAGS CXXFLAGS=$SLKCFLAGS make
+make
 make install DESTDIR=$PKG
-strip --strip-unneeded $PKG/usr/bin/xclip 2> /dev/null
 
-gzip -9 $PKG/usr/man/man1/xclip.1
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/xclip/xclip.info b/misc/xclip/xclip.info
index 253d2fa9f2a5..47f88e8bbdae 100644
--- a/misc/xclip/xclip.info
+++ b/misc/xclip/xclip.info
@@ -1,8 +1,10 @@
 PRGNAM="xclip"
-VERSION="0.11"
+VERSION="0.12"
 HOMEPAGE="http://sourceforge.net/projects/xclip/"
-DOWNLOAD="http://downloads.sourceforge.net/xclip/xclip-0.11.tar.gz"
-MD5SUM="4caf3a2b03c36981f9af36a8e8582951"
-MAINTAINER="Peter Drauden"
-EMAIL="pjdraud@gmail.com"
-APPROVED="Erik Hanson"
+DOWNLOAD="http://downloads.sourceforge.net/xclip/xclip-0.12.tar.gz"
+MD5SUM="f7e19d3e976fecdc1ea36cd39e39900d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Grigorios Bouzakis"
+EMAIL="grbzks@xsmail.com"
+APPROVED="dsomero"