2 files changed, 58 insertions, 44 deletions

diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 66be3574d898..757143a9ce94 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -20,21 +20,34 @@ COMMENT=	A GPS navigation system
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GETOPT_LONG=yes
-USE_GETTEXT=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
-USE_INC_LIBTOOL_VER=	13
+USE_INC_LIBTOOL_VER=	15
+USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-garmin
 INSTALLS_SHLIB=	yes
 
+.if defined(WITHOUT_NLS)
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 MAN1=		gpsdrive.1
 MANLANG=	"" de es
 
+post-patch:
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} 's|SUBDIRS = src po man|SUBDIRS = src man|' \
+		${WRKSRC}/Makefile.in
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist
index 18c6672255cc..ce47b9d5dc75 100644
--- a/astro/gpsdrive/pkg-plist
+++ b/astro/gpsdrive/pkg-plist
@@ -19,47 +19,48 @@ lib/libnautic.a
 lib/libnautic.so
 lib/libnautic.so.2
 share/applications/gpsdrive.desktop
-share/gpsdrive/AUTHORS
-share/gpsdrive/CREDITS
-share/gpsdrive/FAQ.gpsdrive
-share/gpsdrive/FAQ.gpsdrive.fr
-share/gpsdrive/GPS-receivers
-share/gpsdrive/LEEME
-share/gpsdrive/LISEZMOI
-share/gpsdrive/NMEA.txt
-share/gpsdrive/README
-share/gpsdrive/README.FreeBSD
-share/gpsdrive/README.SQL
-share/gpsdrive/README.gpspoint2gspdrive
-share/gpsdrive/README.kismet
-share/gpsdrive/README.nasamaps
-share/gpsdrive/TODO
-share/gpsdrive/create.sql
-share/gpsdrive/friendsicon.png
-share/gpsdrive/gpsdriveanim.gif
-share/gpsdrive/gpsdrivemini.png
-share/gpsdrive/gpsdrivesplash.png
-share/gpsdrive/gpsicon.png
-share/gpsdrive/gpsiconbt.png
-share/gpsdrive/top_GPSWORLD.jpg
-share/gpsdrive/wp2sql
-share/locale/da/LC_MESSAGES/gpsdrive.mo
-share/locale/de/LC_MESSAGES/gpsdrive.mo
-share/locale/de_AT/LC_MESSAGES/gpsdrive.mo
-share/locale/es/LC_MESSAGES/gpsdrive.mo
-share/locale/fr/LC_MESSAGES/gpsdrive.mo
-share/locale/gr/LC_MESSAGES/gpsdrive.mo
-share/locale/hu/LC_MESSAGES/gpsdrive.mo
-share/locale/it/LC_MESSAGES/gpsdrive.mo
-share/locale/ja/LC_MESSAGES/gpsdrive.mo
-share/locale/nl/LC_MESSAGES/gpsdrive.mo
-share/locale/no/LC_MESSAGES/gpsdrive.mo
-share/locale/pt_BR/LC_MESSAGES/gpsdrive.mo
-share/locale/sk/LC_MESSAGES/gpsdrive.mo
-share/locale/sv/LC_MESSAGES/gpsdrive.mo
-share/locale/tr/LC_MESSAGES/gpsdrive.mo
 share/pixmaps/gpsicon.png
-@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/gr 2> /dev/null || true
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/CREDITS
+%%DATADIR%%/FAQ.gpsdrive
+%%DATADIR%%/FAQ.gpsdrive.fr
+%%DATADIR%%/GPS-receivers
+%%DATADIR%%/LEEME
+%%DATADIR%%/LISEZMOI
+%%DATADIR%%/NMEA.txt
+%%DATADIR%%/README
+%%DATADIR%%/README.FreeBSD
+%%DATADIR%%/README.SQL
+%%DATADIR%%/README.gpspoint2gspdrive
+%%DATADIR%%/README.kismet
+%%DATADIR%%/README.nasamaps
+%%DATADIR%%/TODO
+%%DATADIR%%/create.sql
+%%DATADIR%%/friendsicon.png
+%%DATADIR%%/gpsdriveanim.gif
+%%DATADIR%%/gpsdrivemini.png
+%%DATADIR%%/gpsdrivesplash.png
+%%DATADIR%%/gpsicon.png
+%%DATADIR%%/gpsiconbt.png
+%%DATADIR%%/top_GPSWORLD.jpg
+%%DATADIR%%/wp2sql
+%%NLS%%share/locale/da/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/de_AT/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/gr/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/no/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gpsdrive.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gpsdrive.mo
+%%NLS%%@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/gr 2> /dev/null || true
 @unexec rmdir %D/share/applications 2> /dev/null || true
-@dirrm share/gpsdrive
+@unexec rmdir %D/share/pixmaps 2> /dev/null || true
+@dirrm %%DATADIR%%