Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Nov 2019 15:16:47 +0000 (UTC)
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r517130 - head/sysutils/am-utils
Message-ID:  <201911091516.xA9FGlc8014910@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cy
Date: Sat Nov  9 15:16:47 2019
New Revision: 517130
URL: https://svnweb.freebsd.org/changeset/ports/517130

Log:
  Simplify docs installation.
  
  PR:		241805
  Submitted by:	amdmi3

Modified:
  head/sysutils/am-utils/Makefile   (contents, props changed)
  head/sysutils/am-utils/pkg-plist   (contents, props changed)

Modified: head/sysutils/am-utils/Makefile
==============================================================================
--- head/sysutils/am-utils/Makefile	Sat Nov  9 15:16:42 2019	(r517129)
+++ head/sysutils/am-utils/Makefile	Sat Nov  9 15:16:47 2019	(r517130)
@@ -34,26 +34,20 @@ MAKE_ENV=	MAKEINFOFLAGS=--no-split
 INSTALL_TARGET=	install-strip
 
 INFO=		am-utils
-DOCS=		AUTHORS BUGS FAQ NEWS README.attrcache
+PORTDOCS=	AUTHORS BUGS FAQ NEWS README.attrcache
 
 OPENLDAP_USES=			localbase:ldflags
 OPENLDAP_USE=			OPENLDAP=yes
 OPENLDAP_CONFIGURE_WITH=	ldap
-OPENLDAP_CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
-				CPPFLAGS="-I${LOCALBASE}/include"
-OPENLDAP_VARS=			DOCS+="README.ldap ldap-id.txt ldap.schema"
+OPENLDAP_PORTDOCS=		README.ldap ldap-id.txt ldap.schema
 
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${RM} ${WRKSRC}/doc/am-utils.info*
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/am-utils/pkg-plist
==============================================================================
--- head/sysutils/am-utils/pkg-plist	Sat Nov  9 15:16:42 2019	(r517129)
+++ head/sysutils/am-utils/pkg-plist	Sat Nov  9 15:16:47 2019	(r517130)
@@ -35,11 +35,3 @@ sbin/sun2amd
 sbin/wait4amd
 sbin/wait4amd2die
 sbin/wire-test
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README.attrcache
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt
-%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema



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