svn commit: r333983 - in head/mail/sendmail: . files

[Dirk Meyer]

Author: dinoex
Date: Sat Nov 16 06:38:19 2013
New Revision: 333983
URL: http://svnweb.freebsd.org/changeset/ports/333983

Log:
  - fix CC handling
  - escape LD options
  PR:		183547

Modified:
  head/mail/sendmail/Makefile
  head/mail/sendmail/files/patch-FreeBSD
  head/mail/sendmail/files/sharedlibrary.m4

Modified: head/mail/sendmail/Makefile
==============================================================================
--- head/mail/sendmail/Makefile	Sat Nov 16 05:06:38 2013	(r333982)
+++ head/mail/sendmail/Makefile	Sat Nov 16 06:38:19 2013	(r333983)
@@ -132,8 +132,9 @@ PLIST_SUB+=	MILTER_SHARED="@comment "
 .endif
 .endif
 
-SED_SCRIPT=	-e "s;\`-pthread\';\`${PTHREAD_LIBS}\';" \
-		-e "s;\`-O\';\`${CFLAGS}\';"
+SED_SCRIPT=	-e "s|\`-pthread\'|\`${PTHREAD_LIBS}\'|" \
+		-e "s|\`-O\'|\`${CFLAGS}\'|" \
+		-e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|'
 
 .if ! ${PORT_OPTIONS:MNIS}
 SED_SCRIPT+=	-e "s;-DNIS ;;"
@@ -148,17 +149,12 @@ post-patch:
 	@${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter
 	${CP} ${FILESDIR}/sharedlibrary.m4 \
 		${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4
-	@${MV} ${WRKSRC}/libsharedmilter/Makefile.m4 \
-		${WRKSRC}/libsharedmilter/Makefile.m4.sed
-	@${SED} -e 's=`library=`sharedlibrary=' \
-		${WRKSRC}/libsharedmilter/Makefile.m4.sed \
-		> ${WRKSRC}/libsharedmilter/Makefile.m4
+	${REINPLACE_CMD} -e 's=`library=`sharedlibrary=' \
+		${WRKSRC}/libsharedmilter/Makefile.m4
 .endif
 
 do-configure:
-	@${MV} ${WRKSRC}/devtools/OS/FreeBSD ${WRKSRC}/devtools/OS/FreeBSD.sed
-	${SED} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD.sed \
-		> ${WRKSRC}/devtools/OS/FreeBSD
+	${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
 		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
 		${SITE} > ${WCONF}/site.config.m4

Modified: head/mail/sendmail/files/patch-FreeBSD
==============================================================================
--- head/mail/sendmail/files/patch-FreeBSD	Sat Nov 16 05:06:38 2013	(r333982)
+++ head/mail/sendmail/files/patch-FreeBSD	Sat Nov 16 06:38:19 2013	(r333983)
@@ -1,11 +1,11 @@
 --- devtools/OS/FreeBSD.orig	2003-07-03 03:07:45.000000000 +0200
-+++ devtools/OS/FreeBSD	2011-06-24 20:24:03.000000000 +0200
++++ devtools/OS/FreeBSD	2013-11-16 07:06:27.000000000 +0100
 @@ -6,7 +6,7 @@
  define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
  define(`confLIBS', `-lutil')
  
 -define(`confLD', `cc')
-+define(`confLD', `${CC}')
++define(`confCC', `%%CC%%')
  define(`confMTLDOPTS', `-pthread')
  define(`confMTCCOPTS', `-D_THREAD_SAFE')
  define(`confLDOPTS_SO', `-shared')

Modified: head/mail/sendmail/files/sharedlibrary.m4
==============================================================================
--- head/mail/sendmail/files/sharedlibrary.m4	Sat Nov 16 05:06:38 2013	(r333982)
+++ head/mail/sendmail/files/sharedlibrary.m4	Sat Nov 16 06:38:19 2013	(r333983)
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+# 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
@@ -10,7 +10,7 @@ divert(-1)
 #
 #  Definitions for Makefile construction for sendmail
 #
-#	$Id: library.m4,v 8.10 2001/02/14 04:39:38 gshapiro Exp $
+#	$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
@@ -22,7 +22,7 @@ bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`
 include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
 divert(bldTARGETS_SECTION)
 bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
-	${LD} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so confSONAME bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'}
+	${LD} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME -Wl,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'}
 ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
 
 install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so