svn commit: r404316 - in head/devel/upp: . files

[Thomas Zander]

Author: riggs
Date: Wed Dec 23 19:39:42 2015
New Revision: 404316
URL: https://svnweb.freebsd.org/changeset/ports/404316

Log:
  Update to upstream version 9251, convert to OPTION helpers
  
  PR:		204961
  Submitted by:	lightside at gmx.com
  Approved by:	maintainer timeout

Deleted:
  head/devel/upp/files/
Modified:
  head/devel/upp/Makefile
  head/devel/upp/distinfo

Modified: head/devel/upp/Makefile
==============================================================================
--- head/devel/upp/Makefile	Wed Dec 23 19:25:48 2015	(r404315)
+++ head/devel/upp/Makefile	Wed Dec 23 19:39:42 2015	(r404316)
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	upp
-PORTVERSION=	8227
+PORTVERSION=	9251
 CATEGORIES=	devel x11-toolkits
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.1/
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.2/
 DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
 
 MAINTAINER=	m.sund at arcor.de
@@ -35,6 +35,12 @@ MAKE_ARGS=	UPPOUT="../_out/" OutFile="..
 		-I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/glib-2.0 \
 		-I${LOCALBASE}/lib/glib-2.0/include -I/usr/include"
 
+MAKE_JOBS_UNSAFE=	yes
+
+BROKEN_ia64=	Does not compile on ${ARCH}
+BROKEN_powerpc=	Does not compile on ${ARCH}
+BROKEN_sparc64=	Does not compile on ${ARCH}
+
 PORTDATA=	bazaar examples reference tutorial uppsrc *.bm
 
 DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \
@@ -43,6 +49,7 @@ DESKTOP_ENTRIES="TheIDE" "IDE for cross-
 
 OPTIONS_DEFINE=	SDL OPENGL MYSQL PGSQL USEMALLOC
 USEMALLOC_DESC=	Compile without U++ heap allocator
+USEMALLOC_VARS=	MACRO_FLAGS+=-DflagUSEMALLOC
 
 PLIST_FILES=	bin/theide
 
@@ -51,16 +58,6 @@ OPENGL_USE=	gl
 MYSQL_USE=	mysql=yes
 PGSQL_USES=	pgsql
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MUSEMALLOC}
-MACRO_FLAGS+=	-DflagUSEMALLOC
-.endif
-
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64, powerpc, or sparc64
-.endif
-
 post-patch: .SILENT
 	${MV} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile
 	${REINPLACE_CMD} -e '/^CXX =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \
@@ -70,6 +67,7 @@ post-patch: .SILENT
 
 post-build: .SILENT
 	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
+	${ECHO_CMD} "COMMON_CPP_OPTIONS = \"-std=c++0x\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC.bm
 	${ECHO_CMD} "DEBUG_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
@@ -91,6 +89,8 @@ post-build: .SILENT
 	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
 		${SED} -i '' -e '/^BUILDER/s|GCC|CLANG| ; \
 		s| -fdata-sections|| ; s| -finline-limit=20||' CLANG.bm)
+	${ECHO_CMD} "COMMON_OPTIONS = \"-Wno-logical-op-parentheses\";" >> ${WRKSRC}/CLANG.bm
+	${ECHO_CMD} "ALLOW_PRECOMPILED_HEADERS = \"0\";" >> ${WRKSRC}/CLANG.bm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin

Modified: head/devel/upp/distinfo
==============================================================================
--- head/devel/upp/distinfo	Wed Dec 23 19:25:48 2015	(r404315)
+++ head/devel/upp/distinfo	Wed Dec 23 19:39:42 2015	(r404316)
@@ -1,2 +1,2 @@
-SHA256 (upp-x11-src-8227.tar.gz) = 0cbac66dd527d9b05fc279ffb8b53cab1cd67d275f173c95a59b904fd46bb338
-SIZE (upp-x11-src-8227.tar.gz) = 44496813
+SHA256 (upp-x11-src-9251.tar.gz) = f1012e15914a4a9d4c70c008b94b932db7dd39ff043bdf5c4584a45f7580ebd5
+SIZE (upp-x11-src-9251.tar.gz) = 45014025