- Update to 0.85 [1]

- Fix syntax of "extern C" wrappers in .h files [2]
- Use SUB_FILES facility
- Polish the Makefile

PR:		ports/80947
Submitted by:	maintainer [1], Milan Obuch <ports-bugs@dino.sk> [2]

12 files changed, 74 insertions, 37 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index fdd9d0e8543f..86d481b57eb5 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	${DISTVERSION:C/([a-z])[a-z]*/.\1/g:S/-/./g}
+PORTVERSION=	0.85
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	clamav
-DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	rob@debank.tv
 COMMENT=	Command line virus scanner written entirely in C
@@ -23,8 +22,6 @@ RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 		arc:${PORTSDIR}/archivers/arc \
 		unzip:${PORTSDIR}/archivers/unzip
 
-DISTVERSION=	0.84
-
 OPTIONS=	MILTER "Compile the milter interface" Off \
 		CURL "Support URL downloading" Off
 USE_REINPLACE=	yes
@@ -33,9 +30,6 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_RC_SUBR=	yes
 
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-
 PORTDOCS=	NEWS ChangeLog html
 
 DBDIR=		/var/db/clamav
@@ -70,14 +64,14 @@ CLAMAVGROUP?=	clamav
 CLAMAV_CLAMD_SOCKET?=	${RUNDIR}/clamd
 CLAMAV_MILTER_SOCKET?=	${RUNDIR}/clmilter.sock
 
-SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%DBDIR%%|${DBDIR}|g' \
-		-e 's|%%LOGDIR%%|${LOGDIR}|g' \
-		-e 's|%%RUNDIR%%|${RUNDIR}|g' \
-		-e 's|%%CLAMAVUSER%%|${CLAMAVUSER}|g' \
-		-e 's|%%CLAMAVGROUP%%|${CLAMAVGROUP}|g' \
-		-e 's|%%CLAMAV_CLAMD_SOCKET%%|${CLAMAV_CLAMD_SOCKET}|g' \
-		-e 's|%%CLAMAV_MILTER_SOCKET%%|${CLAMAV_MILTER_SOCKET}|g'
+SUB_FILES=	pkg-install pkg-deinstall clamav-clamd.sh clamav-freshclam.sh
+SUB_LIST=	DBDIR=${DBDIR} \
+		LOGDIR=${LOGDIR} \
+		RUNDIR=${RUNDIR} \
+		CLAMAVUSER=${CLAMAVUSER} \
+		CLAMAVGROUP=${CLAMAVGROUP} \
+		CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \
+		CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET}
 
 SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
@@ -96,15 +90,13 @@ PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 
 RC_DIR=		${PREFIX}/etc/rc.d
 RC_SUFX=	.sh
-SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
-		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
-		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
-PLIST_SUB+=	RC_DIR=${RC_DIR} \
-		RC_SUFX=${RC_SUFX}
+SUB_LIST+=	RC_DIR=${RC_DIR} RC_SUFX=${RC_SUFX}
+PLIST_SUB+=	RC_DIR=${RC_DIR} RC_SUFX=${RC_SUFX}
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MILTER)
+SUB_FILES+=	clamav-milter.sh
 .if !defined(WITHOUT_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
 USE_OPENLDAP=	yes
 LDFLAGS+=	-lldap
@@ -142,16 +134,6 @@ pre-build:
 post-build:
 	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamd.conf
 	@${REINPLACE_CMD} ${SED_CONF} ${BUILD_WRKSRC}/etc/freshclam.conf
-	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
-	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-clamd.sh \
-		>${WRKDIR}/clamav-clamd.sh
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-freshclam.sh \
-		>${WRKDIR}/clamav-freshclam.sh
-.if defined(WITH_MILTER)
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-milter.sh \
-		>${WRKDIR}/clamav-milter.sh
-.endif
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} PKG_DESTDIR=${DESTDIR} \
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index bd45124703d8..0509465ff42f 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,2 +1,2 @@
-MD5 (clamav-0.84.tar.gz) = c43213da01d510faf117daa9a4d5326c
-SIZE (clamav-0.84.tar.gz) = 4006624
+MD5 (clamav-0.85.tar.gz) = b6bf9b04d69b4e9cf917beca99d8169a
+SIZE (clamav-0.85.tar.gz) = 4047244
diff --git a/security/clamav/files/clamav-clamd.sh b/security/clamav/files/clamav-clamd.sh.in
index c9019a8e3ac9..3518358332c7 100644
--- a/security/clamav/files/clamav-clamd.sh
+++ b/security/clamav/files/clamav-clamd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-clamd.sh.in,v 1.1 2005-05-13 08:16:40 jylefort Exp $
 #
 
 # PROVIDE: clamd
diff --git a/security/clamav/files/clamav-freshclam.sh b/security/clamav/files/clamav-freshclam.sh.in
index 3ade51a5f538..89a2c4f63b5b 100644
--- a/security/clamav/files/clamav-freshclam.sh
+++ b/security/clamav/files/clamav-freshclam.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-freshclam.sh.in,v 1.1 2005-05-13 08:16:40 jylefort Exp $
 #
 
 # PROVIDE: freshclam
