Update couchdb-glib to 0.7.4. On the pkgsrc side: passes pkglint (mostly)
and verifypc (mostly). Use newer libuuid in devel/ instead of wip/ (scheduled for removal). Include openssl's buildlink3.mk in Makefile and add p5-XML-LibXML to BUILD_DEPENDS. Remove libsoup24 and libuuid from buildlink3.mk - nothing links against them and nothing includes them in the headers. Add options framework to enable the user to build with gobject-introspection support (requires that json-glib is build with introspection support too - update coming). Fulfills and exceeds update request.
This commit is contained in:
Blue Rats
Thomas Klausner
parent
d35ec84bc4
commit
b8276dbfda
5 changed files with 47 additions and 19 deletions
|
|
@ -1,10 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.7 2012/09/24 18:26:55 asau Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2013/04/18 01:25:26 othyro Exp $
|
||||
#
|
||||
|
||||
DISTNAME= couchdb-glib-0.7.0
|
||||
DISTNAME= couchdb-glib-0.7.4
|
||||
CATEGORIES= databases gnome
|
||||
MASTER_SITES= ftp://ftp.gnome.org/pub/gnome/sources/couchdb-glib/0.7/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/couchdb-glib/0.7/}
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
MAINTAINER= pkgsrc.gnome@gmail.com
|
||||
HOMEPAGE= https://launchpad.net/couchdb-glib
|
||||
|
|
@ -13,16 +13,21 @@ LICENSE= gnu-gpl-v2
|
|||
|
||||
GNU_CONFIGURE= yes
|
||||
USE_LIBTOOL= yes
|
||||
USE_TOOLS+= pkg-config gmake
|
||||
USE_TOOLS+= gmake pkg-config
|
||||
|
||||
PKGCONFIG_OVERRIDE+= couchdb-glib.pc.in
|
||||
PKGCONFIG_OVERRIDE+= desktopcouch-glib.pc.in
|
||||
|
||||
.include "options.mk"
|
||||
|
||||
BUILD_DEPENDS+= p5-XML-LibXML-[0-9]*:../../textproc/p5-XML-LibXML
|
||||
.include "../../x11/gtk-sharp/buildlink3.mk"
|
||||
.include "../../security/openssl/buildlink3.mk"
|
||||
.include "../../devel/glib2/buildlink3.mk"
|
||||
.include "../../net/libsoup24/buildlink3.mk"
|
||||
BUILDLINK_DEPMETHOD.gnome-keyring= build
|
||||
.include "../../security/gnome-keyring/buildlink3.mk"
|
||||
.include "../../sysutils/dbus-glib/buildlink3.mk"
|
||||
.include "../../textproc/json-glib/buildlink3.mk"
|
||||
.include "../../wip/libuuid/buildlink3.mk"
|
||||
.include "../../devel/libuuid/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.3 2010/12/23 21:58:30 noud4 Exp $
|
||||
@comment $NetBSD: PLIST,v 1.4 2013/04/18 01:25:26 othyro Exp $
|
||||
include/couchdb-glib-1.0/couchdb-array-field.h
|
||||
include/couchdb-glib-1.0/couchdb-credentials.h
|
||||
include/couchdb-glib-1.0/couchdb-database-info.h
|
||||
|
|
@ -16,6 +16,10 @@ include/couchdb-glib-1.0/couchdb-struct-field.h
|
|||
include/couchdb-glib-1.0/couchdb-types.h
|
||||
include/desktopcouch-glib-1.0/desktopcouch-glib.h
|
||||
include/desktopcouch-glib-1.0/desktopcouch-session.h
|
||||
lib/couchdb-glib-sharp-1.0/couchdb-glib-sharp.dll
|
||||
lib/couchdb-glib-sharp-1.0/couchdb-glib-sharp.dll.config
|
||||
${PLIST.introspection}lib/girepository-1.0/Couchdb-1.0.typelib
|
||||
${PLIST.introspection}lib/girepository-1.0/Desktopcouch-1.0.typelib
|
||||
lib/libcouchdb-glib-1.0.la
|
||||
lib/libdesktopcouch-glib-1.0.la
|
||||
lib/pkgconfig/couchdb-glib-1.0.pc
|
||||
|
|
@ -24,19 +28,24 @@ share/doc/couchdb-glib/LICENSE
|
|||
share/doc/couchdb-glib/NEWS
|
||||
share/doc/couchdb-glib/README
|
||||
share/doc/couchdb-glib/couchdb-glib.doap
|
||||
${PLIST.introspection}share/gir-1.0/Couchdb-1.0.gir
|
||||
${PLIST.introspection}share/gir-1.0/Desktopcouch-1.0.gir
|
||||
share/gtk-doc/html/couchdb-glib/CouchdbCredentials.html
|
||||
share/gtk-doc/html/couchdb-glib/CouchdbDatabase.html
|
||||
share/gtk-doc/html/couchdb-glib/CouchdbDocument.html
|
||||
share/gtk-doc/html/couchdb-glib/CouchdbSession.html
|
||||
share/gtk-doc/html/couchdb-glib/CouchdbStructField.html
|
||||
share/gtk-doc/html/couchdb-glib/ch01.html
|
||||
share/gtk-doc/html/couchdb-glib/ch02.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-CouchdbArrayField.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-CouchdbDesignDocument.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-CouchdbDocumentContact.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-CouchdbDocumentTask.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-CouchdbQuery.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-CouchdbResponse.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-DesktopcouchSession.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-couchdb-array-field.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-couchdb-database-info.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-couchdb-document-info.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-couchdb-struct-field.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-desktopcouch-document-contact.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib-desktopcouch-document.html
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib.devhelp
|
||||
share/gtk-doc/html/couchdb-glib/couchdb-glib.devhelp2
|
||||
share/gtk-doc/html/couchdb-glib/home.png
|
||||
share/gtk-doc/html/couchdb-glib/index.html
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:46:58 thomasklausner Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.3 2013/04/18 01:25:26 othyro Exp $
|
||||
|
||||
BUILDLINK_TREE+= couchdb-glib
|
||||
|
||||
|
|
@ -11,9 +11,7 @@ BUILDLINK_PKGSRCDIR.couchdb-glib?= ../../wip/couchdb-glib
|
|||
|
||||
|
||||
.include "../../devel/glib2/buildlink3.mk"
|
||||
.include "../../net/libsoup24/buildlink3.mk"
|
||||
.include "../../textproc/json-glib/buildlink3.mk"
|
||||
.include "../../wip/libuuid/buildlink3.mk"
|
||||
.endif # COUCHDB_GLIB_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_TREE+= -couchdb-glib
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
$NetBSD: distinfo,v 1.3 2010/12/23 21:58:30 noud4 Exp $
|
||||
$NetBSD: distinfo,v 1.4 2013/04/18 01:25:26 othyro Exp $
|
||||
|
||||
SHA1 (couchdb-glib-0.7.0.tar.bz2) = c33a58aefcf66d0a3505fe019fe4734381cbcaf7
|
||||
RMD160 (couchdb-glib-0.7.0.tar.bz2) = 6bd9a4d5270829eff439f735ce6d2ea5297fad77
|
||||
Size (couchdb-glib-0.7.0.tar.bz2) = 334286 bytes
|
||||
SHA1 (couchdb-glib-0.7.4.tar.xz) = 112eb1491fae0f81718ba6e88480f59a1f6ce6d8
|
||||
RMD160 (couchdb-glib-0.7.4.tar.xz) = 20d3aa8113baaaaac1603aea0e851e27942c981b
|
||||
Size (couchdb-glib-0.7.4.tar.xz) = 322388 bytes
|
||||
|
|
|
|||
16
couchdb-glib/options.mk
Normal file
16
couchdb-glib/options.mk
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# $NetBSD: options.mk,v 1.1 2013/04/18 01:25:26 othyro Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.couchdb-glib
|
||||
PKG_SUPPORTED_OPTIONS= introspection
|
||||
PKG_SUGGESTED_OPTIONS+= introspection
|
||||
PLIST_VARS+= introspection
|
||||
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mintrospection)
|
||||
CONFIGURE_ARGS+= --enable-introspection=yes
|
||||
.include "../../devel/gobject-introspection/buildlink3.mk"
|
||||
PLIST.introspection= yes
|
||||
.else
|
||||
CONFIGURE_ARGS+= --enable-introspection=no
|
||||
.endif
|
||||
Loading…
Reference in a new issue