svn commit: r362285 - head/devel/diffuse

[Danilo Egea Gondolfo]

Author: danilo
Date: Sat Jul 19 23:10:28 2014
New Revision: 362285
URL: http://svnweb.freebsd.org/changeset/ports/362285
QAT: https://qat.redports.org/buildarchive/r362285/

Log:
  - Update from 0.4.7 to 0.4.8
  - Convert USE_BZIP2 to USES
  - Change CONFLICTS to CONFLICTS_INSTALL
  
  PR:		ports/191965
  Submitted by:	Marco Broder <marco.broeder at posteo.eu>

Modified:
  head/devel/diffuse/Makefile
  head/devel/diffuse/distinfo
  head/devel/diffuse/pkg-plist

Modified: head/devel/diffuse/Makefile
==============================================================================
--- head/devel/diffuse/Makefile	Sat Jul 19 22:00:16 2014	(r362284)
+++ head/devel/diffuse/Makefile	Sat Jul 19 23:10:28 2014	(r362285)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	diffuse
-PORTVERSION=	0.4.7
+PORTVERSION=	0.4.8
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 
@@ -14,11 +14,11 @@ LICENSE_COMB=	dual
 
 NO_BUILD=	yes
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_PYTHON=	2
 USE_GNOME=	pygtk2
 
-CONFLICTS=	tinker-[0-9]*
+CONFLICTS_INSTALL=	tinker-[0-9]*
 
 PORTDATA=	syntax
 PORTDOCS=	AUTHORS ChangeLog ChangeLog_ru README README_ru
@@ -31,7 +31,9 @@ OPTIONS_SUB=	yes
 MENU_USES=	desktop-file-utils
 NLS_USES=	gettext
 
-TRANSLATIONS=	cs de es it ja ko pl ru zh_CN
+INSTALLS_ICONS=	yes
+
+TRANSLATIONS=	cs de es it ja ko pl ru zh_CN zh_TW
 MANUALS=	cs it ru
 
 .include <bsd.port.options.mk>
@@ -65,8 +67,8 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
 		${STAGEDIR}${DESKTOPDIR}/
-	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
+	(cd ${WRKSRC}/src/usr/share/icons && \
+		${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share/icons/)
 
 .if ${PORT_OPTIONS:MNLS}
 .for x in ${TRANSLATIONS}

Modified: head/devel/diffuse/distinfo
==============================================================================
--- head/devel/diffuse/distinfo	Sat Jul 19 22:00:16 2014	(r362284)
+++ head/devel/diffuse/distinfo	Sat Jul 19 23:10:28 2014	(r362285)
@@ -1,2 +1,2 @@
-SHA256 (diffuse-0.4.7.tar.bz2) = b0f56acbd246f4b9a692ef51aab167134ae6650423a68d8e5f4ff4c8938f39ac
-SIZE (diffuse-0.4.7.tar.bz2) = 189257
+SHA256 (diffuse-0.4.8.tar.bz2) = c1d3b79bba9352fcb9aa4003537d3fece248fb824781c5e21f3fcccafd42df2b
+SIZE (diffuse-0.4.8.tar.bz2) = 557966

Modified: head/devel/diffuse/pkg-plist
==============================================================================
--- head/devel/diffuse/pkg-plist	Sat Jul 19 22:00:16 2014	(r362284)
+++ head/devel/diffuse/pkg-plist	Sat Jul 19 23:10:28 2014	(r362285)
@@ -2,7 +2,12 @@ bin/diffuse
 etc/diffuserc
 man/man1/diffuse.1.gz
 %%MENU%%share/applications/diffuse.desktop
-%%MENU%%share/pixmaps/diffuse.png
+%%MENU%%share/icons/hicolor/16x16/apps/diffuse.png
+%%MENU%%share/icons/hicolor/22x22/apps/diffuse.png
+%%MENU%%share/icons/hicolor/24x24/apps/diffuse.png
+%%MENU%%share/icons/hicolor/256x256/apps/diffuse.png
+%%MENU%%share/icons/hicolor/32x32/apps/diffuse.png
+%%MENU%%share/icons/hicolor/48x48/apps/diffuse.png
 %%NLS%%man/cs/man1/diffuse.1.gz
 %%NLS%%man/it/man1/diffuse.1.gz
 %%NLS%%man/ru/man1/diffuse.1.gz
@@ -15,6 +20,7 @@ man/man1/diffuse.1.gz
 %%NLS%%share/locale/pl/LC_MESSAGES/diffuse.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/diffuse.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/diffuse.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/diffuse.mo
 %%NLS%%@dirrmtry man/cs/man1
 %%NLS%%@dirrmtry man/cs
 %%NLS%%@dirrmtry man/it/man1