Attachment #140808 for bug #187510




		ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
		http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \
		http://labratsoftware.com/mod_sql_tds/:sql_tds \
		LOCAL/beech:sql_tds \
		https://github.com/jbenden/mod_clamav/archive/:clamav 
.if defined(_BUILDING_PROFTPD_MODULE)
DISTNAME=	proftpd-${PORTVERSION}
.endif

.endfor
PLIST_DIRSTRY+=	libexec/proftpd
.else
OPTIONS_DEFINE=	HTMLDOCS IPV6 NLS MEMCACHE PCRE CLAMAV
OPTIONS_DEFAULT=	IPV6 NLS PCRE

CLAMAV_DESC=		Include mod_clamav
HTMLDOCS_DESC=		Include HTML documentation
MEMCACHE_DESC=		Memcache support using libmemcached


		mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds
.endif

.if ${PORT_OPTIONS:MCLAMAV} || make(makesum) || defined(FETCH_ALL)
DISTFILES+=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
		v0.13rc2${EXTRACT_SUFX}:clamav
USE_CLAMAV=	yes
MODULES+=	mod_clamav
LIB_DEPENDS+=	clamav.7:${PORTSDIR}/security/clamav
PLIST_SUB+=	CLAMAV=""
.else
#.else
PLIST_SUB+=	CLAMAV="@comment "
.endif

.if ${PORT_OPTIONS:MMEMCACHE}
MODULES+=		mod_memcache \

CONFIGURE_ARGS+=	--with-libraries=${LIBDIRS}

.if !defined(_BUILDING_PROFTPD_MODULE)
#post-extract:
#.if ${PORT_OPTIONS:MCLAMAV}
#	(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mod_clamav-0.11rc.tar.gz ${EXTRACT_AFTER_ARGS})
#	@${CP} ${WRKDIR}/mod_clamav-0.11rc/mod_clamav.* ${WRKSRC}/contrib
#.endif

post-patch:
.if ${PORT_OPTIONS:MNLS}
	@${REINPLACE_CMD} -e 's|-lsupp|-lsupp -lintl|g' ${WRKSRC}/Makefile.in

	@${REINPLACE_CMD} -e 's|proftpd\.conf|proftpd.conf.sample|g' ${WRKSRC}/Makefile.in

pre-configure:
.if ${PORT_OPTIONS:MCLAMAV}
	@${CP} ${WRKDIR}/mod_clamav-0.13rc2/mod_clamav.* ${WRKSRC}/contrib
.endif
	@${ECHO_MSG} "==> Configuring with following modules:"
	@${ECHO_MSG} "${MODULES:C/^://g}"


Lines 2-4 Link Here

(-)/root/proftpd/distinfo (+2 lines)
2	SIZE (proftpd-1.3.4d.tar.gz) = 7697046	2	SIZE (proftpd-1.3.4d.tar.gz) = 7697046
3	SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08	3	SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
4	SIZE (mod_sql_tds-4.13.tar.gz) = 11688	4	SIZE (mod_sql_tds-4.13.tar.gz) = 11688
		5	SHA256 (v0.13rc2.tar.gz) = 14932605eec5905f71665bb84e38a715a6ff6db5557b767b6c1b13ad4a616b65
		6	SIZE (v0.13rc2.tar.gz) = 10833

Return to bug 187510

Lines 10-17 Link Here

