[csw-devel] SF.net SVN: gar:[14811] csw/mgar/pkg/netpbm/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jun 14 14:37:13 CEST 2011
Revision: 14811
http://gar.svn.sourceforge.net/gar/?rev=14811&view=rev
Author: dmichelsen
Date: 2011-06-14 12:37:13 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
netpbm: Update to 10.35.80, complete rework
Modified Paths:
--------------
csw/mgar/pkg/netpbm/trunk/Makefile
csw/mgar/pkg/netpbm/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch
csw/mgar/pkg/netpbm/trunk/files/0002-Remove-unused-external-references-causing-link-error.patch
csw/mgar/pkg/netpbm/trunk/files/0003-Remove-extra-conversion-in-function-call-causing-err.patch
csw/mgar/pkg/netpbm/trunk/files/0004-Move-opt-csw-include-to-the-end.patch
csw/mgar/pkg/netpbm/trunk/files/Makefile.config
Removed Paths:
-------------
csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.gspec
csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.postinstall
csw/mgar/pkg/netpbm/trunk/files/cflags-fix.diff
csw/mgar/pkg/netpbm/trunk/files/config_template
csw/mgar/pkg/netpbm/trunk/files/csw-perl.diff
csw/mgar/pkg/netpbm/trunk/files/depend
csw/mgar/pkg/netpbm/trunk/files/gar-base.diff
csw/mgar/pkg/netpbm/trunk/files/make-netpbm-config.sh
csw/mgar/pkg/netpbm/trunk/files/manweb.diff
csw/mgar/pkg/netpbm/trunk/files/netpbm-config.diff
csw/mgar/pkg/netpbm/trunk/files/netpbm-doc.diff
csw/mgar/pkg/netpbm/trunk/files/netpbm-fix.diff
csw/mgar/pkg/netpbm/trunk/files/netpbm-makefile.diff
csw/mgar/pkg/netpbm/trunk/files/netpbm-pm_config.h.diff
Property Changed:
----------------
csw/mgar/pkg/netpbm/trunk/
Property changes on: csw/mgar/pkg/netpbm/trunk
___________________________________________________________________
Modified: svn:externals
- gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1
+ gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2
Modified: csw/mgar/pkg/netpbm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netpbm/trunk/Makefile 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/Makefile 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,5 +1,5 @@
NAME = netpbm
-VERSION = 10.26.43
+VERSION = 10.35.80
CATEGORIES = utils
DESCRIPTION = Netpbm is a toolkit for manipulation of graphic images
@@ -9,61 +9,69 @@
endef
MASTER_SITES += $(SF_MIRRORS)
-DISTFILES = $(NAME)-$(VERSION).tgz netpbm-doc.tgz
-DISTFILES += CSWnetpbm.gspec CSWnetpbm.postinstall
+DISTFILES += $(DISTNAME).tgz
+DISTFILES += Makefile.config
-PATCHFILES = netpbm-config.diff netpbm-makefile.diff csw-perl.diff makeman.diff manweb.diff cflags-fix.diff netpbm-pm_config.h.diff
+EXPANDVARS += Makefile.config
-INSTDIR = $(DESTDIR)/opt/csw
+PATCHFILES += 0001-Reorder-includes-so-that-local-includes-come-before-.patch
+PATCHFILES += 0002-Remove-unused-external-references-causing-link-error.patch
+PATCHFILES += 0003-Remove-extra-conversion-in-function-call-causing-err.patch
+PATCHFILES += 0004-Move-opt-csw-include-to-the-end.patch
-CONFIGURE_SCRIPTS =
-INSTALL_ARGS = package pkgdir=$(INSTDIR)
-ENABLE_TEST = 0
+VENDOR_URL = http://netpbm.sourceforge.net/
-# Remove the following rules and uncomment the
-# include before building.
-all: .DEFAULT
-.DEFAULT:
- @true
+LICENSE = doc/GPL_LICENSE.txt
-NETPBMDOCDIR = $(WORKDIR)/doc
+PACKAGES += CSWnetpbm
+SPKG_DESC_CSWnetpbm = A toolkit for manipulation of graphic images
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWjpeg
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWtiff
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWpng
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWiconv
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWzlib
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibnetpbm10
-pre-install:
- rm -rf $(INSTDIR)
+PACKAGES += CSWlibnetpbm10
+SPKG_DESC_CSWlibnetpbm10 = Library for manipulation of graphic images, libnetpbm.so.10
+PKGFILES_CSWlibnetpbm10 = $(call pkgfiles_lib,libnetpbm.so.10)
-post-install: netpbm-config fix-install install-doc
-#.PHONY: post-install
+PACKAGES += CSWlibnetpbm-dev
+SPKG_DESC_CSWlibnetpbm-dev = Development files for libnetpbm.so.10
+PKGFILES_CSWlibnetpbm-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibnetpbm-dev += CSWlibnetpbm10
-netpbm-config:
- cd files && ./make-netpbm-config.sh $(INSTDIR)
+CONFIGURE_SCRIPTS = custom
-fix-install:
- -mkdir -p $(INSTDIR)/share/netpbm
- -mv $(INSTDIR)/misc/* $(INSTDIR)/share/netpbm
- -rmdir $(INSTDIR)/misc
- -rm $(INSTDIR)/pkginfo
- -rm $(INSTDIR)/VERSION
- -rm $(INSTDIR)/README
- -mv $(INSTDIR)/man $(INSTDIR)/share
- -rm -rf $(INSTDIR)/link
- -cd $(INSTDIR)/lib; ln -s libnetpbm.so.10 libnetpbm.so
+EXTRA_CFLAGS += -D__inline=
-install-doc:
- -mkdir -p $(INSTDIR)/etc
- @echo "#Configuration file for Manweb" > $(INSTDIR)/etc/manweb.conf.CSW
- @echo "webdir=/opt/csw/share/man/web" >> $(INSTDIR)/etc/manweb.conf.CSW
- @echo "#browser=lynx\n" >> $(INSTDIR)/etc/manweb.conf.CSW
- -mkdir -p $(INSTDIR)/share/doc/netpbm
- cp -r $(NETPBMDOCDIR)/* $(INSTDIR)/share/doc/netpbm
-# cd $(NETPBMDOCDIR) && make WORKSRC=$(WORKSRC) DESTDIR=$(INSTDIR) -f /export/home/damjan/csw/utils/netpbm/$(WORKSRC)/buildtools/Makefile.manpage manpages
-# cd $(NETPBMDOCDIR) && make WORKSRC=$(WORKSRC) DESTDIR=$(INSTDIR) -f /export/home/damjan/csw/utils/netpbm/$(WORKSRC)/buildtools/Makefile.manpage installman
- cd $(INSTDIR)/share/doc/netpbm && /export/home/damjan/csw/utils/netpbm/$(WORKSRC)/buildtools/makecat *.html
- cd $(INSTDIR)/share/doc/netpbm && perl -pi.bak -e 's/\/export\/home\/damjan\/tmp\/build.5.8-i386//' *.1
- cd $(INSTDIR)/share/doc/netpbm && rm *.bak
- cd $(INSTDIR)/share/doc/netpbm && (mv libnetpbm.1 libnetpbm.3 && mv pam.1 pam.5 && mv pbm.1 pbm.5 && mv pfm.1 pfm.5 && mv pgm.1 pgm.5 && mv pnm.1 pnm.5 && mv ppm.1 ppm.5)
- mkdir -p $(INSTDIR)/share/man/cat1 $(INSTDIR)/share/man/cat3 $(INSTDIR)/share/man/cat5
- cd $(INSTDIR)/share/doc/netpbm && (mv *.1 $(INSTDIR)/share/man/cat1 && mv *.3 $(INSTDIR)/share/man/cat3 && mv *.5 $(INSTDIR)/share/man/cat5)
- rm -rf $(INSTDIR)/share/man/man?
+INSTALL_OVERRIDE_VARS += PKGMANDIR
+INSTALL_ARGS = package pkgdir=$(DESTDIR)$(prefix)
+INSTALL_OVERRIDE_VAR_PKGMANDIR = share/man
+# Package has no testsuite
+TEST_SCRIPTS =
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/README
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/pkginfo
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/VERSION
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/config_template
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/man/.*
+EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/link/.*
+
+EXTRA_PAX_ARGS = -s ",$(prefix)/misc,$(sharedstatedir)/netpbm,"
+
include gar/category.mk
+
+configure-custom:
+ cp $(WORKDIR)/Makefile.config $(WORKSRC)
+ perl -pi \
+ -e 's,(#define\s+RGB_DB1\s+).*,$$1"/opt/csw/share/netpbm/rgb.txt",;' \
+ -e 's,(#define\s+RGB_DB2\s+).*,$$1"/usr/openwin/lib/X11/rgb.txt",;' \
+ -e 's,(#define\s+RGB_DB3\s+).*,$$1"/usr/openwin/lib/rgb.txt",;' \
+ $(WORKSRC)/pm_config.in.h
+ @$(MAKECOOKIE)
+
+pre-install-modulated:
+ mkdir -p $(DESTDIR)/opt
Modified: csw/mgar/pkg/netpbm/trunk/checksums
===================================================================
--- csw/mgar/pkg/netpbm/trunk/checksums 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/checksums 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,11 +1 @@
-3897ec14dbf586bb1d810a7ff9993968 download/netpbm-10.26.43.tgz
-814afbc81ec0f7499d975c3a75c08619 download/netpbm-doc.tgz
-17c27e7115c2a68ef793f6583757d213 download/CSWnetpbm.gspec
-7f03cc710fa49ccef7a2e40d61514ded download/CSWnetpbm.postinstall
-5285bcded129e88eaf30470016664996 download/netpbm-config.diff
-0b0ee5d2f4a13e601bbfbe69e9cfa0d7 download/netpbm-makefile.diff
-4c4d82da0397562e1a35dee4e62d6a86 download/csw-perl.diff
-78cddb21b97c40126428661d2975f49a download/makeman.diff
-72c259516a85d817dee99335ba7df169 download/manweb.diff
-cf0f2f24662a948a7ebf2439eccb7fab download/cflags-fix.diff
-0778496d108623817392daca6e240052 download/netpbm-pm_config.h.diff
+2edf98b802a82e5367fc52382e9ac144 netpbm-10.35.80.tgz
Added: csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch 2011-06-14 12:37:13 UTC (rev 14811)
@@ -0,0 +1,25 @@
+From aecad6315ae396625724f7253308b25b4be888c6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 24 May 2011 12:27:37 +0200
+Subject: [PATCH 1/3] Reorder includes so that local includes come before /opt/csw/include
+
+---
+ Makefile.common | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index 2946589..33bfb8a 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -68,7 +68,7 @@
+
+ include $(SRCDIR)/Makefile.version
+
+-INCLUDES2 := $(INCLUDES) -I$(SRCDIR)/$(SUBDIR) -I. -I importinc
++INCLUDES2 := -I$(SRCDIR)/$(SUBDIR) -I. $(INCLUDES) -I importinc
+
+ ifeq ($(NETPBMLIBTYPE),unixstatic)
+ NETPBMLIBFNAME = libnetpbm.$(STATICLIBSUFFIX)
+--
+1.7.3.2
+
Added: csw/mgar/pkg/netpbm/trunk/files/0002-Remove-unused-external-references-causing-link-error.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0002-Remove-unused-external-references-causing-link-error.patch (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0002-Remove-unused-external-references-causing-link-error.patch 2011-06-14 12:37:13 UTC (rev 14811)
@@ -0,0 +1,39 @@
+From 80e9de931b2dd00d1513c9d76cac3f93de7d16ff Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 24 May 2011 12:28:06 +0200
+Subject: [PATCH 2/3] Remove unused external references causing link errors
+
+---
+ other/pamx/image.h | 16 ----------------
+ 1 files changed, 0 insertions(+), 16 deletions(-)
+
+diff --git a/other/pamx/image.h b/other/pamx/image.h
+index ea597b2..64f8911 100644
+--- a/other/pamx/image.h
++++ b/other/pamx/image.h
+@@ -65,22 +65,6 @@ freeImage(Image * const imageP);
+ unsigned int
+ depthToColors(unsigned int const depth);
+
+-extern unsigned short RedIntensity[];
+-extern unsigned short GreenIntensity[];
+-extern unsigned short BlueIntensity[];
+-
+-static __inline__ unsigned int
+-colorIntensity(unsigned int const red,
+- unsigned int const grn,
+- unsigned int const blu) {
+-/*----------------------------------------------------------------------------
+- Return the (approximate) intensity of a color.
+------------------------------------------------------------------------------*/
+- return (RedIntensity[red / 256] +
+- GreenIntensity[grn / 256] +
+- BlueIntensity[blu / 256]);
+-}
+-
+ Image *
+ pbmLoad(const char * const fullname,
+ const char * const name,
+--
+1.7.3.2
+
Added: csw/mgar/pkg/netpbm/trunk/files/0003-Remove-extra-conversion-in-function-call-causing-err.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0003-Remove-extra-conversion-in-function-call-causing-err.patch (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0003-Remove-extra-conversion-in-function-call-causing-err.patch 2011-06-14 12:37:13 UTC (rev 14811)
@@ -0,0 +1,49 @@
+From 81091b26250f51d48024f1d7d6627fb1906c41f9 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 24 May 2011 12:29:49 +0200
+Subject: [PATCH 3/3] Remove extra conversion in function call causing errors
+
+---
+ converter/ppm/ppmtompeg/parallel.c | 4 ++--
+ converter/ppm/ppmtompeg/psocket.c | 3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/converter/ppm/ppmtompeg/parallel.c b/converter/ppm/ppmtompeg/parallel.c
+index 021e6d2..66ab2bf 100644
+--- a/converter/ppm/ppmtompeg/parallel.c
++++ b/converter/ppm/ppmtompeg/parallel.c
+@@ -145,7 +145,7 @@ int ClientPid[MAX_MACHINES+4];
+ *=====================*/
+
+
+-static void PM_GNU_PRINTF_ATTR(1,2)
++static void
+ machineDebug(const char format[], ...) {
+
+ va_list args;
+@@ -164,7 +164,7 @@ machineDebug(const char format[], ...) {
+
+
+
+-static void PM_GNU_PRINTF_ATTR(1,2)
++static void
+ errorExit(const char format[], ...) {
+
+ const char * const hostname = GetHostName();
+diff --git a/converter/ppm/ppmtompeg/psocket.c b/converter/ppm/ppmtompeg/psocket.c
+index 707f1d8..fd4c6d6 100644
+--- a/converter/ppm/ppmtompeg/psocket.c
++++ b/converter/ppm/ppmtompeg/psocket.c
+@@ -9,6 +9,9 @@
+
+ ============================================================================*/
+
++#define PM_GNU_PRINTF_ATTR(a,b)
++
++
+ #define _XOPEN_SOURCE 500 /* Make sure stdio.h contains pclose() */
+ /* _ALL_SOURCE is needed on AIX to make the C library include the
+ socket services (e.g. define struct sockaddr)
+--
+1.7.3.2
+
Added: csw/mgar/pkg/netpbm/trunk/files/0004-Move-opt-csw-include-to-the-end.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0004-Move-opt-csw-include-to-the-end.patch (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0004-Move-opt-csw-include-to-the-end.patch 2011-06-14 12:37:13 UTC (rev 14811)
@@ -0,0 +1,39 @@
+From 094b2208dec73eac12014b3dcf8a03f07e94ab7e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 24 May 2011 15:48:02 +0200
+Subject: [PATCH] Move /opt/csw/include to the end
+
+---
+ Makefile.common | 2 +-
+ converter/ppm/ppmtompeg/Makefile | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index 2ff30fd..43e7687 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -68,7 +68,7 @@
+
+ include $(SRCDIR)/Makefile.version
+
+-INCLUDES2 := -I$(SRCDIR)/$(SUBDIR) -I. $(INCLUDES) -I importinc
++INCLUDES2 := -I$(SRCDIR)/$(SUBDIR) -I. $(INCLUDES) -I importinc $(INCLUDES1)
+
+ ifeq ($(NETPBMLIBTYPE),unixstatic)
+ NETPBMLIBFNAME = libnetpbm.$(STATICLIBSUFFIX)
+diff --git a/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile
+index 4e0ad8d..0a11e8a 100644
+--- a/converter/ppm/ppmtompeg/Makefile
++++ b/converter/ppm/ppmtompeg/Makefile
+@@ -22,7 +22,7 @@ INCLUDES = -I$(SRCDIR)/$(SUBDIR)/headers
+
+ ifneq ($(JPEGHDR_DIR),NONE)
+ ifneq ($(JPEGHDR_DIR)x,x)
+- INCLUDES += -I$(JPEGHDR_DIR)
++ INCLUDES1 += -I$(JPEGHDR_DIR)
+ endif
+ endif
+
+--
+1.7.3.2
+
Deleted: csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.gspec
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.gspec 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.gspec 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,6 +0,0 @@
-%var bitname netpbm
-%var pkgname CSWnetpbm
-%copyright url file://%{WORKSRC}/doc/GPL_LICENSE.txt
-%depend url file://%{GARDIR}/utils/netpbm/files/depend
-%include url file://%{GARDIR}/pkglib/csw_standard.gspec
-
Deleted: csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.postinstall
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.postinstall 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/CSWnetpbm.postinstall 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ "$PKG_ROOT_DIR" = "" ] ; then PKG_ROOT_DIR=/ ; fi
-
-ETCDIR=$PKG_ROOT_DIR/opt/csw/etc
-
-# check if the manweb.conf file exists before overwriting it.
-if [ ! -f $ETCDIR/manweb.conf ] ; then
- cp -p $ETCDIR/manweb.conf.CSW $ETCDIR/manweb.conf
- echo "manweb.conf doesn't exists. Copying manweb.conf.CSW to manweb.conf"
-else
- echo "manweb.conf already exists. Not copying manweb.conf.CSW"
-fi
-
-exit 0
Added: csw/mgar/pkg/netpbm/trunk/files/Makefile.config
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/Makefile.config (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/Makefile.config 2011-06-14 12:37:13 UTC (rev 14811)
@@ -0,0 +1,659 @@
+####This file was automatically created by 'configure.'
+####Many variables are set twice -- a generic setting, then
+####a system-specific override at the bottom of the file.
+####
+# This is a make file inclusion, to be included in all the Netpbm make
+# files.
+
+# This file is meant to contain variable settings that customize the
+# build for a particular target system configuration.
+
+# The distribution contains the file Makefile.config.in. You edit
+# Makefile.config.in in ways relevant to your particular environment
+# to create Makefile.config. The "configure" program will do this
+# for you in simple cases.
+
+# Some of the variables that the including make file must set for this
+# file to work:
+#
+# SRCDIR: The directory at the top of the Netpbm source tree. Note that
+# this is typically a relative directory, and it must be relative to the
+# make file that includes this file.
+
+DEFAULT_TARGET = nonmerge
+#DEFAULT_TARGET = merge
+
+# Fiasco has some special requirements that make it fail to compile on
+# some systems, and since it isn't very important, just set this to "N"
+# and skip it on those systems unless you want to debug it and fix it.
+# OpenBSD:
+#BUILD_FIASCO = N
+BUILD_FIASCO = Y
+
+# The following are commands for the build process to use. These values
+# do not get built into anything.
+
+# The C compiler (including macro preprocessor)
+#CC = gcc
+# Note that 'cc' is usually an alias for whatever is the main compiler
+# on a system, e.g. the GNU Compiler on Linux.
+CC = cc
+
+# The linker.
+LD = $(CC)
+#LD = ld
+#Tru64:
+#LD = cc
+#LD = gcc
+
+#If the linker identified above is a compiler that invokes a linker
+#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is
+#that we expect a compiler to take linker options in the '-Wl,-opt1,val1'
+#syntax whereas the actual linker would take '-opt1 val1'.
+LINKERISCOMPILER=Y
+#If $(LD) is 'ld':
+#LINKERISCOMPILER=N
+
+#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can
+#take a library as just another link object argument, as in 'ld
+#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a
+#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'.
+#This variable controls how 'libopt' gets built. Note that with some
+#linkers, you can specify a shared library explicitly, but then it has
+#to live in that exact place at run time. That's not good enough for us.
+
+LINKER_CAN_DO_EXPLICIT_LIBRARY=N
+#GNU:
+#LINKER_CAN_DO_EXPLICIT_LIBRARY=Y
+
+# This is the name of the header file that declares the types
+# uint32_t, etc. This name is used as #include $(INTTYPES_H) .
+# Set to null if the types come automatically without including anything.
+
+# We have a report (2005.09.17) that on IRIX 5.3 with the native IDO
+# cc, inttypes.h and sys/types.h conflict (and Netpbm programs include
+# sys/types for other things), so for that environment, <inttypes.h>
+# won't work, but "inttypes_netpbm.h" might.
+
+INTTYPES_H = <inttypes.h>
+# Linux libc5:
+#INTTYPES_H = <types.h>
+# Solaris:
+# Solaris has <sys/inttypes.h>, but it doesn't define int_fast2_t, etc.
+#INTTYPES_H = "inttypes_netpbm.h"
+# Others:
+#INTTYPES_H = <sys/stdint.h>
+#INTTYPES_H = <sys/types.h>
+# The automatically generated Netpbm version:
+#INTTYPES_H = "inttypes_netpbm.h"
+
+# HAVE_INT64 tells whether, assuming you include the header indicated by
+# INTTYPES_H, you have the int64_t type and related stuff. (If you don't
+# the build will omit certain code that does 64 bit computations).
+HAVE_INT64 = Y
+#HAVE_INT64 = N
+
+# CC and LD are for building the Netpbm programs, which are not necessarily
+# intended to run on the same system on which Make is running. But when we
+# build a build tool such as Libopt, it is meant to run only on the same
+# system on which the Make is running. The variables below define programs
+# to use to compile and link build tools.
+CC_FOR_BUILD = $(CC)
+LD_FOR_BUILD = $(LD)
+CFLAGS_FOR_BUILD = $(CFLAGS)
+
+# MAKE is set automatically by Make to what was used to invoke Make.
+
+INSTALL = $(SRCDIR)/buildtools/install.sh
+#Solaris:
+#INSTALL = /usr/ucb/install
+#Tru64:
+#INSTALL = installbsd
+#OSF1:
+#INSTALL = $(SRCDIR)/buildtools/installosf
+#Red Hat Linux:
+#INSTALL = install
+
+# STRIPFLAG is the option you pass to the above install program to make it
+# strip unnecessary information out of binaries.
+STRIPFLAG = -s
+# If you don't want to strip the binaries, just leave it null:
+#STRIPFLAG =
+
+SYMLINK = ln -s
+# At least some Windows environments don't have any concept of symbolic
+# links, but direct copies are usually a passable alternative.
+#SYMLINK = cp
+
+#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the
+#pointer man pages are installed (ready to nroff, or ready to cat).
+#A pointer man pages is just a single-paragraph pages that tells you there is
+#no man page for the program, to look at the HTML documentation instead.
+MANPAGE_FORMAT = nroff
+#MANPAGE_FORMAT = cat
+
+AR = ar
+RANLIB = ranlib
+# IRIX, SCO don't have Ranlib:
+#RANLIB = true
+
+# LEX is the beginning of a shell command that runs a Lex-like
+# pattern matcher generator. Null string means there isn't any such
+# command. That means the build will skip parts that need one.
+
+LEX = flex
+# Solaris:
+# LEX = flex -e
+# Windows Mingw:
+# LEX =
+#
+# LEX = lex
+
+# C compiler options
+
+# gcc:
+# -ansi and -Werror should work too, but are not included
+# by default because there's no point in daring the build to fail.
+# -pedantic isn't a problem because it causes at worst a warning.
+#CFLAGS = -O3 -ffast-math -pedantic -fno-common \
+# -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit \
+# -Wwrite-string -Wmissing-prototypes -Wundef
+# The merged programs have a main_XXX subroutine instead of main(),
+# which would cause a warning with -Wmissing-declarations or
+# -Wmissing-prototypes.
+#CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes
+# A user of DEC Tru64 4.0F in May 2000 needed -DLONG_32 for ppmtompeg,
+# but word size-sensitive code was removed from parallel.c in September 2004.
+# A user of Tru64 5.1A in July 2003 needed NOT to have -DLONG_32. In
+# theory, you need this if on your system, long is 32 bits and int is not.
+# But it may be completely irrelevant today.
+#Tru64:
+#CFLAGS = -O2 -std1 -DLONG_32
+#CFLAGS = -O2 -std1
+#AIX:
+#CFLAGS= -O3
+#HP-UX:
+#CFLAGS= -O3 -fPIC
+#IRIX:
+#CFLAGS= -n32 -O3
+#Amiga with GNU compiler:
+#CFLAGS= -m68020-60 -ffast-math -mstackextend
+# You can add -noixemul for Amiga and successfully compile most of the
+# programs. (Of the remaining ones, if you can supply your own strtod()
+# function, most of them will build with -noixemul). So try building
+# with 'make --keep-going CADD=-noixemul' first, then just 'make' to build
+# everything that failed for lack of the ixemul library in the first step.
+# That way, the parts that don't required the ixemul library won't indicate
+# a dependency on it.
+#OpenBSD:
+#CFLAGS = -I/usr/local/include
+
+# EXE is a suffix that the linker puts on any executable it generates.
+# In cygwin, this is .exe and most programs deal with its existence without
+# us having to know about it. Some don't though, so set this:
+
+EXE =
+#Cygwin, DJGPP/Windows:
+#EXE = .exe
+
+# linker options.
+
+# LDFLAGS is often set as an environment variable; A setting here overrides
+# it. So either make sure you want to override it, or do a "LDFLAGS +=" here.
+
+# LDFLAGS is usually not the right place for a -L option, because we put
+# LDFLAGS _before_ our own -L options, so it would cancel out our
+# specific selection of libraries. For example, if you say
+# LDFLAGS=/usr/local/lib and an old copy of the libnetpbm is in
+# /usr/local/lib, then you'd be linking against that old copy instead of
+# the copy you just built, which is located by a -L option later on the
+# link command. LIBS is the right variable for adding -L options. LIBS
+# goes after any of our make files' own -L options.
+
+# Eunice users may want to use -noshare so that the executables can
+# run standalone:
+#LDFLAGS += -noshare
+#Tru64:
+# Russ Allberry says on 2001.06.09 that -oldstyle_liblookup may be necessary
+# to keep from finding an ancient system libjpeg.so that isn't compatible with
+# NetPBM. Michael Long found that /usr/local/lib is not in the default
+# search path, or not soon enough, and he was getting an old libjpeg that
+# caused all the jpeg symbol references to be unresolved. He had installed
+# a new libjpeg in /usr/local/lib.
+#LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib
+#AIX:
+#LDFLAGS += -L /usr/pubsw/lib
+#HP-UX:
+#LDFLAGS += -Wl,+b,/usr/pubsw/lib
+#IRIX:
+#LDFLAGS += -n32
+
+# Linker options for created Netpbm shared libraries.
+
+# Here, $(SONAME) resolves to the soname for the shared library being created.
+# The following are gcc options. This works on GNU libc systems.
+LDSHLIB = -shared -Wl,-soname,$(SONAME)
+# 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.
+# BeOS doesn't have sonames built in.
+#LDSHLIB = -nostart
+#LDSHLIB = -G
+# Solaris, SunOS with GNU Ld, SCO:
+# These systems have no soname option.
+#LDSHLIB = -shared
+# Solaris with Sun Ld:
+#LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME)
+#Tru64:
+#LDSHLIB = -shared -expect_unresolved "*"
+#IRIX:
+#LDSHLIB = -shared -n32
+#AIX GNU compiler/linker:
+#LDSHLIB = -shared
+#AIX Visual Age C:
+#LDSHLIB = -qmkshrobj
+
+# LDRELOC is the command to combine two .o files (relocateable object files)
+# into a single .o file that can later be linked into something else. NONE
+# means no such command is available.
+
+LDRELOC = NONE
+# GNU Ld:
+# Older GNU Ld misspells the option as --relocateable. Newer GNU Ld
+# correctly spells it --relocatable. The abbreviation --reloc works on
+# both.
+#LDRELOC = ld --reloc
+#LDRELOC = ld -r
+
+
+# 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
+# -fpic works, use it. If it bombs, go to fPIC). On newer systems,
+# it isn't necessary, but can save real memory at the expense of
+# execution speed. Without position independent code, the library
+# loader may have to patch addresses into the executable text. On an
+# older system, this would cause a program crash because the loader
+# would be writing into read-only shared memory. But on newer
+# systems, the system silently creates a private mapping of the page
+# or segment being modified (the "copy on write" phenomenon). So it
+# needs its own private real page frame. In one experiment, A second
+# copy of Pbmtext used 16K less real memory when built with -fpic than
+# when built without. 2001.06.02.
+
+# We have seen -fPIC required on IA64 and AMD64 machines (GNU
+# compiler/linker). Build-time linking fails without it. I don't
+# know why -- history seems to be repeating itself. 2005.02.23.
+
+CFLAGS_SHLIB =
+# Gcc:
+#CFLAGS_SHLIB = -fpic
+#CFLAGS_SHLIB = -fPIC
+# Sun compiler:
+#CFLAGS_SHLIB = -Kpic
+#CFLAGS_SHLIB = -KPIC
+
+# 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
+# in the shared library and thus choose the correct library among several or
+# avoid using an incompatible one. But on some systems, the link fails.
+# On 2002.09.30, "John H. DuBois III" <spcecdt at armory.com> reports that on
+# SCO OpenServer, he gets the following error message with -lc:
+#
+# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o);
+# fatal error: relocations remain against allocatable but non-writable
+# section: ; .text
+
+SHLIB_CLIB = -lc
+# SCO:
+SHLIB_CLIB =
+
+# On some systems you have to build into an executable the list of
+# directories where its dynamically linked libraries can be found at
+# run time. This is typically done with a -R or -rpath linker
+# option. Even on systems that don't require it, you might prefer to do
+# that rather than set up environment variables or configuration files
+# to tell the system where the libraries are. A "Y" here means to put
+# the directory information in the executable at link time.
+
+NEED_RUNTIME_PATH = N
+# Solaris, SunOS, NetBSD, AIX:
+#NEED_RUNTIME_PATH = Y
+
+# RPATHOPTNAME is the option you use on the link command to specify
+# a runtime search path for a shared library. It is meaningless unless
+# NEED_RUNTIME_PATH is Y.
+RPATHOPTNAME = -rpath
+
+# The following variables tell where your various libraries on which
+# Netpbm depends live. The LIBxxx variable is a full file
+# specification of the link library (not necessarily the library used
+# at run time). e.g. "/usr/local/lib/graphics/libjpeg.so". It usually
+# doesn't matter if the library prefix and suffix are right -- you can
+# use "lib" and ".so" or ".a" regardless of what your system actually
+# uses because these just turn into "-L" and "-l" linker options
+# anyway. ".a" implies a static library for some purposes, though.
+# If you don't have the library in question, use a value of NONE for
+# LIBxxx and the build will simply skip the programs that require that
+# library. If the library is in your linker's (or the Netpbm build's)
+# default search path, leave off the directory part, e.g. "libjpeg.so".
+
+# The xxxHDR_DIR variable is the directory in which the interface
+# headers for the library live (e.g. /usr/include). If they are in your
+# compiler's default search path, set this variable to null.
+
+# This is where the Netpbm shared libraries will reside when Netpbm is
+# fully installed. In some configurations, the Netpbm builder builds
+# this information into the Netpbm executables. This does NOT affect
+# where the Netpbm installer installs the libraries. A null value
+# means the libraries are in a default search path used by the runtime
+# library loader.
+NETPBMLIB_RUNTIME_PATH =
+#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm
+
+# The TIFF library. See above. If you want to build the tiff
+# converters, you must have the tiff library already installed.
+
+TIFFLIB = NONE
+TIFFHDR_DIR =
+
+#TIFFLIB = libtiff.so
+#TIFFHDR_DIR = /usr/include/libtiff
+#NetBSD:
+#TIFFLIB = $(LOCALBASE)/lib/libtiff.so
+#TIFFHDR_DIR = $(LOCALBASE)/include
+# OSF, Tru64:
+#TIFFLIB = /usr/local1/DEC/lib/libtiff.so
+#TIFFHDR_DIR = /usr/local1/DEC/include
+
+# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any
+# program linked with the TIFF library needs a Jpeg and/or Z library.
+# Some TIFF libraries have such library statically linked in, but others
+# need it to be dynamically linked at program load time.
+# Make this 'N' if youf TIFF library doesn't need such dynamic linking.
+# As of 2005.01, the most usual build of the TIFF library appears to require
+# both.
+TIFFLIB_NEEDS_JPEG = Y
+TIFFLIB_NEEDS_Z = Y
+
+# The JPEG library. See above. If you want to build the jpeg
+# converters you must have the jpeg library already installed.
+
+# Tiff files can use JPEG compression, so the Tiff library can reference
+# the JPEG library. If your Tiff library references a dynamic JPEG
+# library, you must specify at least JPEGLIB here, or the Tiff
+# converters will not build. Note that your Tiff library may have the
+# JPEG stuff statically linked in, in which case you won't need
+# JPEGLIB in order to build the Tiff converters.
+
+JPEGLIB = NONE
+JPEGHDR_DIR =
+#JPEGLIB = libjpeg.so
+#JPEGHDR_DIR = /usr/include/jpeg
+# Netbsd:
+#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so
+#JPEGHDR_DIR = ${LOCALBASE}/include
+# OSF, Tru64:
+#JPEGLIB = /usr/local1/DEC/libjpeg.so
+#JPEGHDR_DIR = /usr/local1/DEC/include
+# Typical:
+#JPEGLIB = /usr/local/lib/libjpeg.so
+#JPEGHDR_DIR = /usr/local/include
+# Don't build JPEG stuff:
+#JPEGLIB = NONE
+
+
+# The PNG library. See above. If you want to build the PNG
+# converters you must have the PNG library already installed.
+
+# The PNG library, by convention starting around April 2002, gets installed
+# with names that include a version number, such as libpng10.a and header
+# files in /usr/include/libpng10. But there is conventionally an unnumbered
+# alias (e.g. libpng.a, /usr/include/libpng) for the preferred version.
+#
+# Recent versions of the library (since some time in the 2002-2006 period)
+# have an associated 'libpng-config' that tells how to link it. The make
+# files will use that program if it exists (must be in the PATH). In that
+# case, PNGLIB and PNGHDR_DIR are irrelevant, but PNGVER is still meaningful,
+# because the make file runs 'libpng$(PNGVER)-config'.
+
+PNGLIB = NONE
+PNGHDR_DIR =
+PNGVER =
+#PNGLIB = libpng$(PNGVER).so
+#PNGHDR_DIR = /usr/include/libpng$(PNGVER)
+# NetBSD:
+#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so
+#PNGHDR_DIR = $(LOCALBASE)/include
+# OSF/Tru64:
+#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
+#PNGHDR_DIR = /usr/local1/DEC/include
+
+# The zlib compression library. See above. You need it to build
+# anything that needs the PNG library (see above). If you selected
+# NONE for the PNG library, it doesn't matter what you specify here --
+# it won't get used.
+#
+# If you have 'libpng-config' (see above), these are irrelevant.
+
+ZLIB = NONE
+ZHDR_DIR =
+#ZLIB = libz.so
+
+# The JBIG lossless image compression library (aka JBIG-KIT):
+
+JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
+JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
+
+# The Jasper JPEG-2000 image compression library (aka JasPer):
+JASPERLIB = $(INTERNAL_JASPERLIB)
+JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
+# 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.
+JASPERDEPLIBS =
+#JASPERDEPLIBS = -ljpeg
+
+# And the Utah Raster Toolkit (aka URT aka RLE) library:
+
+URTLIB = $(BUILDDIR)/urt/librle.a
+URTHDR_DIR = $(SRCDIR)/urt
+
+# The X11 library has facilities for talking to an X Window System
+# server. It is required by Pamx.
+
+X11LIB = NONE
+X11HDR_DIR =
+
+#X11LIB = /usr/lib/libX11.so
+#X11HDR_DIR =
+
+# The Linux SVGA library (Svgalib) is a facility for displaying graphics
+# on the Linux console. It is required by Ppmsvgalib.
+
+LINUXSVGALIB = NONE
+LINUXSVGAHDR_DIR =
+
+#LINUXSVGALIB = /usr/lib/libvga.so
+#LINUXSVGAHDR_DIR = /usr/include/vgalib
+
+# If you don't want any network functions, set OMIT_NETWORK to "y".
+# The only thing that requires network functions is the option in
+# ppmtompeg to run it on multiple computers simultaneously. On some
+# systems network functions don't work or we haven't figured out how to
+# make them work, or they just aren't worth the effort.
+OMIT_NETWORK =
+#DJGPP/Windows, Tru64:
+# (there's some minor header problem that prevents network functions from
+# building on Tru64 2000.10.06)
+#OMIT_NETWORK = y
+
+# These are -l options to link in the network libraries. Often, these are
+# built into the standard C library, so this can be null. This is irrelevant
+# if OMIT_NETWORK is "y".
+
+NETWORKLD =
+# Solaris, SunOS:
+#NETWORKLD = -lsocket -lnsl
+# SCO:
+#NETWORKLD = -lsocket, -lresolv
+
+VMS =
+#VMS:
+#VMS = yes
+
+# DONT_HAVE_PROCESS_MGMT is Y if this system doesn't have the usual
+# Unix process management stuff - fork, wait, etc. N for a regular Unix
+# system.
+DONT_HAVE_PROCESS_MGMT = N
+
+# The following variables are used only by 'make install' (and the
+# variants of it). Paths here don't, for example, get built into any
+# programs.
+
+# This is where everything goes when you do 'make package', unless you
+# override it by setting 'pkgdir' on the Make command line.
+PKGDIR_DEFAULT = /tmp/netpbm
+
+# Subdirectory of the package directory ($(pkgdir)) in which man pages
+# go.
+PKGMANDIR = man
+
+# File permissions for installed files.
+# Note that on some systems (e.g. Solaris), 'install' can't use the
+# mnemonic permissions - you have to use octal.
+
+# binaries (pbmmake, etc)
+INSTALL_PERM_BIN = 755 # u=rwx,go=rx
+# shared libraries (libpbm.so, etc)
+INSTALL_PERM_LIBD = 755 # u=rwx,go=rx
+# static libraries (libpbm.a, etc)
+INSTALL_PERM_LIBS = 644 # u=rw,go=r
+# header files (pbm.h, etc)
+INSTALL_PERM_HDR = 644 # u=rw,go=r
+# man pages (pbmmake.1, etc)
+INSTALL_PERM_MAN = 644 # u=rw,go=r
+# data files (pnmtopalm color maps, etc)
+INSTALL_PERM_DATA = 644 # u=rw,go=r
+
+# Specify the suffix that want the man pages to have.
+
+SUFFIXMANUALS1 = 1
+SUFFIXMANUALS3 = 3
+SUFFIXMANUALS5 = 5
+
+#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the
+#Netpbm library functions. The value is used only in make file tests.
+# "unixshared" means a unix-style shared library, typically named like
+# libxyz.so.2.3
+NETPBMLIBTYPE = unixshared
+# "unixstatic" means a unix-style static library, (like libxyz.a)
+#NETPBMLIBTYPE = unixstatic
+# "dll" means a Windows DLL shared library
+#NETPBMLIBTYPE = dll
+# "dylib" means a Darwin/Mac OS shared library
+#NETPBMLIBTYPE = dylib
+
+#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is
+#selected above. All this is used for is to construct library names.
+#The make files never examine the actual value.
+NETPBMLIBSUFFIX = so
+
+# "a" is the suffix for unix-style static libraries. It is also
+# traditionally used for shared libraries on AIX. The Visual Age C
+# manual says sometimes .so works on AIX, and GNU software for AIX
+# 5.1.0 does indeed use it. In our experiments, it works fine if you
+# name the library file explicitly on the link, but isn't in the -l
+# search order. If you name the library explicitly on the link, the
+# library must live in exactly the same position at run time, so we
+# can't use that. Therefore, you cannot build both static and shared
+# libraries with AIX. You have to choose.
+#NETPBMLIBSUFFIX = a
+# For HP-UX shared libraries:
+#NETPBMLIBSUFFIX = sl
+# Darwin/Mac OS shared library:
+#NETPBMLIBSUFFIX = dylib
+# Windows shared library:
+#NETPBMLIBSUFFIX = dll
+
+#STATICLIB_TOO is "y" to signify that you want a static library built
+#and installed in addition to whatever library type you specified by
+#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library,
+#STATICLIB_TOO simply has no effect.
+STATICLIB_TOO = y
+#STATICLIB_TOO = n
+
+#STATICLIBSUFFIX is the suffix that static libraries have. It's
+#meaningless if you aren't building static libraries.
+STATICLIBSUFFIX = a
+
+#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename
+#of a shared library may have on this system. Traditionally, it's
+#just "lib", as in libc or libnetpbm. On Windows, though, varying
+#prefixes are used when multiple alternative forms of a library are
+#available. The first prefix in this list is what we use to name the
+#Netpbm shared libraries.
+#
+# This variable controls how 'libopt' gets built.
+#
+SHLIBPREFIXLIST = lib
+#Cygwin:
+#SHLIBPREFIXLIST = cyg lib
+
+NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
+
+#DLLVER is used to version the DLLs built on cygwin or other
+#windowsish platforms. We can't add this to LIBROOT, or we'd
+#version the static libs (which is bad). We can't add this
+#at the end of the name (like unix does with so numbers) because
+#windows will only load dlls whose name ends in "dll". So,
+#we have this variable, which becomes the end of the library "root" name
+#for DLLs only.
+#
+# This variable controls how 'libopt' gets built.
+#
+DLLVER =
+#Cygwin
+#DLLVER = $(NETPBM_MAJOR_RELEASE)
+
+#NETPBM_DOCURL is the URL of the main documentation page for Netpbm.
+#This is a directory which contains a file for each Netpbm program,
+#library, and file type. E.g. The documentation for jpegtopnm might be in
+#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets
+#installed in the man pages (which say no more than to read the webpage)
+#and in the Webman netpbm.url file.
+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
+#For a system with no web access, but a local copy of the doc:
+#NETPBM_DOCURL = file:/usr/doc/netpbm/
+
+
+
+
+
+####Lines above were copied from Makefile.config.in by 'configure'.
+####Lines below were added by 'configure' based on the SOLARIS platform.
+DEFAULT_TARGET = nonmerge
+NETPBMLIBTYPE=unixshared
+NETPBMLIBSUFFIX=so
+STATICLIB_TOO=n
+NETPBMLIB_RUNTIME_PATH=/opt/csw/lib
+LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME)
+NEED_RUNTIME_PATH = Y
+CFLAGS = @CFLAGS@
+CFLAGS_SHLIB = -Kpic -L/opt/csw/lib
+RPATHOPTNAME = -R
+NETWORKLD = -lsocket -lnsl
+LINKERISCOMPILER = Y
+TIFFHDR_DIR = importinc -I/opt/csw/include
+TIFFLIB = /opt/csw/lib/libtiff.so
+JPEGHDR_DIR = importinc -I/opt/csw/include
+JPEGLIB = /opt/csw/lib/libjpeg.so
+ZHDR_DIR = importinc -I/opt/csw/include
+ZLIB = /opt/csw/lib/libz.so
+X11HDR_DIR = /usr/openwin/include/X11 -I/opt/csw/X11/include
+X11LIB = /usr/openwin/lib/libX11.so
+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
+INTTYPES_H = "inttypes_netpbm.h"
+HAVE_INT64 = N
+LDFLAGS = -L/opt/csw/lib
+PATH:=/opt/csw/bin:$(PATH)
Deleted: csw/mgar/pkg/netpbm/trunk/files/cflags-fix.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/cflags-fix.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/cflags-fix.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,34 +0,0 @@
-diff --speed-large-files --minimal -Nru netpbm-10.26.20.orig/Makefile.common netpbm-10.26.20/Makefile.common
---- netpbm-10.26.20.orig/Makefile.common 2005-12-10 07:58:27.640868000 -0500
-+++ netpbm-10.26.20/Makefile.common 2005-12-10 07:50:13.881577000 -0500
-@@ -299,7 +299,7 @@
- # produce a merge.o file, but not every directory has anything to contribute
- # to the merge.
- empty.o: %.o: %.c
-- $(CC) -c $(CFLAGS_PERSONAL) $(CADD) $< -o $@
-+ $(CC) -c $(CFLAGS) $(CFLAGS_PERSONAL) $(CADD) $< -o $@
- empty.c:
- cat /dev/null >empty.c
-
-diff --speed-large-files --minimal -Nru netpbm-10.26.20.orig/buildtools/Makefile netpbm-10.26.20/buildtools/Makefile
---- netpbm-10.26.20.orig/buildtools/Makefile 2005-12-10 07:58:33.176455000 -0500
-+++ netpbm-10.26.20/buildtools/Makefile 2005-12-10 05:43:24.005413000 -0500
-@@ -28,15 +28,15 @@
- endif
-
- libopt.o: libopt.c
-- $(CC_FOR_BUILD) -c -DSHLIBPREFIXLIST="\"$(SHLIBPREFIXLIST)\"" \
-+ $(CC_FOR_BUILD) -c $(CFLAGS) -DSHLIBPREFIXLIST="\"$(SHLIBPREFIXLIST)\"" \
- $(STRIP_DLL_VERSION) $(EXPLICIT) $(CFLAGS_PERSONAL) $(CADD) \
- -o $@ $<
-
- typegen.o endiangen.o:%.o:%.c
-- $(CC_FOR_BUILD) -c -o $@ $<
-+ $(CC_FOR_BUILD) -c $(CFLAGS) -D__EXTENSIONS__ -o $@ $<
-
- $(PROGS):%:%.o
-- $(LD_FOR_BUILD) -o $@ $<
-+ $(LD_FOR_BUILD) -o $@ $<
-
- clean: cleanlocal
- .PHONY: cleanlocal
Deleted: csw/mgar/pkg/netpbm/trunk/files/config_template
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/config_template 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/config_template 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,52 +0,0 @@
-@ This is a template to be processed into a Bourne shell program.
-@
-#!/bin/sh
-
-# This program was generated by the Netpbm installer. Its purpose is to
-# allow other programs to find out about how Netpbm is installed on this
-# system. This program is supposed to be invoked via the PATH.
-
-@ The following @xxx@ strings get replaced by Installnetpbm when it turns
-@ this template into an actual Bourne shell program.
-version='@VERSION@'
-datadir='@DATADIR@'
-linkdir='@LINKDIR@'
-includedir='@INCLUDEDIR@'
-bindir='@BINDIR@'
-
-
-if test $# -eq 0; then
- echo >&2 "You need to specify one of these options:"
- echo >&2 " --version"
- echo >&2 " --datadir"
- echo >&2 " --linkdir"
- echo >&2 " --includedir"
- echo >&2 " --bindir"
- exit 100
- fi
-
-case "$1" in
- --version)
- echo $version
- exit 0
- ;;
- --datadir)
- echo $datadir
- exit 0
- ;;
- --linkdir)
- echo $linkdir
- exit 0
- ;;
- --includedir)
- echo $includedir
- exit 0
- ;;
- --bindir)
- echo $bindir
- exit 0
- ;;
- *)
- echo >&2 "Unrecognized option to $0: $1"
- exit 100
- esac
Deleted: csw/mgar/pkg/netpbm/trunk/files/csw-perl.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/csw-perl.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/csw-perl.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,63 +0,0 @@
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/pnmflip netpbm-10.26.18/editor/pnmflip
---- netpbm-10.26.18.orig/editor/pnmflip 2005-11-13 16:36:50.000000000 -0500
-+++ netpbm-10.26.18/editor/pnmflip 2005-11-13 16:36:16.610001000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
-
- #============================================================================
- # This is a compatibility interface to Pamflip.
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/pnmquant netpbm-10.26.18/editor/pnmquant
---- netpbm-10.26.18.orig/editor/pnmquant 2005-11-13 16:36:51.000000000 -0500
-+++ netpbm-10.26.18/editor/pnmquant 2005-11-13 16:35:41.230002000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
-
- ##############################################################################
- # pnmquant
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/ppmfade netpbm-10.26.18/editor/ppmfade
---- netpbm-10.26.18.orig/editor/ppmfade 2005-11-13 16:36:50.000000000 -0500
-+++ netpbm-10.26.18/editor/ppmfade 2005-11-13 16:34:50.460003000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- #
- # This program creates a fade (a sequence of frames) between two images.
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/ppmquant netpbm-10.26.18/editor/ppmquant
---- netpbm-10.26.18.orig/editor/ppmquant 2005-11-13 16:36:50.000000000 -0500
-+++ netpbm-10.26.18/editor/ppmquant 2005-11-13 16:35:27.770001000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
- ##############################################################################
- # This is nothing but a compatibility interface for Pnmquant.
- # An old program coded to call Ppmquant will continue working because
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/ppmshadow netpbm-10.26.18/editor/ppmshadow
---- netpbm-10.26.18.orig/editor/ppmshadow 2005-11-13 16:36:50.000000000 -0500
-+++ netpbm-10.26.18/editor/ppmshadow 2005-11-13 16:36:00.060002000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
-
- # P P M S H A D O W
-
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/generator/ppmrainbow netpbm-10.26.18/generator/ppmrainbow
---- netpbm-10.26.18.orig/generator/ppmrainbow 2005-11-13 16:36:52.000000000 -0500
-+++ netpbm-10.26.18/generator/ppmrainbow 2005-11-13 16:36:32.310000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wl
-+#!/opt/csw/bin/perl -wl
- use strict;
- use Getopt::Long;
-
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/manweb netpbm-10.26.18/manweb
---- netpbm-10.26.18.orig/manweb 2005-11-13 16:36:57.000000000 -0500
-+++ netpbm-10.26.18/manweb 2005-11-13 16:36:42.040003000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
-
- use strict;
- use English;
Deleted: csw/mgar/pkg/netpbm/trunk/files/depend
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/depend 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/depend 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,8 +0,0 @@
-P CSWcommon common - common files and dirs for CSW packages
-P CSWjpeg jpeg - lib and tools for JPEG image format
-P CSWpng png - library for Portable Network Graphics format (PNG)
-P CSWtiff tiff - lib and tools for Tag Image File Format
-P CSWzlib zlib - Zlib Data Compression Library
-P CSWperl perl - A high-level, general-purpose programming language.
-P SUNWcsl Core Solaris, (Shared Libs)
-P SUNWlibms Sun WorkShop Bundled shared libm
Deleted: csw/mgar/pkg/netpbm/trunk/files/gar-base.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/gar-base.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/gar-base.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru netpbm-10.26.42.orig/GNUmakefile netpbm-10.26.42/GNUmakefile
---- netpbm-10.26.42.orig/GNUmakefile 2004-10-16 16:27:50.000000000 -0400
-+++ netpbm-10.26.42/GNUmakefile 2007-06-23 11:49:29.790538000 -0400
-@@ -177,7 +177,7 @@
- echo " make package PKGDIR=/tmp/newnetpbm "; \
- false; \
- fi
-- mkdir $(PKGDIR)
-+ mkdir -p $(PKGDIR)
- echo "Netpbm install package made by 'make package'" \
- >$(PKGDIR)/pkginfo
- date >>$(PKGDIR)/pkginfo
Deleted: csw/mgar/pkg/netpbm/trunk/files/make-netpbm-config.sh
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/make-netpbm-config.sh 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/make-netpbm-config.sh 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-VERSION=`cat $1/VERSION`
-
-prefix='\/opt\/csw'
-bindir=$prefix'\/bin'
-libdir=$prefix'\/lib'
-datadir=$prefix'\/share\/netpbm'
-incdir=$prefix'\/include'
-mandir=$prefix'\/man'
-
-sed -e '
-/^\@/d
-s/\@VERSION\@/'"$VERSION"'/
-s/\@BINDIR\@/'"$bindir"'/
-s/\@LIBDIR\@/'"$libdir"'/
-s/\@LINKDIR\@/'"$libdir"'/
-s/\@DATADIR\@/'"$datadir"'/
-s/\@INCLUDEDIR\@/'"$incdir"'/
-s/\@MANDIR\@/'"$mandir"'/
-' config_template > $1/bin/netpbm-config
-
-chmod 0755 $1/bin/netpbm-config
-
Deleted: csw/mgar/pkg/netpbm/trunk/files/manweb.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/manweb.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/manweb.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,20 +0,0 @@
---- netpbm-10.26.19/manweb 2005-11-20 12:40:53.984621000 -0500
-+++ netpbm-10.26.19/manweb 2005-11-20 13:00:57.566416000 -0500
-@@ -300,7 +300,7 @@
-
- sub readConfFile($) {
- #-----------------------------------------------------------------------------
--# Read the configuration file (/etc/manweb.conf or value of
-+# Read the configuration file (/opt/csw/etc/manweb.conf or value of
- # MANWEB_CONF_FILE or named by our argument). Return values set in
- # it, or defaults.
- #-----------------------------------------------------------------------------
-@@ -315,7 +315,7 @@
- if (defined($envVblValue)) {
- $confFile = $envVblValue;
- } else {
-- $confFile = "/etc/manweb.conf";
-+ $confFile = "/opt/csw/etc/manweb.conf";
- }
- }
-
Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-config.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/netpbm-config.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/netpbm-config.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,597 +0,0 @@
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/Makefile.config netpbm-10.26.18/Makefile.config
---- netpbm-10.26.18.orig/Makefile.config 1969-12-31 19:00:00.000000000 -0500
-+++ netpbm-10.26.18/Makefile.config 2005-11-12 16:46:54.680002000 -0500
-@@ -0,0 +1,593 @@
-+####This file was automatically created by 'configure.'
-+####Many variables are set twice -- a generic setting, then
-+####a system-specific override at the bottom of the file.
-+####
-+# This is a make file inclusion, to be included in all the Netpbm make
-+# files.
-+
-+# This file is meant to contain variable settings that customize the
-+# build for a particular target system configuration.
-+
-+# The distribution contains the file Makefile.config.in. You edit
-+# Makefile.config.in in ways relevant to your particular environment
-+# to create Makefile.config. The "configure" program will do this
-+# for you in simple cases.
-+
-+# Some of the variables that the including make file must set for this
-+# file to work:
-+#
-+# SRCDIR: The directory at the top of the Netpbm source tree. Note that
-+# this is typically a relative directory, and it must be relative to the
-+# make file that includes this file.
-+
-+DEFAULT_TARGET = nonmerge
-+#DEFAULT_TARGET = merge
-+
-+# Fiasco has some special requirements that make it fail to compile on
-+# some systems, and since it isn't very important, just set this to "N"
-+# and skip it on those systems unless you want to debug it and fix it.
-+# OpenBSD:
-+#BUILD_FIASCO = N
-+BUILD_FIASCO = Y
-+
-+# The following are commands for the build process to use. These values
-+# do not get built into anything.
-+
-+# The C compiler (including macro preprocessor)
-+#CC = gcc
-+# Note that 'cc' is usually an alias for whatever is the main compiler
-+# on a system, e.g. the GNU Compiler on Linux.
-+CC = cc
-+
-+# The linker.
-+LD = $(CC)
-+#LD = ld
-+#Tru64:
-+#LD = cc
-+#LD = gcc
-+
-+#If the linker identified above is a compiler that invokes a linker
-+#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is
-+#that we expect a compiler to take linker options in the '-Wl,-opt1,val1'
-+#syntax whereas the actual linker would take '-opt1 val1'.
-+LINKERISCOMPILER=Y
-+#If $(LD) is 'ld':
-+#LINKERISCOMPILER=N
-+
-+#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can
-+#take a library as just another link object argument, as in 'ld
-+#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a
-+#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'.
-+#This variable controls how 'libopt' gets built. Note that with some
-+#linkers, you can specify a shared library explicitly, but then it has
-+#to live in that exact place at run time. That's not good enough for us.
-+
-+LINKER_CAN_DO_EXPLICIT_LIBRARY=N
-+#GNU:
-+#LINKER_CAN_DO_EXPLICIT_LIBRARY=Y
-+
-+# This is the name of the header file that declares the types
-+# uint32_t, etc. This name is used as #include $(INTTYPES_H) .
-+# Set to null if the types come automatically without including anything.
-+INTTYPES_H = <inttypes.h>
-+# Linux libc5:
-+#INTTYPES_H = <types.h>
-+# Solaris:
-+#INTTYPES_H = <sys/inttypes.h>
-+# Others:
-+#INTTYPES_H = <sys/stdint.h>
-+#INTTYPES_H = <sys/types.h>
-+# The automatically generated Netpbm version:
-+#INTTYPES_H = "inttypes_netpbm.h"
-+
-+# CC and LD are for building the Netpbm programs, which are not necessarily
-+# intended to run on the same system on which Make is running. But when we
-+# build a build tool such as Libopt, it is meant to run only on the same
-+# system on which the Make is running. The variables below define programs
-+# to use to compile and link build tools.
-+CC_FOR_BUILD = $(CC)
-+LD_FOR_BUILD = $(LD)
-+
-+# MAKE is set automatically by Make to what was used to invoke Make.
-+
-+INSTALL = $(SRCDIR)/buildtools/install.sh
-+#Solaris:
-+#INSTALL = /usr/ucb/install
-+#Tru64:
-+#INSTALL = installbsd
-+#OSF1:
-+#INSTALL = $(SRCDIR)/buildtools/installosf
-+#Red Hat Linux:
-+#INSTALL = install
-+
-+# STRIPFLAG is the option you pass to the above install program to make it
-+# strip unnecessary information out of binaries.
-+STRIPFLAG = -s
-+# If you don't want to strip the binaries, just leave it null:
-+#STRIPFLAG =
-+
-+SYMLINK = ln -s
-+# At least some Windows environments don't have any concept of symbolic
-+# links, but direct copies are usually a passable alternative.
-+#SYMLINK = cp
-+
-+#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the
-+#pointer man pages are installed (ready to nroff, or ready to cat).
-+#A pointer man pages is just a single-paragraph pages that tells you there is
-+#no man page for the program, to look at the HTML documentation instead.
-+MANPAGE_FORMAT = nroff
-+#MANPAGE_FORMAT = cat
-+
-+AR = ar
-+RANLIB = ranlib
-+# IRIX, SCO don't have Ranlib:
-+#RANLIB = true
-+LEX = flex
-+# Solaris:
-+# LEX = flex -e
-+# Or just skip parts that need Lex:
-+# LEX =
-+
-+# C compiler options
-+
-+# gcc:
-+# -ansi and -Werror should work too, but are not included
-+# by default because there's no point in daring the build to fail.
-+# -pedantic isn't a problem because it causes at worst a warning.
-+#CFLAGS = -O3 -fast-math -pedantic \
-+# -Wall -Wno-uninitialized -Wmissing-declarations
-+# The merged programs have a main_XXX subroutine instead of main(),
-+# which would cause a warning with -Wmissing-declarations or
-+# -Wmissing-prototypes.
-+#CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes
-+# A user of DEC Tru64 4.0F in May 2000 needed -DLONG_32 for ppmtompeg,
-+# but word size-sensitive code was removed from parallel.c in September 2004.
-+# A user of Tru64 5.1A in July 2003 needed NOT to have -DLONG_32. In
-+# theory, you need this if on your system, long is 32 bits and int is not.
-+# But it may be completely irrelevant today.
-+#Tru64:
-+#CFLAGS = -O2 -std1 -DLONG_32
-+#CFLAGS = -O2 -std1
-+#AIX:
-+#CFLAGS= -O3
-+#HP-UX:
-+#CFLAGS= -O3 -fPIC
-+#IRIX:
-+#CFLAGS= -n32 -O3
-+#Amiga with GNU compiler:
-+#CFLAGS= -m68020-60 -ffast-math -mstackextend
-+# You can add -noixemul for Amiga and successfully compile most of the
-+# programs. (Of the remaining ones, if you can supply your own strtod()
-+# function, most of them will build with -noixemul). So try building
-+# with 'make --keep-going CADD=-noixemul' first, then just 'make' to build
-+# everything that failed for lack of the ixemul library in the first step.
-+# That way, the parts that don't required the ixemul library won't indicate
-+# a dependency on it.
-+#OpenBSD:
-+#CFLAGS = -I/usr/local/include
-+
-+# EXE is a suffix that the linker puts on any executable it generates.
-+# In cygwin, this is .exe and most programs deal with its existence without
-+# us having to know about it. Some don't though, so set this:
-+
-+EXE =
-+#Cygwin, DJGPP/Windows:
-+#EXE = .exe
-+
-+# linker options.
-+
-+# LDFLAGS is often set as an environment variable; A setting here overrides
-+# it. So either make sure you want to override it, or do a "LDFLAGS +=" here.
-+
-+# Eunice users may want to use -noshare so that the executables can
-+# run standalone:
-+#LDFLAGS += -noshare
-+#Tru64:
-+# Russ Allberry says on 2001.06.09 that -oldstyle_liblookup may be necessary
-+# to keep from finding an ancient system libjpeg.so that isn't compatible with
-+# NetPBM. Michael Long found that /usr/local/lib is not in the default
-+# search path, or not soon enough, and he was getting an old libjpeg that
-+# caused all the jpeg symbol references to be unresolved. He had installed
-+# a new libjpeg in /usr/local/lib.
-+#LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib
-+#AIX:
-+#LDFLAGS += -L /usr/pubsw/lib
-+#HP-UX:
-+#LDFLAGS += -Wl,+b,/usr/pubsw/lib
-+#IRIX:
-+#LDFLAGS += -n32
-+#FreeBSD, OpenBSD:
-+# (04.03.15 This may be a mistake. LDFLAGS may already be set to this as
-+# an environment variable. We used to override the environment variable
-+# here with LDFLAGS =, which would mean we had to override with the same
-+# value it already had. I suspect it will work fine with no LDFLAGS
-+# setting at all; need to confirm this on real FreeBSD and OpenBSD systems)
-+#LDFLAGS += -L/usr/local/lib
-+
-+# Linker options for created Netpbm shared libraries.
-+
-+# Here, $(SONAME) resolves to the soname for the shared library being created.
-+# The following are gcc options. This works on GNU libc systems.
-+LDSHLIB = -shared -Wl,-soname,$(SONAME)
-+# 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.
-+# BeOS doesn't have sonames built in.
-+#LDSHLIB = -nostart
-+#LDSHLIB = -G
-+# Solaris, SunOS with GNU Ld, SCO:
-+# These systems have no soname option.
-+#LDSHLIB = -shared
-+# Solaris with Sun Ld:
-+#LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME)
-+#Tru64:
-+#LDSHLIB = -shared -expect_unresolved "*"
-+#IRIX:
-+#LDSHLIB = -shared -n32
-+#AIX GNU compiler/linker:
-+#LDSHLIB = -shared
-+#AIX Visual Age C:
-+#LDSHLIB = -qmkshrobj
-+
-+# LDRELOC is the command to combine two .o files (relocateable object files)
-+# into a single .o file that can later be linked into something else. NONE
-+# means no such command is available.
-+
-+LDRELOC = NONE
-+# GNU Ld:
-+# Older GNU Ld misspells the option as --relocateable. Newer GNU Ld
-+# correctly spells it --relocatable. The abbreviation --reloc works on
-+# both.
-+#LDRELOC = ld --reloc
-+#LDRELOC = ld -r
-+
-+
-+# 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
-+# -fpic works, use it. If it bombs, go to fPIC). On newer systems,
-+# it isn't necessary, but can save real memory at the expense of
-+# execution speed. Without position independent code, the library
-+# loader may have to patch addresses into the executable text. On an
-+# older system, this would cause a program crash because the loader
-+# would be writing into read-only shared memory. But on newer
-+# systems, the system silently creates a private mapping of the page
-+# or segment being modified (the "copy on write" phenomenon). So it
-+# needs its own private real page frame. In one experiment, A second
-+# copy of Pbmtext used 16K less real memory when built with -fpic than
-+# when built without. 2001.06.02.
-+
-+CFLAGS_SHLIB =
-+# Solaris or SunOS with gcc, and NetBSD:
-+#CFLAGS_SHLIB = -fpic
-+#CFLAGS_SHLIB = -fPIC
-+# Sun compiler:
-+#CFLAGS_SHLIB = -Kpic
-+#CFLAGS_SHLIB = -KPIC
-+
-+# 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
-+# in the shared library and thus choose the correct library among several or
-+# avoid using an incompatible one. But on some systems, the link fails.
-+# On 2002.09.30, "John H. DuBois III" <spcecdt at armory.com> reports that on
-+# SCO OpenServer, he gets the following error message with -lc:
-+#
-+# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o);
-+# fatal error: relocations remain against allocatable but non-writable
-+# section: ; .text
-+
-+SHLIB_CLIB = -lc
-+# SCO:
-+SHLIB_CLIB =
-+
-+# On some systems you have to build into an executable the list of
-+# directories where its dynamically linked libraries can be found at
-+# run time. This is typically done with a -R or -rpath linker
-+# option. Even on systems that don't require it, you might prefer to do
-+# that rather than set up environment variables or configuration files
-+# to tell the system where the libraries are. A "Y" here means to put
-+# the directory information in the executable at link time.
-+
-+NEED_RUNTIME_PATH = N
-+# Solaris, SunOS, NetBSD, AIX:
-+#NEED_RUNTIME_PATH = Y
-+
-+# RPATHOPTNAME is the option you use on the link command to specify
-+# a runtime search path for a shared library. It is meaningless unless
-+# NEED_RUNTIME_PATH is Y.
-+RPATHOPTNAME = -rpath
-+
-+# The following variables tell where your various libraries on which
-+# Netpbm depends live. The LIBxxx variable is a full file
-+# specification of the link library (not necessarily the library used
-+# at run time). e.g. "/usr/local/lib/graphics/libpng.so". It usually
-+# doesn't matter if the library prefix and suffix are right -- you can
-+# use "lib" and ".so" or ".a" regardless of what your system actually
-+# uses because these just turn into "-L" and "-l" linker options
-+# anyway. ".a" implies a static library for some purposes, though.
-+# If you don't have the library in question, use a value of NONE for
-+# LIBxxx and the build will simply skip the programs that require that
-+# library. If the library is in your linker's (or the Netpbm build's)
-+# default search path, leave off the directory part, e.g. "libpng.so".
-+
-+# The xxxHDR_DIR variable is the directory in which the interface
-+# headers for the library live (e.g. /usr/include). If they are in your
-+# compiler's default search path, set this variable to null.
-+
-+# This is where the Netpbm shared libraries will reside when Netpbm is
-+# fully installed. In some configurations, the Netpbm builder builds
-+# this information into the Netpbm executables. This does NOT affect
-+# where the Netpbm installer installs the libraries. A null value
-+# means the libraries are in a default search path used by the runtime
-+# library loader.
-+NETPBMLIB_RUNTIME_PATH =
-+#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm
-+
-+# The TIFF library. See above. If you want to build the tiff
-+# converters, you must have the tiff library already installed.
-+
-+TIFFLIB = NONE
-+TIFFHDR_DIR =
-+
-+#TIFFLIB = libtiff.so
-+#TIFFHDR_DIR = /usr/include/libtiff
-+#NetBSD:
-+#TIFFLIB = $(LOCALBASE)/lib/libtiff.so
-+#TIFFHDR_DIR = $(LOCALBASE)/include
-+# OSF, Tru64:
-+#TIFFLIB = /usr/local1/DEC/lib/libtiff.so
-+#TIFFHDR_DIR = /usr/local1/DEC/include
-+
-+# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any
-+# program linked with the TIFF library needs a Jpeg and/or Z library.
-+# Some TIFF libraries have such library statically linked in, but others
-+# need it to be dynamically linked at program load time.
-+# Make this 'N' if youf TIFF library doesn't need such dynamic linking.
-+# As of 2005.01, the most usual build of the TIFF library appears to require
-+# both.
-+TIFFLIB_NEEDS_JPEG = Y
-+TIFFLIB_NEEDS_Z = Y
-+
-+# The JPEG library. See above. If you want to build the jpeg
-+# converters you must have the jpeg library already installed.
-+
-+# Tiff files can use JPEG compression, so the Tiff library can reference
-+# the JPEG library. If your Tiff library references a dynamic JPEG
-+# library, you must specify at least JPEGLIB here, or the Tiff
-+# converters will not build. Note that your Tiff library may have the
-+# JPEG stuff statically linked in, in which case you won't need
-+# JPEGLIB in order to build the Tiff converters.
-+
-+JPEGLIB = NONE
-+JPEGHDR_DIR =
-+#JPEGLIB = libjpeg.so
-+#JPEGHDR_DIR = /usr/include/jpeg
-+# Netbsd:
-+#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so
-+#JPEGHDR_DIR = ${LOCALBASE}/include
-+# OSF, Tru64:
-+#JPEGLIB = /usr/local1/DEC/libjpeg.so
-+#JPEGHDR_DIR = /usr/local1/DEC/include
-+# Typical:
-+#JPEGLIB = /usr/local/lib/libjpeg.so
-+#JPEGHDR_DIR = /usr/local/include
-+# Don't build JPEG stuff:
-+#JPEGLIB = NONE
-+
-+
-+# The PNG library. See above. If you want to build the PNG
-+# converters you must have the PNG library already installed.
-+
-+# The PNG library, by convention starting around April 2002, gets installed
-+# with names that include a version number, such as libpng10.a and header
-+# files in /usr/include/libpng10.
-+# option.
-+PNGLIB = NONE
-+PNGHDR_DIR =
-+PNGVER =
-+#PNGLIB = libpng$(PNGVER).so
-+#PNGHDR_DIR = /usr/include/libpng$(PNGVER)
-+# NetBSD:
-+#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so
-+#PNGHDR_DIR = $(LOCALBASE)/include
-+# OSF/Tru64:
-+#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
-+#PNGHDR_DIR = /usr/local1/DEC/include
-+
-+# The zlib compression library. See above. You need it to build
-+# anything that needs the PNG library (see above). If you selected
-+# NONE for the PNG library, it doesn't matter what you specify here --
-+# it won't get used.
-+
-+ZLIB = NONE
-+ZHDR_DIR =
-+#ZLIB = libz.so
-+
-+# The JBIG lossless image compression library (aka JBIG-KIT):
-+
-+JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
-+JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig
-+
-+# The Jasper JPEG-2000 image compression library (aka JasPer):
-+JASPERLIB = $(INTERNAL_JASPERLIB)
-+JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR)
-+
-+# And the Utah Raster Toolkit (aka URT aka RLE) library:
-+
-+URTLIB = $(BUILDDIR)/urt/librle.a
-+URTHDR_DIR = $(SRCDIR)/urt
-+
-+# The Linux SVGA library (Svgalib) is a facility for displaying graphics
-+# on the Linux console. It is required by Ppmsvgalib.
-+
-+LINUXSVGALIB = NONE
-+LINUXSVGAHDR_DIR =
-+
-+#LINUXSVGALIB_DIR =
-+#LINUXSVGAHDR_DIR = /usr/include/vgalib
-+
-+# If you don't want any network functions, set OMIT_NETWORK to "y".
-+# The only thing that requires network functions is the option in
-+# ppmtompeg to run it on multiple computers simultaneously. On some
-+# systems network functions don't work or we haven't figured out how to
-+# make them work, or they just aren't worth the effort.
-+OMIT_NETWORK =
-+#DJGPP/Windows, Tru64:
-+# (there's some minor header problem that prevents network functions from
-+# building on Tru64 2000.10.06)
-+#OMIT_NETWORK = Y
-+
-+# These are -l options to link in the network libraries. Often, these are
-+# built into the standard C library, so this can be null. This is irrelevant
-+# if OMIT_NETWORK is "y".
-+
-+NETWORKLD =
-+# Solaris, SunOS:
-+#NETWORKLD = -lsocket -lnsl
-+# SCO:
-+#NETWORKLD = -lsocket, -lresolv
-+
-+VMS =
-+#VMS:
-+#VMS = yes
-+
-+# The following variables are used only by 'make install' (and the
-+# variants of it). Paths here don't, for example, get built into any
-+# programs.
-+
-+# This is where everything goes when you do 'make package', unless you
-+# override it by setting 'pkgdir' on the Make command line.
-+PKGDIR_DEFAULT = /tmp/netpbm
-+
-+# File permissions for installed files.
-+# Note that on some systems (e.g. Solaris), 'install' can't use the
-+# mnemonic permissions - you have to use octal.
-+
-+# binaries (pbmmake, etc)
-+INSTALL_PERM_BIN = 755 # u=rwx,go=rx
-+# shared libraries (libpbm.so, etc)
-+INSTALL_PERM_LIBD = 755 # u=rwx,go=rx
-+# static libraries (libpbm.a, etc)
-+INSTALL_PERM_LIBS = 644 # u=rw,go=r
-+# header files (pbm.h, etc)
-+INSTALL_PERM_HDR = 644 # u=rw,go=r
-+# man pages (pbmmake.1, etc)
-+INSTALL_PERM_MAN = 644 # u=rw,go=r
-+# data files (pnmtopalm color maps, etc)
-+INSTALL_PERM_DATA = 644 # u=rw,go=r
-+
-+# Specify the suffix that want the man pages to have.
-+
-+SUFFIXMANUALS1 = 1
-+SUFFIXMANUALS3 = 3
-+SUFFIXMANUALS5 = 5
-+
-+#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the
-+#Netpbm library functions. The value is used only in make file tests.
-+# "unixshared" means a unix-style shared library, typically named like
-+# libxyz.so.2.3
-+NETPBMLIBTYPE = unixshared
-+# "unixstatic" means a unix-style static library, (like libxyz.a)
-+#NETPBMLIBTYPE = unixstatic
-+# "dll" means a Windows DLL shared library
-+#NETPBMLIBTYPE = dll
-+# "dylib" means a Darwin/Mac OS shared library
-+#NETPBMLIBTYPE = dylib
-+
-+#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is
-+#selected above. All this is used for is to construct library names.
-+#The make files never examine the actual value.
-+NETPBMLIBSUFFIX = so
-+
-+# "a" is the suffix for unix-style static libraries. It is also
-+# traditionally used for shared libraries on AIX. The Visual Age C
-+# manual says sometimes .so works on AIX, and GNU software for AIX
-+# 5.1.0 does indeed use it. In our experiments, it works fine if you
-+# name the library file explicitly on the link, but isn't in the -l
-+# search order. If you name the library explicitly on the link, the
-+# library must live in exactly the same position at run time, so we
-+# can't use that. Therefore, you cannot build both static and shared
-+# libraries with AIX. You have to choose.
-+#NETPBMLIBSUFFIX = a
-+# For HP-UX shared libraries:
-+#NETPBMLIBSUFFIX = sl
-+# Darwin/Mac OS shared library:
-+#NETPBMLIBSUFFIX = dylib
-+# Windows shared library:
-+#NETPBMLIBSUFFIX = dll
-+
-+#STATICLIB_TOO is "y" to signify that you want a static library built
-+#and installed in addition to whatever library type you specified by
-+#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library,
-+#STATICLIB_TOO simply has no effect.
-+STATICLIB_TOO = y
-+#STATICLIB_TOO = n
-+
-+#STATICLIBSUFFIX is the suffix that static libraries have. It's
-+#meaningless if you aren't building static libraries.
-+STATICLIBSUFFIX = a
-+
-+#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename
-+#of a shared library may have on this system. Traditionally, it's
-+#just "lib", as in libc or libpbm. On Windows, though, varying
-+#prefixes are used when multiple alternative forms of a library are
-+#available. The first prefix in this list is what we use to name the
-+#Netpbm shared libraries.
-+#
-+# This variable controls how 'libopt' gets built.
-+#
-+SHLIBPREFIXLIST = lib
-+#Cygwin:
-+#SHLIBPREFIXLIST = cyg lib
-+
-+NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
-+
-+#DLLVER is used to version the DLLs built on cygwin or other
-+#windowsish platforms. We can't add this to LIBROOT, or we'd
-+#version the static libs (which is bad). We can't add this
-+#at the end of the name (like unix does with so numbers) because
-+#windows will only load dlls whose name ends in "dll". So,
-+#we have this variable, which becomes the end of the library "root" name
-+#for DLLs only.
-+#
-+# This variable controls how 'libopt' gets built.
-+#
-+DLLVER =
-+#Cygwin
-+#DLLVER = $(NETPBM_MAJOR_RELEASE)
-+
-+#NETPBM_DOCURL is the URL of the main documentation page for Netpbm.
-+#This is a directory which contains a file for each Netpbm program,
-+#library, and file type. E.g. The documentation for jpegtopnm might be in
-+#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets
-+#installed in the man pages (which say no more than to read the webpage)
-+#and in the Webman netpbm.url file.
-+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/
-+#For a system with no web access, but a local copy of the doc:
-+#NETPBM_DOCURL = file:/usr/doc/netpbm/
-+
-+
-+
-+
-+####Lines above were copied from Makefile.config.in by 'configure'.
-+####Lines below were added by 'configure' based on the SOLARIS platform.
-+DEFAULT_TARGET = merge
-+NETPBMLIBTYPE=unixshared
-+NETPBMLIBSUFFIX=so
-+STATICLIB_TOO=n
-+NETPBMLIB_RUNTIME_PATH=/opt/csw/lib
-+LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME)
-+NEED_RUNTIME_PATH = Y
-+CFLAGS = -fast -xnolibmopt -xdepend -xstrconst $(LDFLAGS) -xildoff
-+CFLAGS_SHLIB = -Kpic
-+RPATHOPTNAME = -R
-+NETWORKLD = -lsocket -lnsl
-+LINKERISCOMPILER = Y
-+TIFFHDR_DIR = /opt/csw/include
-+TIFFLIB = libtiff.so
-+JPEGHDR_DIR = /opt/csw/include
-+JPEGLIB = libjpeg.so
-+PNGHDR_DIR = /opt/csw/include
-+PNGLIB = libpng.so
-+ZLIB = libz.so
-+NETPBM_DOCURL = file:///opt/csw/share/doc/netpbm/
Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-doc.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/netpbm-doc.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/netpbm-doc.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,21 +0,0 @@
-diff --speed-large-files --minimal -Nru x/doc.orig/pnmtopng.html x/doc/pnmtopng.html
---- doc.orig/pnmtopng.html 2005-09-25 20:19:36.000000000 -0400
-+++ doc/pnmtopng.html 2005-11-20 10:02:25.078711000 -0500
-@@ -100,7 +100,7 @@
-
- <pre>
- <kbd>
-- pnmtopng -phys 800 800 0 input.pnm >output.png
-+ pnmtopng -phys 800 800 0 input.pnm >output.png
- </kbd>
- </pre>
-
-@@ -108,7 +108,7 @@
-
- <pre>
- <kbd>
-- pnmtopng -size "800 800 0" input.pnm >output.png
-+ pnmtopng -size "800 800 0" input.pnm >output.png
- </kbd>
- </pre>
-
Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-fix.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/netpbm-fix.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/netpbm-fix.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,36 +0,0 @@
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/converter/other/jpeg2000/Makefile netpbm-10.26.18/converter/other/jpeg2000/Makefile
---- netpbm-10.26.18.orig/converter/other/jpeg2000/Makefile 2005-11-12 16:50:41.000000000 -0500
-+++ netpbm-10.26.18/converter/other/jpeg2000/Makefile 2005-11-12 16:46:54.730001000 -0500
-@@ -18,7 +18,7 @@
- endif
- endif
-
--INTERNAL_JASPERLIB = $(BUILDDIR)/$(SUBDIR)/libjasper/libjasper.a
-+INTERNAL_JASPERLIB = libjasper/libjasper.a
- INTERNAL_JASPERHDR_DIR = $(BUILDDIR)/$(SUBDIR)/libjasper/include
-
- ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB))
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/converter/other/pamtouil.c netpbm-10.26.18/converter/other/pamtouil.c
---- netpbm-10.26.18.orig/converter/other/pamtouil.c 2005-11-12 16:50:39.000000000 -0500
-+++ netpbm-10.26.18/converter/other/pamtouil.c 2005-11-12 16:47:36.140004000 -0500
-@@ -29,7 +29,7 @@
- #define LOW_CHAR '`'
- #define HIGH_CHAR '~'
-
--struct cmdlineInfo {
-+static struct cmdlineInfo {
- /* All the information the user supplied in the command line,
- in a form easy for the program to use.
- */
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/editor/pnmcrop.c netpbm-10.26.18/editor/pnmcrop.c
---- netpbm-10.26.18.orig/editor/pnmcrop.c 2005-11-12 16:50:13.000000000 -0500
-+++ netpbm-10.26.18/editor/pnmcrop.c 2005-11-12 16:48:02.400004000 -0500
-@@ -28,7 +28,7 @@
-
- enum bg_choice {BG_BLACK, BG_WHITE, BG_DEFAULT, BG_SIDES};
-
--struct cmdline_info {
-+static struct cmdline_info {
- /* All the information the user supplied in the command line,
- in a form easy for the program to use.
- */
Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-makefile.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/netpbm-makefile.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/netpbm-makefile.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,66 +0,0 @@
-diff --speed-large-files --minimal -Nru netpbm-10.26.42.orig/GNUmakefile netpbm-10.26.42/GNUmakefile
---- netpbm-10.26.42.orig/GNUmakefile 2004-10-16 16:27:50.000000000 -0400
-+++ netpbm-10.26.42/GNUmakefile 2007-06-23 11:49:29.790538000 -0400
-@@ -177,7 +177,7 @@
- echo " make package PKGDIR=/tmp/newnetpbm "; \
- false; \
- fi
-- mkdir $(PKGDIR)
-+ mkdir -p $(PKGDIR)
- echo "Netpbm install package made by 'make package'" \
- >$(PKGDIR)/pkginfo
- date >>$(PKGDIR)/pkginfo
-@@ -267,7 +267,7 @@
- netpbm:%:%.o $(OBJECT_DEP) $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT)
- # Note that LDFLAGS might contain -L options, so order is important.
- $(LD) -o $@ $< $(OBJECT_LIST) \
-- $(LDFLAGS) `$(LIBOPT) $(NETPBMLIB) $(MERGELIBS)` \
-+ -L $(BUILDDIR)/lib $(LDFLAGS) `$(LIBOPT) $(NETPBMLIB) $(MERGELIBS)` \
- $(MATHLIB) $(NETWORKLD) $(LADD)
-
- netpbm.o: mergetrylist
-diff --speed-large-files --minimal -Nru netpbm-10.26.18.orig/buildtools/Makefile.manpage netpbm-10.26.18/buildtools/Makefile.manpage
---- netpbm-10.26.18.orig/buildtools/Makefile.manpage 2005-11-12 20:53:22.000000000 -0500
-+++ netpbm-10.26.18/buildtools/Makefile.manpage 2005-11-12 20:52:49.040002000 -0500
-@@ -2,9 +2,9 @@
-
- # Make Unix man pages from Netpbm HTML user manual
-
--MAKEMAN = makeman
-+MAKEMAN = /export/home/damjan/csw/utils/netpbm/$(WORKSRC)/buildtools/makeman
-
--MANDIR = /usr/share/man/man1
-+MANDIR = $(DESTDIR)/share/man
-
- # These can convert to man pages cleanly
- MAN1 = \
-@@ -343,13 +343,13 @@
- # This will install the generated man pages
- installman: manpages
- for f in $(MAN1); do \
-- if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man1/$$f.gz; fi; \
-+ if [ -f $$f ]; then cat <$$f >$(MANDIR)/man1/$$f; fi; \
- done
- for f in $(MAN3); do \
-- if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man3/$$f.gz; fi; \
-+ if [ -f $$f ]; then cat <$$f >$(MANDIR)/man3/$$f; fi; \
- done
- for f in $(MAN5); do \
-- if [ -f $$f ]; then gzip <$$f >$(MANDIR)/man5/$$f.gz; fi; \
-+ if [ -f $$f ]; then cat <$$f >$(MANDIR)/man5/$$f; fi; \
- done
- # Clean up old locations on Fedora Core 2
- rm -f $(MANDIR)/man1/extendedopacity.1.gz
-@@ -357,9 +357,9 @@
- rm -f $(MANDIR)/man3/libnetpbm_dir.3.gz
- # remove pointer man pages (that say, "The man page isn't here")
- # which might have been installed previously
-- for f in $(MAN1); do rm -f $(MANDIR)/man1/$$f; done
-- for f in $(MAN3); do rm -f $(MANDIR)/man3/$$f; done
-- for f in $(MAN5); do rm -f $(MANDIR)/man5/$$f; done
-+ # for f in $(MAN1); do rm -f $(MANDIR)/man1/$$f; done
-+ # for f in $(MAN3); do rm -f $(MANDIR)/man3/$$f; done
-+ # for f in $(MAN5); do rm -f $(MANDIR)/man5/$$f; done
-
- clean:
- @rm -f *.[135] $(XML)
Deleted: csw/mgar/pkg/netpbm/trunk/files/netpbm-pm_config.h.diff
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/netpbm-pm_config.h.diff 2011-06-14 12:15:49 UTC (rev 14810)
+++ csw/mgar/pkg/netpbm/trunk/files/netpbm-pm_config.h.diff 2011-06-14 12:37:13 UTC (rev 14811)
@@ -1,52 +0,0 @@
-diff --speed-large-files --minimal -Nru netpbm-10.26.42.orig/pm_config.in.h netpbm-10.26.42/pm_config.in.h
---- netpbm-10.26.42.orig/pm_config.in.h 2004-08-24 17:21:46.000000000 -0400
-+++ netpbm-10.26.42/pm_config.in.h 2007-06-21 11:42:52.416466000 -0400
-@@ -30,6 +30,48 @@
- /* #define MSDOS */
- #endif
-
-+/* Add declarations which are not available in Solaris 8 */
-+#if defined(_CHAR_IS_SIGNED)
-+typedef char int_fast8_t;
-+#else
-+#if defined(__STDC__)
-+typedef signed char int_fast8_t;
-+#endif
-+#endif
-+typedef int int_fast16_t;
-+typedef int int_fast32_t;
-+#ifdef _LP64
-+typedef long int_fast64_t;
-+#else /* _ILP32 */
-+typedef long long int_fast64_t;
-+#endif
-+
-+typedef unsigned char uint_fast8_t;
-+typedef unsigned int uint_fast16_t;
-+typedef unsigned int uint_fast32_t;
-+#ifdef _LP64
-+typedef unsigned long uint_fast64_t;
-+#else /* _ILP32 */
-+typedef unsigned long long uint_fast64_t;
-+#endif
-+
-+#if defined(_CHAR_IS_SIGNED) || defined(__STDC__)
-+#define INT_FAST8_MAX INT8_MAX
-+#endif
-+#define INT_FAST16_MAX INT16_MAX
-+#define INT_FAST32_MAX INT32_MAX
-+#ifdef INT64_MAX
-+#define INT_FAST64_MAX INT64_MAX
-+#endif
-+
-+#define UINT_FAST8_MAX UINT8_MAX
-+#define UINT_FAST16_MAX UINT16_MAX
-+#define UINT_FAST32_MAX UINT32_MAX
-+#ifdef UINT64_MAX
-+#define UINT_FAST64_MAX UINT64_MAX
-+#endif
-+
-+
- /* Switch macros like _POSIX_SOURCE are supposed to add features from
- the indicated standard to the C library. A source file defines one
- of these macros to declare that it uses features of that standard
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list