Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Nov 2013 12:18:12 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r333207 - head/sysutils/am-utils
Message-ID:  <201311081218.rA8CICWg069815@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
 
 .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 <bsd.port.mk>

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%%



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