svn commit: r534079 - head/ftp/wzdftpd

[Rene Ladan]

Author: rene
Date: Tue May  5 12:38:28 2020
New Revision: 534079
URL: https://svnweb.freebsd.org/changeset/ports/534079

Log:
  ftp/wzdftpd: remove expired optional dependency on net/howl

Modified:
  head/ftp/wzdftpd/Makefile
  head/ftp/wzdftpd/pkg-plist

Modified: head/ftp/wzdftpd/Makefile
==============================================================================
--- head/ftp/wzdftpd/Makefile	Tue May  5 12:20:25 2020	(r534078)
+++ head/ftp/wzdftpd/Makefile	Tue May  5 12:38:28 2020	(r534079)
@@ -21,10 +21,9 @@ USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	wzdftpd
 
-OPTIONS_DEFINE=	ICONV IPV6 MYSQL PERL PGSQL SQLITE TCL DOCS
-OPTIONS_RADIO=	TLS ZEROCONF
+OPTIONS_DEFINE=	AVAHI ICONV IPV6 MYSQL PERL PGSQL SQLITE TCL DOCS
+OPTIONS_RADIO=	TLS
 OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
-OPTIONS_RADIO_ZEROCONF=	AVAHI HOWL
 OPTIONS_DEFAULT=	AVAHI GNUTLS
 OPTIONS_SUB=	yes
 
@@ -60,19 +59,6 @@ SQLITE_USES=			sqlite:3
 AVAHI_CONFIGURE_ON=	--with-zeroconf --enable-avahi
 AVAHI_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libavahi-core.so:net/avahi-app
-
-HOWL_DESC=		Zeroconf support via Howl
-HOWL_CONFIGURE_ON=	--with-zeroconf --enable-howl
-HOWL_CPPFLAGS=		-I${LOCALBASE}/include/howl
-HOWL_LIB_DEPENDS=	libhowl.so:net/howl
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MAVAHI} || ${PORT_OPTIONS:MHOWL}
-PLIST_SUB+=	ZEROCONF=""
-.else
-PLIST_SUB+=	ZEROCONF="@comment "
-.endif
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/config.rpath

Modified: head/ftp/wzdftpd/pkg-plist
==============================================================================
--- head/ftp/wzdftpd/pkg-plist	Tue May  5 12:20:25 2020	(r534078)
+++ head/ftp/wzdftpd/pkg-plist	Tue May  5 12:38:28 2020	(r534079)
@@ -116,8 +116,8 @@ lib/wzdftpd/modules/libwzd_sfv.a
 lib/wzdftpd/modules/libwzd_sfv.so
 %%TCL%%lib/wzdftpd/modules/libwzd_tcl.a
 %%TCL%%lib/wzdftpd/modules/libwzd_tcl.so
-%%ZEROCONF%%lib/wzdftpd/modules/libwzd_zeroconf.a
-%%ZEROCONF%%lib/wzdftpd/modules/libwzd_zeroconf.so
+%%AVAHI%%lib/wzdftpd/modules/libwzd_zeroconf.a
+%%AVAHI%%lib/wzdftpd/modules/libwzd_zeroconf.so
 libdata/pkgconfig/wzdftpd.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog