svn commit: r364801 - head/sysutils/hal

[John Marino]

Author: marino
Date: Wed Aug 13 19:10:46 2014
New Revision: 364801
URL: http://svnweb.freebsd.org/changeset/ports/364801
QAT: https://qat.redports.org/buildarchive/r364801/

Log:
  sysutils/hal: Adjust pkg-plist so it passes stage-qa and leftover checks
  
  Hal was not passing poudriere testport or poudriere bulk -t runs due
  to failing the stage-qa tests and later a leftover check with
  /var/lib/PolicyKit/user-haldaemon.auths.  The reported error is actually
  not wrong, but rather an inadequacy in the check-plist logic.  However,
  hald is a dependency for a lot of ports and it keeps breaking bulk -t
  runs, so I switched "@unexec rm -rf" to "@unexec rmdir" to that it would
  build cleanly in poudriere (gnome@ had fair warning!).  If the check-plist
  logic is improved in the future, this can be changed back to the better
  "rm -rf" command then.
  
  While here, stop trying to remove directories that PolicyKit installed
  because this will always fail.  This clears up stage-qa warnings.
  
  PR:		191223
  Submitted by:	marino
  Approved by:	maintainer timeout (2 months, 2 pings)

Modified:
  head/sysutils/hal/Makefile
  head/sysutils/hal/pkg-plist

Modified: head/sysutils/hal/Makefile
==============================================================================
--- head/sysutils/hal/Makefile	Wed Aug 13 19:03:05 2014	(r364800)
+++ head/sysutils/hal/Makefile	Wed Aug 13 19:10:46 2014	(r364801)
@@ -4,7 +4,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.14
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 

Modified: head/sysutils/hal/pkg-plist
==============================================================================
--- head/sysutils/hal/pkg-plist	Wed Aug 13 19:03:05 2014	(r364800)
+++ head/sysutils/hal/pkg-plist	Wed Aug 13 19:10:46 2014	(r364801)
@@ -124,8 +124,6 @@ share/PolicyKit/policy/org.freedesktop.h
 @dirrm %%DATADIR%%/dist
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrmtry share/PolicyKit/policy
- at dirrmtry share/PolicyKit
 @dirrm libexec/hal/scripts/freebsd
 @dirrm libexec/hal/scripts
 @dirrm libexec/hal
@@ -135,10 +133,10 @@ share/PolicyKit/policy/org.freedesktop.h
 @dirrm etc/hal/fdi/information
 @dirrm etc/hal/fdi
 @dirrm etc/hal
+ at 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
- at unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
- at unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
+ at unexec rmdir /var/run/hald/hald-local 2>/dev/null || true
+ at 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
- at unexec rmdir /var/lib 2>/dev/null || true