Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 26 Dec 2019 16:11:32 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r520931 - head/net/geoclue
Message-ID:  <201912261611.xBQGBW8u031070@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Thu Dec 26 16:11:32 2019
New Revision: 520931
URL: https://svnweb.freebsd.org/changeset/ports/520931

Log:
  Update geoclue to 2.5.5.
  
  - Switch to meson build system.
  - Update WWW.
  - Samplefy the config file so local changes aren't overwritten.
  - Add options for DEMO agent en DOCS.
  
  PR:		242539 (merged with gnome development repo version)
  Submitted by:	arrowd@
  Obtained from:	gnome development repo

Modified:
  head/net/geoclue/Makefile
  head/net/geoclue/distinfo
  head/net/geoclue/pkg-descr
  head/net/geoclue/pkg-plist

Modified: head/net/geoclue/Makefile
==============================================================================
--- head/net/geoclue/Makefile	Thu Dec 26 15:50:56 2019	(r520930)
+++ head/net/geoclue/Makefile	Thu Dec 26 16:11:32 2019	(r520931)
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	geoclue
-PORTVERSION=	2.4.12
+PORTVERSION=	2.5.5
 CATEGORIES=	net devel gnome
-MASTER_SITES=	http://www.freedesktop.org/software/geoclue/releases/${PORTVERSION:R}/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	D-Bus service that provides location information
@@ -12,19 +11,37 @@ COMMENT=	D-Bus service that provides location informat
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
+BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libsoup-2.4.so:devel/libsoup \
 		libnotify.so:devel/libnotify
 
-USES=		gettext gmake gnome libtool localbase pathfix \
-		pkgconfig tar:xz
-USE_GNOME=	glib20 intlhack introspection:build
-GNU_CONFIGURE=	yes
+USES=		gettext gnome meson pkgconfig tar:xz
+
+USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-3g-source \
-		--disable-cdma-source \
-		--disable-nmea-source \
-		--disable-modem-gps-source
-INSTALL_TARGET=	install-strip
+
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.freedesktop.org
+GL_COMMIT=	9519d67c7a9a0e97a75115f9ff99d4fb0bb81b21
+
+MESON_ARGS=	-D3g-source=false \
+		-Dcdma-source=false \
+		-Dnmea-source=false \
+		-Dmodem-gps-source=false
+
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	DEMO DOCS
+
+DEMO_DESC=		Install geoclue demo agent
+DEMO_LIB_DEPENDS=	libnotify.so:devel/libnotify
+DEMO_MESON_TRUE=	demo-agent
+
+DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
+DOCS_MESON_TRUE=	gtk-doc
+
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/geoclue/geoclue.conf \
+		${STAGEDIR}${PREFIX}/etc/geoclue/geoclue.conf.sample
 
 .include <bsd.port.mk>

Modified: head/net/geoclue/distinfo
==============================================================================
--- head/net/geoclue/distinfo	Thu Dec 26 15:50:56 2019	(r520930)
+++ head/net/geoclue/distinfo	Thu Dec 26 16:11:32 2019	(r520931)
@@ -1,3 +1,3 @@
 TIMESTAMP = 1577366911
-SHA256 (geoclue-2.4.12.tar.xz) = 05d0e2ec077a685de2a9c63973fe6d18366ca53881d1f0750110b93c5c68caca
-SIZE (geoclue-2.4.12.tar.xz) = 398124
+SHA256 (geoclue-geoclue-9519d67c7a9a0e97a75115f9ff99d4fb0bb81b21_GL0.tar.gz) = 3a8f6efad90d203c30c4e6e01a7deb23b2680ecaab9582cfb28e43af38febdb7
+SIZE (geoclue-geoclue-9519d67c7a9a0e97a75115f9ff99d4fb0bb81b21_GL0.tar.gz) = 114264

Modified: head/net/geoclue/pkg-descr
==============================================================================
--- head/net/geoclue/pkg-descr	Thu Dec 26 15:50:56 2019	(r520930)
+++ head/net/geoclue/pkg-descr	Thu Dec 26 16:11:32 2019	(r520931)
@@ -3,4 +3,4 @@ the Geoclue project is to make creating location-aware
 possible, while the secondary goal is to ensure that no application can access location
 information without explicit permission from user.
 
-WWW: http://geoclue.freedesktop.org/
+WWW: https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home

Modified: head/net/geoclue/pkg-plist
==============================================================================
--- head/net/geoclue/pkg-plist	Thu Dec 26 15:50:56 2019	(r520930)
+++ head/net/geoclue/pkg-plist	Thu Dec 26 16:11:32 2019	(r520931)
@@ -1,7 +1,7 @@
 etc/dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf
 etc/dbus-1/system.d/org.freedesktop.GeoClue2.conf
