View | Details | Raw Unified | Return to bug 263819 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/Makefile (+1 lines)
Lines 748-753 Link Here
748
    SUBDIR += ftnchek
748
    SUBDIR += ftnchek
749
    SUBDIR += fuel
749
    SUBDIR += fuel
750
    SUBDIR += functionalplus
750
    SUBDIR += functionalplus
751
    SUBDIR += fungw
751
    SUBDIR += fuzzylite
752
    SUBDIR += fuzzylite
752
    SUBDIR += fxdiv
753
    SUBDIR += fxdiv
753
    SUBDIR += g-wrap
754
    SUBDIR += g-wrap
(-)b/devel/fungw/Makefile (+47 lines)
Added Link Here
1
PORTNAME=	fungw
2
DISTVERSION=	1.2.1
3
CATEGORIES=	devel
4
MASTER_SITES=	http://www.repo.hu/projects/fungw/releases/
5
6
MAINTAINER=	fuz@fuz.su
7
COMMENT=	Function gateway
8
9
LICENSE=	LGPL21+
10
LICENSE_FILE=	${WRKSRC}/COPYING
11
12
USES=		gmake tar:bz2
13
USE_LDCONFIG=	yes
14
HAS_CONFIGURE=	yes
15
MAKE_ARGS+=	PREFIX=${PREFIX}
16
BINARY_ALIAS=	python=${PYTHON_CMD:Ufalse}
17
18
# unported extensions: estutter funlisp mawk mruby mujs picol python(2)
19
OPTIONS_DEFINE= DOCS DUKTAPE LUA PERL PYTHON3 TCL
20
OPTIONS_DEFAULT=	DUKTAPE LUA PERL PYTHON3 TCL
21
OPTIONS_SUB=	DUKTAPE LUA PERL PYTHON3 TCL
22
23
DUKTAPE_DESC=	Javascript support through Duktape
24
25
DUKTAPE_LIB_DEPENDS=	libduktape.so:lang/duktape-lib
26
LUA_USES=	lua:51
27
PERL_USES=	perl5
28
PYTHON3_USES=	python
29
TCL_USES=	tcl
30
31
pre-configure-DUKTAPE-on:
32
	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
33
	    ${WRKSRC}/scconfig/src/scripts/find_duktape.c
34
35
pre-configure-LUA-on:
36
	${REINPLACE_CMD} \
37
	    -e 's,%%LUA_INCDIR%%,${LUA_INCDIR},' \
38
	    -e 's,%%LUA_LIBDIR%%,${LUA_LIBDIR},' \
39
	    -e 's,%%LUA_VER%%,${LUA_VER},' \
40
	    ${WRKSRC}/scconfig/src/scripts/find_lua.c
