[pkgsrc/trunk]: pkgsrc/geography/mapserver add option x11 to make it possible...

[matthias <matthias%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1dc22d06b01
branches:  trunk
changeset: 574835:e1dc22d06b01
user:      matthias <matthias%pkgsrc.org@localhost>
date:      Tue Apr 27 14:24:14 2010 +0000

description:
add option x11 to make it possible to build without x11.

diffstat:

 geography/mapserver/Makefile   |   3 +--
 geography/mapserver/options.mk |  15 ++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 2d3560c49354 -r e1dc22d06b01 geography/mapserver/Makefile
--- a/geography/mapserver/Makefile      Tue Apr 27 13:15:57 2010 +0000
+++ b/geography/mapserver/Makefile      Tue Apr 27 14:24:14 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2010/04/12 07:04:46 adam Exp $
+# $NetBSD: Makefile,v 1.25 2010/04/27 14:24:14 matthias Exp $
 
 DISTNAME=      mapserver-5.6.3
 CATEGORIES=    geography www
@@ -54,5 +54,4 @@
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2d3560c49354 -r e1dc22d06b01 geography/mapserver/options.mk
--- a/geography/mapserver/options.mk    Tue Apr 27 13:15:57 2010 +0000
+++ b/geography/mapserver/options.mk    Tue Apr 27 14:24:14 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2010/01/27 08:12:19 adam Exp $
+# $NetBSD: options.mk,v 1.3 2010/04/27 14:24:14 matthias Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.mapserver
-PKG_SUPPORTED_OPTIONS= fastcgi pgsql mysql
-PKG_SUGGESTED_OPTIONS= # empty
+PKG_SUPPORTED_OPTIONS= fastcgi pgsql mysql x11
+PKG_SUGGESTED_OPTIONS= x11
 
 .include "../../mk/bsd.options.mk"
 
@@ -29,3 +29,12 @@
 .include "../../databases/mysql5-client/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-mygis
 .endif
+
+#
+# x11 (xpm) support
+#
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libXpm/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-xpm
+.endif