Wed Dec 12 16:37:09 2012 UTC ()
Unbreak on {Mir,Openç«•}BSD by excluding the use of memalign.

The patch is a horrible way to fix this. The real fix should be a check
for the existence of memalign in the configure script.


(bsiegert)
diff -r1.40 -r1.41 pkgsrc/print/ghostscript/distinfo
diff -r1.1 -r1.2 pkgsrc/print/ghostscript/patches/patch-openjpeg_libopenjpeg_opj_malloc_h
cvs diff -r1.40 -r1.41 pkgsrc/print/ghostscript/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/ghostscript/Attic/distinfo 2012/10/10 02:18:25 1.40
+++ pkgsrc/print/ghostscript/Attic/distinfo 2012/12/12 16:37:08 1.41
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.40 2012/10/10 02:18:25 mef Exp $ 1$NetBSD: distinfo,v 1.41 2012/12/12 16:37:08 bsiegert Exp $
2 2
3SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf 3SHA1 (ghostscript-9.05.tar.bz2) = 1a54a846e90ae95b5307f4f0459d044b9597d8cf
4RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084 4RMD160 (ghostscript-9.05.tar.bz2) = 27935f60083b788b2793b19ee42f3663082ba084
5Size (ghostscript-9.05.tar.bz2) = 28279634 bytes 5Size (ghostscript-9.05.tar.bz2) = 28279634 bytes
6SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca 6SHA1 (patch-CVE-2012-4405) = 1dcb4cfeceb366c144e0a1337c6ccc2d8e13e4ca
7SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de 7SHA1 (patch-af) = 79af4d253001f879f1b5d3ef93584ae7300361de
8SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429 8SHA1 (patch-ah) = 35d6e3a4623bb28e59526f61a3062874cc363429
9SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65 9SHA1 (patch-ai) = 8a3de7e097d3d893a0de4ea2936acf192f770c65
10SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c 10SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
11SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc 11SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
12SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2 12SHA1 (patch-an) = 22ed9965aec5d540adb31334d8dd9e05eab8e0c2
13SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f 13SHA1 (patch-base_gdevpng.c) = 24120e26bd2a846f6d4c8ab9753dfe91f151343f
14SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae 14SHA1 (patch-base_gserrors_h) = fde64bd096a6e6f94005c8352a6295df06c19bae
15SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600 15SHA1 (patch-configure.ac) = 450053cef6948c638bf8f72cfcba7391edb33600
16SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 383db0c5909b9d7b33f8da341d82159dbf8594b5 16SHA1 (patch-openjpeg_libopenjpeg_opj_malloc_h) = 4be081d6c4c9bc632ef8d9685fe4167ea3c51484
cvs diff -r1.1 -r1.2 pkgsrc/print/ghostscript/patches/Attic/patch-openjpeg_libopenjpeg_opj_malloc_h (expand / switch to unified diff)

--- pkgsrc/print/ghostscript/patches/Attic/patch-openjpeg_libopenjpeg_opj_malloc_h 2012/10/07 14:19:19 1.1
+++ pkgsrc/print/ghostscript/patches/Attic/patch-openjpeg_libopenjpeg_opj_malloc_h 2012/12/12 16:37:09 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.1 2012/10/07 14:19:19 mef Exp $ 1$NetBSD: patch-openjpeg_libopenjpeg_opj_malloc_h,v 1.2 2012/12/12 16:37:09 bsiegert Exp $
2 2
3To avoid following problem: 3To avoid following problem:
4| gcc .. (omitted).. g -o ./sobin/gsc ./psi/dxmainc.c \ 4| gcc .. (omitted).. g -o ./sobin/gsc ./psi/dxmainc.c \
5| -L./sobin -Wl,-R/usr/pkg/lib -lgs 5| -L./sobin -Wl,-R/usr/pkg/lib -lgs
6| ./sobin/libgs.so: undefined reference to `memalign' 6| ./sobin/libgs.so: undefined reference to `memalign'
7| gmake[2]: *** [sobin/gsc] Error 1 7| gmake[2]: *** [sobin/gsc] Error 1
8 8
9--- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-04-18 22:36:57.000000000 +0900 9--- openjpeg/libopenjpeg/opj_malloc.h.orig 2012-04-18 22:36:57.000000000 +0900
10+++ openjpeg/libopenjpeg/opj_malloc.h 2012-04-18 22:54:13.000000000 +0900 10+++ openjpeg/libopenjpeg/opj_malloc.h 2012-04-18 22:54:13.000000000 +0900
11@@ -84,7 +84,7 @@ 11@@ -84,7 +84,7 @@
12 #if defined(__sun) 12 #if defined(__sun)
13 #define HAVE_MEMALIGN 13 #define HAVE_MEMALIGN
14 /* Linux x86_64 and OSX always align allocations to 16 bytes */ 14 /* Linux x86_64 and OSX always align allocations to 16 bytes */
15- #elif !defined(__amd64__) && !defined(__APPLE__)  15- #elif !defined(__amd64__) && !defined(__APPLE__)
16+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__) 16+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
17 #define HAVE_MEMALIGN 17 #define HAVE_MEMALIGN
18 #include <malloc.h>  18 #include <malloc.h>
19 #endif 19 #endif