diff options
Diffstat (limited to 'desktop/wmudmount/wmudmount.SlackBuild')
| -rw-r--r-- | desktop/wmudmount/wmudmount.SlackBuild | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/desktop/wmudmount/wmudmount.SlackBuild b/desktop/wmudmount/wmudmount.SlackBuild index 1e5739ea8e..cb5322bbd7 100644 --- a/desktop/wmudmount/wmudmount.SlackBuild +++ b/desktop/wmudmount/wmudmount.SlackBuild @@ -2,8 +2,8 @@ # Slackware build script for wmudmount # -# Originally written by Rex Hauser <thundermachinegun[AT]gmail.com> -# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com> +# Originally written by Rex Hauser <email removed> +# Copyright 2015 Gethyn ThomasQuail <email removed> # All rights reserved. # # Based on: @@ -26,14 +26,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Now maintained by B. Watson <yalhcru@gmail.com> + +# 20160818 bkw: +# - take over maintenance +# - i486 => i586 +# - unify 1.13 and 2.2 builds (no script changes needed) +# - make 2.2 the default version (1.13 can still be built) +# - actually use SLKCFLAGS +# - actually install the doinst.sh +# - install binary stripped +# - clarify README, stop asking for patches that aren't coming + PRGNAM=wmudmount -VERSION=${VERSION:-1.13} #If you want to use the newest version, read the comments below +VERSION=${VERSION:-2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +56,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -73,7 +85,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Let's compile! +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -81,18 +94,19 @@ find -L . \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install-strip DESTDIR=$PKG -# Compresses man page. For 2.2 users, remove the x in wmudmount.1x -gzip -9 $PKG/usr/man/man1/wmudmount.1x +gzip -9 $PKG/usr/man/man1/$PRGNAM.* -# For 2.2 users, change line 95 to: ChangeLog COPYING \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ChangeLog debian/copyright $PKG/usr/doc/$PRGNAM-$VERSION +for i in ChangeLog debian/copyright COPYING; do + [ -e $i ] && cp -a $i $PKG/usr/doc/$PRGNAM-$VERSION +done cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |