[Midnightbsd-cvs] mports [17766] trunk/dns/c-ares: update c-ares to new options

[laffer1 at midnightbsd.org]

Revision: 17766
          http://svnweb.midnightbsd.org/mports/?rev=17766
Author:   laffer1
Date:     2014-10-15 21:03:33 -0400 (Wed, 15 Oct 2014)
Log Message:
-----------
update c-ares to new options

Modified Paths:
--------------
    trunk/dns/c-ares/Makefile
    trunk/dns/c-ares/pkg-plist

Removed Paths:
-------------
    trunk/dns/c-ares/files/patch-Makefile.in

Modified: trunk/dns/c-ares/Makefile
===================================================================
--- trunk/dns/c-ares/Makefile	2014-10-16 00:56:47 UTC (rev 17765)
+++ trunk/dns/c-ares/Makefile	2014-10-16 01:03:33 UTC (rev 17766)
@@ -13,49 +13,52 @@
 
 LICENSE=	mit
 
-OPTIONS=	CONFIG_INFO	"Add the ares_config_info patch" ON \
-		DEBUG		"Build with debug information" OFF \
-		HIDE_SYMBOLS	"Hide internal library symbols" ON \
-		OPTIMIZED_CFLAGS	"Build with compiler optimizations" OFF
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-werror
+INSTALL_TARGET=	install-strip
+SSP_UNSAFE=	Refuses -l in LDFLAGS
+USES=		libtool pathfix
+USE_LDCONFIG=	yes
 
-CONFLICTS=	ares-1.*
+PROGRAMS=	acountry adig ahost
 
+OPTIONS_DEFINE=		CONFIG_INFO DEBUG HIDE_SYMBOLS OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	CONFIG_INFO HIDE_SYMBOLS
+
+CONFIG_INFO_DESC=	Add the ares_config_info patch
+HIDE_SYMBOLS_DESC=	Hide internal library symbols
+OPTIMIZED_CFLAGS_DESC=	Build with compiler optimizations
+
+CONFLICTS=		ares-1.*
+
 MAKE_JOBS_UNSAFE=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_CONFIG_INFO)
+.if ${PORT_OPTIONS:MCONFIG_INFO}
 EXTRA_PATCHES+=	${FILESDIR}/ares-config-info.patch
 PKGNAMESUFFIX=	-config
 .endif
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=--enable-debug
 .else
-CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=--disable-debug
 .endif
-.if defined(WITH_HIDE_SYMBOLS)
-CONFIGURE_ARGS+=	--enable-symbol-hiding
+
+.if ${PORT_OPTIONS:MHIDE_SYMBOLS}
+CONFIGURE_ARGS+=--enable-symbol-hiding
 .else
-CONFIGURE_ARGS+=	--disable-symbol-hiding
+CONFIGURE_ARGS+=--disable-symbol-hiding
 .endif
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CONFIGURE_ARGS+=	--enable-optimize
+
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+CONFIGURE_ARGS+=--enable-optimize
 .else
-CONFIGURE_ARGS+=	--disable-optimize
+CONFIGURE_ARGS+=--disable-optimize
 .endif
 
-USE_LDCONFIG=	yes
-SHLIB_VER=	3
-
-MAKE_ENV=	SHLIB_VER="${SHLIB_VER}"
-PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-shared --disable-werror
-
-PROGRAMS=	acountry adig ahost
-
 post-install:
 	${INSTALL_PROGRAM} ${PROGRAMS:S@^@${WRKSRC}/.libs/@} ${PREFIX}/bin/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Deleted: trunk/dns/c-ares/files/patch-Makefile.in
===================================================================
--- trunk/dns/c-ares/files/patch-Makefile.in	2014-10-16 00:56:47 UTC (rev 17765)
+++ trunk/dns/c-ares/files/patch-Makefile.in	2014-10-16 01:03:33 UTC (rev 17766)
@@ -1,16 +0,0 @@
-Description: Place the pkgconfig file in the correct directory on FreeBSD.
-Author: Peter Pentchev <roam at FreeBSD.org>
-Forwarded: not-needed
-Last-Update: 2010-12-19
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -322,7 +322,7 @@
- 
- CLEANFILES = $(PDFPAGES) $(HTMLPAGES)
- DISTCLEANFILES = ares_build.h
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libcares.pc
- VER = -version-info 2:0:0
- # This flag accepts an argument of the form current[:revision[:age]]. So,

Modified: trunk/dns/c-ares/pkg-plist
===================================================================
--- trunk/dns/c-ares/pkg-plist	2014-10-16 00:56:47 UTC (rev 17765)
+++ trunk/dns/c-ares/pkg-plist	2014-10-16 01:03:33 UTC (rev 17766)
@@ -7,9 +7,8 @@
 include/ares_dns.h
 include/ares_version.h
 lib/libcares.a
-lib/libcares.la
 lib/libcares.so
-lib/libcares.so.%%SHLIB_VER%%
+lib/libcares.so.3
 libdata/pkgconfig/libcares.pc
 man/man3/ares_cancel.3.gz
 man/man3/ares_create_query.3.gz