diff --git a/Mk/Uses/lua.mk b/Mk/Uses/lua.mk index 8fb0317e..fddef47b 100644 --- a/Mk/Uses/lua.mk +++ b/Mk/Uses/lua.mk @@ -79,13 +79,13 @@ _LUA_WANTED_VERSION:= ${_LUA_HIGHEST_VERSION} # LUA_VER_STR= ${_LUA_WANTED_VERSION} LUA_VER= ${_LUA_WANTED_VERSION:S/5/5./} -LUA_CMD= lua${_LUA_WANTED_VERSION} -LUAC_CMD= luac${_LUA_WANTED_VERSION} -LUA_INCDIR= ${LOCALBASE}/include/lua${_LUA_WANTED_VERSION} +LUA_CMD= lua${LUA_VER} +LUAC_CMD= luac${LUA_VER} +LUA_INCDIR= ${LOCALBASE}/include/lua/${LUA_VER} LUA_MODLIBDIR= ${LOCALBASE}/lib/lua/${LUA_VER} LUA_MODSHAREDIR= ${LOCALBASE}/share/lua/${LUA_VER} LUA_LIBDIR= ${LOCALBASE}/lib -LUA_PKGNAMEPREFIX= lua${LUA_VER_STR}- +LUA_PKGNAMEPREFIX= lua${LUA_VER_STR} PLIST_SUB+= LUA_MODLIBDIR=${LUA_MODLIBDIR:S,^${LOCALBASE}/,,} \ LUA_MODSHAREDIR=${LUA_MODSHAREDIR:S,^${LOCALBASE}/,,} \ @@ -104,7 +104,7 @@ BUILD_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR} .elif ${lua_ARGS:Mrun} RUN_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR} .else -LIB_DEPENDS+= liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR} +LIB_DEPENDS+= liblua${LUA_VER}.so:lang/lua${LUA_VER_STR} .endif .endif diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index dd80634a..fc93082a 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -63,7 +63,7 @@ LINUX_DEFAULT?= c6 # bumping the LLVM version. LLVM_DEFAULT?= 80 # Possible values: 5.1, 5.2, 5.3 -LUA_DEFAULT?= 5.2 +LUA_DEFAULT?= 5.3 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 10.3m, 5.5p, 5.6p, 5.7p, 5.6w MYSQL_DEFAULT?= 5.7 # Possible values: 5.26, 5.28, 5.30, devel diff --git a/Mk/bsd.ocaml.mk b/Mk/bsd.ocaml.mk index 7b981354..b55deaef 100644 --- a/Mk/bsd.ocaml.mk +++ b/Mk/bsd.ocaml.mk @@ -64,7 +64,7 @@ OCAML_SITELIBDIR?= ${OCAML_LIBDIR}/site-lib # # OCaml compiler port dependency # -OCAMLC_PORT?= lang/ocaml +OCAMLC_PORT?= lang/ocaml410 OCAMLC_DEPEND?= ${OCAMLC}:${OCAMLC_PORT} # diff --git a/lang/lua53/Makefile b/lang/lua53/Makefile index fb8b8a38..e0162330 100644 --- a/lang/lua53/Makefile +++ b/lang/lua53/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= 53 MAINTAINER= russ.haley@gmail.com COMMENT= Powerful, efficient, lightweight, embeddable scripting language -LUA_VER= #53 +LUA_VER= 5.3 USE_LDCONFIG= yes MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} @@ -19,7 +19,7 @@ LUA_PREFIX= ${PREFIX} LUA_CMD= lua${LUA_VER} LUAC_CMD= luac${LUA_VER} -LUA_INCDIR= ${LUA_PREFIX}/include/lua${LUA_VER} +LUA_INCDIR= ${LUA_PREFIX}/include/lua/${LUA_VER} LUA_LIBDIR= ${LUA_PREFIX}/lib LUA_LIB_STATIC= liblua${LUA_VER}.a @@ -37,8 +37,8 @@ ALL_TARGET=bsd #CPPFLAGS= -DLUA_USE_READLINE #LIBS= -ledit -#CPPFLAGS+= -DLUA_USE_READLINE -#LIBS+= -lreadline -L${LOCALBASE}/lib +CPPFLAGS+= -DLUA_USE_READLINE +LIBS+= -lreadline -L${LOCALBASE}/lib CFLAGS+= -fPIC -I${LOCALBASE}/include #NO_STRICT_ALIASING=yes MAKE_ARGS+= CC="${CC}" @@ -74,11 +74,15 @@ SUB_LIST+= SONAME=lua${LUA_VER} post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${LUA_LIB_SHARED} - ${MV} ${STAGEDIR}${PREFIX}/man/man1/lua.1 \ - ${STAGEDIR}${PREFIX}/man/man1/${LUA_CMD}.1 - ${MV} ${STAGEDIR}${PREFIX}/man/man1/luac.1 \ - ${STAGEDIR}${PREFIX}/man/man1/${LUAC_CMD}.1 - ${INSTALL_DATA} ${WRKDIR}/${LUA_PC_FILE} \ - ${STAGEDIR}${PREFIX}/lib/pkgconfig/ + ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/man/man1/lua.1 ${STAGEDIR}${PREFIX}/man/man1/${LUA_CMD}.1 + ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/man/man1/luac.1 ${STAGEDIR}${PREFIX}/man/man1/${LUAC_CMD}.1 + cd ${STAGEDIR}${PREFIX}/man/man1 && ${LN} -sf lua${LUA_VER}.1 lua.1 + cd ${STAGEDIR}${PREFIX}/man/man1 && ${LN} -sf luac${LUA_VER}.1 luac.1 + ${MKDIR} -p ${STAGEDIR}${PREFIX}/lib/pkgconfig + ${INSTALL_DATA} ${WRKDIR}/${LUA_PC_FILE} ${STAGEDIR}${PREFIX}/lib/pkgconfig/ + cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf liblua${LUA_VER}.so.0 liblua${LUA_VER}.so + cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf lua${LUA_VER} lua + cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf luac${LUA_VER} luac + .include diff --git a/lang/lua53/pkg-plist b/lang/lua53/pkg-plist index ec990379..d1ef628c 100644 --- a/lang/lua53/pkg-plist +++ b/lang/lua53/pkg-plist @@ -1,13 +1,19 @@ bin/lua +bin/lua5.3 bin/luac -include/lua/lauxlib.h -include/lua/lua.h -include/lua/lua.hpp -include/lua/luaconf.h -include/lua/lualib.h -lib/liblua.a -lib/liblua.so.0 -lib/pkgconfig/lua.pc +bin/luac5.3 +include/lua/5.3/lauxlib.h +include/lua/5.3/lua.h +include/lua/5.3/lua.hpp +include/lua/5.3/luaconf.h +include/lua/5.3/lualib.h +lib/liblua5.3.a +lib/liblua5.3.so +lib/liblua5.3.so.0 +lib/pkgconfig/lua5.3.pc man/man1/lua.1.gz +man/man1/lua5.3.1.gz man/man1/luac.1.gz +man/man1/luac5.3.1.gz +@dir include/lua/5.3 @dir include/lua diff --git a/_alpha/ocaml405/Makefile b/lang/ocaml405/Makefile similarity index 100% rename from _alpha/ocaml405/Makefile rename to lang/ocaml405/Makefile diff --git a/_alpha/ocaml405/distinfo b/lang/ocaml405/distinfo similarity index 100% rename from _alpha/ocaml405/distinfo rename to lang/ocaml405/distinfo diff --git a/_alpha/ocaml405/files/extra-patch-asmcomp_power_arch.ml b/lang/ocaml405/files/extra-patch-asmcomp_power_arch.ml similarity index 100% rename from _alpha/ocaml405/files/extra-patch-asmcomp_power_arch.ml rename to lang/ocaml405/files/extra-patch-asmcomp_power_arch.ml diff --git a/_alpha/ocaml405/files/patch-asmrun_power.S b/lang/ocaml405/files/patch-asmrun_power.S similarity index 100% rename from _alpha/ocaml405/files/patch-asmrun_power.S rename to lang/ocaml405/files/patch-asmrun_power.S diff --git a/_alpha/ocaml405/files/patch-byterun_caml_stack.h b/lang/ocaml405/files/patch-byterun_caml_stack.h similarity index 100% rename from _alpha/ocaml405/files/patch-byterun_caml_stack.h rename to lang/ocaml405/files/patch-byterun_caml_stack.h diff --git a/_alpha/ocaml405/files/patch-configure b/lang/ocaml405/files/patch-configure similarity index 100% rename from _alpha/ocaml405/files/patch-configure rename to lang/ocaml405/files/patch-configure diff --git a/_alpha/ocaml405/files/patch-testsuite_tests_asmcomp_power.S b/lang/ocaml405/files/patch-testsuite_tests_asmcomp_power.S similarity index 100% rename from _alpha/ocaml405/files/patch-testsuite_tests_asmcomp_power.S rename to lang/ocaml405/files/patch-testsuite_tests_asmcomp_power.S diff --git a/_alpha/ocaml405/pkg-descr b/lang/ocaml405/pkg-descr similarity index 100% rename from _alpha/ocaml405/pkg-descr rename to lang/ocaml405/pkg-descr diff --git a/_alpha/ocaml405/pkg-plist b/lang/ocaml405/pkg-plist similarity index 100% rename from _alpha/ocaml405/pkg-plist rename to lang/ocaml405/pkg-plist diff --git a/_alpha/ocaml410/Makefile b/lang/ocaml410/Makefile similarity index 100% rename from _alpha/ocaml410/Makefile rename to lang/ocaml410/Makefile diff --git a/_alpha/ocaml410/distinfo b/lang/ocaml410/distinfo similarity index 100% rename from _alpha/ocaml410/distinfo rename to lang/ocaml410/distinfo diff --git a/_alpha/ocaml410/files/_patch-asmrun_power.S b/lang/ocaml410/files/_patch-asmrun_power.S similarity index 100% rename from _alpha/ocaml410/files/_patch-asmrun_power.S rename to lang/ocaml410/files/_patch-asmrun_power.S diff --git a/_alpha/ocaml410/files/_patch-byterun_caml_stack.h b/lang/ocaml410/files/_patch-byterun_caml_stack.h similarity index 100% rename from _alpha/ocaml410/files/_patch-byterun_caml_stack.h rename to lang/ocaml410/files/_patch-byterun_caml_stack.h diff --git a/_alpha/ocaml410/files/_patch-configure b/lang/ocaml410/files/_patch-configure similarity index 100% rename from _alpha/ocaml410/files/_patch-configure rename to lang/ocaml410/files/_patch-configure diff --git a/_alpha/ocaml410/files/_patch-testsuite_tests_asmcomp_power.S b/lang/ocaml410/files/_patch-testsuite_tests_asmcomp_power.S similarity index 100% rename from _alpha/ocaml410/files/_patch-testsuite_tests_asmcomp_power.S rename to lang/ocaml410/files/_patch-testsuite_tests_asmcomp_power.S diff --git a/_alpha/ocaml410/files/extra-patch-asmcomp_power_arch.ml b/lang/ocaml410/files/extra-patch-asmcomp_power_arch.ml similarity index 100% rename from _alpha/ocaml410/files/extra-patch-asmcomp_power_arch.ml rename to lang/ocaml410/files/extra-patch-asmcomp_power_arch.ml diff --git a/_alpha/ocaml410/files/patch-x-configure.ac b/lang/ocaml410/files/patch-x-configure.ac similarity index 100% rename from _alpha/ocaml410/files/patch-x-configure.ac rename to lang/ocaml410/files/patch-x-configure.ac diff --git a/_alpha/ocaml410/pkg-descr b/lang/ocaml410/pkg-descr similarity index 100% rename from _alpha/ocaml410/pkg-descr rename to lang/ocaml410/pkg-descr diff --git a/_alpha/ocaml410/pkg-plist b/lang/ocaml410/pkg-plist similarity index 100% rename from _alpha/ocaml410/pkg-plist rename to lang/ocaml410/pkg-plist diff --git a/system/vm-bhyve/Makefile b/system/vm-bhyve/Makefile index 444dbffb..43872d88 100644 --- a/system/vm-bhyve/Makefile +++ b/system/vm-bhyve/Makefile @@ -1,16 +1,13 @@ # $FreeBSD: head/sysutils/vm-bhyve/Makefile 420337 2016-08-17 11:49:08Z amdmi3 $ PORTNAME= vm-bhyve -PORTVERSION= 1.4.0 -DISTVERSIONPREFIX=v +PORTVERSION= 1.4.2 +#DISTVERSIONPREFIX=v CATEGORIES= sysutils MAINTAINER= churchers@gmail.com COMMENT= Management system for bhyve virtual machines -#OPTIONS_DEFINE= EXAMPLES -#EXAMPLES_DESC= Install example guest templates - USE_GITHUB= yes GH_ACCOUNT= churchers diff --git a/system/vm-bhyve/distinfo b/system/vm-bhyve/distinfo index 08e9e7fc..6e5b9139 100644 --- a/system/vm-bhyve/distinfo +++ b/system/vm-bhyve/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1580048634 -SHA256 (churchers-vm-bhyve-v1.4.0_GH0.tar.gz) = b9fb823b7f1ee39bf812a9479a4e31c011607ad4a9b28302f6524fe0aed5dd93 -SIZE (churchers-vm-bhyve-v1.4.0_GH0.tar.gz) = 73222 +TIMESTAMP = 1594108159 +SHA256 (churchers-vm-bhyve-1.4.2_GH0.tar.gz) = 70c6033c046f69d7a05e752c2eccc53736d000f299dbe872bbfbdc0f43f0227b +SIZE (churchers-vm-bhyve-1.4.2_GH0.tar.gz) = 73257 diff --git a/xapp/purple-telegram/Makefile b/xapp/purple-telegram/Makefile index bdd88a64..1ff77f9d 100644 --- a/xapp/purple-telegram/Makefile +++ b/xapp/purple-telegram/Makefile @@ -2,7 +2,7 @@ # $FreeBSD: head/net-im/telegram-purple/Makefile 517179 2019-11-10 05:58:18Z linimon $ PORTNAME= telegram-purple -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.3 DISTVERSIONPREFIX= v CATEGORIES= net-im @@ -13,12 +13,16 @@ BROKEN_armv6= fails to link: undefined reference to 'backtrace' BROKEN_powerpc64= fails to compile: Assertion failed: (get_int () == TLS_SCHEMA_V2), function parse_tlo_file, file generate.c, line 2832. BROKEN_sparc64= fails to compile: assertion fails -LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libwebp.so:graphics/webp \ - libpurple.so:net-im/libpurple \ - libpng.so:graphics/png +LIB_DEPENDS+= libffi.so:devel/libffi +LIB_DEPENDS+= libgcrypt.so:crypto/libgcrypt +LIB_DEPENDS+= libglib.so:devel/libglib +LIB_DEPENDS+= libpurple.so:xapp/pidgin +LIB_DEPENDS+= libxml2.so:text/libxml2 -USES= gettext gmake pkgconfig +LIB_DEPENDS+= libwebp.so:graph/libwebp +LIB_DEPENDS+= libpng16.so:graph/libpng + +USES= gmake pkgconfig GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib @@ -26,7 +30,8 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_GITHUB= yes GH_ACCOUNT= majn GH_PROJECT= tgl:tgl -GH_TAGNAME?= bec2e6d:tgl +#GH_TAGNAME?= bec2e6d:tgl +GH_TAGNAME?= cd7e3d7:tgl GH_SUBDIR= tgl:tgl post-install: diff --git a/xapp/purple-telegram/distinfo b/xapp/purple-telegram/distinfo index a75a5dc2..fad57655 100644 --- a/xapp/purple-telegram/distinfo +++ b/xapp/purple-telegram/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1558825174 -SHA256 (majn-telegram-purple-v1.4.1_GH0.tar.gz) = 2f5238f119bda71be2413854cd1f0242377d029b94a34456427a1cb7b37c6d24 -SIZE (majn-telegram-purple-v1.4.1_GH0.tar.gz) = 213171 -SHA256 (majn-tgl-bec2e6d_GH0.tar.gz) = 490559e80a6299b2ffc3da190e5af1cbcf08824c68e26c18f349654f04727d95 -SIZE (majn-tgl-bec2e6d_GH0.tar.gz) = 270087 +TIMESTAMP = 1595403236 +SHA256 (majn-telegram-purple-v1.4.3_GH0.tar.gz) = 1aa80620b3f76ccafae78b292ad8234ff7cc474474a9cb2c09e64e0c3c914995 +SIZE (majn-telegram-purple-v1.4.3_GH0.tar.gz) = 221455 +SHA256 (majn-tgl-cd7e3d7_GH0.tar.gz) = 5f37c090ca0dc74049d0fd81214a62ea580f1b8cc1e75ec9eb70d2f5b3cc582e +SIZE (majn-tgl-cd7e3d7_GH0.tar.gz) = 271635 diff --git a/xapp/purple-telegram/pkg-plist b/xapp/purple-telegram/pkg-plist index 269287e0..7571e7b6 100644 --- a/xapp/purple-telegram/pkg-plist +++ b/xapp/purple-telegram/pkg-plist @@ -8,6 +8,7 @@ share/locale/es/LC_MESSAGES/telegram-purple.mo share/locale/fr/LC_MESSAGES/telegram-purple.mo share/locale/it/LC_MESSAGES/telegram-purple.mo share/locale/nl/LC_MESSAGES/telegram-purple.mo +share/locale/nn/LC_MESSAGES/telegram-purple.mo share/locale/pl/LC_MESSAGES/telegram-purple.mo share/locale/pt_BR/LC_MESSAGES/telegram-purple.mo share/locale/ru/LC_MESSAGES/telegram-purple.mo @@ -16,6 +17,7 @@ share/locale/uk/LC_MESSAGES/telegram-purple.mo share/pixmaps/pidgin/protocols/16/telegram.png share/pixmaps/pidgin/protocols/22/telegram.png share/pixmaps/pidgin/protocols/48/telegram.png +@dir lib/purple @dir share/appdata @dir share/locale/bg/LC_MESSAGES @dir share/locale/bg @@ -33,6 +35,8 @@ share/pixmaps/pidgin/protocols/48/telegram.png @dir share/locale/it @dir share/locale/nl/LC_MESSAGES @dir share/locale/nl +@dir share/locale/nn/LC_MESSAGES +@dir share/locale/nn @dir share/locale/pl/LC_MESSAGES @dir share/locale/pl @dir share/locale/pt_BR/LC_MESSAGES