aboutsummaryrefslogtreecommitdiffstats
path: root/devel/upp
diff options
context:
space:
mode:
authorfeld <feld@FreeBSD.org>2016-03-20 03:34:29 +0800
committerfeld <feld@FreeBSD.org>2016-03-20 03:34:29 +0800
commit05883419a8013b8f3d492e7e96525d33b24cae31 (patch)
tree6e3e1e8916858691523d2f120514fa6f8e947e8f /devel/upp
parent9dab32d796908d2b122b2072c23a3535a244abbc (diff)
downloadfreebsd-ports-gnome-05883419a8013b8f3d492e7e96525d33b24cae31.tar.gz
freebsd-ports-gnome-05883419a8013b8f3d492e7e96525d33b24cae31.tar.zst
freebsd-ports-gnome-05883419a8013b8f3d492e7e96525d33b24cae31.zip
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
Diffstat (limited to 'devel/upp')
-rw-r--r--devel/upp/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/devel/upp/Makefile b/devel/upp/Makefile
index 31ef9f60543a..96ab73471670 100644
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -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, cross-platform, C/C++ RAD suite
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