summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2013-05-07 11:08:39 +0000
committerwiz <wiz>2013-05-07 11:08:39 +0000
commit3eedeed3a3bf1a5db9c14355a9d852558f3c0198 (patch)
tree94aee4f99fd89b01601405f597bbfdc2bd710516
parent95298c7a49dbe22ca981f0758ef9a897ea3f24fd (diff)
downloadpkgsrc-3eedeed3a3bf1a5db9c14355a9d852558f3c0198.tar.gz
Make libchamplain optional. No change to default package, so no PKGREVISION
bump.
-rw-r--r--graphics/geeqie/Makefile6
-rw-r--r--graphics/geeqie/options.mk14
2 files changed, 17 insertions, 3 deletions
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 7c2d5a01e93..719c5c0872d 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/02/16 11:21:53 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2013/05/07 11:08:39 wiz Exp $
#
DISTNAME= geeqie-1.1
@@ -12,7 +12,6 @@ COMMENT= Image viewer
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-gps
LDFLAGS.SunOS+= -lm -lsocket -lnsl
@@ -27,7 +26,8 @@ REPLACE_BASH+= plugins/import/geeqie-import
post-build:
cd ${WRKSRC}/doc && ${MAKE_PROGRAM} html
-.include "../../geography/libchamplain04/buildlink3.mk"
+.include "options.mk"
+
.include "../../graphics/exiv2/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/graphics/geeqie/options.mk b/graphics/geeqie/options.mk
new file mode 100644
index 00000000000..f5bcda0c484
--- /dev/null
+++ b/graphics/geeqie/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2013/05/07 11:08:40 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.geeqie
+PKG_SUPPORTED_OPTIONS= libchamplain
+PKG_SUGGESTED_OPTIONS= libchamplain
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlibchamplain)
+CONFIGURE_ARGS+= --enable-gps
+.include "../../geography/libchamplain04/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-gps
+.endif