ports/136398: [maintainer update][patch] Update devel/diffuse to 0.3.4, add NLS support

[Marco Bröder]

>Number:         136398
>Category:       ports
>Synopsis:       [maintainer update][patch] Update devel/diffuse to 0.3.4, add NLS support
>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:   Tue Jul 07 01:00:10 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Marco Bröder
>Release:        FreeBSD 7.2-STABLE amd64
>Organization:
>Environment:
>Description:
- Use newly introduced 'bsd.port.options.mk'.
- Change required Python version to new ports framework defaults (2.6.x).
- Update port to version 0.3.4.
- Add NLS option and required handling.
- Small cleanup / remove of unneeded blank lines.

Please note, translations are work in progress and incomplete. The only
available language in this release is german (in alpha quality). More
languages are expected in the future.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -r 63aed3c47e2e -r 67c88d9ea316 devel/diffuse/Makefile
--- a/devel/diffuse/Makefile	Wed May 06 00:37:03 2009 +0200
+++ b/devel/diffuse/Makefile	Tue Jul 07 02:35:27 2009 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	diffuse
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.4
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 
@@ -15,16 +15,17 @@
 
 NO_BUILD=	yes
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_GNOME=	pygtk2
 USE_BZIP2=	yes
 
 MAN1=		diffuse.1
 
 OPTIONS=	MENU	"Add desktop menu (needs desktop-file-utils)"	on \
-		OMF	"Install OMF manual (needs scrollkeeper)"	on
+		OMF	"Install OMF manual (needs scrollkeeper)"	on \
+		NLS	"Install some translations (work in progress)"	on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .ifndef (NOPORTDOCS)
 DOCS=		AUTHORS COPYING ChangeLog README
@@ -46,21 +47,29 @@
 PLIST_SUB+=	OMF="@comment "
 .endif
 
+.ifndef (WITHOUT_NLS)
+PLIST_SUB+=	NLS=""
+USE_GETTEXT=	yes
+TRANSLATIONS=	de
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|../usr|${PREFIX}|g' \
 		${WRKSRC}/src/etc/${PORTNAME}rc
+	${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' \
+		${WRKSRC}/src/etc/${PORTNAME}rc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \
 		${PREFIX}/bin/${PORTNAME}
-
 	${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/
 
 post-install:
 	${MKDIR} ${DATADIR}/syntax
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/${PORTNAME}/syntax/*.syntax \
 		${DATADIR}/syntax/
-
 	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
 		${MANPREFIX}/man/man1/
 
@@ -69,35 +78,37 @@
 	for n in ${DOCS}; do \
 		${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}; \
 	done
+.endif
 
+.ifndef (WITHOUT_NLS)
+	for x in ${TRANSLATIONS}; do \
+		${MKDIR} ${PREFIX}/share/locale/$${x}/LC_MESSAGES; \
+		${MKDIR} ${WRKSRC}/translations/$${x}; \
+		${PREFIX}/bin/msgfmt -c -v ${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/omf/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/omf/${PORTNAME}/*.omf \
 		${PREFIX}/share/omf/${PORTNAME}/
-
 	${PREFIX}/bin/scrollkeeper-update -q
-
 .endif
 
 .ifdef (WITH_MENU)
-
 	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
 		${PREFIX}/share/pixmaps/
-
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
 		${DESKTOPDIR}
-
 	${PREFIX}/bin/update-desktop-database
-
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -r 63aed3c47e2e -r 67c88d9ea316 devel/diffuse/distinfo
--- a/devel/diffuse/distinfo	Wed May 06 00:37:03 2009 +0200
+++ b/devel/diffuse/distinfo	Tue Jul 07 02:35:27 2009 +0200
@@ -1,3 +1,3 @@
-MD5 (diffuse-0.3.3.tar.bz2) = 4c483b557d270024704120adc2552c2c
-SHA256 (diffuse-0.3.3.tar.bz2) = 326dbff9494af021c32a3ab45dea5abac7113e5c733853ca8879203e0f73d214
-SIZE (diffuse-0.3.3.tar.bz2) = 96642
+MD5 (diffuse-0.3.4.tar.bz2) = 706842d366676d4f754792f71489ec2a
+SHA256 (diffuse-0.3.4.tar.bz2) = 3982c0aabe5f02ad6a65cbde9fa86683db71ae72a8ce4505e18c0f781da9755f
+SIZE (diffuse-0.3.4.tar.bz2) = 102845
diff -r 63aed3c47e2e -r 67c88d9ea316 devel/diffuse/pkg-plist
--- a/devel/diffuse/pkg-plist	Wed May 06 00:37:03 2009 +0200
+++ b/devel/diffuse/pkg-plist	Tue Jul 07 02:35:27 2009 +0200
@@ -6,6 +6,7 @@
 %%DATADIR%%/syntax/csharp.syntax
 %%DATADIR%%/syntax/css.syntax
 %%DATADIR%%/syntax/gettext.syntax
+%%DATADIR%%/syntax/glsl.syntax
 %%DATADIR%%/syntax/html.syntax
 %%DATADIR%%/syntax/ini.syntax
 %%DATADIR%%/syntax/java.syntax
@@ -45,3 +46,4 @@
 %%MENU%%@dirrmtry share/applications
 %%MENU%%share/pixmaps/diffuse.png
 %%MENU%%@dirrmtry share/pixmaps
+%%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo


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