From 92a9d2b6a3b56b395959ae8f9f62b5330f23c69b Mon Sep 17 00:00:00 2001 From: hubertf Date: Sun, 14 Dec 1997 23:09:43 +0000 Subject: Update to V3.11, provided by Johnny Lam . --- devel/gtexinfo/Makefile | 19 ++++++++------ devel/gtexinfo/files/md5 | 2 +- devel/gtexinfo/patches/patch-aa | 45 ++++++++++++++------------------- devel/gtexinfo/patches/patch-ab | 19 ++++++++++++++ devel/gtexinfo/patches/patch-ac | 19 ++++++++++++++ devel/gtexinfo/patches/patch-ad | 19 ++++++++++++++ devel/gtexinfo/patches/patch-ae | 56 +++++++++++++++++++++++++++++++++++++++++ devel/gtexinfo/pkg/COMMENT | 2 +- devel/gtexinfo/pkg/DESCR | 2 -- devel/gtexinfo/pkg/PLIST | 29 ++++++++++++++------- 10 files changed, 165 insertions(+), 47 deletions(-) create mode 100644 devel/gtexinfo/patches/patch-ab create mode 100644 devel/gtexinfo/patches/patch-ac create mode 100644 devel/gtexinfo/patches/patch-ad create mode 100644 devel/gtexinfo/patches/patch-ae (limited to 'devel/gtexinfo') diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile index 1bcf596cc47..18a1686897f 100644 --- a/devel/gtexinfo/Makefile +++ b/devel/gtexinfo/Makefile @@ -1,22 +1,25 @@ -# $NetBSD: Makefile,v 1.1.1.1 1997/10/09 09:13:49 agc Exp $ +# $NetBSD: Makefile,v 1.2 1997/12/14 23:09:43 hubertf Exp $ # New ports collection makefile for: GNU texinfo -# Version required: 3.9 -# Date created: 7th October 1997 -# Whom: Alistair Crooks (agc@netbsd.org) +# Version required: 3.11 +# Date created: 14 November 1997 +# Whom: lamj@stat.cmu.edu # -DISTNAME= texinfo-3.9 -PKGNAME= gtexinfo-3.9 +DISTNAME= texinfo-3.11 +PKGNAME= gtexinfo-3.11 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} +MAINTAINER= lamj@stat.cmu.edu + GNU_CONFIGURE= yes -MAN1= info.1 post-install: ${PREFIX}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/texinfo - ${PREFIX}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/makeinfo.info ${PREFIX}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/info.info ${PREFIX}/bin/install-info --info-dir=${PREFIX}/info ${PREFIX}/info/info-stnd.info +.for file in info install-info makeinfo texindex + strip ${PREFIX}/bin/${file} +.endfor .include diff --git a/devel/gtexinfo/files/md5 b/devel/gtexinfo/files/md5 index 1dba7b908eb..658372c5a5b 100644 --- a/devel/gtexinfo/files/md5 +++ b/devel/gtexinfo/files/md5 @@ -1 +1 @@ -MD5 (texinfo-3.9.tar.gz) = 94039aa7449af22dd8c7da23bdc52b6a +MD5 (texinfo-3.11.tar.gz) = 398f30ec1a5b6ec8dbad7172644cc543 diff --git a/devel/gtexinfo/patches/patch-aa b/devel/gtexinfo/patches/patch-aa index 5846fb20a99..6e198349ca2 100644 --- a/devel/gtexinfo/patches/patch-aa +++ b/devel/gtexinfo/patches/patch-aa @@ -1,26 +1,19 @@ ---- util/install-info.c 1996/10/03 23:13:36 1.12 -+++ util/install-info.c 1997/10/07 13:10:54 -@@ -338,16 +338,23 @@ - We define this function here rather than using strerror - because not all systems have strerror. */ - -+#include -+#include -+ - char * - my_strerror (errnum) - int errnum; - { -+#if (defined(BSD) && BSD >= 199306) -+ return strerror(errnum); -+#else - extern char *sys_errlist[]; - extern int sys_nerr; - - if (errnum >= 0 && errnum < sys_nerr) - return sys_errlist[errnum]; - return (char *) "Unknown error"; -+#endif - } - - /* This table defines all the long-named options, says whether they +*** 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\ diff --git a/devel/gtexinfo/patches/patch-ab b/devel/gtexinfo/patches/patch-ab new file mode 100644 index 00000000000..3663fda60ba --- /dev/null +++ b/devel/gtexinfo/patches/patch-ab @@ -0,0 +1,19 @@ +*** 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@ diff --git a/devel/gtexinfo/patches/patch-ac b/devel/gtexinfo/patches/patch-ac new file mode 100644 index 00000000000..3138aadf4f0 --- /dev/null +++ b/devel/gtexinfo/patches/patch-ac @@ -0,0 +1,19 @@ +*** 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) diff --git a/devel/gtexinfo/patches/patch-ad b/devel/gtexinfo/patches/patch-ad new file mode 100644 index 00000000000..b4ba483d532 --- /dev/null +++ b/devel/gtexinfo/patches/patch-ad @@ -0,0 +1,19 @@ +*** 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 * diff --git a/devel/gtexinfo/patches/patch-ae b/devel/gtexinfo/patches/patch-ae new file mode 100644 index 00000000000..b8f606b44e0 --- /dev/null +++ b/devel/gtexinfo/patches/patch-ae @@ -0,0 +1,56 @@ +*** info/terminal.c.orig Tue Jul 29 17:42:05 1997 +--- info/terminal.c Sat Nov 15 17:07:42 1997 +*************** +*** 31,43 **** + #ifdef HAVE_NCURSES_TERMCAP_H + #include + #else +! #ifdef HAVE_TERMCAP_H + #include + #else + /* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC. + Unfortunately, PC is a global variable used by the termcap library. */ + #undef PC + + /* Termcap requires these variables, whether we access them or not. */ + char *BC, *UP; + char PC; /* Pad character */ +--- 31,47 ---- + #ifdef HAVE_NCURSES_TERMCAP_H + #include + #else +! #if defined(HAVE_TERMCAP_H) && !defined(__NetBSD__) + #include + #else + /* On Solaris2, sys/types.h #includes sys/reg.h, which #defines PC. + Unfortunately, PC is a global variable used by the termcap library. */ + #undef PC + ++ #if defined(__NetBSD__) ++ #include ++ #endif ++ + /* Termcap requires these variables, whether we access them or not. */ + char *BC, *UP; + char PC; /* Pad character */ +*************** +*** 114,125 **** +--- 118,135 ---- + /* Although I can't find any documentation that says this is supposed to + return its argument, all the code I've looked at (termutils, less) + does so, so fine. */ ++ #ifdef __NetBSD__ ++ void ++ #else + static int ++ #endif + output_character_function (c) + int c; + { + putc (c, stdout); ++ #ifndef __NetBSD__ + return c; ++ #endif + } + + /* Macro to send STRING to the terminal. */ diff --git a/devel/gtexinfo/pkg/COMMENT b/devel/gtexinfo/pkg/COMMENT index fa257b07139..f8610040f35 100644 --- a/devel/gtexinfo/pkg/COMMENT +++ b/devel/gtexinfo/pkg/COMMENT @@ -1 +1 @@ -GNU info file manipulation utilities. NOT to be confused with print/texinfo +GNU info file manipulation utilities. diff --git a/devel/gtexinfo/pkg/DESCR b/devel/gtexinfo/pkg/DESCR index baf585483d1..4ceaccfc5cf 100644 --- a/devel/gtexinfo/pkg/DESCR +++ b/devel/gtexinfo/pkg/DESCR @@ -1,7 +1,5 @@ GNU hypertext utilities to manipulate info files. -Version 3.9. - The GNU project has a hypertext system called Info which allows the same source file to be either printed as a paper manual, or viewed using info. It is possible to use diff --git a/devel/gtexinfo/pkg/PLIST b/devel/gtexinfo/pkg/PLIST index fe5cd34b4b7..4e6a6a2b250 100644 --- a/devel/gtexinfo/pkg/PLIST +++ b/devel/gtexinfo/pkg/PLIST @@ -1,16 +1,20 @@ -@comment $NetBSD: PLIST,v 1.2 1997/11/06 09:59:17 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1997/12/14 23:09:50 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 bin/makeinfo -bin/info -bin/texindex bin/texi2dvi +bin/texindex bin/install-info -man/man1/info.1.gz +bin/info info/dir -info/makeinfo.info -info/info.info info/info-stnd.info +info/info.info info/texinfo info/texinfo-1 +info/texinfo-10 +info/texinfo-11 +info/texinfo-12 info/texinfo-2 info/texinfo-3 info/texinfo-4 @@ -19,6 +23,13 @@ info/texinfo-6 info/texinfo-7 info/texinfo-8 info/texinfo-9 -info/texinfo-10 -info/texinfo-11 -info/texinfo-12 +@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 +@dirrm share/locale/de/LC_MESSAGES +@dirrm share/locale/de +@dirrm share/locale/fr/LC_MESSAGES +@dirrm share/locale/fr +@dirrm share/locale -- cgit v1.2.3