Index: head/sysutils/hal/Makefile =================================================================== --- head/sysutils/hal/Makefile (revision 260170) +++ head/sysutils/hal/Makefile (revision 260171) @@ -1,124 +1,124 @@ # New ports collection makefile for: HAL # Date Created: 02 May 2006 # Whom: Joe Marcus Clarke # # $FreeBSD$ # $MCom: ports/sysutils/hal/Makefile,v 1.81 2010/04/13 02:49:07 mezz Exp $ # PORTNAME= hal DISTVERSION= 0.5.14 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Hardware Abstraction Layer for simplifying device access BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit \ volume_id.0:${PORTSDIR}/devel/libvolume_id \ ck-connector.0:${PORTSDIR}/sysutils/consolekit RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack ltverhack USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_PYTHON= yes CONFIGURE_ARGS= --disable-gtk-doc \ --with-backend=freebsd \ --disable-docbook-docs \ --with-pci-ids=${LOCALBASE}/share/pciids \ --disable-usb-ids \ --without-libpci \ --disable-usb \ --disable-smbios \ --disable-apm \ --disable-pmu \ --enable-policy-kit \ --enable-console-kit \ --with-socket-dir=/var/run/hald \ --with-eject=/usr/sbin/cdcontrol \ --with-pid-file=/var/run/hald/hald.pid \ --with-deprecated-keys \ --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ GTKDOC="false" #HALVERSION= 0.5.10 #SNAPVERSION= 20080218 USERS= haldaemon GROUPS= haldaemon USE_RC_SUBR= hald USE_GNOME_SUBR= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} PLIST_SUB= VERSION=${DISTVERSION} RC_FILES= hal.conf:${PREFIX}/etc/dbus-1/system.d PLIST_FILES= ${PRIV_FILES:S|^|%%DATADIR%%/dist/|} SUB_FILES= pkg-install pkg-deinstall SUB_LIST= RC_FILES="${RC_FILES}" MAN1= hal-disable-polling.1 hal-find-by-capability.1 \ hal-find-by-property.1 hal-get-property.1 \ hal-is-caller-locked-out.1 hal-is-caller-privileged.1 \ hal-lock.1 hal-set-property.1 lshal.1 MAN8= hald.8 OPTIONS= FIXED_MOUNTPOINTS "use fixed mountpoints" off .include .if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64") RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif .if defined(WITH_FIXED_MOUNTPOINTS) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c .endif .if ${OSVERSION} >= 800063 PLIST_SUB+= USB2="" .else PLIST_SUB+= USB2="@comment " .endif post-patch: @${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \ ${WRKSRC}/tools/Makefile.in \ ${WRKSRC}/tools/freebsd/Makefile.in @${REINPLACE_CMD} -e 's|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \ ${WRKSRC}/hald/Makefile.in \ ${WRKSRC}/tools/Makefile.in @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \ ${WRKSRC}/hal.conf.in @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ < ${FILESDIR}/README.fuse > ${WRKDIR}/README.fuse post-install: ${MKDIR} ${DATADIR}/dist ${INSTALL_DATA} ${WRKSRC}/hal.conf ${DATADIR}/dist ${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor ${INSTALL_DATA} ${FILESDIR}/10-mouse-sysmouse.fdi \ ${PREFIX}/share/hal/fdi/policy/10osvendor ${INSTALL_SCRIPT} ${FILESDIR}/mount-fuse \ ${PREFIX}/share/hal/mount-fuse .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \ ${DOCSDIR}/README.freebsd ${INSTALL_DATA} ${WRKDIR}/README.fuse \ ${DOCSDIR}/README.fuse .endif .include Property changes on: head/sysutils/hal/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.63 \ No newline at end of property +1.64 \ No newline at end of property Index: head/sysutils/hal/files/patch-hald_hf-storage.c =================================================================== --- head/sysutils/hal/files/patch-hald_hf-storage.c (revision 260170) +++ head/sysutils/hal/files/patch-hald_hf-storage.c (revision 260171) @@ -1,79 +1,81 @@ --- hald/freebsd/hf-storage.c.orig 2009-08-24 08:42:29.000000000 -0400 -+++ hald/freebsd/hf-storage.c 2010-02-26 08:29:38.000000000 -0500 ++++ hald/freebsd/hf-storage.c 2010-08-29 12:22:03.000000000 -0400 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -418,10 +419,41 @@ hf_storage_parse_conftxt (const char *co continue; } + /* XXX This is a hack, but we need to ignore dynamic labels like + * ufsids which are created and destroyed based on whether or not + * the actual device is mounted or not. If we don't then strange + * things happen in applications like nautilus. + */ + if ((! strcmp(fields[1], "LABEL") || + ! strcmp(fields[1], "BSD") || + ! strcmp(fields[1], "PART")) && -+ ! (strncmp(fields[2], "ufsid/", strlen("ufsid/")) || -+ ! strncmp(fields[2], "ufs/", strlen("ufs/")))) ++ (! strncmp(fields[2], "ufsid/", strlen("ufsid/")) || ++ ! strncmp(fields[2], "ufs/", strlen("ufs/")))) + { + g_strfreev(fields); + continue; + } + geom_obj = g_new0(Geom_Object, 1); geom_obj->class = g_strdup(fields[1]); geom_obj->dev = g_strdup(fields[2]); + /* Allow for spaces in label names. */ + if (! strcmp(fields[1], "LABEL")) + { + int j; + + for (j = 3; g_strv_length(fields) > (j + 2) && + strcmp(fields[j + 2], "i"); j++) + { + char *tmp; + + tmp = g_strdup_printf("%s %s", geom_obj->dev, fields[j]); + g_free(geom_obj->dev); + geom_obj->dev = tmp; + } + } + geom_obj->type = -1; /* We use -1 here to denote a missing type. */ geom_obj->hash = hash; -@@ -589,11 +621,16 @@ hf_storage_devd_notify (const char *syst +@@ -589,11 +621,18 @@ hf_storage_devd_notify (const char *syst char *conftxt; GSList *new_disks; - if (strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || + if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") || ++ ! strncmp(data, "cdev=ufs/", strlen("cdev=ufs/")) || ++ ! strncmp(data, "cdev=ufsid/", strlen("cdev=ufsid/")) || (strcmp(type, "CREATE") && strcmp(type, "DESTROY"))) return FALSE; + if (! strcmp(type, "DESTROY")) + g_usleep(G_USEC_PER_SEC/2); + conftxt = hf_get_string_sysctl(NULL, "kern.geom.conftxt"); + if (! conftxt) + return FALSE; new_disks = hf_storage_parse_conftxt(conftxt); g_free(conftxt); -@@ -669,7 +706,7 @@ hf_storage_conftxt_timeout_cb (gpointer +@@ -669,7 +708,7 @@ hf_storage_conftxt_timeout_cb (gpointer if (hf_is_waiting) return TRUE; - hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", NULL); + hf_storage_devd_notify("DEVFS", "CDEV", "CREATE", ""); return TRUE; } Property changes on: head/sysutils/hal/files/patch-hald_hf-storage.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property