diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 256df795b..de01bc3b9 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -51,6 +51,10 @@ SUBST_SED.rgb_txt+= -e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.t # only used if NEED_RUNTIME_PATH is set, so set it unconditionally MAKE_FLAGS+= NETPBMLIB_RUNTIME_PATH=${PREFIX} +.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix" +BUILDLINK_TRANSFORM+= rm:-R/usr/pkg/lib +.endif # ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix" + .if ${OPSYS} == "NetBSD" MAKE_FLAGS+= NEED_RUNTIME_PATH=Y .elif ${OPSYS} == "Darwin" diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 4b53af874..cd0cf1e93 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -11,3 +11,5 @@ SHA1 (patch-converter_other_giftopnm.c) = d64d645307e12b32d3a9ce56885bbfb3a4a80d SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca SHA1 (patch-pm__config.in.h) = 9cb3084371be4b354832581d47d552bfe9ff1ce1 SHA1 (patch-wordaccess_be_aligned.h) = 7cc5cd1126f65b3307393c978ac9ff4a49d666de +SHA1 (patch-zz-minix-a) = db1b60f7da452341869dd99142291f880481225a +SHA1 (patch-zz-minix-b) = e932586f79b4112fa9768f297962b81f20bbde82 diff --git a/graphics/netpbm/patches/patch-zz-minix-a b/graphics/netpbm/patches/patch-zz-minix-a new file mode 100644 index 000000000..bb561b526 --- /dev/null +++ b/graphics/netpbm/patches/patch-zz-minix-a @@ -0,0 +1,20 @@ +--- ./pm_config.in.h.orig Mon Apr 27 08:16:21 2015 ++++ ./pm_config.in.h Mon Apr 27 08:17:37 2015 +@@ -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 + +@@ -139,7 +139,7 @@ + + /* #define HAVE_SETMODE */ + +-#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) || defined(__NetBSD__) ++#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) || defined(__minix) || defined(__NetBSD__) + #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..91a24b94f --- /dev/null +++ b/graphics/netpbm/patches/patch-zz-minix-b @@ -0,0 +1,38 @@ +--- config.mk.orig Tue Apr 28 16:06:28 2015 ++++ config.mk Tue Apr 28 16:07:39 2015 +@@ -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: +@@ -408,7 +408,7 @@ + JPEGHDR_DIR = + #JPEGLIB = libjpeg.so + #JPEGHDR_DIR = /usr/include/jpeg +-# Netbsd: ++# Minix, Netbsd: + #JPEGLIB = ${LOCALBASE}/lib/libjpeg.so + #JPEGHDR_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: