diff options
Diffstat (limited to 'development/meld')
-rw-r--r-- | development/meld/README | 9 | ||||
-rw-r--r-- | development/meld/meld.SlackBuild | 16 |
2 files changed, 18 insertions, 7 deletions
diff --git a/development/meld/README b/development/meld/README index 4d9d7587ca..8098259afb 100644 --- a/development/meld/README +++ b/development/meld/README @@ -1,8 +1,9 @@ Meld is a visual diff and merge tool. -You can compare two or three files and edit them in place -(diffs update dynamically). You can compare two or three folders and launch -file comparisons. You can browse and view a working copy from popular version -control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. +You can compare two or three files and edit them in place (diffs +update dynamically). You can compare two or three folders and launch +file comparisons. You can browse and view a working copy from popular +version control systems such such as CVS, Subversion, Bazaar-ng and +Mercurial. Optional dependency: pygtksourceview (for syntax highlighting) diff --git a/development/meld/meld.SlackBuild b/development/meld/meld.SlackBuild index 86bd1ef895..6ec155c6bd 100644 --- a/development/meld/meld.SlackBuild +++ b/development/meld/meld.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for meld @@ -24,10 +24,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=meld VERSION=${VERSION:-1.8.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -37,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +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} @@ -81,4 +91,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 |