svn commit: r331436 - in head/security/clamav-devel: . files

Renato Botelho garga at FreeBSD.org
Wed Oct 23 22:19:49 UTC 2013 

Author: garga
Date: Wed Oct 23 22:19:48 2013
New Revision: 331436
URL: http://svnweb.freebsd.org/changeset/ports/331436

Log:
  . Update to 20131023
  . Support stage
  . Add IPV6 option

Deleted:
  head/security/clamav-devel/files/patch-etc_Makefile.in
Modified:
  head/security/clamav-devel/Makefile
  head/security/clamav-devel/distinfo
  head/security/clamav-devel/pkg-plist

Modified: head/security/clamav-devel/Makefile
==============================================================================
--- head/security/clamav-devel/Makefile	Wed Oct 23 22:17:50 2013	(r331435)
+++ head/security/clamav-devel/Makefile	Wed Oct 23 22:19:48 2013	(r331436)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	20130901
+PORTVERSION=	20131023
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		LOCAL/garga/clamav-devel
@@ -14,7 +14,8 @@ COMMENT=	Command line virus scanner writ
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR DOCS
+OPTIONS_DEFINE=	ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR \
+		DOCS IPV6
 
 ARC_DESC=	Enable arch archives support
 ARJ_DESC=	Enable arj archives support
@@ -26,7 +27,7 @@ TESTS_DESC=	Run compile-time tests (req.
 MILTER_DESC=	Compile the milter interface
 STDERR_DESC=	Print logs to stderr instead of stdout
 
-OPTIONS_DEFAULT=	ARC ARJ LHA UNZOO UNRAR LLVM DOCS
+OPTIONS_DEFAULT=	ARC ARJ LHA UNZOO UNRAR LLVM DOCS IPV6
 
 ARC_RUN_DEPENDS=	arc:${PORTSDIR}/archivers/arc
 ARJ_RUN_DEPENDS=	arj:${PORTSDIR}/archivers/arj
@@ -39,13 +40,13 @@ TESTS_BUILD_DEPENDS=	${LOCALBASE}/includ
 ICONV_CONFIGURE_ON=	--with-iconv
 ICONV_CONFIGURE_OFF=	--without-iconv
 ICONV_USES=		iconv
+IPV6_CONFIGURE_ENABLE=	ipv6
 
 USES=		gmake
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GCC=	any
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
-CLAM_CONF_FILES=	clamd freshclam
 
 PORTDOCS=	*
 
@@ -77,19 +78,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib \
 # force to use -lthr until it's not fixed.
 PTHREAD_LIBS=	-lthr
 
-MAN1=		clambc.1 \
-		clamconf.1 \
-		clamscan.1 \
-		freshclam.1 \
-		sigtool.1 \
-		clamdscan.1 \
-		clamdtop.1
-MAN5=		clamav-milter.conf.5 \
-		clamd.conf.5 \
-		freshclam.conf.5
-MAN8=		clamd.8 \
-		clamav-milter.8
-
 CONFLICTS=	clamav-0.[0-9]* clamav-milter-[0-9]*
 
 CLAMAVUSER?=	clamav
@@ -128,7 +116,6 @@ PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 
 PORTSCOUT=	ignore:1
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
@@ -142,7 +129,6 @@ CONFIGURE_ARGS+=--disable-llvm
 
 .if ${PORT_OPTIONS:MMILTER}
 USE_RC_SUBR+=	clamav-milter
-CLAM_CONF_FILES+=	clamav-milter
 . if ${PORT_OPTIONS:MLDAP} && exists(${LOCALBASE}/lib/libldap.so)
 USE_OPENLDAP=	yes
 LDFLAGS+=	-lldap
@@ -167,14 +153,19 @@ CFLAGS+=	-march=i486
 .endif
 
 post-patch:
+.for f in clamd freshclam clamav-milter
+	@${MV} ${WRKSRC}/etc/${f}.conf ${WRKSRC}/etc/${f}.conf.sample
+	@${REINPLACE_CMD} -e 's,${f}\.conf,${f}\.conf.sample,g' \
+		${WRKSRC}/etc/Makefile.in
+.endfor
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} ${SED_CONF} \
-		${WRKSRC}/etc/clamd.conf \
-		${WRKSRC}/etc/freshclam.conf \
-		${WRKSRC}/etc/clamav-milter.conf
+		${WRKSRC}/etc/clamd.conf.sample \
+		${WRKSRC}/etc/freshclam.conf.sample \
+		${WRKSRC}/etc/clamav-milter.conf.sample
 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
 		${WRKSRC}/libclamunrar/unrar.c
 
@@ -198,20 +189,12 @@ post-build:
 	fi
 .endif
 
-pre-su-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include
-.for c in ${CLAM_CONF_FILES}
-	@[ -f ${PREFIX}/etc/${c}.conf ] || \
-		${CP} -v ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html
 .endif
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>

Modified: head/security/clamav-devel/distinfo
==============================================================================
--- head/security/clamav-devel/distinfo	Wed Oct 23 22:17:50 2013	(r331435)
+++ head/security/clamav-devel/distinfo	Wed Oct 23 22:19:48 2013	(r331436)
@@ -1,2 +1,2 @@
-SHA256 (clamav-devel-20130901.tar.gz) = f3cac2d849b5af6d8394ef5bb3e9977cbbd23e65b0dd3c872ed8c7fc1f07e88b
-SIZE (clamav-devel-20130901.tar.gz) = 37002157
+SHA256 (clamav-devel-20131023.tar.gz) = 5a5b1e38befc65aec66e8a74208f655ad0257a6ace1244c4bf9943c7581e308f
+SIZE (clamav-devel-20131023.tar.gz) = 37002306

Modified: head/security/clamav-devel/pkg-plist
==============================================================================
--- head/security/clamav-devel/pkg-plist	Wed Oct 23 22:17:50 2013	(r331435)
+++ head/security/clamav-devel/pkg-plist	Wed Oct 23 22:19:48 2013	(r331436)
@@ -21,17 +21,24 @@ lib/libclamav.so.7
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.so.7
 libdata/pkgconfig/libclamav.pc
- at unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi
-etc/clamd.conf.default
+man/man1/clambc.1.gz
+man/man1/clamconf.1.gz
+man/man1/clamdscan.1.gz
+man/man1/clamdtop.1.gz
+man/man1/clamscan.1.gz
+man/man1/freshclam.1.gz
+man/man1/sigtool.1.gz
+man/man5/clamav-milter.conf.5.gz
+man/man5/clamd.conf.5.gz
+man/man5/freshclam.conf.5.gz
+man/man8/clamav-milter.8.gz
+man/man8/clamd.8.gz
+ at unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.sample; then rm -f %D/etc/clamd.conf; fi
+etc/clamd.conf.sample
 @exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf
- at unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi
-etc/freshclam.conf.default
-%%MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.default; then rm -f %D/etc/clamav-milter.conf; fi
-%%MILTER%%etc/clamav-milter.conf.default
+ at unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.sample; then rm -f %D/etc/freshclam.conf; fi
+etc/freshclam.conf.sample
 @exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
- at unexec [ -s %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true
- at unexec [ -s %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true
- at cwd /
- at dirrmtry %%DBDIR%%
- at dirrmtry %%LOGDIR%%
- at dirrmtry %%RUNDIR%%
+%%MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.sample; then rm -f %D/etc/clamav-milter.conf; fi
+%%MILTER%%etc/clamav-milter.conf.sample
+%%MILTER%%@exec [ -f %B/clamav-milter.conf ] || cp %B/%f %B/clamav-milter.conf

More information about the svn-ports-all mailing list