From owner-svn-ports-head@freebsd.org Sat Jan 28 17:06:00 2017 Return-Path: Delivered-To: svn-ports-head@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 C428ECC437D; Sat, 28 Jan 2017 17:06:00 +0000 (UTC) (envelope-from zi@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 84EC7883; Sat, 28 Jan 2017 17:06:00 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0SH5x6q080839; Sat, 28 Jan 2017 17:05:59 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0SH5xhQ080837; Sat, 28 Jan 2017 17:05:59 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201701281705.v0SH5xhQ080837@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Sat, 28 Jan 2017 17:05:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432634 - head/dns/getdns X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jan 2017 17:06:00 -0000 Author: zi Date: Sat Jan 28 17:05:59 2017 New Revision: 432634 URL: https://svnweb.freebsd.org/changeset/ports/432634 Log: - Fix build issue with non-default OPTIONS - Don't bump PORTREVISION as this is a noop for the default package PR: 216548 Reported by: Jan Beich Modified: head/dns/getdns/Makefile head/dns/getdns/pkg-plist Modified: head/dns/getdns/Makefile ============================================================================== --- head/dns/getdns/Makefile Sat Jan 28 16:29:20 2017 (r432633) +++ head/dns/getdns/Makefile Sat Jan 28 17:05:59 2017 (r432634) @@ -25,8 +25,10 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libidn=${LOCALBASE} --docdir=${DOCSDIR} \ --with-trust-anchor=${LOCALBASE}/etc/unbound/root.key +SOVERSION= 1.4.1 +SOMAJVER= ${SOVERSION:C/([0-9]).*/\1/1} -PLIST_SUB+= PORTVERSION="${PORTVERSION}" +PLIST_SUB+= SOVERSION="${SOVERSION}" SOMAJVER="${SOMAJVER}" SUB_FILES+= pkg-message OPTIONS_SUB= yes @@ -44,6 +46,7 @@ LIBUV_CONFIGURE_WITH= libuv LIBEVENT_LIB_DEPENDS= libevent.so:devel/libevent2 LIBEVENT_CONFIGURE_WITH=libevent DIAGS_VARS= PLIST_FILES+=bin/${PORTNAME}_query +DIAGS_LIB_DEPENDS= libcheck.so:devel/libcheck do-build-DIAGS-on: (cd ${WRKSRC}/src/test && ${MAKE}) @@ -56,7 +59,7 @@ post-patch: -e '/echo .\*\*\*/d' ${WRKSRC}/Makefile.in post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgetdns.so.* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgetdns*.so.* post-install-DIAGS-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/getdns_query Modified: head/dns/getdns/pkg-plist ============================================================================== --- head/dns/getdns/pkg-plist Sat Jan 28 16:29:20 2017 (r432633) +++ head/dns/getdns/pkg-plist Sat Jan 28 17:05:59 2017 (r432634) @@ -4,21 +4,21 @@ include/getdns/getdns_extra.h %%LIBEVENT%%include/getdns/getdns_ext_libevent.h %%LIBUV%%include/getdns/getdns_ext_libuv.h lib/libgetdns.so -lib/libgetdns.so.1 -lib/libgetdns.so.1.4.1 +lib/libgetdns.so.%%SOMAJVER%% +lib/libgetdns.so.%%SOVERSION%% lib/libgetdns.a libdata/pkgconfig/getdns.pc libdata/pkgconfig/getdns_ext_event.pc -%%LIBEV%%lib/libgetdns_ext_ev-%%PORTVERSION%%.so -%%LIBEV%%lib/libgetdns_ext_ev-%%PORTVERSION%%.so.0 +%%LIBEV%%lib/libgetdns_ext_ev.so.%%SOMAJVER%% +%%LIBEV%%lib/libgetdns_ext_ev.so.%%SOVERSION%% %%LIBEV%%lib/libgetdns_ext_ev.a %%LIBEV%%lib/libgetdns_ext_ev.so -%%LIBEVENT%%lib/libgetdns_ext_event-%%PORTVERSION%%.so -%%LIBEVENT%%lib/libgetdns_ext_event-%%PORTVERSION%%.so.0 +%%LIBEVENT%%lib/libgetdns_ext_event.so.%%SOMAJVER%% +%%LIBEVENT%%lib/libgetdns_ext_event.so.%%SOVERSION%% %%LIBEVENT%%lib/libgetdns_ext_event.a %%LIBEVENT%%lib/libgetdns_ext_event.so -%%LIBUV%%lib/libgetdns_ext_uv-%%PORTVERSION%%.so -%%LIBUV%%lib/libgetdns_ext_uv-%%PORTVERSION%%.so.0 +%%LIBUV%%lib/libgetdns_ext_uv.so.%%SOMAJVER%% +%%LIBUV%%lib/libgetdns_ext_uv.so.%%SOVERSION%% %%LIBUV%%lib/libgetdns_ext_uv.a %%LIBUV%%lib/libgetdns_ext_uv.so man/man3/getdns_address.3.gz