From owner-freebsd-ports Fri Jun 2 12:31:53 2000 Delivered-To: freebsd-ports@freebsd.org Received: from smtp10.atl.mindspring.net (smtp10.atl.mindspring.net [207.69.200.246]) by hub.freebsd.org (Postfix) with ESMTP id 2AC7437C05C for ; Fri, 2 Jun 2000 12:31:47 -0700 (PDT) (envelope-from asami@cs.berkeley.edu) Received: from silvia.hip.berkeley.edu (sji-ca41-211.ix.netcom.com [209.111.208.211]) by smtp10.atl.mindspring.net (8.9.3/8.8.5) with ESMTP id PAA26967 for ; Fri, 2 Jun 2000 15:31:40 -0400 (EDT) Received: (from asami@localhost) by silvia.hip.berkeley.edu (8.9.3/8.6.9) id MAA67682; Fri, 2 Jun 2000 12:31:25 -0700 (PDT) Date: Fri, 2 Jun 2000 12:31:25 -0700 (PDT) Message-Id: <200006021931.MAA67682@silvia.hip.berkeley.edu> X-Authentication-Warning: silvia.hip.berkeley.edu: asami set sender to asami@cs.berkeley.edu using -f To: ports@freebsd.org Subject: NOPORTDOCS handling From: asami@freebsd.org (Satoshi Asami) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Hi folks, How about the following patch? By adding "%%PORTDOCS:%%" in front of the PLIST lines for things that are not installed when NOPORTDOCS is set, you get a correct /var/db/pkg/${PKGNAME}/+CONTENTS regardless of the NOPORTDOCS setting. Also attached is an example of its usage. (Hey, she's cute!) Satoshi P.S. Yes, I prefer a space after the second %% but the PLIST_SUB implementation doesn't allow that.... ------- Index: Mk/bsd.port.mk =================================================================== RCS file: /usr/cvs/ports/Mk/bsd.port.mk,v retrieving revision 1.338 diff -u -r1.338 bsd.port.mk --- Mk/bsd.port.mk 2000/05/06 10:45:35 1.338 +++ Mk/bsd.port.mk 2000/06/02 19:28:40 @@ -675,6 +676,12 @@ MAKE_ENV+= PORTOBJFORMAT=${PORTOBJFORMAT} PLIST_SUB+= PORTOBJFORMAT=${PORTOBJFORMAT} +.if defined(NOPORTDOCS) +PLIST_SUB+= PORTDOCS:="@comment " +.else +PLIST_SUB+= PORTDOCS:= +.endif + .if defined(MANCOMPRESSED) .if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \ ${MANCOMPRESSED} != maybe Index: games/xhime/pkg/PLIST =================================================================== RCS file: /usr/cvs/ports/games/xhime/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- games/xhime/pkg/PLIST 1999/03/07 16:58:29 1.2 +++ games/xhime/pkg/PLIST 2000/06/02 19:28:49 @@ -1,7 +1,7 @@ bin/xhime -share/doc/ja/xhime/xhime-doc.euc -share/doc/ja/xhime/xhime.doc -share/doc/ja/xhime/rh110-doc.euc -@dirrm share/doc/ja/xhime +%%PORTDOCS:%%share/doc/ja/xhime/xhime-doc.euc +%%PORTDOCS:%%share/doc/ja/xhime/xhime.doc +%%PORTDOCS:%%share/doc/ja/xhime/rh110-doc.euc +%%PORTDOCS:%%@dirrm share/doc/ja/xhime share/examples/xhime/rh110.xhm @dirrm share/examples/xhime To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message