From 17ffd620413594153354f93922e4ea46b3173e99 Mon Sep 17 00:00:00 2001 From: Andrey Maraev Date: Tue, 29 May 2012 19:09:12 -0400 Subject: development/diffuse: Added (tool for merging and comparing files) Signed-off-by: dsomero --- development/diffuse/README | 19 +++++++++ development/diffuse/diffuse.SlackBuild | 76 ++++++++++++++++++++++++++++++++++ development/diffuse/diffuse.info | 10 +++++ development/diffuse/doinst.sh | 19 +++++++++ development/diffuse/slack-desc | 19 +++++++++ 5 files changed, 143 insertions(+) create mode 100644 development/diffuse/README create mode 100644 development/diffuse/diffuse.SlackBuild create mode 100644 development/diffuse/diffuse.info create mode 100644 development/diffuse/doinst.sh create mode 100644 development/diffuse/slack-desc (limited to 'development') diff --git a/development/diffuse/README b/development/diffuse/README new file mode 100644 index 0000000000..1d3c9e8dba --- /dev/null +++ b/development/diffuse/README @@ -0,0 +1,19 @@ +Diffuse is a graphical tool for merging and comparing text files. Diffuse is +able to compare an arbitrary number of files side-by-side and gives users the +ability to manually adjust line matching and directly edit files. Diffuse can +also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, +Monotone, RCS, Subversion, and SVK repositories for comparison and merging. + +Some key features of Diffuse: +- ability to compare and merge an arbitrary number of files side-by-side +- line matching can be manually corrected by the user +- ability to directly edit files +- syntax highlighting +- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, + and SVK support +- Unicode support +- unlimited undo +- easy keyboard navigation + + + diff --git a/development/diffuse/diffuse.SlackBuild b/development/diffuse/diffuse.SlackBuild new file mode 100644 index 0000000000..01a9ceea91 --- /dev/null +++ b/development/diffuse/diffuse.SlackBuild @@ -0,0 +1,76 @@ +#!/bin/sh + +# Slackware build script for foobnix + +# Written by Andrey Maraev + + +PRGNAM=diffuse +VERSION=${VERSION:-0.4.6} +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} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +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 {} \; + +python install.py --files-only --prefix=/usr --mandir=/usr/man --destdir=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mv $PKG/etc/diffuserc $PKG/etc/diffuserc.new + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog ChangeLog_ru README README_ru \ + $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/diffuse/diffuse.info b/development/diffuse/diffuse.info new file mode 100644 index 0000000000..1453f3a928 --- /dev/null +++ b/development/diffuse/diffuse.info @@ -0,0 +1,10 @@ +PRGNAM="diffuse" +VERSION="0.4.6" +HOMEPAGE="http://sourceforge.net/projects/diffuse/" +DOWNLOAD="http://sourceforge.net/projects/diffuse/files/diffuse/0.4.6/diffuse-0.4.6.tar.bz2" +MD5SUM="f9139d05601987d89bfbf1e71ea30eeb" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Andrey Maraev" +EMAIL="andrew.maraev60@yandex.ru" +APPROVED="dsomero" diff --git a/development/diffuse/doinst.sh b/development/diffuse/doinst.sh new file mode 100644 index 0000000000..2406c534aa --- /dev/null +++ b/development/diffuse/doinst.sh @@ -0,0 +1,19 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/diffuserc.new + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + diff --git a/development/diffuse/slack-desc b/development/diffuse/slack-desc new file mode 100644 index 0000000000..25665ced46 --- /dev/null +++ b/development/diffuse/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +diffuse: diffuse (tool for merging and comparing text files) +diffuse: +diffuse: Diffuse is able to compare an arbitrary number of files +diffuse: of files side-by-side and gives users the ability to manually +diffuse: adjust line matching and directly edit files. +diffuse: Support Bazaar, CVS, Darcs, Git, Mercurial,Monotone, RCS, +diffuse: Subversion, and SVK repositories for comparison and merging. +diffuse: +diffuse: Homepage: http://diffuse.sourceforge.net +diffuse: +diffuse: -- cgit v1.2.3