From 6f11d87c296327af822052c99f75e452d06de5e1 Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 22 Dec 2014 23:06:09 +0000
Subject: - Update texinfo.tex and texi2dvi to latest release - Use DIST_SUBDIR
 for rolling distfiles

---
 print/texinfo/Makefile | 10 ++++++----
 print/texinfo/distinfo | 16 ++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 22d92d9909b5..0f3c046c4ea4 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -2,12 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	texinfo
-PORTVERSION=	5.2.20140808
+PORTVERSION=	5.2.20141212
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/johans/texinfo/${PORTVERSION:E}/ \
 		GNU
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} htmlxref.cnf texinfo.tex texi2dvi
+DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	johans@FreeBSD.org
@@ -33,10 +35,10 @@ PLIST_SUB=	TEXMF=${TEXMF}
 
 post-patch:
 	${CHMOD} 755 ${WRKSRC}/build-aux/install-sh
-	${CP} ${DISTDIR}/texinfo.tex ${WRKSRC}/doc/
-	${CP} ${DISTDIR}/texi2dvi ${WRKSRC}/util/
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/texinfo.tex ${WRKSRC}/doc/
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/texi2dvi ${WRKSRC}/util/
 
 post-install:
-	${INSTALL_DATA} ${DISTDIR}/htmlxref.cnf ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/htmlxref.cnf ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo
index 235111f87a6f..8ee34e7075ee 100644
--- a/print/texinfo/distinfo
+++ b/print/texinfo/distinfo
@@ -1,8 +1,8 @@
-SHA256 (texinfo-5.2.tar.xz) = 5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda
-SIZE (texinfo-5.2.tar.xz) = 3812944
-SHA256 (htmlxref.cnf) = e008c192c0233428ade62588673198eef88299287e05c80361aacb58b93f1d93
-SIZE (htmlxref.cnf) = 19605
-SHA256 (texinfo.tex) = 298be0b84dad4c98240e023ec99d91dc0fd169be33171e206723ab072aed872c
-SIZE (texinfo.tex) = 326981
-SHA256 (texi2dvi) = cabab426b8af28e9411b988e5ab55fa9308be58dbe854b5eb0de407a96137c48
-SIZE (texi2dvi) = 57261
+SHA256 (texinfo/5.2.20141212/texinfo-5.2.tar.xz) = 5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda
+SIZE (texinfo/5.2.20141212/texinfo-5.2.tar.xz) = 3812944
+SHA256 (texinfo/5.2.20141212/htmlxref.cnf) = e008c192c0233428ade62588673198eef88299287e05c80361aacb58b93f1d93
+SIZE (texinfo/5.2.20141212/htmlxref.cnf) = 19605
+SHA256 (texinfo/5.2.20141212/texinfo.tex) = c73e31295f87d4b856c38bc4d31f7cfc8f0c5605d4ecf58c60e0db276796306b
+SIZE (texinfo/5.2.20141212/texinfo.tex) = 328628
+SHA256 (texinfo/5.2.20141212/texi2dvi) = 6e2457300ff03e5b15a4f32b936c0b995285c6ada70269be7aebd17d7a8cc475
+SIZE (texinfo/5.2.20141212/texi2dvi) = 56378
-- 
cgit v1.2.3