svn commit: r564686 - in head/multimedia/webcamd: . files

[Baptiste Daroussin]

Author: bapt
Date: Mon Feb  8 09:42:54 2021
New Revision: 564686
URL: https://svnweb.freebsd.org/changeset/ports/564686

Log:
  Drop dependency on HAL
  
  Webcamd does not need hal itself, it only pushes information into it.
  Given hal is not used anymore anywhere in freebsd, it is time to drop the support
  for it.
  
  Approved by:	hselasky (maintainer)

Modified:
  head/multimedia/webcamd/Makefile
  head/multimedia/webcamd/files/webcamd.in

Modified: head/multimedia/webcamd/Makefile
==============================================================================
--- head/multimedia/webcamd/Makefile	Mon Feb  8 09:27:49 2021	(r564685)
+++ head/multimedia/webcamd/Makefile	Mon Feb  8 09:42:54 2021	(r564686)
@@ -3,6 +3,7 @@
 
 PORTNAME=	webcamd
 DISTVERSION=	5.10.6.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	hselasky at FreeBSD.org
@@ -23,8 +24,8 @@ GH_PROJECT=	${PORTNAME}
 GH_TAGNAME=	v${DISTVERSION}
 GH_TUPLE=	torvalds:linux:v5.10-rc6:linux
 
-OPTIONS_DEFINE=	DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM
-OPTIONS_DEFAULT=DVB HAL INPUT RADIO WEBCAM
+OPTIONS_DEFINE=	DEBUG VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM
+OPTIONS_DEFAULT=DVB INPUT RADIO WEBCAM
 
 #
 # 32-bit compatibility support is mostly useful for
@@ -35,13 +36,6 @@ OPTIONS_DEFAULT_amd64=		COMPAT32
 
 COMPAT32_DESC=	Enable 32-bit compatibility support
 COMPAT32_MAKE_ARGS=	HAVE_COMPAT32="YES"
-
-HAL_DESC=	Build with HAL and DBUS support
-HAL_LIB_DEPENDS+=	libhal.so:sysutils/hal
-HAL_LIB_DEPENDS+=	libdbus-1.so:devel/dbus
-HAL_MAKE_ARGS=		HAVE_HAL="YES"
-HAL_SUB_LIST=		LIBHAL="${LOCALBASE}/lib/libhal.so:${LOCALBASE}/lib/libdbus-1.so:"
-HAL_SUB_LIST_OFF=	LIBHAL=""
 
 DEBUG_MAKE_ARGS=	HAVE_DEBUG="YES"
 

Modified: head/multimedia/webcamd/files/webcamd.in
==============================================================================
--- head/multimedia/webcamd/files/webcamd.in	Mon Feb  8 09:27:49 2021	(r564685)
+++ head/multimedia/webcamd/files/webcamd.in	Mon Feb  8 09:42:54 2021	(r564686)
@@ -98,18 +98,12 @@ load_rc_config $name
 devd_device=${2}
 devd_interface=${3-0}
 
-command=webcamd
+command=%%PREFIX%%/sbin/webcamd
 command_args="-B -U ${webcamd_user} -G ${webcamd_group}"
 
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 status_cmd="${name}_status"
-
-webcamd()
-{
-  # When running early we need to pre-load some libraries
-  env LD_PRELOAD=%%LIBHAL%% %%PREFIX%%/sbin/webcamd $*
-}
 
 webcamd_pids()
 {