diff options
author | K.D.Hedger <kdhedger@yahoo.co.uk> | 2010-07-31 21:58:44 -0500 |
---|---|---|
committer | Erik Hanson <erik@slackbuilds.org> | 2010-07-31 21:58:44 -0500 |
commit | 93092431d820aca7fac643cd209ebda58e61c6f3 (patch) | |
tree | 1f4374d09776085ac704d8f80772b578192cad47 /development/meld | |
parent | 04a1ac450578f89b7a8f080e58bb1051b31395e7 (diff) |
development/meld: Added (a visual diff and merge tool)
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
Diffstat (limited to 'development/meld')
-rw-r--r-- | development/meld/README | 5 | ||||
-rw-r--r-- | development/meld/doinst.sh | 9 | ||||
-rw-r--r-- | development/meld/meld.SlackBuild | 54 | ||||
-rw-r--r-- | development/meld/meld.info | 10 | ||||
-rw-r--r-- | development/meld/slack-desc | 19 |
5 files changed, 97 insertions, 0 deletions
diff --git a/development/meld/README b/development/meld/README new file mode 100644 index 0000000000000..58fdf7d4d194d --- /dev/null +++ b/development/meld/README @@ -0,0 +1,5 @@ +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. Look at the screenshots page for more detailed features. diff --git a/development/meld/doinst.sh b/development/meld/doinst.sh new file mode 100644 index 0000000000000..3e5691a052b5b --- /dev/null +++ b/development/meld/doinst.sh @@ -0,0 +1,9 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/development/meld/meld.SlackBuild b/development/meld/meld.SlackBuild new file mode 100644 index 0000000000000..1144209560d54 --- /dev/null +++ b/development/meld/meld.SlackBuild @@ -0,0 +1,54 @@ +#!/bin/sh + +# Slackware build script for meld + +# Written by K.D.Hedger kdhedger@yahoo.co.uk + +PRGNAM=meld +VERSION=1.3.2 +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +LIBDIRSUFFIX="" + +if [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -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 {} \; + +make prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG install + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +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} diff --git a/development/meld/meld.info b/development/meld/meld.info new file mode 100644 index 0000000000000..51eeb01920e3a --- /dev/null +++ b/development/meld/meld.info @@ -0,0 +1,10 @@ +PRGNAM="meld" +VERSION="1.3.2" +HOMEPAGE="http://meld.sourceforge.net/" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/meld/1.3/meld-1.3.2.tar.bz2" +MD5SUM="7bd37cc8688a8cc2db68d26a2f186ff9" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="K.D.Hedger" +EMAIL="kdhedger@yahoo.co.uk" +APPROVED="Erik Hanson" diff --git a/development/meld/slack-desc b/development/meld/slack-desc new file mode 100644 index 0000000000000..f29955693a3a4 --- /dev/null +++ b/development/meld/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +meld: meld (a visual diff and merge tool) +meld: +meld: Meld is a visual diff and merge tool. You can compare two or three +meld: files and edit them in place (diffs update dynamically). You can +meld: compare two or three folders and launch file comparisons. You can +meld: browse and view a working copy from popular version control systems +meld: such as CVS, Subversion, Bazaar-ng and Mercurial. Look at the +meld: screenshots page for more detailed features. +meld: +meld: +meld: |