summaryrefslogtreecommitdiff
path: root/ftp
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-05-05 12:38:28 +0000
committerRene Ladan <rene@FreeBSD.org>2020-05-05 12:38:28 +0000
commitad42ee0b5ce4891245a696b97b2e6e10038ffa25 (patch)
tree52638714c28799533ad35df9df98ef74783be2a1 /ftp
parentmultimedia/ogmrip: remove expired optional dependency on multimedia/gpac-mp4box (diff)
ftp/wzdftpd: remove expired optional dependency on net/howl
Notes
Notes: svn path=/head/; revision=534079
Diffstat (limited to 'ftp')
-rw-r--r--ftp/wzdftpd/Makefile18
-rw-r--r--ftp/wzdftpd/pkg-plist4
2 files changed, 4 insertions, 18 deletions
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 9986f20bb933..ebfd2c645d20 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -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
@@ -61,19 +60,6 @@ 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
@${ECHO_CMD} "ACLOCAL_AMFLAGS= -I ac-helpers" >> ${WRKSRC}/Makefile.am
diff --git a/ftp/wzdftpd/pkg-plist b/ftp/wzdftpd/pkg-plist
index 868d5e0ab249..0ec5bb99bc63 100644
--- a/ftp/wzdftpd/pkg-plist
+++ b/ftp/wzdftpd/pkg-plist
@@ -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