diff --git a/security/clamav/files/clamav-milter.sh b/security/clamav/files/clamav-milter.sh.in
index a69f974848c9..a49581cc3a55 100644
--- a/security/clamav/files/clamav-milter.sh
+++ b/security/clamav/files/clamav-milter.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-milter.sh.in,v 1.1 2005-05-13 08:16:40 jylefort Exp $
 #
 
 # PROVIDE: clamav-milter
diff --git a/security/clamav/files/patch-libclamav_clamav.h b/security/clamav/files/patch-libclamav_clamav.h
new file mode 100644
index 000000000000..a67b0cfbf6bd
--- /dev/null
+++ b/security/clamav/files/patch-libclamav_clamav.h
@@ -0,0 +1,11 @@
+--- libclamav/clamav.h.orig	Fri May 13 09:11:42 2005
++++ libclamav/clamav.h	Fri May 13 09:11:46 2005
+@@ -221,7 +221,7 @@
+ extern const char *cl_perror(int clerror); /* deprecated */
+ 
+ #ifdef __cplusplus
+-};
++}
+ #endif
+  
+ #endif
diff --git a/security/clamav/files/patch-libclamav_mspack_mspack.h b/security/clamav/files/patch-libclamav_mspack_mspack.h
new file mode 100644
index 000000000000..eb6acc8d2c8f
--- /dev/null
+++ b/security/clamav/files/patch-libclamav_mspack_mspack.h
@@ -0,0 +1,11 @@
+--- libclamav/mspack/mspack.h.orig	Fri May 13 09:10:53 2005
++++ libclamav/mspack/mspack.h	Fri May 13 09:10:57 2005
+@@ -1488,7 +1488,7 @@
+ };
+ 
+ #ifdef __cplusplus
+-};
++}
+ #endif
+ 
+ #endif
diff --git a/security/clamav/files/patch-libclamav_unrarlib.h b/security/clamav/files/patch-libclamav_unrarlib.h
new file mode 100644
index 000000000000..4d8f466fed78
--- /dev/null
+++ b/security/clamav/files/patch-libclamav_unrarlib.h
@@ -0,0 +1,11 @@
+--- libclamav/unrarlib.h.orig	Fri May 13 09:07:21 2005
++++ libclamav/unrarlib.h	Fri May 13 09:07:26 2005
+@@ -198,7 +198,7 @@
+ 
+ 
+ #ifdef __cplusplus
+-};
++}
+ #endif
+ 
+ #endif
diff --git a/security/clamav/files/patch-libclamav_zziplib_zzip-io.h b/security/clamav/files/patch-libclamav_zziplib_zzip-io.h
new file mode 100644
index 000000000000..57801066cdef
--- /dev/null
+++ b/security/clamav/files/patch-libclamav_zziplib_zzip-io.h
@@ -0,0 +1,11 @@
+--- libclamav/zziplib/zzip-io.h.orig	Fri May 13 09:08:36 2005
++++ libclamav/zziplib/zzip-io.h	Fri May 13 09:08:44 2005
+@@ -68,7 +68,7 @@
+ # define ZZIP_IO_USE_MMAP 1
+ 
+ #ifdef __cplusplus
+-};
++}
+ #endif
+ 
+ #endif
diff --git a/security/clamav/files/patch-libclamav_zziplib_zziplib.h b/security/clamav/files/patch-libclamav_zziplib_zziplib.h
new file mode 100644
index 000000000000..211f5783a1bd
--- /dev/null
+++ b/security/clamav/files/patch-libclamav_zziplib_zziplib.h
@@ -0,0 +1,11 @@
+--- libclamav/zziplib/zziplib.h.orig	Fri May 13 09:08:57 2005
++++ libclamav/zziplib/zziplib.h	Fri May 13 09:09:09 2005
+@@ -325,7 +325,7 @@
+ #endif /* _ZZIP_WRITE_SOURCE */
+ 
+ #ifdef __cplusplus
+-};
++}
+ #endif
+ 
+ #endif /* _ZZIPLIB_H */
diff --git a/security/clamav/pkg-deinstall b/security/clamav/files/pkg-deinstall.in
index 207212015296..0075621d1650 100644
--- a/security/clamav/pkg-deinstall
+++ b/security/clamav/files/pkg-deinstall.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/pkg-deinstall.in,v 1.1 2005-05-13 08:16:40 jylefort Exp $
 
 if [ "$2" != "POST-DEINSTALL" ]; then
 	exit 0
diff --git a/security/clamav/pkg-install b/security/clamav/files/pkg-install.in
index 91ec86b6b17b..3a5a36371c91 100644
--- a/security/clamav/pkg-install
+++ b/security/clamav/files/pkg-install.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/pkg-install.in,v 1.1 2005-05-13 08:16:40 jylefort Exp $
 
 PREFIX=${PKG_PREFIX:-%%PREFIX%%}
 DESTDIR=${PKG_DESTDIR:-}