Index: head/devel/upp/files/patch-bazaar_Tcc_Tcc.upp =================================================================== --- head/devel/upp/files/patch-bazaar_Tcc_Tcc.upp (revision 404315) +++ head/devel/upp/files/patch-bazaar_Tcc_Tcc.upp (nonexistent) @@ -1,14 +0,0 @@ ---- bazaar/Tcc/Tcc.upp.orig 2015-03-02 00:01:02 UTC -+++ bazaar/Tcc/Tcc.upp -@@ -3,9 +3,9 @@ description "Tiny C Compiler wrapper\377 - uses - Core; - --uses(GCC) plugin/tcc; -+uses(CLANG | GCC) plugin/tcc; - --options(GCC) -DLIBTCC; -+options(POSIX) -DLIBTCC; - - options(WIN32) "-DTCC_TARGET_PE -DLIBTCC"; - Property changes on: head/devel/upp/files/patch-bazaar_Tcc_Tcc.upp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/upp/files/patch-bazaar_FreeType_FreeType.upp =================================================================== --- head/devel/upp/files/patch-bazaar_FreeType_FreeType.upp (revision 404315) +++ head/devel/upp/files/patch-bazaar_FreeType_FreeType.upp (nonexistent) @@ -1,8 +0,0 @@ ---- bazaar/FreeType/FreeType.upp.orig 2015-03-02 00:01:02 UTC -+++ bazaar/FreeType/FreeType.upp -@@ -1,4 +1,4 @@ --options(GCC) "-include \"UppFreetype.h\""; -+options(CLANG | GCC) "-include \"UppFreetype.h\""; - - options(MSC) "-FI \"UppFreetype.h\""; - Property changes on: head/devel/upp/files/patch-bazaar_FreeType_FreeType.upp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/upp/files/patch-bazaar_Media_Media.upp =================================================================== --- head/devel/upp/files/patch-bazaar_Media_Media.upp (revision 404315) +++ head/devel/upp/files/patch-bazaar_Media_Media.upp (nonexistent) @@ -1,11 +0,0 @@ ---- bazaar/Media/Media.upp.orig 2015-03-02 00:01:01 UTC -+++ bazaar/Media/Media.upp -@@ -8,7 +8,7 @@ library(MSC) "avcodec.lib avformat.lib a - - library(GCC WIN32) "avcodec avformat avutil swscale avdevice avcore"; - --library(GCC !WIN32) "avutil avcodec avformat avdevice swscale"; -+library(POSIX) "avutil avcodec avformat avdevice swscale"; - - link(MSC) /FORCE:MULTIPLE; - Property changes on: head/devel/upp/files/patch-bazaar_Media_Media.upp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/upp/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp =================================================================== --- head/devel/upp/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp (revision 404315) +++ head/devel/upp/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp (nonexistent) @@ -1,11 +0,0 @@ ---- uppsrc/PostgreSQL/PostgreSQL.upp.orig 2015-03-02 00:01:00 UTC -+++ uppsrc/PostgreSQL/PostgreSQL.upp -@@ -9,7 +9,7 @@ library(WIN32 !NOPOSTGRESQL MSC) libpq; - - library(WIN32 !NOPOSTGRESQL GCC) pq; - --library(LINUX !NOPOSTGRESQL) pq; -+library(POSIX !NOPOSTGRESQL) pq; - - file - PostgreSQL.h, Property changes on: head/devel/upp/files/patch-uppsrc_PostgreSQL_PostgreSQL.upp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp =================================================================== --- head/devel/upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp (revision 404315) +++ head/devel/upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp (nonexistent) @@ -1,16 +0,0 @@ ---- uppsrc/ide/SrcUpdater/Install.cpp.orig 2012-08-31 12:10:00 UTC -+++ uppsrc/ide/SrcUpdater/Install.cpp -@@ -282,7 +282,12 @@ void InstallWizard::Perform(){ - 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:{ Property changes on: head/devel/upp/files/patch-uppsrc_ide_SrcUpdater_Install.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/upp/files/patch-uppsrc_Core_Defs.h =================================================================== --- head/devel/upp/files/patch-uppsrc_Core_Defs.h (revision 404315) +++ head/devel/upp/files/patch-uppsrc_Core_Defs.h (nonexistent) @@ -1,11 +0,0 @@ ---- uppsrc/Core/Defs.h.orig 2015-01-26 21:00:02 UTC -+++ uppsrc/Core/Defs.h -@@ -337,7 +337,7 @@ inline bool IsInf(double d) { ret - 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 Property changes on: head/devel/upp/files/patch-uppsrc_Core_Defs.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/upp/Makefile =================================================================== --- head/devel/upp/Makefile (revision 404315) +++ head/devel/upp/Makefile (revision 404316) @@ -1,100 +1,100 @@ # Created by: Matthias Sund # $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@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}" \ LIBPATH="-L${LOCALBASE}/lib -L/usr/lib" \ CINC="-I. -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \ -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" +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" \ "${DATADIR}/uppsrc/ide/theide-48.png" "theide" \ "Development;IDE;GTK;" false OPTIONS_DEFINE= SDL OPENGL MYSQL PGSQL USEMALLOC USEMALLOC_DESC= Compile without U++ heap allocator +USEMALLOC_VARS= MACRO_FLAGS+=-DflagUSEMALLOC PLIST_FILES= bin/theide SDL_USE= sql OPENGL_USE= gl MYSQL_USE= mysql=yes PGSQL_USES= pgsql -.include - -.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' \ -e 's|-Linux-|-BSD-FreeBSD-|' \ -e 's|-ldl|-lXau -lXdmcp -lfreetype -lexpat -lxcb -lpng -lexecinfo|' \ ${BUILD_WRKSRC}/Makefile 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 ${ECHO_CMD} "DEBUG_OPTIONS = \"-O0\";" >> ${WRKSRC}/GCC.bm ${ECHO_CMD} "DEBUG_FLAGS = \"\";" >> ${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} "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) + ${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 (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA} -not ( -type d -empty )" \ ${STAGEDIR}${DATADIR}) .include Index: head/devel/upp/distinfo =================================================================== --- head/devel/upp/distinfo (revision 404315) +++ head/devel/upp/distinfo (revision 404316) @@ -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