Redo patch for PR pkg/41287 to get it formal correct (suggested by joerg@)

4 files changed, 39 insertions, 47 deletions

diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index aee983bff78..87db94a6b99 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/04/23 08:30:53 sno Exp $
+# $NetBSD: Makefile,v 1.23 2009/05/02 07:56:54 sno Exp $
 #
 
 DISTNAME=	pixman-0.15.2
@@ -40,5 +40,6 @@ PIXMAN_SYMFILE=	${WRKDIR}/pixman.sym
 
 post-extract:
 	${CP} ${FILESDIR}/pixman.sym ${WRKDIR}
+	${CP} ${FILESDIR}/solaris-hwcap.mapfile ${WRKDIR}/pixman
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 64ef1f3e94a..ee2e3697aa6 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2009/04/28 11:31:39 sno Exp $
+$NetBSD: distinfo,v 1.24 2009/05/02 07:56:54 sno Exp $
 
 SHA1 (pixman-0.15.2.tar.bz2) = fd44f4dc0e429bb71344d33c783837fd0b8b6b5b
 RMD160 (pixman-0.15.2.tar.bz2) = 5d925326dfdc3ad73d98eb48f92eccab0f97f63c
@@ -8,4 +8,3 @@ SHA1 (patch-ab) = 11fe86650fe666366818dd70ecabeac7a49c1dba
 SHA1 (patch-ac) = c798e52ecd8fc2a5788552df0a0842f524705126
 SHA1 (patch-ad) = b2fa221652bc5f8bec000e071417b0180816a451
 SHA1 (patch-ae) = 43ac5ba418bb335ef65634bc6dea5d7dc89a19d0
-SHA1 (patch-aj) = 18ffa581c4c6c4ccca92d1f5032865e2d7a1384a
diff --git a/x11/pixman/files/solaris-hwcap.mapfile b/x11/pixman/files/solaris-hwcap.mapfile
new file mode 100644
index 00000000000..7f439a95a7f
--- /dev/null
+++ b/x11/pixman/files/solaris-hwcap.mapfile
@@ -0,0 +1,36 @@
+###############################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+###############################################################################
+#
+# Override the linker's detection of CMOV/MMX/SSE instructions so this
+# library isn't flagged as only usable on CPU's with those ISA's, since it
+# checks at runtime for availability before calling them
+
+hwcap_1 = V0x0 FPU OVERRIDE;
diff --git a/x11/pixman/patches/patch-aj b/x11/pixman/patches/patch-aj
deleted file mode 100644
index 35c6ef73084..00000000000
--- a/x11/pixman/patches/patch-aj
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/04/28 11:31:39 sno Exp $
-
-Adding file imported by Alan Coopersmith but wasn't labeled for 0.15.2
-Bug reported https://bugs.freedesktop.org/show_bug.cgi?id=21429
-
---- /dev/null	2009-04-28 13:19:29.000000000 +0200
-+++ pixman/solaris-hwcap.mapfile	2009-04-28 13:20:22.321122943 +0200
-@@ -0,0 +1,36 @@
-+###############################################################################
-+#
-+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the
-+# "Software"), to deal in the Software without restriction, including
-+# without limitation the rights to use, copy, modify, merge, publish,
-+# distribute, and/or sell copies of the Software, and to permit persons
-+# to whom the Software is furnished to do so, provided that the above
-+# copyright notice(s) and this permission notice appear in all copies of
-+# the Software and that both the above copyright notice(s) and this
-+# permission notice appear in supporting documentation.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+#
-+# Except as contained in this notice, the name of a copyright holder
-+# shall not be used in advertising or otherwise to promote the sale, use
-+# or other dealings in this Software without prior written authorization
-+# of the copyright holder.
-+#
-+###############################################################################
-+#
-+# Override the linker's detection of CMOV/MMX/SSE instructions so this
-+# library isn't flagged as only usable on CPU's with those ISA's, since it
-+# checks at runtime for availability before calling them
-+
-+hwcap_1 = V0x0 FPU OVERRIDE;