Index: branches/2016Q2/ftp/proftpd/Makefile =================================================================== --- branches/2016Q2/ftp/proftpd/Makefile (revision 414150) +++ branches/2016Q2/ftp/proftpd/Makefile (revision 414151) @@ -1,241 +1,220 @@ # Created by: Stephane Legrand # $FreeBSD$ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif PORTREVISION?= 0 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ ftp://ftpmirror.uk/ftp.proftpd.org/distrib/source/ \ http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ .if defined(_BUILDING_PROFTPD_MODULE) DISTNAME= proftpd-${PROFTPD_VERSION} .endif MAINTAINER?= mm@FreeBSD.org COMMENT?= Highly configurable FTP daemon LICENSE?= GPLv2 LICENSE_FILE?= ${WRKSRC}/COPYING .if defined(_BUILDING_PROFTPD_MODULE) BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd .endif -PROFTPD_VERSION= 1.3.5a +PROFTPD_VERSION= 1.3.5b .if defined(_BUILDING_PROFTPD_MODULE) DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_ONLY+= ${DISTNAME}${EXTRACT_SUFX} WRKSRC= ${WRKDIR}/proftpd-${PROFTPD_VERSION} . if defined(_PROFTPD_MODULE_EXTRACT_ONLY) EXTRACT_ONLY+= ${_PROFTPD_MODULE_EXTRACT_ONLY} . endif . if defined(_PROFTPD_MODULE_DISTFILES) DISTFILES+= ${_PROFTPD_MODULE_DISTFILES} . endif . if defined(_PROFTPD_MODULE_MASTER_SITES) MASTER_SITES+= ${_PROFTPD_MODULE_MASTER_SITES} . endif .endif .if !defined(_BUILDING_PROFTPD_MODULE) PORTDOCS= * .endif MAKE_JOBS_UNSAFE= yes USES+= cpe gmake libtool USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes .if !defined(_BUILDING_PROFTPD_MODULE) USE_OPENSSL= yes USE_RC_SUBR= proftpd .endif LOCALSTATEDIR?= /var/run CONFIGURE_ARGS=--localstatedir=${LOCALSTATEDIR} \ --libexecdir=${PREFIX}/libexec/proftpd \ --with-pkgconfig=libdata/pkgconfig \ --sysconfdir=${PREFIX}/etc \ --enable-ctrls \ --enable-dso \ --disable-sendfile CONFIGURE_ENV+= install_user=`${ID} -u` \ install_group=`${ID} -g` .if defined(_BUILDING_PROFTPD_MODULE) MODULES= ${_BUILDING_PROFTPD_MODULE} .for m in ${MODULES} __MODULES:=${__MODULES}:${m} .endfor CONFIGURE_ARGS+= --with-shared=${__MODULES:C/^://g} INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include/proftpd ALL_TARGET= shared BUILD_WRKSRC= ${WRKSRC}/modules INSTALL_WRKSRC= ${WRKSRC}/modules PLIST= ${WRKDIR}/PLIST .for m in ${MODULES} PLIST_FILES+= libexec/proftpd/${m}.a \ libexec/proftpd/${m}.so .endfor .else OPTIONS_DEFINE= DOCS HTMLDOCS IPV6 NLS MEMCACHE PCRE OPTIONS_DEFAULT= IPV6 NLS PCRE HTMLDOCS_DESC= Include HTML documentation MEMCACHE_DESC= Memcache support using libmemcached PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATEDIR}" +OPTIONS_SUB= yes .endif #!defined(_BUILDING_PROFTPD_MODULE) -.include - .if !defined(_BUILDING_PROFTPD_MODULE) CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} LIBS+= -lssl -lcrypto -L${OPENSSLLIB} LDFLAGS+= -lpthread .endif .if !defined(_BUILDING_PROFTPD_MODULE) LIBDIRS?= ${LOCALBASE}/lib INCLUDEDIRS?= ${LOCALBASE}/include # Always built modules MODULES+= mod_ban \ mod_copy \ mod_ctrls_admin \ mod_deflate \ mod_dnsbl \ mod_dynmasq \ mod_exec \ mod_ifsession \ mod_ifversion \ mod_qos \ mod_quotatab \ mod_quotatab_file \ mod_quotatab_radius \ mod_quotatab_sql \ mod_radius \ mod_ratio \ mod_readme \ mod_rewrite \ mod_sftp \ mod_sftp_pam \ mod_sftp_sql \ mod_shaper \ mod_site_misc \ mod_snmp \ mod_sql \ mod_sql_passwd \ mod_tls \ mod_tls_shmcache \ mod_unique_id \ mod_wrap2 \ mod_wrap2_file \ mod_wrap2_sql -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif +IPV6_CONFIGURE_ENABLE=ipv6 -.if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+= --enable-nls -USES+= gettext iconv -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +NLS_CONFIGURE_ON= --enable-nls +NLS_USES= gettext iconv -.if ${PORT_OPTIONS:MPCRE} -LIB_DEPENDS+= libpcre.so:devel/pcre -CONFIGURE_ARGS+= --enable-pcre -.else -CONFIGURE_ARGS+= --disable-pcre -.endif +PCRE_CONFIGURE_ENABLE= pcre +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -.if ${PORT_OPTIONS:MMEMCACHE} -MODULES+= mod_memcache \ - mod_tls_memcache -LIB_DEPENDS+= libmemcached.so:databases/libmemcached -CONFIGURE_ARGS+= --enable-memcache -LIBS+= -L${LOCALBASE}/lib -lmemcached -lmemcachedutil -PLIST_SUB+= MEMCACHE="" -.else -CONFIGURE_ARGS+= --disable-memcache -PLIST_SUB+= MEMCACHE="@comment " -.endif +MEMCACHE_LIB_DEPENDS= libmemcached.so:databases/libmemcached +MEMCACHE_CONFIGURE_ENABLE= memcache +MEMCACHE_VARS= MODULES+="mod_memcache mod_tls_memcache" \ + LIBS+="-L${LOCALBASE}/lib -lmemcached -lmemcachedutil" # Generate modules configuration string .for m in ${MODULES} _MODULES:=${_MODULES}:${m} .endfor # Keep this here below, in case similar constructs need to be made CONFIGURE_ARGS+= --with-shared=${_MODULES:C/^://g} .endif #!defined(_BUILDING_PROFTPD_MODULE) CONFIGURE_ARGS+= --with-includes=${INCLUDEDIRS} CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .include .if !defined(_BUILDING_PROFTPD_MODULE) -.if empty(ICONV_LIB) +.if empty(ICONV_PREFIX) CONFIGURE_ARGS+= ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif post-patch: @${REINPLACE_CMD} -e 's|proftpd\.conf |proftpd.conf.sample |g' ${WRKSRC}/Makefile.in pre-configure: @${ECHO_MSG} "==> Configuring with following modules:" @${ECHO_MSG} "${MODULES:C/^://g}" post-configure: ${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules ${REINPLACE_CMD} -e 's:/usr/sbin:${PREFIX}/sbin:' \ -e 's:/usr/bin:${PREFIX}/bin:' \ ${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \ ${WRKSRC}/utils/ftpcount.1 .endif #!defined(_BUILDING_PROFTPD_MODULE) .if defined(_BUILDING_PROFTPD_MODULE) pre-build: @cd ${WRKSRC} && ${MAKE} include/buildstamp.h pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/proftpd .else post-install: @${MKDIR} ${STAGEDIR}/var/run/proftpd .if ${PORT_OPTIONS:MDOCS} @${INSTALL} -d ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${CP} README* RELEASE_NOTES ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} license.txt ${STAGEDIR}${DOCSDIR} . if ${PORT_OPTIONS:MHTMLDOCS} @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} Configuration.html faq.html ${STAGEDIR}${DOCSDIR}/html @${CP} -RP ${WRKSRC}/doc/contrib ${STAGEDIR}${DOCSDIR}/html/contrib @${CP} -RP ${WRKSRC}/doc/modules ${STAGEDIR}${DOCSDIR}/html/modules @${CP} -RP ${WRKSRC}/doc/howto ${STAGEDIR}${DOCSDIR}/html/howto . endif .endif @${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/ .endif #!defined(_BUILDING_PROFTPD_MODULE) .include Index: branches/2016Q2/ftp/proftpd/distinfo =================================================================== --- branches/2016Q2/ftp/proftpd/distinfo (revision 414150) +++ branches/2016Q2/ftp/proftpd/distinfo (revision 414151) @@ -1,6 +1,6 @@ -SHA256 (proftpd-1.3.5a.tar.gz) = a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696 -SIZE (proftpd-1.3.5a.tar.gz) = 29988477 +SHA256 (proftpd-1.3.5b.tar.gz) = afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8 +SIZE (proftpd-1.3.5b.tar.gz) = 29992107 SHA256 (mod_clamav-v0.13.tar.gz) = 7f60bebbb58836319bf249be77540efc6667a55caca8aaba164e6a61cd0c3db7 SIZE (mod_clamav-v0.13.tar.gz) = 11683 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08 SIZE (mod_sql_tds-4.13.tar.gz) = 11688 Index: branches/2016Q2 =================================================================== --- branches/2016Q2 (revision 414150) +++ branches/2016Q2 (revision 414151) Property changes on: branches/2016Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r413681