Attachment #154119 for bug #198359




# $FreeBSD: head/devel/upp/Makefile 373227 2014-11-24 17:41:10Z mat $

PORTNAME=	upp
PORTVERSION=	8227
PORTREVISION=	2
CATEGORIES=	devel x11-toolkits
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/2015.1/
DISTNAME=	${PORTNAME}-x11-src-${PORTVERSION}

MAINTAINER=	m.sund@arcor.de
COMMENT=	Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${BUILD_WRKSRC}/Core/Copying

LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
		libexpat.so:${PORTSDIR}/textproc/expat2 \
		libnotify.so:${PORTSDIR}/devel/libnotify

USES=		execinfo gmake
USE_XORG=	xft
USE_GNOME=	gtk20

WRKSRC=		${WRKDIR}/${DISTNAME}
BUILD_WRKSRC=	${WRKSRC}/uppsrc

MACRO_FLAGS=	-DflagGUI -DflagMT -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD

MAKE_ARGS=	UPPOUT="../_out/" OutFile="../theide" \
		Macro="${MACRO_FLAGS}" \

		-I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/include/atk-1.0 \
		-I${LOCALBASE}/include/cairo -I${LOCALBASE}/include/gdk-pixbuf-2.0 \
		-I${LOCALBASE}/include/pango-1.0 -I${LOCALBASE}/include/glib-2.0 \
		-I${LOCALBASE}/lib/glib-2.0/include -I/usr/include"
		-I${LOCALBASE}/include/libpng -I/usr/include"

PORTDATA=	bazaar examples reference tutorial uppsrc *.bm

DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \
		"${DATADIR}/uppsrc/ide/theide-48.png" "theide" \

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' \
		-e 's|-Linux-|-BSD-FreeBSD-|' \
		-e 's|-ldl|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng -lexecinfo|' \
		${BUILD_WRKSRC}/Makefile
	${BUILD_WRKSRC}/Makefile

post-build: .SILENT
	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm

	${ECHO_CMD} "DEBUG_LINK = \"\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "RELEASE_OPTIONS = \"-O2 -ffunction-sections -fdata-sections\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-Os -finline-limit=20 -ffunction-sections -fdata-sections\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "RELEASE_FLAGS = \"\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "RELEASE_LINK = \"-Wl,--gc-sections\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "INCLUDE = \"${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/atk-1.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/gdk-pixbuf-2.0;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/lib/glib-2.0/include;/usr/include\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "LIB = \"${LOCALBASE}/lib;/usr/lib\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "REMOTE_OS = \"\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC.bm
	${ECHO_CMD} "LINKMODE_LOCK = \"0\";" >> ${WRKSRC}/GCC.bm
# Also create CLANG build method, based on GCC with some changes
	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
		${SED} -i '' -e '/^BUILDER/s|GCC|CLANG| ; \
		s| -fdata-sections|| ; s| -finline-limit=20||' CLANG.bm)

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA} -not ( -type d -empty )" \
		${STAGEDIR}${DATADIR})

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)upp/distinfo (-2 / +2 lines)
1	SHA256 (upp-x11-src-5485.tar.gz) = d6f9c5991c7aceb9df71d5723fd3b591c3201c05b05795eb063bc634dc5a0bb1	1	SHA256 (upp-x11-src-8227.tar.gz) = 0cbac66dd527d9b05fc279ffb8b53cab1cd67d275f173c95a59b904fd46bb338
2	SIZE (upp-x11-src-5485.tar.gz) = 36693193	2	SIZE (upp-x11-src-8227.tar.gz) = 44496813




# Allow to build with using modern GCC
--- uppsrc/Core/Defs.h.orig	2015-01-27 01:00:02.000000000 +0400
+++ uppsrc/Core/Defs.h	2015-03-06 21:55:01.000000000 +0400
@@ -337,7 +337,7 @@
 inline bool IsNaN(double d)        { return _isnan(d); }
 inline bool IsInf(double d)        { return !_finite(d) && !_isnan(d); }
 #endif
