diff --git a/geo/geoclue/Makefile b/geo/geoclue/Makefile index a75aaa92655..054263e20aa 100644 --- a/geo/geoclue/Makefile +++ b/geo/geoclue/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.15 2012/04/04 10:03:12 landry Exp $ +# $OpenBSD: Makefile,v 1.16 2012/09/21 13:19:01 jasper Exp $ COMMENT= modular geoinformation service on top of D-Bus -DISTNAME= geoclue-0.12.0 -SHARED_LIBS += geoclue 1.0 # .0.0 +DISTNAME= geoclue-0.12.99 +SHARED_LIBS += geoclue 1.1 # .0.0 CATEGORIES= geo devel -REVISION= 5 - HOMEPAGE= http://geoclue.freedesktop.org/ # LGPLv2 @@ -16,30 +14,28 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c dbus-1 dbus-glib-1 ffi gconf-2 gcrypt gio-2.0 glib-2.0 -WANTLIB += gmodule-2.0 gnome-keyring gobject-2.0 gpg-error gps -WANTLIB += gthread-2.0 m pcre pthread soup-2.4 soup-gnome-2.4 -WANTLIB += sqlite3 xml2 z +MASTER_SITES= http://freedesktop.org/~hadess/ -MASTER_SITES= http://folks.o-hand.com/jku/geoclue-releases/ \ - http://distfiles.nl/ +MODULES= devel/dconf \ + devel/gettext -MODULES= devel/gettext +WANTLIB += c dbus-1 dbus-glib-1 ffi gcrypt gio-2.0 glib-2.0 gmodule-2.0 +WANTLIB += gnome-keyring gobject-2.0 gpg-error gps gthread-2.0 +WANTLIB += m pcre pthread soup-2.4 soup-gnome-2.4 sqlite3 xml2 +WANTLIB += z +BUILD_DEPENDS = textproc/libxslt LIB_DEPENDS = devel/libsoup,-gnome \ misc/gpsd \ - x11/dbus-glib \ - devel/gconf2 + x11/dbus-glib USE_GMAKE= Yes USE_LIBTOOL= Yes -# for xsltproc -BUILD_DEPENDS = textproc/libxslt - CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-gtk-doc=no + --enable-gtk-doc=no \ + --enable-gtk=no #CONFIGURE_ARGS+= --enable-system-bus CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/geo/geoclue/distinfo b/geo/geoclue/distinfo index 7664d15b3c5..328d48bcbed 100644 --- a/geo/geoclue/distinfo +++ b/geo/geoclue/distinfo @@ -1,5 +1,2 @@ -MD5 (geoclue-0.12.0.tar.gz) = M6+DB/My4AZa8FbsumX+wg== -RMD160 (geoclue-0.12.0.tar.gz) = 8BmMW2R432mbccWF0n1sidV/SWo= -SHA1 (geoclue-0.12.0.tar.gz) = DH0zIqyA5QMrjdWCatdlF/NMkv0= -SHA256 (geoclue-0.12.0.tar.gz) = D1M/F3rpqjXoB6AcdUhA9m35V59VJFUvFPK1umcKRpY= -SIZE (geoclue-0.12.0.tar.gz) = 567552 +SHA256 (geoclue-0.12.99.tar.gz) = /jlskctS3kIZKB9NkiMVYzj8A2cNNHACgehtE5m4CnI= +SIZE (geoclue-0.12.99.tar.gz) = 608074 diff --git a/geo/geoclue/patches/patch-configure b/geo/geoclue/patches/patch-configure index bb50518166b..2c80542b1d7 100644 --- a/geo/geoclue/patches/patch-configure +++ b/geo/geoclue/patches/patch-configure @@ -1,10 +1,10 @@ -$OpenBSD: patch-configure,v 1.2 2010/11/25 08:56:58 sebastia Exp $ +$OpenBSD: patch-configure,v 1.3 2012/09/21 13:19:01 jasper Exp $ Link against -pthread ---- configure.orig Thu Mar 25 22:41:36 2010 -+++ configure Tue Nov 2 12:53:54 2010 -@@ -11987,7 +11987,7 @@ fi +--- configure.orig Tue Jul 31 18:59:39 2012 ++++ configure Thu Sep 20 20:06:51 2012 +@@ -13144,7 +13144,7 @@ fi if test "x$have_skyhook" = "xyes"; then PROVIDER_SUBDIRS="$PROVIDER_SUBDIRS skyhook" diff --git a/geo/geoclue/pkg/PLIST b/geo/geoclue/pkg/PLIST index 6a277bd923c..407c36ee850 100644 --- a/geo/geoclue/pkg/PLIST +++ b/geo/geoclue/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2012/04/04 10:03:12 landry Exp $ +@comment $OpenBSD: PLIST,v 1.4 2012/09/21 13:19:01 jasper Exp $ %%SHARED%% include/geoclue/ include/geoclue/gc-iface-address.h @@ -38,6 +38,9 @@ lib/pkgconfig/geoclue.pc @bin libexec/geoclue-plazes @bin libexec/geoclue-skyhook @bin libexec/geoclue-yahoo +share/GConf/ +share/GConf/gsettings/ +share/GConf/gsettings/geoclue share/dbus-1/ share/dbus-1/services/ share/dbus-1/services/org.freedesktop.Geoclue.Master.service @@ -64,8 +67,7 @@ share/geoclue-providers/geoclue-nominatim.provider share/geoclue-providers/geoclue-plazes.provider share/geoclue-providers/geoclue-skyhook.provider share/geoclue-providers/geoclue-yahoo.provider -share/gtk-doc/ -share/gtk-doc/html/ +share/glib-2.0/schemas/org.freedesktop.Geoclue.gschema.xml share/gtk-doc/html/geoclue/ share/gtk-doc/html/geoclue/Address.html share/gtk-doc/html/geoclue/Geoclue.html @@ -88,7 +90,6 @@ share/gtk-doc/html/geoclue/geoclue-geoclue-accuracy.html share/gtk-doc/html/geoclue/geoclue-geoclue-address-details.html share/gtk-doc/html/geoclue/geoclue-geoclue-error.html share/gtk-doc/html/geoclue/geoclue-geoclue-types.html -share/gtk-doc/html/geoclue/geoclue.devhelp share/gtk-doc/html/geoclue/geoclue.devhelp2 share/gtk-doc/html/geoclue/home.png share/gtk-doc/html/geoclue/index.html @@ -101,3 +102,5 @@ share/gtk-doc/html/geoclue/simple-example.html share/gtk-doc/html/geoclue/simple-master-example.html share/gtk-doc/html/geoclue/style.css share/gtk-doc/html/geoclue/up.png +@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null +@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null