From owner-svn-ports-all@freebsd.org Mon May 29 15:27:37 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 935E5D520C5; Mon, 29 May 2017 15:27:37 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EDEC7DF60; Mon, 29 May 2017 15:27:37 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4TFRatQ057116; Mon, 29 May 2017 15:27:36 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4TFRaKY057115; Mon, 29 May 2017 15:27:36 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201705291527.v4TFRaKY057115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 29 May 2017 15:27:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442008 - head/mail/libmilter X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2017 15:27:37 -0000 Author: sunpoet Date: Mon May 29 15:27:36 2017 New Revision: 442008 URL: https://svnweb.freebsd.org/changeset/ports/442008 Log: Convert to options helper - Fix OPTIONS_DEFAULT: remove IPV6 which is added by framework - Convert to options target helper - Convert to options variable helper Approved by: portmgr (blanket) Modified: head/mail/libmilter/Makefile Modified: head/mail/libmilter/Makefile ============================================================================== --- head/mail/libmilter/Makefile Mon May 29 15:27:31 2017 (r442007) +++ head/mail/libmilter/Makefile Mon May 29 15:27:36 2017 (r442008) @@ -17,8 +17,9 @@ LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT} MILTER_SOVER?= 6 OPTIONS_DEFINE?= IPV6 MILTER_SHARED MILTER_POOL DOCS -OPTIONS_DEFAULT?= IPV6 MILTER_SHARED MILTER_POOL +OPTIONS_DEFAULT?= MILTER_SHARED MILTER_POOL NO_OPTIONS_SORT=yes +OPTIONS_SUB= yes MILTER_SHARED_DESC= Build shared libmilter MILTER_POOL_DESC= Enable milter thread pools @@ -26,32 +27,18 @@ WRKSRC= ${WRKDIR}/sendmail-${PORTVERSIO WCONF= ${WRKSRC}/devtools/Site SITE= ${FILESDIR}/site.config.m4 -.include +IPV6_VARS= SITE+=${FILESDIR}/site.config.m4.ipv6 +MILTER_POOL_VARS= SITE+=${FILESDIR}/site.config.m4.pool +MILTER_SHARED_MAKE_ENV= MILTER_SOVER=${MILTER_SOVER} +MILTER_SHARED_PLIST_SUB=MILTER_SOVER=${MILTER_SOVER} +MILTER_SHARED_USE= LDCONFIG=yes -.if ${PORT_OPTIONS:MIPV6} -SITE+= ${FILESDIR}/site.config.m4.ipv6 -.endif -.if ${PORT_OPTIONS:MMILTER_POOL} -SITE+= ${FILESDIR}/site.config.m4.pool -.endif - -.if ${PORT_OPTIONS:MMILTER_SHARED} -PLIST_SUB+= MILTER_SHARED="" -PLIST_SUB+= MILTER_SOVER=${MILTER_SOVER} -MAKE_ENV+= MILTER_SOVER=${MILTER_SOVER} -USE_LDCONFIG= yes -.else -PLIST_SUB+= MILTER_SHARED="@comment " -.endif - -.if ${PORT_OPTIONS:MMILTER_SHARED} -post-patch: +post-patch-MILTER_SHARED-on: @${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter ${CP} ${FILESDIR}/sharedlibrary.m4 \ ${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4 ${REINPLACE_CMD} -e 's=`library=`sharedlibrary=' \ ${WRKSRC}/libsharedmilter/Makefile.m4 -.endif do-configure: ${REINPLACE_CMD} -e "s|\`-O\'|\`${CFLAGS}\'|" \