Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Sep 2014 17:52:54 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368505 - in head/dns/nss_mdns: . files
Message-ID:  <201409181752.s8IHqs2Q071290@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Thu Sep 18 17:52:54 2014
New Revision: 368505
URL: http://svnweb.freebsd.org/changeset/ports/368505
QAT: https://qat.redports.org/buildarchive/r368505/

Log:
  - Convert to USES=autoreconf and add INSTALL_TARGET=install-strip
  - Use post-install instead of do-install

Deleted:
  head/dns/nss_mdns/files/patch-aclocal.m4
Modified:
  head/dns/nss_mdns/Makefile

Modified: head/dns/nss_mdns/Makefile
==============================================================================
--- head/dns/nss_mdns/Makefile	Thu Sep 18 17:50:34 2014	(r368504)
+++ head/dns/nss_mdns/Makefile	Thu Sep 18 17:52:54 2014	(r368505)
@@ -18,10 +18,10 @@ LIB_DEPENDS=	libavahi-client.so:${PORTSD
 
 CONFLICTS_INSTALL=	mDNSResponder_nss-[0-9]*
 
-USE_AUTOTOOLS=	autoconf automake
-USES=		gmake libtool
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		autoreconf gmake libtool
 USE_LDCONFIG=	yes
-AUTOTOOLSFILES=	aclocal.m4
 
 OPTIONS_DEFINE=	SEARCH_DOMAINS DOCS
 SEARCH_DOMAINS_DESC=	Honour search domains in resolv.conf
@@ -29,8 +29,6 @@ SEARCH_DOMAINS_DESC=	Honour search domai
 CONFIGURE_ARGS+=		\
 	--sysconfdir=/etc	\
 	--localstatedir=/var	\
-	--disable-static	\
-	--enable-shared		\
 	--enable-avahi		\
 	--disable-legacy	\
 	--disable-lynx
@@ -43,17 +41,9 @@ INSTALLED_MODULES=nss_mdns nss_mdns_mini
 CONFIGURE_ARGS+=	--enable-search-domains
 .endif
 
-#
-# libtool is used, therefore we must perform a GNU make based install,
-# followed by removal of build rubble; we must create our own .so symlinks;
-# we do this from the do-install target so as to avoid causing any
-# problems if we are later packaged.
-#
-do-install:
-	@( cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} )
+post-install:
 .for INSTALLED_MODULE in ${INSTALLED_MODULES}
-	( cd ${STAGEDIR}${PREFIX}/lib ; ${LN} -s ${INSTALLED_MODULE}.so.1 ${INSTALLED_MODULE}.so )
-	${RM} ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.a ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.la
+	${LN} -s ${INSTALLED_MODULE}.so.1 ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.so
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
@@ -66,8 +56,4 @@ do-install:
 PLIST_FILES=	${INSTALLED_MODULES:C/^/lib\//:C/$/.so/} ${INSTALLED_MODULES:C/^/lib\//:C/$/.so.1/}
 PORTDOCS=	README README.html
 
-post-configure:
-	@${FIND} ${WRKSRC} -name Makefile -print | \
-		${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|g'
-
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409181752.s8IHqs2Q071290>