From cc45666f8404962113d519f5441c318e44a31291 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Wed, 18 Jun 2014 07:40:41 +0000
Subject: - Update to 7.1.5

PR:		190899
---
 graphics/ipe/Makefile | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'graphics/ipe/Makefile')

diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 213c9fe0b03e..f36a349f9243 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipe
-PORTVERSION=	7.1.4
+PORTVERSION=	7.1.5
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}${PORTVERSION:R:R}/${PORTNAME}/${PORTVERSION:R}
@@ -12,18 +12,18 @@ COMMENT=	Extensible vector graphics editor with Latex text support
 
 LICENSE=	GPLv3 # (or later)
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		liblua-5.2.so:${PORTSDIR}/lang/lua52
+LIB_DEPENDS=	liblua-5.2.so:${PORTSDIR}/lang/lua52
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
-OPTIONS_DEFINE=	DOCS
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-USES=		gmake iconv pkgconfig
+USES=		dos2unix gmake iconv pkgconfig
+DOS2UNIX_FILES=	ipelib/Makefile
+USE_GNOME=	cairo
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 USE_TEX=	latex
-MAKE_ENV=	DLL_CFLAGS="-fPIC" \
+MAKE_ENV=	DL_LIBS="" \
+		DLL_CFLAGS="-fPIC" \
 		ICONV_CFLAGS="-I${ICONV_PREFIX}/include" \
 		ICONV_LIBS="-L${ICONV_PREFIX}/lib ${ICONV_LIB}" \
 		INSTALL_DIR="${MKDIR}" \
@@ -35,6 +35,8 @@ MAKE_ENV=	DLL_CFLAGS="-fPIC" \
 		IPEDOCDIR="${DOCSDIR}" \
 		IPEMANDIR="${MANPREFIX}/man/man1" \
 		IPEPREFIX="${PREFIX}" \
+		JPEG_CFLAGS="-I${LOCALBASE}/include" \
+		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
 		LUA_CFLAGS="-I${LOCALBASE}/include/lua52" \
 		LUA_LIBS="-L${LOCALBASE}/lib -llua-5.2" \
 		MOC="${MOC}"
@@ -47,7 +49,7 @@ PORTDOCS=	*
 DESKTOP_ENTRIES="Ipe" "" "${DATADIR}/${PORTVERSION}/ipe.png" \
 		"${PORTNAME}" "" true
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@cd ${WRKSRC}/../fontmaps && ${SED} -e \
@@ -63,6 +65,8 @@ post-patch:
 		'/$$(INSTALL_ROOT)$$(IPEDOCDIR)/s|^|#|' ${WRKSRC}/ipe/Makefile
 	@${REINPLACE_CMD} -e \
 		'/%s/s|gnome-open|xdg-open|' ${WRKSRC}/ipe/lua/prefs.lua
+	@${REINPLACE_CMD} -e \
+		's|QT__H|QT_H|' ${WRKSRC}/ipeui/ipeui_qt.h
 
 post-install:
 	(cd ${WRKSRC}/../fontmaps && ${INSTALL_DATA} fontmap.xml \
-- 
cgit v1.2.3