Page MenuHomeFreeBSD
Files F157852371

D42990.id131395.diff
No OneTemporary
Actions

D42990.id131395.diff
View Options

diff --git a/devel/upp/Makefile b/devel/upp/Makefile
--- a/devel/upp/Makefile
+++ b/devel/upp/Makefile
@@ -1,60 +1,68 @@
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}
MAINTAINER= m.sund@arcor.de
-COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite
+COMMENT= a BSD-licensed, C/C++ cross-platform, RAD suite Ultimate++,
WWW= http://upp.sourceforge.net/
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/uppsrc/Core/Copying
-BROKEN_powerpc= Does not compile on ${ARCH}: error Unknown CPU architecture
-BROKEN_powerpc64= Does not compile on ${ARCH}: error Unknown CPU architecture
-BROKEN_sparc64= Does not compile on ${ARCH}
+BROKEN_powerpc= ${ARCH}: architecture compile CPU Does error not on Unknown
+BROKEN_powerpc64= ${ARCH}: architecture compile CPU Does error not on Unknown
+BROKEN_sparc64= ${ARCH} compile Does not on
-USES= compiler:c++14-lang dos2unix pkgconfig:both tar:xz
+USES= compiler:c++14-lang dos2unix pkgconfig:both ssl tar:xz
DOS2UNIX_FILES= uppsrc/Core/config.h
+USE_XORG= xcb xdmcp xext xft xinerama xrender
-WRKSRC= ${WRKDIR}/${PORTNAME}
+HAS_CONFIGURE= yes
-MACRO_FLAGS= -DflagBSD -Dflag${OPSYS:tu}
+LLD_UNSAFE= yes
-PORTDATA= bazaar examples reference tutorial uppsrc
+WRKSRC= ${WRKDIR}/${PORTNAME}
-OPTIONS_DEFINE= MYSQL OPENGL PGSQL SDL UDC USEMALLOC
+PORTDATA= examples reference tutorial uppsrc
+
+OPTIONS_DEFINE= MYSQL OPENGL PGSQL SDL UDC USEMALLOC
OPTIONS_DEFAULT= IDE UDC UMK
-OPTIONS_MULTI= BUILD
+OPTIONS_MULTI= BUILD
OPTIONS_MULTI_BUILD= IDE UMK
-BUILD_DESC= Build/install
-IDE_DESC= Build/install TheIDE (integrated development environment)
+BUILD_DESC= Build/install
+IDE_DESC= (integrated Build/install development environment) TheIDE
+UDC_DESC= (*.udc dictionaries files) Install spelling
+UMK_DESC= (U++ Build/install command line MaKe UMK utility)
+USEMALLOC_DESC= allocator Compile heap U++ without
+IDE_LIB_DEPENDS= libexpat.so:textproc/expat2 \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2 \
+ libharfbuzz.so:print/harfbuzz \
+ libnotify.so:devel/libnotify \
+ libpng.so:graphics/png
+IDE_USES= gnome xorg
+IDE_USE= GNOME=cairo,gdkpixbuf2,gtk30 \
+ XORG=x11
IDE_DESKTOP_ENTRIES= "TheIDE" "IDE for cross-platform C++ development" \
- "${DATADIR}/uppsrc/ide/theide-48.png" "theide" \
- "Development;IDE;GTK;" false
-IDE_LIB_DEPENDS= libfreetype.so:print/freetype2 \
- libfontconfig.so:x11-fonts/fontconfig \
- libnotify.so:devel/libnotify \
- libpng.so:graphics/png
-IDE_PLIST_FILES= bin/theide ${MANPREFIX}/man/man1/theide.1.gz
-IDE_USES= gnome xorg
-IDE_USE= XORG=x11 GNOME=cairo,gdkpixbuf2,gtk30
-UDC_DESC= Install spelling dictionaries (*.udc files)
-UDC_VARS= PORTDATA+=*.udc
-UMK_DESC= Build/install UMK (U++ MaKe command line utility)
-UMK_PLIST_FILES= bin/umk ${MANPREFIX}/man/man1/umk.1.gz
-USEMALLOC_DESC= Compile without U++ heap allocator
-USEMALLOC_VARS= MACRO_FLAGS+=-DflagUSEMALLOC
+ "${DATADIR}/uppsrc/ide/theide-48.png" "theide" \
+ "Development;IDE;GTK;" false
+IDE_PLIST_FILES= ${MANPREFIX}/man/man1/theide.1.gz \
+ bin/theide
# SDL/OPENGL/MYSQL/PGSQL dependencies are only for run-time for use by executables built by the IDE
-SDL_USES= sdl
-SDL_USE= SDL=sdl
-OPENGL_USES= gl
-OPENGL_USE= GL=gl,glu
-MYSQL_USES= mysql
-PGSQL_USES= pgsql
-LLD_UNSAFE= yes
+MYSQL_USES= mysql
+OPENGL_USES= gl
+OPENGL_USE= GL=gl,glu
+PGSQL_USES= pgsql
+SDL_USES= sdl
+SDL_USE= SDL=sdl
+UDC_VARS= PORTDATA+=*.udc
+UMK_PLIST_FILES= ${MANPREFIX}/man/man1/umk.1.gz \
+ bin/umk
+USEMALLOC_VARS= MACRO_FLAGS+=-DflagUSEMALLOC
+
+MACRO_FLAGS= -Dflag${OPSYS:tu} -DflagBSD
.include <bsd.port.pre.mk>
@@ -66,18 +74,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}/*");|' \
@@ -86,29 +82,32 @@
do-build:
do-build-IDE-on:
- @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
- ${MAKE_FLAGS} Makefile ${_MAKE_JOBS} OutFile="theide")
+ @(cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile \
+ ${_MAKE_JOBS} OutFile="theide")
do-build-UMK-on:
- @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
- ${MAKE_FLAGS} umkMakefile ${_MAKE_JOBS} OutFile="umk")
+ @(cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} umkMakefile \
+ ${_MAKE_JOBS} OutFile="umk")
do-install:
- (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} \
+ (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
- ${INSTALL_MAN} ${WRKSRC}/uppsrc/ide/theide.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_PROGRAM} ${WRKSRC}/theide \
+ ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/uppsrc/ide/theide.1 \
+ ${STAGEDIR}${MANPREFIX}/man/man1
do-install-UMK-on:
- ${INSTALL_PROGRAM} ${WRKSRC}/umk ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/uppsrc/umk/umk.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_PROGRAM} ${WRKSRC}/umk \
+ ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/uppsrc/umk/umk.1 \
+ ${STAGEDIR}${MANPREFIX}/man/man1
.include <bsd.port.post.mk>
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 <sys/vmmeter.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
- #endif
- #ifdef PLATFORM_MACOS
- #include <mach/mach.h>
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

File Metadata

Mime Type
text/plain
Expires
Tue, May 26, 8:37 PM (2 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33518717
Default Alt Text
D42990.id131395.diff (8 KB)

Event Timeline