(-)/root/proftpd/Makefile (-20 / +16 lines)
10	ftp://proftpd.networkedsystems.co.uk/distrib/source/ \	10	ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
11	http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \	11	http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ \
12	http://labratsoftware.com/mod_sql_tds/:sql_tds \	12	http://labratsoftware.com/mod_sql_tds/:sql_tds \
13	LOCAL/beech:sql_tds	13	LOCAL/beech:sql_tds \
14	# https://secure.thrallingpenguin.com/redmine/attachments/download/1/:clam	14	https://github.com/jbenden/mod_clamav/archive/:clamav
15	.if defined(_BUILDING_PROFTPD_MODULE)	15	.if defined(_BUILDING_PROFTPD_MODULE)
16	DISTNAME= proftpd-${PORTVERSION}	16	DISTNAME= proftpd-${PORTVERSION}
17	.endif	17	.endif
Lines 81-90 Link Here
81	.endfor	81	.endfor
82	PLIST_DIRSTRY+= libexec/proftpd	82	PLIST_DIRSTRY+= libexec/proftpd
83	.else	83	.else
84	OPTIONS_DEFINE= HTMLDOCS IPV6 NLS MEMCACHE PCRE	84	OPTIONS_DEFINE= HTMLDOCS IPV6 NLS MEMCACHE PCRE CLAMAV
85	OPTIONS_DEFAULT= IPV6 NLS PCRE	85	OPTIONS_DEFAULT= IPV6 NLS PCRE
86		86
87	#CLAMAV_DESC= Include mod_clamav	87	CLAMAV_DESC= Include mod_clamav
88	HTMLDOCS_DESC= Include HTML documentation	88	HTMLDOCS_DESC= Include HTML documentation
89	MEMCACHE_DESC= Memcache support using libmemcached	89	MEMCACHE_DESC= Memcache support using libmemcached
90		90
Lines 174-190 Link Here
174	mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds	174	mod_sql_tds-4.13${EXTRACT_SUFX}:sql_tds
175	.endif	175	.endif
176		176
177	#.if ${PORT_OPTIONS:MCLAMAV} \|\| make(makesum) \|\| defined(FETCH_ALL)	177	.if ${PORT_OPTIONS:MCLAMAV} \|\| make(makesum) \|\| defined(FETCH_ALL)
178	#DISTFILES+= mod_clamav-0.11rc.tar.gz:clam	178	DISTFILES+= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
179	#EXTRA_PATCHES+= ${FILESDIR}/extra-patch-modules_mod_xfer.c	179	v0.13rc2${EXTRACT_SUFX}:clamav
180	#USE_CLAMAV= yes	180	USE_CLAMAV= yes
181	#MODULES+= mod_clamav	181	MODULES+= mod_clamav
182	#LIB_DEPENDS+= clamav.7:${PORTSDIR}/security/clamav	182	LIB_DEPENDS+= clamav.7:${PORTSDIR}/security/clamav
183	#PLIST_SUB+= CLAMAV=""	183	PLIST_SUB+= CLAMAV=""
184	#PROFTPD_LIBS+= -lclamav	184	.else
185	#.else
186	PLIST_SUB+= CLAMAV="@comment "	185	PLIST_SUB+= CLAMAV="@comment "
187	#.endif	186	.endif
188		187
189	.if ${PORT_OPTIONS:MMEMCACHE}	188	.if ${PORT_OPTIONS:MMEMCACHE}
190	MODULES+= mod_memcache \	189	MODULES+= mod_memcache \
Lines 213-224 Link Here
213	CONFIGURE_ARGS+= --with-libraries=${LIBDIRS}	212	CONFIGURE_ARGS+= --with-libraries=${LIBDIRS}
214		213
215	.if !defined(_BUILDING_PROFTPD_MODULE)	214	.if !defined(_BUILDING_PROFTPD_MODULE)
216	#post-extract:
217	#.if ${PORT_OPTIONS:MCLAMAV}
218	# (cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/mod_clamav-0.11rc.tar.gz ${EXTRACT_AFTER_ARGS})
219	# @${CP} ${WRKDIR}/mod_clamav-0.11rc/mod_clamav.* ${WRKSRC}/contrib
220	#.endif
221
222	post-patch:	215	post-patch:
223	.if ${PORT_OPTIONS:MNLS}	216	.if ${PORT_OPTIONS:MNLS}
224	@${REINPLACE_CMD} -e 's\|-lsupp\|-lsupp -lintl\|g' ${WRKSRC}/Makefile.in	217	@${REINPLACE_CMD} -e 's\|-lsupp\|-lsupp -lintl\|g' ${WRKSRC}/Makefile.in
Lines 226-231 Link Here
226	@${REINPLACE_CMD} -e 's\|proftpd\.conf\|proftpd.conf.sample\|g' ${WRKSRC}/Makefile.in	219	@${REINPLACE_CMD} -e 's\|proftpd\.conf\|proftpd.conf.sample\|g' ${WRKSRC}/Makefile.in
227		220
228	pre-configure:	221	pre-configure:
		222	.if ${PORT_OPTIONS:MCLAMAV}
		223	@${CP} ${WRKDIR}/mod_clamav-0.13rc2/mod_clamav.* ${WRKSRC}/contrib
		224	.endif
229	@${ECHO_MSG} "==> Configuring with following modules:"	225	@${ECHO_MSG} "==> Configuring with following modules:"
230	@${ECHO_MSG} "${MODULES:C/^://g}"	226	@${ECHO_MSG} "${MODULES:C/^://g}"
231		227