- support handling of NLS while upstream works out issue

- bump portrevision

Feature safe:	yes

4 files changed, 95 insertions, 63 deletions

diff --git a/deskutils/xpad-current/Makefile b/deskutils/xpad-current/Makefile
index 5d6f2999773e..99bb53a93dfd 100644
--- a/deskutils/xpad-current/Makefile
+++ b/deskutils/xpad-current/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xpad
 PORTVERSION=	4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 PKGNAMESUFFIX=	-current
@@ -13,6 +13,8 @@ COMMENT=	Virtual note-pad system for your X11 desktop
 
 LICENSE=	GPLv3
 
+OPTIONS_DEFINE=	NLS
+
 CONFLICTS_INSTALL=	xpad-[0-9]*
 FETCH_ARGS=	-p
 USE_BZIP2=	yes
@@ -25,12 +27,24 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+.include <bsd.port.options.mk>
+
 #code currently doesn't properly handle --disable-nls (in next upstream milestone)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
-
-MAN1=		xpad.1
-
-post-patch:
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+MAN1+=		xpad.1
+
+post-patch-script:
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|SUBDIRS = autopackage doc src images po|SUBDIRS = autopackage doc src images|' \
+		${WRKSRC}/Makefile.in
+.endif
 	@${REINPLACE_CMD} -e 's|glib/glist.h|glib.h|g' \
 		${WRKSRC}/src/xpad-undo.c
 
diff --git a/deskutils/xpad-current/pkg-plist b/deskutils/xpad-current/pkg-plist
index 8c8264d1f483..ac8ca7efc55d 100644
--- a/deskutils/xpad-current/pkg-plist
+++ b/deskutils/xpad-current/pkg-plist
@@ -1,32 +1,32 @@
 bin/xpad
 share/applications/xpad.desktop
 share/icons/hicolor/scalable/apps/xpad.svg
-share/locale/af/LC_MESSAGES/xpad.mo
-share/locale/bg/LC_MESSAGES/xpad.mo
-share/locale/cs/LC_MESSAGES/xpad.mo
-share/locale/da/LC_MESSAGES/xpad.mo
-share/locale/de/LC_MESSAGES/xpad.mo
-share/locale/en_GB/LC_MESSAGES/xpad.mo
-share/locale/es/LC_MESSAGES/xpad.mo
-share/locale/et/LC_MESSAGES/xpad.mo
-share/locale/fi/LC_MESSAGES/xpad.mo
-share/locale/fr/LC_MESSAGES/xpad.mo
-share/locale/ga/LC_MESSAGES/xpad.mo
-share/locale/hr/LC_MESSAGES/xpad.mo
-share/locale/hu/LC_MESSAGES/xpad.mo
-share/locale/it/LC_MESSAGES/xpad.mo
-share/locale/ja/LC_MESSAGES/xpad.mo
-share/locale/ko/LC_MESSAGES/xpad.mo
-share/locale/lv/LC_MESSAGES/xpad.mo
-share/locale/nl/LC_MESSAGES/xpad.mo
-share/locale/pt/LC_MESSAGES/xpad.mo
-share/locale/ro/LC_MESSAGES/xpad.mo
-share/locale/ru/LC_MESSAGES/xpad.mo
-share/locale/rw/LC_MESSAGES/xpad.mo
-share/locale/sv/LC_MESSAGES/xpad.mo
-share/locale/th/LC_MESSAGES/xpad.mo
-share/locale/tr/LC_MESSAGES/xpad.mo
-share/locale/vi/LC_MESSAGES/xpad.mo
-share/locale/zh_CN/LC_MESSAGES/xpad.mo
-share/locale/zh_TW/LC_MESSAGES/xpad.mo
+%%NLS%%%%NLS%%share/locale/af/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xpad.mo
 @dirrmtry share/applications
diff --git a/deskutils/xpad/Makefile b/deskutils/xpad/Makefile
index 009e055e1d4e..9c0af12aaa7f 100644
--- a/deskutils/xpad/Makefile
+++ b/deskutils/xpad/Makefile
@@ -1,9 +1,9 @@
-# Created by:	Guillaume Paquet <amyfoub@gmail.com>
+# Created by: Guillaume Paquet <amyfoub@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	xpad
 PORTVERSION=	3.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpad.net/xpad/stable/${PORTVERSION}/+download/
 
@@ -12,6 +12,8 @@ COMMENT=	Virtual note-pad system for your X11 desktop
 
 LICENSE=	GPLv3
 
+OPTIONS_DEFINE=	NLS
+
 CONFLICTS_INSTALL=	xpad-current-[0-9]*
 
 FETCH_ARGS=	"-pRr"
@@ -22,11 +24,27 @@ USE_GNOME=	gtk20 gnomehier intltool
 USE_PKGCONFIG=	build
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-USE_GETTEXT=	yes
 
 MAN1=		xpad.1
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+MAN1+=		xpad.1
+
+post-patch-script:
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|SUBDIRS = autopackage doc src images po|SUBDIRS = autopackage doc src images|' \
+		${WRKSRC}/Makefile.in
+.endif
+
 .include <bsd.port.mk>
diff --git a/deskutils/xpad/pkg-plist b/deskutils/xpad/pkg-plist
index f0f01928a9cf..daccf3f68ee4 100644
--- a/deskutils/xpad/pkg-plist
+++ b/deskutils/xpad/pkg-plist
@@ -1,28 +1,28 @@
 bin/xpad
 share/applications/xpad.desktop
 share/icons/hicolor/scalable/apps/xpad.svg
-share/locale/af/LC_MESSAGES/xpad.mo
-share/locale/bg/LC_MESSAGES/xpad.mo
-share/locale/cs/LC_MESSAGES/xpad.mo
-share/locale/da/LC_MESSAGES/xpad.mo
-share/locale/en_GB/LC_MESSAGES/xpad.mo
-share/locale/es/LC_MESSAGES/xpad.mo
-share/locale/fi/LC_MESSAGES/xpad.mo
-share/locale/fr/LC_MESSAGES/xpad.mo
-share/locale/ga/LC_MESSAGES/xpad.mo
-share/locale/hu/LC_MESSAGES/xpad.mo
-share/locale/it/LC_MESSAGES/xpad.mo
-share/locale/ja/LC_MESSAGES/xpad.mo
-share/locale/ko/LC_MESSAGES/xpad.mo
-share/locale/lv/LC_MESSAGES/xpad.mo
-share/locale/nl/LC_MESSAGES/xpad.mo
-share/locale/ro/LC_MESSAGES/xpad.mo
-share/locale/ru/LC_MESSAGES/xpad.mo
-share/locale/rw/LC_MESSAGES/xpad.mo
-share/locale/sv/LC_MESSAGES/xpad.mo
-share/locale/vi/LC_MESSAGES/xpad.mo
-share/locale/zh_CN/LC_MESSAGES/xpad.mo
-share/locale/zh_TW/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/af/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xpad.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xpad.mo
 @dirrmtry share/applications
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
+@dirrmtry %%NLS%%share/locale/rw/LC_MESSAGES
+@dirrmtry %%NLS%%share/locale/rw