-#elif __APPLE__ || __DragonFly__
+#elif __APPLE__ || __DragonFly__ || (PLATFORM_BSD && GCC_VERSION >= 40700)
 inline bool IsNaN(double d)        { return std::isnan(d); }
 inline bool IsInf(double d)        { return std::isinf(d); }
 #else




# Delete *.bm files for local install, not just GCC.bm
--- uppsrc/ide/SrcUpdater/Install.cpp.orig	2012-08-31 16:10:00.000000000 +0400
+++ uppsrc/ide/SrcUpdater/Install.cpp	2015-03-10 01:05:26.000000000 +0400
@@ -282,7 +282,12 @@
 			if(!CopyFolder(UpdaterCfg().localsrc,UpdaterCfg().globalsrc,&p)){
 				Exclamation(DeQtf("Failed to copy "+UpdaterCfg().globalsrc+" to "+UpdaterCfg().localsrc));
 			}
-			DeleteFile(AppendFileName(UpdaterCfg().localsrc,"GCC.bm"));
+			FindFile ff(AppendFileName(UpdaterCfg().globalsrc, "*.bm"));
+			while (ff) {
+				if (ff.IsFile())
+					FileDelete(AppendFileName(UpdaterCfg().localsrc, ff.GetName()));
+				ff.Next();
+			}
 			break;
 		}
 		case 1:{

Return to bug 198359

Lines 2-30 Link Here

(-)upp/Makefile (-23 / +23 lines)
2	# $FreeBSD: head/devel/upp/Makefile 373227 2014-11-24 17:41:10Z mat $	2	# $FreeBSD: head/devel/upp/Makefile 373227 2014-11-24 17:41:10Z mat $
3		3
4	PORTNAME= upp	4	PORTNAME= upp
5	PORTVERSION= 5485	5	PORTVERSION= 8227
6	PORTREVISION= 2
7	CATEGORIES= devel x11-toolkits	6	CATEGORIES= devel x11-toolkits
8	MASTER_SITES= SF	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2015.1/
9	DISTNAME= ${PORTNAME}-x11-src-${PORTVERSION}	8	DISTNAME= ${PORTNAME}-x11-src-${PORTVERSION}
10		9
11	MAINTAINER= m.sund@arcor.de	10	MAINTAINER= m.sund@arcor.de
12	COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite	11	COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
13		12
14	LICENSE= BSD2CLAUSE	13	LICENSE= BSD2CLAUSE
		14	LICENSE_FILE= ${BUILD_WRKSRC}/Core/Copying
15		15
16	LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \	16	LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
17	libexpat.so:${PORTSDIR}/textproc/expat2 \	17	libexpat.so:${PORTSDIR}/textproc/expat2 \
18	libnotify.so:${PORTSDIR}/devel/libnotify	18	libnotify.so:${PORTSDIR}/devel/libnotify
19		19
20	USES= gmake	20	USES= execinfo gmake
21	USE_XORG= xft	21	USE_XORG= xft
22	USE_GNOME= gtk20	22	USE_GNOME= gtk20
23		23
24	WRKSRC= ${WRKDIR}/${DISTNAME}	24	WRKSRC= ${WRKDIR}/${DISTNAME}
25	BUILD_WRKSRC= ${WRKSRC}/uppsrc	25	BUILD_WRKSRC= ${WRKSRC}/uppsrc
26		26
27	MACRO_FLAGS= -DflagGUI -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD	27	MACRO_FLAGS= -DflagGUI -DflagMT -DflagGCC -DflagSHARED -DflagPOSIX -DflagBSD -DflagFREEBSD
28		28
29	MAKE_ARGS= UPPOUT="../_out/" OutFile="../theide" \	29	MAKE_ARGS= UPPOUT="../_out/" OutFile="../theide" \
30	Macro="${MACRO_FLAGS}" \	30	Macro="${MACRO_FLAGS}" \
Lines 33-42 Link Here
33	-I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/include/atk-1.0 \	33	-I${LOCALBASE}/include/gtk-2.0 -I${LOCALBASE}/include/atk-1.0 \
34	-I${LOCALBASE}/include/cairo -I${LOCALBASE}/include/gdk-pixbuf-2.0 \	34	-I${LOCALBASE}/include/cairo -I${LOCALBASE}/include/gdk-pixbuf-2.0 \
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 \	36	-I${LOCALBASE}/lib/glib-2.0/include -I/usr/include"
37	-I${LOCALBASE}/include/libpng -I/usr/include"
38		37
39	PORTDATA= bazaar examples reference tutorial uppsrc GCC.bm	38	PORTDATA= bazaar examples reference tutorial uppsrc *.bm
40		39
41	DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \	40	DESKTOP_ENTRIES="TheIDE" "IDE for cross-platform C++ development" \
42	"${DATADIR}/uppsrc/ide/theide-48.png" "theide" \	41	"${DATADIR}/uppsrc/ide/theide-48.png" "theide" \
Lines 62-74 Link Here
62	BROKEN= Does not compile on ia64, powerpc, or sparc64	61	BROKEN= Does not compile on ia64, powerpc, or sparc64
63	.endif	62	.endif
64		63
65	pre-build: .SILENT	64	post-patch: .SILENT
66	${MV} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile	65	${MV} ${BUILD_WRKSRC}/Makefile.in ${BUILD_WRKSRC}/Makefile
67	${REINPLACE_CMD} -e '/^CC =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \	66	${REINPLACE_CMD} -e '/^CXX =/d;/^CFLAGS =/d;/^CXXFLAGS =/d;/^LDFLAGS =/d' \
68	-e 's\|$$(CC)\|$$(CXX)\|' \	67	-e 's\|-Linux-\|-BSD-FreeBSD-\|' \
69	-e 's\|-Linux-\|-BSD-FreeBSD-\|' \	68	-e 's\|-ldl\|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng -lexecinfo\|' \
70	-e 's\|-ldl\|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng\|' \	69	${BUILD_WRKSRC}/Makefile
71	${BUILD_WRKSRC}/Makefile
72		70
73	post-build: .SILENT	71	post-build: .SILENT
74	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm	72	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
Lines 80-100 Link Here
80	${ECHO_CMD} "DEBUG_LINK = \"\";" >> ${WRKSRC}/GCC.bm	78	${ECHO_CMD} "DEBUG_LINK = \"\";" >> ${WRKSRC}/GCC.bm
81	${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm	79	${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
82	${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm	80	${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
83	${ECHO_CMD} "RELEASE_OPTIONS = \"-O2 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm	81	${ECHO_CMD} "RELEASE_OPTIONS = \"-O2 -ffunction-sections -fdata-sections\";" >> ${WRKSRC}/GCC.bm
84	${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-Os -finline-limit=20 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm	82	${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-Os -finline-limit=20 -ffunction-sections -fdata-sections\";" >> ${WRKSRC}/GCC.bm
		83	${ECHO_CMD} "RELEASE_FLAGS = \"\";" >> ${WRKSRC}/GCC.bm
		84	${ECHO_CMD} "RELEASE_LINK = \"-Wl,--gc-sections\";" >> ${WRKSRC}/GCC.bm
85	${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm	85	${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
86	${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm	86	${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
87	${ECHO_CMD} "INCLUDE = \"${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/atk-1.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/gdk-pixbuf-2.0;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/include/libpng;/usr/include\";" >> ${WRKSRC}/GCC.bm	87	${ECHO_CMD} "INCLUDE = \"${LOCALBASE}/include;${LOCALBASE}/include/freetype2;${LOCALBASE}/include/gtk-2.0;${LOCALBASE}/include/atk-1.0;${LOCALBASE}/include/cairo;${LOCALBASE}/include/gdk-pixbuf-2.0;${LOCALBASE}/include/pango-1.0;${LOCALBASE}/include/glib-2.0;${LOCALBASE}/lib/glib-2.0/include;/usr/include\";" >> ${WRKSRC}/GCC.bm
88	${ECHO_CMD} "LIB = \"${LOCALBASE}/lib;/usr/lib\";" >> ${WRKSRC}/GCC.bm	88	${ECHO_CMD} "LIB = \"${LOCALBASE}/lib;/usr/lib\";" >> ${WRKSRC}/GCC.bm
89	${ECHO_CMD} "REMOTE_HOST = \"\";" >> ${WRKSRC}/GCC.bm
90	${ECHO_CMD} "REMOTE_OS = \"\";" >> ${WRKSRC}/GCC.bm
91	${ECHO_CMD} "REMOTE_TRANSFER = \"\";" >> ${WRKSRC}/GCC.bm
92	${ECHO_CMD} "REMOTE_MAP = \"\";" >> ${WRKSRC}/GCC.bm
93	${ECHO_CMD} "LINKMODE_LOCK = \"0\";" >> ${WRKSRC}/GCC.bm	89	${ECHO_CMD} "LINKMODE_LOCK = \"0\";" >> ${WRKSRC}/GCC.bm
		90	# Also create CLANG build method, based on GCC with some changes
		91	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
		92	${SED} -i '' -e '/^BUILDER/s\|GCC\|CLANG\| ; \
		93	s\| -fdata-sections\|\| ; s\| -finline-limit=20\|\|' 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
97	${MKDIR} ${STAGEDIR}${DATADIR}	97	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA} -not ( -type d -empty )" \
98	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}	98	${STAGEDIR}${DATADIR})
99		99
100	.include <bsd.port.mk>	100	.include <bsd.port.mk>

Line 0 Link Here

(-)upp/files/patch-uppsrc_Core_Defs.h (+12 lines)
	1	# Allow to build with using modern GCC
	2	--- uppsrc/Core/Defs.h.orig 2015-01-27 01:00:02.000000000 +0400
	3	+++ uppsrc/Core/Defs.h 2015-03-06 21:55:01.000000000 +0400
	4	@@ -337,7 +337,7 @@
	5	inline bool IsNaN(double d) { return _isnan(d); }
	6	inline bool IsInf(double d) { return !_finite(d) && !_isnan(d); }
	7	#endif
	8	-#elif __APPLE__ \|\| __DragonFly__
	9	+#elif __APPLE__ \|\| __DragonFly__ \|\| (PLATFORM_BSD && GCC_VERSION >= 40700)
	10	inline bool IsNaN(double d) { return std::isnan(d); }
	11	inline bool IsInf(double d) { return std::isinf(d); }
	12	#else

Line 0 Link Here

(-)upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp.diff (+17 lines)
	1	# Delete *.bm files for local install, not just GCC.bm
	2	--- uppsrc/ide/SrcUpdater/Install.cpp.orig 2012-08-31 16:10:00.000000000 +0400
	3	+++ uppsrc/ide/SrcUpdater/Install.cpp 2015-03-10 01:05:26.000000000 +0400
	4	@@ -282,7 +282,12 @@
	5	if(!CopyFolder(UpdaterCfg().localsrc,UpdaterCfg().globalsrc,&p)){
	6	Exclamation(DeQtf("Failed to copy "+UpdaterCfg().globalsrc+" to "+UpdaterCfg().localsrc));
	7	}
	8	- DeleteFile(AppendFileName(UpdaterCfg().localsrc,"GCC.bm"));
	9	+ FindFile ff(AppendFileName(UpdaterCfg().globalsrc, "*.bm"));
	10	+ while (ff) {
	11	+ if (ff.IsFile())
	12	+ FileDelete(AppendFileName(UpdaterCfg().localsrc, ff.GetName()));
	13	+ ff.Next();
	14	+ }
	15	break;
	16	}
	17	case 1:{