diff options
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/hsftp/Makefile | 9 | ||||
| -rw-r--r-- | ftp/wzdftpd/Makefile | 47 |
2 files changed, 28 insertions, 28 deletions
diff --git a/ftp/hsftp/Makefile b/ftp/hsftp/Makefile index 7134ae78df24..c3a0fb6bb3cb 100644 --- a/ftp/hsftp/Makefile +++ b/ftp/hsftp/Makefile @@ -21,11 +21,12 @@ MAKEFILE= makefile MAN1= hsftp.1 PLIST_FILES= bin/hsftp -OPTIONS= OPENSSH "Build with OpenSSH support" off +OPTIONS_DEFINE= OPENSSH +OPENSSH_DESC= Build with OpenSSH support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_OPENSSH) +.if ${PORT_OPTIONS:MOPENSSH} RUN_DEPENDS+= ssh:${PORTSDIR}/security/openssh CONFIGURE_ARGS+= --with-openssh .endif @@ -37,4 +38,4 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hsftp ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/hsftp.1 ${MANPREFIX}/man/man1 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index 09078f894680..2ef0aa33ff90 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -25,15 +25,15 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= UTF8 "Enable UTF8 support" off \ - TCL "Enable TCL 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 \ - AVAHI "Enable Zeroconf support using Avahi" on \ - HOWL "Enable Zeroconf support using Howl" off +OPTIONS_DEFINE= UTF8 TCL OPENSSL GNUTLS IPV6 PERL MYSQL ZEROCONF +OPTIONS_SINGLE= ZEROCONF +OPTIONS_SINGLE_ZEROCONF= AVAHI HOWL +OPTIONS_DEFAULT= GNUTLS IPV6 ZEROCONF AVAHI + +UTF8_DESC= Enable UTF8 support +ZEROCONF_DESC= Enable Zeroconf support +HOWL_DESC= Enable Zeroconf support using Howl +AVAHI_DESC= Enable Zeroconf support using Avahi MAN1= siteconfig.1 \ siteuptime.1 \ @@ -41,15 +41,15 @@ MAN1= siteconfig.1 \ wzd-config.1 MAN8= wzdftpd.8 -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_UTF8) +.if ${PORT_OPTIONS:MUTF8} USE_ICONV= yes .else CONFIGURE_ARGS+= --disable-utf8 .endif -.if defined(WITH_TCL) +.if ${PORT_OPTIONS:MTCL} LIB_DEPENDS+= tcl84:${PORTSDIR}/lang/tcl84 CONFIGURE_ARGS+= --with-tcl='${PREFIX}/lib/tcl8.4' PLIST_SUB+= TCL="" @@ -58,24 +58,23 @@ CONFIGURE_ARGS+= --without-tcl PLIST_SUB+= TCL="@comment " .endif -.if defined(WITH_SSL) -#USE_OPENSSL= yes -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +.if ${PORT_OPTIONS:MOPENSSL} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl .endif -.if defined(WITH_GNUTLS) +.if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls .else CONFIGURE_ARGS+= --disable-gnutls .endif -.if !defined(WITH_IPV6) +.if !${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 .endif -.if !defined(WITH_PERL) +.if !${PORT_OPTIONS:MPERL} CONFIGURE_ARGS+= --disable-perl PLIST_SUB+= PERL="@comment " .else @@ -83,7 +82,7 @@ USE_PERL5= yes PLIST_SUB+= PERL="" .endif -.if defined(WITH_MYSQL) +.if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes PLIST_SUB+= MYSQL="" .else @@ -91,19 +90,19 @@ CONFIGURE_ARGS+= --disable-mysql PLIST_SUB+= MYSQL="@comment " .endif -.if defined(WITH_AVAHI) || defined(WITH_HOWL) +.if ${PORT_OPTIONS:MZEROCONF} PLIST_SUB+= ZEROCONF="" .else PLIST_SUB+= ZEROCONF="@comment " .endif -.if defined(WITH_AVAHI) && !defined(WITH_HOWL) +.if ${PORT_OPTIONS:MAVAHI} LIB_DEPENDS+= dbus-1.3:${PORTSDIR}/devel/dbus \ avahi-core.7:${PORTSDIR}/net/avahi-app CONFIGURE_ARGS+= --with-zeroconf --enable-avahi .endif -.if defined(WITH_HOWL) && !defined(WITH_AVAHI) +.if ${PORT_OPTIONS:MHOWL} CFLAGS+= -I${LOCALBASE}/include/howl LIB_DEPENDS+= howl.0:${PORTSDIR}/net/howl CONFIGURE_ARGS+= --with-zeroconf --enable-howl @@ -116,11 +115,11 @@ post-patch: @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|" ${WRKSRC}/configure post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> |