ports/139608: [maintainer-update][patch] devel/diffuse: Several fixes, and update to 0.4.1

Thu Oct 15 16:20:02 UTC 2009

The following reply was made to PR ports/139608; it has been noted by GNATS.

From: Marco Broeder <marco.broeder at gmx.eu>
To: bug-followup at freebsd.org
Cc: marco.broeder at gmx.eu
Subject: Re: ports/139608: [maintainer-update][patch] devel/diffuse: Several fixes, and update to 0.4.1
Date: Thu, 15 Oct 2009 18:18:45 +0200

 --Boundary-00=_mt01KDkFT+8SBaG
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit

 Attached is new updated patch. Please use that instead of previous one. Many 
 thanks!

 New full changelog:

 - Simplify a run dependency line by using a shortcut from 'USE_GNOME' macro
 - Remove 'INSTALLS_ICONS' (no icons in '${PREFIX}/share/icons')
 - Replace '${PREFIX}/share/applications' with '${DESKTOPDIR}'
 - Reduce verbosity of 'msgfmt' and 'update-desktop-database'
 - Unify syntax of destination / installation paths
 - Update port to 0.4.1
 - Add 'ja' and 'zh_CN' translations
 - Sort 'pkg-plist' and remove entries covered by other mtree / bsd.*.mk files
 - Use '${COPYTREE_SHARE}' macro to install all the syntax files
 - Use 'PORTDATA' macro to greatly reduce 'pkg-plist' file
 - Use 'PORTDOCS' macro to further reduce 'pkg-plist' file
   (thanks to Sylvio Cesar <scjamorim at bsd.com.br>)
 - Combine two '${REINPLACE_CMD}' patch lines into one
   (thanks to Sylvio Cesar <scjamorim at bsd.com.br>)

 -- 
 Regards,
 Marco Broeder <marco.broeder at gmx.eu>
 OpenPGP key fingerprint: 5615 106E 031A F3D3 64CC 0F9E 4DCE 6524 F595 082F

 --Boundary-00=_mt01KDkFT+8SBaG
 Content-Type: text/plain;
   charset="utf-8";
   name="newpatch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="newpatch.txt"

 diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
 index 4b29ad3..05636e4 100644
 --- a/devel/diffuse/Makefile
 +++ b/devel/diffuse/Makefile
 @@ -6,8 +6,7 @@
  #

  PORTNAME=	diffuse
 -PORTVERSION=	0.4.0
 -PORTREVISION=	1
 +PORTVERSION=	0.4.1
  CATEGORIES=	devel python
  MASTER_SITES=	SF

 @@ -21,6 +20,7 @@ USE_GNOME=	pygtk2
  USE_BZIP2=	yes

  MAN1=		diffuse.1
 +PORTDATA=	syntax

  OPTIONS=	MENU	"Add desktop menu (needs desktop-file-utils)"	on \
  		OMF	"Install OMF manual (needs scrollkeeper)"	on \
 @@ -29,13 +29,12 @@ OPTIONS=	MENU	"Add desktop menu (needs desktop-file-utils)"	on \
  .include <bsd.port.options.mk>

  .ifndef (NOPORTDOCS)
 -DOCS=		AUTHORS COPYING ChangeLog README
 +PORTDOCS=	AUTHORS COPYING ChangeLog README
  .endif

  .ifdef (WITH_MENU)
  PLIST_SUB+=	MENU=""
 -RUN_DEPENDS+=	update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
 -INSTALLS_ICONS=	yes
 +USE_GNOME+=	desktopfileutils
  .else
  PLIST_SUB+=	MENU="@comment "
  .endif
 @@ -51,35 +50,33 @@ PLIST_SUB+=	OMF="@comment "
  .ifndef (WITHOUT_NLS)
  PLIST_SUB+=	NLS=""
  USE_GETTEXT=	yes
 -TRANSLATIONS=	de
 +TRANSLATIONS=	de ja zh_CN
  .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' \
 +	${REINPLACE_CMD} -e 's|../usr|${PREFIX}|g; s|/etc|${PREFIX}/etc|g' \
  		${WRKSRC}/src/etc/${PORTNAME}rc
  	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
  		${WRKSRC}/src/usr/share/omf/${PORTNAME}/${PORTNAME}-C.omf

  do-install:
  	${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \
 -		${PREFIX}/bin/${PORTNAME}
 +		${PREFIX}/bin/
  	${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/
 +	(cd ${WRKSRC}/src/usr/share/${PORTNAME}/ && \
 +		${COPYTREE_SHARE} \* ${DATADIR}/)
  	${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
  		${MANPREFIX}/man/man1/

  .ifndef (NOPORTDOCS)
  	${MKDIR} ${DOCSDIR}
 -	for n in ${DOCS}; do \
 -		${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}; \
 +	for n in ${PORTDOCS}; do \
 +		${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}/; \
  	done
  .endif

 @@ -87,7 +84,7 @@ post-install:
  	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 \
 +		${PREFIX}/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/; \
 @@ -108,10 +105,10 @@ post-install:
  	${MKDIR} ${PREFIX}/share/pixmaps
  	${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
  		${PREFIX}/share/pixmaps/
 -	${MKDIR} ${PREFIX}/share/applications
 +	${MKDIR} ${DESKTOPDIR}
  	${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \
 -		${DESKTOPDIR}
 -	${PREFIX}/bin/update-desktop-database
 +		${DESKTOPDIR}/
 +	${PREFIX}/bin/update-desktop-database -q
  .endif

  .include <bsd.port.mk>
 diff --git a/devel/diffuse/distinfo b/devel/diffuse/distinfo
 index 391d6b7..a9e1019 100644
 --- a/devel/diffuse/distinfo
 +++ b/devel/diffuse/distinfo
 @@ -1,3 +1,3 @@
 -MD5 (diffuse-0.4.0.tar.bz2) = 75a72e0853f67024bac927737731411e
 -SHA256 (diffuse-0.4.0.tar.bz2) = f7fcf0aa23d323104aa938a1d98f7960ee3031e48af598cac72c370eefb24952
 -SIZE (diffuse-0.4.0.tar.bz2) = 109438
 +MD5 (diffuse-0.4.1.tar.bz2) = dbdfc4f3ed50e66e2151dc6e2fa3e345
 +SHA256 (diffuse-0.4.1.tar.bz2) = 782ac14e925b94feeb2c2cea2e3119c1f2e3bd82ed8e38e77178290c300132ea
 +SIZE (diffuse-0.4.1.tar.bz2) = 117740
 diff --git a/devel/diffuse/pkg-plist b/devel/diffuse/pkg-plist
 index eb99036..74d16af 100644
 --- a/devel/diffuse/pkg-plist
 +++ b/devel/diffuse/pkg-plist
 @@ -1,49 +1,12 @@
  bin/diffuse
  etc/diffuserc
 -%%DATADIR%%/syntax/bash.syntax
 -%%DATADIR%%/syntax/c++.syntax
 -%%DATADIR%%/syntax/csh.syntax
 -%%DATADIR%%/syntax/csharp.syntax
 -%%DATADIR%%/syntax/css.syntax
 -%%DATADIR%%/syntax/fortran.syntax
 -%%DATADIR%%/syntax/gettext.syntax
 -%%DATADIR%%/syntax/glsl.syntax
 -%%DATADIR%%/syntax/html.syntax
 -%%DATADIR%%/syntax/ini.syntax
 -%%DATADIR%%/syntax/java.syntax
 -%%DATADIR%%/syntax/javascript.syntax
 -%%DATADIR%%/syntax/jsp.syntax
 -%%DATADIR%%/syntax/makefile.syntax
 -%%DATADIR%%/syntax/objective-c++.syntax
 -%%DATADIR%%/syntax/octave.syntax
 -%%DATADIR%%/syntax/pascal.syntax
 -%%DATADIR%%/syntax/patch.syntax
 -%%DATADIR%%/syntax/perl.syntax
 -%%DATADIR%%/syntax/php.syntax
 -%%DATADIR%%/syntax/python.syntax
 -%%DATADIR%%/syntax/ruby.syntax
 -%%DATADIR%%/syntax/sql.syntax
 -%%DATADIR%%/syntax/tcl.syntax
 -%%DATADIR%%/syntax/vb.syntax
 -%%DATADIR%%/syntax/verilog.syntax
 -%%DATADIR%%/syntax/vhdl.syntax
 -%%DATADIR%%/syntax/xml.syntax
 - at dirrm %%DATADIR%%/syntax
 - at dirrm %%DATADIR%%
 -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 -%%PORTDOCS%%%%DOCSDIR%%/COPYING
 -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 +%%MENU%%share/applications/diffuse.desktop
 +%%MENU%%share/pixmaps/diffuse.png
 +%%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo
 +%%NLS%%share/locale/ja/LC_MESSAGES/diffuse.mo
 +%%NLS%%share/locale/zh_CN/LC_MESSAGES/diffuse.mo
  %%OMF%%share/gnome/help/diffuse/C/diffuse.xml
  %%OMF%%@dirrm share/gnome/help/diffuse/C
  %%OMF%%@dirrm share/gnome/help/diffuse
 -%%OMF%%@dirrmtry share/gnome/help
 -%%OMF%%@dirrmtry share/gnome
  %%OMF%%share/omf/diffuse/diffuse-C.omf
  %%OMF%%@dirrm share/omf/diffuse
 -%%OMF%%@dirrmtry share/omf
 -%%MENU%%share/applications/diffuse.desktop
 -%%MENU%%@dirrmtry share/applications
 -%%MENU%%share/pixmaps/diffuse.png
 -%%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo

 --Boundary-00=_mt01KDkFT+8SBaG--