CenterIM
Hallo, There is someone out there using CenterIM? I am not using it for a very long time now, and there is so many new hipsters messengers now, so.. I want to burn it with fire. Any objections? Cheers.- -- Sending from my toaster.
Clang6 fix for print/qpdf
Hi,
Quick fix for clang6 error:
libqpdf/QUtil.cc:284:16: error: reinterpret_cast from 'nullptr_t' to 'char *'
is not allowed
setvbuf(f, reinterpret_cast(NULL), _IOLBF, 0);
^~
Here's patch to fix current version. Noticed that latest version of this port is
8.0.2 which doesn't need any patching to work with clang6.
timo
Index: Makefile
===
RCS file: /cvs/ports/print/qpdf/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile23 Aug 2017 07:40:49 - 1.21
+++ Makefile9 Apr 2018 04:58:36 -
@@ -4,6 +4,7 @@ COMMENT=PDF transformation and inspecti
DISTNAME= qpdf-7.0.b1
PKGNAME= qpdf-7.0beta1
+REVISION= 0
SHARED_LIBS += qpdf 4.0 # 18.0
Index: patches/patch-libqpdf_QUtil_cc
===
RCS file: patches/patch-libqpdf_QUtil_cc
diff -N patches/patch-libqpdf_QUtil_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libqpdf_QUtil_cc 9 Apr 2018 04:58:36 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libqpdf/QUtil.cc
+--- libqpdf/QUtil.cc.orig
libqpdf/QUtil.cc
+@@ -281,7 +281,7 @@ void
+ QUtil::setLineBuf(FILE* f)
+ {
+ #ifndef _WIN32
+-setvbuf(f, reinterpret_cast(NULL), _IOLBF, 0);
++setvbuf(f, reinterpret_cast(0), _IOLBF, 0);
+ #endif
+ }
+
Re: FIX archivers/p7zip - fix for clang 6.0
On Sat, Apr 07, 2018 at 05:26:50PM +0200, Bj??rn Ketelaars wrote:
> On Sat 07/04/2018 16:52, Rafael Sadowski wrote:
> > Please use only:
> >
> > switch(static_cast(errorCode))
> >
> > ok to that.
>
> ...which results is a much smaller additional patch. Thanks!
>
> OK?
Maintainer's OK with the addition of a REVISION bump.
Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile25 Nov 2017 13:27:48 - 1.43
+++ Makefile9 Apr 2018 00:19:44 -
@@ -4,7 +4,7 @@ COMMENT-main= file archiver with high co
COMMENT-rar= rar modules for p7zip
V= 16.02
-REVISION-main= 3
+REVISION-main= 4
REVISION-rar= 1
DISTNAME= p7zip_${V}_src_all
PKGNAME= p7zip-${V}
Index: patches/patch-CPP_Windows_ErrorMsg_cpp
===
RCS file: patches/patch-CPP_Windows_ErrorMsg_cpp
diff -N patches/patch-CPP_Windows_ErrorMsg_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_Windows_ErrorMsg_cpp 9 Apr 2018 00:18:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CPP/Windows/ErrorMsg.cpp
+--- CPP/Windows/ErrorMsg.cpp.orig
CPP/Windows/ErrorMsg.cpp
+@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode)
+ const char * txt = 0;
+ AString msg;
+
+- switch(errorCode) {
++ switch(static_cast(errorCode)) {
+ case ERROR_NO_MORE_FILES : txt = "No more files"; break ;
+ case E_NOTIMPL : txt = "E_NOTIMPL"; break ;
+ case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ;
Re: clang6 fallout
Updated list as of Apr 9, 00:00 UTC. Logs at http://build-failures.rhaalovely.net/amd64/2018-04-07/ archivers/p7zip astro/celestia audio/audacity audio/caps-plugins audio/gogglesmm audio/libmusicbrainz audio/libmusicbrainz5 audio/libsidplay cad/kicad comms/gpsk31 comms/hylafax databases/mysqlcc databases/pgadmin3 devel/arm-none-eabi/gcc-linaro devel/bouml devel/bullet devel/jdk/1.8 devel/mysql++ devel/openmpi devel/ptlib devel/qt-creator devel/sdcc devel/smpeg devel/smpeg2 devel/tclcl devel/xtensa-elf/gcc editors/fte editors/ht education/drgeo emulators/BasiliskII emulators/desmume emulators/dgen-sdl emulators/fceux emulators/frodo emulators/fs-uae emulators/mupen64plus/video-glide64 emulators/nestopia games/amph games/blobby games/crack-attack games/dungeon-crawl games/ja2-stracciatella games/kobodeluxe games/koboredux games/maelstrom games/numptyphysics games/scorched3d games/stepmania games/sumwars games/vegastrike/engine games/xminehunter games/xwelltris geo/gpstk graphics/animorph graphics/cal3d graphics/dcmtk graphics/discwrapper graphics/rawstudio inputmethods/scim japanese/groff java/jlint lang/apl lang/erlang/16 mail/mimetic mail/prepop math/libqalculate math/minisat math/openfst math/z3 misc/cdrdao misc/openbabel misc/xnc multimedia/libmp4v2 multimedia/sfml multimedia/swfmill net/amule net/centerim net/dhcdrop net/dxpc net/kismet net/libtorrent-rasterbar net/livemedia net/mldonkey net/mutella net/nepenthes net/ntopng net/ruby-eventmachine net/synergy net/tcpreen news/pan print/qpdf print/texlive/base security/steghide sysutils/facter textproc/arabica textproc/clucene textproc/exempi textproc/lq-sp textproc/opensp textproc/sablotron textproc/sphinx textproc/wkhtmltopdf www/mongrel2 www/phantomjs x11/kde/arts3 x11/qt4 -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: fix fs-uae for clang 6
On Sun, Apr 08 2018, Edd Barrett wrote:
> Hi,
>
> This unbreaks the build for emulators/fs-uae.
>
> While we are here, iconv isn't needed in WANTLIB.
>
> OK?
-std=c++03 isn't supported by g++-4.2.1; do you need the workaround on
clang archs only?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/emulators/fs-uae/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- Makefile 21 Nov 2017 00:13:00 - 1.23
> +++ Makefile 8 Apr 2018 21:09:22 -
> @@ -9,7 +9,7 @@ V = 2.4.0
> MODPY_EGG_VERSION = ${V}
> DISTNAME = fs-uae-$V
> CATEGORIES = emulators
> -REVISION = 4
> +REVISION = 5
>
> HOMEPAGE = http://fengestad.no/fs-uae/
> MAINTAINER = Edd Barrett
> @@ -17,7 +17,7 @@ MAINTAINER =Edd Barrett # GPLv2, LGPLv2.1
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += GL GLU SDL X11 c freetype glib-2.0 gthread-2.0 iconv intl m
> +WANTLIB += GL GLU SDL X11 c freetype glib-2.0 gthread-2.0 intl m
> WANTLIB += openal png pthread ${COMPILER_LIBCXX} z
>
> MASTER_SITES = ${HOMEPAGE}stable/$V/
> @@ -31,6 +31,8 @@ RUN_DEPENDS = devel/desktop-file-utils
> x11/gtk+3,-guic
>
> USE_GMAKE = Yes
> +
> +CXXFLAGS = -std=c++03
>
> MAKE_FLAGS +=prefix=${PREFIX} CXXFLAGS="${CXXFLAGS}"
> MAKE_FLAGS +=CFLAGS="${CFLAGS}" CXX="${CXX}"
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
fix fs-uae for clang 6
Hi,
This unbreaks the build for emulators/fs-uae.
While we are here, iconv isn't needed in WANTLIB.
OK?
Index: Makefile
===
RCS file: /cvs/ports/emulators/fs-uae/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile21 Nov 2017 00:13:00 - 1.23
+++ Makefile8 Apr 2018 21:09:22 -
@@ -9,7 +9,7 @@ V = 2.4.0
MODPY_EGG_VERSION =${V}
DISTNAME = fs-uae-$V
CATEGORIES = emulators
-REVISION = 4
+REVISION = 5
HOMEPAGE = http://fengestad.no/fs-uae/
MAINTAINER = Edd Barrett
@@ -17,7 +17,7 @@ MAINTAINER = Edd Barrett http://www.theunixzoo.co.uk
Re: TeX stuff for devel/cocinelle and books/tex-by-topic into build set
Hi Stuart,
On Sat, Apr 07, 2018 at 08:35:10PM +0100, Stuart Henderson wrote:
> My dev machines are updated past clang 6 so I can't test atm but it reads
> ok.
We might as well fix the build first. The below diff should do the
trick.
I *think* I'm right to not bump.
OK for that part?
> I don't think it will do much to bulk build speeds in itself, coccinelle
> and tex-by-topic aren't parts of big dependency chains, and don't take
> that long to build, but seems a good testbed for your script which could
> well be useful for things in future that have a bigger impact on the
> build.
Agreed.
Thanks
Index: patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w
===
RCS file: patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w
diff -N patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w8 Apr 2018
10:38:34 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix C++11 build problem in generated C++ code.
+http://www.tug.org/pipermail/tex-live/2017-June/040365.html
+
+Index: texk/web2c/luatexdir/image/pdftoepdf.w
+--- texk/web2c/luatexdir/image/pdftoepdf.w.orig
texk/web2c/luatexdir/image/pdftoepdf.w
+@@ -71,7 +71,7 @@ static char *get_file_checksum(const char *a, file_err
+ ck = (char *) malloc(PDF_CHECKSUM_SIZE);
+ if (ck == NULL)
+ formatted_error("pdf inclusion","out of memory while processing
'%s'", a);
+-snprintf(ck, PDF_CHECKSUM_SIZE, "%" PRIu64 "_%" PRIu64, (uint64_t)
size,(uint64_t) mtime);
++ snprintf(ck, PDF_CHECKSUM_SIZE, "%"@= @>PRIu64@= @>"_%"@= @>PRIu64,
(uint64_t) size,(uint64_t) mtime);
+} else {
+ switch (fe) {
+ case FE_FAIL:
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: [NEW] textproc/ruby-rouge
On Sat, Mar 17, 2018 at 10:42:42AM +0100, Frederic Cambus wrote: > Here is a new port: textproc/ruby-rouge > > From DESCR: > > Rouge is a pure-ruby syntax highlighter. It can highlight 100 different > languages, and output HTML or ANSI 256-color text. > > Its HTML output is compatible with stylesheets designed for pygments. > > Comments? OK? Ping. Anyone willing to look at this?
Re: [New] nnn-1.7
On Sun, Apr 8, 2018 at 6:47 PM, Klemens Nanni wrote:
> On Wed, Apr 04, 2018 at 01:35:35PM +0200, Jeremie Courreges-Anglas wrote:
>> On Wed, Apr 04 2018, Ljuba Nedeljkovic wrote:
>> > Ping.
>> >
>> > On Wed, Mar 14, 2018 at 5:13 PM, Klemens Nanni wrote:
>> >> On Wed, Mar 14, 2018 at 02:37:22AM +0100, Ljuba Nedeljkovic wrote:
>> >>> Please find attached updated port's tarball with suggested fixes. One
>> >>> deviation from kn's tarball is removal of `patches/patch-nlay` file and
>> >>> doing shebang fix using LOCALBASE with `post-extract` target. Said
>> >>> patch leaves literal `#!${LOCALBASE}/bin/bash` in installed `nlay`
>> >>> script and breaks it.
>> >> Not a fan of modyfing WRKSRC "manually", we have patches and SUBST_CMD
>> >> for that. You'd simply patch LOCALBASE into the shebang and later do
>> >>
>> >> pre-configure:
>> >> ${SUBST_CMD} ${WRKSRC}/nlay
>> >>
>> >> I'm happy to import your latest tarball with that, OK anyone?
>>
>> Looks good to me, however I'd like us to stop importing ports using
>> GH_*. Upstream already uses publishes release assets:
>>
>> https://github.com/jarun/nnn/releases
>>
>> Could someone get in touch with them and ask them to publish proper
>> source tarballs?
> I had a lengthy email conversation with upstream about it.
>
> tl;dr: A pull request to create the asset automatically with Travic CI
> is welcome. Neither do I use Github, nor do I know shit about Travis.
>
> Ljuba, can you do that?
Yes
--
If you wish to live wisely,
ignore sayings -- including this one.
Re: UPDATE: net/mininet - various bug fixes
On 2018-04-08, Klemens Nanni wrote: > Compact .for loops in targets to smaller brace expansion. I'm of somewhat mixed opinion on this since brace expansion is not a sh(1) features, it's a ksh(1) extension. -- Christian "naddy" Weisgerber na...@mips.inka.de
update: zsh 5.5
Update zsh to 5.5. I've been running the RCs for a week or so and
haven't had issues. I bumped AUTOCONF_VERSION since ./configure has
a comment that it's generated with 2.69 and removed both remaining
patches. The _bsd_pkg patch is superseded by improvements made upstream
and the zsh.texi patch seems to be useless: zsh-5.5/fake-amd64 is
identical with and without the patch.
- Matthew Martin
diff --git Makefile Makefile
index 36350def5ad..1fc94cb5666 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT= Z shell, Bourne shell-compatible
-V= 5.4.2
+V= 5.5
DISTNAME= zsh-$V
CATEGORIES=shells
@@ -21,7 +21,7 @@ WANTLIB= c curses iconv m pcre
LIB_DEPENDS= converters/libiconv \
devel/pcre
-AUTOCONF_VERSION=2.68
+AUTOCONF_VERSION=2.69
CONFIGURE_STYLE=autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git distinfo distinfo
index 446c618c94b..6a79e41a63c 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (zsh-5.4.2.tar.gz) = lXvNssV/ZMAvZzaT6lp1GO8ktlV66zpM4iLO+m10rMk=
-SIZE (zsh-5.4.2.tar.gz) = 4482413
+SHA256 (zsh-5.5.tar.gz) = 0FYGpUVnKuhiOCiALbzEyD2aTT2/uWDpSp/Z9iRnwVk=
+SIZE (zsh-5.5.tar.gz) = 4576506
diff --git patches/patch-Completion_BSD_Command__bsd_pkg
patches/patch-Completion_BSD_Command__bsd_pkg
deleted file mode 100644
index 5496f27152c..000
--- patches/patch-Completion_BSD_Command__bsd_pkg
+++ /dev/null
@@ -1,87 +0,0 @@
-$OpenBSD: patch-Completion_BSD_Command__bsd_pkg,v 1.5 2017/12/05 23:28:56 jca
Exp $
-Index: Completion/BSD/Command/_bsd_pkg
Completion/BSD/Command/_bsd_pkg.orig
-+++ Completion/BSD/Command/_bsd_pkg
-@@ -6,15 +6,19 @@ _bsd_pkg_pkgfiles() {
-
- case $OSTYPE in
- netbsd*)
--portsdir=/usr/pkgsrc
-+portsdir=${PORTSDIR:-/usr/pkgsrc}
-+pkgsdir=${PACKAGES:-$portsdir/packages}/All
- ;;
-+ openbsd*)
-+portsdir=${PORTSDIR:-/usr/ports}
-+pkgsdir=${PACKAGES:-$portsdir/packages}/$(arch -s)/All
-+;;
- *)
- portsdir=${PORTSDIR:-/usr/ports}
-+pkgsdir=${PACKAGES:-$portsdir/packages}/All
- ;;
- esac
-
-- pkgsdir=${PACKAGES:-$portsdir/packages}/All
--
- paths=( "${(@)${(@s.:.)PKG_PATH}:#}" )
- _files "$@" -g '*.t[bg]z(-.)' && ret=0
- (( $#path )) && _files "$@" -W paths -g '*.t[bg]z(-.)' && ret=0
-@@ -25,7 +29,7 @@ _bsd_pkg_pkgfiles() {
-
- (( $+functions[_bsd_pkg_pkgs] )) ||
- _bsd_pkg_pkgs() {
-- compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
-+ compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(-/:t)
- }
-
- (( $+functions[_bsd_pkg_pkgs_and_files] )) ||
-@@ -157,14 +161,22 @@ _bsd_pkg() {
- ;;
- esac
-
--_arguments -s \
-- $flags[@] \
-- '(-a)*:package name:_bsd_pkg_pkgs_and_files'
-+case "$OSTYPE" in
-+openbsd*)
-+ _arguments -s \
-+$flags[@] \
-+'*:installed package name:_bsd_pkg_pkgs'
-+ ;;
-+*)
-+ _arguments -s \
-+$flags[@] \
-+'(-a)*:package name:_bsd_pkg_pkgs_and_files'
-+ ;;
-+esac
- ;;
-
- pkg_info)
- flags=(
-- '(:)-a[show all installed packages]'
- '-c[show comment fields]'
- '-D[show install-message files]'
- '-d[show long descriptions]'
-@@ -209,9 +221,20 @@ _bsd_pkg() {
- ;;
- esac
-
--_arguments -s \
-- $flags[@] \
-- '(-a)*:package name:_bsd_pkg_pkgs_and_files'
-+case "$OSTYPE" in
-+openbsd*)
-+ _arguments -s \
-+'(* -)-a[show all installed packages]' \
-+$flags[@] \
-+'*:installed package name:_bsd_pkg_pkgs'
-+ ;;
-+*)
-+ _arguments -s \
-+'(:)-a[show all installed packages]' \
-+$flags[@] \
-+'(-a)*:package name:_bsd_pkg_pkgs_and_files'
-+ ;;
-+esac
- ;;
- esac
- }
diff --git patches/patch-Doc_zsh_texi patches/patch-Doc_zsh_texi
deleted file mode 100644
index a827e72189c..000
--- patches/patch-Doc_zsh_texi
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Doc_zsh_texi,v 1.10 2017/02/02 03:41:12 juanfra Exp $
Doc/zsh.texi.orig Fri Dec 2 13:55:17 2016
-+++ Doc/zsh.texi Fri Dec 2 15:24:31 2016
-@@ -5,6 +5,10 @@
- @end iftex
- @setfilename zsh.info
- @settitle zsh
-+@dircategory Shells
-+@direntry
-+* Zsh: (zsh). The Z shell.
-+@end direntry
- @c %**end of header
-
- @ifinfo
diff --git pkg/PLIST pkg/PLIST
index 8a8a2a2d7e0..e61fd3b612b 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -117,6 +117,7 @@ share/zsh/${V}/functions/_all_labels
share/zsh/${V}/functions/_all_matches
share/zsh/${V}/functions/_alternative
share/zsh/${V}/functions/_analyseplugin
+share/zsh/${V}/functions/_ansible
share/zsh/${V}/functions/_ant
share/zsh/${V}/functions/_antiword
share/zsh/${V}/functions/_apachectl
@@ -170,6 +171,7 @@ share/zsh/${V}/functions/_bzip2
share/zsh/${V}/functions/_bzr
share/zsh/${V}/functions/_cabal
share/zsh/${V}/functions/_cache_invalid
+share/zsh/${V}/functions/_caffeinate
share/zsh/${V}/functions/_c
Re: UPDATE: net/mininet - various bug fixes
On Sat, Apr 07, 2018 at 05:50:54PM -0700, Ayaka Koshibe wrote:
> And I found the manpage for mn isn't generated properly during last-minute
> testing...
>
> Updated Makefile diff, plus cleanup to run MAKEDEV in /dev, rather than create
> and move a file, as suggested by phessler.
How about these on top of your diff:
Use CFLAGS in do-build, enabling DEBUG.
Compact .for loops in targets to smaller brace expansion. IMO the
examples/ path is clear enough, so I also avoided renaming switchd.conf.
Set SEPARATE_BUILD since you're already using WRKSRC and WRKBUILD
accordingly.
Feedback?
Maybe also use the latest git commit instead of bumping revision?
Index: Makefile
===
RCS file: /cvs/ports/net/mininet/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile7 Dec 2017 06:33:40 - 1.6
+++ Makefile8 Apr 2018 17:16:12 -
@@ -3,7 +3,7 @@
COMMENT = emulator for rapid prototyping of software defined networks
DISTNAME = mininet-0.0.20170813
-REVISION = 3
+REVISION = 4
GH_ACCOUNT = mininet
GH_PROJECT = mininet
GH_COMMIT =87e26ef931ee6063332ceba77db472140f832d3a
@@ -18,33 +18,32 @@ MAINTAINER =Ayaka Koshibe
Index: patches/patch-mininet_cli_py
===
RCS file: /cvs/ports/net/mininet/patches/patch-mininet_cli_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-mininet_cli_py
--- patches/patch-mininet_cli_py21 Aug 2017 18:47:12 - 1.1.1.1
+++ patches/patch-mininet_cli_py8 Apr 2018 17:16:12 -
@@ -3,7 +3,24 @@ split() automatically splits on whitespa
Index: mininet/cli.py
--- mininet/cli.py.orig
+++ mininet/cli.py
-@@ -411,7 +411,7 @@ class CLI( Cmd ):
+@@ -356,12 +356,11 @@ class CLI( Cmd ):
+ """Run dpctl (or ovs-ofctl) command on all switches.
+Usage: dpctl command [arg1] [arg2] ..."""
+ args = line.split()
+-if len(args) < 1:
+-error( 'usage: dpctl command [arg1] [arg2] ...\n' )
+-return
+ for sw in self.mn.switches:
+-output( '*** ' + sw.name + ' ' + ('-' * 72) + '\n' )
+-output( sw.dpctl( *args ) )
++res = sw.dpctl( *args )
++if res:
++output( '*** ' + sw.name + ' ' + ('-' * 72) + '\n' )
++output( res )
+
+ def do_time( self, line ):
+ "Measure time taken for any command in Mininet."
+@@ -411,7 +410,7 @@ class CLI( Cmd ):
% first )
return
node = self.mn[ first ]
Index: patches/patch-mininet_net_py
===
RCS file: /cvs/ports/net/mininet/patches/patch-mininet_net_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-mininet_net_py
--- patches/patch-mininet_net_py9 Sep 2017 21:18:30 - 1.2
+++ patches/patch-mininet_net_py8 Apr 2018 17:16:12 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-mininet_net_py,v 1.2 201
Index: mininet/net.py
--- mininet/net.py.orig
+++ mininet/net.py
-@@ -96,13 +96,27 @@ from time import sleep
+@@ -96,15 +96,29 @@ from time import sleep
from itertools import chain, groupby
from math import ceil
@@ -19,7 +19,7 @@ Index: mininet/net.py
+else:
+from mininet.openbsd.node import Node
+from mininet.openbsd.intf import Intf
-+from mininet.openbsd.util import fixLimits, numCores
++from mininet.openbsd.util import fixLimits, numCores, waitListening
+
from mininet.cli import CLI
from mininet.log import info, error, debug, output, warn
@@ -30,11 +30,15 @@ Index: mininet/net.py
from mininet.nodelib import NAT
-from mininet.link import Link, Intf
-from mininet.util import ( quietRun, fixLimits, numCores, ensureRoot,
+- macColonHex, ipStr, ipParse, netParse, ipAdd,
+- waitListening )
+from mininet.link import Link
+from mininet.util import ( quietRun, ensureRoot,
-macColonHex, ipStr, ipParse, netParse, ipAdd,
-waitListening )
++ macColonHex, ipStr, ipParse, netParse, ipAdd
++ )
from mininet.term import cleanUpScreens, makeTerms
+
+ # Mininet version: should be consistent with README and LICENSE
@@ -113,7 +127,7 @@ VERSION = "2.3.0d1"
class Mininet( object ):
"Network emulation with hosts spawned in network namespaces."
@@ -53,24 +57,29 @@ Index: mininet/net.py
iperfArgs = 'iperf -p %d ' % port
bwArgs = ''
if l4Type == 'UDP':
-@@ -817,7 +831,7 @@ class Mininet( object ):
+@@ -817,9 +831,9 @@ class Mininet( object ):
raise Exception( 'Unexpected l4 type: %s' % l4Type )
if fmt:
iperfArgs += '-f %s ' % fmt
-server.sendCmd( iperfArgs + '-s' )
+server.cmd( iperfArgs + '-s &' )
if l4Type
Re: UPDATE: www/stagit 0.7.2->0.8
On Sun, Apr 08, 2018 at 03:02:49PM +0100, Stuart Henderson wrote:
> On 2018/04/08 15:56, Klemens Nanni wrote:
> > On Sun, Apr 08, 2018 at 03:17:09PM +0200, Hiltjo Posthuma wrote:
> > > This updates stagit from 0.7.2 to 0.8.
> > >
> > > stagit project changes:
> > > - Fix pledge(2) abort with newer libgit/libcurl: this is because libgit
> > > uses
> > > curl which uses some initialization checks, namely an IPv6 check which
> > > creates a socket. The pledge(2) is now done after this initialization.
> > > - Add -l option: limit the amount of commits for the log.html file.
> > > - Remove a non-portable syntax in Makefile.
> > > - Improve example script and documentation slightly.
> > > - style.css: improve compatibility with older browsers, namely dillo.
> > > - Minor optimization for the diffstat.
> > >
> > >
> > > No special changes in the Makefile: just a version bump.
> > Updated diff below passing CFLAGS, otherwise both CFLAGS and DEBUG are
> > completely ignored.
>
> Generally liking the direction of this - can you fix CC as well please?
> That is ignored too.
Err, of course.
OK?
Index: Makefile
===
RCS file: /cvs/ports/www/stagit/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jan 2018 23:15:03 - 1.6
+++ Makefile8 Apr 2018 16:53:42 -
@@ -2,22 +2,26 @@
COMMENT = static git page generator
-DISTNAME = stagit-0.7.2
+DISTNAME = stagit-0.8
CATEGORIES = www
-HOMEPAGE = http://git.2f30.org/stagit/
+HOMEPAGE = https://git.2f30.org/stagit/
# MIT/X Consortium License
PERMIT_PACKAGE_CDROM = Yes
# uses pledge()
WANTLIB = c git2
+
LIB_DEPENDS = devel/libgit2/libgit2>=0.22
-MASTER_SITES = http://dl.2f30.org/releases/
+MASTER_SITES = https://dl.2f30.org/releases/
-MAKE_FLAGS=GITINC=${LOCALBASE}/include \
+MAKE_FLAGS=CC=${CC} \
+ CFLAGS='${CFLAGS}' \
+ COMPATOBJ='' \
+ GITINC=${LOCALBASE}/include \
GITLIB=${LOCALBASE}/lib
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/www/stagit/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo12 Jan 2018 23:15:03 - 1.5
+++ distinfo8 Apr 2018 16:53:42 -
@@ -1,2 +1,2 @@
-SHA256 (stagit-0.7.2.tar.gz) = JfrLfOOE8dLwbFNnU+J1SzgDe0gsalRhluvr9MNLetQ=
-SIZE (stagit-0.7.2.tar.gz) = 16845
+SHA256 (stagit-0.8.tar.gz) = 3w0+/hopdY5BUh1Ku8cSvPv+++uDeUXylRIf9oC8KKY=
+SIZE (stagit-0.8.tar.gz) = 17378
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 12 Jan 2018 23:15:03 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2018/01/12 23:15:03 juanfra Exp $
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -25,7 +25,7 @@ COMPATOBJ = \
- strlcat.o\
- strlcpy.o
-
--OBJ = ${SRC:.c=.o} ${COMPATOBJ}
-+OBJ = ${SRC:.c=.o}
-
- all: ${BIN}
-
-@@ -49,11 +49,11 @@ dist:
-
- ${OBJ}: config.mk ${HDR}
-
--stagit: stagit.o ${COMPATOBJ}
-- ${CC} -o $@ stagit.o ${COMPATOBJ} ${LDFLAGS}
-+stagit: stagit.o
-+ ${CC} -o $@ stagit.o ${LDFLAGS}
-
--stagit-index: stagit-index.o ${COMPATOBJ}
-- ${CC} -o $@ stagit-index.o ${COMPATOBJ} ${LDFLAGS}
-+stagit-index: stagit-index.o
-+ ${CC} -o $@ stagit-index.o ${LDFLAGS}
-
- clean:
- rm -f ${BIN} ${OBJ} ${NAME}-${VERSION}.tar.gz
Index: patches/patch-compat_h
===
RCS file: patches/patch-compat_h
diff -N patches/patch-compat_h
--- patches/patch-compat_h 26 Apr 2016 13:53:10 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-compat_h,v 1.1.1.1 2016/04/26 13:53:10 juanfra Exp $
compat.h.orig Tue Apr 26 02:15:26 2016
-+++ compat.h Tue Apr 26 02:16:53 2016
-@@ -1,6 +1,8 @@
-+#if 0
- #undef strlcat
- size_t strlcat(char *, const char *, size_t);
- #undef strlcpy
- size_t strlcpy(char *, const char *, size_t);
- #undef reallocarray
- void *reallocarray(void *, size_t, size_t);
-+#endif
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/www/stagit/patches/patch-config_mk,v
retrieving revision 1.1
diff -u -p -r1.1 patch-config_mk
--- patches/patch-config_mk 9 May 2016 17:02:52 - 1.1
+++ patches/patch-config_mk 8 Apr 2018 16:53:42 -
@@ -1,8 +1,9 @@
config.mk.orig Sat May 7 15:07:28 2016
-+++ config.mk Mon May 9 13:36:03 2016
+Index: config.mk
+--- config.mk.orig
config.mk
@@ -29,4 +29,4 @@ LDFLAGS = -s ${LIBS}
CPPFLAGS = -D_XOP
Re: [New] nnn-1.7
On Wed, Apr 04, 2018 at 01:35:35PM +0200, Jeremie Courreges-Anglas wrote:
> On Wed, Apr 04 2018, Ljuba Nedeljkovic wrote:
> > Ping.
> >
> > On Wed, Mar 14, 2018 at 5:13 PM, Klemens Nanni wrote:
> >> On Wed, Mar 14, 2018 at 02:37:22AM +0100, Ljuba Nedeljkovic wrote:
> >>> Please find attached updated port's tarball with suggested fixes. One
> >>> deviation from kn's tarball is removal of `patches/patch-nlay` file and
> >>> doing shebang fix using LOCALBASE with `post-extract` target. Said
> >>> patch leaves literal `#!${LOCALBASE}/bin/bash` in installed `nlay`
> >>> script and breaks it.
> >> Not a fan of modyfing WRKSRC "manually", we have patches and SUBST_CMD
> >> for that. You'd simply patch LOCALBASE into the shebang and later do
> >>
> >> pre-configure:
> >> ${SUBST_CMD} ${WRKSRC}/nlay
> >>
> >> I'm happy to import your latest tarball with that, OK anyone?
>
> Looks good to me, however I'd like us to stop importing ports using
> GH_*. Upstream already uses publishes release assets:
>
> https://github.com/jarun/nnn/releases
>
> Could someone get in touch with them and ask them to publish proper
> source tarballs?
I had a lengthy email conversation with upstream about it.
tl;dr: A pull request to create the asset automatically with Travic CI
is welcome. Neither do I use Github, nor do I know shit about Travis.
Ljuba, can you do that?
Re: UPDATE: www/stagit 0.7.2->0.8
On 2018/04/08 15:56, Klemens Nanni wrote:
> On Sun, Apr 08, 2018 at 03:17:09PM +0200, Hiltjo Posthuma wrote:
> > This updates stagit from 0.7.2 to 0.8.
> >
> > stagit project changes:
> > - Fix pledge(2) abort with newer libgit/libcurl: this is because libgit uses
> > curl which uses some initialization checks, namely an IPv6 check which
> > creates a socket. The pledge(2) is now done after this initialization.
> > - Add -l option: limit the amount of commits for the log.html file.
> > - Remove a non-portable syntax in Makefile.
> > - Improve example script and documentation slightly.
> > - style.css: improve compatibility with older browsers, namely dillo.
> > - Minor optimization for the diffstat.
> >
> >
> > No special changes in the Makefile: just a version bump.
> Updated diff below passing CFLAGS, otherwise both CFLAGS and DEBUG are
> completely ignored.
Generally liking the direction of this - can you fix CC as well please?
That is ignored too.
> patch-Makefile can be dropped in favour of passing COMPATOBJ='', I'd
> also drop patch-compat_h as it makes no difference.
>
> Use TLS for HOMEPAGE and HTTPS.
>
> Feedback?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/stagit/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile 12 Jan 2018 23:15:03 - 1.6
> +++ Makefile 8 Apr 2018 13:56:00 -
> @@ -2,22 +2,25 @@
>
> COMMENT =static git page generator
>
> -DISTNAME = stagit-0.7.2
> +DISTNAME = stagit-0.8
>
> CATEGORIES = www
>
> -HOMEPAGE = http://git.2f30.org/stagit/
> +HOMEPAGE = https://git.2f30.org/stagit/
>
> # MIT/X Consortium License
> PERMIT_PACKAGE_CDROM = Yes
>
> # uses pledge()
> WANTLIB =c git2
> +
> LIB_DEPENDS =devel/libgit2/libgit2>=0.22
>
> -MASTER_SITES = http://dl.2f30.org/releases/
> +MASTER_SITES = https://dl.2f30.org/releases/
>
> -MAKE_FLAGS= GITINC=${LOCALBASE}/include \
> +MAKE_FLAGS= CFLAGS='${CFLAGS}' \
> + COMPATOBJ='' \
> + GITINC=${LOCALBASE}/include \
> GITLIB=${LOCALBASE}/lib
>
> NO_TEST =Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/stagit/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 12 Jan 2018 23:15:03 - 1.5
> +++ distinfo 8 Apr 2018 13:56:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (stagit-0.7.2.tar.gz) = JfrLfOOE8dLwbFNnU+J1SzgDe0gsalRhluvr9MNLetQ=
> -SIZE (stagit-0.7.2.tar.gz) = 16845
> +SHA256 (stagit-0.8.tar.gz) = 3w0+/hopdY5BUh1Ku8cSvPv+++uDeUXylRIf9oC8KKY=
> +SIZE (stagit-0.8.tar.gz) = 17378
> Index: patches/patch-Makefile
> ===
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- patches/patch-Makefile12 Jan 2018 23:15:03 - 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,29 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.3 2018/01/12 23:15:03 juanfra Exp $
> -Index: Makefile
> Makefile.orig
> -+++ Makefile
> -@@ -25,7 +25,7 @@ COMPATOBJ = \
> - strlcat.o\
> - strlcpy.o
> -
> --OBJ = ${SRC:.c=.o} ${COMPATOBJ}
> -+OBJ = ${SRC:.c=.o}
> -
> - all: ${BIN}
> -
> -@@ -49,11 +49,11 @@ dist:
> -
> - ${OBJ}: config.mk ${HDR}
> -
> --stagit: stagit.o ${COMPATOBJ}
> --${CC} -o $@ stagit.o ${COMPATOBJ} ${LDFLAGS}
> -+stagit: stagit.o
> -+${CC} -o $@ stagit.o ${LDFLAGS}
> -
> --stagit-index: stagit-index.o ${COMPATOBJ}
> --${CC} -o $@ stagit-index.o ${COMPATOBJ} ${LDFLAGS}
> -+stagit-index: stagit-index.o
> -+${CC} -o $@ stagit-index.o ${LDFLAGS}
> -
> - clean:
> - rm -f ${BIN} ${OBJ} ${NAME}-${VERSION}.tar.gz
> Index: patches/patch-compat_h
> ===
> RCS file: patches/patch-compat_h
> diff -N patches/patch-compat_h
> --- patches/patch-compat_h26 Apr 2016 13:53:10 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-compat_h,v 1.1.1.1 2016/04/26 13:53:10 juanfra Exp $
> compat.h.origTue Apr 26 02:15:26 2016
> -+++ compat.h Tue Apr 26 02:16:53 2016
> -@@ -1,6 +1,8 @@
> -+#if 0
> - #undef strlcat
> - size_t strlcat(char *, const char *, size_t);
> - #undef strlcpy
> - size_t strlcpy(char *, const char *, size_t);
> - #undef reallocarray
> - void *reallocarray(void *, size_t, size_t);
> -+#endif
> Index: patches/patch-config_mk
> ===
> RCS file: /cvs/ports/www/stagit/patches/patch-config_mk,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-config_mk
> --- patches/patch-config_mk 9 May 2016 17:02:52 - 1.1
> +++ patches/patch-config_mk 8 Apr 2018 13:56:00 -
> @@ -1,8 +1,9 @@
> co
Re: UPDATE: www/stagit 0.7.2->0.8
On Sun, Apr 08, 2018 at 03:17:09PM +0200, Hiltjo Posthuma wrote:
> This updates stagit from 0.7.2 to 0.8.
>
> stagit project changes:
> - Fix pledge(2) abort with newer libgit/libcurl: this is because libgit uses
> curl which uses some initialization checks, namely an IPv6 check which
> creates a socket. The pledge(2) is now done after this initialization.
> - Add -l option: limit the amount of commits for the log.html file.
> - Remove a non-portable syntax in Makefile.
> - Improve example script and documentation slightly.
> - style.css: improve compatibility with older browsers, namely dillo.
> - Minor optimization for the diffstat.
>
>
> No special changes in the Makefile: just a version bump.
Updated diff below passing CFLAGS, otherwise both CFLAGS and DEBUG are
completely ignored.
patch-Makefile can be dropped in favour of passing COMPATOBJ='', I'd
also drop patch-compat_h as it makes no difference.
Use TLS for HOMEPAGE and HTTPS.
Feedback?
Index: Makefile
===
RCS file: /cvs/ports/www/stagit/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jan 2018 23:15:03 - 1.6
+++ Makefile8 Apr 2018 13:56:00 -
@@ -2,22 +2,25 @@
COMMENT = static git page generator
-DISTNAME = stagit-0.7.2
+DISTNAME = stagit-0.8
CATEGORIES = www
-HOMEPAGE = http://git.2f30.org/stagit/
+HOMEPAGE = https://git.2f30.org/stagit/
# MIT/X Consortium License
PERMIT_PACKAGE_CDROM = Yes
# uses pledge()
WANTLIB = c git2
+
LIB_DEPENDS = devel/libgit2/libgit2>=0.22
-MASTER_SITES = http://dl.2f30.org/releases/
+MASTER_SITES = https://dl.2f30.org/releases/
-MAKE_FLAGS=GITINC=${LOCALBASE}/include \
+MAKE_FLAGS=CFLAGS='${CFLAGS}' \
+ COMPATOBJ='' \
+ GITINC=${LOCALBASE}/include \
GITLIB=${LOCALBASE}/lib
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/www/stagit/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo12 Jan 2018 23:15:03 - 1.5
+++ distinfo8 Apr 2018 13:56:00 -
@@ -1,2 +1,2 @@
-SHA256 (stagit-0.7.2.tar.gz) = JfrLfOOE8dLwbFNnU+J1SzgDe0gsalRhluvr9MNLetQ=
-SIZE (stagit-0.7.2.tar.gz) = 16845
+SHA256 (stagit-0.8.tar.gz) = 3w0+/hopdY5BUh1Ku8cSvPv+++uDeUXylRIf9oC8KKY=
+SIZE (stagit-0.8.tar.gz) = 17378
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 12 Jan 2018 23:15:03 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.3 2018/01/12 23:15:03 juanfra Exp $
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -25,7 +25,7 @@ COMPATOBJ = \
- strlcat.o\
- strlcpy.o
-
--OBJ = ${SRC:.c=.o} ${COMPATOBJ}
-+OBJ = ${SRC:.c=.o}
-
- all: ${BIN}
-
-@@ -49,11 +49,11 @@ dist:
-
- ${OBJ}: config.mk ${HDR}
-
--stagit: stagit.o ${COMPATOBJ}
-- ${CC} -o $@ stagit.o ${COMPATOBJ} ${LDFLAGS}
-+stagit: stagit.o
-+ ${CC} -o $@ stagit.o ${LDFLAGS}
-
--stagit-index: stagit-index.o ${COMPATOBJ}
-- ${CC} -o $@ stagit-index.o ${COMPATOBJ} ${LDFLAGS}
-+stagit-index: stagit-index.o
-+ ${CC} -o $@ stagit-index.o ${LDFLAGS}
-
- clean:
- rm -f ${BIN} ${OBJ} ${NAME}-${VERSION}.tar.gz
Index: patches/patch-compat_h
===
RCS file: patches/patch-compat_h
diff -N patches/patch-compat_h
--- patches/patch-compat_h 26 Apr 2016 13:53:10 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-compat_h,v 1.1.1.1 2016/04/26 13:53:10 juanfra Exp $
compat.h.orig Tue Apr 26 02:15:26 2016
-+++ compat.h Tue Apr 26 02:16:53 2016
-@@ -1,6 +1,8 @@
-+#if 0
- #undef strlcat
- size_t strlcat(char *, const char *, size_t);
- #undef strlcpy
- size_t strlcpy(char *, const char *, size_t);
- #undef reallocarray
- void *reallocarray(void *, size_t, size_t);
-+#endif
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/www/stagit/patches/patch-config_mk,v
retrieving revision 1.1
diff -u -p -r1.1 patch-config_mk
--- patches/patch-config_mk 9 May 2016 17:02:52 - 1.1
+++ patches/patch-config_mk 8 Apr 2018 13:56:00 -
@@ -1,8 +1,9 @@
config.mk.orig Sat May 7 15:07:28 2016
-+++ config.mk Mon May 9 13:36:03 2016
+Index: config.mk
+--- config.mk.orig
config.mk
@@ -29,4 +29,4 @@ LDFLAGS = -s ${LIBS}
CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD_SOURCE ${INCS}
# OpenBSD 5.9+: use pledge(2)
--#CPPFLAGS += -DUSE_PLEDGE
+-#CPPFLAGS = -D_XOPEN_SOURCE=700 -D_DEFAULT_SOURCE -D_BSD
UPDATE: www/stagit 0.7.2->0.8
Hi, This updates stagit from 0.7.2 to 0.8. stagit project changes: - Fix pledge(2) abort with newer libgit/libcurl: this is because libgit uses curl which uses some initialization checks, namely an IPv6 check which creates a socket. The pledge(2) is now done after this initialization. - Add -l option: limit the amount of commits for the log.html file. - Remove a non-portable syntax in Makefile. - Improve example script and documentation slightly. - style.css: improve compatibility with older browsers, namely dillo. - Minor optimization for the diffstat. No special changes in the Makefile: just a version bump. Patch below: >From c2b9a987137291293b496dffa83d974c23644e2b Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Sun, 8 Apr 2018 15:08:39 +0200 Subject: [PATCH] stagit: update to 0.8 --- www/stagit/Makefile | 2 +- www/stagit/distinfo | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/stagit/Makefile b/www/stagit/Makefile index 3c1c3fb100b..c472f7ff153 100644 --- a/www/stagit/Makefile +++ b/www/stagit/Makefile @@ -2,7 +2,7 @@ COMMENT = static git page generator -DISTNAME = stagit-0.7.2 +DISTNAME = stagit-0.8 CATEGORIES = www diff --git a/www/stagit/distinfo b/www/stagit/distinfo index 635cf909b4f..83181d38808 100644 --- a/www/stagit/distinfo +++ b/www/stagit/distinfo @@ -1,2 +1,2 @@ -SHA256 (stagit-0.7.2.tar.gz) = JfrLfOOE8dLwbFNnU+J1SzgDe0gsalRhluvr9MNLetQ= -SIZE (stagit-0.7.2.tar.gz) = 16845 +SHA256 (stagit-0.8.tar.gz) = 3w0+/hopdY5BUh1Ku8cSvPv+++uDeUXylRIf9oC8KKY= +SIZE (stagit-0.8.tar.gz) = 17378 -- 2.16.2 -- Kind regards, Hiltjo
Re: UPDATE: www/gitea 1.3.2 => 1.4.0
ok for me
On 01/04/18 14:16 +0300, Pavel Korovin wrote:
> Dear all,
>
> Please see the diff for the latest www/gitea port attached.
> Changes: https://github.com/go-gitea/gitea/releases/tag/v1.4.0
> OK to commmit?
>
> --
> With best regards,
> Pavel Korovin
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/gitea/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 17 Jan 2018 21:05:38 - 1.8
> +++ Makefile 1 Apr 2018 11:01:21 -
> @@ -2,7 +2,7 @@
>
> COMMENT =compact self-hosted Git service
>
> -VERSION =1.3.2
> +VERSION =1.4.0
> GH_ACCOUNT = go-gitea
> GH_PROJECT = gitea
> GH_TAGNAME = v${VERSION}
> @@ -32,13 +32,17 @@ WRKSRC = ${MODGO_WORKSPACE}/src/${ALL_T
> SUBST_VARS +=VERSION
>
> pre-configure:
> - ${SUBST_CMD} ${WRKDIST}/{conf/app.ini,main.go}
> + ${SUBST_CMD} ${WRKDIST}/{custom/conf/app.ini.sample,main.go}
>
> do-install:
> ${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/gitea ${PREFIX}/sbin
> ${INSTALL_DATA_DIR} ${PREFIX}/share/gitea
> -.for _d in conf options public templates
> +.for _d in custom/conf options public templates
> cp -Rp ${WRKSRC}/${_d} ${PREFIX}/share/gitea
> .endfor
> +
> +post-install:
> + @find ${WRKINST} -type f -name '*.beforesubst' -exec rm {} \;
> + @find ${WRKINST} -type f -name '*.orig' -exec rm {} \;
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/gitea/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 17 Jan 2018 21:05:38 - 1.3
> +++ distinfo 1 Apr 2018 11:01:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (gitea-1.3.2.tar.gz) = mjUeQaq8CHDUNcry8J0qdmUuZ8kBygFW4p5Lh+zMFf8=
> -SIZE (gitea-1.3.2.tar.gz) = 14784167
> +SHA256 (gitea-1.4.0.tar.gz) = gkSktjhRVidf/XCSHSViZhwa2W5YC0yi71LnOVuBDxM=
> +SIZE (gitea-1.4.0.tar.gz) = 14983167
> Index: patches/patch-conf_app_ini
> ===
> RCS file: patches/patch-conf_app_ini
> diff -N patches/patch-conf_app_ini
> --- patches/patch-conf_app_ini17 Jan 2018 21:05:38 - 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,144 +0,0 @@
> -$OpenBSD: patch-conf_app_ini,v 1.3 2018/01/17 21:05:38 landry Exp $
> -Index: conf/app.ini
> conf/app.ini.orig
> -+++ conf/app.ini
> -@@ -1,12 +1,12 @@
> - ; App name that shows on every page title
> - APP_NAME = Gitea: Git with a cup of tea
> - ; Change it if you run locally
> --RUN_USER = git
> -+RUN_USER = _gitea
> - ; Either "dev", "prod" or "test", default is "dev"
> --RUN_MODE = dev
> -+RUN_MODE = prod
> -
> - [repository]
> --ROOT =
> -+ROOT = ${LOCALSTATEDIR}/gitea/gitea-repositories
> - SCRIPT_TYPE = bash
> - ; Default ANSI charset
> - ANSI_CHARSET =
> -@@ -42,7 +42,7 @@ LOCAL_COPY_PATH = tmp/local-repo
> - ; Whether repository file uploads are enabled. Defaults to `true`
> - ENABLED = true
> - ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on
> gitea restart)
> --TEMP_PATH = data/tmp/uploads
> -+TEMP_PATH = ${LOCALSTATEDIR}/gitea/data/tmp/uploads
> - ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any
> file type
> - ALLOWED_TYPES =
> - ; Max size of each file in MB. Defaults to 3MB
> -@@ -120,7 +120,7 @@ SSH_DOMAIN = %(DOMAIN)s
> - ; Network interface builtin SSH server listens on
> - SSH_LISTEN_HOST =
> - ; Port number to be exposed in clone URL
> --SSH_PORT = 22
> -+SSH_PORT =
> - ; Port number builtin SSH server listens on
> - SSH_LISTEN_PORT = %(SSH_PORT)s
> - ; Root path of SSH directory, default is '~/.ssh', but you have to use
> '/home/git/.ssh'.
> -@@ -155,13 +155,13 @@ DISABLE_ROUTER_LOG = false
> - ; not forget to export the private key):
> - ; $ openssl pkcs12 -in cert.pfx -out cert.pem -nokeys
> - ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes
> --CERT_FILE = custom/https/cert.pem
> --KEY_FILE = custom/https/key.pem
> -+CERT_FILE = ${LOCALSTATEDIR}/gitea/custom/https/cert.pem
> -+KEY_FILE = ${LOCALSTATEDIR}/gitea/custom/https/key.pem
> - ; Upper level of template and static file path
> - ; default is the path where Gitea is executed
> - STATIC_ROOT_PATH =
> - ; Default path for App data
> --APP_DATA_PATH = data
> -+APP_DATA_PATH = ${LOCALSTATEDIR}/gitea/data
> - ; Application level GZIP support
> - ENABLE_GZIP = false
> - ; Landing page for non-logged users, can be "home" or "explore"
> -@@ -182,7 +182,7 @@ DSA = 1024
> -
> - [database]
> - ; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice
> --DB_TYPE = mysql
> -+DB_TYPE = sqlite3
> - HOST = 127.0.0.1:3306
> - NAME = gitea
> - USER = root
> -@@ -190,14 +190,14 @@ PASSWD =
> - ; For "postgres" only, either "disable", "require" or "verify-full"
> - SSL_MODE = disable
> - ; For "sqlite3" and "tidb", use absolute path whe
update devel/arm-none-eabi/gcc-linaro to 7.2-2017.11
--disable-plugin avoids having to deal with shared libs including
libcc1 which by default isn't in a target directory and caused conflicts
between arm and aarch64 packages.
Built on a system with llvm 6.0.0, 6.3-2017.02 apparently didn't build
with llvm 6.0.0.
Index: Makefile
===
RCS file: /cvs/ports/devel/arm-none-eabi/gcc-linaro/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile29 Nov 2017 11:58:44 - 1.13
+++ Makefile8 Apr 2018 08:46:42 -
@@ -7,9 +7,8 @@ BROKEN-armv7= error during libgcc autoco
COMMENT= gcc for ${CONFIG} cross-development, Linaro version
-VERSION= 6.3-2017.02
+VERSION= 7.2-2017.11
DISTNAME= gcc-linaro-${VERSION}
-REVISION= 2
EXTRACT_SUFX= .tar.xz
PKGNAME= ${CONFIG}-gcc-linaro-${VERSION:S/-/./g}
@@ -24,7 +23,7 @@ CONFIG= arm-none-eabi
ERRORS+= "either aarch64 or arm FLAVOR should be set"
.endif
-GCC_VERSION= 6.3.1
+GCC_VERSION= 7.2.1
SUBST_VARS+= VERSION CONFIG GCC_VERSION
WANTLIB= c m ${COMPILER_LIBCXX} gmp mpfr mpc
@@ -66,7 +65,8 @@ CONFIGURE_ARGS+=--enable-languages=${LAN
--with-gmp=${LOCALBASE} \
--with-newlib \
--disable-lto \
- --enable-cpp
+ --enable-cpp \
+ --disable-plugin
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===
RCS file: /cvs/ports/devel/arm-none-eabi/gcc-linaro/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo8 May 2017 09:04:54 - 1.3
+++ distinfo8 Apr 2018 05:51:05 -
@@ -1,2 +1,2 @@
-SHA256 (gcc/gcc-linaro-6.3-2017.02.tar.xz) =
psFZkM49HD/FEcsuF8KUCWxNHB3TksrKd2JKbYhKAdg=
-SIZE (gcc/gcc-linaro-6.3-2017.02.tar.xz) = 80402340
+SHA256 (gcc/gcc-linaro-7.2-2017.11.tar.xz) =
ewcJXfUKEHifRGzsQhRo8QxX/ou2p4mnPcdYrPhHXLA=
+SIZE (gcc/gcc-linaro-7.2-2017.11.tar.xz) = 64692940
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/arm-none-eabi/gcc-linaro/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 8 May 2017 09:04:54 - 1.2
+++ patches/patch-Makefile_in 8 Apr 2018 05:51:05 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.2 2017/05/08 09:04:54 patrick Exp $
Makefile.in.orig Wed Feb 15 01:14:40 2017
-+++ Makefile.inWed May 3 09:53:45 2017
-@@ -952,32 +952,8 @@ configure-host: \
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -977,31 +977,8 @@ configure-host: \
maybe-configure-gotools
.PHONY: configure-target
configure-target: \
@@ -19,13 +20,12 @@ $OpenBSD: patch-Makefile_in,v 1.2 2017/0
-maybe-configure-target-libgfortran \
-maybe-configure-target-libobjc \
-maybe-configure-target-libgo \
+-maybe-configure-target-libhsail-rt \
-maybe-configure-target-libtermcap \
-maybe-configure-target-winsup \
-maybe-configure-target-libgloss \
-maybe-configure-target-libffi \
--maybe-configure-target-libjava \
-maybe-configure-target-zlib \
--maybe-configure-target-boehm-gc \
-maybe-configure-target-rda \
-maybe-configure-target-libada \
-maybe-configure-target-libgomp \
@@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2017/0
# The target built for a native non-bootstrap build.
.PHONY: all
-@@ -1109,44 +1085,10 @@ all-host: maybe-all-gotools
+@@ -1133,43 +1110,10 @@ all-host: maybe-all-gotools
.PHONY: all-target
@@ -63,13 +63,12 @@ $OpenBSD: patch-Makefile_in,v 1.2 2017/0
-all-target: maybe-all-target-libgfortran
-all-target: maybe-all-target-libobjc
-all-target: maybe-all-target-libgo
+-all-target: maybe-all-target-libhsail-rt
-all-target: maybe-all-target-libtermcap
-all-target: maybe-all-target-winsup
-all-target: maybe-all-target-libgloss
-all-target: maybe-all-target-libffi
--all-target: maybe-all-target-libjava
-all-target: maybe-all-target-zlib
--all-target: maybe-all-target-boehm-gc
-all-target: maybe-all-target-rda
-all-target: maybe-all-target-libada
-@if target-libgomp-no-bootstrap
@@ -80,7 +79,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2017/0
# Do a target for all the subdirectories. A ``make do-X'' will do a
# ``make X'' in all subdirectories (because, in general, there is a
-@@ -1213,32 +1155,8 @@ info-host: maybe-info-gotools
+@@ -1236,31 +1180,8 @@ info-host: maybe-info-gotools
.PHONY: info-target
@@ -98,13 +97,12 @@ $OpenBSD: patch-Makefile_in,v 1.2 2017/0
-info-target: maybe-info-target-libgfortran
-info-target: maybe-info-target-libobjc
-info-target: maybe-info-target-libgo
+-info-target: maybe-info-target-libhsail-rt
-info-target: maybe-info-target-libte
Re: mpd 0.20.18, mpc 0.29 & libmpdclient 2.14
On 2018-04-06 21:42:35, Landry Breuil wrote: > Hi, > > small updates, i only fought a bit with meson in the mpc update. Using > it now on amd64, probably needs testing on other archs. > Everything seems to work fine when paired with audio/ario on my amd64 system as well. -- Bryan
Re: UPDATE www/kcaldav
On Fri, Apr 06, 2018 at 03:30:57PM -0500, Aaron Poffenberger wrote: > On 2018/04/06 06:44, Stuart Henderson wrote: > > On 2018/04/06 10:42, Stefan Sperling wrote: > >> On Fri, Apr 06, 2018 at 03:11:45AM -0500, Aaron Poffenberger wrote: > >> > The following patch updates kcaldav to 0.1.6, making it compatible > >> > with kcgi-0.10.2. > >> > > >> > In addition to make kcaldav compatible with kcgi, Krtisaps accepted > >> > many of patches from the 0.1.4 port, and updated build to use gmake > >> > like kcgi. > >> > > >> > As a result, you'll find a lot of patch files were deleted. I'd recommend > >> > applying this patch with -E. > >> > > >> > --Aaron > >> > >> Doesn't build for me. > >> > >> The kcgi package ships no shared library, but this kcaldav ports > >> seems to be trying to link to kcgi as a shared library: > >> > >> cc -o kcaldav -static delete.o dynamic.o get.o kcaldav.o options.o > >> propfind.o property.o proppatch.o put.o util.o db.o kcaldav-sql.o > >> principal.o resource.o libkcaldav.a -lkcgi -lkcgixml -lkcgijson -lz > >> -lexpat -lsqlite3 -lm -lpthread > >> /usr/bin/ld: cannot find -lkcgi > > > > There's a static library though, it should probably find it if the right > > -L path is used. > > Sorry about that. The replacement patch below fixes the issue. > > It also fixes a small issue I reported to upstream. Comitted. Thanks!
Re: multimedia/mediatomb removal (and apache-couchdb ?)
On Sun, Apr 08, 2018 at 07:59:46AM +1000, Jonathan Matthew wrote: > On Sat, Apr 07, 2018 at 04:38:06PM +0100, Stuart Henderson wrote: > > On 2018/04/07 13:48, Landry Breuil wrote: > > > > > There are still 3 ports depending on lang/spidermonkey, which is from > > > the mozilla 3 days and hasnt been updated since 2010. This is probably > > > crippled with security issues, so i'd like to work towards removing it. > > > > > > databases/riak might be updatable, i havent checked to see if it still > > > relied on this ancient version of spidermonkey. > > > > I don't see anything that looks like a change in js engine in newer > > versions. > > > > It's not super-new but there's some discussion about use of spidermonkey > > at https://github.com/basho/riak/issues/427. It doesn't seem like something > > that will be changed in a hurry. > > Judging by this: > https://github.com/basho/riak_kv/commit/e895dc730488f699a1ddfb3a988accd289b0a378 > the js stuff will be removed entirely in riak 3. I think we can get away with > doing it earlier than that though. If no one objects (does anyone else even > use riak?) > I'll do that in the next update, which should be in the next few weeks. That would be great, thanks !
