Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Mar 2019 14:15:34 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r497124 - head/print/texinfo
Message-ID:  <201903291415.x2TEFYhU040131@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Fri Mar 29 14:15:34 2019
New Revision: 497124
URL: https://svnweb.freebsd.org/changeset/ports/497124

Log:
  Fix the download of auxiliary files
  
  The main problem is that upstream provides unversioned auxiliary files
  (htmlxref.cnf, texi2dvi and texinfo.tex) [1]. After several failure and PRs, I
  decided to host those files in my LOCAL and use it as MASTER_SITES. It helps
  make the update "expected". But it still makes problem when the users have an
  outdated ports tree.
  
  In order to solve this problem, those files are stored versioned (by date) in my
  LOCAL from now on. Therefore, people with old ports tree would still be able to
  fetch the files.
  
  [1] https://ftp.gnu.org/gnu/texinfo/

Modified:
  head/print/texinfo/Makefile
  head/print/texinfo/distinfo

Modified: head/print/texinfo/Makefile
==============================================================================
--- head/print/texinfo/Makefile	Fri Mar 29 14:15:29 2019	(r497123)
+++ head/print/texinfo/Makefile	Fri Mar 29 14:15:34 2019	(r497124)
@@ -6,9 +6,12 @@ PORTVERSION=	6.6
 PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	GNU \
-		LOCAL/sunpoet/${DIST_SUBDIR}:DEFAULT,local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} htmlxref.cnf:local texi2dvi:local texinfo.tex:local
-DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
+		LOCAL/sunpoet/texinfo:DEFAULT,local
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		htmlxref.cnf-${HTMLXREF_CNF_RELDATE}:local \
+		texi2dvi-${TEXI2DVI_RELDATE}:local \
+		texinfo.tex-${TEXINFO_TEX_RELDATE}:local
+DIST_SUBDIR=	texinfo
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -39,6 +42,10 @@ USE_TEX=	yes
 
 INFO=		info-stnd texinfo
 
+HTMLXREF_CNF_RELDATE=	20180823
+TEXI2DVI_RELDATE=	20190104
+TEXINFO_TEX_RELDATE=	20190216
+
 CPE_VENDOR=	gnu
 CPE_VERSION=	${PORTVERSION:R}
 
@@ -46,11 +53,10 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-patch:
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/texinfo.tex ${WRKSRC}/doc/
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/htmlxref.cnf ${WRKSRC}/util/
-	@${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/texi2dvi ${WRKSRC}/util/
-	@${REINPLACE_CMD} -e '/rm -f $$(DESTDIR)/ s|$$| $$(DESTDIR)$$(xsdir)/XSParagraph.*|' \
-		${WRKSRC}/tp/Texinfo/XS/Makefile.in
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/texinfo.tex-${TEXINFO_TEX_RELDATE} ${WRKSRC}/doc/texinfo.tex
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/htmlxref.cnf-${HTMLXREF_CNF_RELDATE} ${WRKSRC}/util/htmlxref.cnf
+	@${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/texi2dvi-${TEXI2DVI_RELDATE} ${WRKSRC}/util/texi2dvi
+	@${REINPLACE_CMD} -e '/rm -f $$(DESTDIR)/ s|$$| $$(DESTDIR)$$(xsdir)/XSParagraph.*|' ${WRKSRC}/tp/Texinfo/XS/Makefile.in
 	@${REINPLACE_CMD} -e 's|free (.*)|Safe&|' ${WRKSRC}/tp/Texinfo/XS/misc.c
 
 post-install:

Modified: head/print/texinfo/distinfo
==============================================================================
--- head/print/texinfo/distinfo	Fri Mar 29 14:15:29 2019	(r497123)
+++ head/print/texinfo/distinfo	Fri Mar 29 14:15:34 2019	(r497124)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1551424865
-SHA256 (texinfo/6.6/texinfo-6.6.tar.xz) = 9bb9ca00da53f26a7e5725eee49689cd4a1e18d25d5b061ac8b2053018d93d66
-SIZE (texinfo/6.6/texinfo-6.6.tar.xz) = 4946900
-SHA256 (texinfo/6.6/htmlxref.cnf) = 214988e088251b52c5b9c80c05120858777fee4c8cec384be2f33dd716374d2d
-SIZE (texinfo/6.6/htmlxref.cnf) = 20076
-SHA256 (texinfo/6.6/texi2dvi) = 9c608884b81a43a9b0802e7294788b336b2a9db8a64ca775e9e6bdae396a0c24
-SIZE (texinfo/6.6/texi2dvi) = 61195
-SHA256 (texinfo/6.6/texinfo.tex) = b19a421624076a9d1335d1a17c33329a26d02a0a3430b43c2a3cbd51708f1cdf
-SIZE (texinfo/6.6/texinfo.tex) = 380503
+TIMESTAMP = 1552736091
+SHA256 (texinfo/texinfo-6.6.tar.xz) = 9bb9ca00da53f26a7e5725eee49689cd4a1e18d25d5b061ac8b2053018d93d66
+SIZE (texinfo/texinfo-6.6.tar.xz) = 4946900
+SHA256 (texinfo/htmlxref.cnf-20180823) = 214988e088251b52c5b9c80c05120858777fee4c8cec384be2f33dd716374d2d
+SIZE (texinfo/htmlxref.cnf-20180823) = 20076
+SHA256 (texinfo/texi2dvi-20190104) = 9c608884b81a43a9b0802e7294788b336b2a9db8a64ca775e9e6bdae396a0c24
+SIZE (texinfo/texi2dvi-20190104) = 61195
+SHA256 (texinfo/texinfo.tex-20190216) = b19a421624076a9d1335d1a17c33329a26d02a0a3430b43c2a3cbd51708f1cdf
+SIZE (texinfo/texinfo.tex-20190216) = 380503



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