diff options
Diffstat (limited to 'system/vcp')
| -rw-r--r-- | system/vcp/README | 10 | ||||
| -rw-r--r-- | system/vcp/slack-desc | 4 | ||||
| -rw-r--r-- | system/vcp/vcp.SlackBuild | 31 | ||||
| -rw-r--r-- | system/vcp/vcp.info | 2 |
4 files changed, 29 insertions, 18 deletions
diff --git a/system/vcp/README b/system/vcp/README index a3839670cc..56fa364378 100644 --- a/system/vcp/README +++ b/system/vcp/README @@ -1,6 +1,8 @@ +vcp (copy files via a curses interface) + vcp copies files and directories in a curses interface, with text only -output available. its options and output are similar to BSD's cp while -adding some new features. It provides information on: +output available. Its options and output are similar to BSD's cp while +adding some new features. It provides information on: - files copied and left to copy @@ -8,5 +10,5 @@ adding some new features. It provides information on: - data being written every second -- two status bars, one showing current file status, the other total status -(except with 1 file, both show current), and percentage +- two status bars, one showing current file status, the other total + status (except with 1 file, both show current), and percentage diff --git a/system/vcp/slack-desc b/system/vcp/slack-desc index 10dbbbf6ac..ad9f1ad902 100644 --- a/system/vcp/slack-desc +++ b/system/vcp/slack-desc @@ -9,8 +9,8 @@ vcp: vcp (copy files via a curses interface) vcp: vcp: vcp copies files and directories in a curses interface, with text -vcp: only output available. its options and output are similar to BSD's -vcp: cp while adding some new features. It provides information on: +vcp: only output available. Its options and output are similar to BSD's +vcp: cp while adding some new features. It provides information on: vcp: vcp: - files copied and left to copy vcp: - data written and total data size diff --git a/system/vcp/vcp.SlackBuild b/system/vcp/vcp.SlackBuild index 29a5f501f7..2b28b63955 100644 --- a/system/vcp/vcp.SlackBuild +++ b/system/vcp/vcp.SlackBuild @@ -1,15 +1,23 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for vcp -# Written by B. Watson (yalhcru@gmail.com) +# Written by B. Watson (urchlay@slackware.uk) # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20221228 bkw: BUILD=2: use -fcommon rather than +# -Wl,--allow-multiple-definitions. It probably doesn't matter, +# but -fcommon is more standard (and easier to grep for). +# Also tweak the slack-desc slightly. + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=vcp VERSION=${VERSION:-2.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -19,7 +27,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -47,13 +59,10 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -make CFLAGS="$SLKCFLAGS" +make CFLAGS="$SLKCFLAGS -fcommon" # "make install" is a mess, do it ourselves: mkdir -p $PKG/usr/bin $PKG/etc $PKG/usr/man/man1 $PKG/usr/man/pl/man1 @@ -71,4 +80,4 @@ 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} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/vcp/vcp.info b/system/vcp/vcp.info index 6df3d322f7..18ae4e21d4 100644 --- a/system/vcp/vcp.info +++ b/system/vcp/vcp.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +EMAIL="urchlay@slackware.uk" |