From nobody Tue Aug 08 07:31:36 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKlHY0q3zz4Tq7r; Tue, 8 Aug 2023 07:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKlHY09v8z4Fkg; Tue, 8 Aug 2023 07:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691479897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=616PRjfJ4b2cELHrITnmw8iO6LtWsHZjy7ArGCasDlc=; b=vjDxEVL6TwbJ9Yw658HH06K/3aA79HgBYkLnU5VUdS8mbOBiioZklw8RhMiVaEAvMSZsXp rzk6rjkAJqi70IWkdBbVCZhQs72TVe6SEAyY8NALqTyT5NPh+N4fqDt0QxjUNojeETRKOe aPNm7zy26dUf+NqGWDc8NlD5/E8bedY4MzP6oWqxfQ2wtdBeF3qL1MNfG8aj8+XoOriIrT SrBUipnz6xrOakTwxM33CwU1yQShZ0xAebpiyYQzWPFUjXLFPTcyxK5Or4eKgeNGq7YQaL n+s58DGi8FPo90TOC8i3V2rt22Y7LZPROrvaOTo4m0S7k5CotIYSwCJ6EfO0qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691479897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=616PRjfJ4b2cELHrITnmw8iO6LtWsHZjy7ArGCasDlc=; b=pnqcCZ5/40C2wkM5paoJEteasAmPv89Ph5Npy20+XT+KQToAQFcEqSwmK4+hqnN3rkfGVW fyZL8z3IfIBAujW8h42Dt+RYwffxRrXOlwOzg9RkqF38EaryvYkZuimqt/VRMmrx5sSxxG XXxTEy4GGbOmauC2azIDAsguXx/aV/xlHsmv8YwzZbOfut4sl1vRq7tGkesL/VQZjMhIr9 kjkArK2dI1jxpBgCvHAcZNeWmx2JS6yNOR8NWTe6i8kBesq6OoduLQCWYRFAwL9UDaQwOX CjyO0LjNHB3NKuUIQE0J1rvekoZC9r7C+HYWbrdG73zwzm7YtUG7m6K5Hpy/BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691479897; a=rsa-sha256; cv=none; b=fJFG6PMHFZmd+L+sNHRjdq2YjErDE5mkW2t4FsuQLsYtvwo1kSgGDV+0tMlH9Cr80crrDU uEJtMamSxrnj2YgbRydrrg1uz8CDwKlmVkqjdL1YhEN6vV8F6/PGeYc4aR/A8hvv9LN/pd w8RB5rj5oRerpYjKZPQSG8XF3RLwvHCr7Y6Xi0ercyK9c9hZ47EgTSEV4Sq+m7il6ick10 tHhAyisrseOkaJ9L70gHRtpWF+PwlgoiHhMM/iMOgj8GVfo6E0yuztTJV576CKsdvaR87i xcXMl8RXDXwq2To7PzoMIZ0SyXEZ2/63jBE/AfQh5UC2XcS3D8OEXj3Gg6N85Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKlHX6LCSzB01; Tue, 8 Aug 2023 07:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3787VaXN037221; Tue, 8 Aug 2023 07:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3787VaKB037220; Tue, 8 Aug 2023 07:31:36 GMT (envelope-from git) Date: Tue, 8 Aug 2023 07:31:36 GMT Message-Id: <202308080731.3787VaKB037220@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 97deaa15fc17 - main - x11-toolkits/py-fltk: update the port to version 1.3.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97deaa15fc17517445f6a7c8da3cbea796beda9a Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=97deaa15fc17517445f6a7c8da3cbea796beda9a commit 97deaa15fc17517445f6a7c8da3cbea796beda9a Author: Alexey Dokuchaev AuthorDate: 2023-08-08 07:30:22 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-08-08 07:30:22 +0000 x11-toolkits/py-fltk: update the port to version 1.3.8 It has better compatibility with modern compilers and matches our current FLTK version (adjust port description accordingly). --- x11-toolkits/py-fltk/Makefile | 28 ++++++++++++---------------- x11-toolkits/py-fltk/distinfo | 6 +++--- x11-toolkits/py-fltk/files/patch-setup.py | 21 +++++++++++---------- x11-toolkits/py-fltk/pkg-descr | 7 +++---- 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile index ba34a91d2f0c..3e69ed3084eb 100644 --- a/x11-toolkits/py-fltk/Makefile +++ b/x11-toolkits/py-fltk/Makefile @@ -1,24 +1,27 @@ PORTNAME= fltk -PORTVERSION= 1.3.4.1 +PORTVERSION= 1.3.8 CATEGORIES= x11-toolkits python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/pyFltk-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyFltk-${PORTVERSION}_py3 +DISTNAME= pyFltk-${PORTVERSION} MAINTAINER= python@FreeBSD.org COMMENT= Python interface to FLTK window toolkit -WWW= http://pyfltk.sourceforge.net/ +WWW= https://pyfltk.sourceforge.io/ LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= swig:devel/swig LIB_DEPENDS= libfltk.so:x11-toolkits/fltk CFLAGS+= -DFL_LIBRARY -MAKE_ENV= FLTK_HOME=${LOCALBASE}/bin -USES= python xorg -USE_CXXSTD= c++14 +USES= python shebangfix xorg USE_PYTHON= autoplist distutils +PYDISTUTILS_CONFIGUREARGS= swig +SHEBANG_FILES= fltk/test/tree.py \ + fltk/test/tree_demo.py \ + fltk/test/fltk_threads.py USE_XORG= x11 DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} @@ -29,16 +32,9 @@ WRKSRC= ${WRKDIR}/pyFltk-${PORTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -CFLAGS+= -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS -.endif - post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' \ - ${WRKSRC}/python/fltk_wrap.cpp + @${REINPLACE_CMD} -e '/^%include fl_types/,+1 \ + s|Enumerations|Fl_Export|' ${WRKSRC}/swig/fltk.i post-build: ${REINPLACE_CMD} -e "s|\.\./docs|${DOCSDIR}/html|g" ${WRKSRC}/fltk/test/help.py @@ -48,7 +44,7 @@ post-install: post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/html/ - cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README TODO ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README.md ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/fltk/docs/ && ${INSTALL_DATA} *.html *.jpg ${STAGEDIR}${DOCSDIR}/html/ post-install-EXAMPLES-on: diff --git a/x11-toolkits/py-fltk/distinfo b/x11-toolkits/py-fltk/distinfo index 76d7fbb73a18..4bdf9133a0e5 100644 --- a/x11-toolkits/py-fltk/distinfo +++ b/x11-toolkits/py-fltk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499054805 -SHA256 (pyFltk-1.3.4.1_py3.tar.gz) = 9cbac496f124cd99a1eb0d329dbfdac0d1e160d25f9fd82a3dfb10abc86e069c -SIZE (pyFltk-1.3.4.1_py3.tar.gz) = 955717 +TIMESTAMP = 1661553643 +SHA256 (pyFltk-1.3.8.tar.gz) = f7c5012810022dce011f3ed9f3f004c56e08090823739bfe670881fce9611f80 +SIZE (pyFltk-1.3.8.tar.gz) = 587221 diff --git a/x11-toolkits/py-fltk/files/patch-setup.py b/x11-toolkits/py-fltk/files/patch-setup.py index 8e0d02c386b7..ef29b4f616d3 100644 --- a/x11-toolkits/py-fltk/files/patch-setup.py +++ b/x11-toolkits/py-fltk/files/patch-setup.py @@ -1,19 +1,20 @@ ---- setup.py.orig 2016-12-29 09:36:33 UTC +--- setup.py.orig 2022-08-26 05:16:56 UTC +++ setup.py -@@ -106,7 +106,7 @@ elif sys.platform.startswith('linux'): +@@ -80,7 +80,7 @@ elif sys.platform.startswith('linux') or sys.platform compile_arg_list.append('-Werror=format-security') lib_dir_list = [fltk_lib_dir, '/usr/lib'] lib_list = ["fltk"] -elif sys.platform in ['freebsd4','freebsd5','freebsd6','freebsd7', 'sunos5']: +elif sys.platform[0:7] == 'freebsd': - print("Building for: %s"%sys.platform) + print(f"Building for: {sys.platform}") def_list = [('UNIX', '1')] lib_dir_list = [fltk_lib_dir,'/usr/X11R6/lib','/usr/lib'] -@@ -323,7 +323,6 @@ setup (name = 'pyFltk', - description = 'This is a Python wrapper for the FLTK', - ext_modules = [module1], - packages = ['fltk'], -- package_data={'fltk': ['test/*.*', 'docs/*.*']}, - ) - +@@ -297,7 +297,7 @@ class PySwigCommand(distutils.cmd.Command): + def run(self): + """Run command.""" +- command = ['swig', '-w302', '-w312', '-w325', '-w362', '-w389', '-w401', '-w473', '-w509', '-I./swig', '-DFL_EXPORT', '-DPYTHON', '-DPYTHON3', '-py3', '-c++', '-python', '-shadow', '-fastdispatch', '-outdir', 'fltk', '-o', 'fltk/fltk_wrap.cpp', './swig/fltk.i'] ++ command = ['swig', '-w302', '-w312', '-w325', '-w362', '-w389', '-w401', '-w473', '-w509', '-I./swig', '-DPYTHON', '-DPYTHON3', '-c++', '-python', '-shadow', '-fastdispatch', '-outdir', 'fltk', '-o', 'fltk/fltk_wrap.cpp', './swig/fltk.i'] + pos = command.index('-I./swig')+1 + command[pos:pos] = self.include + self.announce( diff --git a/x11-toolkits/py-fltk/pkg-descr b/x11-toolkits/py-fltk/pkg-descr index 3cc7ce10c713..bad899549b65 100644 --- a/x11-toolkits/py-fltk/pkg-descr +++ b/x11-toolkits/py-fltk/pkg-descr @@ -1,4 +1,3 @@ -pyFLTK is Python wrapper for the Fast Light Tool Kit cross-platform graphical -user-interface library. - -This package wraps FLTK version 1.1 and is quite stable. +pyFLTK is Python wrapper for the Fast Light Tool Kit cross-platform +graphical user-interface library. It wraps FLTK version 1.3 and is +quite stable.