Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Nov 2018 21:45:02 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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
Message-ID:  <201811142145.wAELj2JI070504@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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/*.*']},
+        )
+ 
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811142145.wAELj2JI070504>