Mention that DESTDIR is now default.

While here, convert to destdir, and use a static PLIST with PLIST_VARS
instead of find(1).

3 files changed, 71 insertions, 25 deletions

diff --git a/doc/guide/Makefile b/doc/guide/Makefile
index 7b7189be687..0d7c557aba8 100644
--- a/doc/guide/Makefile
+++ b/doc/guide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2009/06/14 22:58:00 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2011/04/09 08:03:49 wiz Exp $
 #
 
 DISTNAME=		pkgsrc-guide-${PKGVERSION}
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=		The pkgsrc guide
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 # To regenerate pkgsrc/doc/pkgsrc.{html,txt} and
 # htdocs/docs/pkgsrc, just run "make regen".
 
@@ -18,7 +20,8 @@ DIST_SUBDIR=		${PKGBASE}
 USE_LANGUAGES=		# empty
 MAKE_ENV+=		SED=${SED:Q}
 
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
+PLIST_VARS=		ascii html pdf
+
 DOCDIR=			${PREFIX}/share/doc/pkgsrc
 .if exists(/usr/cvs/htdocs)
 HTDOCSDIR?=		/usr/cvs/htdocs
@@ -28,12 +31,23 @@ HTDOCSDIR?=		${.CURDIR}/../../../htdocs
 BUILD_DEFS+=		OUTPUTS
 OUTPUTS?=		lint html html-split ascii pdf
 
+INSTALLATION_DIRS=	${DOCDIR}
+
 .if defined(OUTPUTS)
 .  if !empty(OUTPUTS:Mascii)
 # the html is needed to build the ascii version.
 OUTPUTS+=		html
+PLIST.ascii=		yes
 .  endif
 
+.  if !empty(OUTPUTS:Mhtml) || !empty(OUTPUTS:Mhtml-split)
+PLIST.html=		yes
+.endif
+
+.  if !empty(OUTPUTS:Mpdf)
+PLIST.pdf=		yes
+.endif
+
 # only override the Makefile.common default if it is explicitly set
 _GUIDE_OUTPUTS=		${OUTPUTS}
 .endif
@@ -56,24 +70,18 @@ post-build:
 	@${RM} -f ${WRKSRC}/pkgsrc.tmp.html
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
 .if !empty(OUTPUTS:Mhtml) || !empty(OUTPUTS:Mhtml-split)
-	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/htdocs/global.css ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.html ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKDIR}/htdocs/global.css ${DESTDIR}${DOCDIR}
 .endif
 .if !empty(OUTPUTS:Mascii)
-	${INSTALL_DATA} ${WRKSRC}/pkgsrc.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/pkgsrc.txt ${DESTDIR}${DOCDIR}
 .endif
 .if !empty(OUTPUTS:Mpdf)
-	${INSTALL_DATA} ${WRKSRC}/pkgsrc.ps ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/pkgsrc.pdf ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/pkgsrc.ps ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/pkgsrc.pdf ${DESTDIR}${DOCDIR}
 .endif
 
-post-install:
-	${FIND} ${DOCDIR} \( -type f -o -type l \) -print		\
-		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
-		>> ${PLIST_SRC}
-
 # install the single-file HTML and ascii output into the pkgsrc doc/
 # directory, for distribution with pkgsrc.
 #
