View | Details | Raw Unified | Return to bug 198359 | Differences between
and this patch

Collapse All | Expand All

(-)upp/Makefile (-23 / +26 lines)
Lines 2-30 Link Here
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
70
# Allow to build with using modern GCC
71
	${REINPLACE_CMD} -e '/__APPLE__/s/$$/ || \(PLATFORM_BSD \&\& GCC_VERSION >= 40700\)/' \
72
		${BUILD_WRKSRC}/Core/Defs.h
72
73
73
post-build: .SILENT
74
post-build: .SILENT
74
	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
75
	${ECHO_CMD} "BUILDER = \"GCC\"" > ${WRKSRC}/GCC.bm
Lines 80-100 Link Here
80
	${ECHO_CMD} "DEBUG_LINK = \"\";" >> ${WRKSRC}/GCC.bm
81
	${ECHO_CMD} "DEBUG_LINK = \"\";" >> ${WRKSRC}/GCC.bm
81
	${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
82
	${ECHO_CMD} "RELEASE_BLITZ = \"0\";" >> ${WRKSRC}/GCC.bm
82
	${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
83
	${ECHO_CMD} "RELEASE_LINKMODE = \"1\";" >> ${WRKSRC}/GCC.bm
83
	${ECHO_CMD} "RELEASE_OPTIONS = \"-O2 -ffunction-sections\";" >> ${WRKSRC}/GCC.bm
84
	${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
85
	${ECHO_CMD} "RELEASE_SIZE_OPTIONS = \"-Os -finline-limit=20 -ffunction-sections -fdata-sections\";" >> ${WRKSRC}/GCC.bm
86
	${ECHO_CMD} "RELEASE_FLAGS = \"\";" >> ${WRKSRC}/GCC.bm
87
	${ECHO_CMD} "RELEASE_LINK = \"-Wl,--gc-sections\";" >> ${WRKSRC}/GCC.bm
85
	${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
88
	${ECHO_CMD} "DEBUGGER = \"gdb\";" >> ${WRKSRC}/GCC.bm
86
	${ECHO_CMD} "PATH = \"\";" >> ${WRKSRC}/GCC.bm
89
	${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
90
	${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
91
	${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
92
	${ECHO_CMD} "LINKMODE_LOCK = \"0\";" >> ${WRKSRC}/GCC.bm
93
# Also create CLANG build method, based on GCC with some changes
94
	(cd ${WRKSRC} && ${CP} GCC.bm CLANG.bm && \
95
		${SED} -i '' -e '/^BUILDER/s|GCC|CLANG| ; \
96
		s| -fdata-sections|| ; s| -finline-limit=20||' CLANG.bm)
94
97
95
do-install:
98
do-install:
96
	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
99
	${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin
97
	${MKDIR} ${STAGEDIR}${DATADIR}
100
	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA} -not ( -type d -empty )" \
98
	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}
101
		${STAGEDIR}${DATADIR})
99
102
100
.include <bsd.port.mk>
103
.include <bsd.port.mk>
(-)upp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
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
(-)upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp (+16 lines)
Line 0 Link Here
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-06 17:48:52.000000000 +0400
4
@@ -282,7 +282,11 @@
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().localsrc, "*.bm"));
10
+			while (ff) {
11
+				DeleteFile(AppendFileName(UpdaterCfg().localsrc, ff.GetName()));
12
+				ff.Next();
13
+			}
14
 			break;
15
 		}
16
 		case 1:{

Return to bug 198359