svn commit: r411421 - head/devel/upp

[Mark Felder]

Author: feld
Date: Sat Mar 19 19:34:29 2016
New Revision: 411421
URL: https://svnweb.freebsd.org/changeset/ports/411421

Log:
  devel/upp: Unbreak port
  
  - Bump PORTREVISION
  - Use simplified upstream patch [1, 2] to fix the build
  
  Reference links:
  1. Fixed FT include issue in GtkDrawText.cpp
  https://github.com/ultimatepp/mirror/commit/24c443290699034e21d6bdb8b1dee493e78107c5
  2. freetype include in GTK backend removed
  https://github.com/ultimatepp/mirror/commit/71174caa1b99265490d1cc210e7efe0f6b325eba
  
  PR:		207979

Modified:
  head/devel/upp/Makefile

Modified: head/devel/upp/Makefile
==============================================================================
--- head/devel/upp/Makefile	Sat Mar 19 18:17:50 2016	(r411420)
+++ head/devel/upp/Makefile	Sat Mar 19 19:34:29 2016	(r411421)
@@ -3,6 +3,7 @@
 
 PORTNAME=	upp
 PORTVERSION=	9251
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.2/
 DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
@@ -13,8 +14,6 @@ COMMENT=	Ultimate++, a BSD-licensed, cro
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${BUILD_WRKSRC}/Core/Copying
 
-BROKEN=		fails to build
-
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libnotify.so:${PORTSDIR}/devel/libnotify
@@ -66,6 +65,8 @@ post-patch: .SILENT
 		-e 's|-Linux-|-BSD-FreeBSD-|' \
 		-e 's|-ldl|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng -lexecinfo|' \
 		${BUILD_WRKSRC}/Makefile
+# Use simplified upstream patch to fix the build
+	${REINPLACE_CMD} -e '/ftoutln.h/d' ${BUILD_WRKSRC}/CtrlCore/GtkDrawText.cpp
 
 post-build: .SILENT
 	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm