diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2003-06-13 21:17:18 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2003-06-13 21:17:18 +0000 |
commit | 8d68bb3e27b5b2854598dd4a97fd6d533bb79b73 (patch) | |
tree | 41022c5d37af91c1d7771a181c8c0044d177f988 /comms/bpl+ | |
parent | transfig run-depends on ghostscript. (diff) |
Use mkstemp() for tempfile handling instead of tmpnam() [1]
Respect CC and CFLAGS. Bump PORTREVISION.
Obtained from: OpenBSD [1]
Notes
Notes:
svn path=/head/; revision=82954
Diffstat (limited to 'comms/bpl+')
-rw-r--r-- | comms/bpl+/Makefile | 1 | ||||
-rw-r--r-- | comms/bpl+/files/patch-Makefile | 15 | ||||
-rw-r--r-- | comms/bpl+/files/patch-bplexec.c | 50 | ||||
-rw-r--r-- | comms/bpl+/files/patch-config.sh | 30 |
4 files changed, 96 insertions, 0 deletions
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile index 4751ee591881..573b7fd493d9 100644 --- a/comms/bpl+/Makefile +++ b/comms/bpl+/Makefile @@ -7,6 +7,7 @@ PORTNAME= bpl+ PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= comms MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= max diff --git a/comms/bpl+/files/patch-Makefile b/comms/bpl+/files/patch-Makefile new file mode 100644 index 000000000000..2b157ca235c7 --- /dev/null +++ b/comms/bpl+/files/patch-Makefile @@ -0,0 +1,15 @@ +--- Makefile.orig Fri Jun 13 14:13:23 2003 ++++ Makefile Fri Jun 13 14:13:43 2003 +@@ -4,11 +4,9 @@ + # USE_MKTIME use mktime instead of timelocal + # + MAKE = make +-CC = gcc +-OPTFLAG = -O $(OPTS) + OBJS = bpl.o bplexec.o rsraw.o + +-CFLAGS = $(OPTFLAG) $(FLAG1) $(FLAG2) ++CFLAGS += $(FLAG1) $(FLAG2) + + all: + @sh config.sh diff --git a/comms/bpl+/files/patch-bplexec.c b/comms/bpl+/files/patch-bplexec.c new file mode 100644 index 000000000000..9830a08aa22a --- /dev/null +++ b/comms/bpl+/files/patch-bplexec.c @@ -0,0 +1,50 @@ +--- bplexec.c.orig Thu Feb 9 17:25:34 1995 ++++ bplexec.c Wed Nov 15 20:45:53 2000 +@@ -17,6 +17,7 @@ + #include <stdio.h> + #include <string.h> + #include <stdlib.h> ++#include <errno.h> + + #include "bpl.h" + #include "machine.h" +@@ -1096,7 +1097,7 @@ + + fname_w_index = strlen(fname_work); + if (copy_body(s)) { /* ファイル名異常 */ +- strcpy(fname_work, tmpnam(NULL)); ++ strcpy(fname_work, "/tmp/bpl.XXXXXXXXXX"); + } + + my_free(real_filename); +@@ -1118,16 +1119,19 @@ + FILE *fp; + UCHAR *my_tmp; + char *tmp; ++ int fd; + +- tmp = tmpnam(NULL); ++ tmp = "/tmp/bpl.XXXXXXXXXX"; + my_tmp = (UCHAR *) malloc(strlen(tmp) + 1); + if (my_tmp == NULL) + return NULL; + strcpy(my_tmp, tmp); + +- fp = fopen(tmp, "wb"); +- if (fp == NULL) { ++ if ((fd = mkstemp(my_tmp)) == -1 || ++ (fp = fdopen(fd, "wb")) == NULL ) { ++ fprintf(stderr, "%s: %s\n", my_tmp, strerror(errno)); + free(my_tmp); ++ return NULL; + } else { + /* ディレクトリは current を使う */ + strwarn(STR_CANT_CREATE_L); /* 「ファイルが作成できないので」 */ +@@ -1136,6 +1140,7 @@ + strwarn(STR_CANT_CREATE_R); + my_free(real_filename); + real_filename = my_tmp; ++ close(fd); + } + return fp; + } diff --git a/comms/bpl+/files/patch-config.sh b/comms/bpl+/files/patch-config.sh new file mode 100644 index 000000000000..07febcb06085 --- /dev/null +++ b/comms/bpl+/files/patch-config.sh @@ -0,0 +1,30 @@ +--- config.sh.orig Fri Jun 13 14:14:53 2003 ++++ config.sh Fri Jun 13 14:15:18 2003 +@@ -8,27 +8,6 @@ + exit + fi + +-# check compiler +-CC=cc +-#type +-#if [ $? = 1 ]; then +- # Ultrix +- for file in `echo $PATH|sed 's/:/ /g'` +- do +- if [ -f $file/gcc ]; then +- CC=gcc +- OPTS=-g +- break +- fi +- done +-#else +-# set `type gcc` +-# if [ $1 = gcc ]; then +-# CC=$3 +-# OPTS=-g +-# fi +-#fi +- + if [ -f /usr/include/utime.h ]; then + FUTIME="-DHAME_UTIME_H" + fi |