 @@ -1,154 +1,154 @@
-# $NetBSD: Makefile,v 1.48 2018/04/04 10:23:17 leot Exp $
+# $NetBSD: Makefile,v 1.49 2018/07/05 10:04:17 leot Exp $
 DISTNAME=		pkgsrc-guide-${PKGVERSION}
 CATEGORIES=		# empty
 MASTER_SITES=		${MASTER_SITE_LOCAL}
-DISTFILES=		htdocs-share-20180404.tar.gz
+DISTFILES=		htdocs-share-20180705.tar.gz
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/docs/pkgsrc/
 COMMENT=		The pkgsrc guide
 # To regenerate pkgsrc/doc/pkgsrc.{html,txt} and
 # htdocs/docs/pkgsrc, just run "make regen".
 PKGVERSION!=		date '+%Y%m%d'
 DIST_SUBDIR=		${PKGBASE}
 USE_LANGUAGES=		# empty
 MAKE_ENV+=		SED=${SED:Q}
 PLIST_VARS=		ascii html pdf
 DOCDIR=			${PREFIX}/share/doc/pkgsrc
 .if exists(/usr/cvs/htdocs)
 HTDOCSDIR?=		/usr/cvs/htdocs
 .endif
 HTDOCSDIR?=		${.CURDIR}/../../../htdocs
 BUILD_DEFS+=		OUTPUTS
 OUTPUTS?=		lint html html-split ascii pdf
 INSTALLATION_DIRS=	${DOCDIR}
 SUBST_CLASSES+=		docbook45
 SUBST_STAGE.docbook45=	pre-configure
 SUBST_FILES.docbook45=	${WRKDIR}/htdocs/share/xml/*
 SUBST_SED.docbook45=	-e 's,V4\.2,V4.5,'
 SUBST_SED.docbook45+=	-e 's,/4\.2/,/4.5/,'
 .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
 .include "Makefile.common"
 # The source files are only symlinked into the WRKSRC, so that they can
 # be easily modified, should the "lint" phase fail.
 pre-extract:
 	${MKDIR} ${WRKSRC}
 	${LN} -s ${FILESDIR}/* ${WRKSRC}
 do-build:
 .for _output_ in ${OUTPUTS}
 	@${ECHO} "-----> Building ${_output_} output"
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${_output_}
 .endfor
 post-build:
 	@${RM} -f ${WRKSRC}/pkgsrc.tmp.html
 do-install:
 .if !empty(OUTPUTS:Mhtml) || !empty(OUTPUTS:Mhtml-split)
 	${INSTALL_DATA} ${WRKSRC}/*.html ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKDIR}/htdocs/global.css ${DESTDIR}${DOCDIR}
 .endif
 .if !empty(OUTPUTS:Mascii)
 	${INSTALL_DATA} ${WRKSRC}/pkgsrc.txt ${DESTDIR}${DOCDIR}
 .endif
 .if !empty(OUTPUTS:Mpdf)
 	${INSTALL_DATA} ${WRKSRC}/pkgsrc.ps ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/pkgsrc.pdf ${DESTDIR}${DOCDIR}
 .endif
 # install the single-file HTML and ascii output into the pkgsrc doc/
 # directory, for distribution with pkgsrc.
+#
 # note that this uses ${CP} and not ${INSTALL_DATA} because the files
 # stay in the development directories and have nothing to do with
 # the permissions or ownership of installed files.
+#
 install-doc: build
 	${CP} ${WRKSRC}/pkgsrc.html ${PKGSRCDIR}/doc
 	${CP} ${WRKSRC}/pkgsrc.txt ${PKGSRCDIR}/doc
 install-htdocs: build
 	cd ${WRKSRC} && ${CP} pkgsrc.txt pkgsrc.pdf pkgsrc.ps *.html	\
 		${HTDOCSDIR}/docs/pkgsrc
 .PHONY: regen regen-doc regen-htdocs
 regen: regen-doc regen-htdocs
 regen-doc: build
 	@${STEP_MSG} "Updating the files in pkgsrc/doc"
 	cd .. && cvs update pkgsrc.*
 	${MAKE} ${MAKEFLAGS} install-doc
 	@${STEP_MSG} "Committing the files in pkgsrc/doc"
 	cd .. && cvs commit -m "doc/pkgsrc.*: regen" pkgsrc.*
 regen-htdocs: build
 	@${STEP_MSG} "Updating the files in htdocs"
 	cd ${HTDOCSDIR}/docs/pkgsrc && cvs update
 	${MAKE} ${MAKEFLAGS} install-htdocs
 	@${STEP_MSG} "Committing the files in htdocs"
 	cd ${HTDOCSDIR}/docs/pkgsrc && cvs commit -m "regen"
 do-lint:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} lint
 DETAB_PROGRAM= \
 	if (/<programlisting>/ .. /<\/programlisting>/) {		\
 		while (/(.*?)\t(.*)/s) {				\
 			my $$filler = " " x (8 - (length($$1) % 8));	\
 			$$_ = "$$1$$filler$$2";				\
 		}							\
+	}
 # remove tabulators from the <programlisting> tags.
 # TeX does not like them.
 .PHONY: detab
 detab:
 	cd ${FILESDIR} &&						\
 	perl -p -i".detab.tmp" -e '${DETAB_PROGRAM}' *.xml &&		\
 	${RM} -f *.xml.detab.tmp
 # Generates a new htdocs-share-*.tar.gz archive from the current
 # contents of the htdocs directory. To make it available, it should
 # be copied to ftp.NetBSD.org:/pub/pkgsrc/distfiles/LOCAL_PORTS/, i.e.:
+#
 # % scp htdocs-share-*.tar.gz ftp.NetBSD.org:/pub/pkgsrc/distfiles/LOCAL_PORTS/
 # [... adjust DISTFILES variable ...]
 # % make makesum
+#
 .PHONY: htdocs-share
 htdocs-share:
 	cd ${HTDOCSDIR}							\
 	&& ${PAX} -wz -f ${.CURDIR}/htdocs-share-${PKGVERSION}.tar.gz	\
 		-s ',^,htdocs/,'					\
 		global.css share
 .include "../../mk/bsd.pkg.mk"

 @@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2018/04/04 10:23:17 leot Exp $
+$NetBSD: distinfo,v 1.18 2018/07/05 10:04:17 leot Exp $
-SHA1 (pkgsrc-guide/htdocs-share-20180404.tar.gz) = 104ff949c072bfbe1f5b4786f9a114f466ab305a
+SHA1 (pkgsrc-guide/htdocs-share-20180705.tar.gz) = 0a33b0d611ea6e186fd08e77bb26a51a703043ad
-RMD160 (pkgsrc-guide/htdocs-share-20180404.tar.gz) = 6167e2838b727425934688c8d7c205e2c7665ff1
+RMD160 (pkgsrc-guide/htdocs-share-20180705.tar.gz) = a9dbb698b7317e19472f05e64e4051acfb3986d8
-SHA512 (pkgsrc-guide/htdocs-share-20180404.tar.gz) = 67e2b6e2cc3a17c917e875fbe63f0497ba14fd39bdb6a459fda251a4140bb2694b2708241921c84f8519ccfd88494653c36c69ee88649749465317b228c9dd38
+SHA512 (pkgsrc-guide/htdocs-share-20180705.tar.gz) = 531466f5df47b046943ebf4eef38bd843a706361cb4a6868f13269a0bd275b20310e09e961ac21f2b0878dc689912673fd7072baa4695f0ba8df9c285b59aea0
-Size (pkgsrc-guide/htdocs-share-20180404.tar.gz) = 106217 bytes
+Size (pkgsrc-guide/htdocs-share-20180705.tar.gz) = 106855 bytes