svn commit: r534893 - head/multimedia/webcamd

[Jan Beich]

Hans Petter Selasky <hselasky at FreeBSD.org> writes:

> Author: hselasky
> Date: Mon May 11 08:34:28 2020
> New Revision: 534893
> URL: https://svnweb.freebsd.org/changeset/ports/534893
>
> Log:
>   Only set COMPAT32 option when building 64-bit platforms.
>   
>   PR:		245698
>   Approved by:	pi (implicit)
[...]
> -.if exists(/usr/lib32/libcuse.so)
> +.include <bsd.port.options.mk>
> +
> +.if ${ARCH} == amd64 || ${ARCH} == aarch64
>  OPTIONS_DEFAULT+=	COMPAT32
>  .endif

Looks pointless. Not only it misses other 64-bit archs like powerpc64 but
also doesn't address bug 245698 where user accidentally enabled COMPAT option.

Try the following instead

Index: multimedia/webcamd/Makefile
===================================================================
--- multimedia/webcamd/Makefile	(revision 534907)
+++ multimedia/webcamd/Makefile	(working copy)
@@ -20,15 +20,13 @@ USE_RC_SUBR=	webcamd
 SUB_FILES=	webcamd.conf
 
 OPTIONS_DEFINE=	COMPAT32 DEBUG HAL VT_CLIENT VT_SERVER DVB INPUT KEYBOARD MOUSE RADIO WEBCAM
-OPTIONS_DEFAULT=DVB HAL INPUT RADIO WEBCAM
+OPTIONS_DEFAULT=COMPAT32 DVB HAL INPUT RADIO WEBCAM
 
 COMPAT32_DESC=	Enable 32-bit compatibility support
 COMPAT32_MAKE_ARGS=	HAVE_COMPAT32="YES"
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == amd64 || ${ARCH} == aarch64
-OPTIONS_DEFAULT+=	COMPAT32
+.if !exists(/usr/lib32/libcuse.so)
+OPTIONS_EXCLUDE+=	COMPAT32
 .endif
 
 HAL_DESC=	Build with HAL and DBUS support