Import of pkgsrc-2015Q1

sysutils/hal/Makefile

@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.67 2013/07/12 10:45:03 jperkin Exp $
+# $NetBSD: Makefile,v 1.72 2015/01/31 12:08:55 wiz Exp $
 
 DISTNAME=		hal-0.5.14
-PKGREVISION=		12
+PKGREVISION=		15
 CATEGORIES=		sysutils
 MASTER_SITES=		http://hal.freedesktop.org/releases/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		netbsd-desktop@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://hal.freedesktop.org/
 COMMENT=		FreeDesktop hardware abstraction layer
 LICENSE=		gnu-gpl-v2
@@ -72,7 +72,7 @@ PLIST_SRC=		PLIST
 
 CFLAGS.SunOS+=		-Du_int32_t=uint32_t
 
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
+.if ${OPSYS} == "Darwin"
 BUILDLINK_TRANSFORM+=	rm:-Wl,--as-needed
 .endif
 

sysutils/hal/files/hald-netbsd/devinfo_mass.c

@@ -1,4 +1,4 @@
-/* $NetBSD: devinfo_mass.c,v 1.4 2010/12/26 20:59:31 markd Exp $ */
+/* $NetBSD: devinfo_mass.c,v 1.6 2015/01/31 12:08:55 wiz Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca>
@@ -230,7 +230,7 @@ devinfo_mass_add(HalDevice *parent, const char *devnode, char *devfs_path, char
 	}
 	if (gparent_devnode && strstr (gparent_devnode, "umass") == gparent_devnode)
 		hal_device_property_set_string (d, "storage.bus", "usb");
-	else if (strstr (parent_devnode, "atabus") == parent_devnode)
+	else if (parent_devnode && strstr (parent_devnode, "atabus") == parent_devnode)
 		hal_device_property_set_string (d, "storage.bus", "ide");
 	else
 		hal_device_property_set_string (d, "storage.bus", "scsi");
@@ -387,20 +387,22 @@ devinfo_mass_disklabel_add(HalDevice *parent, const char *devnode, char *devfs_p
 	vid = volume_id_open_fd (fd);
 	if (vid) {
 		if (volume_id_probe_all (vid, 0, psize) == 0) {
-			char *type;
+			const char *type,*fstype;
 
 			hal_device_property_set_string (d, "volume.label", vid->label);
 			hal_device_property_set_string (d, "volume.partition.label", vid->label);
 			hal_device_property_set_string (d, "volume.uuid", vid->uuid);
 			hal_device_property_set_string (d, "volume.partition.uuid", vid->uuid);
 
-			if (volume_id_get_type (vid, &type) && type != NULL)
-				if (strcmp (type, "vfat") == 0) {
-					HAL_INFO (("%s disklabel reports %s but libvolume_id says it is "
-					    "%s, assuming disklabel is incorrect",
-					    devpath, devinfo_mass_get_fstype (part->p_fstype), type));
+			if ( type && volume_id_get_type (vid, &type)) {
+				fstype=devinfo_mass_get_fstype (part->p_fstype);
+				if (strcmp (type, fstype)) {
+					HAL_INFO (("%s disklabel reports [%s] but libvolume_id says it is "
+					    "[%s], assuming disklabel is incorrect",
+					    devpath, fstype, type));
 					hal_device_property_set_string (d, "volume.fstype", type);
 				}
+			}
 		}
 		volume_id_close (vid);
 	}

sysutils/hal/files/hald-netbsd/devinfo_misc.c

@@ -137,12 +137,12 @@ devinfo_default_apply_quirks(HalDevice *d, const char *devnode)
 
 /* acpiacad(4) */
 	if (strncmp (devnode, "acpiacad", 8) == 0) {
-		HAL_INFO (("%s: applying acpiacad quirks"));
+		HAL_INFO (("%s: applying acpiacad quirks",devnode));
 		hal_device_add_capability (d, "ac_adapter");
 
 /* acpibat(4) */
 	} else if (strncmp (devnode, "acpibat", 7) == 0) {
-		HAL_INFO (("%s: applying acpibat quirks"));
+		HAL_INFO (("%s: applying acpibat quirks",devnode));
 		hal_device_add_capability (d, "battery");
 		hal_device_property_set_string (d, "battery.type", "primary");
 	}

sysutils/hal/files/hald-netbsd/drvctl.c

@@ -123,7 +123,7 @@ drvctl_dev_add(gchar *name)
 		parent = hal_device_store_match_key_value_string (
 		    hald_get_gdl(), "netbsd.device", pdevnode);
 		if (parent == NULL)
-			HAL_INFO (("dev_add: name=%s but netbsd.device=%s not found", pdevnode));
+			HAL_INFO (("dev_add: name=%s but netbsd.device=%s not found",name, pdevnode));
 	}
 
 	d = devinfo_add_node (parent, name);
@@ -245,7 +245,7 @@ drvctl_find_device_with_child(const gchar *curnode, const gchar *devnode,
 	if (laa.l_childname)
 		free(laa.l_childname);
 
-	/* HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode)); */
+	HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode));
 	return FALSE;
 }