Attachment #235323 for bug #265285

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

Lines 1-5 Link Here

(-)b/devel/fungw/Makefile (-14 / +8 lines)
1	PORTNAME= fungw	1	PORTNAME= fungw
2	DISTVERSION= 1.2.1	2	DISTVERSION= 1.2.1
		3	PORTREVISION= 1
3	CATEGORIES= devel	4	CATEGORIES= devel
4	MASTER_SITES= http://www.repo.hu/projects/fungw/releases/	5	MASTER_SITES= http://www.repo.hu/projects/fungw/releases/
5		6
Lines 9-14 COMMENT= C Function gateway for different programming languages Link Here
9	LICENSE= LGPL21+	10	LICENSE= LGPL21+
10	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
11		12
		13	LIB_DEPENDS= libgenht.so:devel/genht
		14
12	USES= gmake tar:bz2	15	USES= gmake tar:bz2
13	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
14	HAS_CONFIGURE= yes	17	HAS_CONFIGURE= yes
Lines 23-47 OPTIONS_SUB= DUKTAPE LUA PERL PYTHON3 TCL Link Here
23	DUKTAPE_DESC= Javascript support through Duktape	26	DUKTAPE_DESC= Javascript support through Duktape
24		27
25	DUKTAPE_LIB_DEPENDS= libduktape.so:lang/duktape-lib	28	DUKTAPE_LIB_DEPENDS= libduktape.so:lang/duktape-lib
		29	DUKTAPE_CONFIGURE_ON= --cflags/libs/script/duktape=-I${LOCALBASE}/include \
		30	--ldflags/libs/script/duktape=-L${LOCALBASE}/lib
26	LUA_USES= lua:51	31	LUA_USES= lua:51
		32	LUA_CONFIGURE_ON= --cflags/libs/script/lua=-I${LUA_INCDIR} \
		33	--ldflags/libs/script/lua=!'-L${LUA_LIBDIR} -llua-${LUA_VER}'
