From f1fa3d610dd76279305d706bf6dd78514a4a1623 Mon Sep 17 00:00:00 2001 From: hubertf Date: Mon, 9 Mar 1998 08:09:34 +0000 Subject: Update to V3.12 --- devel/gtexinfo/Makefile | 6 +++--- devel/gtexinfo/files/md5 | 2 +- devel/gtexinfo/patches/patch-aa | 39 ++++++++++++++++++++------------------- devel/gtexinfo/patches/patch-ab | 30 +++++++++++------------------- devel/gtexinfo/patches/patch-ac | 30 +++++++++++------------------- devel/gtexinfo/patches/patch-ad | 31 ++++++++++++------------------- devel/gtexinfo/patches/patch-ae | 20 -------------------- devel/gtexinfo/pkg/PLIST | 6 +++--- 8 files changed, 61 insertions(+), 103 deletions(-) (limited to 'devel/gtexinfo') diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile index d05903a7219..6ea3b9961bf 100644 --- a/devel/gtexinfo/Makefile +++ b/devel/gtexinfo/Makefile @@ -3,11 +3,11 @@ # Date created: 14 November 1997 # Whom: lamj@stat.cmu.edu # -# $NetBSD: Makefile,v 1.4 1998/03/05 13:17:17 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 1998/03/09 08:09:34 hubertf Exp $ # -DISTNAME= texinfo-3.11 -PKGNAME= gtexinfo-3.11 +DISTNAME= texinfo-3.12 +PKGNAME= gtexinfo-3.12 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} diff --git a/devel/gtexinfo/files/md5 b/devel/gtexinfo/files/md5 index 658372c5a5b..dff7d606e27 100644 --- a/devel/gtexinfo/files/md5 +++ b/devel/gtexinfo/files/md5 @@ -1 +1 @@ -MD5 (texinfo-3.11.tar.gz) = 398f30ec1a5b6ec8dbad7172644cc543 +MD5 (texinfo-3.12.tar.gz) = 731f0955cdaa5260d0f81053576a6482 diff --git a/devel/gtexinfo/patches/patch-aa b/devel/gtexinfo/patches/patch-aa index 6e198349ca2..ebe0c7d3057 100644 --- a/devel/gtexinfo/patches/patch-aa +++ b/devel/gtexinfo/patches/patch-aa @@ -1,19 +1,20 @@ -*** util/install-info.c.orig Tue Oct 7 16:08:31 1997 ---- util/install-info.c Tue Oct 7 16:43:18 1997 -*************** -*** 335,341 **** - topmost node of the Info hierarchy, called (dir)Top.\n\ - The first time you invoke Info you start off looking at this node.\n\ - \n\ -! File: dir Node: Top This is the top of the INFO tree\n\ - \n\ - This (the Directory node) gives a menu of major topics.\n\ - Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\ ---- 335,341 ---- - topmost node of the Info hierarchy, called (dir)Top.\n\ - The first time you invoke Info you start off looking at this node.\n\ - \n\ -! File: dir Node: Top This is the top of the INFO tree\n\ - \n\ - This (the Directory node) gives a menu of major topics.\n\ - Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\ +--- util/Makefile.in 1998/02/13 13:13:54 1.1 ++++ util/Makefile.in 1998/02/13 13:14:34 +@@ -40,7 +40,7 @@ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} + transform = @program_transform_name@ + + NORMAL_INSTALL = true +@@ -253,7 +253,7 @@ + all: Makefile $(PROGRAMS) $(SCRIPTS) + + install-strip: +- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install ++ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install + installdirs: + $(mkinstalldirs) $(bindir) $(bindir) + diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab index 3663fda60ba..e728c9bb37b 100644 --- a/devel/gtexinfo/patches/patch-ab +++ b/devel/gtexinfo/patches/patch-ab @@ -1,19 +1,11 @@ -*** info/Makefile.in.orig Thu Jul 31 19:51:17 1997 ---- info/Makefile.in Tue Oct 7 16:54:31 1997 -*************** -*** 107,113 **** - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - - -! DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ ---- 107,113 ---- - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - - -! DEFS = @DEFS@ -DPORTSINFODIR=\"$(prefix)/info\" -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ +--- info/Makefile.in.orig Mon Mar 9 08:42:23 1998 ++++ info/Makefile.in Mon Mar 9 08:42:44 1998 +@@ -97,7 +97,7 @@ + # Automake puts -I.. and -I$(srcdir) into DEFS by default, but + # we need to override it, so include them ourselves. + INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir) +-DEFS = -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@ ++DEFS = -DPORTSINFODIR=\"$(prefix)/info\" -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@ + LDADD = ../lib/libtxi.a @TERMLIBS@ @INTLLIBS@ + + makedoc_SOURCES = makedoc.c diff --git a/devel/gtexinfo/patches/patch-ac b/devel/gtexinfo/patches/patch-ac index 3138aadf4f0..e1382cb533c 100644 --- a/devel/gtexinfo/patches/patch-ac +++ b/devel/gtexinfo/patches/patch-ac @@ -1,19 +1,11 @@ -*** info/filesys.h.orig Tue Jul 15 14:39:09 1997 ---- info/filesys.h Tue Oct 7 17:00:11 1997 -*************** -*** 71,77 **** - - /* The default value of INFOPATH. */ - #if !defined (DEFAULT_INFOPATH) -! # define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:." - #endif /* !DEFAULT_INFOPATH */ - - #if !defined (S_ISREG) && defined (S_IFREG) ---- 71,77 ---- - - /* The default value of INFOPATH. */ - #if !defined (DEFAULT_INFOPATH) -! # define DEFAULT_INFOPATH PORTSINFODIR ":" "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:." - #endif /* !DEFAULT_INFOPATH */ - - #if !defined (S_ISREG) && defined (S_IFREG) +--- info/filesys.h.orig Mon Mar 9 08:43:52 1998 ++++ info/filesys.h Mon Mar 9 08:44:32 1998 +@@ -71,7 +71,7 @@ + + /* The default value of INFOPATH. */ + #if !defined (DEFAULT_INFOPATH) +-# define DEFAULT_INFOPATH "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:." ++# define DEFAULT_INFOPATH PORTSINFODIR ":" "/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:." + #endif /* !DEFAULT_INFOPATH */ + + #if !defined (S_ISREG) && defined (S_IFREG) diff --git a/devel/gtexinfo/patches/patch-ad b/devel/gtexinfo/patches/patch-ad index b4ba483d532..f7a89f53142 100644 --- a/devel/gtexinfo/patches/patch-ad +++ b/devel/gtexinfo/patches/patch-ad @@ -1,19 +1,12 @@ -*** util/texindex.c.orig Thu Jul 24 19:34:46 1997 ---- util/texindex.c Fri Oct 3 13:11:13 1997 -*************** -*** 1692,1698 **** - } - - #if !defined (HAVE_STRERROR) -! extern char *sys_errlist[]; - extern int sys_nerr; - - char * ---- 1692,1698 ---- - } - - #if !defined (HAVE_STRERROR) -! extern const char * const sys_errlist[]; - extern int sys_nerr; - - char * +--- util/texindex.c.orig Mon Mar 9 08:48:33 1998 ++++ util/texindex.c Mon Mar 9 08:48:45 1998 +@@ -1683,7 +1683,8 @@ + } + + #if !defined (HAVE_STRERROR) +-extern char *sys_errlist[]; ++# error patch-ad really needed (sys_errlist prototype) ++extern __const char *__const sys_errlist[]; + extern int sys_nerr; + + char * diff --git a/devel/gtexinfo/patches/patch-ae b/devel/gtexinfo/patches/patch-ae index 6867dea2aba..b8f606b44e0 100644 --- a/devel/gtexinfo/patches/patch-ae +++ b/devel/gtexinfo/patches/patch-ae @@ -54,23 +54,3 @@ } /* Macro to send STRING to the terminal. */ ---- util/Makefile.in 1998/02/13 13:13:54 1.1 -+++ util/Makefile.in 1998/02/13 13:14:34 -@@ -40,7 +40,7 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} - transform = @program_transform_name@ - - NORMAL_INSTALL = true -@@ -253,7 +253,7 @@ - all: Makefile $(PROGRAMS) $(SCRIPTS) - - install-strip: -- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install -+ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_SCRIPT)' install - installdirs: - $(mkinstalldirs) $(bindir) $(bindir) - diff --git a/devel/gtexinfo/pkg/PLIST b/devel/gtexinfo/pkg/PLIST index 881cad1ae6e..47b0b869508 100644 --- a/devel/gtexinfo/pkg/PLIST +++ b/devel/gtexinfo/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1997/12/29 03:02:09 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.5 1998/03/09 08:09:35 hubertf Exp $ @unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/info-stnd.info @unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/info.info @unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/texinfo @@ -26,5 +26,5 @@ info/texinfo-9 @exec %D/bin/install-info --info-dir=%D/info %D/info/info-stnd.info @exec %D/bin/install-info --info-dir=%D/info %D/info/info.info @exec %D/bin/install-info --info-dir=%D/info %D/info/texinfo -share/locale/de/LC_MESSAGES/texinfo.mo -share/locale/fr/LC_MESSAGES/texinfo.mo +lib/locale/de/LC_MESSAGES/texinfo.cat +lib/locale/fr/LC_MESSAGES/texinfo.cat -- cgit v1.2.3