diff options
| -rw-r--r-- | accessibility/wgetpaste/dpaste_default.diff | 12 | ||||
| -rw-r--r-- | accessibility/wgetpaste/no_gentooisms.diff | 25 | ||||
| -rw-r--r-- | accessibility/wgetpaste/wgetpaste.1 | 5 | ||||
| -rw-r--r-- | accessibility/wgetpaste/wgetpaste.SlackBuild | 18 | ||||
| -rw-r--r-- | accessibility/wgetpaste/wgetpaste.info | 6 | ||||
| -rw-r--r-- | accessibility/wgetpaste/zlin.conf | 16 |
6 files changed, 69 insertions, 13 deletions
diff --git a/accessibility/wgetpaste/dpaste_default.diff b/accessibility/wgetpaste/dpaste_default.diff new file mode 100644 index 000000000000..156c531b2e04 --- /dev/null +++ b/accessibility/wgetpaste/dpaste_default.diff @@ -0,0 +1,12 @@ +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 18:41:01.000000000 -0500 +@@ -634,7 +634,7 @@ + load_configs + [[ $SERVICESET ]] && verifyservice "$SERVICESET" && SERVICE=$(escape "$SERVICESET") + DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed" +-DEFAULT_SERVICE=${DEFAULT_SERVICE:-gists} ++DEFAULT_SERVICE=${DEFAULT_SERVICE:-dpaste} + DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text} + DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month} + SERVICE=${SERVICE:-${DEFAULT_SERVICE}} diff --git a/accessibility/wgetpaste/no_gentooisms.diff b/accessibility/wgetpaste/no_gentooisms.diff index a0720cc8061a..0751ff54d0c9 100644 --- a/accessibility/wgetpaste/no_gentooisms.diff +++ b/accessibility/wgetpaste/no_gentooisms.diff @@ -1,7 +1,7 @@ -diff -Naur wgetpaste-2.13.orig/wgetpaste wgetpaste-2.13/wgetpaste ---- wgetpaste-2.13.orig/wgetpaste 2009-05-27 09:46:48.000000000 -0400 -+++ wgetpaste-2.13/wgetpaste 2009-06-12 07:12:45.000000000 -0400 -@@ -99,7 +99,7 @@ +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 @@ -10,8 +10,21 @@ diff -Naur wgetpaste-2.13.orig/wgetpaste wgetpaste-2.13/wgetpaste per user in ~/.wgetpaste.conf to use another program (such as e.g. xcut or klipper) to $2 your clipboard. -@@ -603,8 +603,8 @@ - [[ -z $SOURCE ]] && SOURCE="stdin" && FILES[${#FILES[*]}]="/dev/stdin" +@@ -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"} diff --git a/accessibility/wgetpaste/wgetpaste.1 b/accessibility/wgetpaste/wgetpaste.1 index a7f29c200a03..10b073adbc13 100644 --- a/accessibility/wgetpaste/wgetpaste.1 +++ b/accessibility/wgetpaste/wgetpaste.1 @@ -1,4 +1,4 @@ -.TH WGETPASTE, "1" "June 2009" "wgetpaste, version 2.13" "User Commands" +.TH WGETPASTE "1" "Dec 2012" "wgetpaste v2.20" "SlackBuilds.org" .SH NAME wgetpaste \- Command\-line interface to various pastebin sites .SH SYNOPSIS @@ -81,3 +81,6 @@ globally in /etc/wgetpaste.conf or /etc/wgetpaste.d/*.conf or per user in any of Copyright (c) 2007 Bo Ørsted Andresen <bo.andresen@zlin.dk> .br Distributed as-is. With no warranties. +.PP +Man page created by B. Watson <yalhcru@gmail.com>, for the SlackBuilds.org project (but +it may be used by anyone). diff --git a/accessibility/wgetpaste/wgetpaste.SlackBuild b/accessibility/wgetpaste/wgetpaste.SlackBuild index b37531a9f981..ce6498125d9f 100644 --- a/accessibility/wgetpaste/wgetpaste.SlackBuild +++ b/accessibility/wgetpaste/wgetpaste.SlackBuild @@ -4,8 +4,10 @@ # Written by B. Watson (yalhcru@gmail.com) +# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details. + PRGNAM=wgetpaste -VERSION=${VERSION:-2.18} +VERSION=${VERSION:-2.20} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -21,13 +23,20 @@ OUTPUT=${OUTPUT:-/tmp} set -e rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -mkdir -p $TMP $PKG/{usr/bin,etc,usr/man/man1,$ZSHDIR} $OUTPUT +mkdir -p $TMP $OUTPUT $PKG/usr/bin $PKG/etc/$PRGNAM.d $PKG/usr/man/man1 $PKG/$ZSHDIR cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION +# The default pastebin is gists, which isn't actually working today. Never +# used it myself so I dunno if it's a temporary thing or a bug in wgetpaste +# or what. Older wgetpaste defaults to dpaste, which still works fine, so +# let's make that the default. +patch -p1 < $CWD/dpaste_default.diff + +# x11-misc/xclip => xclip +# 'emerge --info' => wgetpaste_info patch -p1 < $CWD/no_gentooisms.diff install -groot -oroot -m0755 $PRGNAM $PKG/usr/bin @@ -35,6 +44,9 @@ install -groot -oroot -m0644 _$PRGNAM $PKG/$ZSHDIR install -groot -oroot -m0644 $CWD/$PRGNAM.example $PKG/etc/$PRGNAM.conf.sample install -groot -oroot -m0755 $CWD/${PRGNAM}_info $PKG/usr/bin +# Add zlin.dk service, operated by the wgetpaste author +install -groot -oroot -m0644 $CWD/zlin.conf $PKG/etc/$PRGNAM.d/ + # Man page made by help2man and edited slightly gzip -9c $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz diff --git a/accessibility/wgetpaste/wgetpaste.info b/accessibility/wgetpaste/wgetpaste.info index a287aed053f1..b5bb8a7ff3ab 100644 --- a/accessibility/wgetpaste/wgetpaste.info +++ b/accessibility/wgetpaste/wgetpaste.info @@ -1,8 +1,8 @@ PRGNAM="wgetpaste" -VERSION="2.18" +VERSION="2.20" HOMEPAGE="http://wgetpaste.zlin.dk/" -DOWNLOAD="http://wgetpaste.zlin.dk/wgetpaste-2.18.tar.bz2" -MD5SUM="0085d679445af9e6f695d036abee106d" +DOWNLOAD="http://wgetpaste.zlin.dk/wgetpaste-2.20.tar.bz2" +MD5SUM="4c7259e626d834af1e51719bc9df0898" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/accessibility/wgetpaste/zlin.conf b/accessibility/wgetpaste/zlin.conf new file mode 100644 index 000000000000..16e2aa887bcc --- /dev/null +++ b/accessibility/wgetpaste/zlin.conf @@ -0,0 +1,16 @@ +#!/bin/bash + +# put this file in /etc/wgetpaste.d/ or ~/.wgetpaste.d/ to add http://zlin.dk/p/ to list of available services + +# add zlin service +SERVICES="${SERVICES} zlin" +ENGINE_zlin=knopaste +URL_zlin="http://zlin.dk/p/ ?" +EXPIRATION_INFO_zlin="Pastes on zlin: ${URL_zlin% *} do not expire."$'\n' +DEFAULT_LANGUAGE_zlin="text" + +# add knopaste engine +LANGUAGES_knopaste="actionscript ada apache applescript asm asp autoit bash blitzbasic bnf c c_mac caddcl cadlisp cfdg cfm cpp cpp-qt csharp css d delphi diff div dos eiffel fortran freebasic gml groovy html4strict idl ini inno io java java5 javascript latex lisp lua matlab mirc mpasm mysql nsis objc ocaml ocaml-brief oobas oracle8 pascal perl php php-brief plsql python qbasic reg robots ruby sas scheme sdlbasic smalltalk smarty sql tcl text thinbasic tsql vb vbnet vhdl visualfoxpro winbatch xml" +POST_knopaste="submit=Submit % % lang % % paste" +REGEX_knopaste='s|$|\.txt|' +REGEX_RAW_knopaste='s|^http://.*$|&.txt|' |