From cea4de3c917fa9bbd8b1a66fa5c621197e556d92 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 4 Apr 2011 09:17:24 +0000 Subject: Changes 10.35.80: * asciitopgm: fix bug: memory corruption on too-long lines. * asciitopgm: fix bug: improper handling of blank lines. Changes 10.35.79: * configure: don't default to /usr/X11R6/lib/libX11.so just because /usr/X11R6 exists. /usr/X11R6/lib must exist. * pngtopnm: fix bug: -verbose reports history chunk present when it's really a palette. --- graphics/netpbm/Makefile | 17 ++++++----------- graphics/netpbm/PLIST | 14 +------------- graphics/netpbm/distinfo | 11 ++++++----- graphics/netpbm/hacks.mk | 6 +++--- graphics/netpbm/patches/patch-af | 4 ++-- graphics/netpbm/patches/patch-lib_libpbm3.c | 15 +++++++++++++++ 6 files changed, 33 insertions(+), 34 deletions(-) create mode 100644 graphics/netpbm/patches/patch-lib_libpbm3.c (limited to 'graphics/netpbm') diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 38526cc6395..9c44edfcb5a 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.172 2011/01/15 18:37:46 tron Exp $ +# $NetBSD: Makefile,v 1.173 2011/04/04 09:17:24 adam Exp $ -DISTNAME= netpbm-10.35.78 +DISTNAME= netpbm-10.35.80 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/} EXTRACT_SUFX= .tgz @@ -8,8 +8,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= adam@NetBSD.org HOMEPAGE= http://netpbm.sourceforge.net/ COMMENT= Toolkit for conversion of images between different formats - -MAKE_JOBS_SAFE= no +LICENSE= gnu-gpl-v2 PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir @@ -74,6 +73,8 @@ MAKE_ENV+= NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so" CPPFLAGS+= -DSGI_IDO_CC .endif +INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/netpbm + pre-configure: ${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config @@ -84,17 +85,11 @@ post-install: cd ${STAGEDIR} && \ ${MV} link/* lib && \ ${RM} -rf link man/web && \ - (rmdir man || ${TRUE}) && \ - ${MKDIR} share/doc/netpbm && \ - ${CP} ${WRKSRC}/doc/* share/doc/netpbm && \ - ${MKDIR} ${PKGMANDIR}/man1 && \ - ${MV} share/doc/netpbm/*.1 ${PKGMANDIR}/man1 && \ + ${MKDIR} share && \ ${MV} misc share/netpbm && \ ${CHOWN} -R ${BINOWN}:${BINGRP} . && \ pax -rwpppm . ${DESTDIR}${PREFIX} ${RM} -fr ${STAGEDIR} - ${FIND} ${DESTDIR}${PREFIX}/share/doc/netpbm -type f -print | \ - ${XARGS} ${CHMOD} ${NONBINMODE} .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST index adb0f09b6e3..f0c65cc780e 100644 --- a/graphics/netpbm/PLIST +++ b/graphics/netpbm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2010/07/14 02:39:17 dholland Exp $ +@comment $NetBSD: PLIST,v 1.8 2011/04/04 09:17:24 adam Exp $ bin/411toppm bin/anytopnm bin/asciitopgm @@ -381,7 +381,6 @@ man/man1/mgrtopbm.1 man/man1/mrftopbm.1 man/man1/mtvtoppm.1 man/man1/neotoppm.1 -man/man1/netpbm.1 man/man1/palmtopnm.1 man/man1/pamaddnoise.1 man/man1/pamarith.1 @@ -652,17 +651,6 @@ man/man5/pbm.5 man/man5/pgm.5 man/man5/pnm.5 man/man5/ppm.5 -share/doc/netpbm/COPYRIGHT.PATENT -share/doc/netpbm/GPL_LICENSE.txt -share/doc/netpbm/HISTORY -share/doc/netpbm/INSTALL -share/doc/netpbm/Netpbm.programming -share/doc/netpbm/README.CYGWIN -share/doc/netpbm/README.DJGPP -share/doc/netpbm/USERDOC -share/doc/netpbm/copyright_summary -share/doc/netpbm/lgpl_v21.txt -share/doc/netpbm/netpbm.html share/netpbm/palmcolor8.map share/netpbm/palmgray1.map share/netpbm/palmgray2.map diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 7874726aaee..692d3e3c5f8 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.82 2011/01/15 18:37:46 tron Exp $ +$NetBSD: distinfo,v 1.83 2011/04/04 09:17:24 adam Exp $ -SHA1 (netpbm-10.35.78.tgz) = 5749b108fb2c1b3369c43b70245197fec3a751e5 -RMD160 (netpbm-10.35.78.tgz) = 40e193485857114f5989cc1a6af166d6b841b273 -Size (netpbm-10.35.78.tgz) = 2547337 bytes +SHA1 (netpbm-10.35.80.tgz) = e2bc82c2fc76775a837596f9774f4b24275f794a +RMD160 (netpbm-10.35.80.tgz) = f8c6dc01ada947f27dd851d954d240f248e07c55 +Size (netpbm-10.35.80.tgz) = 2547601 bytes SHA1 (patch-aa) = fb94fb43c4c63113e9c720ea399a5cecb2c79977 SHA1 (patch-ab) = 4d6508ad837d455ea3f8ebaa704f33f9e089f6e0 SHA1 (patch-ac) = 11c029673a53e9344a477db6cfcb46f32e9f6a93 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1 -SHA1 (patch-af) = 5f01bb5bcbdd5b290955b9ad3a9ebc36be84b0ec +SHA1 (patch-af) = e8965899d577648c6144098f2aa8e1594551666a SHA1 (patch-ag) = 093fe392a3e6156cc55f225a6f139842c0d00570 SHA1 (patch-ah) = 10d7e7f59a0d7c857531db872cd35dc02a048ba1 SHA1 (patch-ai) = 083ddf8b36a74ca39508b6a3b0c35956ac19fbb7 @@ -25,4 +25,5 @@ SHA1 (patch-db) = 23a05e54043ee84a0b7ec507a383d5cd8adfcca5 SHA1 (patch-dc) = 8ed1365dccf5abb0e158a4f7a65749ff5b244ef3 SHA1 (patch-dd) = 2acbcffeef96fd8b0419e60fa44a1eaf9f4b291b SHA1 (patch-eb) = 8af326d4be7e280764843ce213672186fce3f9a8 +SHA1 (patch-lib_libpbm3.c) = 42e7d49fecb559fb1d55345e5053337e60f7458b SHA1 (patch-ppmdraw) = d901a690f8f21a1af940129d1edef509b369ea1a diff --git a/graphics/netpbm/hacks.mk b/graphics/netpbm/hacks.mk index ee8c8cd6aa2..b29352a7be6 100644 --- a/graphics/netpbm/hacks.mk +++ b/graphics/netpbm/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.7 2008/02/08 10:34:19 tnn Exp $ +# $NetBSD: hacks.mk,v 1.8 2011/04/04 09:17:24 adam Exp $ .if !defined(NETPBM_HACKS_MK) NETPBM_HACKS_MK= # defined @@ -40,7 +40,7 @@ post-wrapper: ### .if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc) _BAD_GCC_BUILD!= ${CC} --version | (${GREP} -c '^powerpc-apple-darwin8-gcc-4\.0\.0.*build\ 4061' || ${TRUE}) -. if ${_BAD_GCC_BUILD} == "1" +. if ${_BAD_GCC_BUILD} == "1" PKG_HACKS+= apple-gcc-4-bug BUILDLINK_TRANSFORM+= rm:-finline-floor # unknown option to gcc-3.3 BUILDLINK_TRANSFORM+= rm:-mpowerpc64 # prevent internal compiler error @@ -48,7 +48,7 @@ BUILDLINK_TRANSFORM+= rm:-mpowerpc64 # prevent internal compiler error post-wrapper: ${SED} -e s,/gcc,/gcc-3.3, ${WRKDIR}/.gcc/bin/gcc > ${WRKDIR}/.gcc/bin/gcc-3.3 && ${MV} -f ${WRKDIR}/.gcc/bin/gcc-3.3 ${WRKDIR}/.gcc/bin/gcc && ${CHMOD} a+rx ${WRKDIR}/.gcc/bin/gcc # use gcc-3.3 instead of gcc-4.0.0 -. endif +. endif .endif .endif diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af index 98f119c66bc..3e1c3eee8b0 100644 --- a/graphics/netpbm/patches/patch-af +++ b/graphics/netpbm/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.15 2011/01/15 18:37:46 tron Exp $ +$NetBSD: patch-af,v 1.16 2011/04/04 09:17:24 adam Exp $ Fix build with png-1.5. @@ -232,7 +232,7 @@ Fix build with png-1.5. else pm_message("bKGD chunk: not present"); -- if (info_ptr->valid & PNG_INFO_PLTE) +- if (info_ptr->valid & PNG_INFO_hIST) + if (png_get_hIST(png_ptr, info_ptr, &hist) & PNG_INFO_hIST) pm_message("hIST chunk: present"); else diff --git a/graphics/netpbm/patches/patch-lib_libpbm3.c b/graphics/netpbm/patches/patch-lib_libpbm3.c new file mode 100644 index 00000000000..d357b486917 --- /dev/null +++ b/graphics/netpbm/patches/patch-lib_libpbm3.c @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_libpbm3.c,v 1.1 2011/04/04 09:17:24 adam Exp $ + +Clang does not support SSE extensions at the moment. + +--- lib/libpbm3.c.orig 2011-03-29 09:31:31.000000000 +0000 ++++ lib/libpbm3.c +@@ -23,7 +23,7 @@ + #if defined(__GNUC__) && \ + (__GNUC__ * 100 + __GNUC_MINOR__ >= 301) && \ + (__GNUC__ * 100 + __GNUC_MINOR__ < 403) && \ +- defined (__SSE__) ++ defined (__SSE__) && !defined(__clang__) + /* GCC 4.3 does have the facility, but it is different from what this + code knows how to use. In particular, the calls to + __builtin_ia32_pcmpeqb() and __builtin_ia32_pmovmskb() fail to -- cgit v1.2.3