Index: head/mail/noattach/Makefile
===================================================================
--- head/mail/noattach/Makefile	(revision 119058)
+++ head/mail/noattach/Makefile	(revision 119059)
@@ -1,71 +1,73 @@
 # New ports collection makefile for:	noattach
 # Date created:				10. Feb 2002
 # Whom:					dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	noattach
 PORTVERSION=	1.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.rhnet.is/pub/noattach/
 DISTNAME=	${PORTNAME}-1.1p1
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An attachment filter for Sendmail
 
 .if !defined(SENDMAIL_MILTER_IN_BASE)
 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
 MAN8=		noattach.8
 DOCSFILES=	AUTHORS THANKS INSTALL NEWS README TODO ChangeLog
 SAMPLEFILES=	README noattach.patterns noattach.patterns.johncon
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 .if defined(SENDMAIL_WITH_LDAP)
 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
 
 .include <bsd.port.pre.mk>
 
 .if defined(SENDMAIL_WITHOUT_MILTER)
 pre-fetch:
 	@${ECHO_MSG}
 	@${ECHO_MSG} You must unset variable SENDMAIL_WITHOUT_MILTER,
 	@${ECHO_MSG} and rebuild sendmail in the ports
 	@${FALSE}
 .endif
 
 pre-configure:
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/noattach.sh \
 		> ${WRKSRC}/noattach.sh
 	${REINPLACE_CMD} -e 's=-pthread=${PTHREAD_LIBS}=' \
 		${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${PREFIX}/libexec/noattach
 	${INSTALL_SCRIPT} ${WRKSRC}/noattach.sh \
 		${PREFIX}/etc/rc.d/noattach.sh.sample
 	${INSTALL_DATA} ${WRKSRC}/examples/noattach.patterns \
 		 ${PREFIX}/etc/noattach.patterns-dist
 	${INSTALL_MAN} ${WRKSRC}/doc/noattach.8 ${PREFIX}/man/man8/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${MKDIR} ${EXAMPLESDIR}
 .for i in ${DOCSFILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
 .for i in ${SAMPLEFILES}
 	${INSTALL_DATA} ${WRKSRC}/examples/${i} ${EXAMPLESDIR}/
 .endfor
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/noattach/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.21
\ No newline at end of property
+1.22
\ No newline at end of property
Index: head/mail/noattach/files/patch-Makefile.in
===================================================================
--- head/mail/noattach/files/patch-Makefile.in	(nonexistent)
+++ head/mail/noattach/files/patch-Makefile.in	(revision 119059)
@@ -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@

Property changes on: head/mail/noattach/files/patch-Makefile.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/mail/noattach/files/patch-noattach.c
===================================================================
--- head/mail/noattach/files/patch-noattach.c	(nonexistent)
+++ head/mail/noattach/files/patch-noattach.c	(revision 119059)
@@ -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 */

Property changes on: head/mail/noattach/files/patch-noattach.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property