Fri Nov 19 01:12:24 2010 UTC ()
No need gtkdoc-rebase workaround anymore.


(obache)
diff -r1.13 -r1.14 pkgsrc/devel/GConf/Makefile.common
cvs diff -r1.13 -r1.14 pkgsrc/devel/GConf/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/GConf/Makefile.common 2010/11/15 19:55:10 1.13
+++ pkgsrc/devel/GConf/Makefile.common 2010/11/19 01:12:23 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.13 2010/11/15 19:55:10 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.14 2010/11/19 01:12:23 obache Exp $
2# 2#
3# used by devel/GConf/Makefile 3# used by devel/GConf/Makefile
4# used by devel/GConf-ui/Makefile 4# used by devel/GConf-ui/Makefile
5 5
6GCONF_VERSION= 2.32.0 6GCONF_VERSION= 2.32.0
7 7
8DISTNAME= GConf-${GCONF_VERSION} 8DISTNAME= GConf-${GCONF_VERSION}
9CATEGORIES= devel gnome 9CATEGORIES= devel gnome
10MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.32/} 10MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.32/}
11EXTRACT_SUFX= .tar.bz2 11EXTRACT_SUFX= .tar.bz2
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.gnome.org/projects/gconf/ 14HOMEPAGE= http://www.gnome.org/projects/gconf/
@@ -27,19 +27,15 @@ PATCHDIR= ${.CURDIR}/../GConf/patches @@ -27,19 +27,15 @@ PATCHDIR= ${.CURDIR}/../GConf/patches
27USE_PKGLOCALEDIR= yes 27USE_PKGLOCALEDIR= yes
28GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
29USE_LIBTOOL= yes 29USE_LIBTOOL= yes
30USE_TOOLS+= gmake intltool msgfmt perl pkg-config 30USE_TOOLS+= gmake intltool msgfmt perl pkg-config
31 31
32PKGCONFIG_OVERRIDE= gconf-2.0.pc.in 32PKGCONFIG_OVERRIDE= gconf-2.0.pc.in
33 33
34PKG_SYSCONFSUBDIR= gconf 34PKG_SYSCONFSUBDIR= gconf
35 35
36CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 36CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
37CONFIGURE_ARGS+= --with-sysconfsubdir= 37CONFIGURE_ARGS+= --with-sysconfsubdir=
38CONFIGURE_ARGS+= --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults 38CONFIGURE_ARGS+= --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
39 39
40# Workaround for Upstream Bug#562310. 
41# for more detail, see also PR#41475. 
42TOOLS_NOOP+= gtkdoc-rebase 
43 
44BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0 40BUILDLINK_API_DEPENDS.glib2+= glib2>=2.10.0
45.include "../../devel/glib2/buildlink3.mk" 41.include "../../devel/glib2/buildlink3.mk"