navit: Simplify NAMES

[FeZ <fekete.zoltan%minux.hu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	FeZ <fekete.zoltan%minux.hu@localhost>
Pushed By:	fez
Date:		Mon May 28 12:59:32 2018 +0000
Changeset:	001795a9ae702a673caa382dcdad2ef61c2c0e03

Modified Files:
	navit/Makefile

Log Message:
navit: Simplify NAMES

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=001795a9ae702a673caa382dcdad2ef61c2c0e03

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 navit/Makefile | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diffs:
diff --git a/navit/Makefile b/navit/Makefile
index 9db3656416..0809b31a5b 100644
--- a/navit/Makefile
+++ b/navit/Makefile
@@ -17,21 +17,19 @@ USE_LANGUAGES=	c c++
 
 USE_TOOLS+=		cmake pkg-config
 
-CMAKE_ARGS+=    -DLIB_DIR=${PREFIX}/lib/navit \
-                -DMAN_DIR=${PREFIX}/man \
-		-DUSE_PLUGINS=0 \
-		-DSAMPLE_MAP=0 \
-		-DSVG2PNG=0 \
-		-DUSE_NATIVE_LANGUAGE_SUPPORT=0
-		
-
-# DEPENDS+=       gettext-lib-[0-9]*:../../devel/gettext-lib
+CMAKE_ARGS+=    -DLIB_DIR=${PREFIX}/lib/navit
+CMAKE_ARGS+=    -DMAN_DIR=${PREFIX}/${PKGMANDIR}
+CMAKE_ARGS+=    -DUSE_PLUGINS=0
+CMAKE_ARGS+=	-DSAMPLE_MAP=0
+CMAKE_ARGS+=	-DSVG2PNG=0
+CMAKE_ARGS+=	-DUSE_NATIVE_LANGUAGE_SUPPORT=0		
+
 DEPENDS+=       png>=1.6:../../graphics/png
 DEPENDS+=       freetype2>=2.9:../../graphics/freetype2
 DEPENDS+=       glib2>=2.0:../../devel/glib2
 DEPENDS+=       python27-[0-9]*:../../lang/python27
 DEPENDS+=       gtk2-[0-9]*:../../x11/gtk2
-DEPENDS+=       librsvg-[2-9]*:../../graphics/librsvg
+DEPENDS+=       librsvg-[0-9]*:../../graphics/librsvg
 DEPENDS+=       imlib-[0-9]*:../../graphics/imlib2
 
 
@@ -41,7 +39,6 @@ DEPENDS+=       imlib-[0-9]*:../../graphics/imlib2
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/python27/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-# .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"