* [gentoo-commits] repo/proj/prefix:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
@ 2021-01-06 12:06 Fabian Groffen
0 siblings, 0 replies; only message in thread
From: Fabian Groffen @ 2021-01-06 12:06 UTC (permalink / raw
To: gentoo-commits
commit: ada12d3b1aa803e6f53604c31c21ef7457027257
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 12:04:19 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 12:04:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ada12d3b
media-libs/netpbm: drop package from Prefix
it is so old it cannot even be installed any more, so it is used by noone
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
media-libs/netpbm/Manifest | 5 -
media-libs/netpbm/files/netpbm-10.31-build.patch | 50 -----
.../files/netpbm-10.35.0-pnmtopng-zlib.patch | 12 -
media-libs/netpbm/files/netpbm-10.35.0-xml2.patch | 38 ----
.../netpbm/files/netpbm-10.41.0-interix.patch | 26 ---
media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch | 16 --
.../netpbm/files/netpbm-10.42.0-interix.patch | 26 ---
.../netpbm/files/netpbm-10.44.00-fontdir.patch | 50 -----
.../netpbm/files/netpbm-10.46.00-darwin.patch | 15 --
.../netpbm-10.46.00-min_DCT_v_scaled_size.patch | 35 ---
.../netpbm/files/netpbm-10.46.00-solaris.patch | 17 --
.../netpbm/files/netpbm-10.48.00-interix.patch | 10 -
media-libs/netpbm/files/netpbm-10.48.00-pngx.patch | 51 -----
.../files/netpbm-10.48.00-pnmtopng-zlib.patch | 12 -
.../netpbm/files/netpbm-10.48.00-solaris.patch | 22 --
.../files/netpbm-10.49.00-darwin-signals.patch | 16 --
.../netpbm/files/netpbm-10.49.00-sigpower.patch | 23 --
.../files/netpbm-10.51.00-pnmconvol-nooffset.patch | 83 -------
.../files/netpbm-10.51.00-ppmtompeg-free.patch | 35 ---
.../netpbm/files/netpbm-10.51.00-solaris.patch | 16 --
.../files/netpbm-10.51.00-underlinking.patch | 16 --
.../netpbm-10.57.00-solaris-xopensource.patch | 22 --
.../netpbm-10.60.01-strcaseeq-strcasecmp.patch | 13 --
.../netpbm/files/netpbm-10.76.00-build.patch | 38 ----
.../netpbm/files/netpbm-10.76.00-misc-deps.patch | 68 ------
.../files/netpbm-10.76.00-pbmtext-test.patch | 22 --
.../netpbm/files/netpbm-10.76.00-solaris.patch | 24 --
media-libs/netpbm/files/netpbm-10.76.00-test.patch | 248 ---------------------
media-libs/netpbm/files/netpbm-prefix.patch | 56 -----
media-libs/netpbm/metadata.xml | 14 --
media-libs/netpbm/netpbm-10.51.00-r2.ebuild | 194 ----------------
media-libs/netpbm/netpbm-10.57.00.ebuild | 166 --------------
media-libs/netpbm/netpbm-10.59.00.ebuild | 169 --------------
media-libs/netpbm/netpbm-10.76.00.ebuild | 195 ----------------
34 files changed, 1803 deletions(-)
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
deleted file mode 100644
index 3a5dd5f2e2..0000000000
--- a/media-libs/netpbm/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST netpbm-10.51.00-libpng-1.5.patch.bz2 8120 BLAKE2B 47b9e3f85f2d959ca56dd4ff893c590379cfc3b4cc3dc5de9008220dda8fc04effd8df8b860d4afe7a00720728deff0d53b848a2783c5975c2141342fadfca88 SHA512 3bebffb798e72e5ff872b482d43dffbd174496d1ca46e88bcb3c19f2b94cdfe2037aa1f19a22a40996503ccc03929bd28570722874a0c74265b083fbc66b24c4
-DIST netpbm-10.51.00.tar.xz 1834148 BLAKE2B 07a038c139407f5b5929464ee0e607091f809c70e858105e0b279673167cd22f2500c9c16a03dc80ce62bebde70464bf0f3add4bd44161cb9d25f5baa687b399 SHA512 07b621bfebbd051a80eff09886bc2b3b4f82b01fa9087d6a76ed70a042493b69fb3295d471640a4576101ba19352a57eadf69c5721d9cc416d25ff563ee07c76
-DIST netpbm-10.57.00.tar.xz 1884452 BLAKE2B 9a1f1ccd860aae9a29510dbe79bfbf35001bd3325a0eb671c2bec5ab1af4e1ff9eee1e3c623c55f87640fd7ca602302deceab9c268b8a3fadf4dd8ec76af98a3 SHA512 24dea478599b189d7ed845d62f4b4de5a6c18e3cdf00c35edeb71f179a68a69233a7ce43d6a1be50c218dd32cedbe546e2344f2201e335f9d6d64475510dbb30
-DIST netpbm-10.59.00.tar.xz 2526328 BLAKE2B 7afe992d00ba7b09c483fde157dc25cdc2df592a6b20e83c3b74c2151f2dc86536b24d9678b19fcb115c22df00147fb52b044ae56f754b849cba4dbed5d253d0 SHA512 789095667b0adaaf4ae768dbc52226106caf35dc7fd01a3d352c88dfb699f90e74c5f0a6c002768acb673bcf9e36830b1f2951bfbe27a0159c1c73453b74efc5
-DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch
deleted file mode 100644
index cd74474363..0000000000
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-- Make the libopt tool less 'helpful'
-
---- lib/Makefile
-+++ lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
-+ $(PKGDIR)/lib
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
-+ cd $(PKGDIR)/lib ; \
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
- libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- GNUmakefile
-+++ GNUmakefile
-@@ -87,6 +87,9 @@
-
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
-
- OMIT_CONFIG_RULE = 1
- include $(SRCDIR)/Makefile.common
---- buildtools/libopt.c
-+++ buildtools/libopt.c
-@@ -502,7 +502,7 @@
-
- strcpy(outputLine, ""); /* initial value */
- runtime = FALSE; /* initial value */
-- quiet = FALSE; /* initial value */
-+ quiet = TRUE; /* initial value */
- error = FALSE; /* no error yet */
- for (arg = 1; arg < argc && !error; arg++) {
- if (strcmp(argv[arg], "-runtime") == 0)
diff --git a/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch b/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch
deleted file mode 100644
index ff66768744..0000000000
--- a/media-libs/netpbm/files/netpbm-10.35.0-pnmtopng-zlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/291987
-
---- netpbm/converter/other/Makefile
-+++ netbpm/converter/other/Makefile
-@@ -159,6 +156,7 @@
- $(shell $(LIBOPT) $(NETPBMLIB)) \
- $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
-
-+pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself
- pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
- $(LD) -o $@ $@.o pngtxt.o \
- $(shell $(LIBOPT) $(NETPBMLIB)) \
diff --git a/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch b/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch
deleted file mode 100644
index 2dcc74fc6b..0000000000
--- a/media-libs/netpbm/files/netpbm-10.35.0-xml2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://bugs.gentoo.org/137871
-
---- converter/other/Makefile
-+++ converter/other/Makefile
-@@ -7,14 +7,6 @@
-
- include $(BUILDDIR)/Makefile.config
-
--ifeq ($(shell xml2-config --version),)
-- XML2_LIBS=NONE
-- XML2_CFLAGS=NONE
--else
-- XML2_LIBS=$(shell xml2-config --libs)
-- XML2_CFLAGS=$(shell xml2-config --cflags)
--endif
--
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
- ifneq ($(BUILD_FIASCO), N)
- SUBDIRS += fiasco
---- Makefile.config.in
-+++ Makefile.config.in
-@@ -419,6 +419,16 @@
- ZHDR_DIR =
- #ZLIB = libz.so
-
-+# The XML2 library
-+
-+ifeq ($(shell xml2-config --version),)
-+ XML2_LIBS=NONE
-+ XML2_CFLAGS=NONE
-+else
-+ XML2_LIBS=$(shell xml2-config --libs)
-+ XML2_CFLAGS=$(shell xml2-config --cflags)
-+endif
-+
- # The JBIG lossless image compression library (aka JBIG-KIT):
-
- JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
diff --git a/media-libs/netpbm/files/netpbm-10.41.0-interix.patch b/media-libs/netpbm/files/netpbm-10.41.0-interix.patch
deleted file mode 100644
index 619acfbd39..0000000000
--- a/media-libs/netpbm/files/netpbm-10.41.0-interix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru netpbm-10.41.0.orig/editor/pamthreshold.c netpbm-10.41.0/editor/pamthreshold.c
---- netpbm-10.41.0.orig/editor/pamthreshold.c 2008-03-11 08:52:44 +0100
-+++ netpbm-10.41.0/editor/pamthreshold.c 2008-03-11 08:53:20 +0100
-@@ -23,6 +23,10 @@
- #include <stdlib.h>
- #include <string.h>
-
-+#ifdef __INTERIX
-+# include <stdint.h>
-+#endif
-+
- #include "mallocvar.h"
- #include "nstring.h"
- #include "shhopt.h"
-diff -ru netpbm-10.41.0.orig/lib/util/vasprintf.c netpbm-10.41.0/lib/util/vasprintf.c
---- netpbm-10.41.0.orig/lib/util/vasprintf.c 2008-03-11 08:54:55 +0100
-+++ netpbm-10.41.0/lib/util/vasprintf.c 2008-03-11 08:34:13 +0100
-@@ -7,7 +7,7 @@
-
- #include "nstring.h"
-
--#ifdef __GNUC__
-+#if defined(__GNUC__) && !defined(__INTERIX)
- #define HAVE_VASPRINTF 1
- #else
- #define HAVE_VASPRINTF 0
diff --git a/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch b/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch
deleted file mode 100644
index 1e61de8dec..0000000000
--- a/media-libs/netpbm/files/netpbm-10.42.0-gcc43.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: trunk/lib/libpbm3.c
-===================================================================
---- trunk/lib/libpbm3.c (revision 608)
-+++ trunk/lib/libpbm3.c (revision 609)
-@@ -116,7 +116,11 @@ packBitsWithMmxSse(FILE * const
- ) ];
- */
-
-+#if (__GNUC__ * 100 + __GNUC_MINOR__ >= 403)
-+ typedef char v8qi __attribute__ ((vector_size(8)));
-+#else
- typedef int v8qi __attribute__ ((mode(V8QI)));
-+#endif
- typedef int di __attribute__ ((mode(DI)));
-
- di const zero64 = 0; /* to clear with PXOR */
diff --git a/media-libs/netpbm/files/netpbm-10.42.0-interix.patch b/media-libs/netpbm/files/netpbm-10.42.0-interix.patch
deleted file mode 100644
index 963a4b1c79..0000000000
--- a/media-libs/netpbm/files/netpbm-10.42.0-interix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru netpbm-10.42.0.orig/editor/pamthreshold.c netpbm-10.42.0/editor/pamthreshold.c
---- netpbm-10.42.0.orig/editor/pamthreshold.c 2008-03-31 09:19:51 +0200
-+++ netpbm-10.42.0/editor/pamthreshold.c 2008-03-31 09:31:17 +0200
-@@ -23,6 +23,10 @@
- #include <stdlib.h>
- #include <string.h>
-
-+#ifdef __INTERIX
-+# include <stdint.h>
-+#endif
-+
- #include "mallocvar.h"
- #include "nstring.h"
- #include "shhopt.h"
-diff -ru netpbm-10.42.0.orig/lib/util/vasprintf.c netpbm-10.42.0/lib/util/vasprintf.c
---- netpbm-10.42.0.orig/lib/util/vasprintf.c 2008-03-31 09:19:51 +0200
-+++ netpbm-10.42.0/lib/util/vasprintf.c 2008-03-31 09:20:27 +0200
-@@ -7,7 +7,7 @@
-
- #include "nstring.h"
-
--#if defined(__GNUC__) && !defined(__MINGW32__)
-+#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__INTERIX)
- #define HAVE_VASPRINTF 1
- #else
- #define HAVE_VASPRINTF 0
diff --git a/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch b/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch
deleted file mode 100644
index 35c4a17b5d..0000000000
--- a/media-libs/netpbm/files/netpbm-10.44.00-fontdir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-fix from upstream
-
-http://bugs.gentoo.org/249384#c6
-
-Index: converter/ppm/picttoppm.c
-===================================================================
---- converter/ppm/picttoppm.c (revision 811)
-+++ converter/ppm/picttoppm.c (revision 812)
-@@ -4056,6 +4056,23 @@
-
-
-
-+static void
-+loadDefaultFontDir(void) {
-+/*----------------------------------------------------------------------------
-+ Load the fonts from the font directory file "fontdir" (in the current
-+ directory), if it exists.
-+-----------------------------------------------------------------------------*/
-+ struct stat statbuf;
-+ int rc;
-+
-+ rc = stat("fontdir", &statbuf);
-+
-+ if (rc == 0)
-+ load_fontdir("fontdir");
-+}
-+
-+
-+
- int
- main(int argc, char * argv[]) {
- int argn;
-@@ -4092,8 +4109,6 @@
- ++argn;
- }
-
-- load_fontdir("fontdir");
--
- if (argn < argc) {
- ifp = pm_openr(argv[argn]);
- ++argn;
-@@ -4103,6 +4118,8 @@
- if (argn != argc)
- pm_usage(usage);
-
-+ loadDefaultFontDir();
-+
- if (header) {
- stage = "Reading 512 byte header";
- skip(512);
diff --git a/media-libs/netpbm/files/netpbm-10.46.00-darwin.patch b/media-libs/netpbm/files/netpbm-10.46.00-darwin.patch
deleted file mode 100644
index 434f5925f9..0000000000
--- a/media-libs/netpbm/files/netpbm-10.46.00-darwin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* pngtopnm uses zlib itself, so don't rely on libpng-config, which does
- not output -lz since it's not necessary to do so to link against
- libpng
-
---- converter/other/Makefile
-+++ converter/other/Makefile
-@@ -152,7 +152,7 @@
- ifeq ($(shell libpng-config --version),)
- PNGLIB_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB))
- else
-- PNGLIB_LIBOPTS = $(shell libpng-config --ldflags)
-+ PNGLIB_LIBOPTS = $(shell libpng-config --ldflags) $(ZLIB)
- endif
-
- pngtopnm pngtopam: %: %.o $(NETPBMLIB) $(LIBOPT)
diff --git a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch
deleted file mode 100644
index 89948dceb4..0000000000
--- a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-support for jpeg-7
-
---- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c
-+++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c
-@@ -53,6 +53,17 @@
- #define HEADER_SIZE 607 /*JFIF header size used on output images*/
-
-
-+static int
-+minDctVScaledSize(struct jpeg_decompress_struct const cinfo) {
-+
-+#if JPEG_LIB_VERSION >= 70
-+ return cinfo.min_DCT_v_scaled_size;
-+#else
-+ return cinfo.min_DCT_scaled_size;
-+#endif
-+}
-+
-+
-
- /*=======================================================================*
- * *
-@@ -467,11 +474,7 @@
- /* Make an 8-row-high sample array that will go away when done
- with image
- */
--#ifdef JPEG4
-- buffer_height = 8; /* could be 2, 4,8 rows high */
--#else
-- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size;
--#endif
-+ buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo);
-
- for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
- cp++,compptr++) {
diff --git a/media-libs/netpbm/files/netpbm-10.46.00-solaris.patch b/media-libs/netpbm/files/netpbm-10.46.00-solaris.patch
deleted file mode 100644
index cada46158c..0000000000
--- a/media-libs/netpbm/files/netpbm-10.46.00-solaris.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-* don't define these if you include strings.h on Solaris, the latter
- defines them in that case
-
---- pm_config.in.h
-+++ pm_config.in.h
-@@ -103,9 +103,11 @@
-
- #ifndef __SASC
- #ifndef _DCC /* Amiga DICE Compiler */
-+#ifndef __sun__ /* Solaris */
- #define bzero(dst,len) memset(dst,0,len)
- #define bcopy(src,dst,len) memcpy(dst,src,len)
- #define bcmp memcmp
-+#endif
- #endif /* _DCC */
- #endif /* __SASC */
-
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-interix.patch b/media-libs/netpbm/files/netpbm-10.48.00-interix.patch
deleted file mode 100644
index 7f9d734833..0000000000
--- a/media-libs/netpbm/files/netpbm-10.48.00-interix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ru netpbm-10.48.00.orig/pm_config.in.h netpbm-10.48.00/pm_config.in.h
---- netpbm-10.48.00.orig/pm_config.in.h 2010-02-03 11:43:58 +0100
-+++ netpbm-10.48.00/pm_config.in.h 2010-02-03 11:46:16 +0100
-@@ -321,3 +321,6 @@
- #define pm_mkdir(dir, perm) mkdir(dir, perm)
- #endif
-
-+#ifdef __INTERIX
-+# include <stdint.h>
-+#endif
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch b/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch
deleted file mode 100644
index 9975d29dce..0000000000
--- a/media-libs/netpbm/files/netpbm-10.48.00-pngx.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://bugs.gentoo.org/287725
-
-fix from upstream
-
---- netpbm/converter/other/pngx.c (revision 1021)
-+++ netpbm/converter/other/pngx.c (revision 1022)
-@@ -69,6 +69,7 @@
- else
- *pngxPP = pngxP;
- }
-+ pngxP->rw = rw;
- }
- }
-
-@@ -77,7 +78,14 @@
- void
- pngx_destroy(struct pngx * const pngxP) {
-
-- png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr);
-+ switch(pngxP->rw) {
-+ case PNGX_READ:
-+ png_destroy_read_struct(&pngxP->png_ptr, &pngxP->info_ptr, NULL);
-+ break;
-+ case PNGX_WRITE:
-+ png_destroy_write_struct(&pngxP->png_ptr, &pngxP->info_ptr);
-+ break;
-+ }
-
- free(pngxP);
- }
---- netpbm/converter/other/pngx.h (revision 1021)
-+++ netpbm/converter/other/pngx.h (revision 1022)
-@@ -5,14 +5,14 @@
- the PNG library easier and cleaner.
- */
-
-+typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw;
-+
- struct pngx {
- png_structp png_ptr;
-- png_infop info_ptr;
-+ png_infop info_ptr;
-+ pngx_rw rw;
- };
-
--typedef enum {PNGX_READ, PNGX_WRITE} pngx_rw;
--
--
- void
- pngx_create(struct pngx ** const pngxPP,
- pngx_rw const rw,
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch b/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch
deleted file mode 100644
index 100c33f9ea..0000000000
--- a/media-libs/netpbm/files/netpbm-10.48.00-pnmtopng-zlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/291987
-
---- netpbm/converter/other/Makefile
-+++ netbpm/converter/other/Makefile
-@@ -159,6 +156,7 @@
- $(shell $(LIBOPT) $(NETPBMLIB)) \
- $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
-
-+pnmtopng: LADD += -lz # pnmtopng calls zlib_version itself
- pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
- $(LD) -o $@ $@.o pngtxt.o \
- $(shell $(LIBOPT) $(NETPBMLIB)) \
diff --git a/media-libs/netpbm/files/netpbm-10.48.00-solaris.patch b/media-libs/netpbm/files/netpbm-10.48.00-solaris.patch
deleted file mode 100644
index 8a2a2751a9..0000000000
--- a/media-libs/netpbm/files/netpbm-10.48.00-solaris.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- converter/other/jpeg2000/jpeg2ktopam.corig 2009-10-03 21:08:53.219016926 +0200
-+++ converter/other/jpeg2000/jpeg2ktopam.c 2009-10-03 21:09:31.086672516 +0200
-@@ -9,8 +9,6 @@
- *****************************************************************************/
-
- #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
--/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */
--#define _XOPEN_SOURCE 600
- #include <string.h>
-
- #include "pm_c_util.h"
---- converter/other/jpeg2000/pamtojpeg2k.c.orig 2009-10-03 21:10:15.221677740 +0200
-+++ converter/other/jpeg2000/pamtojpeg2k.c 2009-10-03 21:10:25.271260072 +0200
-@@ -9,8 +9,6 @@
- *****************************************************************************/
-
- #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
--/* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */
--#define _XOPEN_SOURCE 600
- #include <string.h>
-
- #include "pm_c_util.h"
diff --git a/media-libs/netpbm/files/netpbm-10.49.00-darwin-signals.patch b/media-libs/netpbm/files/netpbm-10.49.00-darwin-signals.patch
deleted file mode 100644
index 7ad88ab3b1..0000000000
--- a/media-libs/netpbm/files/netpbm-10.49.00-darwin-signals.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/libsystem.c.orig 2010-03-19 16:17:14 +0100
-+++ lib/libsystem.c 2010-03-19 16:20:21 +0100
-@@ -255,9 +255,11 @@
- not defined by POSIX, including: SIGPWR, SIGLOST, SIGINFO
- */
- }
-- } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX)
-+#if defined(SIGRTMIN) && defined(SIGRTMAX)
-+ } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) {
- return "SIGRTxxx";
-- else
-+#endif
-+ } else
- return "???";
- }
-
diff --git a/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch b/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch
deleted file mode 100644
index dae1b867e0..0000000000
--- a/media-libs/netpbm/files/netpbm-10.49.00-sigpower.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-fix from upstream for systems that lack SIGPWR
-
-http://bugs.gentoo.org/310179
-
---- trunk/lib/libsystem.c 2010/02/23 15:56:42 1129
-+++ trunk/lib/libsystem.c 2010/03/17 01:57:18 1149
-@@ -278,12 +278,14 @@
- return "SIGWINCH";
- case SIGIO:
- return "SIGIO";
-- case SIGPWR:
-- return "SIGPWR";
- case SIGSYS:
- return "SIGSYS";
- default:
- return "???";
-+
-+ /* There are various other signal classes on some systems, but
-+ not defined by POSIX, including: SIGPWR, SIGLOST, SIGINFO
-+ */
- }
- } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX)
- return "SIGRTxxx";
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch b/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
deleted file mode 100644
index 1eb5506dda..0000000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-taken from upstream
-
-http://bugs.gentoo.org/338230
-
-Index: editor/pnmconvol.c
-===================================================================
---- editor/pnmconvol.c (revision 1297)
-+++ editor/pnmconvol.c (revision 1298)
-@@ -455,13 +455,13 @@ static void
- convKernelCreatePnm(struct pam * const cpamP,
- tuple * const * const ctuples,
- unsigned int const depth,
-- bool const offsetPgm,
-+ bool const offsetPnm,
- struct convKernel ** const convKernelPP) {
- /*----------------------------------------------------------------------------
-- Compute the convolution matrix in normalized form from the PGM
-- form. Each element of the output matrix is the actual weight we give an
-- input pixel -- i.e. the thing by which we multiple a value from the
-- input image.
-+ Compute the convolution matrix in normalized form from the PGM form
-+ 'ctuples'/'cpamP'. Each element of the output matrix is the actual weight
-+ we give an input pixel -- i.e. the thing by which we multiple a value from
-+ the input image.
-
- 'depth' is the required number of planes in the kernel. If 'ctuples' has
- fewer planes than that, we duplicate as necessary. E.g. if 'ctuples' is
-@@ -470,13 +470,13 @@ convKernelCreatePnm(struct pam *
- 'ctuples' has more planes than specified, we ignore the higher numbered
- ones.
-
-- 'offsetPgm' means the PGM convolution matrix is defined in offset form so
-+ 'offsetPnm' means the PNM convolution matrix is defined in offset form so
- that it can represent negative values. E.g. with maxval 100, 50 means
- 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0
- and there are no negative weights.
- -----------------------------------------------------------------------------*/
-- double const scale = (offsetPgm ? 2.0 : 1.0) / cpamP->maxval;
-- double const offset = offsetPgm ? - 1.0 : 0.0;
-+ double const scale = (offsetPnm ? 2.0 : 1.0) / cpamP->maxval;
-+ double const offset = offsetPnm ? - 1.0 : 0.0;
- unsigned int const planes = MIN(3, depth);
-
- struct convKernel * convKernelP;
-@@ -579,9 +579,19 @@ normalizeKernel(struct convKernel * cons
- static void
- getKernelPnm(const char * const fileName,
- unsigned int const depth,
-- bool const nooffset,
-+ bool const offset,
- struct convKernel ** const convKernelPP) {
-+/*----------------------------------------------------------------------------
-+ Get the convolution kernel from the PNM file named 'fileName'.
-+ 'offset' means the PNM convolution matrix is defined in offset form so
-+ that it can represent negative values. E.g. with maxval 100, 50 means
-+ 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0
-+ and there are no negative weights.
-+
-+ Make the kernel suitable for convolving an image of depth 'depth'.
-
-+ Return the kernel as *convKernelPP.
-+-----------------------------------------------------------------------------*/
- struct pam cpam;
- FILE * cifP;
- tuple ** ctuples;
-@@ -594,7 +604,7 @@ getKernelPnm(const char * const
-
- validateKernelDimensions(cpam.width, cpam.height);
-
-- convKernelCreatePnm(&cpam, ctuples, depth, nooffset, convKernelPP);
-+ convKernelCreatePnm(&cpam, ctuples, depth, offset, convKernelPP);
- }
-
-
-@@ -893,7 +903,7 @@ getKernel(struct cmdlineInfo const cmd
- struct convKernel * convKernelP;
-
- if (cmdline.pnmMatrixFileName)
-- getKernelPnm(cmdline.pnmMatrixFileName, depth, cmdline.nooffset,
-+ getKernelPnm(cmdline.pnmMatrixFileName, depth, !cmdline.nooffset,
- &convKernelP);
- else if (cmdline.matrixfile)
- convKernelCreateSimpleFile(cmdline.matrixfile, cmdline.normalize,
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch
deleted file mode 100644
index 0c1e48549b..0000000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-fix from upstream
-
-------------------------------------------------------------------------
-r1285 | giraffedata | 2010-09-18 16:13:39 -0400 (Sat, 18 Sep 2010) | 1 line
-
-Fix free of non-allocated memory
-
-Index: converter/ppm/ppmtompeg/param.c
-===================================================================
---- converter/ppm/ppmtompeg/param.c (revision 1284)
-+++ converter/ppm/ppmtompeg/param.c (revision 1285)
-@@ -283,8 +283,8 @@ GetFrameRate(const char * const p)
-
-
- static void
--mergeInputSource(struct inputSource * const baseSourceP,
-- struct inputSource * const addedSourceP) {
-+mergeInputSource(struct inputSource * const baseSourceP,
-+ const struct inputSource * const addedSourceP) {
-
- unsigned int i;
-
-@@ -294,12 +294,6 @@ mergeInputSource(struct inputSource * co
- for (i = 0; i < addedSourceP->numInputFileEntries; ++i)
- baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] =
- addedSourceP->inputFileEntries[i];
--
-- free(addedSourceP);
-- /* Note the space allocated for the *addedSourceP input file
-- entries themselves is still allocated, and used by
-- *baseSourceP.
-- */
- }
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-solaris.patch b/media-libs/netpbm/files/netpbm-10.51.00-solaris.patch
deleted file mode 100644
index 97f8215c43..0000000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-solaris.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Inspired by
-http://mail-index.netbsd.org/pkgsrc-bugs/2010/03/04/msg036725.html
-
-Solves c99 requirement and makes it compile fine on Solaris
-
---- editor/pampaintspill.c
-+++ editor/pampaintspill.c
-@@ -37,7 +37,7 @@
- 10.04.14
- */
-
--#define _XOPEN_SOURCE 600 /* Make sure random(), srandom() are in <stdlib.h>*/
-+#define _XOPEN_SOURCE 500 /* Make sure random(), srandom() are in <stdlib.h>*/
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch b/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch
deleted file mode 100644
index e161242c44..0000000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- converter/other/Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/converter/other/Makefile b/converter/other/Makefile
-index 1417cd3..c178101 100644
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -167,7 +167,7 @@ pngtopam: %: %.o pngx.o $(NETPBMLIB) $(LIBOPT)
- pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
- $(LD) -o $@ $@.o pngx.o pngtxt.o \
- $(shell $(LIBOPT) $(NETPBMLIB)) \
-- $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
-+ $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) -lz
-
- pamrgbatopng: %: %.o $(NETPBMLIB) $(LIBOPT)
- $(LD) -o $@ $@.o \
diff --git a/media-libs/netpbm/files/netpbm-10.57.00-solaris-xopensource.patch b/media-libs/netpbm/files/netpbm-10.57.00-solaris-xopensource.patch
deleted file mode 100644
index 326247978f..0000000000
--- a/media-libs/netpbm/files/netpbm-10.57.00-solaris-xopensource.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- netpbm-10.57.00/editor/specialty/pampaintspill.c
-+++ netpbm-10.57.00/editor/specialty/pampaintspill.c
-@@ -37,7 +37,7 @@
- 10.04.14
- */
-
--#define _XOPEN_SOURCE 600 /* Make sure random(), srandom() are in <stdlib.h>*/
-+#define _XOPEN_SOURCE 500 /* Make sure random(), srandom() are in <stdlib.h>*/
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
---- netpbm-10.57.00/editor/pamrecolor.c
-+++ netpbm-10.57.00/editor/pamrecolor.c
-@@ -24,7 +24,7 @@
- * ----------------------------------------------------------------------
- */
-
--#define _XOPEN_SOURCE 600 /* Make sure random(), srandom() are in <stdlib.h>*/
-+#define _XOPEN_SOURCE 500 /* Make sure random(), srandom() are in <stdlib.h>*/
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/media-libs/netpbm/files/netpbm-10.60.01-strcaseeq-strcasecmp.patch b/media-libs/netpbm/files/netpbm-10.60.01-strcaseeq-strcasecmp.patch
deleted file mode 100644
index 413b23ff66..0000000000
--- a/media-libs/netpbm/files/netpbm-10.60.01-strcaseeq-strcasecmp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://trac.macports.org/browser/trunk/dports/graphics/netpbm/files/patch-converter-other-giftopnm.c-strcaseeq.diff
-
---- converter/other/giftopnm.c.orig 2012-07-06 23:30:09.000000000 +0200
-+++ converter/other/giftopnm.c 2012-07-06 23:32:45.000000000 +0200
-@@ -155,7 +155,7 @@
- cmdlineP->imageNum = 0;
- cmdlineP->allImages = FALSE;
- } else {
-- if (strcaseeq(image, "all")) {
-+ if (strcasecmp(image, "all") == 0) {
- cmdlineP->allImages = TRUE;
- } else {
- char * tailptr;
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-build.patch b/media-libs/netpbm/files/netpbm-10.76.00-build.patch
deleted file mode 100644
index 231da54467..0000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
-+ $(PKGDIR)/lib
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
-+ cd $(PKGDIR)/lib ; \
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
- libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -87,6 +87,9 @@
-
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
-
- # Parallel make (make --jobs) is not smart enough to coordinate builds
- # between submakes, so a naive parallel make would cause certain
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch b/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
deleted file mode 100644
index 392eae0f40..0000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-misc-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-do not autoprobe deps when we disabled them
-
---- GNUmakefile
-+++ GNUmakefile
-@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
-
- PROG_SUBDIRS = converter analyzer editor generator other
- PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
--SUPPORT_SUBDIRS = urt icon buildtools test
-+SUPPORT_SUBDIRS = icon buildtools test
-+ifeq ($(URTLIB),$(BUNDLED_URTLIB))
-+SUPPORT_SUBDIRS += urt
-+endif
-
- SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
-
---- converter/other/Makefile
-+++ converter/other/Makefile
-@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
-
- include $(BUILDDIR)/config.mk
-
-+ifneq ($(XML2_LIBS),NONE)
- TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
-
- ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
-@@ -22,6 +23,7 @@ else
- XML2_CFLAGS=$(shell xml2-config --cflags)
- endif
- endif
-+endif
-
- SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
- ifneq ($(BUILD_FIASCO), N)
-@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE)
- endif
- endif
-
-+ifneq ($(PNGLIB),NONE)
- TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi
-
- ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
-@@ -58,6 +61,7 @@ else
- endif
- endif
- endif
-+endif
-
- ifneq ($(JPEGLIB),NONE)
- ifneq ($(JPEGHDR_DIR)x,x)
---- other/pamx/Makefile
-+++ other/pamx/Makefile
-@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
-
- EXTERN_INCLUDE =
-
-+ifneq ($(X11LIB),NONE)
- ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
- # Pkg-config has never heard of X11, or doesn't even exist
-
-@@ -23,6 +24,7 @@ else
- X11LIB = $(shell pkg-config x11 --libs)
- EXTERN_INCLUDES += $(shell pkg-config x11 --cflags)
- endif
-+endif
-
- ifeq ($(HAVE_X11LIB),Y)
- PORTBINARIES += pamx
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
deleted file mode 100644
index cdc075e529..0000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-the tool tries to generate binary output, but the current locale might change
-what awk generates. force it to C/ASCII to avoid that.
-
-https://bugs.gentoo.org/601012
-
---- test/pbmtext.test
-+++ test/pbmtext.test
-@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
-
- # One long row
- # Should print 3233136020 4535
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i);
- for (i=160;i<=255;++i) printf("%c",i); }' | \
- pbmtext -builtin bdf | cksum
-
- # One tall column
- # Should print 1216262214 5711
-+LC_CTYPE=C \
- awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i);
- for (i=160;i<=255;++i) printf("%c\n",i); }' | \
- pbmtext -nomargins -builtin bdf | cksum
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-solaris.patch b/media-libs/netpbm/files/netpbm-10.76.00-solaris.patch
deleted file mode 100644
index f294c7de27..0000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-solaris.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- converter/other/jpeg2000/jpeg2ktopam.c
-+++ converter/other/jpeg2000/jpeg2ktopam.c
-@@ -9,7 +9,9 @@
- *****************************************************************************/
-
- #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
-+#if 0
- #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */
-+#endif
- /* In 2014.09, this was _XOPEN_SOURCE 600, with a comment saying it was
- necessary to make <inttypes.h> define int_fast32_t, etc. on AIX.
- <jasper/jasper.h> does use int_fast32_t and does include <inttypes.h>,
---- converter/other/jpeg2000/pamtojpeg2k.c
-+++ converter/other/jpeg2000/pamtojpeg2k.c
-@@ -9,7 +9,9 @@
- *****************************************************************************/
-
- #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */
-+#if 0
- #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */
-+#endif
- /* In 2014.09, this was _XOPEN_SOURCE 600, with a comment saying it was
- necessary to make <inttypes.h> define int_fast32_t, etc. on AIX.
- <jasper/jasper.h> does use int_fast32_t and does include <inttypes.h>,
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-test.patch
deleted file mode 100644
index 870998bc98..0000000000
--- a/media-libs/netpbm/files/netpbm-10.76.00-test.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-automatically skip tests of disabled tools
-
---- GNUmakefile
-+++ GNUmakefile
-@@ -455,6 +458,21 @@ deb:
- .PHONY: check-package
- .PHONY: check-install
-
-+# Variables from the make env we pass down to the test scripts.
-+CHECK_VARS = \
-+ BUILDDIR=$(BUILDDIR) \
-+ RGBDEF=$(RGBDEF) \
-+ BUILD_FIASCO=$(BUILD_FIASCO) \
-+ JASPERLIB="$(JASPERLIB)" \
-+ JBIGLIB="$(JBIGLIB)" \
-+ JPEGLIB="$(JPEGLIB)" \
-+ PNGLIB="$(PNGLIB)" \
-+ TIFFLIB="$(TIFFLIB)" \
-+ URTLIB="$(URTLIB)" \
-+ X11LIB="$(X11LIB)" \
-+ XML2_LIBS="$(XML2_LIBS)" \
-+ ZLIB="$(ZLIB)"
-+
- # Test files in source tree.
-
- check-tree : BUILDBINDIRS :=./analyzer \
-@@ -525,10 +543,10 @@ resultdir-backup: FORCE
-
- check-tree: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=tree \
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
- # Execute-Tests needs to know BUILDDIR in order to locate testrandom.
-@@ -545,19 +563,18 @@ check: check-package
-
- check-package: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=package \
-- PBM_TEST_PATH=$(PBM_TEST_PATH) BUILDDIR=$(BUILDDIR) \
-+ PBM_TEST_PATH=$(PBM_TEST_PATH) \
- LD_LIBRARY_PATH=$(PBM_LIBRARY_PATH):${LD_LIBRARY_PATH} \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
-
- # Check after install
- check-install: $(TESTRANDOM) resultdir-backup
- cd $(RESULTDIR); \
-+ $(CHECK_VARS) \
- CHECK_TYPE=install \
-- BUILDDIR=$(BUILDDIR) \
-- RGBDEF=$(RGBDEF) \
- $(SRCDIR)/test/Execute-Tests 2>&1
-
-
---- test/all-in-place.test
-+++ test/all-in-place.test
-@@ -367,11 +367,62 @@ ordinary_testprogs="\
- zeisstopnm \
- "
-
-+enabled_testprog() {
-+ case $1 in
-+ fiascotopnm|\
-+ pnmtofiasco)
-+ [ "${BUILD_FIASCO}" = "N" ] && return 1 ;;
-+
-+ jpeg2ktopam|\
-+ pamtojpeg2k)
-+ [ "${JASPERLIB}" = "NONE" ] && return 1 ;;
-+
-+ jbigtopnm|\
-+ pnmtojbig)
-+ [ "${JBIGLIB}" = "NONE" ] && return 1 ;;
-+
-+ jpegtopnm|\
-+ pnmtojpeg|\
-+ ppmtojpeg)
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamtopng|\
-+ pngtopam|\
-+ pnmtopng)
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+ svgtopam)
-+ [ "${PNGLIB}" = "NONE" ] && return 1
-+ [ "${XML2_LIBS}" = "NONE" ] && return 1
-+ ;;
-+
-+ pamtotiff|\
-+ pnmtotiffcmyk|\
-+ tifftopnm)
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+
-+ pnmtorle|\
-+ rletopnm)
-+ [ "${URTLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamx)
-+ [ "${X11LIB}" = "NONE" ] && return 1 ;;
-+ esac
-+
-+ return 0
-+}
-+
- # The string "fiascotopnm" has to be filtered out by egrep for fiascotopnm
- # has a slightly different version report format.
-
- for i in $ordinary_testprogs
- do
-+ # Stub out programs that aren't built.
-+ if ! enabled_testprog "$i"; then
-+ echo "$i: ok"
-+ continue
-+ fi
-+
- $i --version 2>&1 | \
- egrep -v -e fiascotopnm -e \
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- test/fiasco-roundtrip.test
-+++ test/fiasco-roundtrip.test
-@@ -2,6 +2,10 @@
- # This script tests: pnmtofiasco fiascotopnm
- # Also requires: pnmpad
-
-+if [ "${BUILD_FIASCO}" = "N" ]; then
-+ exit 80
-+fi
-+
- # Should print 215556145 102615
-
- pnmpad --black --bottom 1 --left 1 testimg.ppm | \
---- test/jbig-roundtrip.test
-+++ test/jbig-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtojbig jbigtopnm
- # Also requires: pamchannel pamtopnm
-
-+if [ "${JBIGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- # Test 1. Should print 2425386270 41
- pnmtojbig testgrid.pbm | jbigtopnm | cksum
---- test/legacy-names.test
-+++ test/legacy-names.test
-@@ -94,8 +94,30 @@ ordinary_testprogs="\
- ppmtouil \
- "
-
-+enabled_testprog() {
-+ case $1 in
-+ ppmtojpeg)
-+ [ "${JPEGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pamrgbatopng|\
-+ pngtopnm)
-+ [ "${PNGLIB}" = "NONE" ] && return 1 ;;
-+
-+ pnmtotiff)
-+ [ "${TIFFLIB}" = "NONE" ] && return 1 ;;
-+ esac
-+
-+ return 0
-+}
-+
- for i in $ordinary_testprogs
- do
-+ # Stub out programs that aren't built.
-+ if ! enabled_testprog "$i"; then
-+ echo "$i: ok"
-+ continue
-+ fi
-+
- $i --version 2>&1 | \
- egrep -v \
- "(Using libnetpbm|Compiled|(BSD|SYSV|MSDOS|AMIGA) defined|RGB_?ENV=)" \
---- test/png-roundtrip.test
-+++ test/png-roundtrip.test
-@@ -6,6 +6,10 @@
- ## If this test fails and pnm-roundtrip2.test succeeds, it indicates
- ## some problem with pnmtopng.
-
-+if [ "${PNGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- # Test 1. Should print 1926073387 101484 18 times
- for flags in "" -interlace \
- -gamma=.45 \
---- test/png-roundtrip2.test
-+++ test/png-roundtrip2.test
-@@ -9,6 +9,10 @@
- ## If both tests fail, the likely cause is a problem with pngtopam.
- ## It is also possible that there is some problem in libpng.
-
-+if [ "${PNGLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- # Test 1. Should print 1926073387 101484 twice
- for flags in "" -gamma=.45
- do
---- test/ps-roundtrip.test
-+++ test/ps-roundtrip.test
-@@ -8,6 +8,10 @@
- ## (1) zlib was not linked.
- ## (2) ghostscript is not available.
-
-+if [ "${ZLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-+
- tmpdir=${tmpdir:-/tmp}
-
- # pstopnm does not use libnetpbm functions for output.
---- test/tiff-roundtrip.test
-+++ test/tiff-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pamtotiff tifftopnm
- # Also requires:
-
-+if [ "${TIFFLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- # Failure message
- ## Second test fails if Netpbm was built without the flate library
---- test/utahrle-roundtrip.test
-+++ test/utahrle-roundtrip.test
-@@ -2,6 +2,9 @@
- # This script tests: pnmtorle rletopnm
- # Also requires: pamchannel pamtopnm
-
-+if [ "${URTLIB}" = "NONE" ]; then
-+ exit 80
-+fi
-
- #Test 1. Should produce 1571496937 33838, cksum of testimg.red
- pamchannel -infile=testimg.ppm -tupletype="GRAYSCALE" 0 | pamtopnm | \
diff --git a/media-libs/netpbm/files/netpbm-prefix.patch b/media-libs/netpbm/files/netpbm-prefix.patch
deleted file mode 100644
index 89c2398654..0000000000
--- a/media-libs/netpbm/files/netpbm-prefix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- converter/pbm/pbmtox10bm~ 2007-10-14 11:12:34 +0200
-+++ converter/pbm/pbmtox10bm 2007-10-14 11:14:12 +0200
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#! @GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
-
- #============================================================================
- # This is a compatibility interface to Pbmtoxbm.
---- editor/ppmfade~ 2007-10-14 11:17:35 +0200
-+++ editor/ppmfade 2007-10-14 11:20:02 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- #
- # This program creates a fade (a sequence of frames) between two images.
---- editor/pnmflip~ 2007-10-14 11:20:37 +0200
-+++ editor/pnmflip 2007-10-14 11:20:45 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
-
- #============================================================================
- # This is a compatibility interface to Pamflip.
---- editor/pnmquant~ 2007-10-14 11:21:02 +0200
-+++ editor/pnmquant 2007-10-14 11:21:13 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
-
- ##############################################################################
- # pnmquant
---- editor/ppmquant~ 2007-10-14 11:21:35 +0200
-+++ editor/ppmquant 2007-10-14 11:21:43 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
- ##############################################################################
- # This is nothing but a compatibility interface for Pnmquant.
- # An old program coded to call Ppmquant will continue working because
---- editor/ppmshadow~ 2007-10-14 11:33:01 +0200
-+++ editor/ppmshadow 2007-10-14 11:33:13 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
-
- # P P M S H A D O W
-
---- generator/ppmrainbow~ 2007-10-14 11:22:04 +0200
-+++ generator/ppmrainbow 2007-10-14 11:22:14 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wl
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -wl
- use strict;
- use Getopt::Long;
-
diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
deleted file mode 100644
index ca3e23b04d..0000000000
--- a/media-libs/netpbm/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>graphics@gentoo.org</email>
- <name>Gentoo Graphics Project</name>
- </maintainer>
- <use>
- <flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">netpbm</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/netpbm/netpbm-10.51.00-r2.ebuild b/media-libs/netpbm/netpbm-10.51.00-r2.ebuild
deleted file mode 100644
index d1de3fa339..0000000000
--- a/media-libs/netpbm/netpbm-10.51.00-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00-r2.ebuild,v 1.5 2011/11/16 09:47:56 jlec Exp $
-
-EAPI="3"
-
-inherit toolchain-funcs eutils multilib prefix
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
- mirror://gentoo/${P}-libpng-1.5.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
-
-RDEPEND="jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- png? ( >=media-libs/libpng-1.4:0 )
- rle? ( media-libs/urt )
- svga? ( media-libs/svgalib )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- xml? ( dev-libs/libxml2 )
- zlib? ( sys-libs/zlib )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- sys-devel/flex"
-
-maint_pkg_create() {
- local base="${EPREFIX}/usr/local/src"
- local srcdir="${base}/netpbm/release_number"
- if [[ -d ${srcdir} ]] ; then
- cd "${T}" || die
-
- ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}"
- svn export -q ${srcdir}/${PV} netpbm-${PV}
- eend $? || return 1
-
- ebegin "Creating netpbm-${PV}.tar.xz"
- tar cf - netpbm-${PV} | xz > netpbm-${PV}.tar.xz
- eend $?
-
- einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.xz"
- else
- einfo "You need to run:"
- einfo " cd ${base}"
- einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
- die "need svn checkout dir"
- fi
-}
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.xz ]] && maint_pkg_create ; }
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo ${suffix//\.}
-}
-netpbm_ldshlib() {
- # ultra dirty Darwin hack, but hey... in the end this is all it needs...
- case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name ${EPREFIX}/usr/lib/libnetpbm.10.dylib';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
- esac
-}
-netpbm_config() {
- if use $1 ; then
- [[ $2 != "!" ]] && echo -l${2:-$1}
- else
- echo NONE
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/netpbm-10.31-build.patch
- epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch
- epatch "${FILESDIR}"/${P}-pnmconvol-nooffset.patch #338230
- epatch "${WORKDIR}"/${P}-libpng-1.5.patch #355025
- epatch "${FILESDIR}"/${P}-underlinking.patch #367405
-
- epatch "${FILESDIR}"/${PN}-10.46.00-darwin.patch
- epatch "${FILESDIR}"/${PN}-10.46.00-solaris.patch
- epatch "${FILESDIR}"/${PN}-10.48.00-solaris.patch
- epatch "${FILESDIR}"/${PN}-10.51.00-solaris.patch
- epatch "${FILESDIR}"/${PN}-10.48.00-interix.patch
- epatch "${FILESDIR}"/${PN}-10.49.00-darwin-signals.patch
- epatch "${FILESDIR}"/netpbm-prefix.patch
- eprefixify converter/pbm/pbmtox10bm generator/ppmrainbow \
- editor/{ppmfade,pnmflip,pnmquant,ppmquant,ppmshadow}
-
- # make sure we use system urt
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -rf urt
-
- # take care of the importinc stuff ourselves by only doing it once
- # at the top level and having all subdirs use that one set #149843
- sed -i \
- -e '/^importinc:/s|^|importinc:\nmanual_|' \
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
- common.mk || die
- sed -i \
- -e '/%.c/s: importinc$::' \
- common.mk lib/Makefile lib/util/Makefile || die
-
- # avoid ugly depend.mk warnings
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
- cat config.mk.in - >> config.mk <<-EOF
- # Misc crap
- BUILD_FIASCO = N
- SYMLINK = ln -sf
-
- # Toolchain options
- CC = $(tc-getCC) -Wall
- LD = \$(CC)
- CC_FOR_BUILD = $(tc-getBUILD_CC)
- LD_FOR_BUILD = \$(CC_FOR_BUILD)
- AR = $(tc-getAR)
- RANLIB = $(tc-getRANLIB)
-
- STRIPFLAG =
- CFLAGS_SHLIB = -fPIC
-
- LDRELOC = \$(LD) -r
- LDSHLIB = $(netpbm_ldshlib)
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
- LINKERISCOMPILER = Y
- NETPBMLIBSUFFIX = $(netpbm_libsuffix)
- NETPBMLIBTYPE = $(netpbm_libtype)
-
- # Gentoo build options
- TIFFLIB = $(netpbm_config tiff)
- JPEGLIB = $(netpbm_config jpeg)
- PNGLIB = $(netpbm_config png)
- ZLIB = $(netpbm_config zlib z)
- LINUXSVGALIB = $(netpbm_config svga vga)
- XML2_LIBS = $(netpbm_config xml xml2)
- JBIGLIB = -ljbig
- JBIGHDR_DIR = $(netpbm_config jbig "!")
- JASPERLIB = -ljasper
- JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
- URTLIB = $(netpbm_config rle)
- URTHDR_DIR =
- X11LIB = $(netpbm_config X X11)
- X11HDR_DIR =
- EOF
- # cannot chain the die with the heredoc above as bash-3
- # has a parser bug in that setup #282902
- [ $? -eq 0 ] || die "writing config.mk failed"
-}
-
-src_compile() {
- # Solaris doesn't have vasprintf, libiberty does have it, for gethostbyname
- # we need -lnsl, for connect -lsocket
- [[ ${CHOST} == *-solaris* ]] && extlibs="-liberty -lnsl -lsocket"
- # same holds for interix, but we only need iberty
- [[ ${CHOST} == *-interix* ]] && extlibs="-liberty"
-
- emake LIBS="${extlibs}" -j1 pm_config.h version.h manual_importinc || die #149843
- emake LIBS="${extlibs}" || die
-}
-
-src_install() {
- mkdir -p "${ED}"
- # Subdir make targets like to use `mkdir` all over the place
- # without any actual dependencies, thus the -j1.
- emake -j1 package pkgdir="${ED}"/usr || die
-
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
-
- # Remove cruft that we don't need, and move around stuff we want
- rm "${ED}"/usr/bin/{doc.url,manweb} || die
- rm -r "${ED}"/usr/man/web || die
- rm -r "${ED}"/usr/link || die
- rm "${ED}"/usr/{README,VERSION,config_template,pkginfo} || die
- dodir /usr/share
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
- dodoc README
- cd doc
- dodoc HISTORY Netpbm.programming USERDOC
- dohtml -r .
-}
diff --git a/media-libs/netpbm/netpbm-10.57.00.ebuild b/media-libs/netpbm/netpbm-10.57.00.ebuild
deleted file mode 100644
index e9e57fe68c..0000000000
--- a/media-libs/netpbm/netpbm-10.57.00.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.57.00.ebuild,v 1.1 2012/01/03 01:37:19 vapier Exp $
-
-EAPI="3"
-
-inherit toolchain-funcs eutils multilib prefix
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
-
-RDEPEND="jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- png? ( >=media-libs/libpng-1.4:0 )
- rle? ( media-libs/urt )
- svga? ( media-libs/svgalib )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- xml? ( dev-libs/libxml2 )
- zlib? ( sys-libs/zlib )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- sys-devel/flex"
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo ${suffix//\.}
-}
-netpbm_ldshlib() {
- # ultra dirty Darwin hack, but hey... in the end this is all it needs...
- case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name ${EPREFIX}/usr/lib/libnetpbm.$(MAJ).dylib';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
- esac
-}
-netpbm_config() {
- if use $1 ; then
- [[ $2 != "!" ]] && echo -l${2:-$1}
- else
- echo NONE
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/netpbm-10.31-build.patch
-
- epatch "${FILESDIR}"/${PN}-10.46.00-solaris.patch
- epatch "${FILESDIR}"/${PN}-10.48.00-solaris.patch
- epatch "${FILESDIR}"/${PN}-10.57.00-solaris-xopensource.patch
- epatch "${FILESDIR}"/${PN}-10.48.00-interix.patch
- epatch "${FILESDIR}"/netpbm-prefix.patch
- eprefixify converter/pbm/pbmtox10bm generator/ppmrainbow \
- editor/{ppmfade,pnmflip,pnmquant,ppmquant,ppmshadow}
-
- # make sure we use system urt
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -rf urt
-
- # take care of the importinc stuff ourselves by only doing it once
- # at the top level and having all subdirs use that one set #149843
- sed -i \
- -e '/^importinc:/s|^|importinc:\nmanual_|' \
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
- common.mk || die
- sed -i \
- -e '/%.c/s: importinc$::' \
- common.mk lib/Makefile lib/util/Makefile || die
-
- # avoid ugly depend.mk warnings
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
- cat config.mk.in - >> config.mk <<-EOF
- # Misc crap
- BUILD_FIASCO = N
- SYMLINK = ln -sf
-
- # Toolchain options
- CC = $(tc-getCC) -Wall
- LD = \$(CC)
- CC_FOR_BUILD = $(tc-getBUILD_CC)
- LD_FOR_BUILD = \$(CC_FOR_BUILD)
- AR = $(tc-getAR)
- RANLIB = $(tc-getRANLIB)
-
- STRIPFLAG =
- CFLAGS_SHLIB = -fPIC
-
- LDRELOC = \$(LD) -r
- LDSHLIB = $(netpbm_ldshlib)
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
- LINKERISCOMPILER = Y
- NETPBMLIBSUFFIX = $(netpbm_libsuffix)
- NETPBMLIBTYPE = $(netpbm_libtype)
-
- # Gentoo build options
- TIFFLIB = $(netpbm_config tiff)
- # Let tiff worry about its own dependencies #395753
- TIFFLIB_NEEDS_JPEG = N
- TIFFLIB_NEEDS_Z = N
- JPEGLIB = $(netpbm_config jpeg)
- PNGLIB = $(netpbm_config png)
- ZLIB = $(netpbm_config zlib z)
- LINUXSVGALIB = $(netpbm_config svga vga)
- XML2_LIBS = $(netpbm_config xml xml2)
- JBIGLIB = -ljbig
- JBIGHDR_DIR = $(netpbm_config jbig "!")
- JASPERLIB = -ljasper
- JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
- URTLIB = $(netpbm_config rle)
- URTHDR_DIR =
- X11LIB = $(netpbm_config X X11)
- X11HDR_DIR =
- EOF
- # cannot chain the die with the heredoc above as bash-3
- # has a parser bug in that setup #282902
- [ $? -eq 0 ] || die "writing config.mk failed"
-}
-
-src_compile() {
- # Solaris doesn't have vasprintf, libiberty does have it, for gethostbyname
- # we need -lnsl, for connect -lsocket
- [[ ${CHOST} == *-solaris* ]] && extlibs="-liberty -lnsl -lsocket"
- # same holds for interix, but we only need iberty
- [[ ${CHOST} == *-interix* ]] && extlibs="-liberty"
-
- emake LIBS="${extlibs}" -j1 pm_config.h version.h manual_importinc || die #149843
- emake LIBS="${extlibs}" || die
-}
-
-src_install() {
- mkdir -p "${ED}"
- # Subdir make targets like to use `mkdir` all over the place
- # without any actual dependencies, thus the -j1.
- emake -j1 package pkgdir="${ED}"/usr || die
-
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
-
- # Remove cruft that we don't need, and move around stuff we want
- rm "${ED}"/usr/bin/{doc.url,manweb} || die
- rm -r "${ED}"/usr/man/web || die
- rm -r "${ED}"/usr/link || die
- rm "${ED}"/usr/{README,VERSION,config_template,pkginfo} || die
- dodir /usr/share
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
- dodoc README
- cd doc
- dodoc HISTORY Netpbm.programming USERDOC
- dohtml -r .
-}
diff --git a/media-libs/netpbm/netpbm-10.59.00.ebuild b/media-libs/netpbm/netpbm-10.59.00.ebuild
deleted file mode 100644
index a1987225f5..0000000000
--- a/media-libs/netpbm/netpbm-10.59.00.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.59.00.ebuild,v 1.1 2012/07/18 21:50:27 vapier Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs eutils multilib prefix
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jbig jpeg jpeg2k png rle svga tiff X xml zlib"
-
-RDEPEND="jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/jasper )
- png? ( >=media-libs/libpng-1.4:0 )
- rle? ( media-libs/urt )
- svga? ( media-libs/svgalib )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- xml? ( dev-libs/libxml2 )
- zlib? ( sys-libs/zlib )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- sys-devel/flex"
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo ${suffix//\.}
-}
-netpbm_ldshlib() {
- # ultra dirty Darwin hack, but hey... in the end this is all it needs...
- case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name ${EPREFIX}/usr/lib/libnetpbm.$(MAJ).dylib';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
- esac
-}
-netpbm_config() {
- if use $1 ; then
- [[ $2 != "!" ]] && echo -l${2:-$1}
- else
- echo NONE
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/netpbm-10.31-build.patch
-
- epatch "${FILESDIR}"/${PN}-10.46.00-solaris.patch
- epatch "${FILESDIR}"/${PN}-10.48.00-solaris.patch
- #epatch "${FILESDIR}"/${PN}-10.57.00-solaris-xopensource.patch
- #epatch "${FILESDIR}"/${PN}-10.48.00-interix.patch
- epatch "${FILESDIR}"/${PN}-10.60.01-strcaseeq-strcasecmp.patch
- epatch "${FILESDIR}"/netpbm-prefix.patch
- eprefixify converter/pbm/pbmtox10bm generator/ppmrainbow \
- editor/{ppmfade,pnmflip,pnmquant,ppmquant,ppmshadow}
-
- # make sure we use system urt
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -rf urt
-
- # take care of the importinc stuff ourselves by only doing it once
- # at the top level and having all subdirs use that one set #149843
- sed -i \
- -e '/^importinc:/s|^|importinc:\nmanual_|' \
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
- common.mk || die
- sed -i \
- -e '/%.c/s: importinc$::' \
- common.mk lib/Makefile lib/util/Makefile || die
-
- # avoid ugly depend.mk warnings
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
- cat config.mk.in - >> config.mk <<-EOF
- # Misc crap
- BUILD_FIASCO = N
- SYMLINK = ln -sf
-
- # Toolchain options
- CC = $(tc-getCC) -Wall
- LD = \$(CC)
- CC_FOR_BUILD = $(tc-getBUILD_CC)
- LD_FOR_BUILD = \$(CC_FOR_BUILD)
- AR = $(tc-getAR)
- RANLIB = $(tc-getRANLIB)
-
- STRIPFLAG =
- CFLAGS_SHLIB = -fPIC
-
- LDRELOC = \$(LD) -r
- LDSHLIB = $(netpbm_ldshlib)
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
- LINKERISCOMPILER = Y
- NETPBMLIBSUFFIX = $(netpbm_libsuffix)
- NETPBMLIBTYPE = $(netpbm_libtype)
-
- # Gentoo build options
- TIFFLIB = $(netpbm_config tiff)
- # Let tiff worry about its own dependencies #395753
- TIFFLIB_NEEDS_JPEG = N
- TIFFLIB_NEEDS_Z = N
- JPEGLIB = $(netpbm_config jpeg)
- PNGLIB = $(netpbm_config png)
- ZLIB = $(netpbm_config zlib z)
- LINUXSVGALIB = $(netpbm_config svga vga)
- XML2_LIBS = $(netpbm_config xml xml2)
- JBIGLIB = -ljbig
- JBIGHDR_DIR = $(netpbm_config jbig "!")
- JASPERLIB = -ljasper
- JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
- URTLIB = $(netpbm_config rle)
- URTHDR_DIR =
- X11LIB = $(netpbm_config X X11)
- X11HDR_DIR =
- EOF
- # cannot chain the die with the heredoc above as bash-3
- # has a parser bug in that setup #282902
- [ $? -eq 0 ] || die "writing config.mk failed"
-}
-
-src_compile() {
- # Solaris doesn't have vasprintf, libiberty does have it, for gethostbyname
- # we need -lnsl, for connect -lsocket
- [[ ${CHOST} == *-solaris* ]] && extlibs="-liberty -lnsl -lsocket"
- # same holds for interix, but we only need iberty
- [[ ${CHOST} == *-interix* ]] && extlibs="-liberty"
-
- emake LIBS="${extlibs}" -j1 pm_config.h version.h manual_importinc #149843
- emake LIBS="${extlibs}"
-}
-
-src_install() {
- mkdir -p "${ED}"
- # Subdir make targets like to use `mkdir` all over the place
- # without any actual dependencies, thus the -j1.
- emake -j1 package pkgdir="${ED}"/usr
-
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
-
- # Remove cruft that we don't need, and move around stuff we want
- rm "${ED}"/usr/bin/{doc.url,manweb} || die
- rm -r "${ED}"/usr/man/web || die
- rm -r "${ED}"/usr/link || die
- rm "${ED}"/usr/{README,VERSION,config_template,pkginfo} || die
- dodir /usr/share
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
- doman userguide/*.[0-9]
- use doc && dohtml -r userguide
- dodoc README
- cd doc
- dodoc HISTORY Netpbm.programming USERDOC
- dohtml -r .
-}
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
deleted file mode 100644
index 8d33c25e68..0000000000
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils multilib prefix
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
-
-RDEPEND="jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper )
- png? ( >=media-libs/libpng-1.4:0 )
- postscript? ( app-text/ghostscript-gpl )
- rle? ( media-libs/urt )
- svga? ( media-libs/svgalib )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- xml? ( dev-libs/libxml2 )
- zlib? ( sys-libs/zlib )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- sys-devel/flex"
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo ${suffix//\.}
-}
-netpbm_ldshlib() {
- # ultra dirty Darwin hack, but hey... in the end this is all it needs...
- case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name ${EPREFIX}/usr/lib/libnetpbm.$(MAJ).dylib';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
- esac
-}
-netpbm_config() {
- if use $1 ; then
- [[ $2 != "!" ]] && echo -l${2:-$1}
- else
- echo NONE
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/netpbm-10.76.00-build.patch
- epatch "${FILESDIR}"/netpbm-10.76.00-test.patch #450530
- epatch "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
- epatch "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
-
- epatch "${FILESDIR}"/${PN}-10.46.00-solaris.patch
- epatch "${FILESDIR}"/${PN}-10.76.00-solaris.patch
- epatch "${FILESDIR}"/${PN}-10.60.01-strcaseeq-strcasecmp.patch
-
- # make sure we use system libs
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -r urt converter/other/jbig/libjbig converter/other/jpeg2000/libjasper || die
-
- # take care of the importinc stuff ourselves by only doing it once
- # at the top level and having all subdirs use that one set #149843
- sed -i \
- -e '/^importinc:/s|^|importinc:\nmanual_|' \
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
- common.mk || die
- sed -i \
- -e '/%.c/s: importinc$::' \
- common.mk lib/Makefile lib/util/Makefile || die
- sed -i \
- -e 's:pkg-config:$(PKG_CONFIG):' \
- GNUmakefile converter/other/Makefile other/pamx/Makefile || die
-
- # The postscript knob is currently bound up with a fork test.
- if ! use postscript ; then
- sed -i \
- -e 's:$(DONT_HAVE_PROCESS_MGMT):Y:' \
- converter/other/Makefile generator/Makefile || die
- sed -i -r \
- -e 's:(pbmtextps|pnmtops|pstopnm).*::' \
- test/all-in-place.{ok,test} || die
- sed -i -e '/^$/d' test/all-in-place.ok || die
- sed -i '2iexit 80' test/ps-{alt-,}roundtrip.test || die
- fi
-
- # avoid ugly depend.mk warnings
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
- cat config.mk.in - >> config.mk <<-EOF
- # Misc crap
- BUILD_FIASCO = N
- SYMLINK = ln -sf
-
- # These vars let src_test work by default
- PKGDIR_DEFAULT = ${T}/netpbm
- RESULTDIR_DEFAULT = ${T}/netpbm-test
-
- # Toolchain options
- CC = $(tc-getCC) -Wall
- LD = \$(CC)
- CC_FOR_BUILD = $(tc-getBUILD_CC)
- LD_FOR_BUILD = \$(CC_FOR_BUILD)
- AR = $(tc-getAR)
- RANLIB = $(tc-getRANLIB)
- PKG_CONFIG = $(tc-getPKG_CONFIG)
-
- STRIPFLAG =
- CFLAGS_SHLIB = -fPIC
-
- LDRELOC = \$(LD) -r
- LDSHLIB = $(netpbm_ldshlib)
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
- LINKERISCOMPILER = Y
- NETPBMLIBSUFFIX = $(netpbm_libsuffix)
- NETPBMLIBTYPE = $(netpbm_libtype)
- STATICLIB_TOO = $(usex static-libs Y N)
-
- # The var is called SSE, but the code is actually SSE2.
- WANT_SSE = $(usex cpu_flags_x86_sse2 Y N)
-
- # Gentoo build options
- TIFFLIB = $(netpbm_config tiff)
- # Let tiff worry about its own dependencies #395753
- TIFFLIB_NEEDS_JPEG = N
- TIFFLIB_NEEDS_Z = N
- JPEGLIB = $(netpbm_config jpeg)
- PNGLIB = $(netpbm_config png)
- ZLIB = $(netpbm_config zlib z)
- LINUXSVGALIB = $(netpbm_config svga vga)
- XML2_LIBS = $(netpbm_config xml xml2)
- JBIGLIB = $(netpbm_config jbig)
- JBIGHDR_DIR =
- JASPERLIB = $(netpbm_config jpeg2k jasper)
- JASPERHDR_DIR =
- URTLIB = $(netpbm_config rle)
- URTHDR_DIR =
- X11LIB = $(netpbm_config X X11)
- X11HDR_DIR =
- EOF
- # cannot chain the die with the heredoc above as bash-3
- # has a parser bug in that setup #282902
- [ $? -eq 0 ] || die "writing config.mk failed"
-}
-
-src_compile() {
- # Solaris doesn't have vasprintf, libiberty does have it, for gethostbyname
- # we need -lnsl, for connect -lsocket
- [[ ${CHOST} == *-solaris* ]] && extlibs="-liberty -lnsl -lsocket"
-
- emake LIBS="${extlibs}" -j1 pm_config.h version.h manual_importinc #149843
- emake LIBS="${extlibs}"
-}
-
-src_test() {
- # The code wants to install everything first and then test the result.
- emake install.{bin,lib,data}
- emake check
-}
-
-src_install() {
- mkdir -p "${ED}"
- # Subdir make targets like to use `mkdir` all over the place
- # without any actual dependencies, thus the -j1.
- emake -j1 package pkgdir="${ED}"/usr
-
- [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir)
-
- # Remove cruft that we don't need, and move around stuff we want
- rm "${ED}"/usr/bin/{doc.url,manweb} || die
- rm -r "${ED}"/usr/man/web || die
- rm -r "${ED}"/usr/link || die
- rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die
- dodir /usr/share
- mv "${ED}"/usr/man "${ED}"/usr/share/ || die
- mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die
-
- doman userguide/*.[0-9]
- use doc && dohtml -r userguide
- dodoc README
- cd doc
- dodoc HISTORY Netpbm.programming USERDOC
- dohtml -r .
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-06 12:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-06 12:06 [gentoo-commits] repo/proj/prefix:master commit in: media-libs/netpbm/files/, media-libs/netpbm/ Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox