cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to netpbm 9.24

Browse Source
This commit is contained in:
brad 2002-03-01 22:49:19 +00:00
parent 2b06f1da7d
commit 8e753689e9
12 changed files with 111 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/netpbm/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.23 2001/10/03 03:09:31 brad Exp $
# $OpenBSD: Makefile,v 1.24 2002/03/01 22:49:19 brad Exp $
# $NetBSD: Makefile,v 1.25 1999/03/04 14:18:54 tron Exp $
COMMENT= "toolkit for converting images between different formats"
DISTNAME= netpbm-9.19
DISTNAME= netpbm-9.24
CATEGORIES= graphics
NEED_VERSION= 1.460
NEED_VERSION= 1.500
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= netpbm
EXTRACT_SUFX= .tgz
@ -13,6 +13,7 @@ EXTRACT_SUFX= .tgz
HOMEPAGE= http://netpbm.sourceforge.net/
LIB_DEPENDS= tiff.35::graphics/tiff \
jpeg.62::graphics/jpeg \
png.2::graphics/png
MAINTAINER= Brad Smith <brad@openbsd.org>
@ -29,13 +30,13 @@ USE_GMAKE= Yes
MAKE_FILE= GNUmakefile
post-patch:
@mv -f ${WRKSRC}/pm_config.h ${WRKSRC}/pm_config.h.bak
@mv -f ${WRKSRC}/pbm/pm.h ${WRKSRC}/pbm/pm.h.bak
pre-build:
@mv -f ${WRKSRC}/pm_config.h ${WRKSRC}/pm_config.h.new
@mv -f ${WRKSRC}/pbm/pm.h ${WRKSRC}/pbm/pm.h.new
@sed -e s#!!X11R6!!#${X11BASE}#g \
${WRKSRC}/pm_config.h.bak > ${WRKSRC}/pm_config.h
${WRKSRC}/pm_config.h.new > ${WRKSRC}/pm_config.h
@sed -e s#shhopt.h#pm_shhopt.h#g \
${WRKSRC}/pbm/pm.h.bak > ${WRKSRC}/pbm/pm.h
${WRKSRC}/pbm/pm.h.new > ${WRKSRC}/pbm/pm.h
@cp -f ${FILESDIR}/Makefile.config.OpenBSD \
${WRKSRC}/Makefile.config
@cd ${WRKSRC}/shhopt; ln -sf shhopt.h pm_shhopt.h

3
graphics/netpbm/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (netpbm-9.24.tgz) = 4c73dbf91b8ee858f9e2fe688d7b0fff
RMD160 (netpbm-9.24.tgz) = 5330e663827d672073cf541ca6735abbd0ce9b62
SHA1 (netpbm-9.24.tgz) = 2be68df2cd18b55864856db1e331a7e01b9f06c9

2
graphics/netpbm/files/Makefile.config.OpenBSD
View File

@ -18,6 +18,8 @@ ZLIB_DIR = /usr/lib
ZHDR_DIR = /usr/include
URTLIB_DIR = NONE
URTHDR_DIR = NONE
LINUXSVGALIB_DIR = NONE
LINUXSVGAHDR_DIR = NONE
INSTALLBINARIES = $(PREFIX)/bin
INSTALLSCRIPTS = $(INSTALLBINARIES)
INSTALLLIBS = $(PREFIX)/lib

3
graphics/netpbm/files/md5
View File

@ -1,3 +0,0 @@
MD5 (netpbm-9.19.tgz) = c5793f67bb96c8bc7ff4531d0b9c08ac
RMD160 (netpbm-9.19.tgz) = b7f6aeeda05baf412a7299118e396f42be25b4b0
SHA1 (netpbm-9.19.tgz) = 8f7ff213ff397e4ee967d2ac1a479e01786b17cd

