pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
clamav: pkglint cleanup
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sat Aug 23 21:15:11 2025 +0200
Changeset: 2637040a424d7ca89204108e55f18356513c8961
Modified Files:
clamav/Makefile
clamav/Makefile.common
clamav/PLIST
clamav/buildlink3.mk
Log Message:
clamav: pkglint cleanup
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2637040a424d7ca89204108e55f18356513c8961
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
clamav/Makefile | 30 +++++++++++++++---------------
clamav/Makefile.common | 8 ++++----
clamav/PLIST | 4 ++--
clamav/buildlink3.mk | 2 +-
4 files changed, 22 insertions(+), 22 deletions(-)
diffs:
diff --git a/clamav/Makefile b/clamav/Makefile
index ad04a53668..54c9d2973f 100644
--- a/clamav/Makefile
+++ b/clamav/Makefile
@@ -10,21 +10,21 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= gsed pkg-config gmake
SET_LIBDIR= yes
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
-CMAKE_CONFIGURE_ARGS+= -DAPP_CONFIG_DIRECTORY=${PKG_SYSCONFDIR}
-CMAKE_CONFIGURE_ARGS+= -DDATABASE_DIRECTORY=${CLAMAV_DBDIR}
-CMAKE_CONFIGURE_ARGS+= -DCLAMAV_USER=${CLAMAV_USER}
-CMAKE_CONFIGURE_ARGS+= -DCLAMAV_GROUP=${CLAMAV_GROUP}
-CMAKE_CONFIGURE_ARGS+= -DENABLE_EXTERNAL_MSPACK=on
-CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS=off
-CMAKE_CONFIGURE_ARGS+= -DENABLE_MILTER=off
-#CMAKE_CONFIGURE_ARGS+= -DJSONC_LIBRARY={BUILDLINK_PREFIX.json-c}/lib
-#CMAKE_CONFIGURE_ARGS+= -DJSONC_INCLUDE_DIR={BUILDLINK_PREFIX.json-c}/include
-#CMAKE_CONFIGURE_ARGS+= -DJSONC_LIBRARY={BUILDLINK_PREFIX.json-c}/lib
-#CMAKE_CONFIGURE_ARGS+= -DCURL_INCLUDE_DIR={BUILDLINK_PREFIX.curl}/include
-#CMAKE_CONFIGURE_ARGS+= -DCURL_LIBRARY={BUILDLINK_PREFIX.curl}/lib
-#CMAKE_CONFIGURE_ARGS+= -D_INCLUDE_DIR={BUILDLINK_PREFIX.curl}/include
-#CMAKE_CONFIGURE_ARGS+= -DCURL_LIBRARY={BUILDLINK_PREFIX.curl}/lib
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_CONFIGURE_ARGS+= -DAPP_CONFIG_DIRECTORY=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DDATABASE_DIRECTORY=${CLAMAV_DBDIR}
+CMAKE_CONFIGURE_ARGS+= -DCLAMAV_USER=${CLAMAV_USER}
+CMAKE_CONFIGURE_ARGS+= -DCLAMAV_GROUP=${CLAMAV_GROUP}
+CMAKE_CONFIGURE_ARGS+= -DENABLE_EXTERNAL_MSPACK=on
+CMAKE_CONFIGURE_ARGS+= -DENABLE_TESTS=off
+CMAKE_CONFIGURE_ARGS+= -DENABLE_MILTER=off
+#CMAKE_CONFIGURE_ARGS+= -DJSONC_LIBRARY={BUILDLINK_PREFIX.json-c}/lib
+#CMAKE_CONFIGURE_ARGS+= -DJSONC_INCLUDE_DIR={BUILDLINK_PREFIX.json-c}/include
+#CMAKE_CONFIGURE_ARGS+= -DJSONC_LIBRARY={BUILDLINK_PREFIX.json-c}/lib
+#CMAKE_CONFIGURE_ARGS+= -DCURL_INCLUDE_DIR={BUILDLINK_PREFIX.curl}/include
+#CMAKE_CONFIGURE_ARGS+= -DCURL_LIBRARY={BUILDLINK_PREFIX.curl}/lib
+#CMAKE_CONFIGURE_ARGS+= -D_INCLUDE_DIR={BUILDLINK_PREFIX.curl}/include
+#CMAKE_CONFIGURE_ARGS+= -DCURL_LIBRARY={BUILDLINK_PREFIX.curl}/lib
#CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
#CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
#CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
diff --git a/clamav/Makefile.common b/clamav/Makefile.common
index a85fc21bf1..70c1dd0f95 100644
--- a/clamav/Makefile.common
+++ b/clamav/Makefile.common
@@ -1,7 +1,7 @@
# $NetBSD: Makefile.common,v 1.27 2024/09/05 15:10:15 taca Exp $
#
-# used by security/clamav/Makefile
-# used by security/clamav-doc/Makefile
+# used by wip/clamav/Makefile
+# used by wip/clamav-doc/Makefile
DISTNAME= clamav-1.4.3
CATEGORIES= security
@@ -11,5 +11,5 @@ MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.clamav.net/
LICENSE= gnu-gpl-v2
-DISTINFO_FILE= ${.CURDIR}/../../security/clamav/distinfo
-PATCHDIR= ${.CURDIR}/../../security/clamav/patches
+DISTINFO_FILE= ${.CURDIR}/../../wip/clamav/distinfo
+PATCHDIR= ${.CURDIR}/../../wip/clamav/patches
diff --git a/clamav/PLIST b/clamav/PLIST
index f72d78fdbf..94548999d6 100644
--- a/clamav/PLIST
+++ b/clamav/PLIST
@@ -39,8 +39,8 @@ man/man5/clamd.conf.5
man/man5/freshclam.conf.5
man/man8/clamav-milter.8
man/man8/clamd.8
-sbin/clamd
${PLIST.milter}sbin/clamav-milter
+sbin/clamd
+${PLIST.milter}share/examples/clamav/clamav-milter.conf
share/examples/clamav/clamd.conf
share/examples/clamav/freshclam.conf
-${PLIST.milter}share/examples/clamav/clamav-milter.conf
diff --git a/clamav/buildlink3.mk b/clamav/buildlink3.mk
index c71fb70708..0b568e5abb 100644
--- a/clamav/buildlink3.mk
+++ b/clamav/buildlink3.mk
@@ -7,7 +7,7 @@ CLAMAV_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.clamav+= clamav>=0.95.3nb1
BUILDLINK_ABI_DEPENDS.clamav+= clamav>=0.103.12nb4
-BUILDLINK_PKGSRCDIR.clamav?= ../../security/clamav
+BUILDLINK_PKGSRCDIR.clamav?= ../../wip/clamav
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/pcre2/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index