Antoine Jacoutot <[email protected]> writes: > On Tue, Sep 16, 2014 at 04:37:27PM +0100, Stuart Henderson wrote: >> On 2014/09/16 13:57, Jérémie Courrèges-Anglas wrote: >> > This is the only feedback I have received. Since Matthieu has unlinked >> > sendmail yesterday, the clock is ticking. >> >> These ports (which are currently broken) will need the dependency to be >> added .. > > I think libmilter will need to be provided built as a shared lib first.
sharedlibrary.m4 from FreeBSD and hacked to fit in our tree, libmilter.so cargo-cult-bumped. Index: Makefile =================================================================== RCS file: /cvs/ports/mail/sendmail/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 16 Sep 2014 17:09:31 -0000 1.1.1.1 +++ Makefile 16 Sep 2014 18:39:29 -0000 @@ -4,6 +4,9 @@ COMMENT = mother of Mail Transfer Agent DISTNAME = sendmail.8.14.9 PKGNAME = sendmail-8.14.9 +REVISION = 0 + +SHARED_LIBS = milter 4.0 CATEGORIES = mail @@ -21,8 +24,14 @@ MASTER_SITES = ftp://ftp.sendmail.org/p BUILD_DEPENDS = textproc/groff SUBDIRS = libsmutil libsm libmilter sendmail mail.local mailstats makemap praliases smrsh editmap +.include <bsd.port.arch.mk> +.if ! ${PROPERTIES:Mno_shared} +SUBDIRS += libsharedmilter +.endif + MAKE_FLAGS = O="${CFLAGS}" \ - SUBDIRS="${SUBDIRS} cf/cf" + SUBDIRS="${SUBDIRS} cf/cf" \ + MILTER_SOVER="${LIBmilter_VERSION}" MAKE_ENV = M4="/usr/bin/m4" FAKE_FLAGS = SUBDIRS="${SUBDIRS}" @@ -52,6 +61,9 @@ WRKDIST = ${WRKDIR}/${PKGNAME} post-extract: cp ${FILESDIR}/cf/*.mc ${WRKSRC}/cf/cf + cp ${FILESDIR}/sharedlibrary.m4 ${WRKSRC}/devtools/M4/UNIX/ + cp -R ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter + perl -pi -e 's=`library=`sharedlibrary=' ${WRKSRC}/libsharedmilter/Makefile.m4 ${SUBST_CMD} -c ${FILESDIR}/site.OS.m4 \ ${WRKSRC}/devtools/Site/site.config.m4 Index: files/sharedlibrary.m4 =================================================================== RCS file: files/sharedlibrary.m4 diff -N files/sharedlibrary.m4 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/sharedlibrary.m4 16 Sep 2014 18:39:29 -0000 @@ -0,0 +1,35 @@ +divert(-1) +# +# Copyright (c) 1999-2001, 2006 Sendmail, Inc. and its suppliers. +# All rights reserved. +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the sendmail distribution. +# +# +# Definitions for Makefile construction for sendmail +# +# $Id: library.m4,v 8.11 2006/09/05 22:56:53 ca Exp $ +# +divert(0)dnl +include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl +bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl +bldPUSH_TARGET(bldCURRENT_PRODUCT.so.${MILTER_SOVER})dnl +bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl +bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl + +include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4') +divert(bldTARGETS_SECTION) +bldCURRENT_PRODUCT.so.${MILTER_SOVER}: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'} + ${LD} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} +ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') + +install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so.${MILTER_SOVER} +ifdef(`bldINSTALLABLE', ` ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}') + +bldCURRENT_PRODUCT-clean: + rm -f ${OBJS} bldCURRENT_PRODUCT.so ${MANPAGES} + +divert(0) +COPTS+= confCCOPTS_SO Index: files/site.OS.m4 =================================================================== RCS file: /cvs/ports/mail/sendmail/files/site.OS.m4,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 site.OS.m4 --- files/site.OS.m4 16 Sep 2014 17:09:31 -0000 1.1.1.1 +++ files/site.OS.m4 16 Sep 2014 18:39:29 -0000 @@ -28,6 +28,8 @@ APPENDDEF(`confENVDEF', `-DNEEDSGETIPNOD APPENDDEF(`confENVDEF', `-DNETINET6')dnl APPENDDEF(`confENVDEF', `-DSM_CONF_SHM')dnl APPENDDEF(`confMAPDEF', `-DSOCKETMAP')dnl +APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER') +APPENDDEF(`conf_sendmail_ENVDEF', `-DMILTER') dnl (START)TLS APPENDDEF(`confENVDEF', `-DSTARTTLS')dnl APPENDDEF(`confLIBS', `-lssl -lcrypto')dnl Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/sendmail/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 16 Sep 2014 17:09:32 -0000 1.1.1.1 +++ pkg/PLIST 16 Sep 2014 18:39:29 -0000 @@ -5,6 +5,7 @@ include/libmilter/ include/libmilter/mfapi.h include/libmilter/mfdef.h lib/libmilter.a +@lib lib/libmilter.so.${LIBmilter_VERSION} @bin libexec/mail.local libexec/sendmail/ @bin libexec/sendmail/makemap -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
