Fri Aug 18 15:19:50 2017 UTC ()
Tidy Makefile.common (no functional change)

- Move PKGREVISION (unchanged) to Makefiles.
- Fix used-by annotation.
- Add PATCHDIR so clamav-doc has consistent distinfo/patches (even
  though clamav-doc just copies files that aren't patched).


(gdt)
diff -r1.36 -r1.37 pkgsrc/security/clamav/Makefile
diff -r1.7 -r1.8 pkgsrc/security/clamav/Makefile.common
diff -r1.2 -r1.3 pkgsrc/security/clamav-doc/Makefile
cvs diff -r1.36 -r1.37 pkgsrc/security/clamav/Makefile (expand / switch to unified diff)

--- pkgsrc/security/clamav/Makefile 2017/07/24 09:39:42 1.36
+++ pkgsrc/security/clamav/Makefile 2017/08/18 15:19:49 1.37
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.36 2017/07/24 09:39:42 maya Exp $ 1# $NetBSD: Makefile,v 1.37 2017/08/18 15:19:49 gdt Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5COMMENT= Anti-virus toolkit 5COMMENT= Anti-virus toolkit
 6PKGREVISION= 3
6 7
7USE_LANGUAGES= c c++ 8USE_LANGUAGES= c c++
8USE_LIBTOOL= yes 9USE_LIBTOOL= yes
9USE_TOOLS+= gsed 10USE_TOOLS+= gsed
10GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
11SET_LIBDIR= yes 12SET_LIBDIR= yes
12FAKE_NCURSES= yes 13FAKE_NCURSES= yes
13CONFIGURE_ARGS+= --disable-clamav 14CONFIGURE_ARGS+= --disable-clamav
14CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
15CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR} 16CONFIGURE_ARGS+= --with-dbdir=${CLAMAV_DBDIR}
16CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} 17CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP}
17CONFIGURE_ARGS+= --with-user=${CLAMAV_USER} 18CONFIGURE_ARGS+= --with-user=${CLAMAV_USER}
18CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl} 19CONFIGURE_ARGS+= --with-libcurl=${BUILDLINK_PREFIX.curl}
cvs diff -r1.7 -r1.8 pkgsrc/security/clamav/Makefile.common (expand / switch to unified diff)

--- pkgsrc/security/clamav/Makefile.common 2017/07/24 09:39:42 1.7
+++ pkgsrc/security/clamav/Makefile.common 2017/08/18 15:19:49 1.8
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.common,v 1.7 2017/07/24 09:39:42 maya Exp $ 1# $NetBSD: Makefile.common,v 1.8 2017/08/18 15:19:49 gdt Exp $
2# 2#
3# used by clamav/Makefile 3# used by security/clamav/Makefile
4# used by clamav-doc/Makefile 4# used by security/clamav-doc/Makefile
5 5
6DISTNAME= clamav-0.99.2 6DISTNAME= clamav-0.99.2
7PKGREVISION= 3 
8CATEGORIES= security 7CATEGORIES= security
9MASTER_SITES= http://www.clamav.net/downloads/production/ 8MASTER_SITES= http://www.clamav.net/downloads/production/
10 9
11MAINTAINER?= pkgsrc-users@NetBSD.org 10MAINTAINER?= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.clamav.net/ 11HOMEPAGE= http://www.clamav.net/
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15DISTINFO_FILE= ${.CURDIR}/../../security/clamav/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../security/clamav/distinfo
 15PATCHDIR= ${.CURDIR}/../../security/clamav/patches
cvs diff -r1.2 -r1.3 pkgsrc/security/clamav-doc/Makefile (expand / switch to unified diff)

--- pkgsrc/security/clamav-doc/Makefile 2015/12/11 16:31:06 1.2
+++ pkgsrc/security/clamav-doc/Makefile 2017/08/18 15:19:50 1.3
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.2 2015/12/11 16:31:06 adam Exp $ 1# $NetBSD: Makefile,v 1.3 2017/08/18 15:19:50 gdt Exp $
2 2
3.include "../../security/clamav/Makefile.common" 3.include "../../security/clamav/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/clamav/clamav-doc/} 5PKGNAME= ${DISTNAME:S/clamav/clamav-doc/}
 6PKGREVISION= 3
6COMMENT= Anti-virus toolkit documents 7COMMENT= Anti-virus toolkit documents
7 8
8NO_BUILD= yes 9NO_BUILD= yes
9NO_CONFIGURE= yes 10NO_CONFIGURE= yes
10USE_TOOLS+= pax 11USE_TOOLS+= pax
11 12
12DOCDIR= ${PREFIX}/share/doc/clamav 13DOCDIR= ${PREFIX}/share/doc/clamav
13PDFDOC= clamav-mirror-howto.pdf clamdoc.pdf phishsigs_howto.pdf \ 14PDFDOC= clamav-mirror-howto.pdf clamdoc.pdf phishsigs_howto.pdf \
14 signatures.pdf 15 signatures.pdf
15 16
16INSTALLATION_DIRS+= ${DOCDIR}/html 17INSTALLATION_DIRS+= ${DOCDIR}/html
17 18
18do-install: 19do-install: