svn commit: r354254 - in head: . mail/dspam mail/dspam-devel security security/clamav security/clamav-devel security/clamav-milter security/clamsmtp www/mod_clamav

Renato Botelho garga at FreeBSD.org
Fri May 16 18:46:51 UTC 2014 

Author: garga
Date: Fri May 16 18:46:48 2014
New Revision: 354254
URL: http://svnweb.freebsd.org/changeset/ports/354254
QAT: https://qat.redports.org/buildarchive/r354254/

Log:
  Retire security/clamav-devel, clamav is not being updated that much nowadays,
  so a -devel version is not required anymore. Also removed OPTIONS on other
  ports that pointed to clamav-devel as a dependency.
  
  Approved by:	portmgr (implict)

Deleted:
  head/security/clamav-devel/
Modified:
  head/MOVED
  head/mail/dspam-devel/Makefile
  head/mail/dspam/Makefile
  head/security/Makefile
  head/security/clamav-milter/Makefile
  head/security/clamav/Makefile
  head/security/clamsmtp/Makefile
  head/www/mod_clamav/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri May 16 18:46:00 2014	(r354253)
+++ head/MOVED	Fri May 16 18:46:48 2014	(r354254)
@@ -6104,3 +6104,4 @@ archivers/star||2014-05-15|Has expired: 
 editors/ved||2014-05-15|Has expired: Depends on deprecated smake
 japanese/chasen||2014-05-15|Has expired: Unmaintained since 2001
 www/openx|www/revive-adserver|2014-05-15|Upstream obsolete, forked
+security/clamav-devel||2014-05-16|Retire, older than security/clamav

Modified: head/mail/dspam-devel/Makefile
==============================================================================
--- head/mail/dspam-devel/Makefile	Fri May 16 18:46:00 2014	(r354253)
+++ head/mail/dspam-devel/Makefile	Fri May 16 18:46:48 2014	(r354254)
@@ -34,7 +34,7 @@ WRKSRC=		${WRKDIR}/dspam-${PORTVER_MAJ}
 .endif
 
 OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
-		CLAMAV CLAMAV_DEVEL CLAMAV_LOCAL MYSQL_COMPRESS \
+		CLAMAV CLAMAV_LOCAL MYSQL_COMPRESS \
 		MYSQL_LOCAL PGSQL_LOCAL HASH EXTERNAL_LOOKUP \
 		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
 		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
@@ -52,7 +52,6 @@ BNR_DEBUG_DESC=	Debug for BNR
 PREF_EXT_DESC=	Preferences in database not in files
 DAEMON_DESC=	Daemonize dspam; speaks LMTP or DLMTP
 CLAMAV_DESC=	ClamAV support
-CLAMAV_DEVEL_DESC=	ClamAV support
 CLAMAV_LOCAL_DESC=	RUN_DEPEND on selected ClamAV
 MYSQL51_DESC=	MySQL 5.1.x as back-end
 MYSQL55_DESC=	MySQL 5.5.x as back-end
@@ -191,15 +190,6 @@ SUB_LIST+=	CLAMD=clamd
 SUB_LIST+=	CLAMD=
 .	endif
 .endif
-.if ${PORT_OPTIONS:MCLAMAV_DEVEL}
-CONFIGURE_ARGS+=	--enable-clamav
-.	if ${PORT_OPTIONS:MCLAMAV_LOCAL}
-RUN_DEPENDS+=	clamav-devel>=0:${PORTSDIR}/security/clamav-devel
-SUB_LIST+=	CLAMD=clamd
-.	else
-SUB_LIST+=	CLAMD=
-.	endif
-.endif
 
 # we need to know if we are building statically or dynamicaly for the plist
 _DBDRV_COUNT=	# blank, but defined so we can check against it

Modified: head/mail/dspam/Makefile
==============================================================================
--- head/mail/dspam/Makefile	Fri May 16 18:46:00 2014	(r354253)
+++ head/mail/dspam/Makefile	Fri May 16 18:46:48 2014	(r354254)
@@ -19,7 +19,7 @@ COMMENT=	Bayesian spam filter
 MIN_OPTIONS_VER=	${PORTNAME}-3.9.0
 
 OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
