3 files changed, 7 insertions, 41 deletions

diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 563ed0d4ec5c..7ab7f0f7f460 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	texinfo
-PORTVERSION=	5.1.20130828
+PORTVERSION=	5.2.20130926
 CATEGORIES=	print
 MASTER_SITES=	GNU \
 		ftp://ftp.stack.nl/pub/users/johans/texinfo/${PORTVERSION:E}/
@@ -23,16 +23,11 @@ PKGDEINSTALL=	${PKGINSTALL}
 USES+=		charsetfix gmake perl5
 
 MAKE_ARGS=	TEXMF=${PREFIX}/${TEXMF}
-
 INFO=		${PORTNAME} info-stnd info
-MAN1=		info.1 infokey.1 install-info.1 makeinfo.1 texi2dvi.1 \
-		texi2pdf.1 pdftexi2dvi.1 pod2texi.1 texi2any.1 texindex.1
-MAN5=		info.5 texinfo.5
 
 TEXMF=		share/texmf
 PLIST_SUB=	TEXMF=${TEXMF}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -53,6 +48,6 @@ post-patch:
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} ${SH} \
 		${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${INSTALL_DATA} ${DISTDIR}/htmlxref.cnf ${DATADIR}/
+	@${INSTALL_DATA} ${DISTDIR}/htmlxref.cnf ${STAGEDIR}/${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo
index fb7aa6ee94d3..ed958c2083b4 100644
--- a/print/texinfo/distinfo
+++ b/print/texinfo/distinfo
@@ -1,8 +1,8 @@
-SHA256 (texinfo-5.1.tar.xz) = 181d802ffd01c915e32804aca1ee9fb8023e8587d6dcb2c7aaa3234462d9c420
-SIZE (texinfo-5.1.tar.xz) = 3752460
+SHA256 (texinfo-5.2.tar.xz) = 5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda
+SIZE (texinfo-5.2.tar.xz) = 3812944
 SHA256 (htmlxref.cnf) = 4e9213642a5c22757ac1831aa4515404b2955cd7be83a4ee96e11ab5b9e3de49
 SIZE (htmlxref.cnf) = 19086
-SHA256 (texinfo.tex) = 1badb4787006dc24428f4e1589f8e4b285ad4dcd21de2ee2d3436d1889f279b8
-SIZE (texinfo.tex) = 324167
-SHA256 (texi2dvi) = d42a883f2d4cce78cc785091c6055e4f724f9fca66795c7f8842dafb04ff45f5
+SHA256 (texinfo.tex) = f62cf03a7e7922d55df7fb8ec6a9c491aede54e407585fe9fd932532c6218c96
+SIZE (texinfo.tex) = 325892
+SHA256 (texi2dvi) = 1544ebfe146908dc9a221723b6981eeed63675fc05f76b7820e903a2b40f30a1
 SIZE (texi2dvi) = 58518
diff --git a/print/texinfo/files/patch-doc::Makefile.in b/print/texinfo/files/patch-doc::Makefile.in
deleted file mode 100644
index 2a719a6e8ad9..000000000000
--- a/print/texinfo/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- doc/Makefile.in.orig	2013-02-16 18:23:15.000000000 +0100
-+++ doc/Makefile.in	2013-02-19 09:15:24.000000000 +0100
-@@ -209,7 +209,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@
- am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
- am__v_texidevnull_0 = > /dev/null
- am__v_texidevnull_1 = 
--INFO_DEPS = texinfo info-stnd.info info.info
-+INFO_DEPS = texinfo.info info-stnd.info info.info
- TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
- am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
- DVIS = texinfo.dvi info-stnd.dvi info.dvi
-@@ -1002,7 +1002,7 @@ SUBDIRS = tp_api
- 
- # Put texinfo.txi first because that's the most important.
- info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
--DISTCLEANFILES = texinfo texinfo-* info*.info*
-+DISTCLEANFILES = texinfo.info texinfo-* info*.info*
- 
- # Use the programs built in our distribution, taking account of possible
- # cross-compiling.
-@@ -1090,7 +1090,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
- 
--texinfo: texinfo.txi $(srcdir)/version.texi
-+texinfo.info: texinfo.txi $(srcdir)/version.texi
- 	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
- 	rm -rf $$backupdir && mkdir $$backupdir && \
- 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \