Index: www/newmoon/Makefile =================================================================== --- www/newmoon/Makefile (nonexistent) +++ www/newmoon/Makefile (copie de travail) @@ -0,0 +1,205 @@ +# $FreeBSD$ +# Created by Olivier Certner + +PORTNAME= newmoon +DISTVERSION= 28.15.0 +# UXP_VERSION has to be updated according to DISTVERSION (see recorded commit +# of the 'platform' git sub-module and corresponding release in UXP/releases; +# see MASTER_SITES for base URLs). +UXP_VERSION= 20201024 +CATEGORIES= www +MASTER_SITES= https://repo.palemoon.org/MoonchildProductions/Pale-Moon/archive/:palemoon \ + https://repo.palemoon.org/MoonchildProductions/UXP/archive/:uxp +DISTFILES= ${DISTVERSION}_Release.tar.gz:palemoon \ + RELBASE_${UXP_VERSION}.tar.gz:uxp +DIST_SUBDIR= MoonchildProductions +WRKSRC= ${WRKDIR}/pale-moon + +MAINTAINER= olce.freebsd.ports@certner.fr +COMMENT= Open-source web browser mostly using Pale Moon(TM) code + +# Not sure about the real status of ARM, but only ARM packages of old versions of +# PM are available in some Linux distros. +ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS_REASON=Upstream only cares about i386/amd64 + +# Common deps & build options +BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \ + yasm:devel/yasm \ + zip:archivers/zip \ + +LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libdbus-glib-1.so:devel/dbus-glib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + +USES= dos2unix perl5 gmake gnome xorg desktop-file-utils +# This is purely so that the patch applied to this file on NO_UAOVERRIDES can +# be checked in cleanly into SVN. +DOS2UNIX_FILES= palemoon/branding/shared/pref/uaoverrides.inc +USE_PERL5= build +USE_GNOME= cairo gdkpixbuf2 glib20 pango +USE_XORG= xt x11 xcb xext xrender +# 9 is the last version endorsed upstream (and was the default in ports when +# this was written). Should ideally be bumped with GCC's default version, but +# *only if* validated by upstream (or thoroughly tested by us). Hence +# hardcoded. (For the record, building with clang produces malfunctioning +# executables.) +# NOTE: We make sure that there are no runtime dependencies to GCC. See +# [GCC-no-rdep-*] tags below. This should rather be solved in the ports +# infrastructure proper (see PR 211154; also, allowing to choose among C++ +# standard libraries, besides providing a common default, would be great). +USE_GCC= 9 + +# Put this here pending creation of USES=gtar +BUILD_DEPENDS+= gtar:archivers/gtar +BINARY_ALIAS+= tar=${LOCALBASE}/bin/gtar + +BUILD_DEPENDS+= tauthon:lang/tauthon +BINARY_ALIAS+= python=${LOCALBASE}/bin/tauthon \ + python2=${LOCALBASE}/bin/tauthon \ + python2.7=${LOCALBASE}/bin/tauthon + +BUNDLE_LIBS= yes + +# Options + +OPTIONS_SINGLE+= GUI +OPTIONS_SINGLE_GUI= GTK2 GTK3 +OPTIONS_DEFAULT+= GTK3 + +OPTIONS_SINGLE+= SOUND +OPTIONS_SINGLE_SOUND= ALSA PULSEAUDIO +OPTIONS_DEFAULT+= ALSA + +OPTIONS_DEFINE+= SYNC NO_UAOVERRIDES + +SYNC_DESC= Pale Moon Sync service (see https://www.palemoon.org/sync/) +NO_UAOVERRIDES_DESC= Deactivate default User Agent overrides (prefs renamed) + +GTK2_USE= gnome=gtk20,gconf2 +# XXX +# GTK3 needs gtk20 and gconf2 to pass old-configure (and maybe more). +# See also: https://repo.palemoon.org/MoonchildProductions/UXP/issues/1638. +GTK3_USE= gnome=gtk30,gtk20:build,gconf2:build + +OPTIONS_SUB= yes + +ALSA_BUILD_DEPENDS= ${PREFIX}/include/alsa/asoundlib.h:audio/alsa-lib +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +PULSEAUDIO_BUILD_DEPENDS=${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio + +NO_UAOVERRIDES_EXTRA_PATCHES= \ +${PATCHDIR}/no_uaoverrides_patch-palemoon_branding_shared_pref_uaoverrides.inc + +.include + +# Vars and targets + +# Have GCC link with libc++. Needed because some library dependencies (e.g., +# libgraphite2.so) are linked against libc++ already, and mixing both with this +# codebase results in instant executable crash. +# As advised here: +# https://libcxx.llvm.org/docs/UsingLibcxx.html#using-libc-with-gcc +# with the change of linking gcc statically, so that this port doesn't need +# to depend on GCC at all at runtime. [GCC-no-rdep-1] +# This is similar to what 'compiler.mk' does on using "gcc-c++11-lib". +CXXFLAGS+= -nostdinc++ -I/usr/include/c++/v1 -nodefaultlibs \ + -lc++ -lcxxrt -lm -lc -lgcc \ + -pthread -lpthread +LDFLAGS+= -lgcc + +DOT_MOZCONFIG= ${WRKSRC}/.mozconfig +PM_BUILD_DIR= ${WRKSRC}/pmbuild + +NEWMOON_DESKTOP=${WRKSRC}/palemoon/branding/unofficial/browser.desktop + +.if ${PORT_OPTIONS:MGTK3} +PM_GTK_VERSION:=3 +.else +PM_GTK_VERSION:=2 +.endif + +.if ${ARCH} == "amd64" +PM_BUILD_64=_BUILD_64=1 +.else +PM_BUILD_64= +.endif + +# Extract only -O options +PM_OPTIMIZE=${CFLAGS:M-O*} + +.for VAR in PM_BUILD_64 PM_GTK_VERSION PM_BUILD_DIR PM_OPTIMIZE +PM_MOZCONFIG_REINPLACE_ARGS+=-e 's!%%${VAR}%%!${${VAR}}!' +.endfor + + +# Taken from bsd.gecko.mk. See comment there. +.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE) +MAKE_JOBS_NUMBER= 1 +.endif +.if defined(MAKE_JOBS_NUMBER) +MOZ_MAKE_FLAGS+= -j${MAKE_JOBS_NUMBER} +.endif + + +post-extract: + ${RMDIR} ${WRKSRC}/platform + ${RLN} ${WRKDIR}/uxp ${WRKSRC}/platform + +# Prepare '.mozconfig' for 'configure' +pre-configure: + ${CP} ${FILESDIR}/dot.mozconfig ${DOT_MOZCONFIG} + ${REINPLACE_CMD} ${PM_MOZCONFIG_REINPLACE_ARGS} ${DOT_MOZCONFIG} +.if ${PORT_OPTIONS:MALSA} + ${ECHO_CMD} ac_add_options --enable-alsa >> ${DOT_MOZCONFIG} + ${ECHO_CMD} ac_add_options --disable-pulseaudio >> ${DOT_MOZCONFIG} +.endif +.if ! ${PORT_OPTIONS:MSYNC} + ${ECHO_CMD} ac_add_options --disable-sync >> ${DOT_MOZCONFIG} +.endif +# .if ${PORT_OPTIONS:MDEBUG} +# ${ECHO_CMD} ac_add_options --disable-strip >> ${DOT_MOZCONFIG} +# ${ECHO_CMD} ac_add_options --disable-install-strip >> ${DOT_MOZCONFIG} +# # Causes compile error +# # ${ECHO_CMD} ac_add_options --enable-debug >> ${DOT_MOZCONFIG} +# .endif +.if defined(MOZ_MAKE_FLAGS) + ${ECHO_CMD} mk_add_options MOZ_MAKE_FLAGS=${MOZ_MAKE_FLAGS:Q} \ + >> ${DOT_MOZCONFIG} +.endif +# Add build variables +.for VAR in CPP CXXCPP CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS \ + LD AS AR RANLIB OBJDUMP NM +.if defined(${VAR}) +# Remove -rpath options to GCC's directory [GCC-no-rdep-2] + ${ECHO_CMD} export ${VAR}=\"${${VAR}:N*-rpath*lib/gcc*}\" >> ${DOT_MOZCONFIG} +.endif +.endfor + +# Running 'mach configure' separately is "strongly discouraged" (see Mozilla's +# doc on build options configuration). Still, things seem to work correctly +# even with this separate step. +do-configure: + cd ${WRKSRC} && ${SETENV} PATH=${PATH} ./mach configure + +do-build: + cd ${WRKSRC} && ${SETENV} PATH=${PATH} ./mach build +# Going through the package route (the only one documented upstream) + cd ${WRKSRC} && ${SETENV} PATH=${PATH} ./mach package + +do-install: + ${TAR} -C ${STAGEDIR}${PREFIX}/lib \ + -xf ${PM_BUILD_DIR:Q}/dist/palemoon*.tar* \ + palemoon + ${RLN} ${STAGEDIR}${PREFIX}/lib/palemoon/palemoon \ + ${STAGEDIR}${PREFIX}/bin/palemoon + ${INSTALL_DATA} ${NEWMOON_DESKTOP} \ + ${STAGEDIR}${PREFIX}/share/applications/newmoon.desktop + ${RLN} ${STAGEDIR}${PREFIX}/lib/palemoon/browser/icons/mozicon128.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/palemoon.png + +.include +# [GCC-no-rdep-3] +RUN_DEPENDS:= ${RUN_DEPENDS:Ngcc*} Property changes on: www/newmoon/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/distinfo =================================================================== --- www/newmoon/distinfo (nonexistent) +++ www/newmoon/distinfo (copie de travail) @@ -0,0 +1,5 @@ +TIMESTAMP = 1604571428 +SHA256 (MoonchildProductions/28.15.0_Release.tar.gz) = 1475113c47c5a44539c402dba46e3ff15bc7cf6a6303cdb755408a01cdff9a65 +SIZE (MoonchildProductions/28.15.0_Release.tar.gz) = 8535322 +SHA256 (MoonchildProductions/RELBASE_20201024.tar.gz) = 4a4c7e1751527b5d0231590978f14e55d70d70a8c654c8766aeeaedca0af6b58 +SIZE (MoonchildProductions/RELBASE_20201024.tar.gz) = 299700681 Property changes on: www/newmoon/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/dot.mozconfig =================================================================== --- www/newmoon/files/dot.mozconfig (nonexistent) +++ www/newmoon/files/dot.mozconfig (copie de travail) @@ -0,0 +1,35 @@ +# Standard build options for Pale Moon +# See http://developer.palemoon.org/build/linux/ + +# The 'configure' ports step replaces %%VAR%% with content of Makefile's VAR +# and appends lines to this file. + +%%PM_BUILD_64%% +_GTK_VERSION=%%PM_GTK_VERSION%% +mk_add_options MOZ_OBJDIR=%%PM_BUILD_DIR%% + +ac_add_options --enable-application=palemoon +ac_add_options --enable-optimize="-w %%PM_OPTIMIZE%%" +ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION +# OlCe: Commented out. Old version of jemalloc calls pthread_mutex_init which +# now in FreeBSD calls back malloc... +#ac_add_options --enable-jemalloc +ac_add_options --enable-strip +ac_add_options --enable-devtools +ac_add_options --disable-eme +ac_add_options --disable-webrtc +ac_add_options --disable-gamepad +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-necko-wifi +ac_add_options --disable-updater +ac_add_options --with-pthreads +ac_add_options --enable-phoenix-extensions + +export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION + +# Don't bother compressing, mach's package is just intermediate file +export MOZ_PKG_FORMAT=TAR + +# Below this line, build options depending on port options, as well as make and +# build flags, will be appended. Property changes on: www/newmoon/files/dot.mozconfig ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/patch-platform_gfx_harfbuzz_src_hb-blob.cc =================================================================== --- www/newmoon/files/patch-platform_gfx_harfbuzz_src_hb-blob.cc (nonexistent) +++ www/newmoon/files/patch-platform_gfx_harfbuzz_src_hb-blob.cc (copie de travail) @@ -0,0 +1,15 @@ +--- ./platform/gfx/harfbuzz/src/hb-blob.cc ++++ ./platform/gfx/harfbuzz/src/hb-blob.cc +@@ -25,6 +25,8 @@ + */ + ++#ifndef __FreeBSD__ + /* http://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html */ + #ifndef _POSIX_C_SOURCE + #define _POSIX_C_SOURCE 199309L + #endif ++#endif + + #include "hb-private.hh" + + #include "hb-object-private.hh" Property changes on: www/newmoon/files/patch-platform_gfx_harfbuzz_src_hb-blob.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/patch-platform_ipc_chromium_src_third__party_libevent_evutil__rand.c =================================================================== --- www/newmoon/files/patch-platform_ipc_chromium_src_third__party_libevent_evutil__rand.c (nonexistent) +++ www/newmoon/files/patch-platform_ipc_chromium_src_third__party_libevent_evutil__rand.c (copie de travail) @@ -0,0 +1,11 @@ +--- ./platform/ipc/chromium/src/third_party/libevent/evutil_rand.c ++++ ./platform/ipc/chromium/src/third_party/libevent/evutil_rand.c +@@ -139,7 +139,7 @@ evutil_secure_rng_get_bytes(void *buf, size_t n) + ev_arc4random_buf(buf, n); + } + +-#if !defined(__OpenBSD__) && !defined(ANDROID) && !defined(__sun__) ++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) && !defined(__sun__) + void + evutil_secure_rng_add_bytes(const char *buf, size_t n) + { Property changes on: www/newmoon/files/patch-platform_ipc_chromium_src_third__party_libevent_evutil__rand.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/patch-platform_memory_mozjemalloc_jemalloc.c =================================================================== --- www/newmoon/files/patch-platform_memory_mozjemalloc_jemalloc.c (nonexistent) +++ www/newmoon/files/patch-platform_memory_mozjemalloc_jemalloc.c (copie de travail) @@ -0,0 +1,12 @@ +--- ./platform/memory/mozjemalloc/jemalloc.c ++++ ./platform/memory/mozjemalloc/jemalloc.c +@@ -174,6 +174,9 @@ + #endif + + #include ++#ifdef MOZ_MEMORY_BSD ++#include ++#endif + + #include + #include Property changes on: www/newmoon/files/patch-platform_memory_mozjemalloc_jemalloc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/patch-platform_python_mozbuild_mozbuild_configure___init__.py =================================================================== --- www/newmoon/files/patch-platform_python_mozbuild_mozbuild_configure___init__.py (nonexistent) +++ www/newmoon/files/patch-platform_python_mozbuild_mozbuild_configure___init__.py (copie de travail) @@ -0,0 +1,14 @@ +--- ./platform/python/mozbuild/mozbuild/configure/__init__.py~ 2020-10-24 10:42:23.000000000 +0000 ++++ ./platform/python/mozbuild/mozbuild/configure/__init__.py 2020-11-09 12:31:00.109014000 +0000 +@@ -192,8 +192,9 @@ + b: __builtins__[b] + for b in ('None', 'False', 'True', 'int', 'bool', 'any', 'all', 'len', + 'list', 'tuple', 'set', 'dict', 'isinstance', 'getattr', +- 'hasattr', 'enumerate', 'range', 'zip') +- }, __import__=forbidden_import, str=unicode) ++ 'hasattr', 'enumerate', 'range', 'zip', '__build_class__') ++ if b in __builtins__}, ++ __import__=forbidden_import, str=unicode) + + # Expose a limited set of functions from os.path + OS = ReadOnlyNamespace(path=ReadOnlyNamespace(**{ Property changes on: www/newmoon/files/patch-platform_python_mozbuild_mozbuild_configure___init__.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/patch-platform_python_mozbuild_mozbuild_frontend_sandbox.py =================================================================== --- www/newmoon/files/patch-platform_python_mozbuild_mozbuild_frontend_sandbox.py (nonexistent) +++ www/newmoon/files/patch-platform_python_mozbuild_mozbuild_frontend_sandbox.py (copie de travail) @@ -0,0 +1,14 @@ +--- ./platform/python/mozbuild/mozbuild/frontend/sandbox.py~ 2020-10-24 10:42:23.000000000 +0000 ++++ ./platform/python/mozbuild/mozbuild/frontend/sandbox.py 2020-11-09 12:38:55.634959000 +0000 +@@ -115,7 +115,10 @@ + def __init__(self, context, builtins=None, finder=default_finder): + """Initialize a Sandbox ready for execution. + """ +- self._builtins = builtins or self.BUILTINS ++ self._builtins = ReadOnlyDict( ++ (builtins or self.BUILTINS).viewitems() | ++ {b: __builtins__[b] for b in ('__build_class__',) ++ if b in __builtins__}.viewitems()) + dict.__setitem__(self, '__builtins__', self._builtins) + + assert isinstance(self._builtins, ReadOnlyDict) Property changes on: www/newmoon/files/patch-platform_python_mozbuild_mozbuild_frontend_sandbox.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/patch-platform_python_psutil_psutil___psutil__bsd.c =================================================================== --- www/newmoon/files/patch-platform_python_psutil_psutil___psutil__bsd.c (nonexistent) +++ www/newmoon/files/patch-platform_python_psutil_psutil___psutil__bsd.c (copie de travail) @@ -0,0 +1,245 @@ +--- ./platform/python/psutil/psutil/_psutil_bsd.c ++++ ./platform/python/psutil/psutil/_psutil_bsd.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -38,7 +39,7 @@ + #include // for TCP connection states + #include // for inet_ntop() + +-#if __FreeBSD_version < 900000 ++#if !defined(__FreeBSD_version) + #include // system users + #else + #include +@@ -601,11 +602,7 @@ psutil_virtual_mem(PyObject *self, PyObject *args) + struct vmtotal vm; + int mib[] = {CTL_VM, VM_METER}; + long pagesize = getpagesize(); +-#if __FreeBSD_version > 702101 + long buffers; +-#else +- int buffers; +-#endif + size_t buffers_size = sizeof(buffers); + + if (sysctlbyname("vm.stats.vm.v_page_count", &total, &size, NULL, 0)) +@@ -724,13 +721,13 @@ psutil_cpu_times(PyObject *self, PyObject *args) + + /* + * XXX +- * These functions are available on FreeBSD 8 only. ++ * These functions were seen available on FreeBSD only. + * In the upper python layer we do various tricks to avoid crashing + * and/or to provide alternatives where possible. + */ + + +-#if defined(__FreeBSD_version) && __FreeBSD_version >= 800000 ++#if defined(__FreeBSD_version) + /* + * Return files opened by process as a list of (path, fd) tuples. + * TODO: this is broken as it may report empty paths. 'procstat' +@@ -943,11 +940,19 @@ psutil_sockaddr_matches(int family, int port, void *pcb_addr, + psutil_sockaddr_addrlen(family)) == 0); + } + ++#if __FreeBSD_version >= 1200026 ++static struct xtcpcb * ++psutil_search_tcplist(char *buf, struct kinfo_file *kif) ++{ ++ struct xtcpcb *tp; ++ struct xinpcb *inp; ++#else + static struct tcpcb * + psutil_search_tcplist(char *buf, struct kinfo_file *kif) + { + struct tcpcb *tp; + struct inpcb *inp; ++#endif + struct xinpgen *xig, *oxig; + struct xsocket *so; + +@@ -955,9 +960,15 @@ psutil_search_tcplist(char *buf, struct kinfo_file *kif) + for (xig = (struct xinpgen *)((char *)xig + xig->xig_len); + xig->xig_len > sizeof(struct xinpgen); + xig = (struct xinpgen *)((char *)xig + xig->xig_len)) { ++#if __FreeBSD_version >= 1200026 ++ tp = (struct xtcpcb *)xig; ++ inp = &tp->xt_inp; ++ so = &inp->xi_socket; ++#else + tp = &((struct xtcpcb *)xig)->xt_tp; + inp = &((struct xtcpcb *)xig)->xt_inp; + so = &((struct xtcpcb *)xig)->xt_socket; ++#endif + + if (so->so_type != kif->kf_sock_type || + so->xso_family != kif->kf_sock_domain || +@@ -967,20 +978,36 @@ psutil_search_tcplist(char *buf, struct kinfo_file *kif) + if (kif->kf_sock_domain == AF_INET) { + if (!psutil_sockaddr_matches( + AF_INET, inp->inp_lport, &inp->inp_laddr, ++#if __FreeBSD_version < 1200031 + &kif->kf_sa_local)) ++#else ++ &kif->kf_un.kf_sock.kf_sa_local)) ++#endif + continue; + if (!psutil_sockaddr_matches( + AF_INET, inp->inp_fport, &inp->inp_faddr, ++#if __FreeBSD_version < 1200031 + &kif->kf_sa_peer)) ++#else ++ &kif->kf_un.kf_sock.kf_sa_peer)) ++#endif + continue; + } else { + if (!psutil_sockaddr_matches( + AF_INET6, inp->inp_lport, &inp->in6p_laddr, ++#if __FreeBSD_version < 1200031 + &kif->kf_sa_local)) ++#else ++ &kif->kf_un.kf_sock.kf_sa_local)) ++#endif + continue; + if (!psutil_sockaddr_matches( + AF_INET6, inp->inp_fport, &inp->in6p_faddr, ++#if __FreeBSD_version < 1200031 + &kif->kf_sa_peer)) ++#else ++ &kif->kf_un.kf_sock.kf_sa_peer)) ++#endif + continue; + } + +@@ -1005,7 +1032,11 @@ psutil_proc_connections(PyObject *self, PyObject *args) + struct kinfo_file *freep = NULL; + struct kinfo_file *kif; + char *tcplist = NULL; ++#if __FreeBSD_version >= 1200026 ++ struct xtcpcb *tcp; ++#else + struct tcpcb *tcp; ++#endif + + PyObject *retList = PyList_New(0); + PyObject *tuple = NULL; +@@ -1074,19 +1105,35 @@ psutil_proc_connections(PyObject *self, PyObject *args) + inet_ntop( + kif->kf_sock_domain, + psutil_sockaddr_addr(kif->kf_sock_domain, ++#if __FreeBSD_version < 1200031 + &kif->kf_sa_local), ++#else ++ &kif->kf_un.kf_sock.kf_sa_local), ++#endif + lip, + sizeof(lip)); + inet_ntop( + kif->kf_sock_domain, + psutil_sockaddr_addr(kif->kf_sock_domain, ++#if __FreeBSD_version < 1200031 + &kif->kf_sa_peer), ++#else ++ &kif->kf_un.kf_sock.kf_sa_peer), ++#endif + rip, + sizeof(rip)); + lport = htons(psutil_sockaddr_port(kif->kf_sock_domain, ++#if __FreeBSD_version < 1200031 + &kif->kf_sa_local)); ++#else ++ &kif->kf_un.kf_sock.kf_sa_local)); ++#endif + rport = htons(psutil_sockaddr_port(kif->kf_sock_domain, ++#if __FreeBSD_version < 1200031 + &kif->kf_sa_peer)); ++#else ++ &kif->kf_un.kf_sock.kf_sa_peer)); ++#endif + + // construct python tuple/list + laddr = Py_BuildValue("(si)", lip, lport); +@@ -1115,7 +1162,11 @@ psutil_proc_connections(PyObject *self, PyObject *args) + else if (kif->kf_sock_domain == AF_UNIX) { + struct sockaddr_un *sun; + ++#if __FreeBSD_version < 1200031 + sun = (struct sockaddr_un *)&kif->kf_sa_local; ++#else ++ sun = (struct sockaddr_un *)&kif->kf_un.kf_sock.kf_sa_local; ++#endif + snprintf( + path, sizeof(path), "%.*s", + (int)(sun->sun_len - (sizeof(*sun) - sizeof(sun->sun_path))), +@@ -1626,7 +1677,7 @@ psutil_users(PyObject *self, PyObject *args) + if (ret_list == NULL) + return NULL; + +-#if __FreeBSD_version < 900000 ++#if !defined(__FreeBSD_version) + struct utmp ut; + FILE *fp; + +@@ -1754,7 +1805,11 @@ int psutil_gather_inet(int proto, PyObject *py_retlist) + struct xinpgen *xig, *exig; + struct xinpcb *xip; + struct xtcpcb *xtp; ++#if __FreeBSD_version >= 1200026 ++ struct xinpcb *inp; ++#else + struct inpcb *inp; ++#endif + struct xsocket *so; + const char *varname = NULL; + size_t len, bufsize; +@@ -1820,8 +1875,13 @@ int psutil_gather_inet(int proto, PyObject *py_retlist) + goto error; + } + inp = &xtp->xt_inp; ++#if __FreeBSD_version >= 1200026 ++ so = &inp->xi_socket; ++ status = xtp->t_state; ++#else + so = &xtp->xt_socket; + status = xtp->xt_tp.t_state; ++#endif + break; + case IPPROTO_UDP: + xip = (struct xinpcb *)xig; +@@ -1830,7 +1890,11 @@ int psutil_gather_inet(int proto, PyObject *py_retlist) + "struct xinpcb size mismatch"); + goto error; + } ++#if __FreeBSD_version >= 1200026 ++ inp = xip; ++#else + inp = &xip->xi_inp; ++#endif + so = &xip->xi_socket; + status = PSUTIL_CONN_NONE; + break; +@@ -2166,7 +2230,7 @@ PsutilMethods[] = + "Return process CPU affinity."}, + {"proc_cpu_affinity_set", psutil_proc_cpu_affinity_set, METH_VARARGS, + "Set process CPU affinity."}, +-#if defined(__FreeBSD_version) && __FreeBSD_version >= 800000 ++#if defined(__FreeBSD_version) + {"proc_open_files", psutil_proc_open_files, METH_VARARGS, + "Return files opened by process as a list of (path, fd) tuples"}, + {"proc_cwd", psutil_proc_cwd, METH_VARARGS, +@@ -2191,7 +2255,7 @@ PsutilMethods[] = + "Return swap mem stats"}, + {"cpu_times", psutil_cpu_times, METH_VARARGS, + "Return system cpu times as a tuple (user, system, nice, idle, irc)"}, +-#if defined(__FreeBSD_version) && __FreeBSD_version >= 800000 ++#if defined(__FreeBSD_version) + {"per_cpu_times", psutil_per_cpu_times, METH_VARARGS, + "Return system per-cpu times as a list of tuples"}, + #endif Property changes on: www/newmoon/files/patch-platform_python_psutil_psutil___psutil__bsd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/patch-platform_python_virtualenv_site.py =================================================================== --- www/newmoon/files/patch-platform_python_virtualenv_site.py (nonexistent) +++ www/newmoon/files/patch-platform_python_virtualenv_site.py (copie de travail) @@ -0,0 +1,33 @@ +--- ./platform/python/virtualenv/site.py 2020-10-24 10:42:23.000000000 +0000 ++++ ./platform/python/virtualenv/site.py 2020-11-09 17:42:48.105834000 +0000 +@@ -233,10 +233,10 @@ + elif os.sep == '/': + sitedirs = [os.path.join(prefix, + "lib", +- "python" + sys.version[:3], ++ "tauthon" + sys.version[:3], + "site-packages"), + os.path.join(prefix, "lib", "site-python"), +- os.path.join(prefix, "python" + sys.version[:3], "lib-dynload")] ++ os.path.join(prefix, "tauthon" + sys.version[:3], "lib-dynload")] + lib64_dir = os.path.join(prefix, "lib64", "python" + sys.version[:3], "site-packages") + if (os.path.exists(lib64_dir) and + os.path.realpath(lib64_dir) not in [os.path.realpath(p) for p in sitedirs]): +@@ -583,7 +583,7 @@ + elif sys.platform == 'win32' and os.sep == '\\': + paths = [os.path.join(sys.real_prefix, 'Lib'), os.path.join(sys.real_prefix, 'DLLs')] + else: +- paths = [os.path.join(sys.real_prefix, 'lib', 'python'+sys.version[:3])] ++ paths = [os.path.join(sys.real_prefix, 'lib', 'tauthon'+sys.version[:3])] + hardcoded_relative_dirs = paths[:] # for the special 'darwin' case below + lib64_path = os.path.join(sys.real_prefix, 'lib64', 'python'+sys.version[:3]) + if os.path.exists(lib64_path): +@@ -602,7 +602,7 @@ + # This is a non-multiarch aware Python. Fallback to the old way. + arch = sys.platform + plat_path = os.path.join(sys.real_prefix, 'lib', +- 'python'+sys.version[:3], ++ 'tauthon'+sys.version[:3], + 'plat-%s' % arch) + if os.path.exists(plat_path): + paths.append(plat_path) Property changes on: www/newmoon/files/patch-platform_python_virtualenv_site.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/files/patch-platform_python_virtualenv_virtualenv.py =================================================================== --- www/newmoon/files/patch-platform_python_virtualenv_virtualenv.py (nonexistent) +++ www/newmoon/files/patch-platform_python_virtualenv_virtualenv.py (copie de travail) @@ -0,0 +1,20 @@ +--- ./platform/python/virtualenv/virtualenv.py 2020-10-24 10:42:23.000000000 +0000 ++++ ./platform/python/virtualenv/virtualenv.py 2020-11-09 14:29:09.153232000 +0000 +@@ -49,7 +49,7 @@ + except NameError: + basestring = str + +-py_version = 'python%s.%s' % (sys.version_info[0], sys.version_info[1]) ++py_version = 'tauthon%s.%s' % (sys.version_info[0], sys.version_info[1]) + + is_jython = sys.platform.startswith('java') + is_pypy = hasattr(sys, 'pypy_version_info') +@@ -131,6 +131,8 @@ + REQUIRED_MODULES.extend(['warnings', 'linecache', '_abcoll', 'abc']) + if minver >= 7: + REQUIRED_MODULES.extend(['_weakrefset']) ++ if minver >= 8: ++ REQUIRED_MODULES.extend(['_oserror']) + if is_msys2: + REQUIRED_MODULES.extend(['functools']) + elif majver == 3: Property changes on: www/newmoon/files/patch-platform_python_virtualenv_virtualenv.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/pkg-descr =================================================================== --- www/newmoon/pkg-descr (nonexistent) +++ www/newmoon/pkg-descr (copie de travail) @@ -0,0 +1,23 @@ +New Moon is a browser built with most of the code of Pale Moon(TM), but is not +affiliated at all with Pale Moon nor Moonchild Productions, in the sense that +it is a third-party build which is not endorsed by them. Nonetheless, we try to +stick with their official Linux build instructions, as much as practically +feasible on FreeBSD. + +Pale Moon offers you a browsing experience in a browser completely built from +its own, independently developed source that has been forked off from +Firefox/Mozilla code a number of years ago, with carefully selected features +and optimizations to improve the browser's stability and user experience, while +offering full customization and a growing collection of extensions and themes +to make the browser truly your own. + +Some of the main features: +- Based on the Unified XUL Platform (UXP) containing our own optimized layout + and rendering engine (Goanna). +- Safe: Forked from mature Mozilla code and regularly updated with the latest + security patches. +- Secure: Additional security features and security-aware development +- Zero ads; no telemetry, spyware or data gathering +- Familiar, efficient, fully customizable interface + +WWW: https://www.palemoon.org/ Property changes on: www/newmoon/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/newmoon/pkg-plist =================================================================== --- www/newmoon/pkg-plist (nonexistent) +++ www/newmoon/pkg-plist (copie de travail) @@ -0,0 +1,59 @@ +bin/palemoon +lib/palemoon/application.ini +lib/palemoon/browser/blocklist.xml +lib/palemoon/browser/chrome.manifest +lib/palemoon/browser/chrome/icons/default/default16.png +lib/palemoon/browser/chrome/icons/default/default32.png +lib/palemoon/browser/chrome/icons/default/default48.png +lib/palemoon/browser/components/components.manifest +lib/palemoon/browser/components/libbrowsercomps.so +lib/palemoon/browser/defaults/profile/chrome/userChrome-example.css +lib/palemoon/browser/defaults/profile/chrome/userContent-example.css +lib/palemoon/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi +lib/palemoon/browser/icons/mozicon128.png +lib/palemoon/browser/omni.ja +lib/palemoon/browser/searchplugins/bing.xml +lib/palemoon/browser/searchplugins/duckduckgo-palemoon.xml +lib/palemoon/browser/searchplugins/ecosia.xml +lib/palemoon/browser/searchplugins/ekoru.xml +lib/palemoon/browser/searchplugins/twitter.xml +lib/palemoon/browser/searchplugins/wikipedia.xml +lib/palemoon/browser/searchplugins/yahoo.xml +lib/palemoon/browser/ua-update.json +lib/palemoon/chrome.manifest +lib/palemoon/defaults/pref/channel-prefs.js +lib/palemoon/dependentlibs.list +lib/palemoon/dictionaries/en-US.aff +lib/palemoon/dictionaries/en-US.dic +%%GTK3%%lib/palemoon/gtk2/libmozgtk.so +lib/palemoon/icudt58l.dat +lib/palemoon/libfreebl3.chk +lib/palemoon/libfreebl3.so +lib/palemoon/liblgpllibs.so +lib/palemoon/libmozavcodec.so +lib/palemoon/libmozavutil.so +%%GTK3%%lib/palemoon/libmozgtk.so +lib/palemoon/libmozsqlite3.so +lib/palemoon/libnspr4.so +lib/palemoon/libnss3.so +lib/palemoon/libnssckbi.so +lib/palemoon/libnssdbm3.chk +lib/palemoon/libnssdbm3.so +lib/palemoon/libnssutil3.so +lib/palemoon/libplc4.so +lib/palemoon/libplds4.so +lib/palemoon/libsmime3.so +lib/palemoon/libsoftokn3.chk +lib/palemoon/libsoftokn3.so +lib/palemoon/libssl3.so +lib/palemoon/libxul.so +lib/palemoon/omni.ja +lib/palemoon/palemoon +lib/palemoon/palemoon-bin +lib/palemoon/platform.ini +lib/palemoon/plugin-container +lib/palemoon/precomplete +lib/palemoon/removed-files +lib/palemoon/run-mozilla.sh +share/applications/newmoon.desktop +share/pixmaps/palemoon.png Property changes on: www/newmoon/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property