Index: head/ftp/wzdftpd/Makefile =================================================================== --- head/ftp/wzdftpd/Makefile (revision 156715) +++ head/ftp/wzdftpd/Makefile (revision 156716) @@ -1,116 +1,139 @@ # New ports collection makefile for: wzdftpd # Date created: 2003-10-22 # Whom: Roman Bogorodskiy # # $FreeBSD$ # PORTNAME= wzdftpd PORTVERSION= 0.6.1 CATEGORIES= ftp ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= novel@FreeBSD.org COMMENT= Modular FTP server configurable online using SITE commands USE_RC_SUBR= yes USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes INSTALLS_SHLIB= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= pkgconfig -CONFIGURE_ARGS+= --without-pam --without-pgsql +CONFIGURE_ARGS+= --without-pam --without-pgsql --disable-bonjour +CONFIGURE_ENV= CPPFLAGS="${CPPLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS= UTF8 "Enable UTF8 support" off \ TCL "Enable TCL support" off \ - SSL "Enable OpenSSL support" on \ - GNUTLS "Enable gnutls support" off \ + SSL "Enable OpenSSL support" off \ + GNUTLS "Enable gnutls support" on \ IPV6 "Enable IPv6 support" on \ PERL "Enable PERL support" off \ - MYSQL "Enable MYSQL backend" off + MYSQL "Enable MYSQL backend" off \ + AVAHI "Enable Zeroconf support using Avahi" on \ + HOWL "Enable Zeroconf support using Howl" off MAN1= siteconfig.1 \ siteuptime.1 \ sitewho.1 \ - wzd-config.1 + wzd-config.1 MAN8= wzdftpd.8 .include .if defined(WITH_UTF8) USE_ICONV= yes CONFIGURE_ARGS+= --enable-utf8 .endif .if defined(WITH_TCL) LIB_DEPENDS+= tcl84:${PORTSDIR}/lang/tcl84 CONFIGURE_ARGS+= --with-tcl='${PREFIX}/lib/tcl8.4' PLIST_SUB+= TCL="" .else CONFIGURE_ARGS+= --without-tcl PLIST_SUB+= TCL="@comment " .endif .if defined(WITH_SSL) #USE_OPENSSL= yes .include "${PORTSDIR}/Mk/bsd.openssl.mk" .else CONFIGURE_ARGS+= --disable-openssl .endif .if defined(WITH_GNUTLS) LIB_DEPENDS+= gnutls.15:${PORTSDIR}/security/gnutls .else CONFIGURE_ARGS+= --disable-gnutls .endif .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .endif .if !defined(WITH_PERL) CONFIGURE_ARGS+= --disable-perl PLIST_SUB+= PERL="@comment " .else USE_PERL5= yes PLIST_SUB+= PERL="" .endif .if defined(WITH_MYSQL) USE_MYSQL= yes PLIST_SUB+= MYSQL="" .else CONFIGURE_ARGS+= --without-mysql PLIST_SUB+= MYSQL="@comment " .endif +.if defined(WITH_AVAHI) || defined(WITH_HOWL) +PLIST_SUB+= ZEROCONF="" +.else +PLIST_SUB+= ZEROCONF="@comment " +.endif + +.if defined(WITH_AVAHI) && !defined(WITH_HOWL) +LIB_DEPENDS+= dbus-1.2:${PORTSDIR}/devel/dbus \ + avahi-core.3:${PORTSDIR}/net/avahi +CONFIGURE_ARGS+= --with-zeroconf --enable-avahi +.endif + +.if defined(WITH_HOWL) && !defined(WITH_AVAHI) +CFLAGS+= -I${LOCALBASE}/include/howl +LIB_DEPENDS+= howl.0:${PORTSDIR}/net/howl +CONFIGURE_ARGS+= --with-zeroconf --enable-howl +.endif + PORTDOCS= AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst ChangeLog RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ RC_SUBR=${RC_SUBR} post-patch: @${REINPLACE_CMD} -e "s|@HAVE_PERL_TRUE@|#|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|" ${WRKSRC}/configure post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${FILESDIR}/wzdftpd.sh > ${PREFIX}/etc/rc.d/wzdftpd.sh @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/wzdftpd.sh @if test ! -f ${PREFIX}/etc/wzd.cfg; then \ ${CP} ${PREFIX}/etc/wzd.cfg.sample ${PREFIX}/etc/wzd.cfg; \ fi @if test ! -f ${PREFIX}/etc/users; then \ ${CP} ${PREFIX}/etc/users.sample ${PREFIX}/etc/users; \ fi .include Property changes on: head/ftp/wzdftpd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.37 \ No newline at end of property +1.38 \ No newline at end of property Index: head/ftp/wzdftpd/files/patch-modules-zeroconf-libwzd_zeroconf.c =================================================================== --- head/ftp/wzdftpd/files/patch-modules-zeroconf-libwzd_zeroconf.c (nonexistent) +++ head/ftp/wzdftpd/files/patch-modules-zeroconf-libwzd_zeroconf.c (revision 156716) @@ -0,0 +1,10 @@ +--- modules/zeroconf/libwzd_zeroconf.c.orig Wed Feb 22 21:44:51 2006 ++++ modules/zeroconf/libwzd_zeroconf.c Wed Feb 22 21:45:26 2006 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include /* htonl() */ + #include Property changes on: head/ftp/wzdftpd/files/patch-modules-zeroconf-libwzd_zeroconf.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/ftp/wzdftpd/pkg-plist =================================================================== --- head/ftp/wzdftpd/pkg-plist (revision 156715) +++ head/ftp/wzdftpd/pkg-plist (revision 156716) @@ -1,102 +1,103 @@ @comment $FreeBSD$ bin/siteconfig bin/siteuptime bin/sitewho bin/wzd-config etc/rc.d/wzdftpd.sh etc/wzd.pem etc/file_ginfo.txt etc/file_help.txt etc/file_swho.txt etc/file_user.txt etc/file_group.txt etc/file_rules.txt etc/file_users.txt etc/file_vfs.txt etc/file_who.txt etc/file_groups.txt include/wzdftpd/libwzd-auth/wzd_auth.h include/wzdftpd/libwzd-auth/wzd_base64.h include/wzdftpd/libwzd-auth/wzd_crypt.h include/wzdftpd/libwzd-auth/wzd_krb5.h include/wzdftpd/libwzd-auth/wzd_md5.h include/wzdftpd/libwzd-auth/wzd_md5crypt.h include/wzdftpd/libwzd-auth/wzd_pam.h include/wzdftpd/libwzd-auth/wzd_sha1.h include/wzdftpd/libwzd-auth/wzd_tls.h include/wzdftpd/libwzd-base/dlist.h include/wzdftpd/libwzd-base/hash.h include/wzdftpd/libwzd-base/list.h include/wzdftpd/libwzd-base/stack.h include/wzdftpd/libwzd-base/wzd_strlcat.h include/wzdftpd/libwzd-base/wzd_strtok_r.h include/wzdftpd/libwzd-core/arch/bsd.h include/wzdftpd/libwzd-core/arch/win32.h include/wzdftpd/libwzd-core/ls.h include/wzdftpd/libwzd-core/wzd_ClientThread.h include/wzdftpd/libwzd-core/wzd_action.h include/wzdftpd/libwzd-core/wzd_all.h include/wzdftpd/libwzd-core/wzd_backend.h include/wzdftpd/libwzd-core/wzd_cache.h include/wzdftpd/libwzd-core/wzd_commands.h include/wzdftpd/libwzd-core/wzd_configfile.h include/wzdftpd/libwzd-core/wzd_configloader.h include/wzdftpd/libwzd-core/wzd_crc32.h include/wzdftpd/libwzd-core/wzd_crontab.h include/wzdftpd/libwzd-core/wzd_data.h include/wzdftpd/libwzd-core/wzd_debug.h include/wzdftpd/libwzd-core/wzd_dir.h include/wzdftpd/libwzd-core/wzd_events.h include/wzdftpd/libwzd-core/wzd_file.h include/wzdftpd/libwzd-core/wzd_fs.h include/wzdftpd/libwzd-core/wzd_hardlimits.h include/wzdftpd/libwzd-core/wzd_ip.h include/wzdftpd/libwzd-core/wzd_libmain.h include/wzdftpd/libwzd-core/wzd_log.h include/wzdftpd/libwzd-core/wzd_messages.h include/wzdftpd/libwzd-core/wzd_misc.h include/wzdftpd/libwzd-core/wzd_mod.h include/wzdftpd/libwzd-core/wzd_mutex.h include/wzdftpd/libwzd-core/wzd_perm.h include/wzdftpd/libwzd-core/wzd_ratio.h include/wzdftpd/libwzd-core/wzd_section.h include/wzdftpd/libwzd-core/wzd_shm.h include/wzdftpd/libwzd-core/wzd_site.h include/wzdftpd/libwzd-core/wzd_site_group.h include/wzdftpd/libwzd-core/wzd_site_user.h include/wzdftpd/libwzd-core/wzd_socket.h include/wzdftpd/libwzd-core/wzd_string.h include/wzdftpd/libwzd-core/wzd_structs.h include/wzdftpd/libwzd-core/wzd_threads.h include/wzdftpd/libwzd-core/wzd_tls.h include/wzdftpd/libwzd-core/wzd_types.h include/wzdftpd/libwzd-core/wzd_utf8.h include/wzdftpd/libwzd-core/wzd_vars.h include/wzdftpd/libwzd-core/wzd_vfs.h include/wzdftpd/libwzd.h include/wzdftpd/libwzd_pv.h include/wzdftpd/libwzd_socket.h include/wzdftpd/libwzd_tls.h lib/libwzd_core.so lib/libwzd_core.so.1 lib/libwzd.so lib/libwzd.so.1 share/aclocal/wzd.m4 sbin/wzdftpd %%DATADIR%%/backends/libwzdplaintext.so %%MYSQL%%%%DATADIR%%/backends/libwzdmysql.so %%DATADIR%%/modules/libwzd_sfv.so %%PERL%%%%DATADIR%%/modules/libwzd_perl.so %%TCL%%%%DATADIR%%/modules/libwzd_tcl.so +%%ZEROCONF%%%%DATADIR%%/modules/libwzd_zeroconf.so @dirrm %%DATADIR%%/modules/ @dirrm %%DATADIR%%/backends/ @dirrm %%DATADIR%%/ @dirrm include/wzdftpd/libwzd-auth @dirrm include/wzdftpd/libwzd-base @dirrm include/wzdftpd/libwzd-core/arch @dirrm include/wzdftpd/libwzd-core @dirrm include/wzdftpd @unexec if cmp -s %D/etc/wzd.cfg %D/etc/wzd.cfg.sample; then rm -f %D/etc/wzd.cfg; fi @unexec if cmp -s %D/etc/users %D/etc/users.sample; then rm -f %D/etc/users; fi etc/wzd.cfg.sample etc/users.sample Property changes on: head/ftp/wzdftpd/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property