svn commit: r432634 - head/dns/getdns

[Ryan Steinmetz]

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 <jbeich at FreeBSD.org>

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