Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1578140063183410"
MIME-Version: 1.0
Date: Sat, 4 Jan 2020 12:14:23 +0000
From: "Ryo ONODERA" <ryoon@netbsd.org>
Subject: CVS commit: pkgsrc/doc/guide
To: pkgsrc-changes@NetBSD.org
Reply-To: ryoon@netbsd.org
Message-Id: <20200104121423.254ACFA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1578140063183410
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	ryoon
Date:		Sat Jan  4 12:14:23 UTC 2020

Modified Files:
	pkgsrc/doc/guide: Makefile Makefile.common PLIST distinfo
	pkgsrc/doc/guide/files: Makefile

Log Message:
Add a rule to create EPUB file

* Sync htdocs with 20190104
* Do not build EPUB file by default


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/doc/guide/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/doc/guide/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/doc/guide/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/doc/guide/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/doc/guide/files/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1578140063183410
Content-Disposition: inline
Content-Length: 4644
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/doc/guide/Makefile
diff -u pkgsrc/doc/guide/Makefile:1.57 pkgsrc/doc/guide/Makefile:1.58
--- pkgsrc/doc/guide/Makefile:1.57	Sat Oct  5 08:50:35 2019
+++ pkgsrc/doc/guide/Makefile	Sat Jan  4 12:14:22 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2019/10/05 08:50:35 leot Exp $
+# $NetBSD: Makefile,v 1.58 2020/01/04 12:14:22 ryoon Exp $
 
 DISTNAME=		pkgsrc-guide-${PKGVERSION}
 CATEGORIES=		# empty
 MASTER_SITES=		${MASTER_SITE_LOCAL}
-DISTFILES=		htdocs-share-20191005.tar.gz
+DISTFILES=		htdocs-share-20200104.tar.gz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/docs/pkgsrc/
@@ -17,7 +17,7 @@ DIST_SUBDIR=		${PKGBASE}
 USE_LANGUAGES=		# empty
 MAKE_ENV+=		SED=${SED:Q}
 
-PLIST_VARS=		ascii html pdf
+PLIST_VARS=		ascii html pdf epub
 
 DOCDIR=			${PREFIX}/share/doc/pkgsrc
 .if exists(/usr/cvs/htdocs)
@@ -51,6 +51,10 @@ PLIST.html=		yes
 PLIST.pdf=		yes
 .endif
 
+.  if !empty(OUTPUTS:Mepub)
+PLIST.epub=		yes
+.endif
+
 # only override the Makefile.common default if it is explicitly set
 _GUIDE_OUTPUTS=		${OUTPUTS}
 .endif

Index: pkgsrc/doc/guide/Makefile.common
diff -u pkgsrc/doc/guide/Makefile.common:1.8 pkgsrc/doc/guide/Makefile.common:1.9
--- pkgsrc/doc/guide/Makefile.common:1.8	Mon Feb 20 09:35:16 2017
+++ pkgsrc/doc/guide/Makefile.common	Sat Jan  4 12:14:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2017/02/20 09:35:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2020/01/04 12:14:22 ryoon Exp $
 #
 # This is included by doc/guide and meta-pkgs/pkgsrc-guide-tools.
 #
@@ -28,6 +28,10 @@ _GUIDE_DEPENDS+=	tidy-[0-9]*:../../www/t
 _GUIDE_DEPENDS+=	w3m>=0.4:../../www/w3m
 .endif
 
+.if !empty(_GUIDE_OUTPUTS:Mepub)
+.include "../../lang/ruby/rubyversion.mk"
+.endif
+
 .if !empty(_GUIDE_OUTPUTS:Mps) || !empty(_GUIDE_OUTPUTS:Mpdf)
 _GUIDE_DEPENDS+=	openjade>=1.3.2:../../textproc/openjade
 _GUIDE_DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk

