aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2004-10-13 00:16:19 +0800
committerDirk Meyer <dinoex@FreeBSD.org>2004-10-13 00:16:19 +0800
commit4a732520f3977f97112efe9027a1ca32428e64e7 (patch)
treeb3eb1c18e3776294c626ac9840c4ea9e475b358f /mail
parent9e6c8fc0bc15540fb4f77d018bd2bdd67e99d665 (diff)
downloadfreebsd-ports-gnome-4a732520f3977f97112efe9027a1ca32428e64e7.tar.gz
freebsd-ports-gnome-4a732520f3977f97112efe9027a1ca32428e64e7.tar.zst
freebsd-ports-gnome-4a732520f3977f97112efe9027a1ca32428e64e7.zip
- force milter dir as first include path
- fix build with sendmail 8.13 mfapi.h - switch default to sendmail 8.13
Diffstat (limited to 'mail')
-rw-r--r--mail/noattach/Makefile6
-rw-r--r--mail/noattach/files/patch-Makefile.in11
-rw-r--r--mail/noattach/files/patch-noattach.c12
3 files changed, 27 insertions, 2 deletions
diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile
index 51e05ce8e003..0009052e0de6 100644
--- a/mail/noattach/Makefile
+++ b/mail/noattach/Makefile
@@ -7,7 +7,7 @@
PORTNAME= noattach
PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= ftp://ftp.rhnet.is/pub/noattach/
DISTNAME= ${PORTNAME}-1.1p1
@@ -19,7 +19,7 @@ COMMENT= An attachment filter for Sendmail
BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/${SENDMAIL_PORT}
.endif
-SENDMAIL_PORT?= sendmail812
+SENDMAIL_PORT?= sendmail
CFLAGS+= ${PTHREAD_CFLAGS:S=""==}
GNU_CONFIGURE= yes
USE_REINPLACE= yes
@@ -31,6 +31,8 @@ CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS+= --enable-ldap
.endif
.if !defined(SENDMAIL_MILTER_IN_BASE)
+CONFIGURE_ENV+= MILTER_INCLUDES="-I${LOCALBASE}/include"
+MAKE_ENV+= MILTER_INCLUDES="-I${LOCALBASE}/include"
LDFLAGS+= -L${LOCALBASE}/lib
.endif
diff --git a/mail/noattach/files/patch-Makefile.in b/mail/noattach/files/patch-Makefile.in
new file mode 100644
index 000000000000..fb2a756dd7a1
--- /dev/null
+++ b/mail/noattach/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Thu Aug 21 15:56:27 2003
++++ Makefile.in Tue Oct 12 17:14:38 2004
+@@ -122,7 +122,7 @@
+ noattach_LDFLAGS =
+
+ DEFS = @DEFS@
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
++DEFAULT_INCLUDES = $(MILTER_INCLUDES) -I. -I$(srcdir) -I.
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
diff --git a/mail/noattach/files/patch-noattach.c b/mail/noattach/files/patch-noattach.c
new file mode 100644
index 000000000000..19c07c00a793
--- /dev/null
+++ b/mail/noattach/files/patch-noattach.c
@@ -0,0 +1,12 @@
+--- noattach.c.orig Thu Aug 21 15:52:48 2003
++++ noattach.c Tue Oct 12 18:02:32 2004
+@@ -54,7 +54,9 @@
+ #define BUFFER_SIZE (MILTER_CHUNK_SIZE+OVERLAP_SIZE)
+
+ #ifndef true
++#ifndef __bool_true_false_are_defined
+ typedef int bool;
++#endif /* ! __bool_true_false_are_defined */
+ #define false 0
+ #define true 1
+ #endif /* ! true */