ports/158872: [maintainer-update] [patch] devel/diffuse: Update to 0.4.5

Wed Jul 13 16:50:10 UTC 2011

>Number:         158872
>Category:       ports
>Synopsis:       [maintainer-update] [patch] devel/diffuse: Update to 0.4.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 13 16:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Marco Bröder
>Release:        stable/8 amd64
>Organization:
>Environment:
>Description:
1. Update to 0.4.5 release. Read ${PREFIX}/share/diffuse/ChangeLog or
http://diffuse.sourceforge.net/releasehistory.html for changes.

2. Update pkg description.

3. Move translated man pages installation to optional translations installation, but always install standard English man page.

4. Use INSTALL_DATA instead of INSTALL_MAN for PORTDOCS.

5. Add license combo stuff. Looks like there will be no significant improvement for the 'GPLvX or later' case anytime soon. So just add the license combo workaround for now.

6. Remove the whole OMF / gnome help stuff. The OMF / gnome help stuff never worked as intended, because gnome-help-browser was missing. It would require too many additional gnome related dependencies. It appears too heavy just to display a simple help manual. Since Diffuse has usual man pages, a command line help option and a built in fallback to an online HTML manual, just rely on those instead.

7. Small style fixes and cleanups.

Successful tested: portlint -C, tinderbox build, pkg install + remove, runtime

Thanks!

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index ac74a93..59a9474 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -6,25 +6,26 @@
 #
 
 PORTNAME=	diffuse
-PORTVERSION=	0.4.4
+PORTVERSION=	0.4.5
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 
 MAINTAINER=	marco.broeder at gmx.eu
 COMMENT=	A graphical N-way diff and merge tool written in python
 
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
 NO_BUILD=	yes
 
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2
 USE_BZIP2=	yes
 
-MANLANG=	"" ru
 MAN1=		diffuse.1
 
-OPTIONS=	MENU	"Add desktop menu (needs desktop-file-utils)"	on \
-		OMF	"Install OMF manual (needs scrollkeeper)"	on \
-		NLS	"Install some translations (work in progress)"	on
+OPTIONS=	MENU	"Install a desktop menu entry"	on \
+		NLS	"Install translations (work in progress)"	on
 
 .include <bsd.port.options.mk>
 
@@ -43,18 +44,11 @@ USE_GNOME+=	desktopfileutils
 PLIST_SUB+=	MENU="@comment "
 .endif
 
-.ifdef (WITH_OMF)
-PLIST_SUB+=	OMF=""
-RUN_DEPENDS+=	scrollkeeper-update:${PORTSDIR}/textproc/scrollkeeper
-INSTALLS_OMF=	yes
-.else
-PLIST_SUB+=	OMF="@comment "
-.endif
-
 .ifndef (WITHOUT_NLS)
 PLIST_SUB+=	NLS=""
 USE_GETTEXT=	yes
-TRANSLATIONS=	de es ja ko ru zh_CN
+TRANSLATIONS=	de es it ja ko ru zh_CN
+MANLANG=	"" it ru
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
@@ -71,9 +65,6 @@ post-patch:
 
 	${REINPLACE_CMD} -e 's|../../etc|${PREFIX}/etc|g' \
 		${WRKSRC}/src/usr/bin/${PORTNAME}