27	PERL_USES= perl5	34	PERL_USES= perl5
28	PYTHON3_USES= python	35	PYTHON3_USES= python
29	TCL_USES= tcl	36	TCL_USES= tcl
30		37
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:	38	post-install:
44	(cd ${WRKSRC}/src_3rd/genht && ${SETENV} ${MAKE_ENV} \	39	[ '${STRIP}' = -s ] && ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfungw*.so.?
45	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
46		40
47	.include <bsd.port.mk>	41	.include <bsd.port.mk>




Index: Makefile
===================================================================
--- Makefile	(Revision 788)
+++ Makefile	(Revision 795)
@@ -1,36 +1,36 @@
 all:
-	cd libfungw && make all
-	cd libfungwbind && make all
-	cd regression && make all
-	cd doc && make all
+	cd libfungw && $(MAKE) all
+	cd libfungwbind && $(MAKE) all
+	cd regression && $(MAKE) all
+	cd doc && $(MAKE) all
 
 clean:
-	cd libfungw && make clean
-	cd libfungwbind && make clean
-	cd regression && make clean
-	cd doc && make clean
-	-cd src_3rd/genht && make clean
+	cd libfungw && $(MAKE) clean
+	cd libfungwbind && $(MAKE) clean
+	cd regression && $(MAKE) clean
+	cd doc && $(MAKE) clean
+	-cd src_3rd/genht && $(MAKE) clean
 
 distclean:
-	cd regression && make distclean
-	cd libfungw && make distclean
-	cd libfungwbind && make distclean
-	cd doc && make distclean
-	cd scconfig && make distclean
-	-cd src_3rd/genht && make clean
+	cd regression && $(MAKE) distclean
+	cd libfungw && $(MAKE) distclean
+	cd libfungwbind && $(MAKE) distclean
+	cd doc && $(MAKE) distclean
+	cd scconfig && $(MAKE) distclean
+	-cd src_3rd/genht && $(MAKE) clean
 
 install:
-	cd libfungw && make install
-	cd libfungwbind && make install
-	cd doc && make install
+	cd libfungw && $(MAKE) install
+	cd libfungwbind && $(MAKE) install
+	cd doc && $(MAKE) install
 
 
 linstall:
-	cd libfungw && make linstall
-	cd libfungwbind && make linstall
-	cd doc && make linstall
+	cd libfungw && $(MAKE) linstall
+	cd libfungwbind && $(MAKE) linstall
+	cd doc && $(MAKE) linstall
 
 uninstall:
-	cd libfungw && make uninstall
-	cd libfungwbind && make uninstall
-	cd doc && make uninstall
+	cd libfungw && $(MAKE) uninstall
+	cd libfungwbind && $(MAKE) uninstall
+	cd doc && $(MAKE) uninstall
Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in	(Revision 788)
+++ doc/Makefile.in	(Revision 795)
@@ -32,12 +32,12 @@
 	$(INST) -d $(DOCS) $(DOCDIR)
 
 install:
-	make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
+	$(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
 
 linstall:
-	make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
+	$(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
 
 uninstall:
-	make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
+	$(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
 
 ~]
Index: libfungw/Makefile.in
===================================================================
--- libfungw/Makefile.in	(Revision 788)
+++ libfungw/Makefile.in	(Revision 795)
@@ -96,16 +96,16 @@
 	$(SCCBOX) $(HOW) $(FUNGW_DYN_VER_XYZ) $(LIBDIR)/$(FUNGW_DYN_VER_XY)
 
 install:
-	make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
-	make install_link_ "HOW=ln -f"
+	$(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
+	$(MAKE) install_link_ "HOW=ln -f"
 
 linstall:
-	make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
-	make install_link_ "HOW=ln -f"
+	$(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
+	$(MAKE) install_link_ "HOW=ln -f"
 
 uninstall:
-	make install_link_ "HOW=install -u"
-	make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
+	$(MAKE) install_link_ "HOW=install -u"
+	$(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
 
 dep:
 	echo "### Generated file, do not edit, run make dep ###" > Makefile.dep
Index: libfungwbind/Makefile.in
===================================================================
--- libfungwbind/Makefile.in	(Revision 788)
+++ libfungwbind/Makefile.in	(Revision 795)
@@ -2,7 +2,7 @@
 foreach /local/fungw/task in {all clean install linstall uninstall}
 	print [~~/local/fungw/task~:~] {\n}
 	foreach /local/fungw/n in /local/fungw/bindings_all
-		print	[~	cd ~/local/fungw/n~ && make ~/local/fungw/task~~] {\n}
+		print	[~	cd ~/local/fungw/n~ && $(MAKE) ~/local/fungw/task~~] {\n}
 	end
 	print {\n}
 end
@@ -10,7 +10,7 @@
 
 print {distclean:\n}
 foreach /local/fungw/n in /local/fungw/bindings_all
-	print	[~	cd ~/local/fungw/n~ && make distclean~] {\n}
+	print	[~	cd ~/local/fungw/n~ && $(MAKE) distclean~] {\n}
 end
 print {	rm libfungwbind.mak Makefile\n}
 
Index: libfungwbind/Plugin.tmpasm
===================================================================
--- libfungwbind/Plugin.tmpasm	(Revision 788)
+++ libfungwbind/Plugin.tmpasm	(Revision 795)
@@ -99,16 +99,16 @@
 	$(SCCBOX) install $(IOP) --relative $(LIBDIR)/lib$(LIBSO_XYZ) $(LIBDIR)/lib$(LIBSO_X)
 
 install:
-	make install_ IOP="-i"
-	make install_link IOP="-l"
+	$(MAKE) install_ IOP="-i"
+	$(MAKE) install_link IOP="-l"
 
 linstall:
-	make install_ IOP="-l"
-	make install_link IOP="-l"
+	$(MAKE) install_ IOP="-l"
+	$(MAKE) install_link IOP="-l"
 
 uninstall:
-	make install_link IOP="-u"
-	make install_ IOP="-u"
+	$(MAKE) install_link IOP="-u"
+	$(MAKE) install_ IOP="-u"
 ~]
 
 redir /local/fungw/mod_mak
Index: regression/Makefile.in
===================================================================
--- regression/Makefile.in	(Revision 788)
+++ regression/Makefile.in	(Revision 795)
@@ -24,7 +24,7 @@
 multicall: multicall.o $(LIB_FGW) $(ENGINES) $(LIBS)
 
 ../src_3rd/genht/genht_std.a:
-	cd ../src_3rd/genht && make genht_std.a
+	cd ../src_3rd/genht && $(MAKE) genht_std.a
 
 test.o: test.c
 




--- Makefile.orig	2021-04-04 05:53:11 UTC
+++ Makefile
@@ -1,36 +1,37 @@
 all:
-	cd libfungw && make all
-	cd libfungwbind && make all
-	cd regression && make all
-	cd doc && make all
+	cd libfungw && $(MAKE) all
+	cd libfungwbind && $(MAKE) all
+	cd regression && $(MAKE) all
+	cd doc && $(MAKE) all
+	cd src_3rd/genht && $(MAKE) all
 
 clean:
-	cd libfungw && make clean
-	cd libfungwbind && make clean
-	cd regression && make clean
-	cd doc && make clean
-	-cd src_3rd/genht && make clean
+	cd libfungw && $(MAKE) clean
+	cd libfungwbind && $(MAKE) clean
+	cd regression && $(MAKE) clean
+	cd doc && $(MAKE) clean
+	-cd src_3rd/genht && $(MAKE) clean
 
 distclean:
-	cd regression && make distclean
-	cd libfungw && make distclean
-	cd libfungwbind && make distclean
-	cd doc && make distclean
-	cd scconfig && make distclean
-	-cd src_3rd/genht && make clean
+	cd regression && $(MAKE) distclean
+	cd libfungw && $(MAKE) distclean
+	cd libfungwbind && $(MAKE) distclean
+	cd doc && $(MAKE) distclean
+	cd scconfig && $(MAKE) distclean
+	-cd src_3rd/genht && $(MAKE) clean
 
 install:
-	cd libfungw && make install
-	cd libfungwbind && make install
-	cd doc && make install
+	cd libfungw && $(MAKE) install
+	cd libfungwbind && $(MAKE) install
+	cd doc && $(MAKE) install
 
 
 linstall:
-	cd libfungw && make linstall
-	cd libfungwbind && make linstall
-	cd doc && make linstall
+	cd libfungw && $(MAKE) linstall
+	cd libfungwbind && $(MAKE) linstall
+	cd doc && $(MAKE) linstall
 
 uninstall:
-	cd libfungw && make uninstall
-	cd libfungwbind && make uninstall
-	cd doc && make uninstall
+	cd libfungw && $(MAKE) uninstall
+	cd libfungwbind && $(MAKE) uninstall
+	cd doc && $(MAKE) uninstall




--- doc/Makefile.in.orig	2022-05-06 13:43:13 UTC
+++ doc/Makefile.in
@@ -32,12 +32,12 @@ install_:
 	$(INST) -d $(DOCS) $(DOCDIR)
 
 install:
-	make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
+	$(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
 
 linstall:
-	make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
+	$(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
 
 uninstall:
-	make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
+	$(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
 
 ~]




--- libfungw/Makefile.in.orig	2022-05-06 13:42:01 UTC
+++ libfungw/Makefile.in
@@ -96,16 +96,16 @@ install_link_:
 	$(SCCBOX) $(HOW) $(FUNGW_DYN_VER_XYZ) $(LIBDIR)/$(FUNGW_DYN_VER_XY)
 
 install:
-	make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
-	make install_link_ "HOW=ln -f"
+	$(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
+	$(MAKE) install_link_ "HOW=ln -f"
 
 linstall:
-	make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
-	make install_link_ "HOW=ln -f"
+	$(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
+	$(MAKE) install_link_ "HOW=ln -f"
 
 uninstall:
-	make install_link_ "HOW=install -u"
-	make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
+	$(MAKE) install_link_ "HOW=install -u"
+	$(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
 
 dep:
 	echo "### Generated file, do not edit, run make dep ###" > Makefile.dep




--- libfungwbind/Makefile.in.orig	2022-05-06 13:42:28 UTC
+++ libfungwbind/Makefile.in
@@ -2,7 +2,7 @@ print {# Generated by ./configure - DO NOT EDIT\n\n}
 foreach /local/fungw/task in {all clean install linstall uninstall}
 	print [~~/local/fungw/task~:~] {\n}
 	foreach /local/fungw/n in /local/fungw/bindings_all
-		print	[~	cd ~/local/fungw/n~ && make ~/local/fungw/task~~] {\n}
+		print	[~	cd ~/local/fungw/n~ && $(MAKE) ~/local/fungw/task~~] {\n}
 	end
 	print {\n}
 end
@@ -10,7 +10,7 @@ end
 
 print {distclean:\n}
 foreach /local/fungw/n in /local/fungw/bindings_all
-	print	[~	cd ~/local/fungw/n~ && make distclean~] {\n}
+	print	[~	cd ~/local/fungw/n~ && $(MAKE) distclean~] {\n}
 end
 print {	rm libfungwbind.mak Makefile\n}
 




--- libfungwbind/Plugin.tmpasm.orig	2022-05-06 14:46:15 UTC
+++ libfungwbind/Plugin.tmpasm
@@ -99,16 +99,16 @@ install_link: $(LIBA) $(LIBSO)
 	$(SCCBOX) install $(IOP) --relative $(LIBDIR)/lib$(LIBSO_XYZ) $(LIBDIR)/lib$(LIBSO_X)
 
 install:
-	make install_ IOP="-i"
-	make install_link IOP="-l"
+	$(MAKE) install_ IOP="-i"
+	$(MAKE) install_link IOP="-l"
 
 linstall:
-	make install_ IOP="-l"
-	make install_link IOP="-l"
+	$(MAKE) install_ IOP="-l"
+	$(MAKE) install_link IOP="-l"
 
 uninstall:
-	make install_link IOP="-u"
-	make install_ IOP="-u"
+	$(MAKE) install_link IOP="-u"
+	$(MAKE) install_ IOP="-u"
 ~]
 
 redir /local/fungw/mod_mak

Removed Link Here

(-)a/devel/fungw/files/patch-regression_Makefile.in (-11 lines)
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

Removed Link Here

(-)a/devel/fungw/files/patch-scconfig_src_scripts_find__duktape.c (-11 lines)
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	}

Removed Link Here

(-)a/devel/fungw/files/patch-scconfig_src_scripts_find__lua.c (-11 lines)
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;




--- src_3rd/genht/Makefile.orig	2021-07-19 16:13:28 UTC
+++ src_3rd/genht/Makefile
@@ -17,6 +17,7 @@ BIN=mainsi
 OBJS=htss.o htsp.o htsi.o htip.o htpp.o htpi.o hash.o siphash24.o
 LIBSO=libgenht.so.$(VER)
 LIBSO1=libgenht.so.$(VER_MAJOR)
+LIBSO2=libgenht.so
 LIBA=libgenht.a
 
 all: version.h $(BIN) $(OBJS) $(LIBA) $(LIBSO)
@@ -34,7 +35,7 @@ mainsi: mainsi.o htsi.o
 	$(CC) -o $@ mainsi.o htsi.o $(LDFLAGS)
 
 $(LIBSO): $(OBJS)
-	$(CC) $(LDFLAGS) -shared -dynamic -rdynamic -o $@ $(OBJS)
+	$(CC) $(LDFLAGS) -shared -dynamic -rdynamic -Wl,-soname,$(LIBSO1) -o $@ $(OBJS)
 
 $(LIBA): $(OBJS)
 	ar rvu $@ $(OBJS)
@@ -78,14 +79,16 @@ uninstall:
 	rm $(LIBDIR)/$(LIBSO) $(LIBDIR)/$(LIBA) $(LIBDIR)/$(LIBSO1)
 
 install:
-	make install_ CP="cp"
+	$(MAKE) install_ CP="cp"
 	-@rm $(LIBDIR)/$(LIBSO1) 2>/dev/null
 	ln -s $(LIBSO) $(LIBDIR)/$(LIBSO1)
+	ln -s $(LIBSO1) $(LIBDIR)/$(LIBSO2)
 
 linstall:
-	make install_ CP="ln -s"
+	$(MAKE) install_ CP="ln -s"
 	-@rm $(LIBDIR)/$(LIBSO1) 2>/dev/null
 	ln -s $(LIBSO) $(LIBDIR)/$(LIBSO1)
+	ln -s $(LIBSO1) $(LIBDIR)/$(LIBSO2)
 
 test: mainsi
 	@./mainsi > mainsi.out

Lines 19-22 doesn't need to know what language the function is implemented in. Link Here

(-)b/devel/fungw/pkg-descr (-1 / +1 lines)
19	The main property of fungw is simplicity. The only API between objects	19	The main property of fungw is simplicity. The only API between objects
20	is the plain old function call mechanism.	20	is the plain old function call mechanism.
21		21
22	WWW: http://repo.hu/projects/fungw/	22	WWW: http://www.repo.hu/projects/fungw/




include/genht/hash.h
include/genht/ht.c
include/genht/ht.h
include/genht/ht_inlines.h
include/genht/ht_utils.h
include/genht/htip.h
include/genht/htpi.h
include/genht/htpp.h
include/genht/htsi.h
include/genht/htsp.h
include/genht/htss.h
include/genht/siphash24.h
include/genht/version.h
include/libfungw/fungw.h
include/libfungw/fungw_conv.h
include/libfungw/scconfig_hooks.h

%%TCL%%lib/libfungw_tcl.so.1
%%TCL%%lib/libfungw_tcl.so.1.2
%%TCL%%lib/libfungw_tcl.so.1.2.1
lib/libgenht.a
lib/libgenht.so
lib/libgenht.so.1
lib/libgenht.so.1.1.2
lib/puplug/fungw_c.a
lib/puplug/fungw_c.mak
lib/puplug/fungw_c.pup
- 

Return to bug 265285

Added Link Here

(-)b/devel/fungw/files/patch-MAKE (+174 lines)
1	Index: Makefile
2	===================================================================
3	--- Makefile (Revision 788)
4	+++ Makefile (Revision 795)
5	@@ -1,36 +1,36 @@
6	all:
7	- cd libfungw && make all
8	- cd libfungwbind && make all
9	- cd regression && make all
10	- cd doc && make all
11	+ cd libfungw && $(MAKE) all
12	+ cd libfungwbind && $(MAKE) all
13	+ cd regression && $(MAKE) all
14	+ cd doc && $(MAKE) all
15
16	clean:
17	- cd libfungw && make clean
18	- cd libfungwbind && make clean
19	- cd regression && make clean
20	- cd doc && make clean
21	- -cd src_3rd/genht && make clean
22	+ cd libfungw && $(MAKE) clean
23	+ cd libfungwbind && $(MAKE) clean
24	+ cd regression && $(MAKE) clean
25	+ cd doc && $(MAKE) clean
26	+ -cd src_3rd/genht && $(MAKE) clean
27
28	distclean:
29	- cd regression && make distclean
30	- cd libfungw && make distclean
31	- cd libfungwbind && make distclean
32	- cd doc && make distclean
33	- cd scconfig && make distclean
34	- -cd src_3rd/genht && make clean
35	+ cd regression && $(MAKE) distclean
36	+ cd libfungw && $(MAKE) distclean
37	+ cd libfungwbind && $(MAKE) distclean
38	+ cd doc && $(MAKE) distclean
39	+ cd scconfig && $(MAKE) distclean
40	+ -cd src_3rd/genht && $(MAKE) clean
41
42	install:
43	- cd libfungw && make install
44	- cd libfungwbind && make install
45	- cd doc && make install
46	+ cd libfungw && $(MAKE) install
47	+ cd libfungwbind && $(MAKE) install
48	+ cd doc && $(MAKE) install
49
50
51	linstall:
52	- cd libfungw && make linstall
53	- cd libfungwbind && make linstall
54	- cd doc && make linstall
55	+ cd libfungw && $(MAKE) linstall
56	+ cd libfungwbind && $(MAKE) linstall
57	+ cd doc && $(MAKE) linstall
58
59	uninstall:
60	- cd libfungw && make uninstall
61	- cd libfungwbind && make uninstall
62	- cd doc && make uninstall
63	+ cd libfungw && $(MAKE) uninstall
64	+ cd libfungwbind && $(MAKE) uninstall
65	+ cd doc && $(MAKE) uninstall
66	Index: doc/Makefile.in
67	===================================================================
68	--- doc/Makefile.in (Revision 788)
69	+++ doc/Makefile.in (Revision 795)
70	@@ -32,12 +32,12 @@
71	$(INST) -d $(DOCS) $(DOCDIR)
72
73	install:
74	- make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
75	+ $(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
76
77	linstall:
78	- make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
79	+ $(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
80
81	uninstall:
82	- make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
83	+ $(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
84
85	~]
86	Index: libfungw/Makefile.in
87	===================================================================
88	--- libfungw/Makefile.in (Revision 788)
89	+++ libfungw/Makefile.in (Revision 795)
90	@@ -96,16 +96,16 @@
91	$(SCCBOX) $(HOW) $(FUNGW_DYN_VER_XYZ) $(LIBDIR)/$(FUNGW_DYN_VER_XY)
92
93	install:
94	- make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
95	- make install_link_ "HOW=ln -f"
96	+ $(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
97	+ $(MAKE) install_link_ "HOW=ln -f"
98
99	linstall:
100	- make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
101	- make install_link_ "HOW=ln -f"
102	+ $(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
103	+ $(MAKE) install_link_ "HOW=ln -f"
104
105	uninstall:
106	- make install_link_ "HOW=install -u"
107	- make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
108	+ $(MAKE) install_link_ "HOW=install -u"
109	+ $(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
110
111	dep:
112	echo "### Generated file, do not edit, run make dep ###" > Makefile.dep
113	Index: libfungwbind/Makefile.in
114	===================================================================
115	--- libfungwbind/Makefile.in (Revision 788)
116	+++ libfungwbind/Makefile.in (Revision 795)
117	@@ -2,7 +2,7 @@
118	foreach /local/fungw/task in {all clean install linstall uninstall}
119	print [~~/local/fungw/task~:~] {\n}
120	foreach /local/fungw/n in /local/fungw/bindings_all
121	- print [~ cd ~/local/fungw/n~ && make ~/local/fungw/task~~] {\n}
122	+ print [~ cd ~/local/fungw/n~ && $(MAKE) ~/local/fungw/task~~] {\n}
123	end
124	print {\n}
125	end
126	@@ -10,7 +10,7 @@
127
128	print {distclean:\n}
129	foreach /local/fungw/n in /local/fungw/bindings_all
130	- print [~ cd ~/local/fungw/n~ && make distclean~] {\n}
131	+ print [~ cd ~/local/fungw/n~ && $(MAKE) distclean~] {\n}
132	end
133	print { rm libfungwbind.mak Makefile\n}
134
135	Index: libfungwbind/Plugin.tmpasm
136	===================================================================
137	--- libfungwbind/Plugin.tmpasm (Revision 788)
138	+++ libfungwbind/Plugin.tmpasm (Revision 795)
139	@@ -99,16 +99,16 @@
140	$(SCCBOX) install $(IOP) --relative $(LIBDIR)/lib$(LIBSO_XYZ) $(LIBDIR)/lib$(LIBSO_X)
141
142	install:
143	- make install_ IOP="-i"
144	- make install_link IOP="-l"
145	+ $(MAKE) install_ IOP="-i"
146	+ $(MAKE) install_link IOP="-l"
147
148	linstall:
149	- make install_ IOP="-l"
150	- make install_link IOP="-l"
151	+ $(MAKE) install_ IOP="-l"
152	+ $(MAKE) install_link IOP="-l"
153
154	uninstall:
155	- make install_link IOP="-u"
156	- make install_ IOP="-u"
157	+ $(MAKE) install_link IOP="-u"
158	+ $(MAKE) install_ IOP="-u"
159	~]
160
161	redir /local/fungw/mod_mak
162	Index: regression/Makefile.in
163	===================================================================
164	--- regression/Makefile.in (Revision 788)
165	+++ regression/Makefile.in (Revision 795)
166	@@ -24,7 +24,7 @@
167	multicall: multicall.o $(LIB_FGW) $(ENGINES) $(LIBS)
168
169	../src_3rd/genht/genht_std.a:
170	- cd ../src_3rd/genht && make genht_std.a
171	+ cd ../src_3rd/genht && $(MAKE) genht_std.a
172
173	test.o: test.c
174

Removed Link Here

(-)a/devel/fungw/files/patch-Makefile (-64 lines)
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

Removed Link Here

(-)a/devel/fungw/files/patch-doc_Makefile.in (-18 lines)
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	~]

Removed Link Here

(-)a/devel/fungw/files/patch-libfungw_Makefile.in (-25 lines)
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

Removed Link Here

(-)a/devel/fungw/files/patch-libfungwbind_Makefile.in (-20 lines)
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

Removed Link Here

(-)a/devel/fungw/files/patch-libfungwbind_Plugin.tmpasm (-25 lines)
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

Removed Link Here

(-)a/devel/fungw/files/patch-src__3rd_genht_Makefile (-38 lines)
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

Lines 1-16 Link Here

(-)b/devel/fungw/pkg-plist (-18 lines)
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	1	include/libfungw/fungw.h
15	include/libfungw/fungw_conv.h	2	include/libfungw/fungw_conv.h
16	include/libfungw/scconfig_hooks.h	3	include/libfungw/scconfig_hooks.h
Lines 50-59 lib/libfungw_fawk.so.1.2.1 Link Here
50	%%TCL%%lib/libfungw_tcl.so.1	37	%%TCL%%lib/libfungw_tcl.so.1
51	%%TCL%%lib/libfungw_tcl.so.1.2	38	%%TCL%%lib/libfungw_tcl.so.1.2
52	%%TCL%%lib/libfungw_tcl.so.1.2.1	39	%%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	40	lib/puplug/fungw_c.a
58	lib/puplug/fungw_c.mak	41	lib/puplug/fungw_c.mak
59	lib/puplug/fungw_c.pup	42	lib/puplug/fungw_c.pup
60	-