-		CLAMAV CLAMAV_DEVEL CLAMAV_LOCAL EXTERNAL_LOOKUP \
+		CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \
 		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
 		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
 		QMAIL WEBUI LIGHTTPD
@@ -37,7 +37,6 @@ BNR_DEBUG_DESC=	Debug for BNR
 PREF_EXT_DESC=	Preferences in database not in files
 DAEMON_DESC=	Daemonize dspam; speaks LMTP or DLMTP
 CLAMAV_DESC=	ClamAV support
-CLAMAV_DEVEL_DESC=	ClamAV devel version support
 CLAMAV_LOCAL_DESC=	RUN_DEPEND on selected ClamAV
 MYSQL_DESC=	MySQL 5.X.x as back-end
 MYSQL_COMPRESS_DESC=	Compress dspam <--> MySQL
@@ -186,15 +185,6 @@ SUB_LIST+=	CLAMD=clamd
 SUB_LIST+=	CLAMD=
 .	endif
 .endif
-.if ${PORT_OPTIONS:MCLAMAV_DEVEL}
-CONFIGURE_ARGS+=	--enable-clamav
-.	if ${PORT_OPTIONS:MCLAMAV_LOCAL}
-RUN_DEPENDS+=	clamav-devel>=0:${PORTSDIR}/security/clamav-devel
-SUB_LIST+=	CLAMD=clamd
-.	else
-SUB_LIST+=	CLAMD=
-.	endif
-.endif
 
 # we need to know if we are building statically or dynamicaly for the plist
 _DBDRV_COUNT=	# blank, but defined so we can check against it

Modified: head/security/Makefile
==============================================================================
--- head/security/Makefile	Fri May 16 18:46:00 2014	(r354253)
+++ head/security/Makefile	Fri May 16 18:46:48 2014	(r354254)
@@ -69,7 +69,6 @@
     SUBDIR += cl-md5-sbcl
     SUBDIR += clamassassin
     SUBDIR += clamav
-    SUBDIR += clamav-devel
     SUBDIR += clamav-milter
     SUBDIR += clamav-unofficial-sigs
     SUBDIR += clamcour

Modified: head/security/clamav-milter/Makefile
==============================================================================
--- head/security/clamav-milter/Makefile	Fri May 16 18:46:00 2014	(r354253)
+++ head/security/clamav-milter/Makefile	Fri May 16 18:46:48 2014	(r354254)
@@ -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"

Modified: head/security/clamav/Makefile
==============================================================================
--- head/security/clamav/Makefile	Fri May 16 18:46:00 2014	(r354253)
+++ head/security/clamav/Makefile	Fri May 16 18:46:48 2014	(r354254)
@@ -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

Modified: head/security/clamsmtp/Makefile
==============================================================================
--- head/security/clamsmtp/Makefile	Fri May 16 18:46:00 2014	(r354253)
+++ head/security/clamsmtp/Makefile	Fri May 16 18:46:48 2014	(r354254)
@@ -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=

Modified: head/www/mod_clamav/Makefile
==============================================================================
--- head/www/mod_clamav/Makefile	Fri May 16 18:46:00 2014	(r354253)
+++ head/www/mod_clamav/Makefile	Fri May 16 18:46:48 2014	(r354254)
@@ -18,17 +18,10 @@ USE_AUTOTOOLS=	libtool
 USE_APACHE=	22
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		CLAMAVDEVEL
-CLAMAVDEVEL_DESC=	development version of CLAMAV
-
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MCLAMAVDEVEL}
-LIB_DEPENDS+=	libclamav.so:${PORTSDIR}/security/clamav-devel
-.else
 CLAMAV_PORT=	security/clamav
 LIB_DEPENDS+=	libclamav.so:${PORTSDIR}/security/clamav
-.endif
 
 CONFIGURE_ARGS=	--with-apxs=${APXS} \
 		--libdir=${PREFIX}/lib/apache2

More information about the svn-ports-all mailing list