svn commit: r348344 - head/ftp/proftpd

[Martin Matuska]

Author: mm
Date: Sat Mar 15 16:28:07 2014
New Revision: 348344
URL: http://svnweb.freebsd.org/changeset/ports/348344
QAT: https://qat.redports.org/buildarchive/r348344/

Log:
  Remove mod_clamav from ftp/proftpd (goes to security/proftpd-mod_clamav)
  Move module MASTER_SITES to module ports

Modified:
  head/ftp/proftpd/Makefile
  head/ftp/proftpd/distinfo
  head/ftp/proftpd/pkg-plist

Modified: head/ftp/proftpd/Makefile
==============================================================================
--- head/ftp/proftpd/Makefile	Sat Mar 15 16:25:40 2014	(r348343)
+++ head/ftp/proftpd/Makefile	Sat Mar 15 16:28:07 2014	(r348344)
@@ -3,13 +3,12 @@
 
 PORTNAME?=	proftpd
 PORTVERSION?=	1.3.4d
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	ftp
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
 		https://github.com/downloads/proftpd/proftpd.github.com/ \
 		ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
-		http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \
-		https://codeload.github.com/jbenden/mod_clamav/legacy.tar.gz/v0.13rc2?dummy=/:clamav
+		http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/
 .if defined(_BUILDING_PROFTPD_MODULE)
 DISTNAME=	proftpd-${PORTVERSION}
 .endif
@@ -35,6 +34,9 @@ EXTRACT_ONLY+=	${_PROFTPD_MODULE_EXTRACT
 . 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)
@@ -79,10 +81,9 @@ PLIST_FILES+=	libexec/proftpd/${m}.a \
 .endfor
 PLIST_DIRSTRY+=	libexec/proftpd
 .else
-OPTIONS_DEFINE=	HTMLDOCS IPV6 NLS MEMCACHE PCRE CLAMAV
+OPTIONS_DEFINE=	HTMLDOCS IPV6 NLS MEMCACHE PCRE
 OPTIONS_DEFAULT=	IPV6 NLS PCRE
 
-CLAMAV_DESC=		Include mod_clamav
 HTMLDOCS_DESC=		Include HTML documentation
 MEMCACHE_DESC=		Memcache support using libmemcached
 
@@ -167,17 +168,6 @@ CONFIGURE_ARGS+=	--enable-pcre
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
-.if ${PORT_OPTIONS:MCLAMAV} || make(makesum) || defined(FETCH_ALL)
-DISTFILES+=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		mod_clamav-v0.13rc2${EXTRACT_SUFX}:clamav
-USE_CLAMAV=	yes
-MODULES+=	mod_clamav
-RUN_DEPENDS+=	clamd:${PORTSDIR}/security/clamav
-PLIST_SUB+=	CLAMAV=""
-.else
-PLIST_SUB+=	CLAMAV="@comment " 
-.endif
-
 .if ${PORT_OPTIONS:MMEMCACHE}
 MODULES+=		mod_memcache \
 			mod_tls_memcache
@@ -213,9 +203,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|proftpd\.conf|proftpd.conf.sample|g' ${WRKSRC}/Makefile.in
 
 pre-configure:
-.if ${PORT_OPTIONS:MCLAMAV}
-	@${CP} ${WRKDIR}/jbenden-mod_clamav-0b524e3/mod_clamav.* ${WRKSRC}/contrib
-.endif
 	@${ECHO_MSG} "==> Configuring with following modules:"
 	@${ECHO_MSG} "${MODULES:C/^://g}"
 

Modified: head/ftp/proftpd/distinfo
==============================================================================
--- head/ftp/proftpd/distinfo	Sat Mar 15 16:25:40 2014	(r348343)
+++ head/ftp/proftpd/distinfo	Sat Mar 15 16:28:07 2014	(r348344)
@@ -2,3 +2,5 @@ SHA256 (proftpd-1.3.4d.tar.gz) = c198b53
 SIZE (proftpd-1.3.4d.tar.gz) = 7697046
 SHA256 (mod_clamav-v0.13rc2.tar.gz) = 06b49e0042fdd86d198ad1b1cf33f2c296cb2b6dcbdd2010df392ec37b670457
 SIZE (mod_clamav-v0.13rc2.tar.gz) = 10841
+SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
+SIZE (mod_sql_tds-4.13.tar.gz) = 11688

Modified: head/ftp/proftpd/pkg-plist
==============================================================================
--- head/ftp/proftpd/pkg-plist	Sat Mar 15 16:25:40 2014	(r348343)
+++ head/ftp/proftpd/pkg-plist	Sat Mar 15 16:28:07 2014	(r348344)
@@ -45,7 +45,6 @@ include/proftpd/libsupp.h
 include/proftpd/log.h
 include/proftpd/memcache.h
 include/proftpd/mkhome.h
-%%CLAMAV%%include/proftpd/mod_clamav.h
 include/proftpd/mod_wrap2.h
 include/proftpd/mod_sftp.h
 include/proftpd/mod_sql.h
@@ -84,9 +83,6 @@ libdata/pkgconfig/proftpd.pc
 libexec/proftpd/mod_ban.a
 libexec/proftpd/mod_ban.la
 libexec/proftpd/mod_ban.so
-%%CLAMAV%%libexec/proftpd/mod_clamav.a
-%%CLAMAV%%libexec/proftpd/mod_clamav.la
-%%CLAMAV%%libexec/proftpd/mod_clamav.so
 libexec/proftpd/mod_copy.a
 libexec/proftpd/mod_copy.la
 libexec/proftpd/mod_copy.so