add NLS knob to OPTIONS and make it work [1]

fix pkg-plist for WITHOUT_X11

Noted by:	kris [1]

2 files changed, 57 insertions, 48 deletions

diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index dd589cedae55..7de403a0f189 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -26,7 +26,8 @@ USE_REINPLACE=	yes
 WANT_GNOME=	yes
 
 OPTIONS=	X11 "Build with X11 frontend" on \
-		GTK2 "gtk2 instead of gtk12" off
+		GTK2 "gtk2 instead of gtk12" off \
+		NLS "Native Language Support via gettext utilities" on
 
 .if !defined(WITHOUT_X11)
 USE_X_PREFIX=	yes
@@ -40,7 +41,9 @@ USE_GNOME+=	gnomehack
 CONFIGURE_ARGS+=--disable-gtkport --disable-gtk20
 PKGNAMESUFFIX=	-nox11
 USE_GNOME+=	glib12
+PLIST_SUB+=	NOX11:="@comment "
 .else
+PLIST_SUB+=	NOX11:=""
 WANT_GNOME=	yes
 .if defined(WITH_GTK2)
 USE_GNOME+=	gtk20
@@ -54,10 +57,12 @@ CONFIGURE_ARGS+=--disable-gtk20
 
 MAN1=		gftp.1
 
-.if defined(WITHOUT_X11)
-PLIST_SUB+=	NOX11:="@comment "
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
 .else
-PLIST_SUB+=	NOX11:=""
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${HAVE_GNOME:Mgnomelibs}!="" && !defined(WITH_GTK2)
@@ -73,5 +78,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		s|"-lssl |& -lcrypto|' ${WRKSRC}/configure
+.if defined(WITHOUT_X11)
+	@${REINPLACE_CMD} -e 's|: install-pkgdataDATA|: |' \
+		${WRKSRC}/docs/sample.gftp/Makefile.in
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist
index d569dcdcd55c..0f869a9f9fbe 100644
--- a/ftp/gftp/pkg-plist
+++ b/ftp/gftp/pkg-plist
@@ -31,48 +31,48 @@ bin/gftp-text
 %%NOX11:%%%%DATADIR%%/gftp/up.xpm
 %%NOX11:%%%%DATADIR%%/gftp/world.xpm
 %%NOX11:%%%%MYGNOME%%share/gnome/pixmaps/gftp.png
-share/locale/am/LC_MESSAGES/gftp.mo
-share/locale/ar/LC_MESSAGES/gftp.mo
-share/locale/az/LC_MESSAGES/gftp.mo
-share/locale/be/LC_MESSAGES/gftp.mo
-share/locale/bg/LC_MESSAGES/gftp.mo
-share/locale/bn/LC_MESSAGES/gftp.mo
-share/locale/ca/LC_MESSAGES/gftp.mo
-share/locale/cs/LC_MESSAGES/gftp.mo
-share/locale/da/LC_MESSAGES/gftp.mo
-share/locale/de/LC_MESSAGES/gftp.mo
-share/locale/el/LC_MESSAGES/gftp.mo
-share/locale/en_CA/LC_MESSAGES/gftp.mo
-share/locale/en_GB/LC_MESSAGES/gftp.mo
-share/locale/es/LC_MESSAGES/gftp.mo
-share/locale/fi/LC_MESSAGES/gftp.mo
-share/locale/fr/LC_MESSAGES/gftp.mo
-share/locale/ga/LC_MESSAGES/gftp.mo
-share/locale/hr/LC_MESSAGES/gftp.mo
-share/locale/hu/LC_MESSAGES/gftp.mo
-share/locale/it/LC_MESSAGES/gftp.mo
-share/locale/ja/LC_MESSAGES/gftp.mo
-share/locale/ko/LC_MESSAGES/gftp.mo
-share/locale/mk/LC_MESSAGES/gftp.mo
-share/locale/ml/LC_MESSAGES/gftp.mo
-share/locale/ms/LC_MESSAGES/gftp.mo
-share/locale/nl/LC_MESSAGES/gftp.mo
-share/locale/no/LC_MESSAGES/gftp.mo
-share/locale/pa/LC_MESSAGES/gftp.mo
-share/locale/pl/LC_MESSAGES/gftp.mo
-share/locale/pt/LC_MESSAGES/gftp.mo
-share/locale/pt_BR/LC_MESSAGES/gftp.mo
-share/locale/ro/LC_MESSAGES/gftp.mo
-share/locale/ru/LC_MESSAGES/gftp.mo
-share/locale/sk/LC_MESSAGES/gftp.mo
-share/locale/sq/LC_MESSAGES/gftp.mo
-share/locale/sr/LC_MESSAGES/gftp.mo
-share/locale/sr@Latn/LC_MESSAGES/gftp.mo
-share/locale/sv/LC_MESSAGES/gftp.mo
-share/locale/ta/LC_MESSAGES/gftp.mo
-share/locale/th/LC_MESSAGES/gftp.mo
-share/locale/tr/LC_MESSAGES/gftp.mo
-share/locale/uk/LC_MESSAGES/gftp.mo
-share/locale/zh_CN/LC_MESSAGES/gftp.mo
-share/locale/zh_TW/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/am/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/az/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/be/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/el/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ml/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/no/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/sr@Latn/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/th/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gftp.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/gftp.mo
 %%NOX11:%%@dirrm %%DATADIR%%/gftp