aboutsummaryrefslogtreecommitdiff
path: root/mail/kavmilter
diff options
context:
space:
mode:
Diffstat (limited to 'mail/kavmilter')
-rw-r--r--mail/kavmilter/Makefile11
-rw-r--r--mail/kavmilter/files/patch-Makefile28
-rw-r--r--mail/kavmilter/files/patch-libconf_Makefile12
3 files changed, 42 insertions, 9 deletions
diff --git a/mail/kavmilter/Makefile b/mail/kavmilter/Makefile
index bdcbadc946a3..393640806bee 100644
--- a/mail/kavmilter/Makefile
+++ b/mail/kavmilter/Makefile
@@ -7,14 +7,13 @@
PORTNAME= kavmilter
PORTVERSION= 0.91.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://granch.ru/pub/kavmilter/
MAINTAINER= shelton@granch.ru
COMMENT= Sendmail antivirus filter, based on Kaspersky Antivirus and Milter API
-LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
-
.if !exists(/usr/lib/libmilter.a)
IGNORE= requires Sendmail 8.12; upgrade the base system
.endif
@@ -26,10 +25,10 @@ USE_REINPLACE= yes
MAN5= kavmilter.5
MAN8= kavmilter.8
-MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
-
-post-patch:
- @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${MAKEFILE}
+CPPFLAGS= ${PTHREAD_CFLAGS}
+LDFLAGS= ${PTHREAD_LIBS}
+MAKE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
post-install:
${STRIP_CMD} ${PREFIX}/libexec/kavmilter
diff --git a/mail/kavmilter/files/patch-Makefile b/mail/kavmilter/files/patch-Makefile
index c5b3d348277f..d2235b91c51a 100644
--- a/mail/kavmilter/files/patch-Makefile
+++ b/mail/kavmilter/files/patch-Makefile
@@ -1,6 +1,28 @@
---- Makefile.orig Mon Jun 16 22:58:51 2003
-+++ Makefile Mon Jun 16 22:58:44 2003
-@@ -58,6 +58,11 @@
+--- Makefile.orig Thu Jun 12 19:19:59 2003
++++ Makefile Mon Jul 7 06:57:24 2003
+@@ -38,11 +38,11 @@
+ VARDIR=/var
+ PIDDIR=$(VARDIR)/run
+
+-LIBS=-lmilter -lgnugetopt -lconf
++LIBS=-lmilter -lconf
+ DEFS=-DCONFIG="\"$(PREFIX)/etc/kavmilter.conf\""
+
+-CFLAGS += -Wall -pipe $(INCDIRS)
+-LDFLAGS += -pthread
++CFLAGS += -Wall -pipe $(INCDIRS) $(CPPFLAGS)
++#LDFLAGS += ${PTHREAD_LIBS}
+ #
+ # Remove command
+ RMF = -/bin/rm -f
+@@ -51,13 +51,16 @@
+ echo $(CFLAGS)
+ $(CC) -c $(DEFS) $(CFLAGS) $<
+
+-CC=gcc
+-
+ all: $(BINS)
+
$(OBJS): $(HEADERS)
install: kavmilter stop
diff --git a/mail/kavmilter/files/patch-libconf_Makefile b/mail/kavmilter/files/patch-libconf_Makefile
new file mode 100644
index 000000000000..9a48aa006312
--- /dev/null
+++ b/mail/kavmilter/files/patch-libconf_Makefile
@@ -0,0 +1,12 @@
+--- libconf/Makefile.orig Wed Oct 30 17:29:18 2002
++++ libconf/Makefile Sun Jul 6 20:03:55 2003
+@@ -31,8 +31,7 @@
+ INCDIR=$(PREFIX)
+ #
+ # Compile flags
+-CC=gcc
+-CFLAGS=-Wall -pipe -I$(INCDIR)
++CFLAGS+=-Wall -pipe -I$(INCDIR)
+ #
+ # Libraries
+ LIBS=-lm