Attachment 23375 Details for Bug 40245 – file.diff

[patch] file.diff

file.diff (text/plain), 4.79 KB, created by tkato on 2002-07-06 01:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-07-06 01:20:08 UTC

Size: 4.79 KB

patch

obsolete

>diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
>--- /usr/ports/graphics/netpbm/Makefile	Fri Jun 21 19:10:53 2002
>+++ graphics/netpbm/Makefile	Sat Jul  6 00:00:00 2002
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	netpbm
>-PORTVERSION=	10.2
>+PORTVERSION=	10.3
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -19,6 +19,7 @@
> 		png.5:${PORTSDIR}/graphics/png \
> 		jbig.1:${PORTSDIR}/graphics/jbigkit
> 
>+USE_PERL5=	yes
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
> MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"
>diff -urN /usr/ports/graphics/netpbm/distinfo graphics/netpbm/distinfo
>--- /usr/ports/graphics/netpbm/distinfo	Fri Jun 21 19:10:53 2002
>+++ graphics/netpbm/distinfo	Sat Jul  6 00:00:00 2002
>@@ -1 +1 @@
>-MD5 (netpbm-10.2.tgz) = 871cf2c42f101fcd57c51ad415160819
>+MD5 (netpbm-10.3.tgz) = 73ffe1962788d585e041684260dfadae
>diff -urN /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopng.c graphics/netpbm/files/patch-converter::other::pnmtopng.c
>--- /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopng.c	Thu Jun 20 05:21:21 2002
>+++ graphics/netpbm/files/patch-converter::other::pnmtopng.c	Sat Jul  6 00:00:00 2002
>@@ -1,16 +1,16 @@
>---- converter/other/pnmtopng.c.orig	Thu Apr 25 09:37:11 2002
>-+++ converter/other/pnmtopng.c	Tue Jun 18 00:00:00 2002
>-@@ -1857,8 +1857,13 @@
>-       fprintf(stderr,"pnmtopng version %s.\n", VERSION);
>-       fprintf(stderr, "   Compiled with libpng %s; using libpng %s.\n",
>-         PNG_LIBPNG_VER_STRING, png_libpng_ver);
>+--- converter/other/pnmtopng.c.orig	Sun Jun 23 12:51:37 2002
>++++ converter/other/pnmtopng.c	Sat Jul  6 00:00:00 2002
>+@@ -1903,8 +1903,13 @@
>+     */
>+     fprintf(stderr, "   Compiled with libpng %s.\n",
>+             PNG_LIBPNG_VER_STRING);
> +#ifdef zlib_version
>-       fprintf(stderr, "   Compiled with zlib %s; using zlib %s.\n",
>-         ZLIB_VERSION, zlib_version);
>+     fprintf(stderr, "   Compiled with zlib %s; using zlib %s.\n",
>+             ZLIB_VERSION, zlib_version);
> +#else
>-+      fprintf(stderr, "   Compiled with zlib %s.\n",
>-+        ZLIB_VERSION);
>++    fprintf(stderr, "   Compiled with zlib %s.\n",
>++            ZLIB_VERSION);
> +#endif
>-       fprintf(stderr,    
>-         "   Compiled with %d-bit netpbm support (PPM_OVERALLMAXVAL = %d).\n",
>-         pm_maxvaltobits (PPM_OVERALLMAXVAL), PPM_OVERALLMAXVAL);
>+     fprintf(stderr,    
>+             "   Compiled with %d-bit netpbm support "
>+             "(PPM_OVERALLMAXVAL = %d).\n",
>diff -urN /usr/ports/graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile
>--- /usr/ports/graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile	Thu Jun 20 05:21:21 2002
>+++ graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile	Thu Jan  1 09:00:00 1970
>@@ -1,23 +0,0 @@
>---- converter/ppm/ppmtompeg/Makefile.orig	Mon Jun 10 13:35:38 2002
>-+++ converter/ppm/ppmtompeg/Makefile	Tue Jun 18 00:00:00 2002
>-@@ -8,18 +8,12 @@
>- include $(BUILDDIR)/Makefile.config
>- 
>- JPEGLD =
>--ifeq ($(JPEGLIB_DIR),NONE)
>-+ifeq ($(JPEGLIB),NONE)
>-   # 'nojpeg' is a module that implements all the jpeg access routines as
>-   # error messages that tell you we don't have jpeg capability
>-   JPEG_MODULE = nojpeg
>- else
>--  ifneq ($(JPEGLIB_DIR)x,x)
>--    JPEGLD += -L$(JPEGLIB_DIR)
>--    ifeq ($(NEED_RUNTIME_PATH),Y)
>--      JPEGLD += -R$(JPEGLIB_DIR)
>--    endif
>--  endif
>--  JPEGLD += -ljpeg
>-+  JPEGLD += `$(LIBOPT) $(LIBOPTOPT) $(JPEGLIB)`
>-   # 'jpeg' is a module that accesses J-movies via the JPEG library.
>-   JPEG_MODULE = jpeg
>- endif
>diff -urN /usr/ports/graphics/netpbm/files/patch-other::pnmarith.c graphics/netpbm/files/patch-other::pnmarith.c
>--- /usr/ports/graphics/netpbm/files/patch-other::pnmarith.c	Thu Jun 20 05:21:21 2002
>+++ graphics/netpbm/files/patch-other::pnmarith.c	Thu Jan  1 09:00:00 1970
>@@ -1,15 +0,0 @@
>---- other/pnmarith.c.orig	Sun Aug 13 13:08:04 1995
>-+++ other/pnmarith.c	Tue Jun 18 00:00:00 2002
>-@@ -147,9 +147,9 @@
>- 		    break;
>- 
>- 		    case '*':
>--		    r1 = r1 * r2 / maxval3;
>--		    g1 = g1 * g2 / maxval3;
>--		    b1 = b1 * b2 / maxval3;
>-+		    r1 = (unsigned) r1 * r2 / maxval3;
>-+		    g1 = (unsigned) g1 * g2 / maxval3;
>-+		    b1 = (unsigned) b1 * b2 / maxval3;
>- 		    break;
>- 
>- 		    case 'D':
>diff -urN /usr/ports/graphics/netpbm/pkg-plist graphics/netpbm/pkg-plist
>--- /usr/ports/graphics/netpbm/pkg-plist	Fri Jun 21 19:10:56 2002
>+++ graphics/netpbm/pkg-plist	Sat Jul  6 00:00:00 2002
>@@ -33,14 +33,17 @@
> bin/mtvtoppm
> bin/neotoppm
> bin/palmtopnm
>+bin/pamarith
> bin/pamchannel
> bin/pamcut
> bin/pamdeinterlace
> bin/pamdice
> bin/pamendian
> bin/pamfile
>+bin/pamfunc
> bin/pamoil
> bin/pamseq
>+bin/pamslice
> bin/pamstack
> bin/pamstretch
> bin/pamstretch-gen
>@@ -90,6 +93,7 @@
> bin/pbmupc
> bin/pcdovtoppm
> bin/pcxtoppm
>+bin/pgmabel
> bin/pgmbentley
> bin/pgmcrater
> bin/pgmedge

Actions: View | Diff

Attachments on bug 40245: 23375