41
42
# install the genht component
43
post-install:
44
	(cd ${WRKSRC}/src_3rd/genht && ${SETENV} ${MAKE_ENV} \
45
	    ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
46
47
.include <bsd.port.mk>
(-)b/devel/fungw/distinfo (+3 lines)
Added Link Here
1
TIMESTAMP = 1651841856
2
SHA256 (fungw-1.2.1.tar.bz2) = f2599959a6b96957015b181629cc5035370f929d1ee08dec6447c3eb622fc925
3
SIZE (fungw-1.2.1.tar.bz2) = 336633
(-)b/devel/fungw/files/patch-Makefile (+64 lines)
Added Link Here
1
--- Makefile.orig	2021-04-04 05:53:11 UTC
2
+++ Makefile
3
@@ -1,36 +1,37 @@
4
 all:
5
-	cd libfungw && make all
6
-	cd libfungwbind && make all
7
-	cd regression && make all
8
-	cd doc && make all
9
+	cd libfungw && $(MAKE) all
10
+	cd libfungwbind && $(MAKE) all
11
+	cd regression && $(MAKE) all
12
+	cd doc && $(MAKE) all
13
+	cd src_3rd/genht && $(MAKE) all
14
 
15
 clean:
16
-	cd libfungw && make clean
17
-	cd libfungwbind && make clean
18
-	cd regression && make clean
19
-	cd doc && make clean
20
-	-cd src_3rd/genht && make clean
21
+	cd libfungw && $(MAKE) clean
22
+	cd libfungwbind && $(MAKE) clean
23
+	cd regression && $(MAKE) clean
24
+	cd doc && $(MAKE) clean
25
+	-cd src_3rd/genht && $(MAKE) clean
26
 
27
 distclean:
28
-	cd regression && make distclean
29
-	cd libfungw && make distclean
30
-	cd libfungwbind && make distclean
31
-	cd doc && make distclean
32
-	cd scconfig && make distclean
33
-	-cd src_3rd/genht && make clean
34
+	cd regression && $(MAKE) distclean
35
+	cd libfungw && $(MAKE) distclean
36
+	cd libfungwbind && $(MAKE) distclean
37
+	cd doc && $(MAKE) distclean
38
+	cd scconfig && $(MAKE) distclean
39
+	-cd src_3rd/genht && $(MAKE) clean
40
 
41
 install:
42
-	cd libfungw && make install
43
-	cd libfungwbind && make install
44
-	cd doc && make install
45
+	cd libfungw && $(MAKE) install
46
+	cd libfungwbind && $(MAKE) install
47
+	cd doc && $(MAKE) install
48
 
49
 
50
 linstall:
51
-	cd libfungw && make linstall
52
-	cd libfungwbind && make linstall
53
-	cd doc && make linstall
54
+	cd libfungw && $(MAKE) linstall
55
+	cd libfungwbind && $(MAKE) linstall
56
+	cd doc && $(MAKE) linstall
57
 
58
 uninstall:
59
-	cd libfungw && make uninstall
60
-	cd libfungwbind && make uninstall
61
-	cd doc && make uninstall
62
+	cd libfungw && $(MAKE) uninstall
63
+	cd libfungwbind && $(MAKE) uninstall
64
+	cd doc && $(MAKE) uninstall
(-)b/devel/fungw/files/patch-doc_Makefile.in (+18 lines)
Added Link Here
1
--- doc/Makefile.in.orig	2022-05-06 13:43:13 UTC
2
+++ doc/Makefile.in
3
@@ -32,12 +32,12 @@ install_:
4
 	$(INST) -d $(DOCS) $(DOCDIR)
5
 
6
 install:
7
-	make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
8
+	$(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
9
 
10
 linstall:
11
-	make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
12
+	$(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
13
 
14
 uninstall:
15
-	make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
16
+	$(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
17
 
18
 ~]
(-)b/devel/fungw/files/patch-libfungw_Makefile.in (+25 lines)
Added Link Here
1
--- libfungw/Makefile.in.orig	2022-05-06 13:42:01 UTC
2
+++ libfungw/Makefile.in
3
@@ -96,16 +96,16 @@ install_link_:
4
 	$(SCCBOX) $(HOW) $(FUNGW_DYN_VER_XYZ) $(LIBDIR)/$(FUNGW_DYN_VER_XY)
5
 
6
 install:
7
-	make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
8
-	make install_link_ "HOW=ln -f"
9
+	$(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
10
+	$(MAKE) install_link_ "HOW=ln -f"
11
 
12
 linstall:
13
-	make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
14
-	make install_link_ "HOW=ln -f"
15
+	$(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
16
+	$(MAKE) install_link_ "HOW=ln -f"
17
 
18
 uninstall:
19
-	make install_link_ "HOW=install -u"
20
-	make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
21
+	$(MAKE) install_link_ "HOW=install -u"
22
+	$(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
23
 
24
 dep:
25
 	echo "### Generated file, do not edit, run make dep ###" > Makefile.dep
(-)b/devel/fungw/files/patch-libfungwbind_Makefile.in (+20 lines)
Added Link Here
1
--- libfungwbind/Makefile.in.orig	2022-05-06 13:42:28 UTC
2
+++ libfungwbind/Makefile.in
3
@@ -2,7 +2,7 @@ print {# Generated by ./configure - DO NOT EDIT\n\n}
4
 foreach /local/fungw/task in {all clean install linstall uninstall}
5
 	print [~~/local/fungw/task~:~] {\n}
6
 	foreach /local/fungw/n in /local/fungw/bindings_all
7
-		print	[~	cd ~/local/fungw/n~ && make ~/local/fungw/task~~] {\n}
8
+		print	[~	cd ~/local/fungw/n~ && $(MAKE) ~/local/fungw/task~~] {\n}
9
 	end
10
 	print {\n}
11
 end
12
@@ -10,7 +10,7 @@ end
13
 
14
 print {distclean:\n}
15
 foreach /local/fungw/n in /local/fungw/bindings_all
16
-	print	[~	cd ~/local/fungw/n~ && make distclean~] {\n}
17
+	print	[~	cd ~/local/fungw/n~ && $(MAKE) distclean~] {\n}
18
 end
19
 print {	rm libfungwbind.mak Makefile\n}
20
 
(-)b/devel/fungw/files/patch-libfungwbind_Plugin.tmpasm (+25 lines)
Added Link Here
1
--- libfungwbind/Plugin.tmpasm.orig	2022-05-06 14:46:15 UTC
2
+++ libfungwbind/Plugin.tmpasm
3
@@ -99,16 +99,16 @@ install_link: $(LIBA) $(LIBSO)
4
 	$(SCCBOX) install $(IOP) --relative $(LIBDIR)/lib$(LIBSO_XYZ) $(LIBDIR)/lib$(LIBSO_X)
5
 
6
 install:
7
-	make install_ IOP="-i"
8
-	make install_link IOP="-l"
9
+	$(MAKE) install_ IOP="-i"
10
+	$(MAKE) install_link IOP="-l"
11
 
12
 linstall:
13
-	make install_ IOP="-l"
14
-	make install_link IOP="-l"
15
+	$(MAKE) install_ IOP="-l"
16
+	$(MAKE) install_link IOP="-l"
17
 
18
 uninstall:
19
-	make install_link IOP="-u"
20
-	make install_ IOP="-u"
21
+	$(MAKE) install_link IOP="-u"
22
+	$(MAKE) install_ IOP="-u"
23
 ~]
24
 
25
 redir /local/fungw/mod_mak
(-)b/devel/fungw/files/patch-regression_Makefile.in (+11 lines)
Added Link Here
1
--- regression/Makefile.in.orig	2022-05-06 13:43:42 UTC
2
+++ regression/Makefile.in
3
@@ -24,7 +24,7 @@ test_script: test_script.o hello.o $(LIB_FGW) $(ENGINE
4
 multicall: multicall.o $(LIB_FGW) $(ENGINES) $(LIBS)
5
 
6
 ../src_3rd/genht/genht_std.a:
7
-	cd ../src_3rd/genht && make genht_std.a
8
+	cd ../src_3rd/genht && $(MAKE) genht_std.a
9
 
10
 test.o: test.c
11
 
(-)b/devel/fungw/files/patch-scconfig_src_scripts_find__duktape.c (+11 lines)
Added Link Here
1
--- scconfig/src/scripts/find_duktape.c.orig	2022-05-06 14:34:12 UTC
2
+++ scconfig/src/scripts/find_duktape.c
3
@@ -44,7 +44,7 @@ int find_script_duktape(const char *name, int logdepth
4
 	logdepth++;
5
 
6
 	/* Look at the standard place */
7
-	if (try_icl(logdepth, "libs/script/duktape", test_c, NULL, NULL, "-lduktape -lm")) return 0;
8
+	if (try_icl(logdepth, "libs/script/duktape", test_c, NULL, "-I%%LOCALBASE%%/include", "-L%%LOCALBASE%%/lib -lduktape -lm")) return 0;
9
 
10
 	return try_fail(logdepth, "libs/script/duktape");
11
 }
(-)b/devel/fungw/files/patch-scconfig_src_scripts_find__lua.c (+11 lines)
Added Link Here
1
--- scconfig/src/scripts/find_lua.c.orig	2022-05-06 14:29:08 UTC
2
+++ scconfig/src/scripts/find_lua.c
3
@@ -48,7 +48,7 @@ int find_script_lua(const char *name, int logdepth, in
4
 
5
 	/* Look at some standard places */
6
 	/* TODO: do we need -ldl? */
7
-	if (try_icl(logdepth, "libs/script/lua", test_c, NULL, NULL, "-llua -llualib -lm")) return 0;
8
+	if (try_icl(logdepth, "libs/script/lua", test_c, NULL, "-I%%LUA_INCDIR%%", "-L%%LUA_LIBDIR%% -llua-%%LUA_VER%%")) return 0;
9
 
10
 	/* lualib doesn't exist in lua 5.1.1 */
11
 	if (try_icl(logdepth, "libs/script/lua", test_c, NULL, NULL, "-llua -lm")) return 0;
(-)b/devel/fungw/files/patch-scconfig_src_scripts_find__python.c (+19 lines)
Added Link Here
1
--- scconfig/src/scripts/find_python.c.orig	2019-01-09 06:46:09 UTC
2
+++ scconfig/src/scripts/find_python.c
3
@@ -43,13 +43,13 @@ static int find_script_python_(const char *name, int l
4
 
5
 	char *inc_py =
6
 		NL "import distutils.sysconfig;"
7
-		NL "print '-I' + distutils.sysconfig.get_python_inc().replace('\\\\','/')"
8
+		NL "print ('-I' + distutils.sysconfig.get_python_inc().replace('\\\\','/'))"
9
 		NL;
10
 	char *lib_py =
11
 		NL "import distutils.sysconfig;"
12
-		NL "print '-L' + distutils.sysconfig.PREFIX.replace('\\\\','/') + '/libs',;"
13
+		NL "print ('-L' + distutils.sysconfig.PREFIX.replace('\\\\','/') + '/lib')"
14
 		NL "import sys;"
15
-		NL "print '-lpython' + str(sys.version_info[0]) + str(sys.version_info[1])"
16
+		NL "print ('-lpython' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]))"
17
 		NL;
18
 
19
 
(-)b/devel/fungw/files/patch-src__3rd_genht_Makefile (+38 lines)
Added Link Here
1
--- src_3rd/genht/Makefile.orig	2021-07-19 16:13:28 UTC
2
+++ src_3rd/genht/Makefile
3
@@ -17,6 +17,7 @@ BIN=mainsi
4
 OBJS=htss.o htsp.o htsi.o htip.o htpp.o htpi.o hash.o siphash24.o
5
 LIBSO=libgenht.so.$(VER)
6
 LIBSO1=libgenht.so.$(VER_MAJOR)
7
+LIBSO2=libgenht.so
8
 LIBA=libgenht.a
9
 
10
 all: version.h $(BIN) $(OBJS) $(LIBA) $(LIBSO)
11
@@ -34,7 +35,7 @@ mainsi: mainsi.o htsi.o
12
 	$(CC) -o $@ mainsi.o htsi.o $(LDFLAGS)
13
 
14
 $(LIBSO): $(OBJS)
15
-	$(CC) $(LDFLAGS) -shared -dynamic -rdynamic -o $@ $(OBJS)
16
+	$(CC) $(LDFLAGS) -shared -dynamic -rdynamic -Wl,-soname,$(LIBSO1) -o $@ $(OBJS)
17
 
18
 $(LIBA): $(OBJS)
19
 	ar rvu $@ $(OBJS)
20
@@ -78,14 +79,16 @@ uninstall:
21
 	rm $(LIBDIR)/$(LIBSO) $(LIBDIR)/$(LIBA) $(LIBDIR)/$(LIBSO1)
22
 
23
 install:
24
-	make install_ CP="cp"
25
+	$(MAKE) install_ CP="cp"
26
 	-@rm $(LIBDIR)/$(LIBSO1) 2>/dev/null
27
 	ln -s $(LIBSO) $(LIBDIR)/$(LIBSO1)
28
+	ln -s $(LIBSO1) $(LIBDIR)/$(LIBSO2)
29
 
30
 linstall:
31
-	make install_ CP="ln -s"
32
+	$(MAKE) install_ CP="ln -s"
33
 	-@rm $(LIBDIR)/$(LIBSO1) 2>/dev/null
34
 	ln -s $(LIBSO) $(LIBDIR)/$(LIBSO1)
35
+	ln -s $(LIBSO1) $(LIBDIR)/$(LIBSO2)
36
 
37
 test: mainsi
38
 	@./mainsi > mainsi.out
(-)b/devel/fungw/pkg-descr (+22 lines)
Added Link Here
1
Fungw is a tiny, portable library written in C (C89) that manages
2
dynamic function calls across different programming languages.  For
3
this, fungw provides:
4
5
 - a simplistic scalar data type abstraction, supporting the most common types
6
 - semi-automatic conversion between data types
7
 - contexts that can host objects; objects can host named functions
8
 - a set of optional language bindings to the most popular scripting languages
9
10
The main use of fungw is to provide the host application a framework
11
where dynamic parts of the code (e.g. plugins) can register their calls,
12
allowing app-plugin, plugin-app, and plugin-plugin calls.
13
14
The second main use is doing all this in a language-agnostic way: any
15
part of the code can be implemented in any of the numerous supported
16
scripting languages (such as awk or lua).  The caller of a function
17
doesn't need to know what language the function is implemented in.
18
19
The main property of fungw is simplicity.  The only API between objects
20
is the plain old function call mechanism.
21
22
WWW: http://repo.hu/projects/fungw/
(-)b/devel/fungw/pkg-plist (-1 / +100 lines)
Added Link Here
0
- 
1
include/genht/hash.h
2
include/genht/ht.c
3
include/genht/ht.h
4
include/genht/ht_inlines.h
5
include/genht/ht_utils.h
6
include/genht/htip.h
7
include/genht/htpi.h
8
include/genht/htpp.h
9
include/genht/htsi.h
10
include/genht/htsp.h
11
include/genht/htss.h
12
include/genht/siphash24.h
13
include/genht/version.h
14
include/libfungw/fungw.h
15
include/libfungw/fungw_conv.h
16
include/libfungw/scconfig_hooks.h
17
lib/libfungw.so
18
lib/libfungw.so.1
19
lib/libfungw.so.1.2
20
lib/libfungw.so.1.2.1
21
lib/libfungw_c.a
22
lib/libfungw_c.so.1
23
lib/libfungw_c.so.1.2
24
lib/libfungw_c.so.1.2.1
25
lib/libfungw_cli.a
26
lib/libfungw_cli.so.1
27
lib/libfungw_cli.so.1.2
28
lib/libfungw_cli.so.1.2.1
29
%%DUKTAPE%%lib/libfungw_duktape.a
30
%%DUKTAPE%%lib/libfungw_duktape.so.1
31
%%DUKTAPE%%lib/libfungw_duktape.so.1.2
32
%%DUKTAPE%%lib/libfungw_duktape.so.1.2.1
33
lib/libfungw_fawk.a
34
lib/libfungw_fawk.so.1
35
lib/libfungw_fawk.so.1.2
36
lib/libfungw_fawk.so.1.2.1
37
%%LUA%%lib/libfungw_lua.a
38
%%LUA%%lib/libfungw_lua.so.1
39
%%LUA%%lib/libfungw_lua.so.1.2
40
%%LUA%%lib/libfungw_lua.so.1.2.1
41
%%PERL%%lib/libfungw_perl.a
42
%%PERL%%lib/libfungw_perl.so.1
43
%%PERL%%lib/libfungw_perl.so.1.2
44
%%PERL%%lib/libfungw_perl.so.1.2.1
45
%%PYTHON3%%lib/libfungw_python3.a
46
%%PYTHON3%%lib/libfungw_python3.so.1
47
%%PYTHON3%%lib/libfungw_python3.so.1.2
48
%%PYTHON3%%lib/libfungw_python3.so.1.2.1
49
%%TCL%%lib/libfungw_tcl.a
50
%%TCL%%lib/libfungw_tcl.so.1
51
%%TCL%%lib/libfungw_tcl.so.1.2
52
%%TCL%%lib/libfungw_tcl.so.1.2.1
53
lib/libgenht.a
54
lib/libgenht.so
55
lib/libgenht.so.1
56
lib/libgenht.so.1.1.2
57
lib/puplug/fungw_c.a
58
lib/puplug/fungw_c.mak
59
lib/puplug/fungw_c.pup
60
lib/puplug/fungw_c.so
61
lib/puplug/fungw_cli.a
62
lib/puplug/fungw_cli.mak
63
lib/puplug/fungw_cli.pup
64
lib/puplug/fungw_cli.so
65
%%DUKTAPE%%lib/puplug/fungw_duktape.a
66
%%DUKTAPE%%lib/puplug/fungw_duktape.mak
67
%%DUKTAPE%%lib/puplug/fungw_duktape.pup
68
%%DUKTAPE%%lib/puplug/fungw_duktape.so
69
lib/puplug/fungw_fawk.a
70
lib/puplug/fungw_fawk.mak
71
lib/puplug/fungw_fawk.pup
72
lib/puplug/fungw_fawk.so
73
%%LUA%%lib/puplug/fungw_lua.a
74
%%LUA%%lib/puplug/fungw_lua.mak
75
%%LUA%%lib/puplug/fungw_lua.pup
76
%%LUA%%lib/puplug/fungw_lua.so
77
%%PERL%%lib/puplug/fungw_perl.a
78
%%PERL%%lib/puplug/fungw_perl.mak
79
%%PERL%%lib/puplug/fungw_perl.pup
80
%%PERL%%lib/puplug/fungw_perl.so
81
%%PYTHON3%%lib/puplug/fungw_python3.a
82
%%PYTHON3%%lib/puplug/fungw_python3.mak
83
%%PYTHON3%%lib/puplug/fungw_python3.pup
84
%%PYTHON3%%lib/puplug/fungw_python3.so
85
%%TCL%%lib/puplug/fungw_tcl.a
86
%%TCL%%lib/puplug/fungw_tcl.mak
87
%%TCL%%lib/puplug/fungw_tcl.pup
88
%%TCL%%lib/puplug/fungw_tcl.so
89
%%PORTDOCS%%%%DOCSDIR%%/TODO
90
%%PORTDOCS%%%%DOCSDIR%%/custom_types.txt
91
%%PORTDOCS%%%%DOCSDIR%%/index.html
92
%%PORTDOCS%%%%DOCSDIR%%/lang.html
93
%%PORTDOCS%%%%DOCSDIR%%/lang_estutter.html
94
%%PORTDOCS%%%%DOCSDIR%%/lang_funlisp.html
95
%%PORTDOCS%%%%DOCSDIR%%/lang_howto_support.html
96
%%PORTDOCS%%%%DOCSDIR%%/lang_lua.html
97
%%PORTDOCS%%%%DOCSDIR%%/lang_perl.html
98
%%PORTDOCS%%%%DOCSDIR%%/lang_python.html
99
%%PORTDOCS%%%%DOCSDIR%%/lang_sh.html
100
%%PORTDOCS%%%%DOCSDIR%%/model.html

Return to bug 263819