[csw-devel] SF.net SVN: gar:[21753] csw/mgar/pkg/netpbm/trunk

lblume at users.sourceforge.net lblume at users.sourceforge.net
Sat Aug 17 02:06:31 CEST 2013


Revision: 21753
          http://gar.svn.sourceforge.net/gar/?rev=21753&view=rev
Author:   lblume
Date:     2013-08-17 00:06:30 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
netpbm/trunk: Bump to version 10.63.00

Modified Paths:
--------------
    csw/mgar/pkg/netpbm/trunk/Makefile
    csw/mgar/pkg/netpbm/trunk/checksums
    csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch

Added Paths:
-----------
    csw/mgar/pkg/netpbm/trunk/files/0005_missing_stdlib.h.patch
    csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch
    csw/mgar/pkg/netpbm/trunk/files/0007_stdout_already_used.patch
    csw/mgar/pkg/netpbm/trunk/files/config.mk

Modified: csw/mgar/pkg/netpbm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netpbm/trunk/Makefile	2013-08-16 18:22:18 UTC (rev 21752)
+++ csw/mgar/pkg/netpbm/trunk/Makefile	2013-08-17 00:06:30 UTC (rev 21753)
@@ -1,5 +1,5 @@
 NAME = netpbm
-VERSION = 10.35.80
+VERSION = 10.63.00
 GARTYPE = v2
 
 DESCRIPTION = Netpbm is a toolkit for manipulation of graphic images
@@ -8,25 +8,31 @@
   including conversion of images between a variety of different formats.
 endef
 
-MASTER_SITES += $(SF_MIRRORS)
-DISTFILES += $(DISTNAME).tgz
-DISTFILES += Makefile.config
+SF_PROJECT = netpbm
+MASTER_SITES  = svn-http://svn.code.sf.net/p/$(NAME)/code/release_number/
+DISTFILES += config.mk
+DISTFILES += $(VERSION)
+NOCHECKSUM += $(VERSION)
+DISTNAME = $(VERSION)
 
-EXPANDVARS += Makefile.config
+GARCOMPILER = GCC4
 
-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
+EXPANDVARS += config.mk
 
+PATCHFILES += 0005_missing_stdlib.h.patch
+PATCHFILES += 0006-memcpy.patch
+PATCHFILES += 0007_stdout_already_used.patch
+
 VENDOR_URL = http://netpbm.sourceforge.net/
 
 LICENSE = doc/GPL_LICENSE.txt
 
+BUILD_DEP_PKGS += CSWx11xproto
+
 PACKAGES += CSWnetpbm
 SPKG_DESC_CSWnetpbm = A toolkit for manipulation of graphic images
 RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibjpeg7
-RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibtiff3
+RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibtiff5
 RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibpng12-0
 RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWnetpbm += CSWlibz1
@@ -44,8 +50,6 @@
 
 CONFIGURE_SCRIPTS = custom
 
-EXTRA_CFLAGS += -D__inline=
-
 INSTALL_OVERRIDE_VARS += PKGMANDIR
 INSTALL_ARGS = package pkgdir=$(DESTDIR)$(prefix)
 INSTALL_OVERRIDE_VAR_PKGMANDIR = share/man
@@ -64,8 +68,10 @@
 
 include gar/category.mk
 
+PATH := /opt/csw/gnu:$(PATH):/opt/csw/gcc4/bin
+
 configure-custom:
-	cp $(WORKDIR)/Makefile.config $(WORKSRC)
+	cp $(WORKDIR)/config.mk $(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",;' \

Modified: csw/mgar/pkg/netpbm/trunk/checksums
===================================================================
--- csw/mgar/pkg/netpbm/trunk/checksums	2013-08-16 18:22:18 UTC (rev 21752)
+++ csw/mgar/pkg/netpbm/trunk/checksums	2013-08-17 00:06:30 UTC (rev 21753)
@@ -1 +1 @@
-2edf98b802a82e5367fc52382e9ac144  netpbm-10.35.80.tgz
+ff609d95f43cc8bf6ea9c3667a15b610  netpbm-10.35.89.tgz

Modified: 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	2013-08-16 18:22:18 UTC (rev 21752)
+++ csw/mgar/pkg/netpbm/trunk/files/0001-Reorder-includes-so-that-local-includes-come-before-.patch	2013-08-17 00:06:30 UTC (rev 21753)
@@ -1,25 +1,11 @@
-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
- 
+--- a/Makefile.common	jeu. juin 21 22:40:36 2012
++++ b/Makefile.common	mer. juil 24 21:42:39 2013
+@@ -77,7 +77,7 @@
+ # because $(INCLUDES) also contains -I's for some local directories, which
+ # must go before -I importinc.  It is too complex for the Super Stable series.
+ #
 -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/0005_missing_stdlib.h.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0005_missing_stdlib.h.patch	                        (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0005_missing_stdlib.h.patch	2013-08-17 00:06:30 UTC (rev 21753)
@@ -0,0 +1,70 @@
+--- a/urt/rle_putrow.c	ven. août 16 22:25:35 2013
++++ b/urt/rle_putrow.c	ven. août 16 22:27:13 2013
+@@ -31,6 +31,7 @@
+  */
+  
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "rle_put.h"
+ #include "rle.h"
+--- a/urt/scanargs.c	ven. août 16 22:32:22 2013
++++ b/urt/scanargs.c	ven. août 16 22:33:13 2013
+@@ -41,6 +41,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <stdarg.h>
+ 
+--- a/urt/rle_open_f.c	ven. août 16 22:45:04 2013
++++ b/urt/rle_open_f.c	ven. août 16 23:03:01 2013
+@@ -12,6 +12,7 @@
+ 
+ #include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ 
+--- a/converter/other/zeisstopnm.c	ven. août 16 23:25:57 2013
++++ b/converter/other/zeisstopnm.c	ven. août 16 23:28:37 2013
+@@ -49,6 +49,7 @@
+ **
+ */
+ 
++#include <stdlib.h>
+ #include "pnm.h"
+ 
+ int
+--- a/lib/util/nstring.h	ven. août 16 23:41:47 2013
++++ b/lib/util/nstring.h	ven. août 16 23:44:39 2013
+@@ -3,6 +3,7 @@
+ 
+ #include <stdarg.h>
+ #include <string.h>
++#include <strings.h>
+ #include <ctype.h>
+ 
+ #include "pm_c_util.h"
+--- a/urt/rle_error.c	ven. août 16 23:45:33 2013
++++ b/urt/rle_error.c	ven. août 16 23:47:33 2013
+@@ -25,6 +25,7 @@
+  * Copyright (c) 1992, University of Michigan
+  */
+ 
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include "rle_config.h"
+--- a/converter/other/sirtopnm.c	ven. août 16 23:54:50 2013
++++ b/converter/other/sirtopnm.c	ven. août 16 23:57:14 2013
+@@ -10,6 +10,7 @@
+ ** implied warranty.
+ */
+ 
++#include <stdlib.h>
+ #include "pnm.h"
+ 
+ int main( argc, argv )

Added: csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch	                        (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0006-memcpy.patch	2013-08-17 00:06:30 UTC (rev 21753)
@@ -0,0 +1,23 @@
+--- a/pm_config.in.h	ven. août 16 23:48:28 2013
++++ b/pm_config.in.h	ven. août 16 23:51:30 2013
+@@ -91,9 +91,11 @@
+ 
+ #ifndef __SASC
+ #ifndef _DCC    /* Amiga DICE Compiler */
++#ifndef sun    /* Solaris */
+ #define bzero(dst,len) memset(dst,0,len)
+ #define bcopy(src,dst,len) memcpy(dst,src,len)
+ #define bcmp memcmp
++#endif /* sun */
+ #endif /* _DCC */
+ #endif /* __SASC */
+ 
+@@ -93,7 +93,7 @@
+ ** If you have compilation problems that point here, feel free to tweak
+ ** or remove these declarations.
+ */
+-#ifdef BSD
++#if defined(BSD) || defined(sun)
+ #include <stdlib.h>
+ #endif
+ #if defined(SYSV)

Added: csw/mgar/pkg/netpbm/trunk/files/0007_stdout_already_used.patch
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/0007_stdout_already_used.patch	                        (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/0007_stdout_already_used.patch	2013-08-17 00:06:30 UTC (rev 21753)
@@ -0,0 +1,29 @@
+--- a/converter/other/pstopnm.c	sam. août 17 00:04:17 2013
++++ b/converter/other/pstopnm.c	sam. août 17 00:11:44 2013
+@@ -64,7 +64,7 @@
+     unsigned int ysize;  /* zero means unspecified */
+     unsigned int dpi;    /* zero means unspecified */
+     enum Orientation orientation;
+-    unsigned int stdout;
++    unsigned int npstdout;
+     unsigned int textalphabits;
+ };
+ 
+@@ -112,7 +112,7 @@
+     OPTENT3(0, "dpi",        OPT_UINT,  &cmdlineP->dpi, &dpiSpec,        0);
+     OPTENT3(0, "portrait",   OPT_FLAG,  NULL, &portraitOpt,             0);
+     OPTENT3(0, "landscape",  OPT_FLAG,  NULL, &landscapeOpt,            0);
+-    OPTENT3(0, "stdout",     OPT_FLAG,  NULL, &cmdlineP->stdout,         0);
++    OPTENT3(0, "stdout",     OPT_FLAG,  NULL, &cmdlineP->npstdout,         0);
+     OPTENT3(0, "textalphabits", OPT_UINT,
+             &cmdlineP->textalphabits,  &textalphabitsSpec, 0);
+ 
+@@ -623,7 +623,7 @@
+ -----------------------------------------------------------------------------*/
+     const char * retval;  /* malloc'ed */
+ 
+-    if (cmdline.stdout)
++    if (cmdline.npstdout)
+         retval = strdup("-");
+     else if (streq(cmdline.inputFileName, "-"))
+         retval = strdup("-");

Added: csw/mgar/pkg/netpbm/trunk/files/config.mk
===================================================================
--- csw/mgar/pkg/netpbm/trunk/files/config.mk	                        (rev 0)
+++ csw/mgar/pkg/netpbm/trunk/files/config.mk	2013-08-17 00:06:30 UTC (rev 21753)
@@ -0,0 +1,695 @@
+####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 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 = -fPIC -L/opt/csw/lib
+RPATHOPTNAME = -R
+NETWORKLD = -lsocket -lnsl
+LINKERISCOMPILER = Y
+TIFFHDR_DIR = importinc -I/opt/csw/include -I/opt/csw/X11/include
+TIFFLIB = /opt/csw/lib/libtiff.so
+JPEGHDR_DIR = importinc -I/opt/csw/include -I/opt/csw/X11/include
+JPEGLIB = /opt/csw/lib/libjpeg.so
+JASPERLIB = /opt/csw/lib/libjasper.so
+JASPERHDR_DIR = importinc -I/opt/csw/include -I/opt/csw/X11/include
+JASPERDEPLIBS = -ljpeg
+JBIGLIB = /opt/csw/lib/libjbig.so
+JBIGHDR_DIR = importinc -I/opt/csw/include -I/opt/csw/X11/include
+
+# And the Utah Raster Toolkit (aka URT aka RLE) library:
+ZHDR_DIR = importinc -I/opt/csw/include -I/opt/csw/X11/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)
+
+
+
+####Lines above were copied from config.mk.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
+CC = gcc
+CFLAGS = -O3 -ffast-math  -pedantic -fno-common -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef -std=gnu99 -D_XPG6 -D__EXTENSIONS__ -I/opt/csw/X11/include
+RPATHOPTNAME = -R
+NETWORKLD = -lsocket -lnsl
+LINKERISCOMPILER = Y
+CFLAGS_SHLIB += -fPIC
+TIFFHDR_DIR = /opt/csw/include -I/opt/csw/X11/include
+TIFFLIB = libtiff.so
+JPEGLIB = libjpeg.so
+ZHDR_DIR = /opt/csw/include -I/opt/csw/X11/include
+ZLIB = libz.so
+X11LIB = /usr/X11R6/lib/libX11.so
+NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/

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