Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Nov 2020 23:36:54 +0000 (UTC)
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r553876 - head/dns/nss_mdns
Message-ID:  <202011012336.0A1NasSK088558@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: 0mp
Date: Sun Nov  1 23:36:53 2020
New Revision: 553876
URL: https://svnweb.freebsd.org/changeset/ports/553876

Log:
  Clean up the port's makefile
  
  - Sort variables
  - Use post-install-DOCS-on instead of an if statement based on PORT_OPTIONS
  
  Approved by:	portmgr blanket

Modified:
  head/dns/nss_mdns/Makefile

Modified: head/dns/nss_mdns/Makefile
==============================================================================
--- head/dns/nss_mdns/Makefile	Sun Nov  1 23:04:37 2020	(r553875)
+++ head/dns/nss_mdns/Makefile	Sun Nov  1 23:36:53 2020	(r553876)
@@ -15,41 +15,39 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 
 USES=		autoreconf gmake libtool pkgconfig
-CONFLICTS_INSTALL=	mDNSResponder_nss-[0-9]*
-
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	lathiat
 GH_PROJECT=	nss-mdns
 GH_TAGNAME=	99c2f1c
+USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=/var \
+		--sysconfdir=/etc
 
-CONFIGURE_ARGS+=		\
-	--sysconfdir=/etc	\
-	--localstatedir=/var
+INSTALL_TARGET=	install-strip
 
+CONFLICTS_INSTALL=	mDNSResponder_nss-[0-9]*
+
+# TODO: Print a message about the etc directory used for mdns.allow
+# being relative to ${PREFIX}.
+PLIST_FILES=	${INSTALLED_MODULES:C/^/lib\//:C/$/.so.1/} \
+		${INSTALLED_MODULES:C/^/lib\//:C/$/.so/}
+PORTDOCS=	README.md
+
+OPTIONS_DEFINE=	DOCS
+
 INSTALLED_MODULES=	nss_mdns nss_mdns_minimal \
-		  	nss_mdns4 nss_mdns4_minimal \
+			nss_mdns4 nss_mdns4_minimal \
 			nss_mdns6 nss_mdns6_minimal
 
-.include <bsd.port.options.mk>
-
 post-install:
 .for INSTALLED_MODULE in ${INSTALLED_MODULES}
 	${LN} -s ${INSTALLED_MODULE}.so.1 ${STAGEDIR}${PREFIX}/lib/${INSTALLED_MODULE}.so
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.endif
-
-# TODO: Print a message about the etc directory used for mdns.allow
-# being relative to ${PREFIX}.
-PLIST_FILES=	${INSTALLED_MODULES:C/^/lib\//:C/$/.so/} ${INSTALLED_MODULES:C/^/lib\//:C/$/.so.1/}
-PORTDOCS=	README.md
 
 .include <bsd.port.mk>



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