Attachment #239584 for bug #269048

View | Details | Raw Unified | Return to bug 269048
Collapse All | Expand All





GNU_CONFIGURE=	yes

CONFLICTS_INSTALL=	ucl

INSTALL_TARGET=	install-strip
TEST_TARGET=	check

CPPFLAGS=		-I../uthash

CONFLICTS_INSTALL=	ucl

OPTIONS_DEFINE=		LUA REGEX SIGNATURES URLS UTILS
OPTIONS_DEFAULT=	REGEX UTILS
OPTIONS_SUB=		yes


UTILS_CONFIGURE_ENABLE=	utils

.include <bsd.port.options.mk>

# https://github.com/vstakhov/libucl/issues/203
.if ${PORT_OPTIONS:MSIGNATURES} && ((${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl)
BROKEN=	Signatures checking support does not build with OpenSSL 1.1.1
.endif

.include <bsd.port.mk>




LICENSE=	MIT
LICENSE_FILE=	${WRKDIR}/libucl-${PORTVERSION}/COPYING

LIB_DEPENDS=	libucl.so:textproc/libucl
	libucl.so:textproc/libucl

USES=		python

USES=		python:3.6+
USE_GITHUB=	yes
GH_ACCOUNT=	vstakhov
GH_PROJECT=	libucl
USE_PYTHON=	autoplist concurrent distutils

CPPFLAGS+=	-Iuthash

WRKSRC_SUBDIR=	python

.include <bsd.port.mk>




--- setup.py.orig	2023-01-08 10:03:32 UTC
+++ setup.py
@@ -22,7 +22,7 @@ if sys.version < '2.7':
 
 uclmodule = Extension(
     'ucl',
-    libraries=['ucl', 'curl'],
+    libraries=['ucl', 'fetch'],
     sources=['python/src/uclmodule.c'],
     include_dirs=['include'],
     language='c',
@@ -31,7 +31,7 @@ uclmodule = Extension(
 ucl_lib = {
     'sources': ['src/' + fn for fn in os.listdir('src') if fn.endswith('.c')],
     'include_dirs': ['include', 'src', 'uthash', 'klib'],
-    'macros': [('CURL_FOUND', '1')],
+    'macros': [('HAVE_FETCH_H', '1')],
 }
 
 # sdist setup() will pull in the *.c files automatically, but not headers
@@ -41,7 +41,7 @@ template = 'python/MANIFEST.in'
 # distutils assume setup.py is in the root of the project
 # we need to include C source from the parent so trick it
 in_ucl_root = 'setup.py' in os.listdir('python')
-if in_ucl_root:
+if not os.path.isfile('setup.py') and in_ucl_root:
     os.link('python/setup.py', 'setup.py')
 
 setup(

Return to bug 269048

Lines 19-29 USE_LDCONFIG= yes Link Here

(-)b/textproc/libucl/Makefile (-9 / +4 lines)
19		19
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21		21
22	CONFLICTS_INSTALL= ucl
23
24	INSTALL_TARGET= install-strip	22	INSTALL_TARGET= install-strip
25	TEST_TARGET= check	23	TEST_TARGET= check
26		24
		25	CPPFLAGS= -I../uthash
		26
		27	CONFLICTS_INSTALL= ucl
		28
27	OPTIONS_DEFINE= LUA REGEX SIGNATURES URLS UTILS	29	OPTIONS_DEFINE= LUA REGEX SIGNATURES URLS UTILS
28	OPTIONS_DEFAULT= REGEX UTILS	30	OPTIONS_DEFAULT= REGEX UTILS
29	OPTIONS_SUB= yes	31	OPTIONS_SUB= yes
Lines 49-59 URLS_CONFIGURE_ENABLE= urls Link Here
49		51
50	UTILS_CONFIGURE_ENABLE= utils	52	UTILS_CONFIGURE_ENABLE= utils
51		53
52	.include <bsd.port.options.mk>
53
54	# https://github.com/vstakhov/libucl/issues/203
55	.if ${PORT_OPTIONS:MSIGNATURES} && ((${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base) \|\| ${SSL_DEFAULT} == openssl)
56	BROKEN= Signatures checking support does not build with OpenSSL 1.1.1
57	.endif
58
59	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Lines 10-26 WWW= https://github.com/vstakhov/libucl/ Link Here

(-)b/textproc/py-ucl/Makefile (-5 / +4 lines)
10	LICENSE= MIT	10	LICENSE= MIT
11	LICENSE_FILE= ${WRKDIR}/libucl-${PORTVERSION}/COPYING	11	LICENSE_FILE= ${WRKDIR}/libucl-${PORTVERSION}/COPYING
12		12
13	LIB_DEPENDS= libcurl.so:ftp/curl \	13	LIB_DEPENDS= libucl.so:textproc/libucl
14	libucl.so:textproc/libucl
15		14
16	CFLAGS+= -I${PREFIX}/include	15	USES= python
17
18	USES= python:3.6+
19	USE_GITHUB= yes	16	USE_GITHUB= yes
20	GH_ACCOUNT= vstakhov	17	GH_ACCOUNT= vstakhov
21	GH_PROJECT= libucl	18	GH_PROJECT= libucl
22	USE_PYTHON= autoplist concurrent distutils	19	USE_PYTHON= autoplist concurrent distutils
23		20
		21	CPPFLAGS+= -Iuthash
		22
24	WRKSRC_SUBDIR= python	23	WRKSRC_SUBDIR= python
25		24
26	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Added Link Here

(-)b/textproc/py-ucl/files/patch-setup.py (+29 lines)
1	--- setup.py.orig 2023-01-08 10:03:32 UTC
2	+++ setup.py
3	@@ -22,7 +22,7 @@ if sys.version < '2.7':
4
5	uclmodule = Extension(
6	'ucl',
7	- libraries=['ucl', 'curl'],
8	+ libraries=['ucl', 'fetch'],
9	sources=['python/src/uclmodule.c'],
10	include_dirs=['include'],
11	language='c',
12	@@ -31,7 +31,7 @@ uclmodule = Extension(
13	ucl_lib = {
14	'sources': ['src/' + fn for fn in os.listdir('src') if fn.endswith('.c')],
15	'include_dirs': ['include', 'src', 'uthash', 'klib'],
16	- 'macros': [('CURL_FOUND', '1')],
17	+ 'macros': [('HAVE_FETCH_H', '1')],
18	}
19
20	# sdist setup() will pull in the *.c files automatically, but not headers
21	@@ -41,7 +41,7 @@ template = 'python/MANIFEST.in'
22	# distutils assume setup.py is in the root of the project
23	# we need to include C source from the parent so trick it
24	in_ucl_root = 'setup.py' in os.listdir('python')
25	-if in_ucl_root:
26	+if not os.path.isfile('setup.py') and in_ucl_root:
27	os.link('python/setup.py', 'setup.py')
28
29	setup(