Changes 10.31:
* Bug fixes
This commit is contained in:
parent
ae9724a03b
commit
034380fe31
6 changed files with 29 additions and 50 deletions
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.127 2005/12/05 20:50:21 rillig Exp $
|
||||
# $NetBSD: Makefile,v 1.128 2006/01/16 15:17:02 adam Exp $
|
||||
|
||||
DISTNAME= netpbm-10.30
|
||||
DISTNAME= netpbm-10.31
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/}
|
||||
EXTRACT_SUFX= .tgz
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.45 2005/10/19 09:30:08 adam Exp $
|
||||
$NetBSD: distinfo,v 1.46 2006/01/16 15:17:02 adam Exp $
|
||||
|
||||
SHA1 (netpbm-10.30.tgz) = b07ff527f4b2f8adaf7b44abd00f16b10b0ab403
|
||||
RMD160 (netpbm-10.30.tgz) = 6e0409e7c7085751d266f1137a89d2a3d37022da
|
||||
Size (netpbm-10.30.tgz) = 2370761 bytes
|
||||
SHA1 (patch-aa) = e10c9a7266714bb980f7d515b2fa43e18d580d44
|
||||
SHA1 (patch-ab) = 900c36d6ab145c807ecb3dec6b77ae2ad50d4dad
|
||||
SHA1 (netpbm-10.31.tgz) = c85d5c439e2bb81a5c5f7a5ab1068391c553caaa
|
||||
RMD160 (netpbm-10.31.tgz) = abeb8b44ce3496f7b4127ca6e1a89bd11e5ef2bb
|
||||
Size (netpbm-10.31.tgz) = 2383586 bytes
|
||||
SHA1 (patch-aa) = 5b9202879ae7c0a3df776d06be5fc76b8bb95982
|
||||
SHA1 (patch-ab) = 86bc267115349c9ef52dc01b1ab425ad6d5e2193
|
||||
SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
|
||||
SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
|
||||
SHA1 (patch-af) = 82e366af1c8b644cf374706c2eb113c370447de9
|
||||
SHA1 (patch-ah) = f9cd1864c3298fbba7241646a49fe845bbc716ba
|
||||
SHA1 (patch-ai) = 1d8c9585a08f96422f4180719ecc26e305929c62
|
||||
SHA1 (patch-ah) = 638f2f48fc073011c8d436b38a274df6e8b31238
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
||||
$NetBSD: patch-aa,v 1.34 2006/01/16 15:17:02 adam Exp $
|
||||
|
||||
--- Makefile.config.in.orig 2005-10-08 02:37:24.000000000 +0000
|
||||
--- Makefile.config.in.orig 2005-12-10 18:19:13.000000000 +0100
|
||||
+++ Makefile.config.in
|
||||
@@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge
|
||||
# and skip it on those systems unless you want to debug it and fix it.
|
||||
|
@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
|
||||
# The linker.
|
||||
LD = $(CC)
|
||||
@@ -98,7 +98,7 @@ LD_FOR_BUILD = $(LD)
|
||||
@@ -99,7 +99,7 @@ CFLAGS_FOR_BUILD = $(CFLAGS)
|
||||
|
||||
# MAKE is set automatically by Make to what was used to invoke Make.
|
||||
|
||||
|
@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
#Solaris:
|
||||
#INSTALL = /usr/ucb/install
|
||||
#Tru64:
|
||||
@@ -110,7 +110,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
|
||||
@@ -111,7 +111,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s
|
||||
|
||||
# STRIPFLAG is the option you pass to the above install program to make it
|
||||
# strip unnecessary information out of binaries.
|
||||
|
@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
# If you don't want to strip the binaries, just leave it null:
|
||||
#STRIPFLAG =
|
||||
|
||||
@@ -129,8 +129,10 @@ MANPAGE_FORMAT = nroff
|
||||
@@ -130,8 +130,10 @@ MANPAGE_FORMAT = nroff
|
||||
AR = ar
|
||||
RANLIB = ranlib
|
||||
# IRIX, SCO don't have Ranlib:
|
||||
|
@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
# Solaris:
|
||||
# LEX = flex -e
|
||||
# Or just skip parts that need Lex:
|
||||
@@ -216,7 +218,7 @@ EXE =
|
||||
@@ -217,7 +219,7 @@ EXE =
|
||||
|
||||
# Here, $(SONAME) resolves to the soname for the shared library being created.
|
||||
# The following are gcc options. This works on GNU libc systems.
|
||||
|
@ -60,7 +60,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
# You need -nostart instead of -shared on BeOS. Though the BeOS compiler is
|
||||
# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
|
||||
# documentation and doesn't exist in at least one non-BeOS installation.
|
||||
@@ -249,6 +251,18 @@ LDRELOC = NONE
|
||||
@@ -250,6 +252,18 @@ LDRELOC = NONE
|
||||
#LDRELOC = ld --reloc
|
||||
#LDRELOC = ld -r
|
||||
|
||||
|
@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
|
||||
# On older systems, you have to make shared libraries out of position
|
||||
# independent code, so you need -fpic or fPIC here. (The rule is: if
|
||||
@@ -271,11 +285,23 @@ LDRELOC = NONE
|
||||
@@ -272,11 +286,23 @@ LDRELOC = NONE
|
||||
CFLAGS_SHLIB =
|
||||
# Solaris or SunOS with gcc, and NetBSD:
|
||||
#CFLAGS_SHLIB = -fpic
|
||||
|
@ -104,7 +104,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
# SHLIB_CLIB is the link option to include the C library in a shared library,
|
||||
# normally "-lc". On typical systems, this serves no purpose. On some,
|
||||
# though, it causes information about which C library to use to be recorded
|
||||
@@ -344,8 +370,8 @@ TIFFHDR_DIR =
|
||||
@@ -345,8 +371,8 @@ TIFFHDR_DIR =
|
||||
#TIFFLIB = libtiff.so
|
||||
#TIFFHDR_DIR = /usr/include/libtiff
|
||||
#NetBSD:
|
||||
|
@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
# OSF, Tru64:
|
||||
#TIFFLIB = /usr/local1/DEC/lib/libtiff.so
|
||||
#TIFFHDR_DIR = /usr/local1/DEC/include
|
||||
@@ -375,8 +401,8 @@ JPEGHDR_DIR =
|
||||
@@ -376,8 +402,8 @@ JPEGHDR_DIR =
|
||||
#JPEGLIB = libjpeg.so
|
||||
#JPEGHDR_DIR = /usr/include/jpeg
|
||||
# Netbsd:
|
||||
|
@ -126,7 +126,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
# OSF, Tru64:
|
||||
#JPEGLIB = /usr/local1/DEC/libjpeg.so
|
||||
#JPEGHDR_DIR = /usr/local1/DEC/include
|
||||
@@ -400,8 +426,8 @@ PNGVER =
|
||||
@@ -401,8 +427,8 @@ PNGVER =
|
||||
#PNGLIB = libpng$(PNGVER).so
|
||||
#PNGHDR_DIR = /usr/include/libpng$(PNGVER)
|
||||
# NetBSD:
|
||||
|
@ -137,7 +137,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
# OSF/Tru64:
|
||||
#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
|
||||
#PNGHDR_DIR = /usr/local1/DEC/include
|
||||
@@ -411,8 +437,8 @@ PNGVER =
|
||||
@@ -412,8 +438,8 @@ PNGVER =
|
||||
# NONE for the PNG library, it doesn't matter what you specify here --
|
||||
# it won't get used.
|
||||
|
||||
|
@ -148,7 +148,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
#ZLIB = libz.so
|
||||
|
||||
# The JBIG lossless image compression library (aka JBIG-KIT):
|
||||
@@ -421,8 +447,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
|
||||
@@ -422,8 +448,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb
|
||||
JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
|
||||
|
||||
# The Jasper JPEG-2000 image compression library (aka JasPer):
|
||||
|
@ -159,7 +159,7 @@ $NetBSD: patch-aa,v 1.33 2005/10/19 09:30:09 adam Exp $
|
|||
# JASPERDEPLIBS is the libraries (-l options or file names) on which
|
||||
# The Jasper library depends -- i.e. what you have to link into any
|
||||
# executable that links in the Jasper library.
|
||||
@@ -458,7 +484,7 @@ OMIT_NETWORK =
|
||||
@@ -459,7 +485,7 @@ OMIT_NETWORK =
|
||||
# built into the standard C library, so this can be null. This is irrelevant
|
||||
# if OMIT_NETWORK is "y".
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ab,v 1.17 2005/08/22 11:59:31 adam Exp $
|
||||
$NetBSD: patch-ab,v 1.18 2006/01/16 15:17:02 adam Exp $
|
||||
|
||||
--- converter/other/Makefile.orig 2005-08-06 16:41:07.000000000 +0000
|
||||
--- converter/other/Makefile.orig 2005-12-03 18:16:27.000000000 +0100
|
||||
+++ converter/other/Makefile
|
||||
@@ -109,6 +109,13 @@ HEADERLINKS = pm_config.h pm.h pbm.h pgm
|
||||
@@ -113,6 +113,13 @@ HEADERLINKS = pm_config.h pm_c_util.h \
|
||||
|
||||
include $(SRCDIR)/Makefile.common
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ah,v 1.8 2005/10/19 09:30:09 adam Exp $
|
||||
$NetBSD: patch-ah,v 1.9 2006/01/16 15:17:02 adam Exp $
|
||||
|
||||
--- converter/other/cameratopam/camera.c.orig 2005-09-17 21:51:41.000000000 +0000
|
||||
--- converter/other/cameratopam/camera.c.orig 2005-12-03 19:06:50.000000000 +0100
|
||||
+++ converter/other/cameratopam/camera.c
|
||||
@@ -23,6 +23,10 @@
|
||||
@@ -25,6 +25,10 @@
|
||||
|
||||
#include "camera.h"
|
||||
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
$NetBSD: patch-ai,v 1.5 2005/08/21 04:47:24 grant Exp $
|
||||
|
||||
--- converter/other/cameratopam/cameratopam.c.orig 2005-04-13 02:20:46.000000000 +1000
|
||||
+++ converter/other/cameratopam/cameratopam.c
|
||||
@@ -6,6 +6,7 @@
|
||||
information on copyright and licensing.
|
||||
*/
|
||||
|
||||
+#include <time.h>
|
||||
#define _XOPEN_SOURCE /* Make sure unistd.h contains swab() */
|
||||
#define _BSD_SOURCE /* Make sure string.h containst strcasecmp() */
|
||||
#include <ctype.h>
|
||||
@@ -19,7 +20,6 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
-#include <time.h>
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#include <io.h>
|
Loading…
Reference in a new issue