Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26248
Modified Files:
netpbm10.info netpbm10.patch
Log Message:
netpbm 10.47.44
switch over to stable tree
Which allows newer dep libraries
Prepare for netpbm11/advanced if necessary
Take over maintainership with approval
Index: netpbm10.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/netpbm10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- netpbm10.patch 23 Jul 2011 12:14:41 -0000 1.1
+++ netpbm10.patch 11 Jun 2013 17:54:17 -0000 1.2
@@ -1,28 +1,32 @@
-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 @@
+diff -Naur netpbm-10.47.44-orig/Makefile.config.fink
netpbm-10.47.44/Makefile.config.fink
+--- netpbm-10.47.44-orig/Makefile.config.fink 1969-12-31 19:00:00.000000000
-0500
++++ netpbm-10.47.44/Makefile.config.fink 2013-06-03 10:45:10.000000000
-0400
+@@ -0,0 +1,22 @@
+#
+# Configuration for fink
-+#
++# Copied from a manual run of ./configure (plus some additions)
+
+DEFAULT_TARGET = nonmerge
+NETPBMLIBTYPE = dylib
+NETPBMLIBSUFFIX = dylib
+STATICLIB_TOO = n
-+NETPBM_RUNTIME_PATH = @PREFIX@/lib
++NETPBMLIB_RUNTIME_PATH = @PREFIX@/lib
+CC = cc -no-cpp-precomp
-+CFLAGS = -Os -fstrict-aliasing -funroll-all-loops -isystem
@PREFIX@/include
++CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized
-Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef
-MD
+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)
++LDSHLIB = -dynamiclib -install_name
$(NETPBMLIB_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib -compatibility_version
$$(($(MAJ)+1)) -current_version $$(($(MAJ)+1)).$(MIN)
++LINKERISCOMPILER = Y
++CFLAGS_SHLIB += -fPIC
+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
++JBIGLIB = libjbig.dylib
++JASPERLIB = libjasper.dylib
++
+diff -Naur netpbm-10.47.44-orig/buildtools/installnetpbm.pl
netpbm-10.47.44/buildtools/installnetpbm.pl
+--- netpbm-10.47.44-orig/buildtools/installnetpbm.pl 2013-06-03
10:18:28.000000000 -0400
++++ netpbm-10.47.44/buildtools/installnetpbm.pl 2013-06-03
10:48:01.000000000 -0400
@@ -117,7 +117,7 @@
} elsif ($ENV{OSTYPE} && $ENV{OSTYPE} eq "msdosdjgpp") {
$default = "/dev/env/DJDIR";
@@ -32,7 +36,7 @@
}
my $response = prompt("install prefix", $default);
-@@ -572,7 +572,7 @@
+@@ -584,7 +584,7 @@
my $manDir;
while (!$manDir) {
@@ -41,7 +45,7 @@
my $response = prompt("man page directory", $default);
-@@ -771,9 +771,9 @@
+@@ -783,9 +783,9 @@
print("\n");
@@ -53,10 +57,10 @@
$$mandirR = $manDir;
}
-diff -Naur netpbm-10.35.81/converter/other/pnmtopng.c
netpbm-10.35.81-patched/converter/other/pnmtopng.c
---- netpbm-10.35.81/converter/other/pnmtopng.c 2010-12-10 13:19:40.000000000
-0500
-+++ netpbm-10.35.81-patched/converter/other/pnmtopng.c 2011-07-20
07:25:27.000000000 -0400
-@@ -527,7 +527,7 @@
+diff -Naur netpbm-10.47.44-orig/converter/other/pnmtopng.c
netpbm-10.47.44/converter/other/pnmtopng.c
+--- netpbm-10.47.44-orig/converter/other/pnmtopng.c 2013-06-03
10:18:31.000000000 -0400
++++ netpbm-10.47.44/converter/other/pnmtopng.c 2013-06-03 10:49:18.000000000
-0400
+@@ -529,7 +529,7 @@
unsigned int * const bestMatchP) {
unsigned int paletteIndex;
@@ -65,7 +69,7 @@
unsigned int bestMatch;
assert(paletteSize > 0);
-@@ -1427,9 +1427,9 @@
+@@ -1464,9 +1464,9 @@
colorhist_vector chv;
unsigned int colors;
@@ -77,7 +81,7 @@
getChv(ifP, rasterPos, cols, rows, maxval, format, MAXCOLORS,
&chv, &colors);
-@@ -2348,7 +2348,7 @@
+@@ -2385,7 +2385,7 @@
/* The color part of the color/alpha palette passed to the PNG
compressor
*/
@@ -86,27 +90,17 @@
gray trans_pnm[MAXCOLORS];
png_byte trans[MAXCOLORS];
-diff -Naur netpbm-10.35.81/lib/libpbm3.c netpbm-10.35.81-patched/lib/libpbm3.c
---- netpbm-10.35.81/lib/libpbm3.c 2008-03-28 14:58:06.000000000 -0400
-+++ netpbm-10.35.81-patched/lib/libpbm3.c 2011-07-20 07:25:27.000000000
-0400
-@@ -117,7 +117,7 @@
- ) ];
- */
-
-- typedef int v8qi __attribute__ ((mode(V8QI)));
-+ typedef int v8qi __attribute__ ((vector_size(8)));
- typedef int di __attribute__ ((mode(DI)));
+diff -Naur netpbm-10.47.44-orig/pm_config.in.h netpbm-10.47.44/pm_config.in.h
+--- netpbm-10.47.44-orig/pm_config.in.h 2013-06-03 10:18:34.000000000
-0400
++++ netpbm-10.47.44/pm_config.in.h 2013-06-03 10:51:28.000000000 -0400
+@@ -61,8 +61,8 @@
- di const zero64 = 0; /* to clear with PXOR */
-diff -Naur netpbm-10.35.81/pm_config.in.h
netpbm-10.35.81-patched/pm_config.in.h
---- netpbm-10.35.81/pm_config.in.h 2006-10-18 14:29:13.000000000 -0400
-+++ netpbm-10.35.81-patched/pm_config.in.h 2011-07-20 07:25:27.000000000
-0400
-@@ -68,7 +68,7 @@
- #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
- #else
- #define RGB_DB1 "/usr/lib/X11/rgb.txt"
--#define RGB_DB2 "/usr/share/X11/rgb.txt"
-+#define RGB_DB2 "/usr/X11/share/X11/rgb.txt"
- #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
- #endif
+ #define RGB_DB_PATH \
+-"/usr/share/netpbm/rgb.txt:" \
++"@PREFIX@/share/netpbm/rgb.txt:" \
+ "/usr/lib/X11/rgb.txt:" \
+-"/usr/share/X11/rgb.txt:" \
++"/usr/X11/share/X11/rgb.txt:" \
+ "/usr/X11R6/lib/X11/rgb.txt"
+ /* CONFIGURE: This is the name of an environment variable that tells
Index: netpbm10.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/netpbm10.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- netpbm10.info 2 Jun 2013 18:34:26 -0000 1.4
+++ netpbm10.info 11 Jun 2013 17:54:17 -0000 1.5
@@ -1,28 +1,47 @@
Package: netpbm10
-Version: 10.35.89
-Revision: 1
-BuildDepends: libjpeg8, libpng3, libtiff, fink (>= 0.24.12-1)
+Version: 10.47.44
+Revision: 2
+BuildDepends: <<
+ fink-package-precedence,
+ libiconv-dev,
+ libjpeg8,
+ libpng14,
+ libtiff5,
+ libxml2
+<<
Depends: %N-shlibs (= %v-%r)
-Replaces: netpbm
-Conflicts: netpbm
+Conflicts: <<
+ netpbm, netpbm10, netpbm11
+<<
+# Replaces netpbm-bin because man3 and man5 dirs were previously installed
+# in the wrong SplitOff.
+Replaces: <<
+ netpbm-bin (<< 10.47.44-2),
+ netpbm, netpbm10, netpbm11
+<<
BuildDependsOnly: True
-Source: mirror:sourceforge:netpbm/netpbm-%v.tgz
-Source-MD5: ff609d95f43cc8bf6ea9c3667a15b610
+Source: http://www.snaggledworks.com/fink/src/netpbm-%v.tar.bz2
+Source-MD5: 200cc18f9635d41e8bc9a2f37c9efe8c
+Source-Checksum: SHA1(d10df2f58d9fa982d82a621204026c9bfd7553ae)
NoSetMAKEFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: %p/lib
PatchFile: %n.patch
-PatchFile-MD5: 7f1bbffe63a1545174ce4bf4d7c7e13a
+PatchFile-MD5: 9db143091ceddcad05150ec01fdc75ba
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
- cat Makefile.config.in Makefile.config.fink >Makefile.config
+ cat config.mk.in Makefile.config.fink >config.mk
+<<
+CompileScript: <<
+ make
+ fink-package-precedence --depfile-ext='\.d'
--prohibit-bdep=netpbm,netpbm10,netpbm11 .
<<
-CompileScript: make -j1
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
+ install -d -m 755 %i/share %i/share/netpbm
+ printf "package\n%i\n\n\n\n%i/share/netpbm\n\n\n" | ./installnetpbm
rm -rf %i/share/man/web
+ mv %i/bin/doc.url %i/share/netpbm
<<
SplitOff: <<
Package: %N-shlibs
@@ -33,33 +52,49 @@
<<
SplitOff2: <<
Package: netpbm-bin
- Depends: %N-shlibs (= %v-%r), libjpeg8-shlibs, libpng3-shlibs, libtiff-shlibs
- Files: bin share/man/man1 share/man/man3
+ Depends: <<
+ %N-shlibs (= %v-%r),
+ libiconv,
+ libjasper.1-shlibs,
+ libjbig-shlibs,
+ libjpeg8-shlibs,
+ libpng14-shlibs,
+ libtiff5-shlibs,
+ libxml2-shlibs
+ <<
+ # Replaces netpbm10 because man3 and man5 dirs were previously installed
+ # in the wrong SplitOff.
+ Replaces: netpbm10 (<< 10.47.44-2)
+ Files: <<
+ bin
+ share/man/man1
+ share/man/man5
+ share/netpbm
+ <<
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>
+Maintainer: Hanspeter Niederstrasser <nie...@users.sourceforge.net>
DescPackaging: <<
Originally packaged by Masanori Sekino.
+ Previously maintained by: Dave Morrison <d...@finkproject.org>
- Note: we cannot update the dependency from libpng3 to libpng14 or later
- until a newer netpbm10 (at least 10.47.04) is declared sufficiently stable
- to package for fink
+ Tarball generated with these commands:
+ svn checkout -r 1897 http://svn.code.sf.net/p/netpbm/code/stable/
netpbm-10.47.44
+ tar cfj netpbm-10.47.44.tar.bz2 netpbm-10.47.44
+
+ nieder:
+ Change from 'super stable' to 'stable' trees.
+ 'Stable' tree fails with libpng15, so keep at libpng14 for now.
+ Reorganize man* to put into proper SplitOff.
+ Move data files from %p/lib to %p/share/netpbm and transfer to -bin SplitOff.
+ This matches Debian's layout.
<<
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
