View | Details | Raw Unified | Return to bug 204961
Collapse All | Expand All

(-)upp/Makefile (-12 / +12 lines)
Lines 2-10 Link Here
2
# $FreeBSD: head/devel/upp/Makefile 385394 2015-05-04 11:17:21Z jbeich $
2
# $FreeBSD: head/devel/upp/Makefile 385394 2015-05-04 11:17:21Z jbeich $
3
3
4
PORTNAME=	upp
4
PORTNAME=	upp
5
PORTVERSION=	8227
5
PORTVERSION=	9251
6
CATEGORIES=	devel x11-toolkits
6
CATEGORIES=	devel x11-toolkits
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.1/
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.2/
8
DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
8
DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}
9
9
10
MAINTAINER=	m.sund@arcor.de
10
MAINTAINER=	m.sund@arcor.de
Lines 35-40 Link Here
35
		-I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/glib-2.0 \
35
		-I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/glib-2.0 \
36
		-I${LOCALBASE}/lib/glib-2.0/include -I/usr/include"
36
		-I${LOCALBASE}/lib/glib-2.0/include -I/usr/include"
37
37
38
MAKE_JOBS_UNSAFE=	yes
39
40
BROKEN_ia64=	Does not compile on ${ARCH}
41
BROKEN_powerpc=	Does not compile on ${ARCH}
42
BROKEN_sparc64=	Does not compile on ${ARCH}
43
38
PORTDATA=	bazaar examples reference tutorial uppsrc *.bm
44
PORTDATA=	bazaar examples reference tutorial uppsrc *.bm
39
45
40
DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \
46
DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \
Lines 43-48 Link Here
43
49
44
OPTIONS_DEFINE=	SDL OPENGL MYSQL PGSQL USEMALLOC
50
OPTIONS_DEFINE=	SDL OPENGL MYSQL PGSQL USEMALLOC
45
USEMALLOC_DESC=	Compile without U++ heap allocator
51
USEMALLOC_DESC=	Compile without U++ heap allocator
52
USEMALLOC_VARS=	MACRO_FLAGS+=-DflagUSEMALLOC
46
53
47
PLIST_FILES=	bin/theide
54
PLIST_FILES=	bin/theide
48
55
Lines 51-66 Link Here
51
MYSQL_USE=	mysql=yes
58
MYSQL_USE=	mysql=yes
52
PGSQL_USES=	pgsql
59
PGSQL_USES=	pgsql
53
60
54
.include <bsd.port.options.mk>
55
56
.if ${PORT_OPTIONS:MUSEMALLOC}
57
MACRO_FLAGS+=	-DflagUSEMALLOC
58
.endif
59
60
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
61
BROKEN=		Does not compile on ia64, powerpc, or sparc64
62
.endif
63
64
post-patch: .SILENT
61
post-patch: .SILENT
65
	${MV} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile
62
	${MV} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile
66
	${REINPLACE_CMD} -e '/^CXX =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \
63
	${REINPLACE_CMD} -e '/^CXX =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \
Lines 70-75 Link Here
70
67
71
post-build: .SILENT
68
post-build: .SILENT
72
	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
69
	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
70
	${ECHO_CMD} "COMMON_CPP_OPTIONS = \"-std=c++0x\";" >> ${WRKSRC}/GCC.bm
