update to 2.5.5; remove patches no longer needed for tiff34
This commit is contained in:
marc
parent
05725cbbd9
commit
c4297f02a1
@ -3,10 +3,10 @@
|
||||
# Date created: December 2, 1997
|
||||
# Whom: Angelos D. Keromytis
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.6 1998/06/14 08:10:38 marc Exp $
|
||||
# $OpenBSD: Makefile,v 1.7 1998/07/04 03:22:14 marc Exp $
|
||||
#
|
||||
|
||||
DISTNAME= xpaint-2.5.4
|
||||
DISTNAME= xpaint-2.5.5
|
||||
CATEGORIES= graphics x11
|
||||
MASTER_SITES= http://www.danbbs.dk/~torsten/xpaint/
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (xpaint-2.5.4.tar.gz) = 8749efd22a3a0645d4262d5b78c925b7
|
||||
MD5 (xpaint-2.5.5.tar.gz) = eba215e3946606b4503ccd9c5549bc31
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
*** rw/writeTIFF.c.orig Wed May 20 16:09:47 1998
|
||||
--- rw/writeTIFF.c Wed May 20 16:10:06 1998
|
||||
***************
|
||||
*** 16,22 ****
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
! #include <tiffio.h>
|
||||
#include "image.h"
|
||||
|
||||
#undef howmany
|
||||
--- 16,22 ----
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
! #include <tiffio34.h>
|
||||
#include "image.h"
|
||||
|
||||
#undef howmany
|
||||
@ -1,19 +1,15 @@
|
||||
*** Local.config.orig Wed May 20 16:11:55 1998
|
||||
--- Local.config Wed May 20 16:13:04 1998
|
||||
***************
|
||||
*** 140,146 ****
|
||||
XPM_INCLUDE = -I/usr/X11R6/include/X11
|
||||
#endif
|
||||
|
||||
! #if defined(FreeBSDArchitecture)
|
||||
ARCH_DEFINES = -DHAVE_PARAM_H
|
||||
TIFF_INCLUDE = -I/usr/local/include/tiff34
|
||||
TIFF_LIB = -L/usr/local/lib -ltiff34
|
||||
--- 140,146 ----
|
||||
XPM_INCLUDE = -I/usr/X11R6/include/X11
|
||||
#endif
|
||||
|
||||
! #if defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
|
||||
ARCH_DEFINES = -DHAVE_PARAM_H
|
||||
TIFF_INCLUDE = -I/usr/local/include/tiff34
|
||||
TIFF_LIB = -L/usr/local/lib -ltiff34
|
||||
--- Local.config.~1~ Mon Mar 23 13:39:44 1998
|
||||
+++ Local.config Fri Jul 3 19:11:27 1998
|
||||
@@ -148,3 +148,12 @@
|
||||
JPEG_LIB = -L/usr/local/lib -ljpeg
|
||||
XPM_INCLUDE = -I/usr/X11R6/include/X11
|
||||
#endif
|
||||
+
|
||||
+#if defined(OpenBSDArchitecture)
|
||||
+ARCH_DEFINES = -DHAVE_PARAM_H
|
||||
+TIFF_INCLUDE = -I/usr/local/include
|
||||
+TIFF_LIB = -L/usr/local/lib -ltiff
|
||||
+JPEG_INCLUDE = -I/usr/local/include
|
||||
+JPEG_LIB = -L/usr/local/lib -ljpeg
|
||||
+XPM_INCLUDE = -I/usr/X11R6/include/X11
|
||||
+#endif
|
||||
|
||||
@ -1,19 +1,18 @@
|
||||
*** rw/rwTable.c.orig Wed May 20 16:21:04 1998
|
||||
--- rw/rwTable.c Wed May 20 16:24:24 1998
|
||||
***************
|
||||
*** 231,242 ****
|
||||
--- 231,244 ----
|
||||
char *
|
||||
RWGetMsg()
|
||||
{
|
||||
+ #if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(_NetBSD__)
|
||||
#if defined(BSD4_4)
|
||||
__const extern char *__const sys_errlist[];
|
||||
#else
|
||||
extern char *sys_errlist[];
|
||||
#endif
|
||||
extern int errno;
|
||||
+ #endif
|
||||
|
||||
if (RWtableMsg[0] == '\0') {
|
||||
if (errno == 0)
|
||||
--- rw/rwTable.c.~1~ Fri Jul 3 19:18:59 1998
|
||||
+++ rw/rwTable.c Fri Jul 3 19:20:44 1998
|
||||
@@ -231,6 +231,7 @@
|
||||
char *
|
||||
RWGetMsg()
|
||||
{
|
||||
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(_NetBSD__)
|
||||
#if defined(BSD4_4)
|
||||
__const extern char *__const sys_errlist[];
|
||||
#else
|
||||
@@ -239,6 +240,7 @@
|
||||
#endif
|
||||
#endif
|
||||
extern int errno;
|
||||
+#endif
|
||||
|
||||
if (RWtableMsg[0] == '\0') {
|
||||
if (errno == 0)
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
*** rw/readTIFF.c.orig Wed May 20 16:25:10 1998
|
||||
--- rw/readTIFF.c Wed May 20 16:25:34 1998
|
||||
***************
|
||||
*** 16,22 ****
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
! #include "tiffio.h"
|
||||
#include "image.h"
|
||||
#include "rwTable.h"
|
||||
|
||||
--- 16,22 ----
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
! #include <tiffio34.h>
|
||||
#include "image.h"
|
||||
#include "rwTable.h"
|
||||
|
||||
@ -1,35 +1,29 @@
|
||||
*** rw/libpnmrw.c.orig Wed May 20 16:26:40 1998
|
||||
--- rw/libpnmrw.c Wed May 20 16:33:16 1998
|
||||
***************
|
||||
*** 16,21 ****
|
||||
--- 16,25 ----
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
+ #include <errno.h>
|
||||
+ #endif
|
||||
+
|
||||
#if defined(SVR2) || defined(SVR3) || defined(SVR4)
|
||||
#ifndef SYSV
|
||||
#define SYSV
|
||||
***************
|
||||
*** 131,136 ****
|
||||
--- 135,141 ----
|
||||
static void
|
||||
pm_perror(char *reason)
|
||||
{
|
||||
+ #if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
|
||||
#if defined(BSD4_4)
|
||||
__const extern char *__const sys_errlist[];
|
||||
#else
|
||||
***************
|
||||
*** 138,143 ****
|
||||
--- 143,149 ----
|
||||
#endif
|
||||
#if !defined(__EMX__) || defined(__CYGWIN32__)
|
||||
extern int errno;
|
||||
+ #endif
|
||||
#endif
|
||||
char *e;
|
||||
|
||||
--- rw/libpnmrw.c.~1~ Tue Jun 9 14:08:57 1998
|
||||
+++ rw/libpnmrw.c Fri Jul 3 19:23:04 1998
|
||||
@@ -16,6 +16,10 @@
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
+#include <errno.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined(SVR2) || defined(SVR3) || defined(SVR4)
|
||||
#ifndef SYSV
|
||||
#define SYSV
|
||||
@@ -131,6 +135,7 @@
|
||||
static void
|
||||
pm_perror(char *reason)
|
||||
{
|
||||
+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
|
||||
#if defined(BSD4_4)
|
||||
__const extern char *__const sys_errlist[];
|
||||
#else
|
||||
@@ -140,6 +145,7 @@
|
||||
#endif
|
||||
#if !defined(__EMX__) || defined(__CYGWIN32__)
|
||||
extern int errno;
|
||||
+#endif
|
||||
#endif
|
||||
char *e;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user