2 files changed, 57 insertions, 44 deletions

diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 5194b671fdeb..6b7abbfb3a71 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -8,11 +8,11 @@ CATEGORIES=	editors
 MASTER_SITES=	SAVANNAH
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	wen@FreeBSD.org
+MAINTAINER=	ports@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 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README
 
+OPTIONS_DEFINE=	NLS
+
 post-extract:
 	@${CHMOD} a+x ${WRKSRC}/install-sh
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MNLS}
+USES+=			gettext
+PLIST_SUB+=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.endif
+
+post-patch:
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|SUBDIRS = src data po|SUBDIRS = src data|g' \
+		${WRKSRC}/Makefile.in
+.endif
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
-	-@update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/editors/leafpad/pkg-plist b/editors/leafpad/pkg-plist
index 4771f792fc02..24e7cae530fe 100644
--- a/editors/leafpad/pkg-plist
+++ b/editors/leafpad/pkg-plist
@@ -5,46 +5,44 @@ share/icons/hicolor/22x22/apps/leafpad.png
 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