From f5a637e0fa8274d33f266e0a97f152b630bf05f9 Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Wed, 8 Aug 2012 10:03:45 +0000
Subject: Switch from lcms to lcms2 Convert to OptionsNG Fix jpeg detection

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17032 df743ca5-7f9a-e211-a948-0013205c9059
---
 graphics/poppler/Makefile              | 22 +++++++++++-----------
 graphics/poppler/files/patch-configure | 13 +++++++++++++
 2 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 graphics/poppler/files/patch-configure

(limited to 'graphics')

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 020804379..8a6891dc2 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/poppler/Makefile,v 1.77 2012/06/13 12:29:03 kwm Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.78 2012/08/08 09:28:16 kwm Exp $
 #
 
 PORTNAME=	poppler
@@ -19,7 +19,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		lcms:${PORTSDIR}/graphics/lcms
+		lcms2:${PORTSDIR}/graphics/lcms2
 RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
 
 USE_GMAKE=	yes
@@ -35,8 +35,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .if !defined(SLAVEPORT)
-OPTIONS=	CAIRO "Enable cairo output backend" on \
-		OPENJPEG "Enable JPEG 2000 support" on
+OPTIONS_DEFINE=	CAIRO OPENJPEG
+OPTIONS_DEFAULT=CAIRO OPENJPEG
 .endif
 
 .include <bsd.port.options.mk>
@@ -82,19 +82,19 @@ CONFIGURE_ARGS+=--disable-poppler-glib \
 		--disable-poppler-qt4 \
 		--disable-utils
 
-.if defined(WITHOUT_CAIRO)
-CONFIGURE_ARGS+=--disable-cairo-output
-PLIST_SUB+=	CAIRO="@comment "
-.else
+.if ${PORT_OPTIONS:MCAIRO}
 LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
 PLIST_SUB+=	CAIRO=""
+.else
+CONFIGURE_ARGS+=--disable-cairo-output
+PLIST_SUB+=	CAIRO="@comment "
 .endif
 
-.if defined(WITHOUT_OPENJPEG)
-CONFIGURE_ARGS+=--disable-libopenjpeg
-.else
+.if ${PORT_OPTIONS:MOPENJPEG}
 CONFIGURE_ARGS+=--enable-libopenjpeg
 LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
+.else
+CONFIGURE_ARGS+=--disable-libopenjpeg
 .endif
 .endif
 
diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure
new file mode 100644
index 000000000..9b176321a
--- /dev/null
+++ b/graphics/poppler/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	2012-08-08 11:59:15.000000000 +0200
++++ configure	2012-08-08 11:59:45.000000000 +0200
+@@ -20271,8 +20271,8 @@
+ 
+           ac_save_USER_INCLUDES="$USER_INCLUDES"
+   ac_save_USER_LDFLAGS="$USER_LDFLAGS"
+-  USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS"
+-  USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_CFLAGS"
++  USER_INCLUDES="$USER_INCLUDES $LIBJPEG_CFLAGS $CPPFLAGS"
++  USER_LDFLAGS="$USER_LDFLAGS $LIBJPEG_LDFLAGS $LDFLAGS"
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg6b" >&5
-- 
cgit