- bump MILTER_SOVER to fix linking on FREEBSD-12

- bump PORTREVISION on ports using libmilter - rename WITH_SENDMAIL_PORT to WITH_MILTER_PORT - rename WITH_SENDMAIL_BASE to WITH_MILTER_BASE - rename WITH_SENDMAIL_STATIC_MILTER to WITH_MILTER_STATIC - cleanup ifdefs - fix build on batv-filter with libmilter from ports
svn path=/head/; revision=473663
2024-11-20 00:21:35 +00:00 · 2018-07-01 10:17:18 +00:00 · 2018-07-01 10:17:18 +00:00 · 6058705eb9 · 2021-03-31 03:12:20 +00:00
commit 6058705eb9
parent d605da2ddf
30 changed files with 96 additions and 82 deletions
--- a/mail/antivirus-milter/Makefile
+++ b/mail/antivirus-milter/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	antivirus
 PORTVERSION=	3.30
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/dinoex

@ -25,9 +25,7 @@ ANTIVIRUS_DIR?=	/var/spool/antivirus

 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

-.if defined(WITH_SENDMAIL_PORT)
 LIBS+=		${LDFLAGS}
-.endif

 MAKE_ENV+=	SENDMAILBASE="${MILTERBASE}" \
 		SENDMAILOBJ="${MILTERBASE}" \
--- a/mail/archivesmtp/Makefile
+++ b/mail/archivesmtp/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	archivesmtp
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dancingfortune.com/projects/archivesmtp/files/

--- a/mail/batv-milter/Makefile
+++ b/mail/batv-milter/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	batv-milter
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF

