Index: branches/2015Q2/sysutils/hal/Makefile =================================================================== --- branches/2015Q2/sysutils/hal/Makefile (revision 389686) +++ branches/2015Q2/sysutils/hal/Makefile (revision 389687) @@ -1,113 +1,113 @@ # Created by: 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= 28 +PORTREVISION= 29 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 # keep shlib version, to prevent confusion with polkit-* from sysutils/polkit 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 USES= gettext gmake libtool:keepla pathfix pkgconfig python shebangfix USE_GNOME= intlhack GNU_CONFIGURE= yes USE_LDCONFIG= 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= GTKDOC="false" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib bash_CMD= ${SH} SHEBANG_FILES= tools/hal-* #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}" INSTALL_TARGET= install-strip OPTIONS_DEFINE= FIXED_MOUNTPOINTS DOCS FIXED_MOUNTPOINTS_DESC= use fixed mountpoints FIXED_MOUNTPOINTS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-tools_hal-storage-mount.c .include .if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64") RUN_DEPENDS+= dmidecode:${PORTSDIR}/sysutils/dmidecode .endif .if ${OSVERSION} >= 800063 PLIST_SUB+= USB2="" .else PLIST_SUB+= USB2="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's/==/=/g' ${WRKSRC}/tools/hal-luks* @${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} ${STAGEDIR}${DATADIR}/dist ${INSTALL_DATA} ${WRKSRC}/hal.conf ${STAGEDIR}${DATADIR}/dist @${MKDIR} ${STAGEDIR}${PREFIX}/share/hal/fdi/policy/10osvendor ${INSTALL_DATA} ${FILESDIR}/10-mouse-sysmouse.fdi \ ${STAGEDIR}${PREFIX}/share/hal/fdi/policy/10osvendor ${INSTALL_SCRIPT} ${FILESDIR}/mount-fuse \ ${STAGEDIR}${PREFIX}/share/hal/mount-fuse .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \ ${STAGEDIR}${DOCSDIR}/README.freebsd ${INSTALL_DATA} ${WRKDIR}/README.fuse \ ${STAGEDIR}${DOCSDIR}/README.fuse .endif @${MKDIR} ${STAGEDIR}/var/lib/hal .include Index: branches/2015Q2/sysutils/hal/pkg-plist =================================================================== --- branches/2015Q2/sysutils/hal/pkg-plist (revision 389686) +++ branches/2015Q2/sysutils/hal/pkg-plist (revision 389687) @@ -1,142 +1,121 @@ @unexec %D/etc/rc.d/hald stop > /dev/null 2>&1 || true bin/hal-device bin/hal-disable-polling bin/hal-find-by-capability bin/hal-find-by-property bin/hal-get-property bin/hal-is-caller-locked-out 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 lib/libhal-storage.la lib/libhal-storage.so lib/libhal-storage.so.1 lib/libhal-storage.so.1.0.0 lib/libhal.a lib/libhal.la lib/libhal.so lib/libhal.so.1 lib/libhal.so.1.0.0 libdata/pkgconfig/hal-storage.pc libdata/pkgconfig/hal.pc libexec/hal-storage-cleanup-all-mountpoints libexec/hal-storage-cleanup-mountpoint libexec/hal-storage-closetray libexec/hal-storage-eject libexec/hal-storage-mount libexec/hal-storage-unmount libexec/hal-system-power-pm-is-supported libexec/hal-system-setserial libexec/hal/scripts/freebsd/hal-system-lcd-get-brightness-freebsd libexec/hal/scripts/freebsd/hal-system-lcd-set-brightness-freebsd libexec/hal/scripts/freebsd/hal-system-power-reboot-freebsd libexec/hal/scripts/freebsd/hal-system-power-set-power-save-freebsd libexec/hal/scripts/freebsd/hal-system-power-shutdown-freebsd libexec/hal/scripts/freebsd/hal-system-power-suspend-freebsd libexec/hal/scripts/hal-dockstation-undock libexec/hal/scripts/hal-functions libexec/hal/scripts/hal-luks-remove libexec/hal/scripts/hal-luks-setup libexec/hal/scripts/hal-luks-teardown libexec/hal/scripts/hal-system-killswitch-get-power libexec/hal/scripts/hal-system-killswitch-set-power libexec/hal/scripts/hal-system-lcd-get-brightness libexec/hal/scripts/hal-system-lcd-set-brightness libexec/hal/scripts/hal-system-power-hibernate libexec/hal/scripts/hal-system-power-reboot libexec/hal/scripts/hal-system-power-set-power-save libexec/hal/scripts/hal-system-power-shutdown libexec/hal/scripts/hal-system-power-suspend libexec/hal/scripts/hal-system-power-suspend-hybrid libexec/hal/scripts/hal-system-wol-enable libexec/hal/scripts/hal-system-wol-enabled libexec/hal/scripts/hal-system-wol-supported libexec/hald-addon-mouse-sysmouse libexec/hald-addon-storage libexec/hald-generate-fdi-cache libexec/hald-probe-hiddev libexec/hald-probe-mouse libexec/hald-probe-scsi libexec/hald-probe-smbios libexec/hald-probe-storage %%USB2%%libexec/hald-probe-usb2-device %%USB2%%libexec/hald-probe-usb2-interface %%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 share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy share/PolicyKit/policy/org.freedesktop.hal.leds.policy share/PolicyKit/policy/org.freedesktop.hal.policy share/PolicyKit/policy/org.freedesktop.hal.power-management.policy share/PolicyKit/policy/org.freedesktop.hal.storage.policy share/PolicyKit/policy/org.freedesktop.hal.wol.policy %%PORTDOCS%%%%DOCSDIR%%/README.freebsd %%PORTDOCS%%%%DOCSDIR%%/README.fuse %%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 %%DATADIR%%/fdi/policy/10osvendor/10-leds.fdi %%DATADIR%%/fdi/policy/10osvendor/10-mouse-sysmouse.fdi %%DATADIR%%/fdi/policy/10osvendor/10-power-mgmt-policy.fdi %%DATADIR%%/fdi/policy/10osvendor/10-rfkill-switch.fdi %%DATADIR%%/fdi/policy/10osvendor/10-tabletPCs.fdi %%DATADIR%%/fdi/policy/10osvendor/10-x11-input.fdi %%DATADIR%%/fdi/policy/10osvendor/15-storage-luks.fdi %%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 Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 389686) +++ branches/2015Q2 (revision 389687) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r389685