aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/fungw/Makefile36
-rw-r--r--devel/fungw/files/patch-MAKE164
-rw-r--r--devel/fungw/files/patch-Makefile64
-rw-r--r--devel/fungw/files/patch-doc_Makefile.in18
-rw-r--r--devel/fungw/files/patch-libfungw_Makefile.in25
-rw-r--r--devel/fungw/files/patch-libfungwbind_Makefile.in20
-rw-r--r--devel/fungw/files/patch-libfungwbind_Plugin.tmpasm25
-rw-r--r--devel/fungw/files/patch-regression_Makefile.in11
-rw-r--r--devel/fungw/files/patch-scconfig_src_scripts_find__duktape.c11
-rw-r--r--devel/fungw/files/patch-scconfig_src_scripts_find__lua.c11
-rw-r--r--devel/fungw/files/patch-src__3rd_genht_Makefile38
-rw-r--r--devel/fungw/pkg-descr2
-rw-r--r--devel/fungw/pkg-plist17
13 files changed, 180 insertions, 262 deletions
diff --git a/devel/fungw/Makefile b/devel/fungw/Makefile
index 78490cf65028..1c587b7fe6be 100644
--- a/devel/fungw/Makefile
+++ b/devel/fungw/Makefile
@@ -1,5 +1,6 @@
PORTNAME= fungw
DISTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.repo.hu/projects/fungw/releases/
@@ -9,6 +10,8 @@ COMMENT= C Function gateway for different programming languages
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
+LIB_DEPENDS= libgenht.so:devel/genht
+
USES= gmake tar:bz2
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
@@ -16,32 +19,23 @@ MAKE_ARGS+= PREFIX=${PREFIX}
BINARY_ALIAS= python=${PYTHON_CMD:Ufalse}
# unported extensions: estutter funlisp mawk mruby mujs picol python(2)
-OPTIONS_DEFINE= DOCS DUKTAPE LUA PERL PYTHON3 TCL
+OPTIONS_DEFINE= DOCS DUKTAPE LUA PERL PYTHON3 TCL
OPTIONS_DEFAULT= DUKTAPE LUA PERL PYTHON3 TCL
-OPTIONS_SUB= DUKTAPE LUA PERL PYTHON3 TCL
+OPTIONS_SUB= DUKTAPE LUA PERL PYTHON3 TCL
DUKTAPE_DESC= Javascript support through Duktape
DUKTAPE_LIB_DEPENDS= libduktape.so:lang/duktape-lib
-LUA_USES= lua:51
-PERL_USES= perl5
-PYTHON3_USES= python
-TCL_USES= tcl
-
-pre-configure-DUKTAPE-on:
- ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
- ${WRKSRC}/scconfig/src/scripts/find_duktape.c
-
-pre-configure-LUA-on:
- ${REINPLACE_CMD} \
- -e 's,%%LUA_INCDIR%%,${LUA_INCDIR},' \
- -e 's,%%LUA_LIBDIR%%,${LUA_LIBDIR},' \
- -e 's,%%LUA_VER%%,${LUA_VER},' \
- ${WRKSRC}/scconfig/src/scripts/find_lua.c
-
-# install the genht component
+DUKTAPE_CONFIGURE_ON= --cflags/libs/script/duktape=-I${LOCALBASE}/include \
+ --ldflags/libs/script/duktape=-L${LOCALBASE}/lib
+LUA_USES= lua:51
+LUA_CONFIGURE_ON= --cflags/libs/script/lua=-I${LUA_INCDIR} \
+ --ldflags/libs/script/lua=!'-L${LUA_LIBDIR} -llua-${LUA_VER}'
+PERL_USES= perl5
+PYTHON3_USES= python
+TCL_USES= tcl
+
post-install:
- (cd ${WRKSRC}/src_3rd/genht && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
+ [ '${STRIP}' = -s ] && ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfungw*.so.?
.include <bsd.port.mk>
diff --git a/devel/fungw/files/patch-MAKE b/devel/fungw/files/patch-MAKE
new file mode 100644
index 000000000000..9b30d60287b5
--- /dev/null
+++ b/devel/fungw/files/patch-MAKE
@@ -0,0 +1,164 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig 2021-04-04 05:53:11 UTC
++++ Makefile
+@@ -1,36 +1,36 @@ all:
+ 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
+--- doc/Makefile.in.orig 2022-01-01 09:41:21 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 2021-06-12 06:55:05 UTC
++++ libfungw/Makefile.in
+@@ -96,16 +96,16 @@ install:
+ $(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 2019-07-12 12:59:25 UTC
++++ libfungwbind/Makefile.in
+@@ -2,7 +2,7 @@ foreach /local/fungw/task in {all clean install linsta
+ 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 @@ foreach /local/fungw/n in /local/fungw/bindings_all
+
+ 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 2021-06-12 06:55:05 UTC
++++ libfungwbind/Plugin.tmpasm
+@@ -99,16 +99,16 @@ install:
+ $(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
+--- regression/Makefile.in.orig 2021-06-12 06:55:05 UTC
++++ regression/Makefile.in
+@@ -24,7 +24,7 @@ multicall: multicall.o $(LIB_FGW) $(ENGINES) $(LIBS)
+ 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
+
diff --git a/devel/fungw/files/patch-Makefile b/devel/fungw/files/patch-Makefile
deleted file mode 100644
index 5d377df31c93..000000000000
--- a/devel/fungw/files/patch-Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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
diff --git a/devel/fungw/files/patch-doc_Makefile.in b/devel/fungw/files/patch-doc_Makefile.in
deleted file mode 100644
index 08981ba8884a..000000000000
--- a/devel/fungw/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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"
-
- ~]
diff --git a/devel/fungw/files/patch-libfungw_Makefile.in b/devel/fungw/files/patch-libfungw_Makefile.in
deleted file mode 100644
index 5c93c7288505..000000000000
--- a/devel/fungw/files/patch-libfungw_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
diff --git a/devel/fungw/files/patch-libfungwbind_Makefile.in b/devel/fungw/files/patch-libfungwbind_Makefile.in
deleted file mode 100644
index 918811c12e42..000000000000
--- a/devel/fungw/files/patch-libfungwbind_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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}
-
diff --git a/devel/fungw/files/patch-libfungwbind_Plugin.tmpasm b/devel/fungw/files/patch-libfungwbind_Plugin.tmpasm
deleted file mode 100644
index 4bda3e843509..000000000000
--- a/devel/fungw/files/patch-libfungwbind_Plugin.tmpasm
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
diff --git a/devel/fungw/files/patch-regression_Makefile.in b/devel/fungw/files/patch-regression_Makefile.in
deleted file mode 100644
index f133afc79fde..000000000000
--- a/devel/fungw/files/patch-regression_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- regression/Makefile.in.orig 2022-05-06 13:43:42 UTC
-+++ regression/Makefile.in
-@@ -24,7 +24,7 @@ test_script: test_script.o hello.o $(LIB_FGW) $(ENGINE
- 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
-
diff --git a/devel/fungw/files/patch-scconfig_src_scripts_find__duktape.c b/devel/fungw/files/patch-scconfig_src_scripts_find__duktape.c
deleted file mode 100644
index 2ed12424c898..000000000000
--- a/devel/fungw/files/patch-scconfig_src_scripts_find__duktape.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- scconfig/src/scripts/find_duktape.c.orig 2022-05-06 14:34:12 UTC
-+++ scconfig/src/scripts/find_duktape.c
-@@ -44,7 +44,7 @@ int find_script_duktape(const char *name, int logdepth
- logdepth++;
-
- /* Look at the standard place */
-- if (try_icl(logdepth, "libs/script/duktape", test_c, NULL, NULL, "-lduktape -lm")) return 0;
-+ if (try_icl(logdepth, "libs/script/duktape", test_c, NULL, "-I%%LOCALBASE%%/include", "-L%%LOCALBASE%%/lib -lduktape -lm")) return 0;
-
- return try_fail(logdepth, "libs/script/duktape");
- }
diff --git a/devel/fungw/files/patch-scconfig_src_scripts_find__lua.c b/devel/fungw/files/patch-scconfig_src_scripts_find__lua.c
deleted file mode 100644
index 7c1bc5f6c943..000000000000
--- a/devel/fungw/files/patch-scconfig_src_scripts_find__lua.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- scconfig/src/scripts/find_lua.c.orig 2022-05-06 14:29:08 UTC
-+++ scconfig/src/scripts/find_lua.c
-@@ -48,7 +48,7 @@ int find_script_lua(const char *name, int logdepth, in
-
- /* Look at some standard places */
- /* TODO: do we need -ldl? */
-- if (try_icl(logdepth, "libs/script/lua", test_c, NULL, NULL, "-llua -llualib -lm")) return 0;
-+ if (try_icl(logdepth, "libs/script/lua", test_c, NULL, "-I%%LUA_INCDIR%%", "-L%%LUA_LIBDIR%% -llua-%%LUA_VER%%")) return 0;
-
- /* lualib doesn't exist in lua 5.1.1 */
- if (try_icl(logdepth, "libs/script/lua", test_c, NULL, NULL, "-llua -lm")) return 0;
diff --git a/devel/fungw/files/patch-src__3rd_genht_Makefile b/devel/fungw/files/patch-src__3rd_genht_Makefile
deleted file mode 100644
index 216e8b27145b..000000000000
--- a/devel/fungw/files/patch-src__3rd_genht_Makefile
+++ /dev/null
@@ -1,38 +0,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
diff --git a/devel/fungw/pkg-descr b/devel/fungw/pkg-descr
index 058d7f749d51..23db979faabc 100644
--- a/devel/fungw/pkg-descr
+++ b/devel/fungw/pkg-descr
@@ -19,4 +19,4 @@ doesn't need to know what language the function is implemented in.
The main property of fungw is simplicity. The only API between objects
is the plain old function call mechanism.
-WWW: http://repo.hu/projects/fungw/
+WWW: http://www.repo.hu/projects/fungw/
diff --git a/devel/fungw/pkg-plist b/devel/fungw/pkg-plist
index 154ac1487f19..b5be11e1ce46 100644
--- a/devel/fungw/pkg-plist
+++ b/devel/fungw/pkg-plist
@@ -1,16 +1,3 @@
-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
@@ -50,10 +37,6 @@ lib/libfungw_fawk.so.1.2.1
%%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