--- a/mail/batv-milter/files/patch-batv-filter_Makefile.m4
+++ b/mail/batv-milter/files/patch-batv-filter_Makefile.m4
@ -1,6 +1,6 @@
--- ./batv-filter/Makefile.m4.orig	2009-04-24 06:11:09.000000000 +0900
-+++ ./batv-filter/Makefile.m4	2009-06-04 07:30:43.000000000 +0900
-@@ -3,6 +3,7 @@
+--- batv-filter/Makefile.m4.orig	2009-04-23 21:11:09 UTC
+++ batv-filter/Makefile.m4
+@@ -3,6 +3,7 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
 
 define(`confMT', `TRUE')
 define(`confREQUIRE_LIBSM', `true')
@ -8,7 +8,13 @@
 
 APPENDDEF(`confLIBS', `-lssl -lcrypto')
 dnl Enable and edit these paths as needed:
-@@ -20,7 +21,7 @@
+@@ -15,12 +16,12 @@ dnl Enable these next line if needed to 
+ dnl and the libmilter include files:
+ dnl APPENDDEF(`confINCDIRS', `-I/usr/local/sendmail/include')
+ dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/sendmail/lib')
+-
+APPENDDEF(`confLIBDIRS', `-L/usr/local/lib')
+ 
 bldPRODUCT_START(`executable', `batv-filter')
 define(`bldSOURCES', `batv-filter.c config.c util.c ')
 dnl PREPENDDEF(`confLIBS', ifelse(index(confENVDEF, `-DCOMMERCIAL'), -1, `-lmilter ', `../libmilter/libmilter.a '))
--- a/mail/dcc-dccd/Makefile
+++ b/mail/dcc-dccd/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dcc-dccd
 PORTVERSION=	1.3.159
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
 		ftp://ftp.dcc-servers.net/src/dcc/old/ \
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dk-milter
 PORTVERSION=	1.0.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/DomainKeys%20Milter/${PORTVERSION}

@ -21,7 +21,7 @@ IGNORE=		your system does not support sysvipc
 .endif

 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
-WITH_SENDMAIL_BASE=	yes
+WITH_MILTER_BASE=	yes
 PKGMESSAGE=	pkg-message.postfix

 .if defined(WITH_POSTFIX_CURRENT)
@ -62,11 +62,11 @@ WITHOUT_MILTER_CFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

 SITE+=		${WRKSRC}/site.config.m4.dist
-.if defined(WITH_SENDMAIL_PORT)
+.if defined(WITH_MILTER_PORT)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif

-.if defined(WITH_SENDMAIL_STATIC_MILTER)
+.if defined(WITH_MILTER_STATIC)
 SITE_SUB+=	-e '\|-static|s|%%STATIC%%||g'
 .else
 SITE_SUB+=	-e '\|-static|s|%%STATIC%%|dnl |g'
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	enma
 PORTVERSION=	1.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/ENMA/${PORTVERSION}

--- a/mail/libmilter/Makefile
+++ b/mail/libmilter/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	libmilter
 PORTVERSION=	8.15.2
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
 DISTNAME=	sendmail.${PORTVERSION}
@ -14,7 +15,7 @@ LICENSE_NAME=	Sendmail License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

-MILTER_SOVER?=	6
+MILTER_SOVER?=	7

 OPTIONS_DEFINE?=	IPV6 MILTER_SHARED MILTER_POOL DOCS
 OPTIONS_DEFAULT?=	MILTER_SHARED MILTER_POOL
--- a/mail/milter-bogom/Makefile
+++ b/mail/milter-bogom/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	bogom
 PORTVERSION=	1.9.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.usebox.net/jjm/bogom/ \
 		http://blackshell.usebox.net/bogom/
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	milter-greylist
 PORTVERSION=	4.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/ \
 		http://fossies.org/unix/privat/
@ -20,9 +20,9 @@ USES=		tar:tgz
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
-#   WITH_SENDMAIL_BASE=yes
+#   WITH_MILTER_BASE=yes
 # or
-#   WITH_SENDMAIL_PORT=yes
+#   WITH_MILTER_PORT=yes
 #
 # If unspecified, check for an up-to-date system version but give an
 # installed port preference over it.
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	milter-regex
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/

--- a/mail/milter-skem/Makefile
+++ b/mail/milter-skem/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	skem
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://virtual-estates.net/skem/

--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	mimedefang
 PORTVERSION=	2.83
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mimedefang.org/static/ \
 		http://fossies.org/linux/misc/
@ -55,9 +56,7 @@ CONFIG_FILES=	mimedefang-filter sa-mimedefang.cf mimedefang-ip-key

 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

-.if defined(WITH_SENDMAIL_PORT)
-CONFIGURE_ARGS+=	--with-milterinc=${LOCALBASE}/include --with-milterlib=${LOCALBASE}/lib
-.endif
+CONFIGURE_ARGS+=	--with-milterinc=${MILTERBASE}/include --with-milterlib=${MILTERBASE}/lib

 CLAMAV_BUILD_DEPENDS+=		clamscan:security/clamav
 CLAMAV_RUN_DEPENDS+=		clamscan:security/clamav
--- a/mail/noattach/Makefile
+++ b/mail/noattach/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	noattach
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/

@ -20,10 +20,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES

 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

-.if defined(WITH_SENDMAIL_PORT)
 CONFIGURE_ENV+=	MILTER_INCLUDES="${MILTERINC}"
 MAKE_ENV+=	MILTER_INCLUDES="${MILTERINC}"
-.endif

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${STAGEDIR}${PREFIX}/libexec/noattach
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	opendkim
 PORTVERSION=	2.10.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases \
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	opendmarc
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/${PORTNAME}/Previous%20Releases
--- a/mail/py-milter/Makefile
+++ b/mail/py-milter/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	milter
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${GH_PROJECT}-
 CATEGORIES=	mail python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	raysfilter
 PORTVERSION=	1.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	LOCAL/dinoex
 DISTNAME=	rays-filter-${PORTVERSION}
--- a/mail/rbl-milter/Makefile
+++ b/mail/rbl-milter/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	rbl-milter
 PORTVERSION=	0.30
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	http://opensource.confusticate.com/rbl-milter/

--- a/mail/scam-backscatter/Makefile
+++ b/mail/scam-backscatter/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	scam-backscatter
 PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.elandsys.com/scam/scam-backscatter/ \
 		http://dist.epipe.com/mirrors/scam-backscatter/
--- a/mail/sendmail/bsd.milter.mk
+++ b/mail/sendmail/bsd.milter.mk
@ -9,10 +9,12 @@
 #
 # the user/port can now set this options in the makefiles.
 #
-# WITH_SENDMAIL_STATIC_MILTER=	- Use static milter lib
+# WITH_MILTER_STATIC=		- Use static milter lib
+# WITHOUT_MILTER_CFLAGS=	- do not set CFLAGS
+# WITHOUT_MILTER_LDFLAGS=	- do not set LDFLAGS
 #
-# WITH_SENDMAIL_BASE=yes	- Use milter in the base
-# WITH_SENDMAIL_PORT=yes	- Use milter from ports
+# WITH_MILTER_BASE=yes		- Use milter in the base
+# WITH_MILTER_PORT=yes		- Use milter from ports
 #
 # If unspecified, check for the lib exist in the base system,
 # but gives an installed port preference over it.
@ -41,49 +43,66 @@

 Milter_Include_MAINTAINER=	dinoex@FreeBSD.org

-.if	!defined(WITH_SENDMAIL_BASE) && \
+.  if	!defined(WITH_MILTER_BASE) && \
+	!defined(WITH_MILTER_PORT)
+.   if	!defined(WITH_SENDMAIL_BASE) && \
 	!defined(WITH_SENDMAIL_PORT)
-.if	exists(${LOCALBASE}/lib/libmilter.a) || \
-	!exists(/usr/lib/libmilter.a)
+.     if	exists(${LOCALBASE}/lib/libmilter.a) || \
+		!exists(/usr/lib/libmilter.a)
+WITH_MILTER_PORT=yes
 WITH_SENDMAIL_PORT=yes
-.else
+.     else
+WITH_MILTER_BASE=yes
 WITH_SENDMAIL_BASE=yes
-.endif
+.     endif
+.   else
+# convert old macros to new
+.     if	defined(WITH_SENDMAIL_PORT)
+WITH_MILTER_PORT=yes
+.     endif
+.     if	defined(WITH_SENDMAIL_BASE)
+WITH_MILTER_BASE=yes
+.     endif
+.   endif
 .endif

-.if defined(WITH_SENDMAIL_PORT)
+.if defined(WITH_MILTER_PORT)

-.if defined(WITH_SENDMAIL_STATIC_MILTER)
+.  if defined(WITH_MILTER_STATIC) || defined(WITH_SENDMAIL_STATIC_MILTER)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:mail/${SENDMAIL_MILTER_PORT}
-.else
+.  else
 LIB_DEPENDS+=	libmilter.so.${MILTER_SOVER}:mail/${SENDMAIL_MILTER_PORT}
-.endif
+.  endif

 SENDMAIL_MILTER_PORT?=	libmilter
-MILTER_SOVER?=	6
+MILTER_SOVER?=	7
 MILTERBASE?=	${LOCALBASE}
-MILTERINC=	-I${MILTERBASE}/include
 MILTERRPATH=	${MILTERBASE}/lib
-MILTERLIB=	-L${MILTERBASE}/lib -Wl,-rpath,${MILTERRPATH}
-
-.if !defined(WITHOUT_MILTER_CFLAGS)
-.if defined(CFLAGS)
-CFLAGS+=${MILTERINC}
-.else
-CFLAGS=${MILTERINC}
-.endif
-.endif

 .endif

-.if defined(WITH_SENDMAIL_BASE)
+.if defined(WITH_MILTER_BASE)
 MILTERBASE?=	/usr
 MILTERRPATH=	${DESTDIR}/usr/lib:${LOCALBASE}/lib
-MILTERLIB=	-Wl,-rpath,${MILTERRPATH}
+
+.if !exists(/usr/lib/libmilter.a)
+BROKEN=		Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
 .endif

+.endif
+
+MILTERINC=	-I${MILTERBASE}/include
+.if !defined(WITHOUT_MILTER_CFLAGS)
+.  if defined(CFLAGS)
+CFLAGS+=${MILTERINC}
+.  else
+CFLAGS=${MILTERINC}
+.  endif
+.endif
+
+MILTERLIB=	-L${MILTERBASE}/lib
 .if !defined(WITHOUT_MILTER_LDFLAGS)
-LDFLAGS+=${MILTERLIB}
+LDFLAGS+=	-Wl,-rpath,${MILTERRPATH} ${MILTERLIB}
 .endif

 # eof
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	sentinel
 PORTVERSION=	1.7b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail
 MASTER_SITES=	SF/smfilter/${PORTNAME}/Sentinel%20${PORTVERSION}

--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	sid-milter
 PORTVERSION=	1.0.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/SenderID%20Milter/${PORTVERSION}

@ -41,7 +41,7 @@ LIBAR_PLIST_FILES=	include/libar.h lib/libar.a man/man3/ar.3.gz

 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

-.if defined(WITH_SENDMAIL_PORT)
+.if defined(WITH_MILTER_PORT)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif

--- a/mail/smfsav-devel/Makefile
+++ b/mail/smfsav-devel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	smfsav
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://smf-sav.anw.at/
 PKGNAMESUFFIX=	-devel
--- a/mail/smfsav/Makefile
+++ b/mail/smfsav/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	smfsav
 PORTVERSION=	1.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/smfs
 DISTNAME=	smf-sav-${PORTVERSION}
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	spamass-milter
 PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	SAVANNAH/spamass-milt

@ -15,8 +15,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}

 LICENSE=	GPLv2

-OPTIONS_DEFINE=	LDAP SENDMAIL_PORT DOCS
-SENDMAIL_PORT_DESC=	Build against sendmail port
+OPTIONS_DEFINE=	LDAP MILTER_PORT DOCS
+MILTER_PORT_DESC=	Build against libmiter port

 .include <bsd.port.pre.mk>

--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	spamilter
 PORTVERSION=	0.60
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.wanlink.com/spamilter/download/

@ -47,11 +47,7 @@ LIBSPF_LDFLAGS=		-L${LOCALBASE}/lib

 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

-.if defined(WITH_SENDMAIL_PORT)
-CONFIGURE_ARGS+=	--sendmail-dir "${LOCALBASE}"
-.else
-CONFIGURE_ARGS+=	--sendmail-dir "/usr"
-.endif
+CONFIGURE_ARGS+=	--sendmail-dir "${MILTERBASE}"

 post-extract:
 	${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
--- a/mail/spfmilter/Makefile
+++ b/mail/spfmilter/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	spfmilter
 PORTVERSION=	2.001
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	https://acme.com/software/spfmilter/

--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	vbsfilter
 PORTVERSION=	1.15
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.dinoex.de/pub/approved/
 EXTRACT_SUFX=	.c
--- a/security/amavisd-milter/Makefile
+++ b/security/amavisd-milter/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	amavisd-milter
 PORTVERSION=	1.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

@ -15,9 +15,9 @@ RUN_DEPENDS=	amavisd:security/amavisd-new
 ##
 # Use the following quirks to choose which sendmail to use (ports or system):
 #
-#   WITH_SENDMAIL_BASE=yes
+#   WITH_MILTER_BASE=yes
 # or
-#   WITH_SENDMAIL_PORT=yes
+#   WITH_MILTER_PORT=yes
 #
 # If unspecified, check for an up-to-date system version but give an
 # installed port preference over it.
@ -46,13 +46,7 @@ PORTDOCS=	AUTHORS CHANGES INSTALL LICENSE README TODO

 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"

-.if defined(WITH_SENDMAIL_BASE) && !exists(/usr/lib/libmilter.a)
-BROKEN=		Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
-.endif
-
-.if defined(WITH_SENDMAIL_PORT)
 CONFIGURE_ARGS+=--with-sendmail=${MILTERBASE}
-.endif

 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug