diff options
| author | pat <pat@FreeBSD.org> | 2002-07-06 09:17:43 +0800 |
|---|---|---|
| committer | pat <pat@FreeBSD.org> | 2002-07-06 09:17:43 +0800 |
| commit | 3ae6bbc008097c5b6dbfdc21088c62eabba087ce (patch) | |
| tree | a2396d014d6bccc327fec3b487acb6a53465f13d /graphics/netpbm/files | |
| parent | d1b4ea921c3737204eb7d0c19e2f3accfc40019a (diff) | |
| download | freebsd-ports-gnome-3ae6bbc008097c5b6dbfdc21088c62eabba087ce.tar.gz freebsd-ports-gnome-3ae6bbc008097c5b6dbfdc21088c62eabba087ce.tar.zst freebsd-ports-gnome-3ae6bbc008097c5b6dbfdc21088c62eabba087ce.zip | |
Update to 10.3
PR: 40245
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Diffstat (limited to 'graphics/netpbm/files')
3 files changed, 13 insertions, 51 deletions
diff --git a/graphics/netpbm/files/patch-converter::other::pnmtopng.c b/graphics/netpbm/files/patch-converter::other::pnmtopng.c index 33a21e9fda10..9a5fbf3a7037 100644 --- a/graphics/netpbm/files/patch-converter::other::pnmtopng.c +++ b/graphics/netpbm/files/patch-converter::other::pnmtopng.c @@ -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 --git a/graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile b/graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile deleted file mode 100644 index 325f788b4a33..000000000000 --- a/graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile +++ /dev/null @@ -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 --git a/graphics/netpbm/files/patch-other::pnmarith.c b/graphics/netpbm/files/patch-other::pnmarith.c deleted file mode 100644 index 924657f51e6a..000000000000 --- a/graphics/netpbm/files/patch-other::pnmarith.c +++ /dev/null @@ -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': |