From 55ed866b8e61b448237caf126927f7326b2e3af3 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Tue, 28 Apr 2015 14:04:39 +0000 Subject: [PATCH] graphics/netpbm --- graphics/netpbm/Makefile | 4 ++++ graphics/netpbm/distinfo | 2 ++ graphics/netpbm/patches/patch-zz-minix-a | 20 ++++++++++++++++ graphics/netpbm/patches/patch-zz-minix-b | 29 ++++++++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 graphics/netpbm/patches/patch-zz-minix-a create mode 100644 graphics/netpbm/patches/patch-zz-minix-b diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 5ce097ddc..94fd6981d 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -63,6 +63,10 @@ MAKE_FLAGS.SunOS+= LDSHLIB=-shared MAKE_FLAGS.SunOS+= NEED_RUNTIME_PATH=Y MAKE_FLAGS.SunOS+= NETWORKLD="-lsocket -lnsl" +.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix" +BUILDLINK_TRANSFORM+= rm:-R/usr/pkg/lib +.endif # ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix" + .if ${OS_VARIANT} == "SCOOSR5" MAKE_FLAGS+= NETWORKLD="-lsocket -lresolv" .endif diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 6b527ac4c..ffbd0a0ce 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -13,3 +13,5 @@ SHA1 (patch-converter_other_giftopnm.c) = 444fd73c239279a94481a2163a9e31d340af1a SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca SHA1 (patch-pm__config.in.h) = c6d51bbdf6c1f7725f08f321591038e296761e61 SHA1 (patch-wordaccess_be_aligned.h) = 7cc5cd1126f65b3307393c978ac9ff4a49d666de +SHA1 (patch-zz-minix-a) = 9de7f260f428853c840b71095dee6dc4147f23c2 +SHA1 (patch-zz-minix-b) = ce54d931bdbe444e00572c06e7f30d02c3c26b30 diff --git a/graphics/netpbm/patches/patch-zz-minix-a b/graphics/netpbm/patches/patch-zz-minix-a new file mode 100644 index 000000000..1f9b6e9d8 --- /dev/null +++ b/graphics/netpbm/patches/patch-zz-minix-a @@ -0,0 +1,20 @@ +--- pm_config.in.h.orig Sun Oct 16 21:10:30 2016 ++++ pm_config.in.h Sun Oct 16 21:11:15 2016 +@@ -49,7 +49,7 @@ + + The problematic C libraries treat _XOPEN_SOURCE the same way. + */ +-#if defined(__OpenBSD__) || defined (__NetBSD__) || defined(__bsdi__) || defined(__APPLE__) ++#if defined(__OpenBSD__) || defined(__minix) || defined (__NetBSD__) || defined(__bsdi__) || defined(__APPLE__) + #define POSIX_IS_IMPLIED + #endif + +@@ -140,7 +140,7 @@ + /* #define HAVE_SETMODE */ + + #if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) \ +- || defined(__NetBSD__) || (defined(__SVR4) && defined (__sun)) ++ || defined(__minix) || defined(__NetBSD__) || (defined(__SVR4) && defined (__sun)) + #define HAVE_VASPRINTF 1 + #else + #define HAVE_VASPRINTF 0 diff --git a/graphics/netpbm/patches/patch-zz-minix-b b/graphics/netpbm/patches/patch-zz-minix-b new file mode 100644 index 000000000..62d85b2ea --- /dev/null +++ b/graphics/netpbm/patches/patch-zz-minix-b @@ -0,0 +1,29 @@ +--- config.mk.in.orig Sun Oct 16 21:12:18 2016 ++++ config.mk.in Sun Oct 16 21:13:08 2016 +@@ -336,7 +336,7 @@ + # the directory information in the executable at link time. + + NEED_RUNTIME_PATH = N +-# Solaris, SunOS, NetBSD, AIX: ++# Solaris, SunOS, Minix, NetBSD, AIX: + #NEED_RUNTIME_PATH = Y + + # RPATHOPTNAME is the option you use on the link command to specify +@@ -378,7 +378,7 @@ + + #TIFFLIB = libtiff.so + #TIFFHDR_DIR = /usr/include/libtiff +-#NetBSD: ++# Minix, NetBSD: + #TIFFLIB = $(LOCALBASE)/lib/libtiff.so + #TIFFHDR_DIR = $(LOCALBASE)/include + # OSF, Tru64: +@@ -448,7 +448,7 @@ + PNGVER = + #PNGLIB = libpng$(PNGVER).so + #PNGHDR_DIR = /usr/include/libpng$(PNGVER) +-# NetBSD: ++# Minix, NetBSD: + #PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so + #PNGHDR_DIR = $(LOCALBASE)/include + # OSF/Tru64: