Dave,

Tested to build on 10.5/i386.

This is an update for netpbm10 to their latest stable (Fink has their super stable version). Biggest change is using libpng14 (libpng15 dies because of the usual removed API stuff in 14->15). netpbm no longer releases tarballs for their stable tree, but their ViewVC does have a download as tarball feature, so it was easy to grab the latest stable release (but will need to be stored elsewhere while finkmirrors pick it up since it is in theory a moving target). Only the filesystem bits from the patch were kept in the attached files. Extra Dependencies were found for netpbm-bin, and it builds with MaxBuildJobs: true (which it didn't previously).

Since libjasper is now being pulled in, there might be a need to play with the patch in Makefile.config.fink to properly set the header and/or library location. I didn't play with it, although otool -L did seem to show the right file.

Hanspeter

--
Hanspeter Niederstrasser
hanspeter AT snaggledworks DOT com

diff -Naur netpbm-10.35.81/Makefile.config.fink 
netpbm-10.35.81-patched/Makefile.config.fink
--- netpbm-10.35.81/Makefile.config.fink        1969-12-31 19:00:00.000000000 
-0500
+++ netpbm-10.35.81-patched/Makefile.config.fink        2011-07-20 
07:25:27.000000000 -0400
@@ -0,0 +1,18 @@
+#
+# Configuration for fink
+#
+
+DEFAULT_TARGET = nonmerge
+NETPBMLIBTYPE  = dylib
+NETPBMLIBSUFFIX        = dylib
+STATICLIB_TOO  = n
+NETPBM_RUNTIME_PATH = @PREFIX@/lib
+CC             = cc -no-cpp-precomp
+CFLAGS         = -Os -fstrict-aliasing -funroll-all-loops -isystem 
@PREFIX@/include
+CFLAGS_SHLIB   = -fno-common
+LADD                   = -L@PREFIX@/lib
+LDSHLIB                = -dynamiclib -install_name 
$(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib -compatibility_version 
$$(($(MAJ)+1)) -current_version $$(($(MAJ)+1)).$(MIN)
+TIFFLIB                = libtiff.dylib
+JPEGLIB                = libjpeg.dylib
+PNGLIB         = libpng.dylib
+ZLIB           = libz.dylib
diff -Naur netpbm-10.35.81/buildtools/installnetpbm.pl 
netpbm-10.35.81-patched/buildtools/installnetpbm.pl
--- netpbm-10.35.81/buildtools/installnetpbm.pl 2007-01-14 21:50:02.000000000 
-0500
+++ netpbm-10.35.81-patched/buildtools/installnetpbm.pl 2011-07-20 
07:25:27.000000000 -0400
@@ -117,7 +117,7 @@
     } elsif ($ENV{OSTYPE} && $ENV{OSTYPE} eq "msdosdjgpp") {
         $default = "/dev/env/DJDIR";
     } else {
-        $default = "/usr/local/netpbm";
+        $default = "@PREFIX@";
     }
 
     my $response = prompt("install prefix", $default);
@@ -572,7 +572,7 @@
     my $manDir;
 
     while (!$manDir) {
-        my $default = "$prefix/man";
+        my $default = "$prefix/share/man";
 
         my $response = prompt("man page directory", $default);
 
@@ -771,9 +771,9 @@
 
     print("\n");
 
-    removeObsoleteManPage($manDir);
+#    removeObsoleteManPage($manDir);
 
-    makeInManwebPath("$manDir/web");
+#    makeInManwebPath("$manDir/web");
     
     $$mandirR = $manDir;
 }
Package: netpbm10
Version: 10.47.29
Revision: 1
BuildDepends: libjpeg8, libpng14, libtiff, fink (>= 0.24.12-1)
Depends: %N-shlibs (= %v-%r)
Replaces: netpbm
Conflicts: netpbm
BuildDependsOnly: True
Source: http://%n.svn.sourceforge.net/viewvc/%n/stable/?view=tar
SourceDirectory: stable
SourceRename: %n-%v.tar.gz
Source-MD5: dc456c874843dc4e4a4fefdc00c96bc5
NoSetMAKEFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: %p/lib
PatchFile: %n.patch
PatchFile-MD5: 22220f658201c2aacddbb723deb3b90b
PatchScript: <<
 sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
 cat config.mk.in Makefile.config.fink >config.mk
<<
UseMaxBuildJobs: true
CompileScript: make
InstallScript: <<
 make package pkgdir=`pwd`/package SYMLINK='ln -s'
 install -d -m 755 %i/share
 printf "package\n%i\n\n\n\n\n\n\n" | ./installnetpbm
 rm -rf %i/share/man/web
<<
SplitOff: <<
  Package: %N-shlibs
  Files: lib/libnetpbm.*.dylib
  Shlibs: %p/lib/libnetpbm.10.dylib 11.0.0 %n (>= 10.12-1)
  Conflicts: netpbm (<< 9.25-1)
  DocFiles: README doc/*
<<
SplitOff2: <<
  Package: netpbm-bin
  Depends: %N-shlibs (= %v-%r), libiconv, libjasper.1-shlibs, libjpeg8-shlibs, 
libpng14-shlibs, libtiff-shlibs, libxml2-shlibs
  Files: bin share/man/man1 share/man/man3
  DocFiles: README doc/*
<<
DocFiles: README doc/*
Description: Graphics manipulation programs and libraries
DescPort: <<
 Change by J-F Mertens:  pnmtopng.c extracted from old version of netpbm
 since the one in the current version does not work with, e.g., latex2html.

 Change undone in Feb. 2007 because the 'old' pnmtopng.c no longer compiles.
 Hopefully this does not break latex2html.

 Patches for gcc 4.0 compatibility thanks to Matt Sachs.

 Security patches thanks to Tomoaki Okayama:
  CVE-2005-2471: netpbm-10.25-CAN-2005-2471.patch             (from RedHat)
  CVE-2005-2978: netpbm-10.26.12-pnmtopng-CAN-2005-2978.patch (from SUSE)
  CVE-2005-3662: netpbm-10.26.12-pnmtopng-overflow.patch      (from SUSE)
<<
License: OSI-Approved
Homepage: http://netpbm.sourceforge.net
Maintainer: Dave Morrison <d...@finkproject.org>
DescPackaging: <<
 Originally packaged by Masanori Sekino.
<<
------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel

Reply via email to