pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/geography/libchamplain012 libchamplain012: Remove intr...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f39d44c4be88
branches:  trunk
changeset: 381103:f39d44c4be88
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Jun 28 11:07:13 2022 +0000

description:
libchamplain012: Remove introspection option. The option is broken
because while this package was switched to build with Meson the option
still assumes autotools.

diffstat:

 geography/libchamplain012/Makefile   |   8 +++-----
 geography/libchamplain012/PLIST      |  10 +++++-----
 geography/libchamplain012/options.mk |  18 ------------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diffs (75 lines):

diff -r 1e0f5b2879df -r f39d44c4be88 geography/libchamplain012/Makefile
--- a/geography/libchamplain012/Makefile        Tue Jun 28 10:58:04 2022 +0000
+++ b/geography/libchamplain012/Makefile        Tue Jun 28 11:07:13 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/04/18 19:09:51 adam Exp $
+# $NetBSD: Makefile,v 1.40 2022/06/28 11:07:13 nia Exp $
 
 DISTNAME=      libchamplain-0.12.20
 PKGNAME=       ${DISTNAME:S/ain/ain012/}
@@ -21,13 +21,11 @@
 
 PYTHON_FOR_BUILD_ONLY= tool
 
-# TODO:
-# add vala option?
-.include "options.mk"
-
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/meson/build.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../geography/libmemphis02/buildlink3.mk"
 .include "../../graphics/clutter-gtk/buildlink3.mk"
 .include "../../graphics/clutter/buildlink3.mk"
diff -r 1e0f5b2879df -r f39d44c4be88 geography/libchamplain012/PLIST
--- a/geography/libchamplain012/PLIST   Tue Jun 28 10:58:04 2022 +0000
+++ b/geography/libchamplain012/PLIST   Tue Jun 28 11:07:13 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/19 16:15:36 cirnatdan Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/06/28 11:07:13 nia Exp $
 include/champlain-0.12/champlain-gtk/champlain-gtk.h
 include/champlain-0.12/champlain-gtk/gtk-champlain-embed.h
 include/champlain-0.12/champlain/champlain-adjustment.h
@@ -40,8 +40,8 @@
 include/champlain-0.12/champlain/champlain-view.h
 include/champlain-0.12/champlain/champlain-viewport.h
 include/champlain-0.12/champlain/champlain.h
-${PLIST.introspection}lib/girepository-1.0/Champlain-0.12.typelib
-${PLIST.introspection}lib/girepository-1.0/GtkChamplain-0.12.typelib
+lib/girepository-1.0/Champlain-0.12.typelib
+lib/girepository-1.0/GtkChamplain-0.12.typelib
 lib/libchamplain-0.12.so
 lib/libchamplain-0.12.so.0
 lib/libchamplain-0.12.so.0.11.10
@@ -50,5 +50,5 @@
 lib/libchamplain-gtk-0.12.so.0.11.10
 lib/pkgconfig/champlain-0.12.pc
 lib/pkgconfig/champlain-gtk-0.12.pc
-${PLIST.introspection}share/gir-1.0/Champlain-0.12.gir
-${PLIST.introspection}share/gir-1.0/GtkChamplain-0.12.gir
+share/gir-1.0/Champlain-0.12.gir
+share/gir-1.0/GtkChamplain-0.12.gir
diff -r 1e0f5b2879df -r f39d44c4be88 geography/libchamplain012/options.mk
--- a/geography/libchamplain012/options.mk      Tue Jun 28 10:58:04 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2021/04/19 15:56:31 cirnatdan Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.libchamplain012
-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



Home | Main Index | Thread Index | Old Index