summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2022-06-28 10:58:04 +0000
committernia <nia@pkgsrc.org>2022-06-28 10:58:04 +0000
commit3112ac047ab6b21c51cf4b9096f5aa1ccaaffd0f (patch)
treec80e94cc20fc5f046a8aad0e1a8e17bc847fd77d /geography
parent9e1a6c864cf0bf764e0cc9cb8e00fec2ec6cd887 (diff)
downloadpkgsrc-3112ac047ab6b21c51cf4b9096f5aa1ccaaffd0f.tar.gz
libmemphis02: Remove introspection option.
https://marc.info/?l=pkgsrc-users&m=165444158600671&w=2
Diffstat (limited to 'geography')
-rw-r--r--geography/libmemphis02/Makefile8
-rw-r--r--geography/libmemphis02/PLIST6
-rw-r--r--geography/libmemphis02/options.mk18
3 files changed, 8 insertions, 24 deletions
diff --git a/geography/libmemphis02/Makefile b/geography/libmemphis02/Makefile
index c9f7da4d425..bc18906c574 100644
--- a/geography/libmemphis02/Makefile
+++ b/geography/libmemphis02/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/12/08 16:02:06 adam Exp $
+# $NetBSD: Makefile,v 1.16 2022/06/28 10:58:04 nia Exp $
DISTNAME= memphis-0.2.3
PKGNAME= libmemphis02-0.2.3
@@ -18,6 +18,8 @@ USE_LIBTOOL= yes
USE_LANGUAGES= c c++
USE_TOOLS+= aclocal autoconf autoheader automake gmake pkg-config
+CONFIGURE_ARGS+= --enable-introspection
+
PKGCONFIG_OVERRIDE+= memphis.pc.in
pre-configure:
@@ -26,9 +28,9 @@ pre-configure:
autoheader ; \
automake -a --foreign -i --add-missing; autoconf
-.include "options.mk"
-
.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection+= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/geography/libmemphis02/PLIST b/geography/libmemphis02/PLIST
index e5a43d5ae60..2262f777342 100644
--- a/geography/libmemphis02/PLIST
+++ b/geography/libmemphis02/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/04/19 15:55:29 cirnatdan Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/06/28 10:58:04 nia Exp $
include/libmemphis-0.2/memphis/memphis-data-pool.h
include/libmemphis-0.2/memphis/memphis-debug.h
include/libmemphis-0.2/memphis/memphis-map.h
@@ -6,8 +6,8 @@ include/libmemphis-0.2/memphis/memphis-renderer.h
include/libmemphis-0.2/memphis/memphis-rule-set.h
include/libmemphis-0.2/memphis/memphis-rule.h
include/libmemphis-0.2/memphis/memphis.h
-${PLIST.introspection}lib/girepository-1.0/Memphis-0.2.typelib
+lib/girepository-1.0/Memphis-0.2.typelib
lib/libmemphis-0.2.la
lib/pkgconfig/memphis-0.2.pc
-${PLIST.introspection}share/gir-1.0/Memphis-0.2.gir
+share/gir-1.0/Memphis-0.2.gir
share/memphis-0.2/default-rules.xml
diff --git a/geography/libmemphis02/options.mk b/geography/libmemphis02/options.mk
deleted file mode 100644
index e0b46441540..00000000000
--- a/geography/libmemphis02/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2021/04/19 15:55:29 cirnatdan Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.libmemphis02
-PKG_SUPPORTED_OPTIONS= introspection
-PKG_SUGGESTED_OPTIONS= introspection
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= introspection
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-BUILDLINK_DEPMETHOD.gobject-introspection+= build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-introspection
-PLIST.introspection= yes
-.else
-CONFIGURE_ARGS+= --disable-introspection
-.endif