diff options
author | Han Boetes <han@mijncomputer.nl> | 2006-12-19 22:23:02 +0100 |
---|---|---|
committer | Han Boetes <han@mijncomputer.nl> | 2006-12-19 22:23:02 +0100 |
commit | 1f07d5e6d90c004e1219309a11e8660953be99dc (patch) | |
tree | b0628d7042c02eb6130e649f1a49b755abdf81ed /texinfo | |
parent | 610f27d0996e05c0790fee1471be5e5bd9bf75c0 (diff) | |
download | contrib-1f07d5e6d90c004e1219309a11e8660953be99dc.tar.gz contrib-1f07d5e6d90c004e1219309a11e8660953be99dc.tar.xz |
pulled my ports from contrib after threats. Sorry for the people who like them, you can find them in my repo
Diffstat (limited to 'texinfo')
-rw-r--r-- | texinfo/.footprint | 28 | ||||
-rw-r--r-- | texinfo/.md5sum | 2 | ||||
-rw-r--r-- | texinfo/Pkgfile | 35 | ||||
-rw-r--r-- | texinfo/texinfo.patch | 169 |
4 files changed, 0 insertions, 234 deletions
diff --git a/texinfo/.footprint b/texinfo/.footprint deleted file mode 100644 index 1cfe03429..000000000 --- a/texinfo/.footprint +++ /dev/null @@ -1,28 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/info --rwxr-xr-x root/root usr/bin/infokey --rwxr-xr-x root/root usr/bin/install-info --rwxr-xr-x root/root usr/bin/makeinfo --rwxr-xr-x root/root usr/bin/texi2dvi --rwxr-xr-x root/root usr/bin/texi2pdf --rwxr-xr-x root/root usr/bin/texindex -drwxr-xr-x root/root usr/info/ --rw-r--r-- root/root usr/info/dir --rw-r--r-- root/root usr/info/info-stnd.info --rw-r--r-- root/root usr/info/info.info --rw-r--r-- root/root usr/info/texinfo --rw-r--r-- root/root usr/info/texinfo-1 --rw-r--r-- root/root usr/info/texinfo-2 --rw-r--r-- root/root usr/info/texinfo-3 -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/info.1.gz --rw-r--r-- root/root usr/man/man1/infokey.1.gz --rw-r--r-- root/root usr/man/man1/install-info.1.gz --rw-r--r-- root/root usr/man/man1/makeinfo.1.gz --rw-r--r-- root/root usr/man/man1/texi2dvi.1.gz --rw-r--r-- root/root usr/man/man1/texindex.1.gz -drwxr-xr-x root/root usr/man/man5/ --rw-r--r-- root/root usr/man/man5/info.5.gz --rw-r--r-- root/root usr/man/man5/texinfo.5.gz diff --git a/texinfo/.md5sum b/texinfo/.md5sum deleted file mode 100644 index 827de8a3c..000000000 --- a/texinfo/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -6611b6f95a5f133aa52889be93bfbf31 texinfo-4.8a.tar.gz -f48d62ac45819dfee35b6b47e14ee6c7 texinfo.patch diff --git a/texinfo/Pkgfile b/texinfo/Pkgfile deleted file mode 100644 index e405c3a1f..000000000 --- a/texinfo/Pkgfile +++ /dev/null @@ -1,35 +0,0 @@ -# Description: Texinfo is the official documentation format of the GNU project -# URL: http://www.gnu.org/software/texinfo/ -# Maintainer: Han Boetes <han@mijncomputer.nl> -# Packager: Han Boetes <han@mijncomputer.nl> -# Depends on: - -# -# Don't laugh! I need it for bootstrapping emacs from cvs. -# - -name=texinfo -version=4.8a -release=1 - -source=" - ftp://ftp.gnu.org/gnu/texinfo/texinfo-$version.tar.gz - texinfo.patch -" - -build() -{ - cd $name-* - patch -p1 -i $SRC/texinfo.patch - ./configure \ - --prefix=/usr \ - --disable-nls - make - make install DESTDIR=$PKG - if [ -d /usr/info ]; then - util/gen-dir-node /usr/info > $PKG/usr/info/dir - else - util/gen-dir-node $PKG/usr/info > $PKG/usr/info/dir - fi - rm -rf $PKG/usr/share/ -} diff --git a/texinfo/texinfo.patch b/texinfo/texinfo.patch deleted file mode 100644 index 7cd07a308..000000000 --- a/texinfo/texinfo.patch +++ /dev/null @@ -1,169 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_warn_missing_tex.dpatch by <norbert@gandalf.localdomain> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./util/texi2dvi /tmp/dpep-work.19TjB7/texinfo-4.8/util/texi2dvi ---- ./util/texi2dvi 2005-08-19 13:04:27.000000000 +0200 -+++ /tmp/dpep-work.19TjB7/texinfo-4.8/util/texi2dvi 2005-08-19 13:05:17.000000000 +0200 -@@ -26,6 +26,17 @@ - # If possible, please send a copy of the output of the script called with - # the `--debug' option when making a bug report. - -+if ! command -v tex >/dev/null 2>&1; then -+ cat <<%EOM% -+You don't have a working TeX binary installed, but the texi2dvi script -+can't proceed without it. If you want to use this script, you have to -+install some kind of TeX, for example teTeX Debian packages. You can do -+that with this command: -+ prt-get install tetex -+%EOM% -+ exit 1 -+fi -+ - # This string is expanded by rcs automatically when this file is checked out. - rcs_revision='$Revision: 1.34 $' - rcs_version=`set - $rcs_revision; echo $2` -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30_texindex_racecondition.dpatch by Henry Jensen <jensen@scan-plus.de> -## and Norbert Preining <preining@logic.at> -## backport of cvs fixes -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ ---- branches/upstream/current/util/texindex.c 2005-09-30 11:28:05.000000000 +0200 -+++ texinfo-cvs/util/texindex.c 2005-10-06 08:35:26.000000000 +0200 -@@ -99,6 +99,9 @@ - /* Directory to use for temporary files. On Unix, it ends with a slash. */ - char *tempdir; - -+/* Start of filename to use for temporary files. */ -+char *tempbase; -+ - /* Number of last temporary file. */ - int tempcount; - -@@ -144,7 +147,7 @@ - void fatal (const char *format, const char *arg); - void error (const char *format, const char *arg); - void *xmalloc (), *xrealloc (); --char *concat (char *s1, char *s2); -+static char *concat3 (const char *, const char *, const char *); - void flush_tempfiles (int to_count); - - #define MAX_IN_CORE_SORT 500000 -@@ -190,6 +193,11 @@ - - decode_command (argc, argv); - -+ /* XXX mkstemp not appropriate, as we need to have somewhat predictable -+ * names. But race condition was fixed, see maketempname. -+ */ -+ tempbase = mktemp (concat3 ("txiXXXXXX", "", "")); -+ - /* Process input files completely, one by one. */ - - for (i = 0; i < num_infiles; i++) -@@ -220,7 +228,7 @@ - - outfile = outfiles[i]; - if (!outfile) -- outfile = concat (infiles[i], "s"); -+ outfile = concat3 (infiles[i], "s", ""); - - need_initials = 0; - first_initial = '\0'; -@@ -318,7 +326,7 @@ - if (tempdir == NULL) - tempdir = DEFAULT_TMPDIR; - else -- tempdir = concat (tempdir, "/"); -+ tempdir = concat3 (tempdir, "/", ""); - - keep_tempfiles = 0; - -@@ -384,26 +395,25 @@ - usage (1); - } - --/* Return a name for temporary file COUNT. */ -+/* Return a name for temporary file COUNT, or NULL if failure. */ - - static char * - maketempname (int count) - { -- static char *tempbase = NULL; - char tempsuffix[10]; -+ char *name; -+ int fd; - -- if (!tempbase) -+ sprintf (tempsuffix, ".%d", count); -+ name = concat3 (tempdir, tempbase, tempsuffix); -+ fd = open (name, O_CREAT|O_EXCL|O_WRONLY, 0600); -+ if (fd == -1) -+ return NULL; -+ else - { -- int fd; -- tempbase = concat (tempdir, "txidxXXXXXX"); -- -- fd = mkstemp (tempbase); -- if (fd == -1) -- pfatal_with_name (tempbase); -+ close(fd); -+ return(name); - } -- -- sprintf (tempsuffix, ".%d", count); -- return concat (tempbase, tempsuffix); - } - - -@@ -931,6 +941,8 @@ - for (i = 0; i < ntemps; i++) - { - char *newtemp = maketempname (++tempcount); -+ if (!newtemp) -+ pfatal_with_name("temp file"); - sort_in_core (tempfiles[i], MAX_IN_CORE_SORT, newtemp); - if (!keep_tempfiles) - unlink (tempfiles[i]); -@@ -1401,6 +1413,8 @@ - if (i + 1 == ntemps) - nf = nfiles - i * MAX_DIRECT_MERGE; - tempfiles[i] = maketempname (++tempcount); -+ if (!tempfiles[i]) -+ pfatal_with_name("temp file"); - value |= merge_direct (&infiles[i * MAX_DIRECT_MERGE], nf, tempfiles[i]); - } - -@@ -1612,17 +1626,18 @@ - } - - --/* Return a newly-allocated string concatenating S1 and S2. */ -+/* Return a newly-allocated string concatenating S1, S2, and S3. */ - --char * --concat (char *s1, char *s2) -+static char * -+concat3 (const char *s1, const char *s2, const char *s3) - { -- int len1 = strlen (s1), len2 = strlen (s2); -- char *result = (char *) xmalloc (len1 + len2 + 1); -+ int len1 = strlen (s1), len2 = strlen (s2), len3 = strlen (s3); -+ char *result = (char *) xmalloc (len1 + len2 + len3 + 1); - - strcpy (result, s1); - strcpy (result + len1, s2); -- *(result + len1 + len2) = 0; -+ strcpy (result + len1 + len2, s3); -+ *(result + len1 + len2 + len3) = 0; - - return result; - } |