Date: Tue, 31 Dec 2024 08:40:43 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c92fdda19eaa - main - devel/gwehywfar*: Update to 5.12.0 Message-ID: <202412310840.4BV8eh5m056162@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=c92fdda19eaafcb4f7089b9eb9673b4009ea7ee8 commit c92fdda19eaafcb4f7089b9eb9673b4009ea7ee8 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2024-12-31 07:57:58 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2024-12-31 08:40:36 +0000 devel/gwehywfar*: Update to 5.12.0 Remove unused dependencies from child ports. Fix linking in devel/gwenhywfar-qt5. --- devel/gwenhywfar-fox16/Makefile | 7 +-- devel/gwenhywfar-gtk2/Makefile | 7 +-- devel/gwenhywfar-gtk3/Makefile | 7 +-- devel/gwenhywfar-qt5/Makefile | 7 +-- devel/gwenhywfar/Makefile | 62 +++++++++++----------- devel/gwenhywfar/distinfo | 6 +-- devel/gwenhywfar/files/patch-configure | 43 +++++++-------- .../files/patch-src_os_portable__endian.h | 45 ++++++++++++++++ devel/gwenhywfar/pkg-plist | 18 +++++++ 9 files changed, 133 insertions(+), 69 deletions(-) diff --git a/devel/gwenhywfar-fox16/Makefile b/devel/gwenhywfar-fox16/Makefile index 9863fec2fb97..e0d46c995adb 100644 --- a/devel/gwenhywfar-fox16/Makefile +++ b/devel/gwenhywfar-fox16/Makefile @@ -1,11 +1,12 @@ PORTREVISION= 0 -PKGNAMESUFFIX= -${SLAVEPORT} +PKGNAMESUFFIX= -${_GWEN_GUI} MAINTAINER= jhale@FreeBSD.org COMMENT= Gwenhywfar FOX-1.6 support library -MASTERDIR= ${.CURDIR}/../../devel/gwenhywfar -SLAVEPORT= fox16 +MASTERDIR= ${.CURDIR:H:H}/devel/gwenhywfar PLIST= ${.CURDIR}/pkg-plist +_GWEN_GUI= fox16 + .include "${MASTERDIR}/Makefile" diff --git a/devel/gwenhywfar-gtk2/Makefile b/devel/gwenhywfar-gtk2/Makefile index ccdb987e8348..eb4188253066 100644 --- a/devel/gwenhywfar-gtk2/Makefile +++ b/devel/gwenhywfar-gtk2/Makefile @@ -1,11 +1,12 @@ PORTREVISION= 0 -PKGNAMESUFFIX= -${SLAVEPORT} +PKGNAMESUFFIX= -${_GWEN_GUI} MAINTAINER= jhale@FreeBSD.org COMMENT= Gwenhywfar GTK2+ support library -MASTERDIR= ${.CURDIR}/../../devel/gwenhywfar -SLAVEPORT= gtk2 +MASTERDIR= ${.CURDIR:H:H}/devel/gwenhywfar PLIST= ${.CURDIR}/pkg-plist +_GWEN_GUI= gtk2 + .include "${MASTERDIR}/Makefile" diff --git a/devel/gwenhywfar-gtk3/Makefile b/devel/gwenhywfar-gtk3/Makefile index ec3473ee31fb..fb109c9cea32 100644 --- a/devel/gwenhywfar-gtk3/Makefile +++ b/devel/gwenhywfar-gtk3/Makefile @@ -1,11 +1,12 @@ PORTREVISION= 0 -PKGNAMESUFFIX= -${SLAVEPORT} +PKGNAMESUFFIX= -${_GWEN_GUI} MAINTAINER= jhale@FreeBSD.org COMMENT= Gwenhywfar GTK3+ support library -MASTERDIR= ${.CURDIR}/../../devel/gwenhywfar -SLAVEPORT= gtk3 +MASTERDIR= ${.CURDIR:H:H}/devel/gwenhywfar PLIST= ${.CURDIR}/pkg-plist +_GWEN_GUI= gtk3 + .include "${MASTERDIR}/Makefile" diff --git a/devel/gwenhywfar-qt5/Makefile b/devel/gwenhywfar-qt5/Makefile index 8749c55aa729..0714190cb149 100644 --- a/devel/gwenhywfar-qt5/Makefile +++ b/devel/gwenhywfar-qt5/Makefile @@ -1,11 +1,12 @@ PORTREVISION= 0 -PKGNAMESUFFIX= -${SLAVEPORT} +PKGNAMESUFFIX= -${_GWEN_GUI} MAINTAINER= jhale@FreeBSD.org COMMENT= Gwenhywfar Qt5 support library -MASTERDIR= ${.CURDIR}/../../devel/gwenhywfar -SLAVEPORT= qt5 +MASTERDIR= ${.CURDIR:H:H}/devel/gwenhywfar PLIST= ${.CURDIR}/pkg-plist +_GWEN_GUI= qt5 + .include "${MASTERDIR}/Makefile" diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile index 34862b3c4830..c2b21e65be42 100644 --- a/devel/gwenhywfar/Makefile +++ b/devel/gwenhywfar/Makefile @@ -1,8 +1,8 @@ PORTNAME= gwenhywfar -PORTVERSION= 5.10.2 -PORTREVISION?= 1 +PORTVERSION= 5.12.0 +PORTREVISION?= 0 CATEGORIES= devel net security -MASTER_SITES= https://www.aquamaniac.de/rdm/attachments/download/501/ +MASTER_SITES= https://www.aquamaniac.de/rdm/attachments/download/529/ MAINTAINER?= jhale@FreeBSD.org COMMENT?= Multi-platform helper library for networking and security applications @@ -11,29 +11,32 @@ WWW= https://www.aquamaniac.de/rdm/projects/gwenhywfar LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libgnutls.so:security/gnutls \ - libgpg-error.so:security/libgpg-error - -USES= cpe gettext gmake iconv:translit libtool localbase:ldflags \ - pathfix pkgconfig +USES= cpe gmake libtool localbase:ldflags pathfix pkgconfig CPE_VENDOR= aquamaniac +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-release="yes" \ - --with-guis="${SLAVEPORT}" + --with-guis="${_GWEN_GUI}" INSTALL_TARGET= install-strip -USE_LDCONFIG= yes -GWEN_SHLIB_VER= 79 -PLIST_SUB= GWEN_SHLIB_VER="${GWEN_SHLIB_VER}" \ +BINARY_ALIAS= make=${GMAKE} + +_GWEN_SHLIB_VER=79 +PLIST_SUB= GWEN_SHLIB_VER="${_GWEN_SHLIB_VER}" \ GWEN_MAJ_MIN_VER="${PORTVERSION:R}" \ GWEN_MIN_PATCH_VER="${PORTVERSION:R:E}.${PORTVERSION:E}" -.if !defined(SLAVEPORT) -OPTIONS_DEFINE= DOXYGEN LIBXML2 MEMDEBUG OPENSSL -OPTIONS_DEFAULT= OPENSSL -OPTIONS_SUB= yes +.if !defined(_GWEN_GUI) +LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgnutls.so:security/gnutls \ + libgpg-error.so:security/libgpg-error + +USES+= gettext iconv:translit + +OPTIONS_DEFINE= DOXYGEN LIBXML2 MEMDEBUG OPENSSL +OPTIONS_DEFAULT= OPENSSL +OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ dot:graphics/graphviz @@ -51,31 +54,28 @@ OPENSSL_CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" OPENSSL_CONFIGURE_ENV_OFF= OPENSSL_CFLAGS="" \ OPENSSL_LIBS="" -.endif - -.include <bsd.port.options.mk> +.else +LIB_DEPENDS= libgwenhywfar.so:devel/gwenhywfar -.if defined(SLAVEPORT) -LIB_DEPENDS+= libgwenhywfar.so:devel/gwenhywfar BUILD_WRKSRC= ${WRKSRC}/gui -INSTALL_WRKSRC= ${WRKSRC}/gui/${SLAVEPORT} +INSTALL_WRKSRC= ${WRKSRC}/gui/${_GWEN_GUI} -. if ${SLAVEPORT}=="fox16" +. if ${_GWEN_GUI} == "fox16" LIB_DEPENDS+= libFOX-1.6.so:x11-toolkits/fox16 CONFIGURE_ARGS+=--with-fox-includes=${LOCALBASE}/include/fox-1.6 \ --with-fox-libs=${LOCALBASE}/lib CXXFLAGS+= -Dregister= -. elif ${SLAVEPORT}=="gtk2" +. elif ${_GWEN_GUI} == "gtk2" LIB_DEPENDS+= libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig -USES+= gnome +USES+= gettext-runtime gnome USE_GNOME+= cairo gdkpixbuf2 gtk20 -. elif ${SLAVEPORT}=="gtk3" +. elif ${_GWEN_GUI} == "gtk3" LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz -USES+= gnome +USES+= gettext-runtime gnome USE_GNOME+= cairo gdkpixbuf2 gtk30 -. elif ${SLAVEPORT}=="qt5" +. elif ${_GWEN_GUI} == "qt5" USES+= compiler:c++11-lang gl qmake:no_env qt:5 USE_GL= gl USE_QT= core gui widgets \ @@ -91,7 +91,7 @@ post-patch: ${WRKSRC}/tools/gcttool/Makefile.in \ ${WRKSRC}/tools/typemaker/Makefile.in \ ${WRKSRC}/tools/xmlmerge/Makefile.in -.if defined(SLAVEPORT) +.if defined(_GWEN_GUI) @${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \ ${REINPLACE_CMD} -e 's|[$$][(]top_builddir[)]/src/[$$][(]gwenhywfar_internal_libname[)]|$$(gwenhywfar_libs)|g' \ -e 's|[$$][(]builddir[)]/../cpp/libgwengui-cpp.la|-lgwengui-cpp|g' \ @@ -100,7 +100,7 @@ post-patch: .endif post-build-DOXYGEN-on: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} srcdoc + @cd ${WRKSRC} && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} srcdoc post-install-DOXYGEN-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/apidoc diff --git a/devel/gwenhywfar/distinfo b/devel/gwenhywfar/distinfo index 24268e0676f8..ea9356eb80e2 100644 --- a/devel/gwenhywfar/distinfo +++ b/devel/gwenhywfar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690737100 -SHA256 (gwenhywfar-5.10.2.tar.gz) = 60a7da03542865501208f20e18de32b45a75e3f4aa8515ca622b391a2728a9e1 -SIZE (gwenhywfar-5.10.2.tar.gz) = 2668749 +TIMESTAMP = 1735272271 +SHA256 (gwenhywfar-5.12.0.tar.gz) = 0ad5f1447703211f1610053a94bce1e82abceda2222a2ecc9cf45b148395d626 +SIZE (gwenhywfar-5.12.0.tar.gz) = 2721790 diff --git a/devel/gwenhywfar/files/patch-configure b/devel/gwenhywfar/files/patch-configure index 11cd16ea0ae8..f97bc90eb9fb 100644 --- a/devel/gwenhywfar/files/patch-configure +++ b/devel/gwenhywfar/files/patch-configure @@ -1,9 +1,11 @@ -Fix dectection of fox libs -Prevent linking to unneeded Qt5 libraries +Hunk 1: Fix dectection of fox libs. +Hunk 2,3: Remove leftover file so temp directory is cleaned. +Hunk 3: Use pkgconf for QT_LIBS. The other method produces the full path to the +library which libtool seems to discard. ---- configure.orig 2022-02-15 16:09:36 UTC +--- configure.orig 2024-12-17 18:57:54 UTC +++ configure -@@ -23446,7 +23446,7 @@ $as_echo_n "checking for fox libraries... " >&6; } +@@ -23442,7 +23442,7 @@ if test "${with_fox_libs+set}" = set; then : # Check whether --with-fox-libs was given. if test "${with_fox_libs+set}" = set; then : @@ -12,27 +14,22 @@ Prevent linking to unneeded Qt5 libraries else ac_ext=cpp -@@ -25042,8 +25042,8 @@ percent.commands = @echo -n "\$(\$(@))\ " - QMAKE_EXTRA_TARGETS += percent +@@ -25024,6 +25024,7 @@ $as_echo_n "checking for Qt... " >&6; } + am_have_qt_dir=`mktemp -d` + am_have_qt_pro="$am_have_qt_dir/test.pro" + am_have_qt_makefile="$am_have_qt_dir/Makefile" ++ am_have_qt_stash="$am_have_qt_dir/.qmake.stash" + # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt + cat > $am_have_qt_pro << EOF + win32 { +@@ -25039,8 +25040,8 @@ EOF EOF $QT_QMAKE $am_have_qt_pro -o $am_have_qt_makefile -- QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` + QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` - QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS` -+ QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile -VCXXFLAGS -VINCPATH | tr '\n' ' '` -+ QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile -VLIBS | tr '\n' ' '` - rm $am_have_qt_pro $am_have_qt_makefile +- rm $am_have_qt_pro $am_have_qt_makefile ++ QT_LIBS=`pkgconf --libs Qt5Widgets gl` ++ rm $am_have_qt_pro $am_have_qt_makefile $am_have_qt_stash rmdir $am_have_qt_dir -@@ -25067,9 +25067,9 @@ else - fi - - -- QT_RCC=`which rcc` -- QT_LRELEASE=`which lrelease` -- QT_LUPDATE=`which lupdate` -+ QT_RCC=#none -+ QT_LRELEASE=#none -+ QT_LUPDATE=#none - - # Get Qt version from qmake - QT_DIR=`$QT_QMAKE --version | grep -o -E /.+` + # Look for specific tools in $PATH diff --git a/devel/gwenhywfar/files/patch-src_os_portable__endian.h b/devel/gwenhywfar/files/patch-src_os_portable__endian.h new file mode 100644 index 000000000000..8e159b43b56a --- /dev/null +++ b/devel/gwenhywfar/files/patch-src_os_portable__endian.h @@ -0,0 +1,45 @@ +Deal with the infamous 'portable_endian.h' yet again. This file hasn't aged +well, especially for *BSD, but various forms of it keep appearing in projects. + +--- src/os/portable_endian.h.orig 2024-04-21 13:51:43 UTC ++++ src/os/portable_endian.h +@@ -13,7 +13,8 @@ + + #endif + +-#if defined(__linux__) || defined(__CYGWIN__) ++#if defined(__linux__) || defined(__CYGWIN__) || defined(__DragonFly__) || \ ++ defined(__FreeBSD__) && __FreeBSD_version >= 1400079 || defined(__NetBSD__) || defined(__OpenBSD__) + + # include <endian.h> + +@@ -41,27 +42,10 @@ + # define __LITTLE_ENDIAN LITTLE_ENDIAN + # define __PDP_ENDIAN PDP_ENDIAN + +-#elif defined(__OpenBSD__) ++// FreeBSD added <endian.h> in 14.0 ++#elif defined(__FreeBSD__) && __FreeBSD_version < 1400079 + +-# include <endian.h> +- +-# define __BYTE_ORDER BYTE_ORDER +-# define __BIG_ENDIAN BIG_ENDIAN +-# define __LITTLE_ENDIAN LITTLE_ENDIAN +-# define __PDP_ENDIAN PDP_ENDIAN +- +-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) +- + # include <sys/endian.h> +- +-# define be16toh(x) betoh16(x) +-# define le16toh(x) letoh16(x) +- +-# define be32toh(x) betoh32(x) +-# define le32toh(x) letoh32(x) +- +-# define be64toh(x) betoh64(x) +-# define le64toh(x) letoh64(x) + + #elif defined(__WINDOWS__) + diff --git a/devel/gwenhywfar/pkg-plist b/devel/gwenhywfar/pkg-plist index 73f3579f9953..52211d5c34b1 100644 --- a/devel/gwenhywfar/pkg-plist +++ b/devel/gwenhywfar/pkg-plist @@ -15,6 +15,7 @@ include/gwenhywfar5/gwenhywfar/base64.h include/gwenhywfar5/gwenhywfar/bindata.h include/gwenhywfar5/gwenhywfar/buffer.h include/gwenhywfar5/gwenhywfar/cgui.h +include/gwenhywfar5/gwenhywfar/condvar.h include/gwenhywfar5/gwenhywfar/configmgr.h include/gwenhywfar5/gwenhywfar/configmgr_be.h include/gwenhywfar5/gwenhywfar/cryptalgo.h @@ -43,6 +44,13 @@ include/gwenhywfar5/gwenhywfar/dialog.h include/gwenhywfar5/gwenhywfar/dialog_be.h include/gwenhywfar5/gwenhywfar/directory.h include/gwenhywfar5/gwenhywfar/endianfns.h +include/gwenhywfar5/gwenhywfar/endpoint.h +include/gwenhywfar5/gwenhywfar/endpoint_ipc.h +include/gwenhywfar5/gwenhywfar/endpoint_msgio.h +include/gwenhywfar5/gwenhywfar/endpoint_multilayer.h +include/gwenhywfar5/gwenhywfar/endpoint_multilayer_p.h +include/gwenhywfar5/gwenhywfar/endpoint_tcpc.h +include/gwenhywfar5/gwenhywfar/endpoint_tcpd.h include/gwenhywfar5/gwenhywfar/error.h include/gwenhywfar5/gwenhywfar/fastbuffer.h include/gwenhywfar5/gwenhywfar/fslock.h @@ -70,6 +78,9 @@ include/gwenhywfar5/gwenhywfar/idmap.h include/gwenhywfar5/gwenhywfar/inetaddr.h include/gwenhywfar5/gwenhywfar/inetsocket.h include/gwenhywfar5/gwenhywfar/inherit.h +include/gwenhywfar5/gwenhywfar/json.h +include/gwenhywfar5/gwenhywfar/json_dump.h +include/gwenhywfar5/gwenhywfar/json_read.h include/gwenhywfar5/gwenhywfar/libloader.h include/gwenhywfar5/gwenhywfar/list.h include/gwenhywfar5/gwenhywfar/list1.h @@ -83,6 +94,8 @@ include/gwenhywfar5/gwenhywfar/memcache.h include/gwenhywfar5/gwenhywfar/memory.h include/gwenhywfar5/gwenhywfar/misc.h include/gwenhywfar5/gwenhywfar/misc2.h +include/gwenhywfar5/gwenhywfar/msg.h +include/gwenhywfar5/gwenhywfar/msg_ipc.h include/gwenhywfar5/gwenhywfar/msgengine.h include/gwenhywfar5/gwenhywfar/multicache.h include/gwenhywfar5/gwenhywfar/mutex.h @@ -97,8 +110,10 @@ include/gwenhywfar5/gwenhywfar/path.h include/gwenhywfar5/gwenhywfar/pathmanager.h include/gwenhywfar5/gwenhywfar/plugin.h include/gwenhywfar5/gwenhywfar/plugindescr.h +include/gwenhywfar5/gwenhywfar/portable_endian.h include/gwenhywfar5/gwenhywfar/process.h include/gwenhywfar5/gwenhywfar/refptr.h +include/gwenhywfar5/gwenhywfar/request.h include/gwenhywfar5/gwenhywfar/ringbuffer.h include/gwenhywfar5/gwenhywfar/sar.h include/gwenhywfar5/gwenhywfar/sighead.h @@ -122,6 +137,7 @@ include/gwenhywfar5/gwenhywfar/testframework.h include/gwenhywfar5/gwenhywfar/testmodule.h include/gwenhywfar5/gwenhywfar/text.h include/gwenhywfar5/gwenhywfar/threadlocaldata.h +include/gwenhywfar5/gwenhywfar/timestamp.h include/gwenhywfar5/gwenhywfar/tlv.h include/gwenhywfar5/gwenhywfar/tree.h include/gwenhywfar5/gwenhywfar/tree2.h @@ -176,6 +192,7 @@ share/gwenbuild/templates/project.tmpl %%DATADIR%%/dialogs/dlg_progress.dlg %%DATADIR%%/dialogs/dlg_showbox.dlg %%DATADIR%%/gwenbuild/builders/posix/app.gwb +%%DATADIR%%/gwenbuild/builders/posix/avrhexfile.gwb %%DATADIR%%/gwenbuild/builders/posix/cbuilder.gwb %%DATADIR%%/gwenbuild/builders/posix/cxxapp.gwb %%DATADIR%%/gwenbuild/builders/posix/cxxbuilder.gwb @@ -212,6 +229,7 @@ share/gwenbuild/templates/project.tmpl %%DATADIR%%/typemaker2/c/gwen_param_tree.tm2 %%DATADIR%%/typemaker2/c/gwen_stringlist2.tm2 %%DATADIR%%/typemaker2/c/gwen_time.tm2 +%%DATADIR%%/typemaker2/c/gwen_timestamp.tm2 %%DATADIR%%/typemaker2/c/gwen_xmlnode.tm2 %%DATADIR%%/typemaker2/c/gwen_xmlnode_list.tm2 %%DATADIR%%/typemaker2/c/gwen_xmlnode_list2.tm2
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412310840.4BV8eh5m056162>