From owner-svn-ports-all@freebsd.org Sat Nov 9 15:16:48 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1A8351AC93F; Sat, 9 Nov 2019 15:16:48 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 479LMg6qfbz3MTT; Sat, 9 Nov 2019 15:16:47 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B7BD518997; Sat, 9 Nov 2019 15:16:47 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA9FGlR7014912; Sat, 9 Nov 2019 15:16:47 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA9FGlc8014910; Sat, 9 Nov 2019 15:16:47 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201911091516.xA9FGlc8014910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 9 Nov 2019 15:16:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517130 - head/sysutils/am-utils X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/sysutils/am-utils X-SVN-Commit-Revision: 517130 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2019 15:16:48 -0000 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 - 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 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