Sun Nov 23 13:43:40 2008 UTC ()
Pull in hal, bump PKGREVISION


(jmcneill)
diff -r1.70 -r1.71 pkgsrc/sysutils/gnome-vfs/Makefile
diff -r1.12 -r1.13 pkgsrc/sysutils/gnome-vfs/Makefile.common
cvs diff -r1.70 -r1.71 pkgsrc/sysutils/gnome-vfs/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/Makefile 2008/08/15 01:41:42 1.70
+++ pkgsrc/sysutils/gnome-vfs/Makefile 2008/11/23 13:43:40 1.71
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.70 2008/08/15 01:41:42 dsainty Exp $ 1# $NetBSD: Makefile,v 1.71 2008/11/23 13:43:40 jmcneill Exp $
 2
 3PKGREVISION= 1
2 4
3PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in 5PKGCONFIG_OVERRIDE= gnome-vfs-2.0.pc.in
4PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in 6PKGCONFIG_OVERRIDE+= gnome-vfs-module-2.0.pc.in
5 7
6OWN_DIRS= ${PKG_SYSCONFDIR}/modules 8OWN_DIRS= ${PKG_SYSCONFDIR}/modules
7 9
8EGFILES+= modules/default-modules.conf 10EGFILES+= modules/default-modules.conf
9EGFILES+= modules/ssl-modules.conf 11EGFILES+= modules/ssl-modules.conf
10 12
11GCONF_SCHEMAS= desktop_default_applications.schemas 13GCONF_SCHEMAS= desktop_default_applications.schemas
12GCONF_SCHEMAS+= desktop_gnome_url_handlers.schemas 14GCONF_SCHEMAS+= desktop_gnome_url_handlers.schemas
13GCONF_SCHEMAS+= system_dns_sd.schemas 15GCONF_SCHEMAS+= system_dns_sd.schemas
14GCONF_SCHEMAS+= system_http_proxy.schemas 16GCONF_SCHEMAS+= system_http_proxy.schemas
cvs diff -r1.12 -r1.13 pkgsrc/sysutils/gnome-vfs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/gnome-vfs/Makefile.common 2008/10/16 12:30:16 1.12
+++ pkgsrc/sysutils/gnome-vfs/Makefile.common 2008/11/23 13:43:40 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.12 2008/10/16 12:30:16 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.13 2008/11/23 13:43:40 jmcneill Exp $
2# 2#
3 3
4GNOME_VFS_VERSION= 2.24.0 4GNOME_VFS_VERSION= 2.24.0
5 5
6DISTNAME= gnome-vfs-${GNOME_VFS_VERSION} 6DISTNAME= gnome-vfs-${GNOME_VFS_VERSION}
7CATEGORIES?= sysutils 7CATEGORIES?= sysutils
8CATEGORIES+= gnome 8CATEGORIES+= gnome
9MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.24/} 9MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.24/}
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://www.gnome.org/ 13HOMEPAGE= http://www.gnome.org/
14COMMENT= GNOME Virtual File System (v2) 14COMMENT= GNOME Virtual File System (v2)
@@ -35,49 +35,58 @@ CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SY @@ -35,49 +35,58 @@ CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SY
35MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale 35MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale
36 36
37INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} 37INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
38INSTALL_MAKE_FLAGS+= modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules 38INSTALL_MAKE_FLAGS+= modulesconfdir=${PREFIX}/share/examples/gnome-vfs-2.0/modules
39 39
40PKG_SYSCONFSUBDIR= gnome-vfs-2.0 40PKG_SYSCONFSUBDIR= gnome-vfs-2.0
41 41
42EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0 42EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0
43.for f in ${EGFILES} 43.for f in ${EGFILES}
44CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 44CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
45.endfor 45.endfor
46 46
47PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs 47PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-vfs
48PKG_SUPPORTED_OPTIONS+= inet6 gssapi 48PKG_SUPPORTED_OPTIONS+= inet6 gssapi hal
 49PKG_SUGGESTED_OPTIONS+= hal
49 50
50.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
51.if ${OPSYS} == NetBSD 52.if ${OPSYS} == NetBSD
52# Kerberos is built in - no additional dependency 53# Kerberos is built in - no additional dependency
53PKG_SUGGESTED_OPTIONS+= gssapi 54PKG_SUGGESTED_OPTIONS+= gssapi
54.endif 55.endif
55 56
56.include "../../mk/bsd.options.mk" 57.include "../../mk/bsd.options.mk"
57 58
58.if !empty(PKG_OPTIONS:Minet6) 59.if !empty(PKG_OPTIONS:Minet6)
59CONFIGURE_ARGS+= --enable-ipv6 60CONFIGURE_ARGS+= --enable-ipv6
60.else 61.else
61CONFIGURE_ARGS+= --disable-ipv6 62CONFIGURE_ARGS+= --disable-ipv6
62.endif 63.endif
63 64
64.if !empty(PKG_OPTIONS:Mgssapi) 65.if !empty(PKG_OPTIONS:Mgssapi)
65.include "../../mk/krb5.buildlink3.mk" 66.include "../../mk/krb5.buildlink3.mk"
66CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG} 67CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG}
67.else 68.else
68CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=none 69CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=none
69.endif 70.endif
70 71
 72.if !empty(PKG_OPTIONS:Mhal)
 73DEPENDS+= gnome-mount>=0.8:../../sysutils/gnome-mount
 74.include "../../sysutils/hal/buildlink3.mk"
 75CONFIGURE_ARGS+= --enable-hal
 76.else
 77CONFIGURE_ARGS+= --disable-hal
 78.endif
 79
71# XXX Work-around for a problem in the configure script which checks for 80# XXX Work-around for a problem in the configure script which checks for
72# statvfs(2) having SVR4 in mind. Solving this in the script itself could 81# statvfs(2) having SVR4 in mind. Solving this in the script itself could
73# be the right way to go, but it is out of the scope of a local patch; it 82# be the right way to go, but it is out of the scope of a local patch; it
74# could require changing the code a lot, which is already very... complex. 83# could require changing the code a lot, which is already very... complex.
75.if ${OPSYS} == "NetBSD" && !exists(/usr/include/fstyp.h) 84.if ${OPSYS} == "NetBSD" && !exists(/usr/include/fstyp.h)
76post-wrapper: 85post-wrapper:
77 ${MKDIR} -p ${BUILDLINK_DIR}/include/sys 86 ${MKDIR} -p ${BUILDLINK_DIR}/include/sys
78 ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h 87 ${TOUCH} ${BUILDLINK_DIR}/include/sys/fstyp.h
79.endif 88.endif
80 89
81# 90#
82# The following stuff is to allow easy building of modules distributed within 91# The following stuff is to allow easy building of modules distributed within
83# gnome-vfs as independent packages. 92# gnome-vfs as independent packages.