19 files changed, 3 insertions, 1069 deletions

diff --git a/security/Makefile b/security/Makefile
index 7b04575bd32e..e6ebb26fd2d4 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -69,7 +69,6 @@
     SUBDIR += cl-md5-sbcl
     SUBDIR += clamassassin
     SUBDIR += clamav
-    SUBDIR += clamav-devel
     SUBDIR += clamav-milter
     SUBDIR += clamav-unofficial-sigs
     SUBDIR += clamcour
diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
deleted file mode 100644
index 60005f0c3999..000000000000
--- a/security/clamav-devel/Makefile
+++ /dev/null
@@ -1,198 +0,0 @@
-# Created by: Rob Evers <rob@debank.tv>
-# $FreeBSD$
-
-PORTNAME=	clamav
-PORTVERSION=	20140107
-PORTREVISION=	3
-CATEGORIES=	security
-MASTER_SITES=	http://www.clamav.net/snapshot/ \
-		LOCAL/garga/clamav-devel
-PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
-
-MAINTAINER=	garga@FreeBSD.org
-COMMENT=	Command line virus scanner written entirely in C
-
-LICENSE=	GPLv2
-
-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
-LHA_DESC=	Enable lha archives support
-UNZOO_DESC=	Enable zoo archives support
-UNRAR_DESC=	Enable rar archives support (req. for unit tests)
-LLVM_DESC=	Enable JIT Bytecode compiler (bundled LLVM)
-TESTS_DESC=	Run compile-time tests (req. python)
-MILTER_DESC=	Compile the milter interface
-STDERR_DESC=	Print logs to stderr instead of stdout
-
-OPTIONS_DEFAULT=	ARC ARJ LHA UNZOO UNRAR LLVM DOCS IPV6
-
-ARC_RUN_DEPENDS=	arc:${PORTSDIR}/archivers/arc
-ARJ_RUN_DEPENDS=	arj:${PORTSDIR}/archivers/arj
-LHA_RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
-UNZOO_RUN_DEPENDS=	unzoo:${PORTSDIR}/archivers/unzoo
-UNRAR_CONFIGURE_ENABLE=	unrar
-MILTER_CONFIGURE_ENABLE=milter
-TESTS_CONFIGURE_ENABLE=	check
-TESTS_BUILD_DEPENDS=	${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck
-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_RC_SUBR=	clamav-clamd clamav-freshclam
-
-PORTDOCS=	*
-
-DBDIR=		/var/db/clamav
-LOGDIR=		/var/log/clamav
-RUNDIR=		/var/run/clamav
-PLIST_SUB+=	DBDIR=${DBDIR} LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
-PY_NO_THREAD=	${WRKDIR}/.python-has-no-threads
-USE_AUTOTOOLS=	libltdl
-OPTIONS_SUB=	yes
-
-CONFIGURE_ARGS=	--libdir=${PREFIX}/lib \
-		--with-dbdir=${DBDIR} \
-		--with-zlib=/usr \
-		--disable-clamuko \
-		--disable-clamav \
-		--enable-bigstack \
-		--enable-readdir_r \
-		--enable-gethostbyname_r \
-		--disable-dependency-tracking \
-		--enable-clamdtop \
-		--enable-experimental
-CPPFLAGS+=	-I${LOCALBASE}/include \
-		${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib \
-		${PTHREAD_LIBS}
-
-# This port has a problem with -pthread,
-# force to use -lthr until it's not fixed.
-PTHREAD_LIBS=	-lthr
-
-CONFLICTS=	clamav-0.[0-9]* clamav-milter-[0-9]*
-
-CLAMAVUSER?=	clamav
-CLAMAVGROUP?=	clamav
-
-CLAMAV_CLAMD_SOCKET?=	${RUNDIR}/clamd.sock
-CLAMAV_MILTER_SOCKET?=	${RUNDIR}/clmilter.sock
-
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST+=	DBDIR=${DBDIR} \
-		LOGDIR=${LOGDIR} \
-		RUNDIR=${RUNDIR} \
-		CLAMAVUSER=${CLAMAVUSER} \
-		CLAMAVGROUP=${CLAMAVGROUP} \
-		CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \
-		CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET} \
-		CHMOD=${CHMOD} \
-		CHOWN=${CHOWN}
-
-SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
-		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
-		-e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${RUNDIR}/\2|' \
-		-e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \
-		-e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \
-		-e 's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' \
-		-e 's|^\#?(ScanMail).*$$|\1 yes|' \
-		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \
-		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
-		-e 's|^\#?(FixStaleSocket).*$$|\1 yes|' \
-		-e 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' \
-		-e 's|^\#?(MilterSocket) */tmp.*$$|\1 ${CLAMAV_MILTER_SOCKET}|' \
-		-e 's|^\#?(ClamdSocket).*$$|\1 unix:${CLAMAV_CLAMD_SOCKET}|'
-
-PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
-		CLAMAVGROUP=${CLAMAVGROUP}
-
-PORTSCOUT=	ignore:1
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
-CONFIGURE_ARGS+=--enable-llvm
-. if ${PORT_OPTIONS:MTESTS}
-USE_PYTHON_BUILD=	yes
-. endif
-.else
-CONFIGURE_ARGS+=--disable-llvm
-.endif
-
-.if ${PORT_OPTIONS:MMILTER}
-USE_RC_SUBR+=	clamav-milter
-. if ${PORT_OPTIONS:MLDAP} && exists(${LOCALBASE}/lib/libldap.so)
-USE_OPENLDAP=	yes
-LDFLAGS+=	-lldap
-. endif
-
-. if !exists(/usr/lib/libmilter.a) || exists(${LOCALBASE}/lib/libmilter.a)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
-CONFIGURE_ARGS+=--with-sendmail=${LOCALBASE}/sbin/sendmail
-. else
-CONFIGURE_ARGS+=--with-sendmail=/usr/sbin/sendmail
-. endif
-.endif
-
-.if ${PORT_OPTIONS:MSTDERR}
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-shared_output.c
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-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.sample \
-		${WRKSRC}/etc/freshclam.conf.sample \
-		${WRKSRC}/etc/clamav-milter.conf.sample
-	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
-		${WRKSRC}/libclamunrar/unrar.c
-
-.if ${PORT_OPTIONS:MLLVM} && ${PORT_OPTIONS:MTESTS}
-pre-configure:
-	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
-		${ECHO_MSG} ""; \
-		${ECHO_MSG} "==========================================================================="; \
-		${ECHO_MSG} "= Unit tests REQUIRES python built with thread support, and yours is not. ="; \
-		${ECHO_MSG} "= It will not be called during this build                                 ="; \
-		${ECHO_MSG} "==========================================================================="; \
-		${ECHO_MSG} ""; \
-		${TOUCH} ${PY_NO_THREAD}; \
-	fi
-.endif
-
-.if ${PORT_OPTIONS:MTESTS} && ${PORT_OPTIONS:MUNRAR} && ${OSVERSION} >= 700000
-post-build:
-	@if [ ! -f "${PY_NO_THREAD}" ]; then \
-		${GMAKE} -C ${WRKSRC} check; \
-	fi
-.endif
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html
-
-.include <bsd.port.post.mk>
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
deleted file mode 100644
index 21ef2aae91bf..000000000000
--- a/security/clamav-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (clamav-devel-20140107.tar.gz) = 2b2d5e7e3ac786dbef77c8e8c43d31c2da0194f5422c2499f8bb8701e91f0705
-SIZE (clamav-devel-20140107.tar.gz) = 36998346
diff --git a/security/clamav-devel/files/clamav-clamd.in b/security/clamav-devel/files/clamav-clamd.in
deleted file mode 100644
index 9369132b6cd7..000000000000
--- a/security/clamav-devel/files/clamav-clamd.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: clamav_clamd
-# REQUIRE: LOGIN
-# BEFORE: mail
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable clamd:
-#
-# clamav_clamd_enable="YES"
-# clamav_clamd_flags="<set as needed>"
-#
-# See clamd(8) for flags
-#
-
-. /etc/rc.subr
-
-name=clamav_clamd
-rcvar=clamav_clamd_enable
-
-# read settings, set default values
-load_rc_config "$name"
-
-: ${clamav_clamd_enable:=NO}
-: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
-
-command=%%PREFIX%%/sbin/clamd
-required_dirs=%%DBDIR%%
-required_files=%%PREFIX%%/etc/clamd.conf
-
-start_precmd=clamav_clamd_precmd
-extra_commands=reload
-reload_cmd="%%PREFIX%%/bin/clamdscan --reload"
-
-#clamav .93 won't start without a valid main.c[vl]d file
-clamav_clamd_precmd()
-{
-	if [ ! -f %%DBDIR%%/main.cvd -a ! -f %%DBDIR%%/main.cld ];then
-		echo "Missing %%DBDIR%%/*.cvd or *.cld files.  You must run freshclam first"
-		exit 1
-	fi
-}
-
-run_rc_command "$1"
diff --git a/security/clamav-devel/files/clamav-freshclam.in b/security/clamav-devel/files/clamav-freshclam.in
deleted file mode 100644
index 6f3165117817..000000000000
--- a/security/clamav-devel/files/clamav-freshclam.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: clamav_freshclam
-# REQUIRE: LOGIN clamav_clamd
-# BEFORE: mail
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable the freshclam daemon:
-#
-# clamav_freshclam_enable="YES"
-# clamav_freshclam_flags="<set as needed>"
-#
-# See freshclam(1) for flags
-#
-
-. /etc/rc.subr
-
-name=clamav_freshclam
-rcvar=clamav_freshclam_enable
-
-load_rc_config ${name}
-
-: ${clamav_freshclam_enable:=NO}
-
-command=%%PREFIX%%/bin/freshclam
-pidfile=%%RUNDIR%%/freshclam.pid
-command_args="--daemon -p ${pidfile}"
-required_dirs=%%DBDIR%%
-required_files=%%PREFIX%%/etc/freshclam.conf
-
-run_rc_command "$1"
diff --git a/security/clamav-devel/files/clamav-milter.in b/security/clamav-devel/files/clamav-milter.in
deleted file mode 100644
index 02ba20a37aaa..000000000000
--- a/security/clamav-devel/files/clamav-milter.in
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: clamav_milter
-# REQUIRE: LOGIN clamav_clamd
-# BEFORE: mail
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable clamav-milter:
-#
-# clamav_milter_enable="YES"
-#
-# See clamav-milter(1) for flags
-#
-
-. /etc/rc.subr
-
-name=clamav_milter
-rcvar=clamav_milter_enable
-
-load_rc_config $name
-
-: ${clamav_milter_enable:=NO}
-: ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
-: ${clamav_milter_conf="%%PREFIX%%/etc/clamav-milter.conf"}
-: ${clamav_milter_flags="-c ${clamav_milter_conf}"}
-: ${clamav_milter_socktimeout=60}
-: ${clamav_milter_socket_mode=777}
-: ${clamav_milter_socket_user=%%CLAMAVUSER%%}
-: ${clamav_milter_socket_group=%%CLAMAVGROUP%%}
-: ${clamav_clamd_enable:=NO}
-: ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"}
-
-command=%%PREFIX%%/sbin/clamav-milter
-required_dirs=%%DBDIR%%
-required_files=${clamav_milter_conf}
-
-start_precmd=start_precmd
-start_postcmd=start_postcmd
-
-start_precmd()
-{
-	if [ -S "$clamav_milter_socket" ]; then
-		warn "Stale socket $clamav_milter_socket removed."
-		rm "$clamav_milter_socket"
-	fi
-	rc_flags="${flags:-$clamav_milter_flags}"
-
-	clamav_clamd_socket_prefix=${clamav_clamd_socket%:*}
-	# We can have inet or inet6, try to remove 6
-	clamav_clamd_socket_prefix=${clamav_clamd_socket_prefix%6}
-	
-	if checkyesno clamav_clamd_enable && [ "x$clamav_clamd_socket" != "x" -a "${clamav_clamd_socket_prefix}" != "inet" ]; then
-		echo -n "Waiting for clamd socket.. "
-		i=${clamav_milter_socktimeout}
-		while [ $i -ne 0 ]
-		do
-			[ -S "$clamav_clamd_socket" ] && break
-			if [ `expr $i % 10` -eq 0 ]; then
-				echo -n "${i}.. "
-			fi
-			sleep 1
-			i=$(($i-1))
-		done
-		echo
-		if [ $i -eq 0 ]; then
-			echo "There is no clamd socket (${clamav_clamd_socket})!"
-			exit 1
-		fi
-	fi
-}
-
-start_postcmd()
-{
-	clamav_milter_socket_prefix=${clamav_milter_socket%:*}
-	# We can have inet or inet6, try to remove 6
-	clamav_milter_socket_prefix=${clamav_milter_socket_prefix%6}
-	
-	if [ "x$clamav_milter_socket" != "x" -a "${clamav_milter_socket_prefix}" != "inet" ]; then
-		echo -n "Waiting for clamav-milter socket.. "
-		i=${clamav_milter_socktimeout}
-		while [ $i -ne 0 ]
-		do
-			[ -S "$clamav_milter_socket" ] && break
-			if [ `expr $i % 10` -eq 0 ]; then
-				echo -n "${i}.. "
-			fi
-			sleep 1
-			i=$(($i-1))
-		done
-		echo
-		if [ $i -eq 0 ]; then
-			echo "There is no clamav-milter socket (${clamav_milter_socket})!"
-			exit 1
-		fi
-		%%CHMOD%% ${clamav_milter_socket_mode} ${clamav_milter_socket}
-		%%CHOWN%% ${clamav_milter_socket_user}:${clamav_milter_socket_group} ${clamav_milter_socket}
-	fi
-}
-
-run_rc_command "$1"
diff --git a/security/clamav-devel/files/extra-patch-shared_output.c b/security/clamav-devel/files/extra-patch-shared_output.c
deleted file mode 100644
index ddb4ab029f38..000000000000
--- a/security/clamav-devel/files/extra-patch-shared_output.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- shared/output.c.orig	Thu May 18 22:10:40 2006
-+++ shared/output.c	Thu May 18 22:12:43 2006
-@@ -236,7 +236,13 @@
- 	return;
-     }
- 
--    fd = stdout;
-+/*    fd = stdout; (missing flag 'mprintf_stdout') --eh.  */
-+
-+     if(mprintf_stdout)
-+         fd = stdout;
-+     else
-+         fd = stderr;
-+
- 
- /* legend:
-  * ! - error
diff --git a/security/clamav-devel/files/patch-configure b/security/clamav-devel/files/patch-configure
deleted file mode 100644
index fc85efdcc7b6..000000000000
--- a/security/clamav-devel/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2008-10-15 07:41:31.000000000 -0300
-+++ configure	2008-10-15 08:55:58.000000000 -0300
-@@ -17909,7 +17909,7 @@
-     ;;
- freebsd*)
-     if test "$have_pthreads" = "yes"; then
--	THREAD_LIBS="-lthr"
-+	THREAD_LIBS="%%PTHREAD_LIBS%%"
- 	TH_SAFE="-thread-safe"
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -18269,7 +18269,7 @@
- if test "$have_milter" = "yes"; then
- 
-         save_LIBS="$LIBS"
--    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
-+    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
-     if test -d /usr/lib/libmilter ; then
- 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
-     fi
diff --git a/security/clamav-devel/files/patch-libclamav-c++-llvm b/security/clamav-devel/files/patch-libclamav-c++-llvm
deleted file mode 100644
index 91c436b65f8b..000000000000
--- a/security/clamav-devel/files/patch-libclamav-c++-llvm
+++ /dev/null
@@ -1,72 +0,0 @@
---- libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp.orig
-+++ libclamav/c++/llvm/lib/Target/SubtargetFeature.cpp
-@@ -18,6 +18,7 @@
- #include <algorithm>
- #include <cassert>
- #include <cctype>
-+#include <cstdlib>
- using namespace llvm;
- 
- //===----------------------------------------------------------------------===//
---- libclamav/c++/llvm/include/llvm/Support/CFG.h.orig
-+++ libclamav/c++/llvm/include/llvm/Support/CFG.h
-@@ -27,8 +27,9 @@
- 
- template <class Ptr, class USE_iterator> // Predecessor Iterator
- class PredIterator : public std::iterator<std::forward_iterator_tag,
--                                          Ptr, ptrdiff_t> {
--  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t> super;
-+                                          Ptr, ptrdiff_t, Ptr*, Ptr*> {
-+  typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t, Ptr*,
-+                                                                    Ptr*> super;
-   typedef PredIterator<Ptr, USE_iterator> Self;
-   USE_iterator It;
- 
-@@ -40,6 +41,7 @@
- 
- public:
-   typedef typename super::pointer pointer;
-+  typedef typename super::reference reference;
- 
-   PredIterator() {}
-   explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) {
-@@ -50,7 +52,7 @@
-   inline bool operator==(const Self& x) const { return It == x.It; }
-   inline bool operator!=(const Self& x) const { return !operator==(x); }
- 
--  inline pointer operator*() const {
-+  inline reference operator*() const {
-     assert(!It.atEnd() && "pred_iterator out of range!");
-     return cast<TerminatorInst>(*It)->getParent();
-   }
-@@ -100,10 +102,11 @@
- 
- template <class Term_, class BB_>           // Successor Iterator
- class SuccIterator : public std::iterator<std::bidirectional_iterator_tag,
--                                          BB_, ptrdiff_t> {
-+                                          BB_, ptrdiff_t, BB_*, BB_*> {
-   const Term_ Term;
-   unsigned idx;
--  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super;
-+  typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t, BB_*,
-+                                                                    BB_*> super;
-   typedef SuccIterator<Term_, BB_> Self;
- 
-   inline bool index_is_valid(int idx) {
-@@ -112,6 +115,7 @@
- 
- public:
-   typedef typename super::pointer pointer;
-+  typedef typename super::reference reference;
-   // TODO: This can be random access iterator, only operator[] missing.
- 
-   explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator
-@@ -142,7 +146,7 @@
-   inline bool operator==(const Self& x) const { return idx == x.idx; }
-   inline bool operator!=(const Self& x) const { return !operator==(x); }
- 
--  inline pointer operator*() const { return Term->getSuccessor(idx); }
-+  inline reference operator*() const { return Term->getSuccessor(idx); }
-   inline pointer operator->() const { return operator*(); }
- 
-   inline Self& operator++() { ++idx; return *this; } // Preincrement
diff --git a/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c b/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c
deleted file mode 100644
index 42770679a072..000000000000
--- a/security/clamav-devel/files/patch-libclamav__tomsfastmath__mont__fp_montgomery_reduce.c
+++ /dev/null
@@ -1,119 +0,0 @@
---- libclamav/tomsfastmath/mont/fp_montgomery_reduce.c.orig	2014-01-07 17:20:37.000000000 -0200
-+++ libclamav/tomsfastmath/mont/fp_montgomery_reduce.c	2014-01-07 17:21:17.000000000 -0200
-@@ -30,7 +30,7 @@
-    "movl %%edx,%1 \n\t"                                   \
- :"=g"(_c[LO]), "=r"(cy)                                   \
- :"0"(_c[LO]), "1"(cy), "g"(mu), "g"(*tmpm++)              \
--: "%eax", "%edx", "%cc")
-+: "%eax", "%edx", "cc")
- 
- #define PROPCARRY                           \
- asm(                                        \
-@@ -39,7 +39,7 @@
-    "movzbl %%al,%1 \n\t"                    \
- :"=g"(_c[LO]), "=r"(cy)                     \
- :"0"(_c[LO]), "1"(cy)                       \
--: "%eax", "%cc")
-+: "%eax", "cc")
- 
- /******************************************************************/
- #elif defined(TFM_X86_64)
-@@ -62,7 +62,7 @@
-    "movq %%rdx,%1 \n\t"                                   \
- :"=g"(_c[LO]), "=r"(cy)                                   \
- :"0"(_c[LO]), "1"(cy), "r"(mu), "r"(*tmpm++)              \
--: "%rax", "%rdx", "%cc")
-+: "%rax", "%rdx", "cc")
- 
- #define INNERMUL8 \
-  asm(                  \
-@@ -155,7 +155,7 @@
-  \
- :"=r"(_c), "=r"(cy)                    \
- : "0"(_c),  "1"(cy), "g"(mu), "r"(tmpm)\
--: "%rax", "%rdx", "%r10", "%r11", "%cc")
-+: "%rax", "%rdx", "%r10", "%r11", "cc")
- 
- 
- #define PROPCARRY                           \
-@@ -165,7 +165,7 @@
-    "movzbq %%al,%1 \n\t"                    \
- :"=g"(_c[LO]), "=r"(cy)                     \
- :"0"(_c[LO]), "1"(cy)                       \
--: "%rax", "%cc")
-+: "%rax", "cc")
- 
- /******************************************************************/
- #elif defined(TFM_SSE2)  
-@@ -280,7 +280,7 @@
-    "movzbl %%al,%1 \n\t"                    \
- :"=g"(_c[LO]), "=r"(cy)                     \
- :"0"(_c[LO]), "1"(cy)                       \
--: "%eax", "%cc")
-+: "%eax", "cc")
- 
- /******************************************************************/
- #elif defined(TFM_ARM)
-@@ -300,7 +300,7 @@
-     " MOVCC  %0,#0            \n\t" \
-     " UMLAL  r0,%0,%3,%4      \n\t" \
-     " STR    r0,%1            \n\t" \
--:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(*tmpm++),"1"(_c[0]):"r0","%cc");
-+:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(*tmpm++),"1"(_c[0]):"r0","cc");
- 
- #define PROPCARRY                  \
- asm(                               \
-@@ -309,7 +309,7 @@
-     " STR   r0,%1            \n\t" \
-     " MOVCS %0,#1            \n\t" \
-     " MOVCC %0,#0            \n\t" \
--:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"r0","%cc");
-+:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"r0","cc");
- 
- /******************************************************************/
- #elif defined(TFM_PPC32)
-@@ -331,7 +331,7 @@
-    " addc     16,16,18       \n\t"   \
-    " addze    %0,17          \n\t"   \
-    " stw      16,%1          \n\t"   \
--:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(tmpm[0]),"1"(_c[0]):"16", "17", "18","%cc"); ++tmpm;
-+:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(tmpm[0]),"1"(_c[0]):"16", "17", "18","cc"); ++tmpm;
- 
- #define PROPCARRY                    \
- asm(                                 \
-@@ -340,7 +340,7 @@
-    " stw      16,%1         \n\t"    \
-    " xor      %0,%0,%0      \n\t"    \
-    " addze    %0,%0         \n\t"    \
--:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"16","%cc");
-+:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"16","cc");
- 
- /******************************************************************/
- #elif defined(TFM_PPC64)
-@@ -362,7 +362,7 @@
-    " addc     r16,r16,r18       \n\t"   \
-    " addze    %0,r17          \n\t"   \
-    " sdx      r16,0,%1        \n\t"   \
--:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(tmpm[0]),"1"(_c[0]):"r16", "r17", "r18","%cc"); ++tmpm;
-+:"=r"(cy),"=m"(_c[0]):"0"(cy),"r"(mu),"r"(tmpm[0]),"1"(_c[0]):"r16", "r17", "r18","cc"); ++tmpm;
- 
- #define PROPCARRY                    \
- asm(                                 \
-@@ -371,7 +371,7 @@
-    " sdx      r16,0,%1       \n\t"    \
-    " xor      %0,%0,%0      \n\t"    \
-    " addze    %0,%0         \n\t"    \
--:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"r16","%cc");
-+:"=r"(cy),"=m"(_c[0]):"0"(cy),"1"(_c[0]):"r16","cc");
- 
- /******************************************************************/
- #elif defined(TFM_AVR32)
-@@ -401,7 +401,7 @@
-    " st.w     %1,r2         \n\t"    \
-    " eor      %0,%0         \n\t"    \
-    " acr      %0            \n\t"    \
--:"=r"(cy),"=r"(&_c[0]):"0"(cy),"1"(&_c[0]):"r2","%cc");
-+:"=r"(cy),"=r"(&_c[0]):"0"(cy),"1"(&_c[0]):"r2","cc");
- 
- /******************************************************************/
- #elif defined(TFM_MIPS)
diff --git a/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c b/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c
deleted file mode 100644
index 7a6301af8222..000000000000
--- a/security/clamav-devel/files/patch-libclamav__tomsfastmath__mul__fp_mul_comba.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- libclamav/tomsfastmath/mul/fp_mul_comba.c.orig	2014-01-07 17:20:42.000000000 -0200
-+++ libclamav/tomsfastmath/mul/fp_mul_comba.c	2014-01-07 17:21:24.000000000 -0200
-@@ -53,7 +53,7 @@
-      "addl  %%eax,%0     \n\t"                            \
-      "adcl  %%edx,%1     \n\t"                            \
-      "adcl  $0,%2        \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","cc");
- 
- #elif defined(TFM_X86_64)
- /* x86-64 optimized */
-@@ -88,7 +88,7 @@
-      "addq  %%rax,%0     \n\t"                            \
-      "adcq  %%rdx,%1     \n\t"                            \
-      "adcq  $0,%2        \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j)  :"%rax","%rdx","%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j)  :"%rax","%rdx","cc");
- 
- #elif defined(TFM_SSE2)
- /* use SSE2 optimizations */
-@@ -128,7 +128,7 @@
-     "movd  %%mm0,%%eax  \n\t"                            \
-     "adcl  %%eax,%1     \n\t"                            \
-     "adcl  $0,%2        \n\t"                            \
--    :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%cc");
-+    :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","cc");
- 
- #elif defined(TFM_ARM)
- /* ARM code */
-@@ -155,7 +155,7 @@
- "  ADDS   %0,%0,r0              \n\t"                         \
- "  ADCS   %1,%1,r1              \n\t"                         \
- "  ADC    %2,%2,#0              \n\t"                         \
--:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j) : "r0", "r1", "%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j) : "r0", "r1", "cc");
- 
- #elif defined(TFM_PPC32)
- /* For 32-bit PPC */
diff --git a/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c b/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c
deleted file mode 100644
index 0394f86b89e1..000000000000
--- a/security/clamav-devel/files/patch-libclamav__tomsfastmath__sqr__fp_sqr_comba.c
+++ /dev/null
@@ -1,277 +0,0 @@
---- libclamav/tomsfastmath/sqr/fp_sqr_comba.c.orig	2014-01-07 17:25:18.000000000 -0200
-+++ libclamav/tomsfastmath/sqr/fp_sqr_comba.c	2014-01-07 17:25:40.000000000 -0200
-@@ -41,7 +41,7 @@
-      "addl  %%eax,%0     \n\t"                            \
-      "adcl  %%edx,%1     \n\t"                            \
-      "adcl  $0,%2        \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%edx","%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%edx","cc");
- 
- #define SQRADD2(i, j)                                     \
- asm(                                            \
-@@ -53,7 +53,7 @@
-      "addl  %%eax,%0     \n\t"                            \
-      "adcl  %%edx,%1     \n\t"                            \
-      "adcl  $0,%2        \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","cc");
- 
- #define SQRADDSC(i, j)                                    \
- asm(                                                     \
-@@ -62,7 +62,7 @@
-      "movl  %%eax,%0     \n\t"                            \
-      "movl  %%edx,%1     \n\t"                            \
-      "xorl  %2,%2        \n\t"                            \
--     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","%cc");
-+     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","cc");
- 
- #define SQRADDAC(i, j)                                    \
- asm(                                                     \
-@@ -71,7 +71,7 @@
-      "addl  %%eax,%0     \n\t"                            \
-      "adcl  %%edx,%1     \n\t"                            \
-      "adcl  $0,%2        \n\t"                            \
--     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","%cc");
-+     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%eax","%edx","cc");
- 
- #define SQRADDDB                                          \
- asm(                                                     \
-@@ -81,7 +81,7 @@
-      "addl %6,%0         \n\t"                            \
-      "adcl %7,%1         \n\t"                            \
-      "adcl %8,%2         \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc");
- 
- #elif defined(TFM_X86_64)
- /* x86-64 optimized */
-@@ -109,7 +109,7 @@
-      "addq  %%rax,%0     \n\t"                            \
-      "adcq  %%rdx,%1     \n\t"                            \
-      "adcq  $0,%2        \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx","%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i) :"%rax","%rdx","cc");
- 
- #define SQRADD2(i, j)                                     \
- asm(                                                     \
-@@ -121,7 +121,7 @@
-      "addq  %%rax,%0     \n\t"                            \
-      "adcq  %%rdx,%1     \n\t"                            \
-      "adcq  $0,%2        \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j)  :"%rax","%rdx","%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "g"(i), "g"(j)  :"%rax","%rdx","cc");
- 
- #define SQRADDSC(i, j)                                    \
- asm(                                                     \
-@@ -130,7 +130,7 @@
-      "movq  %%rax,%0     \n\t"                            \
-      "movq  %%rdx,%1     \n\t"                            \
-      "xorq  %2,%2        \n\t"                            \
--     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","%cc");
-+     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","cc");
- 
- #define SQRADDAC(i, j)                                                         \
- asm(                                                     \
-@@ -139,7 +139,7 @@
-      "addq  %%rax,%0     \n\t"                            \
-      "adcq  %%rdx,%1     \n\t"                            \
-      "adcq  $0,%2        \n\t"                            \
--     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","%cc");
-+     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "g"(i), "g"(j) :"%rax","%rdx","cc");
- 
- #define SQRADDDB                                          \
- asm(                                                     \
-@@ -149,7 +149,7 @@
-      "addq %6,%0         \n\t"                            \
-      "adcq %7,%1         \n\t"                            \
-      "adcq %8,%2         \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc");
- 
- #elif defined(TFM_SSE2)
- 
-@@ -181,7 +181,7 @@
-      "movd  %%mm0,%%eax  \n\t"                            \
-      "adcl  %%eax,%1     \n\t"                            \
-      "adcl  $0,%2        \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i) :"%eax","cc");
- 
- #define SQRADD2(i, j)                                     \
- asm(                                            \
-@@ -197,7 +197,7 @@
-      "addl  %%eax,%0     \n\t"                            \
-      "adcl  %%edx,%1     \n\t"                            \
-      "adcl  $0,%2        \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2): "0"(c0), "1"(c1), "2"(c2), "m"(i), "m"(j)  :"%eax","%edx","cc");
- 
- #define SQRADDSC(i, j)                                                         \
- asm(                                            \
-@@ -221,7 +221,7 @@
-      "addl  %%eax,%0     \n\t"                            \
-      "adcl  %%edx,%1     \n\t"                            \
-      "adcl  $0,%2        \n\t"                            \
--     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "m"(i), "m"(j)  :"%eax","%edx","%cc");
-+     :"=r"(sc0), "=r"(sc1), "=r"(sc2): "0"(sc0), "1"(sc1), "2"(sc2), "m"(i), "m"(j)  :"%eax","%edx","cc");
- 
- #define SQRADDDB                                          \
- asm(                                                     \
-@@ -231,7 +231,7 @@
-      "addl %6,%0         \n\t"                            \
-      "adcl %7,%1         \n\t"                            \
-      "adcl %8,%2         \n\t"                            \
--     :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "%cc");
-+     :"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(sc0), "r"(sc1), "r"(sc2) : "cc");
- 
- #elif defined(TFM_ARM)
- 
-@@ -260,7 +260,7 @@
- "  ADDS   %0,%0,r0                 \n\t"                         \
- "  ADCS   %1,%1,r1                 \n\t"                         \
- "  ADC    %2,%2,#0                 \n\t"                         \
--:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i) : "r0", "r1", "%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i) : "r0", "r1", "cc");
- 	
- /* for squaring some of the terms are doubled... */
- #define SQRADD2(i, j)                                            \
-@@ -272,13 +272,13 @@
- "  ADDS   %0,%0,r0                 \n\t"                         \
- "  ADCS   %1,%1,r1                 \n\t"                         \
- "  ADC    %2,%2,#0                 \n\t"                         \
--:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j) : "r0", "r1", "%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2) : "0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j) : "r0", "r1", "cc");
- 
- #define SQRADDSC(i, j)                                           \
- asm(                                                             \
- "  UMULL  %0,%1,%6,%7              \n\t"                         \
- "  SUB    %2,%2,%2                 \n\t"                         \
--:"=r"(sc0), "=r"(sc1), "=r"(sc2) : "0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j) : "%cc");
-+:"=r"(sc0), "=r"(sc1), "=r"(sc2) : "0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j) : "cc");
- 
- #define SQRADDAC(i, j)                                           \
- asm(                                                             \
-@@ -286,7 +286,7 @@
- "  ADDS   %0,%0,r0                 \n\t"                         \
- "  ADCS   %1,%1,r1                 \n\t"                         \
- "  ADC    %2,%2,#0                 \n\t"                         \
--:"=r"(sc0), "=r"(sc1), "=r"(sc2) : "0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j) : "r0", "r1", "%cc");
-+:"=r"(sc0), "=r"(sc1), "=r"(sc2) : "0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j) : "r0", "r1", "cc");
- 
- #define SQRADDDB                                                 \
- asm(                                                             \
-@@ -296,7 +296,7 @@
- "  ADDS  %0,%0,%3                     \n\t"                      \
- "  ADCS  %1,%1,%4                     \n\t"                      \
- "  ADC   %2,%2,%5                     \n\t"                      \
--:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "cc");
- 
- #elif defined(TFM_PPC32)
- 
-@@ -326,7 +326,7 @@
-    " mulhwu 16,%6,%6       \n\t" \
-    " adde   %1,%1,16       \n\t" \
-    " addze  %2,%2          \n\t" \
--:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i):"16","%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i):"16","cc");
- 
- /* for squaring some of the terms are doubled... */
- #define SQRADD2(i, j)            \
-@@ -339,14 +339,14 @@
-    " addc   %0,%0,16       \n\t" \
-    " adde   %1,%1,17       \n\t" \
-    " addze  %2,%2          \n\t" \
--:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j):"16", "17","%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j):"16", "17","cc");
- 
- #define SQRADDSC(i, j)            \
- asm(                              \
-    " mullw  %0,%6,%7        \n\t" \
-    " mulhwu %1,%6,%7        \n\t" \
-    " xor    %2,%2,%2        \n\t" \
--:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "%cc");
-+:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "cc");
- 
- #define SQRADDAC(i, j)           \
- asm(                             \
-@@ -355,7 +355,7 @@
-    " mulhwu 16,%6,%7       \n\t" \
-    " adde   %1,%1,16       \n\t" \
-    " addze  %2,%2          \n\t" \
--:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j):"16", "%cc");
-+:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j):"16", "cc");
- 
- #define SQRADDDB                  \
- asm(                              \
-@@ -365,7 +365,7 @@
-    " addc   %0,%0,%3        \n\t" \
-    " adde   %1,%1,%4        \n\t" \
-    " adde   %2,%2,%5        \n\t" \
--:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "cc");
- 
- #elif defined(TFM_PPC64)
- /* PPC64 */
-@@ -394,7 +394,7 @@
-    " mulhdu r16,%6,%6       \n\t" \
-    " adde   %1,%1,r16       \n\t" \
-    " addze  %2,%2          \n\t" \
--:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i):"r16","%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i):"r16","cc");
- 
- /* for squaring some of the terms are doubled... */
- #define SQRADD2(i, j)            \
-@@ -407,14 +407,14 @@
-    " addc   %0,%0,r16       \n\t" \
-    " adde   %1,%1,r17       \n\t" \
-    " addze  %2,%2          \n\t" \
--:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j):"r16", "r17","%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2):"0"(c0), "1"(c1), "2"(c2), "r"(i), "r"(j):"r16", "r17","cc");
- 
- #define SQRADDSC(i, j)            \
- asm(                              \
-    " mulld  %0,%6,%7        \n\t" \
-    " mulhdu %1,%6,%7        \n\t" \
-    " xor    %2,%2,%2        \n\t" \
--:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "%cc");
-+:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "cc");
- 
- #define SQRADDAC(i, j)           \
- asm(                             \
-@@ -423,7 +423,7 @@
-    " mulhdu r16,%6,%7       \n\t" \
-    " adde   %1,%1,r16       \n\t" \
-    " addze  %2,%2          \n\t" \
--:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j):"r16", "%cc");
-+:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i), "r"(j):"r16", "cc");
- 
- #define SQRADDDB                  \
- asm(                              \
-@@ -433,7 +433,7 @@
-    " addc   %0,%0,%3        \n\t" \
-    " adde   %1,%1,%4        \n\t" \
-    " adde   %2,%2,%5        \n\t" \
--:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "cc");
- 
- 
- #elif defined(TFM_AVR32)
-@@ -501,7 +501,7 @@
-    " add    %0,%0,%3        \n\t" \
-    " adc    %1,%1,%4        \n\t" \
-    " adc    %2,%2,%5        \n\t" \
--:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "%cc");
-+:"=r"(c0), "=r"(c1), "=r"(c2) : "r"(sc0), "r"(sc1), "r"(sc2), "0"(c0), "1"(c1), "2"(c2) : "cc");
- 
- #elif defined(TFM_MIPS)
- 
-@@ -571,7 +571,7 @@
-    " mflo   %0             \n\t"  \
-    " mfhi   %1             \n\t"  \
-    " xor    %2,%2,%2       \n\t"  \
--:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "%cc");
-+:"=r"(sc0), "=r"(sc1), "=r"(sc2):"0"(sc0), "1"(sc1), "2"(sc2), "r"(i),"r"(j) : "cc");
- 
- #define SQRADDAC(i, j)           \
- asm(                             \
diff --git a/security/clamav-devel/files/pkg-deinstall.in b/security/clamav-devel/files/pkg-deinstall.in
deleted file mode 100644
index ee619bc86abb..000000000000
--- a/security/clamav-devel/files/pkg-deinstall.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-	exit 0
-fi
-
-CLAMAVUSER=%%CLAMAVUSER%%
-
-echo
-echo "===================================================="
-echo
-echo "If you want remove clamav permanently from you system"
-echo "execute following commands:"
-echo
-echo " # rm -rf %%LOGDIR%%"
-echo " # rm -rf %%RUNDIR%%"
-echo " # rm -rf %%DBDIR%%"
-if pw usershow "${CLAMAVUSER}" 2>/dev/null 1>&2; then
-	echo " # pw userdel ${CLAMAVUSER}"
-fi
-echo
-echo "===================================================="
-echo
-
-exit 0
diff --git a/security/clamav-devel/files/pkg-install.in b/security/clamav-devel/files/pkg-install.in
deleted file mode 100644
index 91ce48187153..000000000000
--- a/security/clamav-devel/files/pkg-install.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-PREFIX=${PKG_PREFIX:-%%PREFIX%%}
-
-CLAMAVUSER=%%CLAMAVUSER%%
-CLAMAVGROUP=%%CLAMAVGROUP%%
-UID=106
-GID=$UID
-
-DBDIR=%%DBDIR%%
-LOGDIR=%%LOGDIR%%
-RUNDIR=%%RUNDIR%%
-
-PW="pw"
-CHOWN="chown"
-INSTALL_DIR="install -d -o ${CLAMAVUSER} -g ${CLAMAVGROUP} -m 0755"
-
-if [ "$2" = "PRE-INSTALL" ]; then
-
-	if ! ${PW} groupshow ${CLAMAVGROUP} 2>/dev/null 1>&2; then
-		if ${PW} groupadd ${CLAMAVGROUP} -g $GID; then
-			echo "=> Added group \"${CLAMAVGROUP}\"."
-		else
-			echo "=> Adding group \"${CLAMAVGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ! ${PW} usershow ${CLAMAVUSER} 2>/dev/null 1>&2; then
-		if ${PW} useradd ${CLAMAVUSER} -u $UID -g ${CLAMAVGROUP} -h - \
-			-s "/sbin/nologin" -d "/nonexistent" \
-			-c "Clam Antivirus"; \
-		then
-			${PW} groupmod mail -m ${CLAMAVUSER}
-			echo "=> Added user \"${CLAMAVUSER}\"."
-		else
-			echo "=> Adding user \"${CLAMAVUSER}\" failed..."
-			exit 1
-		fi
-	fi
-
-elif [ "$2" = "POST-INSTALL" ]; then
-	${INSTALL_DIR} ${DBDIR} ${LOGDIR} ${RUNDIR}
-	${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DBDIR} ${LOGDIR} ${RUNDIR}
-fi
-
-exit 0
diff --git a/security/clamav-devel/pkg-descr b/security/clamav-devel/pkg-descr
deleted file mode 100644
index fa040724200a..000000000000
--- a/security/clamav-devel/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a snapshot version of Clam Antivirus.
-Clam Antivirus is command line virus scanner written entirely in C
-and its database is kept up to date. It also detects polymorphic
-viruses, scans compressed files and supported by AMaViS.
-Optionally you can use the clamav-milter interface to connect
-clamav with sendmail.
-
-WWW: http://www.clamav.net/
diff --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist
deleted file mode 100644
index 6c3582d83c47..000000000000
--- a/security/clamav-devel/pkg-plist
+++ /dev/null
@@ -1,43 +0,0 @@
-bin/clamav-config
-bin/clambc
-bin/clamconf
-bin/clamdtop
-bin/clamscan
-bin/clamdscan
-bin/freshclam
-bin/sigtool
-%%MILTER%%sbin/clamav-milter
-sbin/clamd
-include/clamav.h
-include/clamav-config.h
-lib/libclamav.la
-lib/libclamav.so
-lib/libclamav.so.7
-%%UNRAR%%lib/libclamunrar.la
-%%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.7
-%%UNRAR%%lib/libclamunrar_iface.la
-%%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.7
-libdata/pkgconfig/libclamav.pc
-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
-@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
-@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
-%%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
diff --git a/security/clamav-milter/Makefile b/security/clamav-milter/Makefile
index 4393fc77fe17..cdac4f297e65 100644
--- a/security/clamav-milter/Makefile
+++ b/security/clamav-milter/Makefile
@@ -8,6 +8,6 @@ OPTIONS_SET+=	MILTER
 MASTERDIR=	${.CURDIR}/../clamav
 PKGNAMESUFFIX=	-milter
 
-CONFLICTS=	clamav-[0-9]* clamav-devel-[0-9]*
+CONFLICTS=	clamav-[0-9]*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index f175b95cffae..331dc85c2076 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -86,7 +86,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib \
 # force to use -lthr until it's not fixed.
 PTHREAD_LIBS=	-lthr
 
-CONFLICTS?=	clamav-devel-[0-9]* clamav-milter-[0-9]*
+CONFLICTS?=	clamav-milter-[0-9]*
 
 CLAMAVUSER?=	clamav
 CLAMAVGROUP?=	clamav
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index b68aa7df7bfd..0d6f92b6362f 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -23,25 +23,15 @@ MAN8=		clamsmtpd.8
 
 PORTDOCS=	README
 
-OPTIONS_RADIO=	CLAMAV
-OPTIONS_RADIO_CLAMAV=	LOCAL_CLAMAV LOCAL_CLAMAV_DEVEL
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS LOCAL_CLAMAV
 OPTIONS_DEFAULT=	LOCAL_CLAMAV
 LOCAL_CLAMAV_DESC=		RUN_DEPEND on security/clamav
-LOCAL_CLAMAV_DEVEL_DESC=	RUN_DEPEND on security/clamav-devel
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLOCAL_CLAMAV}
 RUN_DEPENDS+=	clamav>=0:${PORTSDIR}/security/clamav
-.endif
-
-.if ${PORT_OPTIONS:MLOCAL_CLAMAV_DEVEL}
-RUN_DEPENDS+=	clamav-devel>=0:${PORTSDIR}/security/clamav-devel
-.endif
-
-.if ${PORT_OPTIONS:MLOCAL_CLAMAV} || ${PORT_OPTIONS:MLOCAL_CLAMAV_DEVEL}
 SUB_LIST+=	CLAMD=clamd
 .else
 SUB_LIST+=	CLAMD=