diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-06-07 17:39:15 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-06-07 17:39:15 +0000 |
| commit | a556be5da738209110f8898285c5aaf3c92359cb (patch) | |
| tree | 7a0412f0ddfea4b0e18eef02ad05f1a9bbb287fa /mail/clamav/patches | |
| parent | e06b405703d11d189d7c5a2788eb51ba7d91e2ca (diff) | |
| download | pkgsrc-a556be5da738209110f8898285c5aaf3c92359cb.tar.gz | |
Avoid hardcoding /usr/pkg in patch files (CFLAGS and LDFLAGS contain the
right flags, so there is no need to add -I and -L flags by hand).
Honour PKG_SYSCONFDIR. Bump PKGREVISION to 2.
Diffstat (limited to 'mail/clamav/patches')
| -rw-r--r-- | mail/clamav/patches/patch-aa | 10 | ||||
| -rw-r--r-- | mail/clamav/patches/patch-ab | 13 |
2 files changed, 18 insertions, 5 deletions
diff --git a/mail/clamav/patches/patch-aa b/mail/clamav/patches/patch-aa index 6570423f968..d5d2dbf0f8b 100644 --- a/mail/clamav/patches/patch-aa +++ b/mail/clamav/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $ +$NetBSD: patch-aa,v 1.2 2003/06/07 17:39:15 jmmv Exp $ --- configure.in.orig Thu Nov 21 01:43:16 2002 +++ configure.in Tue Mar 11 17:48:07 2003 @@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $ -else - cfg_dir="$sysconfdir" -fi -+cfg_dir=$prefix/etc ++cfg_dir=$sysconfdir CFGDIR=$cfg_dir AC_SUBST(CFGDIR) @@ -24,10 +24,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/26 18:55:17 agc Exp $ + AC_MSG_RESULT(NetBSD detected. Adding pth stuff.) have_pthreads="no" AC_DEFINE(C_BSD) -+ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L/usr/pkg/lib -lpthread" ++ LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LDFLAGS -lpthread" + AC_DEFINE(CL_THREAD_SAFE) -+ CLAMD_LIBS="-lpthread -L/usr/pkg/lib" -+ CFLAGS="$CFLAGS -I/usr/pkg/include" ++ CLAMD_LIBS="-lpthread $LDFLAGS" ++ CFLAGS="$CFLAGS" ;; bsd*) AC_MSG_RESULT(Unknown BSD detected. Disabling thread support.) diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab new file mode 100644 index 00000000000..5c81dced96b --- /dev/null +++ b/mail/clamav/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2003/06/07 17:39:15 jmmv Exp $ + +--- etc/Makefile.in.orig 2002-11-21 01:44:02.000000000 +0100 ++++ etc/Makefile.in +@@ -118,7 +118,7 @@ am__quote = @am__quote@ + install_sh = @install_sh@ + + EXTRA_DIST = clamav.conf +-CFGINST = @CFGDIR@ ++CFGINST = $(datadir)/examples/clamav + subdir = etc + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = |