From owner-svn-ports-head@FreeBSD.ORG Fri Nov 8 12:18:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4F92A324; Fri, 8 Nov 2013 12:18:13 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 23CCA2571; Fri, 8 Nov 2013 12:18:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA8CID0R069817; Fri, 8 Nov 2013 12:18:13 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA8CICWg069815; Fri, 8 Nov 2013 12:18:12 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201311081218.rA8CICWg069815@svn.freebsd.org> From: "Vanilla I. Shu" Date: Fri, 8 Nov 2013 12:18:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333207 - head/sysutils/am-utils X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2013 12:18:13 -0000 Author: vanilla Date: Fri Nov 8 12:18:12 2013 New Revision: 333207 URL: http://svnweb.freebsd.org/changeset/ports/333207 Log: Support STAGEDIR, install merged info files. Modified: head/sysutils/am-utils/Makefile head/sysutils/am-utils/pkg-plist Modified: head/sysutils/am-utils/Makefile ============================================================================== --- head/sysutils/am-utils/Makefile Fri Nov 8 12:14:43 2013 (r333206) +++ head/sysutils/am-utils/Makefile Fri Nov 8 12:18:12 2013 (r333207) @@ -23,15 +23,11 @@ OPENLDAP_DESC= OpenLDAP support USE_AUTOTOOLS= libtool USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes +CONFIGURE_ENV+= MAKEINFO="makeinfo --no-split" -MAN1= expn.1 pawd.1 -MAN5= amd.conf.5 -MAN8= amd.8 amq.8 automount2amd.8 fixmount.8 fsinfo.8 hlfsd.8 \ - mk-amd-map.8 wire-test.8 INFO= am-utils -PORTDOCS= AUTHORS BUGS FAQ NEWS README.attrcache +DOCS= AUTHORS BUGS FAQ NEWS README.attrcache -NO_STAGE= yes .include .if ${PORT_OPTIONS:MOPENLDAP} @@ -39,15 +35,20 @@ USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-ldap=yes \ --enable-ldflags=-L${LOCALBASE}/lib \ --enable-cppflags=-I${LOCALBASE}/include -PORTDOCS+= README.ldap ldap-id.txt ldap.schema +DOCS+= README.ldap ldap-id.txt ldap.schema +PLIST_SUB+= LDAP_DOC="" .else +PLIST_SUB+= LDAP_DOC="@comment " CONFIGURE_ARGS+=--with-ldap=no .endif +post-patch: + @${RM} ${WRKSRC}/doc/am-utils.info* + post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/sysutils/am-utils/pkg-plist ============================================================================== --- head/sysutils/am-utils/pkg-plist Fri Nov 8 12:14:43 2013 (r333206) +++ head/sysutils/am-utils/pkg-plist Fri Nov 8 12:18:12 2013 (r333207) @@ -6,6 +6,17 @@ lib/libamu.a lib/libamu.la lib/libamu.so lib/libamu.so.4 +man/man1/expn.1.gz +man/man1/pawd.1.gz +man/man5/amd.conf.5.gz +man/man8/amd.8.gz +man/man8/amq.8.gz +man/man8/automount2amd.8.gz +man/man8/fixmount.8.gz +man/man8/fsinfo.8.gz +man/man8/hlfsd.8.gz +man/man8/mk-amd-map.8.gz +man/man8/wire-test.8.gz sbin/am-eject sbin/amd sbin/amd2ldif @@ -24,3 +35,12 @@ sbin/mk-amd-map sbin/wait4amd sbin/wait4amd2die sbin/wire-test +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/BUGS +%%PORTDOCS%%%%DOCSDIR%%/FAQ +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README.attrcache +%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap +%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt +%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema +%%PORTDOCS%%@dirrm %%DOCSDIR%%