73
	${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC.bm
71
	${ECHO_CMD} "DEBUG_INFO = \"0\";" >> ${WRKSRC}/GCC.bm
74
	${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC.bm
72
	${ECHO_CMD} "DEBUG_BLITZ = \"1\";" >> ${WRKSRC}/GCC.bm
75
	${ECHO_CMD} "DEBUG_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
73
	${ECHO_CMD} "DEBUG_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
Lines 91-96 Link Here
91
	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
89
	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
92
		${SED} -i '' -e '/^BUILDER/s|GCC|CLANG| ; \
90
		${SED} -i '' -e '/^BUILDER/s|GCC|CLANG| ; \
93
		s| -fdata-sections|| ; s| -finline-limit=20||' CLANG.bm)
91
		s| -fdata-sections|| ; s| -finline-limit=20||' CLANG.bm)
92
	${ECHO_CMD} "COMMON_OPTIONS = \"-Wno-logical-op-parentheses\";" >> ${WRKSRC}/CLANG.bm
93
	${ECHO_CMD} "ALLOW_PRECOMPILED_HEADERS = \"0\";" >> ${WRKSRC}/CLANG.bm
94
94
95
do-install:
95
do-install:
96
	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
96
	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
(-)upp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (upp-x11-src-8227.tar.gz) = 0cbac66dd527d9b05fc279ffb8b53cab1cd67d275f173c95a59b904fd46bb338
1
SHA256 (upp-x11-src-9251.tar.gz) = f1012e15914a4a9d4c70c008b94b932db7dd39ff043bdf5c4584a45f7580ebd5
2
SIZE (upp-x11-src-8227.tar.gz) = 44496813
2
SIZE (upp-x11-src-9251.tar.gz) = 45014025
(-)upp/files/patch-bazaar_FreeType_FreeType.upp (-8 lines)
Lines 1-8 Link Here
1
--- bazaar/FreeType/FreeType.upp.orig	2015-03-02 00:01:02 UTC
2
+++ bazaar/FreeType/FreeType.upp
3
@@ -1,4 +1,4 @@
4
-options(GCC) "-include \"UppFreetype.h\"";
5
+options(CLANG | GCC) "-include \"UppFreetype.h\"";
6
 
7
 options(MSC) "-FI \"UppFreetype.h\"";
8
 
(-)upp/files/patch-bazaar_Media_Media.upp (-11 lines)
Lines 1-11 Link Here
1
--- bazaar/Media/Media.upp.orig	2015-03-02 00:01:01 UTC
2
+++ bazaar/Media/Media.upp
3
@@ -8,7 +8,7 @@ library(MSC) "avcodec.lib avformat.lib a
4
 
5
 library(GCC WIN32) "avcodec avformat avutil swscale avdevice avcore";
6
 
7
-library(GCC !WIN32) "avutil avcodec avformat avdevice swscale";
8
+library(POSIX) "avutil avcodec avformat avdevice swscale";
9
 
10
 link(MSC) /FORCE:MULTIPLE;
11
 
(-)upp/files/patch-bazaar_Tcc_Tcc.upp (-14 lines)
Lines 1-14 Link Here
1
--- bazaar/Tcc/Tcc.upp.orig	2015-03-02 00:01:02 UTC
2
+++ bazaar/Tcc/Tcc.upp
3
@@ -3,9 +3,9 @@ description "Tiny C Compiler wrapper\377
4
 uses
5
 	Core;
6
 
7
-uses(GCC) plugin/tcc;
8
+uses(CLANG | GCC) plugin/tcc;
9
 
10
-options(GCC) -DLIBTCC;
11
+options(POSIX) -DLIBTCC;
12
 
13
 options(WIN32) "-DTCC_TARGET_PE -DLIBTCC";
14
 
(-)upp/files/patch-uppsrc_Core_Defs.h (-11 lines)
Lines 1-11 Link Here
1
--- uppsrc/Core/Defs.h.orig	2015-01-26 21:00:02 UTC
2
+++ uppsrc/Core/Defs.h
3
@@ -337,7 +337,7 @@ inline bool IsInf(double d)        { ret
4
 inline bool IsNaN(double d)        { return _isnan(d); }
5
 inline bool IsInf(double d)        { return !_finite(d) && !_isnan(d); }
6
 #endif
7
-#elif __APPLE__ || __DragonFly__
8
+#elif __APPLE__ || __DragonFly__ || (PLATFORM_BSD && GCC_VERSION >= 40700)
9
 inline bool IsNaN(double d)        { return std::isnan(d); }
10
 inline bool IsInf(double d)        { return std::isinf(d); }
11
 #else
(-)upp/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp (-11 lines)
Lines 1-11 Link Here
1
--- uppsrc/PostgreSQL/PostgreSQL.upp.orig	2015-03-02 00:01:00 UTC
2
+++ uppsrc/PostgreSQL/PostgreSQL.upp
3
@@ -9,7 +9,7 @@ library(WIN32 !NOPOSTGRESQL MSC) libpq;
4
 
5
 library(WIN32 !NOPOSTGRESQL GCC) pq;
6
 
7
-library(LINUX !NOPOSTGRESQL) pq;
8
+library(POSIX !NOPOSTGRESQL) pq;
9
 
10
 file
11
 	PostgreSQL.h,
(-)upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp (-16 lines)
Lines 1-16 Link Here
1
--- uppsrc/ide/SrcUpdater/Install.cpp.orig	2012-08-31 12:10:00 UTC
2
+++ uppsrc/ide/SrcUpdater/Install.cpp
3
@@ -282,7 +282,12 @@ void InstallWizard::Perform(){
4
 			if(!CopyFolder(UpdaterCfg().localsrc,UpdaterCfg().globalsrc,&p)){
5
 				Exclamation(DeQtf("Failed to copy "+UpdaterCfg().globalsrc+" to "+UpdaterCfg().localsrc));
6
 			}
7
-			DeleteFile(AppendFileName(UpdaterCfg().localsrc,"GCC.bm"));
8
+			FindFile ff(AppendFileName(UpdaterCfg().globalsrc, "*.bm"));
9
+			while (ff) {
10
+				if (ff.IsFile())
11
+					FileDelete(AppendFileName(UpdaterCfg().localsrc, ff.GetName()));
12
+				ff.Next();
13
+			}
14
 			break;
15
 		}
16
 		case 1:{

Return to bug 204961