2 files changed, 59 insertions, 49 deletions

diff --git a/palm/jpilot/Makefile b/palm/jpilot/Makefile
index 520dfbfd2aaf..328f08cfaa19 100644
--- a/palm/jpilot/Makefile
+++ b/palm/jpilot/Makefile
@@ -17,7 +17,9 @@ COMMENT=	Desktop Organizer Software for the Palm Pilot
 LIB_DEPENDS=	pisock.8:${PORTSDIR}/palm/pilot-link
 
 CONFIGURE_ARGS+=	--with-pilot-prefix=${PREFIX}
+.if (!defined(WITHOUT_NLS))
 USE_GETTEXT=	yes
+.endif
 .if defined(WITH_GTK2)
 USE_GNOME=	gtk20
 CONFIGURE_ARGS+=	--enable-gtk2=yes
@@ -25,6 +27,14 @@ CONFIGURE_ARGS+=	--enable-gtk2=yes
 USE_GNOME=	gtk12
 .endif
 
+.if !defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--enable-nls
+PLIST_SUB=		NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB=		NLS="@comment "
+.endif
+
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/jpilot/plugins
diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist
index e3a151d63304..fdfdc888ee61 100644
--- a/palm/jpilot/pkg-plist
+++ b/palm/jpilot/pkg-plist
@@ -47,60 +47,60 @@ share/jpilot/icons/jpilot-icon1.xpm
 share/jpilot/icons/jpilot-icon2.xpm
 share/jpilot/icons/jpilot-icon3.xpm
 share/jpilot/icons/jpilot-icon4.xpm
-share/locale/ca/LC_MESSAGES/jpilot.mo
-share/locale/cs/LC_MESSAGES/jpilot.mo
-share/locale/da/LC_MESSAGES/jpilot.mo
-share/locale/de/LC_MESSAGES/jpilot.mo
-share/locale/es/LC_MESSAGES/jpilot.mo
-share/locale/fr/LC_MESSAGES/jpilot.mo
-share/locale/it/LC_MESSAGES/jpilot.mo
-share/locale/ja/LC_MESSAGES/jpilot.mo
-share/locale/nl/LC_MESSAGES/jpilot.mo
-share/locale/no/LC_MESSAGES/jpilot.mo
-share/locale/ru/LC_MESSAGES/jpilot.mo
-share/locale/sv/LC_MESSAGES/jpilot.mo
-share/locale/tr/LC_MESSAGES/jpilot.mo
-share/locale/vi/LC_MESSAGES/jpilot.mo
-share/locale/zh_CN/LC_MESSAGES/jpilot.mo
-share/locale/zh_TW/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/da/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/de/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/es/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/it/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/no/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/jpilot.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/jpilot.mo
 @dirrm share/jpilot/icons
 @dirrm share/jpilot
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/jpilot/plugins
 @dirrm lib/jpilot
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/share/locale/vi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/vi 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ca 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/da 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/de 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/es 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/it 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ja 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/nl 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/no 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/tr 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/vi/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/vi 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale 2>/dev/null || true
 @unexec rmdir %D/share/gnome/apps/Applications 2>/dev/null || true
 @unexec rmdir %D/share/gnome/apps 2>/dev/null || true
 @unexec rmdir %D/share/gnome 2>/dev/null || true