ports/132027: New port: devel/diffuse A graphical N-way diff and merge tool written in python

Mon Feb 23 23:00:08 UTC 2009

>Number:         132027
>Category:       ports
>Synopsis:       New port: devel/diffuse A graphical N-way diff and merge tool written in python
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 23 23:00:07 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Marco Broeder
>Release:        FreeBSD 7.1-STABLE amd64
>Organization:
>Environment:
FreeBSD 7.1-STABLE amd64
>Description:
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, 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
  (n-way merges)
- line matching can be manually corrected by the user
- ability to directly edit files
- syntax highlighting
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support
- support for UTF-8 encoded unicode
- unlimited undo
- easy keyboard navigation

WWW:    http://diffuse.sourceforge.net/

>How-To-Repeat:

>Fix:

Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	diffuse
#	diffuse/Makefile
#	diffuse/pkg-descr
#	diffuse/pkg-plist
#	diffuse/distinfo
#	diffuse/files
#	diffuse/files/patch-diffuse
#
echo c - diffuse
mkdir -p diffuse > /dev/null 2>&1
echo x - diffuse/Makefile
sed 's/^X//' >diffuse/Makefile << '0ed874790d9f46953a44d8b8a823cb82'
X# Ports collection makefile for:	diffuse
X# Date created:		2009-02-22
X# Whom:			Marco Broeder <marco.broeder at gmx.eu>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	diffuse
XPORTVERSION=	0.2.15
X#PORTREVISION=	1
XCATEGORIES=	devel python
XMASTER_SITES=	SF
XMASTER_SITE_SUBDIR=	diffuse
XDISTNAME=	${PORTNAME}-${PORTVERSION}
XEXTRACT_ONLY=	${DISTFILES}
X
XMAINTAINER=	marco.broeder at gmx.eu
XCOMMENT=	A graphical N-way diff and merge tool written in python
X
XNO_BUILD=	yes
X#RUN_DEPENDS=
X
XUSE_PYTHON=	2.5+
XUSE_GNOME=	pygtk2
XUSE_BZIP2=	yes
XINSTALLS_OMF=	yes
XINSTALLS_ICONS=	yes
X
XMAN1=		diffuse.1
X
XOPTIONS=	MENU	"Desktop menu entry (needs desktop-file-utils)"	on \
X		OMF	"Install OMF manual (needs scrollkeeper)"	off
X
X.include <bsd.port.pre.mk>
X
X.ifndef (NOPORTDOCS)
X
XDOCS=		AUTHORS ChangeLog COPYING README TODO
X
X.endif
X
X.ifdef (WITH_MENU)
X
XPLIST_SUB+=	MENU=""
XRUN_DEPENDS+=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
X
X.else
X
XPLIST_SUB+=	MENU="@comment "
X
X.endif
X
X.ifdef (WITH_OMF)
X
XPLIST_SUB+=	OMF=""
XRUN_DEPENDS+=	scrollkeeper-update:${PORTSDIR}/textproc/scrollkeeper
X
X.else
X
XPLIST_SUB+=	OMF="@comment "
X
X.endif
X
Xpost-patch:
X
X	${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
X		${WRKSRC}/src/etc/${PORTNAME}rc
X
Xdo-install:
X
X	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \
X		${PREFIX}/bin/${PORTNAME}
X
X	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/
X
Xpost-install:
X
X	${MKDIR} ${DATADIR}/syntax
X	${INSTALL_DATA} ${WRKSRC}/src/usr/share/${PORTNAME}/syntax/*.syntax \
X		${DATADIR}/syntax/
X
X	${MKDIR} ${PREFIX}/share/pixmaps
X	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
X		${PREFIX}/share/pixmaps/
X
X	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
X		${MANPREFIX}/man/man1/
X
X.ifndef (NOPORTDOCS)
X
X	${MKDIR} ${DOCSDIR}
X	for n in ${DOCS}; do \
X		${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}; \
X	done
X
X.endif
X
X.ifdef (WITH_OMF)
X
X	${MKDIR} ${PREFIX}/share/gnome/help/${PORTNAME}/C
X	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/C/*.xml \
X		${PREFIX}/share/gnome/help/${PORTNAME}/C/
X
X	${MKDIR} ${PREFIX}/share/omf/${PORTNAME}
X	${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
X		${PREFIX}/share/omf/${PORTNAME}/
X
X	${PREFIX}/bin/scrollkeeper-update -q
X
X.endif
X
X.ifdef (WITH_MENU)
X
X	${MKDIR} ${PREFIX}/share/applications
X	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
X		${DESKTOPDIR}
X
X	${PREFIX}/bin/update-desktop-database
X
X.endif
X
X.include <bsd.port.post.mk>
0ed874790d9f46953a44d8b8a823cb82
echo x - diffuse/pkg-descr
sed 's/^X//' >diffuse/pkg-descr << '68e7fb635a9d0b78d96a842154dd1270'
XDiffuse is a graphical tool for merging and comparing text files. Diffuse is
Xable to compare an arbitrary number of files side-by-side and gives users the
Xability to manually adjust line matching and directly edit files. Diffuse can
Xalso retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,
XMonotone, Subversion, and SVK repositories for comparison and merging.
X
XSome key features of Diffuse:
X
X- ability to compare and merge an arbitrary number of files side-by-side
X  (n-way merges)
X- line matching can be manually corrected by the user
X- ability to directly edit files
X- syntax highlighting
X- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support
X- support for UTF-8 encoded unicode
X- unlimited undo
X- easy keyboard navigation
X
XWWW:    http://diffuse.sourceforge.net/
68e7fb635a9d0b78d96a842154dd1270
echo x - diffuse/pkg-plist
sed 's/^X//' >diffuse/pkg-plist << '9ac325205d29e5db25d6d8b2187835a7'
Xbin/diffuse
Xetc/diffuserc
X%%DATADIR%%/syntax/bash.syntax
X%%DATADIR%%/syntax/c++.syntax
X%%DATADIR%%/syntax/csh.syntax
X%%DATADIR%%/syntax/csharp.syntax
X%%DATADIR%%/syntax/css.syntax
X%%DATADIR%%/syntax/gettext.syntax
X%%DATADIR%%/syntax/html.syntax
X%%DATADIR%%/syntax/ini.syntax
X%%DATADIR%%/syntax/java.syntax
X%%DATADIR%%/syntax/javascript.syntax
X%%DATADIR%%/syntax/jsp.syntax
X%%DATADIR%%/syntax/makefile.syntax
X%%DATADIR%%/syntax/octave.syntax
X%%DATADIR%%/syntax/pascal.syntax
X%%DATADIR%%/syntax/patch.syntax
X%%DATADIR%%/syntax/perl.syntax
X%%DATADIR%%/syntax/php.syntax
X%%DATADIR%%/syntax/python.syntax
X%%DATADIR%%/syntax/ruby.syntax
X%%DATADIR%%/syntax/sql.syntax
X%%DATADIR%%/syntax/tcl.syntax
X%%DATADIR%%/syntax/vb.syntax
X%%DATADIR%%/syntax/verilog.syntax
X%%DATADIR%%/syntax/vhdl.syntax
X%%DATADIR%%/syntax/xml.syntax
X at dirrm %%DATADIR%%/syntax
X at dirrm %%DATADIR%%
X%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
X%%PORTDOCS%%%%DOCSDIR%%/COPYING
X%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
X%%PORTDOCS%%%%DOCSDIR%%/README
X%%PORTDOCS%%%%DOCSDIR%%/TODO
X%%PORTDOCS%%@dirrm %%DOCSDIR%%
X%%OMF%%share/gnome/help/diffuse/C/diffuse.xml
X%%OMF%%@dirrm share/gnome/help/diffuse/C
X%%OMF%%@dirrm share/gnome/help/diffuse
X%%OMF%%@dirrmtry share/gnome/help
X%%OMF%%@dirrmtry share/gnome
X%%OMF%%share/omf/diffuse/diffuse-C.omf
X%%OMF%%@dirrm share/omf/diffuse
X%%OMF%%@dirrmtry share/omf
X%%MENU%%share/applications/diffuse.desktop
X%%MENU%%@dirrmtry share/applications
Xshare/pixmaps/diffuse.png
X at dirrmtry share/pixmaps
9ac325205d29e5db25d6d8b2187835a7
echo x - diffuse/distinfo
sed 's/^X//' >diffuse/distinfo << '60ce0bc98bc7f232d74658693d4c64cd'
XMD5 (diffuse-0.2.15.tar.bz2) = 0fd7aa7d3ed7271770d36bfac8b1ba42
XSHA256 (diffuse-0.2.15.tar.bz2) = 7bcdfd3dc4e39c12f6c485ca0113e6fd0330e172492bdaea999bb435de912289
XSIZE (diffuse-0.2.15.tar.bz2) = 67417
60ce0bc98bc7f232d74658693d4c64cd
echo c - diffuse/files
mkdir -p diffuse/files > /dev/null 2>&1
echo x - diffuse/files/patch-diffuse
sed 's/^X//' >diffuse/files/patch-diffuse << '5478e00cc90ce184ffebaf6754fc1d43'
X--- src/usr/bin/diffuse.orig        2009-02-23 23:26:01.000000000 +0100
X+++ src/usr/bin/diffuse     2009-02-23 23:27:14.000000000 +0100
X@@ -30,7 +30,7 @@
X APP_NAME = 'Diffuse'
X VERSION = '0.2.15'
X COPYRIGHT = _('Copyright Â© 2006-2008 Derrick Moser')
X-RESOURCES = '/etc/diffuserc'
X+RESOURCES = '/usr/local/etc/diffuserc'
X WEBSITE = 'http://diffuse.sourceforge.net/'
X
X # process help options
5478e00cc90ce184ffebaf6754fc1d43
exit

===> Done

>Release-Note:
>Audit-Trail:
>Unformatted: