diff options
author | tonnerre <tonnerre@pkgsrc.org> | 2008-08-24 20:35:37 +0000 |
---|---|---|
committer | tonnerre <tonnerre@pkgsrc.org> | 2008-08-24 20:35:37 +0000 |
commit | 788a8734376b7601af868acf8cba6092bd2c904d (patch) | |
tree | 1da2e5446cccd457a2e6e841edbf6bbc35488e3a /print | |
parent | 6d26f40b0c161cb3bae997c3477fce43bcaf7bf7 (diff) | |
download | pkgsrc-788a8734376b7601af868acf8cba6092bd2c904d.tar.gz |
If mkdtemp is not defined, define our own version and deploy it. Also, don't
just add mkdtemp to configure.in but also make sure that it is heard.
PKGREVISION++.
Diffstat (limited to 'print')
-rw-r--r-- | print/teTeX3-bin/Makefile | 4 | ||||
-rw-r--r-- | print/teTeX3-bin/distinfo | 8 | ||||
-rw-r--r-- | print/teTeX3-bin/patches/patch-au | 28 | ||||
-rw-r--r-- | print/teTeX3-bin/patches/patch-av | 67 | ||||
-rw-r--r-- | print/teTeX3-bin/patches/patch-aw | 17 | ||||
-rw-r--r-- | print/teTeX3-bin/patches/patch-ax | 112 | ||||
-rw-r--r-- | print/teTeX3-bin/patches/patch-ay | 13 |
7 files changed, 234 insertions, 15 deletions
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile index c70d432f4f7..620ca3f78a7 100644 --- a/print/teTeX3-bin/Makefile +++ b/print/teTeX3-bin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2008/08/07 15:51:11 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2008/08/24 20:35:37 tonnerre Exp $ DISTNAME= tetex-src-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/} -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/} diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo index b82b1b0fcb0..822a7593337 100644 --- a/print/teTeX3-bin/distinfo +++ b/print/teTeX3-bin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2008/05/25 17:10:29 tonnerre Exp $ +$NetBSD: distinfo,v 1.11 2008/08/24 20:35:37 tonnerre Exp $ SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc @@ -22,4 +22,8 @@ SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7 SHA1 (patch-ar) = 7f0c6cdca69b73bad1c8f8298e417ede1cd89d77 SHA1 (patch-as) = 0b6c4c6b253ba1160628c19fa7080bc7c307caf3 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718 -SHA1 (patch-au) = a439d5bfa857636c72861d9d5ffe9243f34dc8e1 +SHA1 (patch-au) = 119e3714b5c1ff2fe7b7ec8041a3bb8eab6fb944 +SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344 +SHA1 (patch-aw) = 4876a029e00298aa0f01b2e652fe101b6453afbd +SHA1 (patch-ax) = 6f32d91113254335f683466149f25050d21dbc08 +SHA1 (patch-ay) = 277a5d8c80b3c2c594bf38de27635d5236f755a6 diff --git a/print/teTeX3-bin/patches/patch-au b/print/teTeX3-bin/patches/patch-au index d2d223b8c15..a038ee853f8 100644 --- a/print/teTeX3-bin/patches/patch-au +++ b/print/teTeX3-bin/patches/patch-au @@ -1,9 +1,15 @@ -$NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ +$NetBSD: patch-au,v 1.2 2008/08/24 20:35:37 tonnerre Exp $ ---- texk/dviljk/dvi2xx.h +--- texk/dviljk/dvi2xx.h.orig 1999-03-16 08:03:33.000000000 +0100 +++ texk/dviljk/dvi2xx.h -@@ -10,8 +10,8 @@ +@@ -8,10 +8,14 @@ + /* #define LJ */ + /* #define DRAWGLYPH */ ++#ifndef HAVE_MKDTEMP ++extern char *mkdtemp(char *path); ++#endif ++ #ifdef KPATHSEA #include <kpathsea/config.h> +#include <kpathsea/c-std.h> @@ -12,7 +18,7 @@ $NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ #include <kpathsea/magstep.h> #include <kpathsea/proginit.h> #include <kpathsea/progname.h> -@@ -24,6 +24,7 @@ +@@ -24,6 +28,7 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> @@ -20,7 +26,7 @@ $NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ #ifdef unix #include <limits.h> #endif -@@ -41,9 +42,6 @@ +@@ -41,9 +46,6 @@ #ifdef MSC5 #include <dos.h> /* only for binaryopen on device */ #endif @@ -30,7 +36,7 @@ $NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ #include "config.h" -@@ -116,6 +114,7 @@ +@@ -116,6 +118,7 @@ #define HUGE_SIZE (unsigned char) 2 #define HUGE_CHAR_PATTERN 32767l #define BYTES_PER_PIXEL_LINE 500 /* max number of bytes per pixel line */ @@ -38,7 +44,7 @@ $NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ #define PK_POST 245 -@@ -281,7 +280,14 @@ char *MFMODE = MFMODE600; +@@ -281,7 +284,14 @@ char *MFMODE = MFMODE600; #define VisChar(c) (unsigned char)(c) #endif @@ -54,7 +60,7 @@ $NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ /**********************************************************************/ -@@ -307,6 +313,7 @@ int printf(); +@@ -307,6 +317,7 @@ int printf(); int sscanf(); int strcmp(); char *strcpy(); @@ -62,7 +68,7 @@ $NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ # ifdef MSC5 unsigned int strlen(); # endif -@@ -393,7 +400,7 @@ struct font_entry { /* font entry */ +@@ -393,7 +404,7 @@ struct font_entry { /* font entry */ char n[STRSIZE]; /* FNT_DEF command parameters */ long4 font_mag; /* computed from FNT_DEF s and d parameters */ /*char psname[STRSIZE];*/ /* PostScript name of the font */ @@ -71,7 +77,7 @@ $NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ FILEPTR font_file_id; /* file identifier (NO_FILE if none) */ #ifdef USEPXL long4 magnification; /* magnification read from PXL file */ -@@ -487,8 +494,8 @@ void LoadAChar DVIPROTO((long4, regis +@@ -487,8 +498,8 @@ void LoadAChar DVIPROTO((long4, regis long4 NoSignExtend DVIPROTO((FILEPTR, int)); void OpenFontFile DVIPROTO((void)); long4 PixRound DVIPROTO((long4, long4)); @@ -82,7 +88,7 @@ $NetBSD: patch-au,v 1.1 2008/05/05 22:48:22 tonnerre Exp $ unsigned int, unsigned char *)); void RasterChar DVIPROTO((struct char_entry *)); void ReadFontDef DVIPROTO((long4)); -@@ -534,11 +541,12 @@ bool LastPageSpecified = _FALSE; +@@ -534,11 +545,12 @@ bool LastPageSpecified = _FALSE; #ifndef KPATHSEA char *PXLpath = FONTAREA; #endif diff --git a/print/teTeX3-bin/patches/patch-av b/print/teTeX3-bin/patches/patch-av new file mode 100644 index 00000000000..d54ad0c04ae --- /dev/null +++ b/print/teTeX3-bin/patches/patch-av @@ -0,0 +1,67 @@ +$NetBSD: patch-av,v 1.1 2008/08/24 20:35:37 tonnerre Exp $ + +--- texk/dviljk/configure.orig 2008-08-24 20:52:04.000000000 +0200 ++++ texk/dviljk/configure +@@ -1286,6 +1286,62 @@ cat >> confdefs.h <<EOF + EOF + + ++for ac_func in rmdir unlink mkdtemp ++do ++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:1243: checking for $ac_func" >&5 ++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext <<EOF ++#line 1248 "configure" ++#include "confdefs.h" ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++#include <assert.h> ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func(); ++ ++int main() { ++ ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++$ac_func(); ++#endif ++ ++; return 0; } ++EOF ++if { (eval echo configure:1271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=no" ++fi ++rm -f conftest* ++fi ++ ++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_func 1 ++EOF ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++done ++ ++ + + trap '' 1 2 15 + cat > confcache <<\EOF diff --git a/print/teTeX3-bin/patches/patch-aw b/print/teTeX3-bin/patches/patch-aw new file mode 100644 index 00000000000..ef68e756e00 --- /dev/null +++ b/print/teTeX3-bin/patches/patch-aw @@ -0,0 +1,17 @@ +$NetBSD: patch-aw,v 1.1 2008/08/24 20:35:37 tonnerre Exp $ + +--- texk/dviljk/c-auto.in.orig 2008-08-24 21:24:31.000000000 +0200 ++++ texk/dviljk/c-auto.in +@@ -7,3 +7,12 @@ + + /* The number of bytes in a long. */ + #undef SIZEOF_LONG ++ ++/* Presence of the rmdir() function. */ ++#undef HAVE_RMDIR ++ ++/* Presence of the unlink() function. */ ++#undef HAVE_UNLINK ++ ++/* Presence of the mkdtemp() function. */ ++#undef HAVE_MKDTEMP diff --git a/print/teTeX3-bin/patches/patch-ax b/print/teTeX3-bin/patches/patch-ax new file mode 100644 index 00000000000..330b3132f80 --- /dev/null +++ b/print/teTeX3-bin/patches/patch-ax @@ -0,0 +1,112 @@ +$NetBSD: patch-ax,v 1.1 2008/08/24 20:35:37 tonnerre Exp $ + +--- /dev/null 2008-08-24 22:23:22.000000000 +0200 ++++ texk/dviljk/mkdtemp.c 2008-08-24 22:23:18.000000000 +0200 +@@ -0,0 +1,107 @@ ++/* ++ * Copyright (c) 1987, 1993 ++ * The Regents of the University of California. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. Neither the name of the University nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++#include <c-auto.h> ++#ifdef KPATHSEA ++#include <kpathsea/config.h> ++#include <kpathsea/c-std.h> ++#include <kpathsea/c-limits.h> ++#include <kpathsea/magstep.h> ++#include <kpathsea/proginit.h> ++#include <kpathsea/progname.h> ++#include <kpathsea/tex-glyph.h> ++#include <kpathsea/tex-hush.h> ++#include <kpathsea/tex-make.h> ++#include <kpathsea/c-vararg.h> ++#else ++#include <string.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <unistd.h> ++#ifdef unix ++#include <limits.h> ++#endif ++#endif /* KPATHSEA */ ++ ++#include <signal.h> ++#include <ctype.h> ++#ifdef vms ++#include <file.h> ++#else ++# ifndef __riscos ++# include <fcntl.h> ++# endif ++#endif ++#ifdef MSC5 ++#include <dos.h> /* only for binaryopen on device */ ++#endif ++ ++#ifndef HAVE_MKDTEMP ++ ++char * ++mkdtemp(path) ++ char *path; ++{ ++ char *tmppath; ++ ++ assert(path != NULL); ++ ++ tmppath = malloc(strlen(path)); ++ assert(tmppath); ++ ++ for (;;) ++ { ++ /* Reset string */ ++ strcpy(tmppath, path); ++ ++ if (!mktemp(tmppath)) ++ { ++ free(tmppath); ++ return NULL; ++ } ++ ++ if (!mkdir(tmppath, 0700)) ++ { ++ /* Write back to user buffer. */ ++ strcpy(path, tmppath); ++ free(tmppath); ++ return path; ++ } ++ ++ if (errno != EEXIST) ++ { ++ free(tmppath); ++ return NULL; ++ } ++ } ++ ++ return NULL; /* Not reached */ ++} ++ ++#endif /* !HAVE_NBTOOL_CONFIG_H || !HAVE_MKDTEMP */ diff --git a/print/teTeX3-bin/patches/patch-ay b/print/teTeX3-bin/patches/patch-ay new file mode 100644 index 00000000000..797b4339c2a --- /dev/null +++ b/print/teTeX3-bin/patches/patch-ay @@ -0,0 +1,13 @@ +$NetBSD: patch-ay,v 1.1 2008/08/24 20:35:37 tonnerre Exp $ + +--- texk/dviljk/Makefile.in.orig 2008-08-24 22:14:59.000000000 +0200 ++++ texk/dviljk/Makefile.in +@@ -9,7 +9,7 @@ ac_include ../make/programs.mk + + prog_cflags = -DKPATHSEA + +-common_objects = tfm.o ++common_objects = tfm.o mkdtemp.o + + program = dvilj + objects = dvilj.o $(common_objects) |