Date: Mon, 3 Jun 2013 07:32:41 GMT From: Jason Helfman <jgh@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/179249: [patch] adopt USES for desktop-file-utils, support NLS on/off Message-ID: <201306030732.r537Wfhx070774@freefall.freebsd.org> Resent-Message-ID: <201306030740.r537e0HF070964@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179249
>Category: ports
>Synopsis: [patch] adopt USES for desktop-file-utils, support NLS on/off
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 03 07:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jason Helfman
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r251226: Sat Jun 1 21:56:43 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64
>Description:
move to USES for desktop-file-utils
support NLS conditionally
>How-To-Repeat:
>Fix:
Index: editors/leafpad/Makefile
===================================================================
--- editors/leafpad/Makefile (revision 319757)
+++ editors/leafpad/Makefile (working copy)
@@ -11,8 +11,8 @@
MAINTAINER= wen@FreeBSD.org
COMMENT= GTK+ based simple text editor
-USE_GNOME= gtk20 desktopfileutils intlhack
-USES= gettext
+USE_GNOME= gtk20 intlhack
+USES= desktop-file-utils
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-chooser
@@ -22,16 +22,31 @@
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README
+OPTIONS_DEFINE= NLS
+
post-extract:
@${CHMOD} a+x ${WRKSRC}/install-sh
.include <bsd.port.options.mk>
+post-patch-script:
+.if ! ${PORT_OPTIONS:MNLS}
+ @${REINPLACE_CMD} -e 's|SUBDIRS = src data po|SUBDIRS = src data|g' \
+ ${WRKSRC}/Makefile.in
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+USES+= gettext
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
post-install:
.if ${PORT_OPTIONS:MDOCS}
@${INSTALL} -d ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
.endif
- -@update-desktop-database
.include <bsd.port.mk>
Index: editors/leafpad/pkg-plist
===================================================================
--- editors/leafpad/pkg-plist (revision 319757)
+++ editors/leafpad/pkg-plist (working copy)
@@ -5,46 +5,44 @@
share/icons/hicolor/24x24/apps/leafpad.png
share/icons/hicolor/32x32/apps/leafpad.png
share/icons/hicolor/scalable/apps/leafpad.svg
-share/locale/bg/LC_MESSAGES/leafpad.mo
-share/locale/br/LC_MESSAGES/leafpad.mo
-share/locale/ca/LC_MESSAGES/leafpad.mo
-share/locale/cs/LC_MESSAGES/leafpad.mo
-share/locale/da/LC_MESSAGES/leafpad.mo
-share/locale/de/LC_MESSAGES/leafpad.mo
-share/locale/el/LC_MESSAGES/leafpad.mo
-share/locale/eo/LC_MESSAGES/leafpad.mo
-share/locale/es/LC_MESSAGES/leafpad.mo
-share/locale/eu/LC_MESSAGES/leafpad.mo
-share/locale/fi/LC_MESSAGES/leafpad.mo
-share/locale/fr/LC_MESSAGES/leafpad.mo
-share/locale/ga/LC_MESSAGES/leafpad.mo
-share/locale/gl/LC_MESSAGES/leafpad.mo
-share/locale/he/LC_MESSAGES/leafpad.mo
-share/locale/hu/LC_MESSAGES/leafpad.mo
-share/locale/id/LC_MESSAGES/leafpad.mo
-share/locale/it/LC_MESSAGES/leafpad.mo
-share/locale/ja/LC_MESSAGES/leafpad.mo
-share/locale/ko/LC_MESSAGES/leafpad.mo
-share/locale/lt/LC_MESSAGES/leafpad.mo
-share/locale/lv/LC_MESSAGES/leafpad.mo
-share/locale/nl/LC_MESSAGES/leafpad.mo
-share/locale/nn/LC_MESSAGES/leafpad.mo
-share/locale/pl/LC_MESSAGES/leafpad.mo
-share/locale/pt/LC_MESSAGES/leafpad.mo
-share/locale/pt_BR/LC_MESSAGES/leafpad.mo
-share/locale/ru/LC_MESSAGES/leafpad.mo
-share/locale/sk/LC_MESSAGES/leafpad.mo
-share/locale/sl/LC_MESSAGES/leafpad.mo
-share/locale/sr/LC_MESSAGES/leafpad.mo
-share/locale/sv/LC_MESSAGES/leafpad.mo
-share/locale/ta/LC_MESSAGES/leafpad.mo
-share/locale/tr/LC_MESSAGES/leafpad.mo
-share/locale/uk/LC_MESSAGES/leafpad.mo
-share/locale/vi/LC_MESSAGES/leafpad.mo
-share/locale/zh_CN/LC_MESSAGES/leafpad.mo
-share/locale/zh_TW/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/br/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/da/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/de/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/el/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/es/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/he/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/id/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/it/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/leafpad.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/leafpad.mo
share/pixmaps/leafpad.png
share/pixmaps/leafpad.xpm
@dirrmtry share/applications
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306030732.r537Wfhx070774>