Index: pkgsrc/doc/guide/PLIST
diff -u pkgsrc/doc/guide/PLIST:1.3 pkgsrc/doc/guide/PLIST:1.4
--- pkgsrc/doc/guide/PLIST:1.3	Fri May  3 10:53:31 2019
+++ pkgsrc/doc/guide/PLIST	Sat Jan  4 12:14:22 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/05/03 10:53:31 sevan Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/01/04 12:14:22 ryoon Exp $
 ${PLIST.html}share/doc/pkgsrc/binary.html
 ${PLIST.html}share/doc/pkgsrc/build.html
 ${PLIST.html}share/doc/pkgsrc/buildlink.html
@@ -30,6 +30,7 @@ ${PLIST.html}share/doc/pkgsrc/makefile.h
 ${PLIST.html}share/doc/pkgsrc/options.html
 ${PLIST.html}share/doc/pkgsrc/pkginstall.html
 ${PLIST.html}share/doc/pkgsrc/pkgsrc.html
+${PLIST.epub}share/doc/pkgsrc/pkgsrc.epub
 ${PLIST.pdf}share/doc/pkgsrc/pkgsrc.pdf
 ${PLIST.pdf}share/doc/pkgsrc/pkgsrc.ps
 ${PLIST.ascii}share/doc/pkgsrc/pkgsrc.txt

Index: pkgsrc/doc/guide/distinfo
diff -u pkgsrc/doc/guide/distinfo:1.23 pkgsrc/doc/guide/distinfo:1.24
--- pkgsrc/doc/guide/distinfo:1.23	Sat Oct  5 08:50:35 2019
+++ pkgsrc/doc/guide/distinfo	Sat Jan  4 12:14:22 2020
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2019/10/05 08:50:35 leot Exp $
+$NetBSD: distinfo,v 1.24 2020/01/04 12:14:22 ryoon Exp $
 
-SHA1 (pkgsrc-guide/htdocs-share-20191005.tar.gz) = def824d26e3def801efd9dd424390a2fbd4a07f3
-RMD160 (pkgsrc-guide/htdocs-share-20191005.tar.gz) = ea59c68285add8634a6b0e4160e050d45c2a80ab
-SHA512 (pkgsrc-guide/htdocs-share-20191005.tar.gz) = 9783f5b59712324158950dcb08798a418387c60ae73d0026348ca7e3504e030a7f4f61cfd1b421cd3bc4cf1c9d18322827245f7e5b9800036597ce4bd6c1ebd5
-Size (pkgsrc-guide/htdocs-share-20191005.tar.gz) = 106986 bytes
+SHA1 (pkgsrc-guide/htdocs-share-20200104.tar.gz) = 82996047b0692de40295ae9f3cc940bbab36bf97
+RMD160 (pkgsrc-guide/htdocs-share-20200104.tar.gz) = c3e0d6239c997b6aa6d79609a409179dec0ef792
+SHA512 (pkgsrc-guide/htdocs-share-20200104.tar.gz) = 53f97e2cf1a62aa2af7394c80d6b7d7ed9403df600ed62a3817929fa74abb1089bf7cd6507674ffaeca346afaf64045f3d679e070f1be4e34416928b366876b4
+Size (pkgsrc-guide/htdocs-share-20200104.tar.gz) = 106922 bytes

Index: pkgsrc/doc/guide/files/Makefile
diff -u pkgsrc/doc/guide/files/Makefile:1.19 pkgsrc/doc/guide/files/Makefile:1.20
--- pkgsrc/doc/guide/files/Makefile:1.19	Sun Apr 28 15:22:24 2019
+++ pkgsrc/doc/guide/files/Makefile	Sat Jan  4 12:14:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/04/28 15:22:24 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2020/01/04 12:14:22 ryoon Exp $
 
 WEB_PREFIX?=		${.CURDIR}/../htdocs
 DBX_XML_CATALOG?=	${SGML_PREFIX}/docbook/4.5/catalog.xml
@@ -59,5 +59,6 @@ all:	# doing this as depends doesn't wor
 
 netbsd.pdf: pdf
 netbsd.txt: ascii
+netbsd.epub: epub
 
 .include "${WEB_PREFIX}/share/mk/doc.docbook.mk"


--_----------=_1578140063183410--