diff --git a/doc/guide/PLIST b/doc/guide/PLIST
index 94b6c773db3..75b3e57e8c7 100644
--- a/doc/guide/PLIST
+++ b/doc/guide/PLIST
@@ -1,2 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/21 14:27:37 grant Exp $
-@comment this PLIST automatically generated
+@comment $NetBSD: PLIST,v 1.2 2011/04/09 08:03:49 wiz Exp $
+${PLIST.html}share/doc/pkgsrc/binary.html
+${PLIST.html}share/doc/pkgsrc/build.html
+${PLIST.html}share/doc/pkgsrc/buildlink.html
+${PLIST.html}share/doc/pkgsrc/bulk.html
+${PLIST.html}share/doc/pkgsrc/components.html
+${PLIST.html}share/doc/pkgsrc/configuring.html
+${PLIST.html}share/doc/pkgsrc/creating.html
+${PLIST.html}share/doc/pkgsrc/debug.html
+${PLIST.html}share/doc/pkgsrc/developers-guide.html
+${PLIST.html}share/doc/pkgsrc/devfaq.html
+${PLIST.html}share/doc/pkgsrc/editing.html
+${PLIST.html}share/doc/pkgsrc/examples.html
+${PLIST.html}share/doc/pkgsrc/faq.html
+${PLIST.html}share/doc/pkgsrc/files.html
+${PLIST.html}share/doc/pkgsrc/fixes.html
+${PLIST.html}share/doc/pkgsrc/ftp-layout.html
+${PLIST.html}share/doc/pkgsrc/getting.html
+${PLIST.html}share/doc/pkgsrc/global.css
+${PLIST.html}share/doc/pkgsrc/gnome.html
+${PLIST.html}share/doc/pkgsrc/index.html
+${PLIST.html}share/doc/pkgsrc/infr.design.html
+${PLIST.html}share/doc/pkgsrc/infrastructure.html
+${PLIST.html}share/doc/pkgsrc/introduction.html
+${PLIST.html}share/doc/pkgsrc/logs.html
+${PLIST.html}share/doc/pkgsrc/makefile.html
+${PLIST.html}share/doc/pkgsrc/options.html
+${PLIST.html}share/doc/pkgsrc/pkginstall.html
+${PLIST.html}share/doc/pkgsrc/pkgsrc.html
+${PLIST.pdf}share/doc/pkgsrc/pkgsrc.pdf
+${PLIST.pdf}share/doc/pkgsrc/pkgsrc.ps
+${PLIST.ascii}share/doc/pkgsrc/pkgsrc.txt
+${PLIST.html}share/doc/pkgsrc/platforms.html
+${PLIST.html}share/doc/pkgsrc/plist.html
+${PLIST.html}share/doc/pkgsrc/porting.html
+${PLIST.html}share/doc/pkgsrc/regression.html
+${PLIST.html}share/doc/pkgsrc/submit.html
+${PLIST.html}share/doc/pkgsrc/tools.html
+${PLIST.html}share/doc/pkgsrc/users-guide.html
+${PLIST.html}share/doc/pkgsrc/using.html
diff --git a/doc/guide/files/configuring.xml b/doc/guide/files/configuring.xml
index 6005a771329..20538e1f022 100644
--- a/doc/guide/files/configuring.xml
+++ b/doc/guide/files/configuring.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: configuring.xml,v 1.37 2010/12/23 23:54:17 abs Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.38 2011/04/09 08:03:49 wiz Exp $ -->
 
 <chapter id="configuring">
   <title>Configuring pkgsrc</title>
@@ -136,21 +136,21 @@ works.</para>
   <sect1 id="variables-affecting-installation">
     <title>Variables affecting the installation process</title>
 
-    <para>A growing number of packages support installation into a
+    <para>Most packages support installation into a
     subdirectory of <varname>WRKDIR</varname>. This allows a package
     to be built, before the actual filesystem is touched. DESTDIR
     support exists in two variations:</para>
     <itemizedlist>
       <listitem><para>Basic DESTDIR support means that the package
-      installation and packaging is still run as
-      root.</para></listitem>
-      <listitem><para>Full DESTDIR support can run the complete build,
-      installation and packaging as normal user. Root privileges are
-      only needed to add packages.</para></listitem>
+      installation and packaging is still run as root.</para></listitem>
+      <listitem><para>Full DESTDIR support can run the complete
+      build, installation and packaging as normal user. Root
+      privileges are only needed to add packages.</para></listitem>
     </itemizedlist>
-    <para>To use the DESTDIR support, set
-    <varname>USE_DESTDIR=yes</varname> to get the full support for packages
-    that support it and with fallback to basic support. </para>
+    <para>DESTDIR support is now the default. To switch back to non-DESTDIR,
+    you can set
+    <varname>USE_DESTDIR=no</varname>; this setting will be deprecated though,
+    so it's preferable to convert a package to DESTDIR instead.</para>
     <para>DESTDIR support changes the behaviour of various targets
     slightly. To install a package after building it, use
     <literal>package-install</literal>. <literal>package</literal> and