diff --git a/devel/upp/Makefile b/devel/upp/Makefile --- a/devel/upp/Makefile +++ b/devel/upp/Makefile @@ -1,9 +1,9 @@ PORTNAME= upp -DISTVERSION= 15260 -PORTREVISION= 1 +DISTVERSION= 17045 CATEGORIES= devel x11-toolkits -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2020.2/ -DISTNAME= ${PORTNAME}-posix-${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2023.2/ +DISTNAME= ${PORTNAME}-posix-${DISTVERSION} +HAS_CONFIGURE= yes MAINTAINER= m.sund@arcor.de COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite @@ -16,14 +16,15 @@ BROKEN_powerpc64= Does not compile on ${ARCH}: error Unknown CPU architecture BROKEN_sparc64= Does not compile on ${ARCH} -USES= compiler:c++14-lang dos2unix pkgconfig:both tar:xz +USES= compiler:c++14-lang dos2unix pkgconfig:both tar:xz ssl DOS2UNIX_FILES= uppsrc/Core/config.h +USE_XORG+= xcb xinerama xrender xft xdmcp xext WRKSRC= ${WRKDIR}/${PORTNAME} MACRO_FLAGS= -DflagBSD -Dflag${OPSYS:tu} -PORTDATA= bazaar examples reference tutorial uppsrc +PORTDATA= examples reference tutorial uppsrc OPTIONS_DEFINE= MYSQL OPENGL PGSQL SDL UDC USEMALLOC OPTIONS_DEFAULT= IDE UDC UMK @@ -37,7 +38,9 @@ IDE_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libnotify.so:devel/libnotify \ - libpng.so:graphics/png + libpng.so:graphics/png \ + libharfbuzz.so:print/harfbuzz \ + libexpat.so:textproc/expat2 IDE_PLIST_FILES= bin/theide ${MANPREFIX}/man/man1/theide.1.gz IDE_USES= gnome xorg IDE_USE= XORG=x11 GNOME=cairo,gdkpixbuf2,gtk30 @@ -66,18 +69,6 @@ CXXFLAGS_i386+= -msse2 post-patch: .SILENT - ${REINPLACE_CMD} -e '/^CXX[[:blank:]]*=/d ; \ - /^LDFLAGS[[:blank:]]*=/d ; /^LIBPATH[[:blank:]]*=/d ; \ - /^Macro[[:blank:]]*=/s|-DflagLINUX|${MACRO_FLAGS}| ; \ - /^CFLAGS[[:blank:]]*=/s|= -O3|+=| ; \ - /^CXXFLAGS[[:blank:]]*=/s|= -O3|+=| ; \ - /^OutDir_/s|-Linux|| ; \ - s|-ldl|-lexecinfo|' \ - ${WRKSRC}/Makefile \ - ${WRKSRC}/umkMakefile - ${REINPLACE_CMD} -i '' -E '/^OutDir_/s|-Gui|| ; \ - s/[[:blank:]]?`pkg-config --(cflags|libs) (freetype2|xcb|expat|xinerama|xrender|xft|xdmcp|xext)`//g' \ - ${WRKSRC}/Makefile # Add ${DATADIR} as an additional path to search for *.upp files # on first TheIDE launch before automatic configuration of assemblies ${REINPLACE_CMD} -e '/Scan(GetHomeDirFile("\*"/s|$$|\${.newline} Scan("${DATADIR}/uppsrc");\${.newline} Scan("${DATADIR}/*");|' \ @@ -96,12 +87,7 @@ do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} \ "-not ( -type d -empty ) -o -name '*.orig'") - (cd ${STAGEDIR}${DATADIR} && ${RMDIR} uppsrc/ide/SrcUpdater uppsrc/Web \ - bazaar/plugin/sundials/src/nvector/mpiplusx \ - bazaar/plugin/sundials/src/nvector/openmp \ - bazaar/plugin/sundials/src/nvector/parallel \ - bazaar/plugin/sundials/src/nvector/pthreads \ - bazaar/plugin/sundials/src/sunlinsol/klu) + (cd ${STAGEDIR}${DATADIR} && ${RMDIR} uppsrc/Web) do-install-IDE-on: ${INSTALL_PROGRAM} ${WRKSRC}/theide ${STAGEDIR}${PREFIX}/bin diff --git a/devel/upp/distinfo b/devel/upp/distinfo --- a/devel/upp/distinfo +++ b/devel/upp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602841898 -SHA256 (upp-posix-15260.tar.xz) = 3d5c4db9b6f06c7eba738baad1bd2bf516c5e08791bd49e48c5c05e052aa95bb -SIZE (upp-posix-15260.tar.xz) = 81138948 +TIMESTAMP = 1701385220 +SHA256 (upp-posix-17045.tar.xz) = 6fb91d6714d7159463778ef9437f14f0a580c420f5556772e4e16aea33e51d17 +SIZE (upp-posix-17045.tar.xz) = 36865316 diff --git a/devel/upp/files/patch-uppsrc_Core_Cpu.cpp b/devel/upp/files/patch-uppsrc_Core_Cpu.cpp deleted file mode 100644 --- a/devel/upp/files/patch-uppsrc_Core_Cpu.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- uppsrc/Core/Cpu.cpp.orig 2021-09-25 19:55:51 UTC -+++ uppsrc/Core/Cpu.cpp -@@ -10,6 +10,8 @@ - - #ifdef PLATFORM_FREEBSD - #include -+#include -+#include - #endif - #ifdef PLATFORM_MACOS - #include diff --git a/devel/upp/files/patch-uppsrc_Core_config.h b/devel/upp/files/patch-uppsrc_Core_config.h deleted file mode 100644 --- a/devel/upp/files/patch-uppsrc_Core_config.h +++ /dev/null @@ -1,19 +0,0 @@ ---- uppsrc/Core/config.h.orig 2023-08-19 14:40:16 UTC -+++ uppsrc/Core/config.h -@@ -139,6 +139,16 @@ - #define _HAVE_NO_STDWSTRING 1 - //BF toolchain has no support for __thread (TLS), so U++ Heap not possible - #define flagUSEMALLOC -+ #elif __powerpc64__ -+ #define CPU_64 1 -+ #define CPU_UNALIGNED 1 -+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -+ #define CPU_LE 1 -+ #define CPU_LITTLE_ENDIAN 1 -+ #else -+ #define CPU_BE 1 -+ #define CPU_BIG_ENDIAN 1 -+ #endif - #else - #error Unknown CPU architecture - #endif