[Midnightbsd-cvs] mports [17543] trunk/sysutils/hal: update plist and man page install for hal.

[laffer1 at midnightbsd.org]

Revision: 17543
          http://svnweb.midnightbsd.org/mports/?rev=17543
Author:   laffer1
Date:     2014-09-27 09:35:45 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
update plist and man page install for hal.

Modified Paths:
--------------
    trunk/sysutils/hal/Makefile
    trunk/sysutils/hal/pkg-plist

Modified: trunk/sysutils/hal/Makefile
===================================================================
--- trunk/sysutils/hal/Makefile	2014-09-27 13:08:53 UTC (rev 17542)
+++ trunk/sysutils/hal/Makefile	2014-09-27 13:35:45 UTC (rev 17543)
@@ -2,7 +2,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.14
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
@@ -12,15 +12,16 @@
 LICENSE=	gpl2
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
-LIB_DEPENDS=	polkit.2:${PORTSDIR}/sysutils/policykit \
-		volume_id:${PORTSDIR}/devel/libvolume_id \
-		ck-connector:${PORTSDIR}/sysutils/consolekit
-RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids
+# keep shared lib ver to avoid polkit confusion
+LIB_DEPENDS=	libpolkit.so.2:${PORTSDIR}/sysutils/policykit \
+		libvolume_id.so:${PORTSDIR}/devel/libvolume_id \
+		libck-connector.so:${PORTSDIR}/sysutils/consolekit
+RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
+		bash:${PORTSDIR}/shells/bash
 
-USE_GMAKE=	yes
-USES=		pathfix gettext
-USE_GNOME=	intlhack ltverhack
-USE_AUTOTOOLS=	libtool
+USES=		gettext gmake libtool:keepla pathfix pkgconfig shebangfix
+USE_GNOME=	intlhack
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
@@ -43,6 +44,7 @@
 CONFIGURE_ENV=	GTKDOC="false"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+SHEBANG_FILES=	tools/hal-*
 
 #HALVERSION=	0.5.10
 #SNAPVERSION=	20080218
@@ -61,28 +63,18 @@
 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
+INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	FIXED_MOUNTPOINTS
+OPTIONS_DEFINE=	FIXED_MOUNTPOINTS DOCS
 FIXED_MOUNTPOINTS_DESC=	use fixed mountpoints
 
-.include <bsd.mport.options.mk>
+FIXED_MOUNTPOINTS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-tools_hal-storage-mount.c
 
-.if ${PORT_OPTIONS:MFIXED_MOUNTPOINTS}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-tools_hal-storage-mount.c
-.endif
-
 .include <bsd.port.pre.mk>
 
-.if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
 RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
-.endif
 
-.if ${OSVERSION} >= 800063
+.if ${OSVERSION} >= 5000
 PLIST_SUB+=	USB2=""
 .else
 PLIST_SUB+=	USB2="@comment "

Modified: trunk/sysutils/hal/pkg-plist
===================================================================
--- trunk/sysutils/hal/pkg-plist	2014-09-27 13:08:53 UTC (rev 17542)
+++ trunk/sysutils/hal/pkg-plist	2014-09-27 13:35:45 UTC (rev 17543)
@@ -69,6 +69,16 @@
 %%USB2%%libexec/hald-probe-video4linux
 libexec/hald-probe-volume
 libexec/hald-runner
+man/man1/hal-disable-polling.1.gz
+man/man1/hal-find-by-capability.1.gz
+man/man1/hal-find-by-property.1.gz
+man/man1/hal-get-property.1.gz
+man/man1/hal-is-caller-locked-out.1.gz
+man/man1/hal-is-caller-privileged.1.gz
+man/man1/hal-lock.1.gz
+man/man1/hal-set-property.1.gz
+man/man1/lshal.1.gz
+man/man8/hald.8.gz
 sbin/hald
 %%PORTDOCS%%%%DOCSDIR%%/README.freebsd
 %%PORTDOCS%%%%DOCSDIR%%/README.fuse
@@ -111,7 +121,7 @@
 @dirrm %%DATADIR%%/fdi
 @dirrm %%DATADIR%%/dist
 @dirrm %%DATADIR%%
- at dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/hal/scripts/freebsd
 @dirrm libexec/hal/scripts
 @dirrm libexec/hal
@@ -121,11 +131,10 @@
 @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
 @unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
 @unexec rm -rf /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
- at unexec rmdir /var/cache 2>/dev/null || true
 @unexec rmdir /var/lib/hal 2>/dev/null || true
- at unexec rmdir /var/lib 2>/dev/null || true