fix previous a different way that avoids the extra headers

This commit is contained in:
sthen 2018-12-04 13:40:06 +00:00
parent bfed3247f0
commit b4a89ef73b
3 changed files with 15 additions and 13 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.123 2018/12/04 13:23:11 sthen Exp $
# $OpenBSD: Makefile,v 1.124 2018/12/04 13:40:06 sthen Exp $
COMMENT= virus scanner
DISTNAME= clamav-0.101.0
REVISION= 0
REVISION= 1
CATEGORIES= security
@ -48,7 +48,6 @@ CONFIGURE_ARGS+= --disable-clamav \
--with-group=_clamav \
--disable-cr \
--with-dbdir=/var/db/clamav \
--includedir=${TRUEPREFIX}/include/clamav \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib
@ -68,9 +67,6 @@ FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/clamav
CONFIGURE_ARGS+= --disable-llvm
post-install:
cd ${WRKSRC}; \
${INSTALL_DATA} clamav-config.h platform.h libclamav/cltypes.h \
${PREFIX}/include/clamav
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/clamav
cd ${WRKSRC}/docs; \
cp -rp UserManual* html ${PREFIX}/share/doc/clamav/

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-libclamav_clamav_h,v 1.2 2018/04/11 21:35:58 sthen Exp $
$OpenBSD: patch-libclamav_clamav_h,v 1.3 2018/12/04 13:40:06 sthen Exp $
Index: libclamav/clamav.h
--- libclamav/clamav.h.orig
@ -12,3 +12,13 @@ Index: libclamav/clamav.h
#include <unistd.h>
@@ -64,8 +64,7 @@
#include <sys/types.h>
#include <sys/stat.h>
-
-#include "cltypes.h"
+#include <inttypes.h>
#ifdef __cplusplus
extern "C"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.28 2018/12/04 13:23:11 sthen Exp $
@comment $OpenBSD: PLIST,v 1.29 2018/12/04 13:40:06 sthen Exp $
@newgroup _clamav:539
@newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin
@extraunexec rm -fr /var/db/clamav/*
@ -17,11 +17,7 @@ bin/clamav-config
@bin bin/clamsubmit
@bin bin/freshclam
@bin bin/sigtool
include/clamav/
include/clamav/clamav-config.h
include/clamav/clamav.h
include/clamav/cltypes.h
include/clamav/platform.h
include/clamav.h
lib/libclamav.a
lib/libclamav.la
@lib lib/libclamav.so.${LIBclamav_VERSION}