diff --git a/doc/CHANGES-2020 b/doc/CHANGES-2020 index dfff6c23c785..96509f61bf79 100644 --- a/doc/CHANGES-2020 +++ b/doc/CHANGES-2020 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2020,v 1.1479 2020/03/11 10:26:05 wiz Exp $ +$NetBSD: CHANGES-2020,v 1.1480 2020/03/11 10:28:39 wiz Exp $ Changes to the packages collection and infrastructure in 2020: @@ -2046,3 +2046,4 @@ Changes to the packages collection and infrastructure in 2020: Updated audio/fasttracker2 to 1.11 [fox 2020-03-11] Updated net/filezilla to 3.47.2 [wiz 2020-03-11] Removed devel/ethos [wiz 2020-03-11] + Removed geography/libchamplain06 successor geography/libchamplain012 [wiz 2020-03-11] diff --git a/geography/Makefile b/geography/Makefile index f6d67bec2707..919ed23e20ad 100644 --- a/geography/Makefile +++ b/geography/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2020/03/11 09:56:05 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2020/03/11 10:28:39 wiz Exp $ # COMMENT= Software for geographical-related uses @@ -24,7 +24,6 @@ SUBDIR+= gpxsee SUBDIR+= kplex SUBDIR+= libchamplain012 SUBDIR+= libchamplain04 -SUBDIR+= libchamplain06 SUBDIR+= libchamplain08 SUBDIR+= libdrg SUBDIR+= libgeotiff diff --git a/geography/libchamplain06/DESCR b/geography/libchamplain06/DESCR deleted file mode 100644 index 0a140c18fd4c..000000000000 --- a/geography/libchamplain06/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -libchamplain is a Clutter based widget to display rich, eye-candy and -interactive maps. diff --git a/geography/libchamplain06/Makefile b/geography/libchamplain06/Makefile deleted file mode 100644 index 7e5175c795cb..000000000000 --- a/geography/libchamplain06/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $NetBSD: Makefile,v 1.59 2020/03/10 22:08:48 wiz Exp $ -# - -DISTNAME= libchamplain-0.6.1 -PKGNAME= libchamplain06-0.6.1 -PKGREVISION= 55 -CATEGORIES= geography -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libchamplain/0.6/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://projects.gnome.org/libchamplain/ -COMMENT= Map widget -#LICENSE= # TODO: (see mk/license.mk) - -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake - -PKGCONFIG_OVERRIDE+= champlain-gtk.pc.in -PKGCONFIG_OVERRIDE+= champlain-memphis.pc.in -PKGCONFIG_OVERRIDE+= champlain.pc.in - -.include "../../devel/glib2/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../graphics/clutter-gtk0.10/buildlink3.mk" -.include "../../databases/sqlite3/buildlink3.mk" -.include "../../net/libsoup/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/geography/libchamplain06/PLIST b/geography/libchamplain06/PLIST deleted file mode 100644 index 42df34fc90d8..000000000000 --- a/geography/libchamplain06/PLIST +++ /dev/null @@ -1,33 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/26 11:07:18 drochner Exp $ -include/libchamplain-0.6/champlain/champlain-base-marker.h -include/libchamplain-0.6/champlain/champlain-defines.h -include/libchamplain-0.6/champlain/champlain-enum-types.h -include/libchamplain-0.6/champlain/champlain-error-tile-source.h -include/libchamplain-0.6/champlain/champlain-features.h -include/libchamplain-0.6/champlain/champlain-file-cache.h -include/libchamplain-0.6/champlain/champlain-layer.h -include/libchamplain-0.6/champlain/champlain-map-source-chain.h -include/libchamplain-0.6/champlain/champlain-map-source-desc.h -include/libchamplain-0.6/champlain/champlain-map-source-factory.h -include/libchamplain-0.6/champlain/champlain-map-source.h -include/libchamplain-0.6/champlain/champlain-marker.h -include/libchamplain-0.6/champlain/champlain-network-tile-source.h -include/libchamplain-0.6/champlain/champlain-point.h -include/libchamplain-0.6/champlain/champlain-polygon.h -include/libchamplain-0.6/champlain/champlain-selection-layer.h -include/libchamplain-0.6/champlain/champlain-tile-cache.h -include/libchamplain-0.6/champlain/champlain-tile-source.h -include/libchamplain-0.6/champlain/champlain-tile.h -include/libchamplain-0.6/champlain/champlain-version.h -include/libchamplain-0.6/champlain/champlain-view.h -include/libchamplain-0.6/champlain/champlain.h -include/libchamplain-gtk-0.6/champlain-gtk/champlain-gtk.h -include/libchamplain-gtk-0.6/champlain-gtk/gtk-champlain-embed.h -lib/libchamplain-0.6.la -lib/libchamplain-gtk-0.6.la -lib/pkgconfig/champlain-0.6.pc -lib/pkgconfig/champlain-gtk-0.6.pc -share/vala/vapi/champlain-0.6.deps -share/vala/vapi/champlain-0.6.vapi -share/vala/vapi/champlain-gtk-0.6.deps -share/vala/vapi/champlain-gtk-0.6.vapi diff --git a/geography/libchamplain06/buildlink3.mk b/geography/libchamplain06/buildlink3.mk deleted file mode 100644 index de9f9d03377e..000000000000 --- a/geography/libchamplain06/buildlink3.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.56 2020/03/10 22:08:48 wiz Exp $ - -BUILDLINK_TREE+= libchamplain06 - -.if !defined(LIBCHAMPLAIN06_BUILDLINK3_MK) -LIBCHAMPLAIN06_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.libchamplain06+= libchamplain06>=0.6.1 -BUILDLINK_ABI_DEPENDS.libchamplain06+= libchamplain06>=0.6.1nb55 -BUILDLINK_PKGSRCDIR.libchamplain06?= ../../geography/libchamplain06 - -.include "../../devel/glib2/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../graphics/clutter-gtk0.10/buildlink3.mk" -.include "../../databases/sqlite3/buildlink3.mk" -.include "../../net/libsoup/buildlink3.mk" -.endif # LIBCHAMPLAIN06_BUILDLINK3_MK - -BUILDLINK_TREE+= -libchamplain06 diff --git a/geography/libchamplain06/distinfo b/geography/libchamplain06/distinfo deleted file mode 100644 index 125c509204f6..000000000000 --- a/geography/libchamplain06/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 00:08:43 agc Exp $ - -SHA1 (libchamplain-0.6.1.tar.bz2) = f365597312f4e8b0dcc080eb7720d631d6425e4c -RMD160 (libchamplain-0.6.1.tar.bz2) = 7726a6991316ef9e46d0ae24cb6d22a91c759910 -SHA512 (libchamplain-0.6.1.tar.bz2) = 705fb2ae5c751257f6ffae179e12754c294afbd7a54268d2d33471998b02d00e830bae66e87f6e4f59ab552ab0c6fc8ca9396a4ee7b2714bf660d26f348aa2ff -Size (libchamplain-0.6.1.tar.bz2) = 694348 bytes -SHA1 (patch-aa) = dc6f2c9cecbcc55831d64f042210ff23f0e44940 -SHA1 (patch-ab) = 3f7a4089a36e6de7ec37ee8eb84314383eb241e4 diff --git a/geography/libchamplain06/patches/patch-aa b/geography/libchamplain06/patches/patch-aa deleted file mode 100644 index 5c8a7cea303c..000000000000 --- a/geography/libchamplain06/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/07/26 11:07:18 drochner Exp $ - ---- Makefile.in.orig 2010-06-26 22:01:30.000000000 +0000 -+++ Makefile.in -@@ -321,7 +321,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - - # Have the demos build at the end as they depend on optional parts --SUBDIRS = tidy champlain $(am__append_1) docs demos bindings -+SUBDIRS = tidy champlain $(am__append_1) demos bindings - ACLOCAL_AMFLAGS = -I m4 - pcfiles = champlain-@CHAMPLAIN_API_VERSION@.pc $(am__append_2) \ - $(am__append_4) diff --git a/geography/libchamplain06/patches/patch-ab b/geography/libchamplain06/patches/patch-ab deleted file mode 100644 index 3efc21e6780f..000000000000 --- a/geography/libchamplain06/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2012/02/02 17:27:19 drochner Exp $ - ---- tidy/Makefile.in.orig 2010-06-26 22:01:29.000000000 +0000 -+++ tidy/Makefile.in -@@ -273,7 +273,6 @@ INCLUDES = \ - -I$(top_srcdir) \ - -DPREFIX=\""$(prefix)"\" \ - -DLIBDIR=\""$(libdir)"\" \ -- -DG_DISABLE_DEPRECATED \ - -DG_LOG_DOMAIN=\"Tidy\" \ - $(DEPS_CFLAGS) \ - $(TIDY_DEBUG_CFLAGS) \