summaryrefslogtreecommitdiff
path: root/geography/mapserver
diff options
context:
space:
mode:
authormatthias <matthias>2010-04-27 14:24:14 +0000
committermatthias <matthias>2010-04-27 14:24:14 +0000
commit268d8696778d8ac92b840d525ac370caa43a0a0d (patch)
tree6447c19b6e766dd98def11b5d2d1177c39d3f80c /geography/mapserver
parent9bb167639db9e2b21334a63d5128d019fe2c67bb (diff)
downloadpkgsrc-268d8696778d8ac92b840d525ac370caa43a0a0d.tar.gz
add option x11 to make it possible to build without x11.
Diffstat (limited to 'geography/mapserver')
-rw-r--r--geography/mapserver/Makefile3
-rw-r--r--geography/mapserver/options.mk15
2 files changed, 13 insertions, 5 deletions
diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index b9ee837801f..9af87a7033b 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -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 @@ do-install:
.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 --git a/geography/mapserver/options.mk b/geography/mapserver/options.mk
index 703b3cb8259..d363bb29f0e 100644
--- a/geography/mapserver/options.mk
+++ b/geography/mapserver/options.mk
@@ -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 @@ CONFIGURE_ARGS+= --with-postgis
.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