From owner-svn-ports-all@freebsd.org Wed Nov 14 21:45:08 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F004D1100A3C; Wed, 14 Nov 2018 21:45:07 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6A6406ECF1; Wed, 14 Nov 2018 21:45:07 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A384F24C7C; Wed, 14 Nov 2018 21:45:02 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAELj2c6070506; Wed, 14 Nov 2018 21:45:02 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAELj2JI070504; Wed, 14 Nov 2018 21:45:02 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201811142145.wAELj2JI070504@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 14 Nov 2018 21:45:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484963 - in head/x11-toolkits/py-fltk: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/x11-toolkits/py-fltk: . files X-SVN-Commit-Revision: 484963 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6A6406ECF1 X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.91), country: US(-0.10)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Nov 2018 21:45:08 -0000 Author: sunpoet Date: Wed Nov 14 21:45:02 2018 New Revision: 484963 URL: https://svnweb.freebsd.org/changeset/ports/484963 Log: Fix build on FreeBSD 13+ Reported by: pkg-fallout Added: head/x11-toolkits/py-fltk/files/ head/x11-toolkits/py-fltk/files/patch-setup.py (contents, props changed) Modified: head/x11-toolkits/py-fltk/Makefile Modified: head/x11-toolkits/py-fltk/Makefile ============================================================================== --- head/x11-toolkits/py-fltk/Makefile Wed Nov 14 21:44:53 2018 (r484962) +++ head/x11-toolkits/py-fltk/Makefile Wed Nov 14 21:45:02 2018 (r484963) @@ -33,7 +33,8 @@ WRKSRC= ${WRKDIR}/pyFltk-${PORTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES post-patch: - @${REINPLACE_CMD} -e "s|/usr/X11R6|${LOCALBASE}|g;s|package_data.*},||g;s|sunos5|dragonfly4', 'freebsd8', 'freebsd9', 'freebsd10', 'freebsd11', 'freebsd12|g" ${WRKSRC}/setup.py +# @${REINPLACE_CMD} -e "s|'freebsd.*sunos5'|'freebsd11', 'freebsd12', 'freebsd13'|; s|/usr/X11R6|${LOCALBASE}|g; s|package_data.*},||g" ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/setup.py post-build: ${REINPLACE_CMD} -e "s|\.\./docs|${DOCSDIR}/html|g" ${WRKSRC}/fltk/test/help.py Added: head/x11-toolkits/py-fltk/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/py-fltk/files/patch-setup.py Wed Nov 14 21:45:02 2018 (r484963) @@ -0,0 +1,19 @@ +--- setup.py.orig 2016-12-29 09:36:33 UTC ++++ setup.py +@@ -106,7 +106,7 @@ elif sys.platform.startswith('linux'): + 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) + 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/*.*']}, + ) + +