[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Add a hacks.mk to avoid issues with inte...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dae316b5f57e
branches:  trunk
changeset: 603570:dae316b5f57e
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue May 08 09:24:15 2012 +0000

description:
Add a hacks.mk to avoid issues with internal/external libjpeg mismatches. Bump pkgrevision

diffstat:

 lang/openjdk7/Makefile |   4 ++--
 lang/openjdk7/hacks.mk |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 240f6abe1df3 -r dae316b5f57e lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Tue May 08 06:13:37 2012 +0000
+++ b/lang/openjdk7/Makefile    Tue May 08 09:24:15 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2012/05/04 16:25:59 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2012/05/08 09:24:15 abs Exp $
 
 DISTNAME=      openjdk-7-fcs-src-b147-27_jun_2011
 PKGNAME=       openjdk7-1.7.0.147.20110811
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 240f6abe1df3 -r dae316b5f57e lang/openjdk7/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/openjdk7/hacks.mk    Tue May 08 09:24:15 2012 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: hacks.mk,v 1.1 2012/05/08 09:24:15 abs Exp $
+
+.if !defined(OPENJDK7_HACKS_MK)
+OPENJDK7_HACKS_MK=     # empty
+
+### Ensure we do not pickup external jpeg includes: openjdk uses an internal
+### libjpeg with potentially conflicting defines, which breaks at least
+### libjpeg-turbo
+post-wrapper:
+       ${RM} -f ${BUILDLINK_DIR}/include/jconfig.h
+       ${RM} -f ${BUILDLINK_DIR}/include/jerror.h
+       ${RM} -f ${BUILDLINK_DIR}/include/jmorecfg.h
+       ${RM} -f ${BUILDLINK_DIR}/include/jpeglib.h
+
+.endif