Date: Thu, 5 Jun 2008 17:46:54 +0200 From: "Pietro Cerutti" <gahr@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/124304: [update] print/texinfo to 4.11 Message-ID: <1212680814.75427@gahrtop.localhost> Resent-Message-ID: <200806051550.m55Fo1U0056510@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124304
>Category: ports
>Synopsis: [update] print/texinfo to 4.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 05 15:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Pietro Cerutti
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD 8.0-CURRENT #42: Wed Jun 4 15:54:06 CEST 2008
root@:/usr/obj/usr/src/sys/MSI1034
>Description:
>How-To-Repeat:
>Fix:
--- texinfo.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/print/texinfo/Makefile,v
retrieving revision 1.29
diff -u -u -r1.29 Makefile
--- Makefile 23 Jul 2007 09:36:25 -0000 1.29
+++ Makefile 5 Jun 2008 15:43:36 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= texinfo
-PORTVERSION= 4.8
-PORTREVISION= 5
+PORTVERSION= 4.11
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,8 +14,6 @@
MAINTAINER= lioux@FreeBSD.org
COMMENT= A typeset documentation system with multiple format output
-USE_GETTEXT= yes
-
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -24,7 +21,7 @@
PKGDEINSTALL= ${PKGINSTALL}
MAKE_ARGS= TEXMF=${PREFIX}/${TEXMFLOCAL}
-CONFIGURE_ARGS= \
+CONFIGURE_ARGS= \
--without-included-gettext
CONFIGURE_ENV= \
CPPFLAGS="-I${LOCALBASE}/lib" \
@@ -39,8 +36,21 @@
TEXMFLOCAL= share/texmf-local
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.else
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.endif
+
+post-patch:
+ ${CHMOD} 755 ${WRKSRC}/build-aux/install-sh
+
post-install:
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
+ @${SETENV} PKG_PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} ${SH} \
${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/print/texinfo/distinfo,v
retrieving revision 1.6
diff -u -u -r1.6 distinfo
--- distinfo 11 Nov 2005 06:06:11 -0000 1.6
+++ distinfo 5 Jun 2008 15:01:16 -0000
@@ -1,3 +1,3 @@
-MD5 (texinfo-4.8.tar.bz2) = 6ba369bbfe4afaa56122e65b3ee3a68c
-SHA256 (texinfo-4.8.tar.bz2) = f6bb61fb9c1d6a65523c786a4a74ab61e455420469e09a86929f2d403d9a21bb
-SIZE (texinfo-4.8.tar.bz2) = 1521822
+MD5 (texinfo-4.11.tar.bz2) = c6bf13df4fbeff8ce874aacd6a51e814
+SHA256 (texinfo-4.11.tar.bz2) = 61033d48778ac7a6c80ac7cee66ca962fc4a1565fad13759618916f7f292f5f7
+SIZE (texinfo-4.11.tar.bz2) = 1659601
Index: pkg-install
===================================================================
RCS file: /home/pcvs/ports/print/texinfo/pkg-install,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-install
--- pkg-install 30 May 2005 23:23:28 -0000 1.1
+++ pkg-install 5 Jun 2008 15:21:25 -0000
@@ -5,7 +5,7 @@
PKGNAME=$1
ACTION=$2
-PATH="${PKG_PREFIX}/bin:/usr/local/bin:/usr/bin:${PATH}"
+PATH="${PKG_PREFIX}/bin:${LOCALBASE}/bin:/usr/bin:${PATH}"
SETENV=env
TEXHASH=texhash
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/print/texinfo/pkg-plist,v
retrieving revision 1.9
diff -u -u -r1.9 pkg-plist
--- pkg-plist 19 May 2007 20:21:50 -0000 1.9
+++ pkg-plist 5 Jun 2008 15:36:43 -0000
@@ -5,30 +5,32 @@
bin/texi2dvi
bin/texi2pdf
bin/texindex
-share/locale/cs/LC_MESSAGES/texinfo.mo
-share/locale/da/LC_MESSAGES/texinfo.mo
-share/locale/de/LC_MESSAGES/texinfo.mo
-share/locale/de_AT/LC_MESSAGES/texinfo.mo
-share/locale/eo/LC_MESSAGES/texinfo.mo
-share/locale/fr/LC_MESSAGES/texinfo.mo
-share/locale/he/LC_MESSAGES/texinfo.mo
-share/locale/hr/LC_MESSAGES/texinfo.mo
-share/locale/ja/LC_MESSAGES/texinfo.mo
-share/locale/nb/LC_MESSAGES/texinfo.mo
-share/locale/nl/LC_MESSAGES/texinfo.mo
-share/locale/no/LC_MESSAGES/texinfo.mo
-share/locale/pl/LC_MESSAGES/texinfo.mo
-share/locale/ro/LC_MESSAGES/texinfo.mo
-share/locale/ru/LC_MESSAGES/texinfo.mo
-share/locale/sv/LC_MESSAGES/texinfo.mo
-share/locale/tr/LC_MESSAGES/texinfo.mo
-share/locale/zh_CN/LC_MESSAGES/texinfo.mo
-share/locale/zh_TW/LC_MESSAGES/texinfo.mo
+bin/pdftexi2dvi
+%%NLS%%share/locale/cs/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/da/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/de/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/de_AT/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/he/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/no/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/texinfo.mo
%%DATADIR%%/texinfo.cat
%%DATADIR%%/texinfo.dtd
%%DATADIR%%/texinfo.xsl
-%%TEXMFLOCAL%%/pdftex/plain/misc/pdfcolor.tex
-%%TEXMFLOCAL%%/tex/generic/dvips/epsf.tex
%%TEXMFLOCAL%%/tex/texinfo/texinfo.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-cs.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-de.tex
@@ -40,13 +42,14 @@
%%TEXMFLOCAL%%/tex/texinfo/txi-no.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-pl.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-pt.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-ru.tex
+%%TEXMFLOCAL%%/tex/texinfo/txi-sr.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-tr.tex
-@dirrm %%TEXMFLOCAL%%/tex/texinfo
-@dirrmtry %%TEXMFLOCAL%%/tex/generic/dvips
+%%TEXMFLOCAL%%/tex/texinfo/txi-uk.tex
+%%TEXMFLOCAL%%/tex/generic/epsf/epsf.tex
+@dirrmtry %%TEXMFLOCAL%%/tex/generic/epsf
@dirrmtry %%TEXMFLOCAL%%/tex/generic
+@dirrm %%TEXMFLOCAL%%/tex/texinfo
@dirrmtry %%TEXMFLOCAL%%/tex
-@dirrmtry %%TEXMFLOCAL%%/pdftex/plain/misc
-@dirrmtry %%TEXMFLOCAL%%/pdftex/plain
-@dirrmtry %%TEXMFLOCAL%%/pdftex
@dirrmtry %%TEXMFLOCAL%%
@dirrm %%DATADIR%%
Index: files/patch-doc::Makefile.in
===================================================================
RCS file: /home/pcvs/ports/print/texinfo/files/patch-doc::Makefile.in,v
retrieving revision 1.1
diff -u -u -r1.1 patch-doc::Makefile.in
--- files/patch-doc::Makefile.in 30 May 2005 23:23:29 -0000 1.1
+++ files/patch-doc::Makefile.in 5 Jun 2008 15:18:25 -0000
@@ -1,15 +1,15 @@
---- doc/Makefile.in.orig Fri Dec 31 16:01:25 2004
-+++ doc/Makefile.in Sun May 29 19:57:29 2005
-@@ -76,7 +76,7 @@
+--- doc/Makefile.in.orig 2007-09-10 02:37:44.000000000 +0200
++++ doc/Makefile.in 2008-06-05 17:17:59.000000000 +0200
+@@ -104,7 +104,7 @@
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
-INFO_DEPS = texinfo info-stnd.info info.info
+INFO_DEPS = texinfo.info info-stnd.info info.info
- am__TEXINFO_TEX_DIR = $(srcdir)
+ TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
DVIS = texinfo.dvi info-stnd.dvi info.dvi
- PDFS = texinfo.pdf info-stnd.pdf info.pdf
-@@ -219,7 +219,7 @@
+@@ -375,7 +375,7 @@
# Put texinfo.txi first because that's the most important.
info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
@@ -18,7 +18,7 @@
man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \
info.5 texinfo.5
-@@ -273,7 +273,7 @@
+@@ -455,7 +455,7 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26,4 +26,4 @@
+texinfo.info: texinfo.txi $(srcdir)/version.texi
restore=: && backupdir="$(am__leading_dot)am$$$$" && \
rm -rf $$backupdir && mkdir $$backupdir && \
- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+ if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
Index: files/patch-util__texindex.c
===================================================================
RCS file: files/patch-util__texindex.c
diff -N files/patch-util__texindex.c
--- files/patch-util__texindex.c 17 Oct 2005 23:56:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
---- util/texindex.c.orig Mon Oct 17 21:41:08 2005
-+++ util/texindex.c Mon Oct 17 21:41:52 2005
-@@ -390,7 +390,9 @@
- maketempname (int count)
- {
- static char *tempbase = NULL;
-+ char *tempname;
- char tempsuffix[10];
-+ int fd;
-
- if (!tempbase)
- {
-@@ -403,7 +405,12 @@
- }
-
- sprintf (tempsuffix, ".%d", count);
-- return concat (tempbase, tempsuffix);
-+ tempname = concat (tempbase, tempsuffix);
-+ fd = open (tempname, O_CREAT|O_EXCL|O_WRONLY, 0600);
-+ if (fd == -1)
-+ pfatal_with_name (tempname);
-+ close (fd);
-+ return tempname;
- }
-
-
--- texinfo.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1212680814.75427>