-	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
-		${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
-		${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/*/*.xml
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \
@@ -81,55 +72,39 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/
 	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
 		${MANPREFIX}/man/man1/
-	${MKDIR} ${MANPREFIX}/man/ru/man1
-	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/ru/man1/*.1 \
-		${MANPREFIX}/man/ru/man1/
 
 post-install:
 .ifndef (NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	for n in ${PORTDOCS}; do \
-		${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}/; \
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .ifndef (NOPORTDATA)
 	${MKDIR} ${DATADIR}/syntax
-	(cd ${WRKSRC}/src/usr/share/${PORTNAME}/ && \
-		${COPYTREE_SHARE} \* ${DATADIR}/)
+	(cd ${WRKSRC}/src/usr/share/${PORTNAME} && \
+		${COPYTREE_SHARE} \* ${DATADIR})
 .endif
 
 .ifndef (WITHOUT_NLS)
 	for x in ${TRANSLATIONS}; do \
-		${MKDIR} ${PREFIX}/share/locale/$${x}/LC_MESSAGES; \
 		${MKDIR} ${WRKSRC}/translations/$${x}; \
 		${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/$${x}.po \
 			-o ${WRKSRC}/translations/$${x}/${PORTNAME}.mo; \
 		${INSTALL_DATA} ${WRKSRC}/translations/$${x}/*.mo \
 			${PREFIX}/share/locale/$${x}/LC_MESSAGES/; \
 	done
-.endif
-
-.ifdef (WITH_OMF)
-	${MKDIR} ${PREFIX}/share/gnome/help/${PORTNAME}/C
-	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/C/*.xml \
-		${PREFIX}/share/gnome/help/${PORTNAME}/C/
-	${MKDIR} ${PREFIX}/share/gnome/help/${PORTNAME}/ru
-	${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/ru/*.xml \
-		${PREFIX}/share/gnome/help/${PORTNAME}/ru/
-	${MKDIR} ${PREFIX}/share/omf/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
-		${PREFIX}/share/omf/${PORTNAME}/
-	${LOCALBASE}/bin/scrollkeeper-update -q
+	for y in ${MANLANG}; do \
+		${MKDIR} ${MANPREFIX}/man/$${y}/man1; \
+		${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/$${y}/man1/*.1 \
+			${MANPREFIX}/man/$${y}/man1/; \
+	done
 .endif
 
 .ifdef (WITH_MENU)
-	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
 		${PREFIX}/share/pixmaps/
-	${MKDIR} ${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
-		${DESKTOPDIR}/
+		${DESKTOPDIR}
 	${LOCALBASE}/bin/update-desktop-database -q
 .endif
 
diff --git a/devel/diffuse/distinfo b/devel/diffuse/distinfo
index 1391264..aa541e1 100644
--- a/devel/diffuse/distinfo
+++ b/devel/diffuse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (diffuse-0.4.4.tar.bz2) = 9dae1aad1aff538fbd571c6ce40e07bbe81530c5d4ebe959b25995be68c462f5
-SIZE (diffuse-0.4.4.tar.bz2) = 146351
+SHA256 (diffuse-0.4.5.tar.bz2) = 0290a055027aea8b14203d1ea05f2dcdb1b9e701f485a604057044a467b95791
+SIZE (diffuse-0.4.5.tar.bz2) = 167958
diff --git a/devel/diffuse/pkg-descr b/devel/diffuse/pkg-descr
index 725f69a..b64dd26 100644
--- a/devel/diffuse/pkg-descr
+++ b/devel/diffuse/pkg-descr
@@ -2,7 +2,7 @@ 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.
+Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
 
 Some key features of Diffuse:
 
@@ -11,7 +11,7 @@ Some key features of Diffuse:
 - 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
+- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, SVK support
 - support for UTF-8 encoded unicode
 - unlimited undo
 - easy keyboard navigation
diff --git a/devel/diffuse/pkg-plist b/devel/diffuse/pkg-plist
index cd24790..8a11a8a 100644
--- a/devel/diffuse/pkg-plist
+++ b/devel/diffuse/pkg-plist
@@ -4,15 +4,8 @@ etc/diffuserc
 %%MENU%%share/pixmaps/diffuse.png
 %%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo
 %%NLS%%share/locale/es/LC_MESSAGES/diffuse.mo
+%%NLS%%share/locale/it/LC_MESSAGES/diffuse.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/diffuse.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/diffuse.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/diffuse.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/diffuse.mo
-%%OMF%%share/gnome/help/diffuse/C/diffuse.xml
-%%OMF%%share/gnome/help/diffuse/ru/diffuse.xml
-%%OMF%%@dirrm share/gnome/help/diffuse/ru
-%%OMF%%@dirrm share/gnome/help/diffuse/C
-%%OMF%%@dirrm share/gnome/help/diffuse
-%%OMF%%share/omf/diffuse/diffuse-C.omf
-%%OMF%%share/omf/diffuse/diffuse-ru.omf
-%%OMF%%@dirrm share/omf/diffuse


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

