git: e3160483b6f3 - main - audio/owntone: add more options

The branch main has been updated by dinoex:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e3160483b6f31fd472e88875854fec61a14ecc41

commit e3160483b6f31fd472e88875854fec61a14ecc41
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2023-02-13 11:16:14 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2023-02-13 11:16:14 +0000

    audio/owntone: add more options
---
 audio/owntone/Makefile  | 42 ++++++++++++++++++++++++++++--------------
 audio/owntone/pkg-plist |  7 +++----
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/audio/owntone/Makefile b/audio/owntone/Makefile
index 4a298ea8c221..3130d206b33d 100644
--- a/audio/owntone/Makefile
+++ b/audio/owntone/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	owntone
 DISTVERSION=	28.5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/owntone/owntone-server/releases/download/${DISTVERSION}/
 
@@ -11,13 +11,13 @@ WWW=		https://github.com/owntone/owntone-server
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
-		libavahi-client.so:net/avahi-app \
+LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 		libavcodec.so:multimedia/ffmpeg \
 		libconfuse.so:devel/libconfuse \
 		libcurl.so:ftp/curl \
 		libevent_pthreads.so:devel/libevent \
 		libgcrypt.so:security/libgcrypt \
+		libgnutls.so:security/gnutls \
 		libgpg-error.so:security/libgpg-error \
 		libjson-c.so:devel/json-c \
 		libinotify.so:devel/libinotify \
@@ -25,47 +25,61 @@ LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
 		libplist-2.0.so:devel/libplist \
 		libsodium.so:security/libsodium \
 		libunistring.so:devel/libunistring \
-		libwebsockets.so:net/libwebsockets \
 		libprotobuf-c.so:devel/protobuf-c \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		tar:xz localbase libtool iconv:wchar_t pkgconfig gnome gmake gperf \
-		sqlite gnome pathfix
+USES=		tar:xz localbase libtool iconv:wchar_t pkgconfig gnome gmake \
+		gperf sqlite gnome pathfix
 USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
-
+CONFIGURE_ARGS=	--disable-install_systemd \
+		--with-owntone-user=${OWNTONE_USER} \
+		--with-owntone-group=${OWNTONE_USER}
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
-USERS=		daapd
-GROUPS=		daapd
+OWNTONE_USER?=	daapd
+USERS?=		daapd
+GROUPS?=	daapd
 
-OPTIONS_DEFINE=		ALSA ITUNES MPD PULSEAUDIO NLS DOCS
-OPTIONS_DEFAULT=	ITUNES MPD NLS DOCS
+OPTIONS_DEFINE=		ITUNES MPD AIRPLAY2 CHROMECAST WEBINTERFACE \
+			ALSA PULSEAUDIO NLS DOCS
+OPTIONS_DEFAULT=	ITUNES MPD AIRPLAY2 CHROMECAST WEBINTERFACE \
+			ALSA NLS DOCS
+NO_OPTIONS_SORT=yes
+OPTIONS_SUB=yes
 
+AIRPLAY2_DESC=		Prefer AirPlay 2
 ITUNES_DESC=		iTunes XML support
+CHROMECAST_DESC=	Chromecast support
 MPD_DESC=		Music Player Daemon protocol support
+WEBINTERFACE_DESC=	Install web interface
+
+AIRPLAY2_CONFIGURE_ENABLE=	preferairplay2
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_WITH=	alsa
 
 ITUNES_CONFIGURE_ENABLE=	itunes
 
+CHROMECAST_CONFIGURE_ENABLE=	chromecast
+
 MPD_CONFIGURE_ENABLE=		mpd
 
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 
+WEBINTERFACE_CONFIGURE_ENABLE=	webinterface
+WEBINTERFACE_CONFIGURE_WITH=	libwebsockets
+WEBINTERFACE_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
+
 NLS_USES=			gettext-runtime
 NLS_CONFIGURE_ENABLE=		nls
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/owntone/owntone-sqlext.so
-	${RM} ${STAGEDIR}${PREFIX}/etc/systemd/system/owntone.service
 	${MV} ${STAGEDIR}${PREFIX}/etc/owntone.conf \
 		${STAGEDIR}${PREFIX}/etc/owntone.conf.sample
-	${REINPLACE_CMD} -i '' -e 's|uid = "owntone"|uid = "daapd"|' \
-		${STAGEDIR}${PREFIX}/etc/owntone.conf.sample
 
 .include <bsd.port.mk>
diff --git a/audio/owntone/pkg-plist b/audio/owntone/pkg-plist
index 026cc05b7c4f..2dc65b023db1 100644
--- a/audio/owntone/pkg-plist
+++ b/audio/owntone/pkg-plist
@@ -1,5 +1,4 @@
 @sample etc/owntone.conf.sample
-etc/systemd/system/owntone@.service
 lib/owntone/owntone-sqlext.so
 man/man8/owntone.8.gz
 sbin/owntone
@@ -33,13 +32,13 @@ sbin/owntone
 %%DATADIR%%/htdocs/android-chrome-192x192.png
 %%DATADIR%%/htdocs/android-chrome-512x512.png
 %%DATADIR%%/htdocs/apple-touch-icon.png
-%%DATADIR%%/htdocs/assets/index.css
-%%DATADIR%%/htdocs/assets/index.js
+%%WEBINTERFACE%%%%DATADIR%%/htdocs/assets/index.css
+%%WEBINTERFACE%%%%DATADIR%%/htdocs/assets/index.js
 %%DATADIR%%/htdocs/browserconfig.xml
 %%DATADIR%%/htdocs/favicon-16x16.png
 %%DATADIR%%/htdocs/favicon-32x32.png
 %%DATADIR%%/htdocs/favicon.ico
-%%DATADIR%%/htdocs/index.html
+%%WEBINTERFACE%%%%DATADIR%%/htdocs/index.html
 %%DATADIR%%/htdocs/mstile-150x150.png
 %%DATADIR%%/htdocs/safari-pinned-tab.svg
 %%DATADIR%%/htdocs/site.webmanifest