28
graphics/netpbm/patches/patch-GNUmakefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-GNUmakefile,v 1.1 2001/10/03 03:09:31 brad Exp $
--- GNUmakefile.orig Mon Sep 10 22:12:09 2001
+++ GNUmakefile Mon Sep 10 22:13:36 2001
@@ -69,7 +69,7 @@ SUBDIRS = pbm pgm ppm pnm
$OpenBSD: patch-GNUmakefile,v 1.2 2002/03/01 22:49:20 brad Exp $
--- GNUmakefile.orig Thu Jan 10 18:28:24 2002
+++ GNUmakefile Fri Mar 1 17:13:24 2002
@@ -71,7 +71,7 @@ SUBDIRS = pbm pgm ppm pnm
default: $(DEFAULT_TARGET)
@ -10,21 +10,25 @@ $OpenBSD: patch-GNUmakefile,v 1.1 2001/10/03 03:09:31 brad Exp $
.PHONY: nonmerge
nonmerge: $(SUBDIRS)
@@ -160,10 +160,10 @@ $(INSTALLHDRS):
@@ -139,7 +139,6 @@ install.lib: $(INSTALLLIBS)
for i in $(SUBDIRS) ; do \
$(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.lib ; \
done
- $(SRCDIR)/buildtools/try_ldconfig
endif
.PHONY: install.hdr
@@ -159,10 +158,10 @@ install-dev: install.hdr install.staticl
install.hdr: $(INSTALLHDRS) $(SRCDIR)/pm_config.h
- $(INSTALL) -c -m$(INSTALL_PERM_HDR) \
# See notes in Makefile.common about how $(INSTALL) varies from one
# platform to another.
- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
+ ${BSD_INSTALL_DATA} \
$(SRCDIR)/pm_config.h $(INSTALLHDRS)
- $(INSTALL) -c -m$(INSTALL_PERM_HDR) \
- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
- $(SRCDIR)/shhopt/shhopt.h $(INSTALLHDRS)
+ ${BSD_INSTALL_DATA} \
+ $(SRCDIR)/shhopt/pm_shhopt.h $(INSTALLHDRS)
for i in $(SUBDIRS) ; do \
$(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.hdr ; \
done
@@ -210,4 +210,4 @@ dep:
done
# The following endif is for the else block that contains virtually the
# whole file, for the test of the existence of CURDIR.

37
graphics/netpbm/patches/patch-Makefile_common
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_common,v 1.1 2001/10/03 03:09:31 brad Exp $
--- Makefile.common.orig Sat Sep 8 15:31:28 2001
+++ Makefile.common Tue Oct 2 21:19:52 2001
@@ -174,25 +174,21 @@ $(MERGENAME): $(MERGENAME).o $(MERGE_OBJ
$OpenBSD: patch-Makefile_common,v 1.2 2002/03/01 22:49:20 brad Exp $
--- Makefile.common.orig Sun Jan 27 15:09:03 2002
+++ Makefile.common Fri Mar 1 17:23:32 2002
@@ -176,25 +176,21 @@ $(MERGENAME): $(MERGENAME).o $(MERGE_OBJ
$(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS)
# Note that the user may have configured -I options into CFLAGS.
@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile_common,v 1.1 2001/10/03 03:09:31 brad Exp $
endif
ifeq ($(NETPBMLIBTYPE),dll)
@@ -281,7 +277,7 @@ endif
@@ -283,7 +279,7 @@ endif
install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
ifneq ($(MERGENAME)x,x)
@ -45,7 +45,7 @@ $OpenBSD: patch-Makefile_common,v 1.1 2001/10/03 03:09:31 brad Exp $
$(MERGENAME) $(INSTALLBINARIES)
cd $(INSTALLBINARIES) ; \
for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
@@ -291,7 +287,7 @@ endif
@@ -293,7 +289,7 @@ endif
ifneq ($(NOMERGEBINARIES)x,x)
for x in $(NOMERGEBINARIES); \
do \
@ -54,7 +54,7 @@ $OpenBSD: patch-Makefile_common,v 1.1 2001/10/03 03:09:31 brad Exp $
$$x $(INSTALLBINARIES); \
done
endif
@@ -302,7 +298,7 @@ install.bin.common: $(BINARIES) install.
@@ -304,7 +300,7 @@ install.bin.common: $(BINARIES) install.
# Make and Install know that pbmmake.exe counts as pbmmake.
for x in $(BINARIES); \
do \
@ -63,7 +63,7 @@ $OpenBSD: patch-Makefile_common,v 1.1 2001/10/03 03:09:31 brad Exp $
$$x $(INSTALLBINARIES); \
done
@@ -311,7 +307,7 @@ install.script: $(SCRIPTS)
@@ -313,7 +309,7 @@ install.script: $(SCRIPTS)
ifneq ($(SCRIPTS)x,x)
for x in $(SCRIPTS); \
do \
@ -72,7 +72,7 @@ $OpenBSD: patch-Makefile_common,v 1.1 2001/10/03 03:09:31 brad Exp $
$(INSTALLSCRIPTS); \
done
endif
@@ -348,7 +344,7 @@ install.hdr:
@@ -350,7 +346,7 @@ install.hdr:
# directory when you compile your programs.
for x in $(INTERFACE_HEADERS); \
do \
@ -81,13 +81,30 @@ $OpenBSD: patch-Makefile_common,v 1.1 2001/10/03 03:09:31 brad Exp $
$(INSTALLHDRS); \
done
@@ -356,19 +352,16 @@ install.hdr:
@@ -358,36 +354,19 @@ install.hdr:
#
.PHONY: install.staticlib
install.staticlib: lib$(LIBROOT).$(STATICLIBSUFFIX)
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLSTATICLIBS)/$<
+ ${BSD_INSTALL_DATA} $< $(INSTALLSTATICLIBS)/$<
-# Install a shared library stub -- the ".so" file used at link time to
-# prepare a program for dynamically linking a library at run time
.PHONY: install.sharedlibstub
-ifeq ($(NETPBMLIBTYPE),unixshared)
-# install the link-time (.so) links to the runtime libraries
-install.sharedlibstub:
- cd $(INSTALLSTATICLIBS) ; \
- rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX); \
- $(SYMLINK) $(INSTALLLIBS)/lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ) \
- lib$(LIBROOT).$(NETPBMLIBSUFFIX)
-else
-# I have no idea what link-time stuff is required for other library types.
-# static libraries are of course entirely link-time and are handled
-# by the install.staticlib target.
install.sharedlibstub:
-endif
# Install a shared library
#
.PHONY: install.lib.common

8
graphics/netpbm/patches/patch-pbm_Makefile
View File

@ -1,5 +1,5 @@
--- pbm/Makefile.orig Mon Sep 10 22:17:16 2001
+++ pbm/Makefile Mon Sep 10 22:20:36 2001
--- pbm/Makefile.orig Thu Jan 10 18:19:44 2002
+++ pbm/Makefile Fri Mar 1 16:03:29 2002
@@ -52,6 +52,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MER
# Library objects to be built and linked by Makefile.common:
@ -36,10 +36,10 @@
HEADERLINKS = pm_config.h version.h compile.h
@@ -109,6 +105,5 @@ $(BUILDDIR)/shhopt/libshhopt.a:
.PHONY: clean
@@ -110,6 +106,5 @@ $(BUILDDIR)/shhopt/libshhopt.a:
clean: clean.common
rm -f thinkjettopbm.c
rm -f compile.h
- $(MAKE) -C pbmtoppa clean
FORCE:

16
graphics/netpbm/patches/patch-pm_config_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-pm_config_h,v 1.1 2001/10/03 03:09:31 brad Exp $
--- pm_config.h.orig Sun Jun 10 19:37:08 2001
+++ pm_config.h Wed Sep 5 21:13:36 2001
@@ -19,6 +19,10 @@
**************************************************************************/
$OpenBSD: patch-pm_config_h,v 1.2 2002/03/01 22:49:20 brad Exp $
--- pm_config.h.orig Wed Jan 16 18:14:55 2002
+++ pm_config.h Fri Mar 1 16:16:07 2002
@@ -35,6 +35,10 @@
typedef unsigned int uint32n;
typedef signed int int32n;
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-pm_config_h,v 1.1 2001/10/03 03:09:31 brad Exp $
#if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
#define SYSV
#endif
@@ -28,7 +32,7 @@
@@ -44,7 +48,7 @@ typedef signed int int32n;
** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're
** probably better off setting SYSV - all it affects is string handling.
*/
@ -21,7 +21,7 @@ $OpenBSD: patch-pm_config_h,v 1.1 2001/10/03 03:09:31 brad Exp $
/* #define SYSV */
/* #define MSDOS */
/* #define AMIGA */
@@ -48,9 +52,9 @@
@@ -86,9 +90,9 @@ typedef signed int int32n;
#define RGB_DB2 "PBMplus_Dir:RGB.TXT"
#define RGB_DB3 "PBMplus_Dir:RGB.TXT"
#else

18
graphics/netpbm/patches/patch-pnm_Makefile
View File

@ -1,14 +1,22 @@
--- pnm/Makefile.orig Mon Sep 10 22:42:10 2001
+++ pnm/Makefile Mon Sep 10 22:44:28 2001
@@ -155,6 +155,7 @@ OBJECTS = $(patsubst %, %.o, $(BINARIES)
--- pnm/Makefile.orig Sun Jan 20 18:17:29 2002
+++ pnm/Makefile Fri Mar 1 16:38:56 2002
@@ -146,13 +146,14 @@ SCRIPTS = anytopnm pamstretch-gen pnmind
# MERGE_ALIASES is additional names to be linked to the merge binary which are
# alternate names for a program whose source is called something else.
# Every name here must be referenced in pnmmerge.c.
-MERGE_ALIASES = pnmnoraw gemtopbm
+MERGE_ALIASES =
OBJECTS = $(patsubst %, %.o, $(BINARIES)) exif.o
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o libpammap.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libpnm
@@ -172,7 +173,7 @@ endif
@@ -170,7 +171,7 @@ endif
$(MAKE) -C jbig all
$(MAKE) -C pnmtopalm all
PHONY: merge

10
graphics/netpbm/patches/patch-pnm_pnmtopalm_Makefile
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-pnm_pnmtopalm_Makefile,v 1.1 2001/10/03 03:09:31 brad Exp $
--- pnm/pnmtopalm/Makefile.orig Tue Jul 31 21:53:09 2001
+++ pnm/pnmtopalm/Makefile Tue Jul 31 21:53:40 2001
@@ -47,7 +47,7 @@ install.bin: install.bin.common
$(SRCDIR)/mkinstalldirs $(INSTALLDATA)
$OpenBSD: patch-pnm_pnmtopalm_Makefile,v 1.2 2002/03/01 22:49:20 brad Exp $
--- pnm/pnmtopalm/Makefile.orig Sun Jan 27 15:41:12 2002
+++ pnm/pnmtopalm/Makefile Fri Mar 1 16:09:58 2002
@@ -45,7 +45,7 @@ install.bin: install.bin.common
$(SRCDIR)/buildtools/mkinstalldirs $(INSTALLDATA)
for x in palmcolor8.map palmgray1.map palmgray2.map palmgray4.map ;\
do \
- $(INSTALL) -c -m $(INSTALL_PERM_DATA) $(SRCSUBDIR)/$$x \

13
graphics/netpbm/patches/patch-ppm_Makefile
View File

@ -1,6 +1,6 @@
--- ppm/Makefile.orig Mon Sep 10 22:44:44 2001
+++ ppm/Makefile Mon Sep 10 22:45:28 2001
@@ -67,6 +67,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MER
--- ppm/Makefile.orig Sun Jan 6 17:04:08 2002
+++ ppm/Makefile Fri Mar 1 16:08:43 2002
@@ -74,6 +74,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MER
LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
libppmfloyd.o bitio.o
@ -8,15 +8,16 @@
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libppm
@@ -74,14 +75,14 @@ MANUALS5 = ppm
@@ -81,7 +82,7 @@ MANUALS5 = ppm
MERGENAME= ppmmerge
-INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h
+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
.PHONY: all
all: $(LIBPPM) $(BINARIES) $(EXTRA_STATICLIB)
ppmsvgalib: %: %.o $(NETPBMLIBS) $(LIBOPT)
$(LD) $(LDFLAGS) -o $@ $< `$(LIBOPT) $(NETPBMLIBS)` $(LINUXSVGALD) \
@@ -92,7 +93,7 @@ all: $(LIBPPM) $(BINARIES) $(EXTRA_STATI
$(MAKE) -C ppmtompeg all
$(MAKE) -C hpcdtoppm all
.PHONY: merge

25
graphics/netpbm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2001/10/03 03:09:31 brad Exp $
@comment $OpenBSD: PLIST,v 1.4 2002/03/01 22:49:20 brad Exp $
bin/411toppm
bin/anytopnm
bin/asciitopgm
@ -11,7 +11,6 @@ bin/eyuvtoppm
bin/fitstopnm
bin/fstopgm
bin/g3topbm
bin/gemtopbm
bin/gemtopnm
bin/giftopnm
bin/gouldtoppm
@ -32,8 +31,11 @@ bin/neotoppm
bin/palmtopnm
bin/pamchannel
bin/pamcut
bin/pamdeinterlace
bin/pamfile
bin/pamoil
bin/pamstretch
bin/pamstretch-gen
bin/pamtopnm
bin/pbmclean
bin/pbmlife
@ -102,6 +104,7 @@ bin/pngtopnm
bin/pnmalias
bin/pnmarith
bin/pnmcat
bin/pnmcolormap
bin/pnmcomp
bin/pnmconvol
bin/pnmcrop
@ -114,17 +117,16 @@ bin/pnmgamma
bin/pnmhisteq
bin/pnmhistmap
bin/pnmindex
bin/pnminterp
bin/pnminterp-gen
bin/pnminvert
bin/pnmmargin
bin/pnmmerge
bin/pnmmontage
bin/pnmnlfilt
bin/pnmnoraw
bin/pnmpad
bin/pnmpaste
bin/pnmpsnr
bin/pnmquant
bin/pnmremap
bin/pnmrotate
bin/pnmscale
bin/pnmscalefixed
@ -151,6 +153,7 @@ bin/ppmbrighten
bin/ppmchange
bin/ppmcie
bin/ppmcolormask
bin/ppmcolors
bin/ppmdim
bin/ppmdist
bin/ppmdither
@ -229,6 +232,8 @@ bin/ybmtopbm
bin/yuvsplittoppm
bin/yuvtoppm
bin/zeisstopnm
include/pam.h
include/pammap.h
include/pbm.h
include/pgm.h
include/pm.h
@ -256,7 +261,6 @@ man/man1/eyuvtoppm.1
man/man1/fitstopnm.1
man/man1/fstopgm.1
man/man1/g3topbm.1
man/man1/gemtopnm.1
man/man1/giftopnm.1
man/man1/gouldtoppm.1
man/man1/hipstopgm.1
@ -277,8 +281,11 @@ man/man1/netpbm.1
man/man1/palmtopnm.1
man/man1/pamchannel.1
man/man1/pamcut.1
man/man1/pamdeinterlace.1
man/man1/pamfile.1
man/man1/pamoil.1
man/man1/pamstretch-gen.1
man/man1/pamstretch.1
man/man1/pamtopnm.1
man/man1/pbmclean.1
man/man1/pbmlife.1
@ -345,6 +352,7 @@ man/man1/pngtopnm.1
man/man1/pnmalias.1
man/man1/pnmarith.1
man/man1/pnmcat.1
man/man1/pnmcolormap.1
man/man1/pnmcomp.1
man/man1/pnmconvol.1
man/man1/pnmcrop.1
@ -357,8 +365,6 @@ man/man1/pnmgamma.1
man/man1/pnmhisteq.1
man/man1/pnmhistmap.1
man/man1/pnmindex.1
man/man1/pnminterp-gen.1
man/man1/pnminterp.1
man/man1/pnminvert.1
man/man1/pnmmargin.1
man/man1/pnmmontage.1
@ -366,6 +372,8 @@ man/man1/pnmnlfilt.1
man/man1/pnmpad.1
man/man1/pnmpaste.1
man/man1/pnmpsnr.1
man/man1/pnmquant.1
man/man1/pnmremap.1
man/man1/pnmrotate.1
man/man1/pnmscale.1
man/man1/pnmscalefixed.1
@ -392,6 +400,7 @@ man/man1/ppmbrighten.1
man/man1/ppmchange.1
man/man1/ppmcie.1
man/man1/ppmcolormask.1
man/man1/ppmcolors.1
man/man1/ppmdim.1
man/man1/ppmdist.1
man/man1/ppmdither.1