summaryrefslogtreecommitdiff
path: root/sysutils/hal
diff options
context:
space:
mode:
authorAlberto Villa <avilla@FreeBSD.org>2015-06-15 11:33:05 +0000
committerAlberto Villa <avilla@FreeBSD.org>2015-06-15 11:33:05 +0000
commitd09a6545876770913d39d349aa2e2a3611633f54 (patch)
tree40ab5695c276c1231d569bf47039b825fa2e285c /sysutils/hal
parent- Update to 3.11.0.1 (diff)
sysutils/hal: add missing /var/lib to plist
Meanwhile, rewrite plist to use '@dir' instead of '@exec mkdir', and remove deprecated '@dirrm'. PR: 199984 Approved by: gnome (maintainer timeout) MFH: 2015Q2
Notes
Notes: svn path=/head/; revision=389685
Diffstat (limited to 'sysutils/hal')
-rw-r--r--sysutils/hal/Makefile2
-rw-r--r--sysutils/hal/pkg-plist47
2 files changed, 14 insertions, 35 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index dae15d3a5864..7902631d7fc5 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -4,7 +4,7 @@
PORTNAME= hal
DISTVERSION= 0.5.14
-PORTREVISION= 28
+PORTREVISION= 29
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/hal/pkg-plist b/sysutils/hal/pkg-plist
index ac70ee7c0fe6..317801f9d32b 100644
--- a/sysutils/hal/pkg-plist
+++ b/sysutils/hal/pkg-plist
@@ -9,9 +9,6 @@ bin/hal-is-caller-privileged
bin/hal-lock
bin/hal-set-property
bin/lshal
-@exec mkdir -p %D/etc/hal/fdi/preprobe
-@exec mkdir -p %D/etc/hal/fdi/policy
-@exec mkdir -p %D/etc/hal/fdi/information
include/hal/libhal-storage.h
include/hal/libhal.h
lib/libhal-storage.a
@@ -94,7 +91,6 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy
%%DATADIR%%/dist/hal.conf
%%DATADIR%%/fdi/fdi.dtd
%%DATADIR%%/fdi/information/10freedesktop/01-deprecated-keys.fdi
-@exec mkdir -p %D/%%DATADIR%%/fdi/information/20thirdparty
%%DATADIR%%/fdi/policy/10osvendor/10-dockstation.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-input-policy.fdi
%%DATADIR%%/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -108,35 +104,18 @@ share/PolicyKit/policy/org.freedesktop.hal.wol.policy
%%DATADIR%%/fdi/policy/10osvendor/20-storage-methods.fdi
%%DATADIR%%/fdi/policy/10osvendor/30-wol.fdi
%%DATADIR%%/mount-fuse
-@exec mkdir -p %D/%%DATADIR%%/fdi/policy/20thirdparty
-@exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/10osvendor
-@exec mkdir -p %D/%%DATADIR%%/fdi/preprobe/20thirdparty
-@dirrm %%DATADIR%%/fdi/preprobe/20thirdparty
-@dirrm %%DATADIR%%/fdi/preprobe/10osvendor
-@dirrm %%DATADIR%%/fdi/preprobe
-@dirrm %%DATADIR%%/fdi/policy/20thirdparty
-@dirrm %%DATADIR%%/fdi/policy/10osvendor
-@dirrm %%DATADIR%%/fdi/policy
-@dirrm %%DATADIR%%/fdi/information/20thirdparty
-@dirrm %%DATADIR%%/fdi/information/10freedesktop
-@dirrm %%DATADIR%%/fdi/information
-@dirrm %%DATADIR%%/fdi
-@dirrm %%DATADIR%%/dist
-@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/hal/scripts/freebsd
-@dirrm libexec/hal/scripts
-@dirrm libexec/hal
-@dirrm include/hal
-@dirrm etc/hal/fdi/preprobe
-@dirrm etc/hal/fdi/policy
-@dirrm etc/hal/fdi/information
-@dirrm etc/hal/fdi
-@dirrm etc/hal
@unexec rm -f /var/lib/PolicyKit/user-haldaemon.auths 2>/dev/null || true
@unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true
-@unexec rmdir /var/run/hald/hald-local 2>/dev/null || true
-@unexec rmdir /var/run/hald/hald-runner 2>/dev/null || true
-@unexec rmdir /var/run/hald 2>/dev/null || true
-@unexec rmdir /var/cache/hald 2>/dev/null || true
-@unexec rmdir /var/lib/hal 2>/dev/null || true
+@dir etc/hal/fdi/information
+@dir etc/hal/fdi/policy
+@dir etc/hal/fdi/preprobe
+@dir %%DATADIR%%/fdi/information/20thirdparty
+@dir %%DATADIR%%/fdi/policy/20thirdparty
+@dir %%DATADIR%%/fdi/preprobe/10osvendor
+@dir %%DATADIR%%/fdi/preprobe/20thirdparty
+@dir /var/cache/hald
+@dir /var/lib/hal
+@dir /var/lib
+@dir /var/run/hald/hald-local
+@dir /var/run/hald/hald-runner
+@dir /var/run/hald