Date: Wed, 14 Oct 2009 18:07:23 GMT From: Marco Bröder <marco.broeder@gmx.eu> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/139608: [maintainer-update][patch] devel/diffuse: Several fixes, and update to 0.4.1 Message-ID: <200910141807.n9EI7NTV005570@www.freebsd.org> Resent-Message-ID: <200910141810.n9EIA1ht066849@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 139608
>Category: ports
>Synopsis: [maintainer-update][patch] devel/diffuse: Several fixes, and update to 0.4.1
>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 Oct 14 18:10:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Marco Bröder
>Release: RELENG_8 amd64
>Organization:
>Environment:
>Description:
Changelog:
- Simplify a run dependency line by using a shortcut from 'USE_GNOME' macro
- Remove 'INSTALLS_ICONS' (no icons in '${PREFIX}/share/icons')
- Add 'ja' and 'zh_CN' translations
- 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
- Sort 'pkg-plist' and remove entries covered by other mtree / bsd.*.mk files
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 4b29ad3..7f743a2 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
@@ -34,8 +33,7 @@ DOCS= AUTHORS COPYING ChangeLog README
.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,7 +49,7 @@ 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
@@ -66,7 +64,7 @@ post-patch:
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:
@@ -79,7 +77,7 @@ post-install:
.ifndef (NOPORTDOCS)
${MKDIR} ${DOCSDIR}
for n in ${DOCS}; do \
- ${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}; \
+ ${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}/; \
done
.endif
@@ -87,7 +85,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 +106,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..4473bd8 100644
--- a/devel/diffuse/pkg-plist
+++ b/devel/diffuse/pkg-plist
@@ -30,20 +30,18 @@ etc/diffuserc
%%DATADIR%%/syntax/xml.syntax
@dirrm %%DATADIR%%/syntax
@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
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910141807.n9EI7NTV005570>