-%%ETCDIR%%/geoclue.conf
-etc/xdg/autostart/geoclue-demo-agent.desktop
+@sample %%ETCDIR%%/geoclue.conf.sample
+%%DEMO%%etc/xdg/autostart/geoclue-demo-agent.desktop
 include/libgeoclue-2.0/gclue-client.h
 include/libgeoclue-2.0/gclue-enum-types.h
 include/libgeoclue-2.0/gclue-enums.h
@@ -17,9 +17,10 @@ lib/libgeoclue-2.so.0.0.0
 libdata/pkgconfig/geoclue-2.0.pc
 libdata/pkgconfig/libgeoclue-2.0.pc
 libexec/geoclue
+%%DEMO%%libexec/geoclue-2.0/demos/agent
 libexec/geoclue-2.0/demos/where-am-i
-libexec/geoclue-2.0/demos/agent
-share/applications/geoclue-demo-agent.desktop
+man/man5/geoclue.5.gz
+%%DEMO%%share/applications/geoclue-demo-agent.desktop
 share/applications/geoclue-where-am-i.desktop
 share/dbus-1/interfaces/org.freedesktop.GeoClue2.Agent.xml
 share/dbus-1/interfaces/org.freedesktop.GeoClue2.Client.xml
@@ -28,3 +29,50 @@ share/dbus-1/interfaces/org.freedesktop.GeoClue2.Manag
 share/dbus-1/interfaces/org.freedesktop.GeoClue2.xml
 share/dbus-1/system-services/org.freedesktop.GeoClue2.service
 share/gir-1.0/Geoclue-2.0.gir
+%%DOCS%%share/gtk-doc/html/geoclue/gdbus-org.freedesktop.GeoClue2.Agent.html
+%%DOCS%%share/gtk-doc/html/geoclue/gdbus-org.freedesktop.GeoClue2.Client.html
+%%DOCS%%share/gtk-doc/html/geoclue/gdbus-org.freedesktop.GeoClue2.Location.html
+%%DOCS%%share/gtk-doc/html/geoclue/gdbus-org.freedesktop.GeoClue2.Manager.html
+%%DOCS%%share/gtk-doc/html/geoclue/geoclue-gclue-enums.html
+%%DOCS%%share/gtk-doc/html/geoclue/geoclue.devhelp2
+%%DOCS%%share/gtk-doc/html/geoclue/home.png
+%%DOCS%%share/gtk-doc/html/geoclue/index.html
+%%DOCS%%share/gtk-doc/html/geoclue/ix01.html
+%%DOCS%%share/gtk-doc/html/geoclue/left-insensitive.png
+%%DOCS%%share/gtk-doc/html/geoclue/left.png
+%%DOCS%%share/gtk-doc/html/geoclue/license.html
+%%DOCS%%share/gtk-doc/html/geoclue/ref-agent-dbus.html
+%%DOCS%%share/gtk-doc/html/geoclue/ref-dbus.html
+%%DOCS%%share/gtk-doc/html/geoclue/right-insensitive.png
+%%DOCS%%share/gtk-doc/html/geoclue/right.png
+%%DOCS%%share/gtk-doc/html/geoclue/style.css
+%%DOCS%%share/gtk-doc/html/geoclue/up-insensitive.png
+%%DOCS%%share/gtk-doc/html/geoclue/up.png
+%%DOCS%%share/gtk-doc/html/libgeoclue/GClueClient.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/GClueClientProxy.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/GClueLocation.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/GClueLocationProxy.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/GClueManager.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/GClueManagerProxy.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/GClueSimple.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/annotation-glossary.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/ch01.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/ch02.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/ch03.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/ch04.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/ch05.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/home.png
+%%DOCS%%share/gtk-doc/html/libgeoclue/index.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/ix01.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/left-insensitive.png
+%%DOCS%%share/gtk-doc/html/libgeoclue/left.png
+%%DOCS%%share/gtk-doc/html/libgeoclue/libgeoclue-gclue-enums.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/libgeoclue.devhelp2
+%%DOCS%%share/gtk-doc/html/libgeoclue/license.html
+%%DOCS%%share/gtk-doc/html/libgeoclue/right-insensitive.png
+%%DOCS%%share/gtk-doc/html/libgeoclue/right.png
+%%DOCS%%share/gtk-doc/html/libgeoclue/style.css
+%%DOCS%%share/gtk-doc/html/libgeoclue/up-insensitive.png
+%%DOCS%%share/gtk-doc/html/libgeoclue/up.png
+share/vala/vapi/libgeoclue-2.0.deps
+share/vala/vapi/libgeoclue-2.0.vapi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912261611.xBQGBW8u031070>