- address not being able to turn off NLS correctly

Submitted by:	jkim@

2 files changed, 39 insertions, 53 deletions

diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 5841aba7650f..13fabe837f5d 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GTK+ based simple text editor
 LICENSE=	GPLv2
 
 USE_GNOME=	gtk20 intlhack
-USES=		desktop-file-utils gmake pkgconfig
+USES=		desktop-file-utils gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-chooser
 INSTALLS_ICONS=	yes
@@ -22,23 +22,9 @@ LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL README
 
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
-
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
-
-.include <bsd.port.options.mk>
-
 post-extract:
 	@${CHMOD} a+x ${WRKSRC}/install-sh
 
-post-patch:
-.if ! ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|SUBDIRS = src data po|SUBDIRS = src data|g' \
-		${WRKSRC}/Makefile.in
-.endif
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
diff --git a/editors/leafpad/pkg-plist b/editors/leafpad/pkg-plist
index 247ef5607d03..90b8582356b6 100644
--- a/editors/leafpad/pkg-plist
+++ b/editors/leafpad/pkg-plist
@@ -5,43 +5,43 @@ 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
-%%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/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
 share/pixmaps/leafpad.png
 share/pixmaps/leafpad.xpm