summaryrefslogtreecommitdiffstats
path: root/accessibility
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2016-07-21 19:59:02 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2016-08-13 07:22:55 +0700
commit27160cc5e86bf35ab3dc21e87bbe016d2968c8a7 (patch)
tree75013c699b76a18c9f8f04022858b8039590e4a7 /accessibility
parent8bbffc0297d5a750a68e86d91f3f03f3858fa925 (diff)
downloadslackbuilds-27160cc5e86bf35ab3dc21e87bbe016d2968c8a7.tar.gz
slackbuilds-27160cc5e86bf35ab3dc21e87bbe016d2968c8a7.tar.xz
accessibility/wgetpaste: Updated for version 2.28.
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/wgetpaste/no_gentooisms.diff36
-rw-r--r--accessibility/wgetpaste/wgetpaste.SlackBuild21
-rw-r--r--accessibility/wgetpaste/wgetpaste.info6
3 files changed, 19 insertions, 44 deletions
diff --git a/accessibility/wgetpaste/no_gentooisms.diff b/accessibility/wgetpaste/no_gentooisms.diff
deleted file mode 100644
index 0751ff54d0..0000000000
--- a/accessibility/wgetpaste/no_gentooisms.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur wgetpaste-2.20/wgetpaste wgetpaste-2.20.patched/wgetpaste
---- wgetpaste-2.20/wgetpaste 2012-05-05 15:15:32.000000000 -0400
-+++ wgetpaste-2.20.patched/wgetpaste 2012-12-20 17:14:06.000000000 -0500
-@@ -134,7 +134,7 @@
- noxclip() {
- cat <<EOF >&2
- Could not find xclip on your system. In order to use --x$1 you must either
--emerge x11-misc/xclip or define x_$1() globally in /etc/wgetpaste.conf or
-+install xclip or define x_$1() globally in /etc/wgetpaste.conf or
- per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or
- klipper) to $2 your clipboard.
-
-@@ -312,9 +312,9 @@
- -c, --command COMMAND paste COMMAND and the output of COMMAND
- -i, --info append the output of \`$INFO_COMMAND\`
- -I, --info-only paste the output of \`$INFO_COMMAND\` only
-- -x, --xcut read input from clipboard (requires x11-misc/xclip)
-- -X, --xpaste write resulting url to the X primary selection buffer (requires x11-misc/xclip)
-- -C, --xclippaste write resulting url to the X clipboard selection buffer (requires x11-misc/xclip)
-+ -x, --xcut read input from clipboard (requires xclip)
-+ -X, --xpaste write resulting url to the X primary selection buffer (requires xclip)
-+ -C, --xclippaste write resulting url to the X clipboard selection buffer (requires xclip)
-
- -r, --raw show url for the raw paste (no syntax highlighting or html)
- -t, --tee use tee to show what is being pasted
-@@ -647,8 +647,8 @@
- [[ -z $SOURCE ]] && SOURCE="stdin"
- CVT_TABS=No
-
--INFO_COMMAND=${INFO_COMMAND:-"emerge --info"}
--INFO_ARGS=${INFO_ARGS:-"--ignore-default-opts"}
-+INFO_COMMAND=${INFO_COMMAND:-"wgetpaste_info"}
-+INFO_ARGS=${INFO_ARGS:-""}
-
- ### everything below this should be independent of which service is being used...
-
diff --git a/accessibility/wgetpaste/wgetpaste.SlackBuild b/accessibility/wgetpaste/wgetpaste.SlackBuild
index 0577cd1c46..9d7f85c2a4 100644
--- a/accessibility/wgetpaste/wgetpaste.SlackBuild
+++ b/accessibility/wgetpaste/wgetpaste.SlackBuild
@@ -25,9 +25,14 @@
# - Replaced no_gentooisms.diff with some sed stuff.
# - Bumped BUILD to 2.
+# 20160721 bkw:
+# - Updated to 2.28.
+# - Leave default service as-is (it's now poundpython).
+# - Really remove no_gentooisms.diff.
+
PRGNAM=wgetpaste
-VERSION=${VERSION:-2.25}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.28}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
ARCH=noarch
@@ -55,16 +60,22 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Un-gentoo-ize the help and error messages, use wgetpaste_info for the
-# -i and -I options. Set default paste service to something that works,
-# since bpaste has stopped working.
+# -i and -I options.
+
sed -i \
- -e '/^DEFAULT_SERVICE/s,bpaste,dpaste,' \
-e 's,emerge --info,wgetpaste_info,g' \
-e 's,emerge x11-misc/,install ,g' \
-e 's,x11-misc/,,g' \
-e '/^INFO_ARGS/s,"[^"]*","",' \
$PRGNAM
+# used to do this:
+## -e '/^DEFAULT_SERVICE/s,bpaste,dpaste,' \
+## Set default paste service to something that works,
+## since bpaste has stopped working.
+# no longer needed as the default is now poundpython, per upstream.
+
+# No 'make install', do it manually:
install -groot -oroot -m0755 $PRGNAM $PKG/usr/bin
install -groot -oroot -m0644 _$PRGNAM $PKG/$ZSHDIR
install -groot -oroot -m0644 $CWD/$PRGNAM.example $PKG/etc/$PRGNAM.conf.sample
diff --git a/accessibility/wgetpaste/wgetpaste.info b/accessibility/wgetpaste/wgetpaste.info
index 13b54ad2cf..e6bd3bcdf6 100644
--- a/accessibility/wgetpaste/wgetpaste.info
+++ b/accessibility/wgetpaste/wgetpaste.info
@@ -1,8 +1,8 @@
PRGNAM="wgetpaste"
-VERSION="2.25"
+VERSION="2.28"
HOMEPAGE="http://wgetpaste.zlin.dk/"
-DOWNLOAD="http://wgetpaste.zlin.dk/wgetpaste-2.25.tar.bz2"
-MD5SUM="073766b6185e2bd2b3ba0a2d44d32cf4"
+DOWNLOAD="http://wgetpaste.zlin.dk/wgetpaste-2.28.tar.bz2"
+MD5SUM="97feb02d95c1e6d5aebee68aacb5ede6"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""