From ed2f9019ab404e4505db869a151dc37d797fae64 Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 29 Mar 2013 13:42:59 +0000 Subject: [PATCH] ugh, turns out i was looking at the wrong master_sites. update to 1.8 and clean things up a bit. ok aja@ --- net/libaccounts-glib/Makefile | 29 ++++++-------- net/libaccounts-glib/distinfo | 4 +- .../patch-libaccounts-glib_Makefile_in | 12 ------ .../patch-libaccounts-glib_ag-account_h | 15 ------- .../patch-libaccounts-glib_ag-manager_h | 15 ------- net/libaccounts-glib/pkg/PLIST | 39 ++++++++++++++++++- 6 files changed, 50 insertions(+), 64 deletions(-) delete mode 100644 net/libaccounts-glib/patches/patch-libaccounts-glib_Makefile_in delete mode 100644 net/libaccounts-glib/patches/patch-libaccounts-glib_ag-account_h delete mode 100644 net/libaccounts-glib/patches/patch-libaccounts-glib_ag-manager_h diff --git a/net/libaccounts-glib/Makefile b/net/libaccounts-glib/Makefile index 4c87d8d8774..8bf40ad7302 100644 --- a/net/libaccounts-glib/Makefile +++ b/net/libaccounts-glib/Makefile @@ -1,11 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2013/03/29 13:16:17 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2013/03/29 13:42:59 jasper Exp $ COMMENT= client library for the Accounts & SSO accounts database -V= 1.1 -BZR= bzr153 -DISTNAME= libaccounts-glib-${V}+${BZR} -PKGNAME= libaccounts-glib-$V +DISTNAME= libaccounts-glib-1.8 SHARED_LIBS += accounts-glib 0.0 # 1.3 @@ -14,25 +11,26 @@ CATEGORIES= net MAINTAINER= Jasper Lievisse Adriaanse , \ Antoine Jacoutot -HOMEPAGE= http://code.google.com/p/accounts-sso/ +HOMEPAGE= https://accounts-sso.googlecode.com/ # GPLv3 PERMIT_PACKAGE_CDROM=Yes -MASTER_SITES= https://launchpad.net/libaccounts-glib/trunk/${V}+${BZR}/+download/ +MASTER_SITES= ${HOMEPAGE}/files/ MODULES= devel/gettext \ lang/python -WANTLIB += c check dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gmodule-2.0 -WANTLIB += gobject-2.0 m pcre pthread sqlite3 xml2 z ffi +WANTLIB += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m pcre pthread +WANTLIB += sqlite3 xml2 z ffi BUILD_DEPENDS= devel/gobject-introspection \ - devel/py-gobject3 + devel/py-gobject3 \ + lang/vala \ + textproc/docbook-xsl RUN_DEPENDS= devel/py-gobject3 -LIB_DEPENDS= devel/check \ - textproc/libxml \ - x11/dbus-glib +LIB_DEPENDS= textproc/libxml +TEST_DEPENDS= devel/check USE_GMAKE=Yes @@ -40,11 +38,6 @@ CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ --enable-introspection -FAKE_FLAGS= libaccountsdocdir="${PREFIX}" \ - libaccountsdoc_DATA= - TEST_IS_INTERACTIVE=x11 -WRKDIST= ${WRKDIR}/libaccounts-glib-$V - .include diff --git a/net/libaccounts-glib/distinfo b/net/libaccounts-glib/distinfo index c895e097df4..1f453437b76 100644 --- a/net/libaccounts-glib/distinfo +++ b/net/libaccounts-glib/distinfo @@ -1,2 +1,2 @@ -SHA256 (libaccounts-glib-1.1+bzr153.tar.gz) = BvLWEaLzKzQM11++SvYtcsJKs4ZRSb/SGTYVoAptqJE= -SIZE (libaccounts-glib-1.1+bzr153.tar.gz) = 464311 +SHA256 (libaccounts-glib-1.8.tar.gz) = p9HqGsI0lGTrA5+agKy8Up0szRVPVF+zQP9ixXiE17w= +SIZE (libaccounts-glib-1.8.tar.gz) = 544737 diff --git a/net/libaccounts-glib/patches/patch-libaccounts-glib_Makefile_in b/net/libaccounts-glib/patches/patch-libaccounts-glib_Makefile_in deleted file mode 100644 index 18c4ccbf465..00000000000 --- a/net/libaccounts-glib/patches/patch-libaccounts-glib_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libaccounts-glib_Makefile_in,v 1.1.1.1 2013/03/29 13:16:17 jasper Exp $ ---- libaccounts-glib/Makefile.in.orig Fri Mar 29 13:55:57 2013 -+++ libaccounts-glib/Makefile.in Fri Mar 29 13:56:06 2013 -@@ -285,7 +285,7 @@ libaccounts_glib_la_CFLAGS = \ - -I$(top_srcdir) \ - -Wall -Werror - --libaccounts_glib_la_LIBADD = $(LIBACCOUNTS_LIBS) $(AEGISCRYPTO_LIBS) -lrt -+libaccounts_glib_la_LIBADD = $(LIBACCOUNTS_LIBS) $(AEGISCRYPTO_LIBS) - libaccounts_glib_la_LDFLAGS = \ - -version-info 1:3:1 \ - -export-symbols-regex '^ag_' diff --git a/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-account_h b/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-account_h deleted file mode 100644 index cddc820e53a..00000000000 --- a/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-account_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-libaccounts-glib_ag-account_h,v 1.2 2013/03/29 13:27:15 jasper Exp $ - -Don't redefine AgAccount which is already declared in ag-types.h. -https://code.google.com/p/accounts-sso/issues/detail?id=175 - ---- libaccounts-glib/ag-account.h.orig Fri Mar 29 13:54:02 2013 -+++ libaccounts-glib/ag-account.h Fri Mar 29 13:54:06 2013 -@@ -40,7 +40,6 @@ G_BEGIN_DECLS - - typedef struct _AgAccountClass AgAccountClass; - typedef struct _AgAccountPrivate AgAccountPrivate; --typedef struct _AgAccount AgAccount; - - /** - * AgAccountClass: diff --git a/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-manager_h b/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-manager_h deleted file mode 100644 index 735d75b60bb..00000000000 --- a/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-manager_h +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-libaccounts-glib_ag-manager_h,v 1.2 2013/03/29 13:27:15 jasper Exp $ - -Don't redefine AgManager which is already declared in ag-types.h. -https://code.google.com/p/accounts-sso/issues/detail?id=175 - ---- libaccounts-glib/ag-manager.h.orig Fri Mar 29 13:43:09 2013 -+++ libaccounts-glib/ag-manager.h Fri Mar 29 13:53:17 2013 -@@ -45,7 +45,6 @@ G_BEGIN_DECLS - - typedef struct _AgManagerClass AgManagerClass; - typedef struct _AgManagerPrivate AgManagerPrivate; --typedef struct _AgManager AgManager; - - /** - * AgManagerClass: diff --git a/net/libaccounts-glib/pkg/PLIST b/net/libaccounts-glib/pkg/PLIST index b9fbbb66314..70f38647afb 100644 --- a/net/libaccounts-glib/pkg/PLIST +++ b/net/libaccounts-glib/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2013/03/29 13:24:23 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.3 2013/03/29 13:42:59 jasper Exp $ @bin bin/ag-backup @bin bin/ag-tool include/libaccounts-glib/ @@ -21,6 +21,8 @@ lib/pkgconfig/libaccounts-glib.pc lib/python${MODPY_VERSION}/site-packages/gi/overrides/Accounts.py lib/python${MODPY_VERSION}/site-packages/gi/overrides/Accounts.pyc lib/python${MODPY_VERSION}/site-packages/gi/overrides/Accounts.pyo +@man man/man1/ag-backup.1 +@man man/man1/ag-tool.1 share/backup-framework/ share/backup-framework/applications/ share/backup-framework/applications/accounts.conf @@ -34,16 +36,49 @@ share/gtk-doc/html/libaccounts-glib/AgManager.html share/gtk-doc/html/libaccounts-glib/AgProvider.html share/gtk-doc/html/libaccounts-glib/AgService.html share/gtk-doc/html/libaccounts-glib/AgServiceType.html +share/gtk-doc/html/libaccounts-glib/account-management.html +share/gtk-doc/html/libaccounts-glib/ag-backup.html +share/gtk-doc/html/libaccounts-glib/ag-tool.html share/gtk-doc/html/libaccounts-glib/annotation-glossary.html +share/gtk-doc/html/libaccounts-glib/api-index-1-1.html +share/gtk-doc/html/libaccounts-glib/api-index-1-2.html +share/gtk-doc/html/libaccounts-glib/api-index-1-4.html +share/gtk-doc/html/libaccounts-glib/api-index-1-5.html share/gtk-doc/html/libaccounts-glib/api-index-deprecated.html share/gtk-doc/html/libaccounts-glib/api-index-full.html +share/gtk-doc/html/libaccounts-glib/appendices.html +share/gtk-doc/html/libaccounts-glib/gettext-xml-files.html +share/gtk-doc/html/libaccounts-glib/glossary.html share/gtk-doc/html/libaccounts-glib/home.png share/gtk-doc/html/libaccounts-glib/index.html share/gtk-doc/html/libaccounts-glib/index.sgml share/gtk-doc/html/libaccounts-glib/left.png +share/gtk-doc/html/libaccounts-glib/libaccounts-compiling.html +share/gtk-doc/html/libaccounts-glib/libaccounts-glib-objects.html +share/gtk-doc/html/libaccounts-glib/libaccounts-glib-overview.html +share/gtk-doc/html/libaccounts-glib/libaccounts-glib-tools.html share/gtk-doc/html/libaccounts-glib/libaccounts-glib.devhelp2 -share/gtk-doc/html/libaccounts-glib/libaccounts-glib.html +share/gtk-doc/html/libaccounts-glib/libaccounts-overview.html +share/gtk-doc/html/libaccounts-glib/libaccounts-running.html share/gtk-doc/html/libaccounts-glib/object-tree.html +share/gtk-doc/html/libaccounts-glib/provider-file-format.html share/gtk-doc/html/libaccounts-glib/right.png +share/gtk-doc/html/libaccounts-glib/service-file-format.html +share/gtk-doc/html/libaccounts-glib/service-type-file-format.html share/gtk-doc/html/libaccounts-glib/style.css share/gtk-doc/html/libaccounts-glib/up.png +share/gtk-doc/html/libaccounts-glib/validating-xml-files.html +share/gtk-doc/html/libaccounts-glib/xml-file-formats.html +share/gtk-doc/html/libaccounts-glib/xml-files.html +share/vala/ +share/vala/vapi/ +share/vala/vapi/accounts.deps +share/vala/vapi/accounts.vapi +share/xml/ +share/xml/accounts/ +share/xml/accounts/schema/ +share/xml/accounts/schema/dtd/ +share/xml/accounts/schema/dtd/accounts-application.dtd +share/xml/accounts/schema/dtd/accounts-provider.dtd +share/xml/accounts/schema/dtd/accounts-service-type.dtd +share/xml/accounts/schema/dtd/accounts-service.dtd