Re: games/tome4 - remove powerpc arch
On Tue, November 21, 2017 19:19, Jeremie Courreges-Anglas wrote: > On Tue, Nov 21 2017, Sol?ne Rapenne wrote: >> Building games/tome4 on powerpc (macppc kernel) fail >> >> [-] >> Building luajit2 (release) >> Creating ../obj/Release/luajit2 >> mkdir -p ../obj/Release/luajit2 >> Running pre-build commands >> [---cut] >> In file included from ../src/luajit2/src/lj_obj.h:14:0, >> from ../src/luajit2/src/lj_dispatch.c:9: >> ../src/luajit2/src/lj_arch.h:321:2: error: #error "No support for >> little-endian PowerPC" >> #error "No support for little-endian PowerPC" >> ^ >> >> I propose to remove powerpc as a supported arch > > Fair proposal. lang/luajit has a patch to explicitely disable this > error message, plus another one for the generated asm. > > What I don't understand, though, is why luajit thinks that powerpc is > little-endian: our powerpc architecture is definitely big-endian. > > Could you please try to run ''make test'' in lang/luajit on powerpc? Hi! I'm currently trying to build tome4 on macppc. It will take some more time on my single core G5 :) But... audio/openal uses COMPILER=base-clang ports-clang ports-gcc and have no chance to be built on powerpc because llvm is marked broken on that arch. It builds with ports-gcc. > >> Index: Makefile >> === >> RCS file: /cvs/ports/games/tome4/Makefile,v >> retrieving revision 1.11 >> diff -u -p -r1.11 Makefile >> --- Makefile 19 Nov 2017 19:47:43 - 1.11 >> +++ Makefile 21 Nov 2017 12:38:45 - >> @@ -5,7 +5,7 @@ >> # Other arches will fail with >> # ../src/luajit2/src/lj_arch.h:55:2: error: #error "No support for >> # this architecture (yet)" >> -ONLY_FOR_ARCHS = powerpc i386 amd64 >> +ONLY_FOR_ARCHS = i386 amd64 >> >> COMMENT-main = graphical sdl rogue-like game >> COMMENT-data = data for Tales of Maj'Eyal >> >
UPDATE: games/chocolate-doom
After prodding from bentley@ about modified chunk canary crashes, when running with 'ln -s S /etc/malloc.conf', I had a go at resolving it. Lucky for me, the new sdl2-branch of chocolate-doom seems to neatly skirt around the issue. I first had a go at seeing if the current release could just be patched, but I got lost with no usable results. Here is an update to chocolate-doom 3.0.0beta1, which works with malloc S option set. I tested doom2, and a local chocolate-server + connect to localhost via chocolate-doom-setup. I quickly ran the heretic, hexen, and strife games and confirmed they start and the games play. For the port, I used the latest github sdl2-branch as a base, rather than an available chocolate-doom-3.0.0beta1 prerolled tarball from February 2017. This is because various little fixes to that branch have rolled in since then, and it is more or less stable until the actual release happens. The manpages were not available pre-built, and thus I had to do some dancing around with making sure its little manpage generator could successfully use a python2 executable. I am not sure if I did this right at all, and was having issues finding other examples in-tree. A push in the right direction appreciated if necessary. That all said, comments or OK? :-) -ryan ? chocolate-doom-3.0.0beta1.diff Index: Makefile === RCS file: /cvs/ports/games/chocolate-doom/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile13 Nov 2017 11:25:27 - 1.22 +++ Makefile22 Nov 2017 03:03:41 - @@ -1,10 +1,13 @@ # $OpenBSD: Makefile,v 1.22 2017/11/13 11:25:27 bentley Exp $ COMMENT = portable release of Doom, Heretic, Hexen, and Strife -V =2.3.0 -DISTNAME = chocolate-doom-${V} +DISTNAME = chocolate-doom-3.0.0beta1 + +GH_ACCOUNT = chocolate-doom +GH_PROJECT = chocolate-doom +GH_COMMIT =413f4ecd7aae41229cc7b40ea3275970dc18cdb4 + CATEGORIES = games x11 -REVISION = 0 HOMEPAGE = https://www.chocolate-doom.org/ @@ -13,42 +16,41 @@ MAINTAINER =Ryan Freeman https://www.chocolate-doom.org/downloads/${V}/ - RUN_DEPENDS = devel/desktop-file-utils - CONFIGURE_STYLE = gnu +AUTOMAKE_VERSION = 1.15 +AUTOCONF_VERSION = 2.69 -# we don't need to require python to build -CONFIGURE_ENV += HAVE_PYTHON=false +CONFIGURE_ARGS += --mandir="${LOCALBASE}/man" -MAN_5 =chocolate-doom.cfg default.cfg \ - chocolate-heretic.cfg heretic.cfg \ - chocolate-hexen.cfg hexen.cfg \ - chocolate-strife.cfg strife.cfg -MAN_6 =chocolate-doom chocolate-server chocolate-setup \ - chocolate-heretic chocolate-hexen chocolate-strife +# just used for generating manpages +BUILD_DEPENDS =lang/python/2.7 post-extract: # set correct data directory @sed -i 's,"/games/doom","/doom",g' ${WRKSRC}/src/d_iwad.c + # set correct python binary name + @sed -i 's/HAVE_PYTHON, python/HAVE_PYTHON, python2/' \ + ${WRKSRC}/configure.ac + @sed -i 's,/usr/bin/env python,/usr/bin/env python2,' \ + ${WRKSRC}/man/docgen + @sed -i 's,/usr/bin/env python,/usr/bin/env python2,' \ + ${WRKSRC}/man/simplecpp + +pre-configure: + @cd ${WRKSRC}; AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} autoreconf -fi post-install: # Data files get installed to this directory. ${INSTALL_DATA_DIR} ${PREFIX}/share/doom/ -.for m in ${MAN_5} - ${INSTALL_MAN} ${WRKBUILD}/man/$m.5 ${PREFIX}/man/man5/ -.endfor -.for m in ${MAN_6} - ${INSTALL_MAN} ${WRKBUILD}/man/$m.6 ${PREFIX}/man/man6/ -.endfor .include Index: distinfo === RCS file: /cvs/ports/games/chocolate-doom/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo3 Jan 2017 00:28:53 - 1.8 +++ distinfo22 Nov 2017 03:03:41 - @@ -1,2 +1,2 @@ -SHA256 (chocolate-doom-2.3.0.tar.gz) = Pm0agqxciwJalpXOHkfQ3G7RQuuxEpseSnDidA95FQw= -SIZE (chocolate-doom-2.3.0.tar.gz) = 2190744 +SHA256 (chocolate-doom-3.0.0beta1-413f4ecd.tar.gz) = sk9/S4B4hHH6vQ50L79qTeAPLZn+s04N7p/ND2T/YJA= +SIZE (chocolate-doom-3.0.0beta1-413f4ecd.tar.gz) = 2245692 Index: pkg/PLIST === RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- pkg/PLIST 3 Jan 2017 00:28:54 - 1.7 +++ pkg/PLIST 22 Nov 2017 03:03:41 - @@ -16,11 +16,15 @@ @man man/man5/heretic.cfg.5 @man man/man5/hexen.cfg.5 @man man/man5/strife.cfg.5 +@man man/man6/chocolate-doom-setup.6 @man man/man6/chocolate-doom.6 +@man man/man6/chocolate-heretic-setup.6 @man man/man6/chocolate-heretic.6 +@man man/man6/chocolate-hexen-setup.6 @man man/man6/cho
NEW: emulators/libretro-parallel-n64
Attached is a new port for a nice Nintendo 64 emulator core, for retroarch. It has several video backends within itself, and by default it autodetects the best one to use. In my testing, it plays several games with less glitches (practically none?) compared to even the mupen64plus standalone port in-tree! This includes the ability to display the in-track video screens in Mario Kart 64, or properly draw the puzzel-piece effect used in Banjo-Kazooie. Unfortunately, the license of this left me with more unanswered questions than answers. I have tried to be as verbose on that matter as possible, but am unsure if we can even distribute via PERMIT_PACKAGE_FTP. Port passes lib-depends-check, port-lib-depends-check, and portcheck. Comments? OK? -ryan libretro-parallel-n64.tar.gz Description: application/tar-gz
[UPDATE] games/ioquake
Hi, brynet@ reported a segfault when it uses openal/sndio backend due to the fact there is no capture device handling. ioquake3 enables VOIP support by default, the solution would be to disable it. Hope it is good. Kind regards. Index: Makefile === RCS file: /cvs/ports/games/ioquake3/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile10 Nov 2017 14:59:52 - 1.18 +++ Makefile21 Nov 2017 22:03:19 - @@ -6,6 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386 COMMENT= clone of the original Quake III Arena DISTNAME= ioquake3-2017.11.09 +REVISION= 0 GH_ACCOUNT=ioquake GH_PROJECT=ioq3 @@ -28,7 +29,7 @@ LIB_DEPENDS= audio/libogg \ devel/sdl2 \ net/curl -MAKE_ENV= V=1 USE_INTERNAL_OGG=0 CC="${CC}" TOOLS_CC="${CC}" +MAKE_ENV= V=1 USE_VOIP=0 USE_INTERNAL_OGG=0 CC="${CC}" TOOLS_CC="${CC}" ALL_TARGET="release" USE_GMAKE= Yes NO_TEST= Yes
Re: PHP remove unused CONFIGURE_ARGS
ping On 11/17/17 08:03, Martijn van Duren wrote: > OK? > > martijn@ > > Index: Makefile.inc > === > RCS file: /cvs/ports/lang/php/Makefile.inc,v > retrieving revision 1.99 > diff -u -p -r1.99 Makefile.inc > --- Makefile.inc 16 Nov 2017 18:37:01 - 1.99 > +++ Makefile.inc 17 Nov 2017 07:03:02 - > @@ -69,7 +69,6 @@ CONFIGURE_ARGS+=--enable-shared \ > --with-pear=${LOCALBASE}/share/php-${PV} \ > --with-config-file-scan-dir=${SYSCONFDIR}/php-${PV} \ > --with-pdo-sqlite \ > - --enable-sqlite-utf8 \ > --with-sqlite3 \ > --program-suffix=-${PV} \ > --with-readline > @@ -98,8 +97,6 @@ CONFIGURE_ARGS+=--with-openssl \ > --enable-sysvshm \ > --enable-mbstring \ > --enable-exif \ > - --enable-zend-multibyte \ > - --enable-fastcgi \ > --enable-fpm \ > --with-fpm-user=www \ > --with-fpm-group=www > @@ -256,7 +253,7 @@ WANTLIB-soap= iconv m pthread z xml2>=8 > # snmp > MULTI_PACKAGES+= -snmp > COMMENT-snmp=snmp protocol extensions for php > -CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack > +CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} > LIB_DEPENDS-snmp=net/net-snmp > WANTLIB-snmp=crypto m netsnmp>=6.2 pthread > >
Re: games/tome4 - remove powerpc arch
Le 2017-11-21 17:19, Jeremie Courreges-Anglas a écrit : On Tue, Nov 21 2017, Solène Rapenne wrote: Building games/tome4 on powerpc (macppc kernel) fail I propose to remove powerpc as a supported arch Fair proposal. lang/luajit has a patch to explicitely disable this error message, plus another one for the generated asm. What I don't understand, though, is why luajit thinks that powerpc is little-endian: our powerpc architecture is definitely big-endian. Could you please try to run ''make test'' in lang/luajit on powerpc? `make test` in lang/luajit on powerpc shows "hello world" as expected and the package compile fine.
Re: games/tome4 - remove powerpc arch
On Tue, Nov 21 2017, Solène Rapenne wrote: > Building games/tome4 on powerpc (macppc kernel) fail > > [-] > Building luajit2 (release) > Creating ../obj/Release/luajit2 > mkdir -p ../obj/Release/luajit2 > Running pre-build commands > [---cut] > In file included from ../src/luajit2/src/lj_obj.h:14:0, > from ../src/luajit2/src/lj_dispatch.c:9: > ../src/luajit2/src/lj_arch.h:321:2: error: #error "No support for > little-endian PowerPC" > #error "No support for little-endian PowerPC" > ^ > > I propose to remove powerpc as a supported arch Fair proposal. lang/luajit has a patch to explicitely disable this error message, plus another one for the generated asm. What I don't understand, though, is why luajit thinks that powerpc is little-endian: our powerpc architecture is definitely big-endian. Could you please try to run ''make test'' in lang/luajit on powerpc? > Index: Makefile > === > RCS file: /cvs/ports/games/tome4/Makefile,v > retrieving revision 1.11 > diff -u -p -r1.11 Makefile > --- Makefile 19 Nov 2017 19:47:43 - 1.11 > +++ Makefile 21 Nov 2017 12:38:45 - > @@ -5,7 +5,7 @@ > # Other arches will fail with > # ../src/luajit2/src/lj_arch.h:55:2: error: #error "No support for > # this architecture (yet)" > -ONLY_FOR_ARCHS = powerpc i386 amd64 > +ONLY_FOR_ARCHS = i386 amd64 > > COMMENT-main = graphical sdl rogue-like game > COMMENT-data = data for Tales of Maj'Eyal > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
[UPDATE] devel/zeal 0.3.1 => 0.4.0
Hi ports@ Attaching a bump to devel/zeal port changes: - regen WANTLIB - drop Qt5Sql as devel/sqlite3 is now used directly - switch from qmake to cmake upstream changelog: https://github.com/zealdocs/zeal/releases/tag/v0.4.0 Feedback? OK's? Regards, Adam Index: Makefile === RCS file: /cvs/ports/devel/zeal/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile30 Jul 2017 14:54:28 - 1.6 +++ Makefile21 Nov 2017 16:05:24 - @@ -7,8 +7,7 @@ COMMENT = simple offline API documentati GH_ACCOUNT = zealdocs GH_PROJECT = zeal -GH_TAGNAME = v0.3.1 -REVISION = 1 +GH_TAGNAME = v0.4.0 CATEGORIES = devel @@ -19,12 +18,17 @@ MAINTAINER =Adam Wolk
Re: x11/xclip: avoid printf %s NULL
On Tue, Nov 21 2017, Theo Buehler wrote: > On Tue, Nov 21, 2017 at 12:25:38AM -0700, Anthony J. Bentley wrote: >> Theo Buehler writes: >> > $ unset DISPLAY; xclip >> > Error: Can't open display: (null) >> > $ tail -1 /var/log/messages >> > Nov 18 11:53:55 mimine xclip: vfprintf %s NULL in "Error: Can't open >> > display: >> > %s " >> > >> > ok? >> > >> > Index: Makefile >> > === >> > RCS file: /var/cvs/ports/x11/xclip/Makefile,v >> > retrieving revision 1.15 >> > diff -u -p -r1.15 Makefile >> > --- Makefile 13 Sep 2016 20:13:38 - 1.15 >> > +++ Makefile 18 Nov 2017 10:56:55 - >> > @@ -4,6 +4,7 @@ COMMENT= command line interface to X se >> > GH_ACCOUNT= astrand >> > GH_PROJECT= xclip >> > GH_TAGNAME= 0.13 >> > +REVISION= 0 >> > CATEGORIES= x11 >> > >> > MAINTAINER= Dmitrij D. Czarkoff >> > Index: patches/patch-xcprint_c >> > === >> > RCS file: patches/patch-xcprint_c >> > diff -N patches/patch-xcprint_c >> > --- /dev/null 1 Jan 1970 00:00:00 - >> > +++ patches/patch-xcprint_c18 Nov 2017 10:55:49 - >> > @@ -0,0 +1,19 @@ >> > +$OpenBSD$ >> > + >> > +Avoid printf "%s" NULL >> > + >> > +Index: xcprint.c >> > +--- xcprint.c.orig >> > xcprint.c >> > +@@ -86,7 +86,10 @@ errxdisplay(char *display) >> > + if (display == NULL) >> > + display = getenv("DISPLAY"); >> > + >> > +-fprintf(stderr, "Error: Can't open display: %s\n", display); >> > ++if (display == NULL || *display == '\0') >> > ++ fprintf(stderr, "Error: Can't open display\n"); >> > ++else >> > ++ fprintf(stderr, "Error: Can't open display: %s\n", display); >> > + exit(EXIT_FAILURE); >> > + } >> > + >> >> This makes the error vague when you actually have DISPLAY unset, e.g., >> ssh'd into the wrong machine... I would prefer to keep the same output >> in the null case. > > Alright, let's do the usual thing, then. I didn't wrap the line because > there are longer lines already. ok jca@ > Index: Makefile > === > RCS file: /var/cvs/ports/x11/xclip/Makefile,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile > --- Makefile 13 Sep 2016 20:13:38 - 1.15 > +++ Makefile 18 Nov 2017 10:56:55 - > @@ -4,6 +4,7 @@ COMMENT= command line interface to X se > GH_ACCOUNT= astrand > GH_PROJECT= xclip > GH_TAGNAME= 0.13 > +REVISION=0 > CATEGORIES= x11 > > MAINTAINER= Dmitrij D. Czarkoff > Index: patches/patch-xcprint_c > === > RCS file: patches/patch-xcprint_c > diff -N patches/patch-xcprint_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-xcprint_c 21 Nov 2017 08:35:08 - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +Avoid printf "%s" NULL > + > +Index: xcprint.c > +--- xcprint.c.orig > xcprint.c > +@@ -86,7 +86,7 @@ errxdisplay(char *display) > + if (display == NULL) > + display = getenv("DISPLAY"); > + > +-fprintf(stderr, "Error: Can't open display: %s\n", display); > ++fprintf(stderr, "Error: Can't open display: %s\n", display ? display : > "(null)"); > + exit(EXIT_FAILURE); > + } > + > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
UPDATE sysutils/u-boot 2017.11
Index: Makefile === RCS file: /cvs/ports/sysutils/u-boot/Makefile,v retrieving revision 1.28 diff -u -p -r1.28 Makefile --- Makefile12 Sep 2017 05:42:17 - 1.28 +++ Makefile15 Nov 2017 00:14:27 - @@ -6,7 +6,7 @@ FLAVORS=aarch64 arm FLAVOR?= arm COMMENT= U-Boot firmware -VERSION= 2017.09 +VERSION= 2017.11 DISTNAME= u-boot-${VERSION} PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//} FULLPKGNAME= ${PKGNAME} Index: distinfo === RCS file: /cvs/ports/sysutils/u-boot/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- distinfo12 Sep 2017 05:42:17 - 1.13 +++ distinfo15 Nov 2017 00:15:02 - @@ -1,2 +1,2 @@ -SHA256 (u-boot-2017.09.tar.bz2) = stFfLPX3LnBgJc3nPWckfG2ozTX34QiR7v59kJUIl0Q= -SIZE (u-boot-2017.09.tar.bz2) = 11434323 +SHA256 (u-boot-2017.11.tar.bz2) = agGP08r1jz3Poj7piagr013wOvcYcrncqMbXWKDSbAU= +SIZE (u-boot-2017.11.tar.bz2) = 11982382 Index: patches/patch-lib_efi_loader_efi_device_path_c === RCS file: patches/patch-lib_efi_loader_efi_device_path_c diff -N patches/patch-lib_efi_loader_efi_device_path_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-lib_efi_loader_efi_device_path_c 21 Nov 2017 12:29:25 - @@ -0,0 +1,15 @@ +$OpenBSD$ + +Index: lib/efi_loader/efi_device_path.c +--- lib/efi_loader/efi_device_path.c.orig lib/efi_loader/efi_device_path.c +@@ -431,6 +431,9 @@ static void *dp_part_fill(void *buf, struct blk_desc * + if (hddp->signature_type != 0) + memcpy(hddp->partition_signature, &desc->guid_sig, + sizeof(hddp->partition_signature)); ++ else ++ memset(hddp->partition_signature, 0, ++ sizeof(hddp->partition_signature)); + + buf = &hddp[1]; + } Index: patches/patch-scripts_Makefile_lib === RCS file: patches/patch-scripts_Makefile_lib diff -N patches/patch-scripts_Makefile_lib --- patches/patch-scripts_Makefile_lib 30 Jul 2017 05:53:03 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-scripts_Makefile_lib,v 1.3 2017/07/30 05:53:03 jsg Exp $ - -Index: scripts/Makefile.lib scripts/Makefile.lib.orig -+++ scripts/Makefile.lib -@@ -309,7 +309,7 @@ quiet_cmd_dtc = DTC $@ - # Bring in any U-Boot-specific include at the end of the file - cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ - cat $< $(if $(u_boot_dtsi),\ -- | sed "$$ a\#include \"$(u_boot_dtsi)\"") | \ -+ | gsed "$$ a\#include \"$(u_boot_dtsi)\"") | \ - $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ - $(DTC) -O dtb -o $@ -b 0 \ - -i $(dir $<) $(DTC_FLAGS) \
[UPDATE] security/plaso
Hi, this is the diff to update plaso to latest release. Ok? Cheers, Remi.Index: Makefile === RCS file: /cvs/ports/security/plaso/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- Makefile 6 Nov 2017 09:03:26 - 1.2 +++ Makefile 21 Nov 2017 14:56:16 - @@ -2,7 +2,7 @@ COMMENT = engine and tools to automate creation of super timeline -MODPY_EGG_VERSION = 20170930 +MODPY_EGG_VERSION = 20171118 DISTNAME = plaso-${MODPY_EGG_VERSION} CATEGORIES = security Index: distinfo === RCS file: /cvs/ports/security/plaso/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo 6 Nov 2017 09:03:26 - 1.2 +++ distinfo 21 Nov 2017 14:56:16 - @@ -1,2 +1,2 @@ -SHA256 (plaso-20170930.tar.gz) = v8v7gVRl/RAjVobtCUQXwZmCJTIMxH5uXGvY7KEFelI= -SIZE (plaso-20170930.tar.gz) = 108785888 +SHA256 (plaso-20171118.tar.gz) = cPrtMrIsWq88vD36MA7V0TmJLPbq97B+T4v4Fpe90GE= +SIZE (plaso-20171118.tar.gz) = 108788580 Index: pkg/PLIST === RCS file: /cvs/ports/security/plaso/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 6 Nov 2017 09:03:26 - 1.2 +++ pkg/PLIST 21 Nov 2017 14:57:08 - @@ -109,6 +109,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/output_modules.pyc lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/parsers.py lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/parsers.pyc +lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/profiling.py +lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/profiling.pyc lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/server_config.py lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/server_config.pyc lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/shared_4n6time_output.py @@ -385,6 +387,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/plaso/formatters/skydrivelog.pyc lib/python${MODPY_VERSION}/site-packages/plaso/formatters/skype.py lib/python${MODPY_VERSION}/site-packages/plaso/formatters/skype.pyc +lib/python${MODPY_VERSION}/site-packages/plaso/formatters/sophos_av.py +lib/python${MODPY_VERSION}/site-packages/plaso/formatters/sophos_av.pyc lib/python${MODPY_VERSION}/site-packages/plaso/formatters/ssh.py lib/python${MODPY_VERSION}/site-packages/plaso/formatters/ssh.pyc lib/python${MODPY_VERSION}/site-packages/plaso/formatters/symantec.py @@ -453,6 +457,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/plaso/lib/errors.pyc lib/python${MODPY_VERSION}/site-packages/plaso/lib/lexer.py lib/python${MODPY_VERSION}/site-packages/plaso/lib/lexer.pyc +lib/python${MODPY_VERSION}/site-packages/plaso/lib/line_reader_file.py +lib/python${MODPY_VERSION}/site-packages/plaso/lib/line_reader_file.pyc lib/python${MODPY_VERSION}/site-packages/plaso/lib/objectfilter.py lib/python${MODPY_VERSION}/site-packages/plaso/lib/objectfilter.pyc lib/python${MODPY_VERSION}/site-packages/plaso/lib/pfilter.py @@ -574,6 +580,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/plaso/parsers/docker.pyc lib/python${MODPY_VERSION}/site-packages/plaso/parsers/dpkg.py lib/python${MODPY_VERSION}/site-packages/plaso/parsers/dpkg.pyc +lib/python${MODPY_VERSION}/site-packages/plaso/parsers/dsv_parser.py +lib/python${MODPY_VERSION}/site-packages/plaso/parsers/dsv_parser.pyc lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb.py lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb.pyc lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/ @@ -692,6 +700,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/shell_items.pyc lib/python${MODPY_VERSION}/site-packages/plaso/parsers/skydrivelog.py lib/python${MODPY_VERSION}/site-packages/plaso/parsers/skydrivelog.pyc +lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sophos_av.py +lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sophos_av.pyc lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite.py lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite.pyc lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/
[UPDATE] security/py-dfvfs
Hi, this is the diff to update py-dfvfs to latest release. Ok? Cheers, Remi.Index: Makefile === RCS file: /cvs/ports/security/py-dfvfs/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile 4 Nov 2017 14:33:38 - 1.3 +++ Makefile 21 Nov 2017 14:48:11 - @@ -2,7 +2,7 @@ COMMENT = Digital Forensics Virtual File System (dfVFS) -MODPY_EGG_VERSION = 20170723 +MODPY_EGG_VERSION = 20171022 DISTNAME = py-dfvfs-${MODPY_EGG_VERSION} GH_ACCOUNT = log2timeline Index: distinfo === RCS file: /cvs/ports/security/py-dfvfs/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo 4 Nov 2017 14:33:38 - 1.3 +++ distinfo 21 Nov 2017 14:48:11 - @@ -1,2 +1,2 @@ -SHA256 (py-dfvfs-20170723.tar.gz) = aX9wUvuLOanDJyv0tJdsQRfgyVWjg/egwdm+f8gbqpo= -SIZE (py-dfvfs-20170723.tar.gz) = 77691337 +SHA256 (py-dfvfs-20171022.tar.gz) = PRexEL0iAyDjYmEpVHRPUIvCVzDeMxy6fR2wkmUrF/c= +SIZE (py-dfvfs-20171022.tar.gz) = 77691789
[UPDATE] security/py-dfdatetime
Hi, this is the diff to update py-dfdatetime to latest release. Ok? Cheers, Remi.Index: Makefile === RCS file: /cvs/ports/security/py-dfdatetime/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- Makefile 9 Oct 2017 18:42:42 - 1.2 +++ Makefile 21 Nov 2017 14:44:15 - @@ -2,7 +2,7 @@ COMMENT = Digital Forensics date and time -MODPY_EGG_VERSION = 20170719 +MODPY_EGG_VERSION = 20171109 DISTNAME = py-dfdatetime-${MODPY_EGG_VERSION} GH_ACCOUNT = log2timeline Index: distinfo === RCS file: /cvs/ports/security/py-dfdatetime/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo 9 Oct 2017 18:42:42 - 1.2 +++ distinfo 21 Nov 2017 14:44:15 - @@ -1,2 +1,2 @@ -SHA256 (py-dfdatetime-20170719.tar.gz) = l8Hmn74anCXBHlktXPIjwY6ToItXKPpXMogwkK1Qg50= -SIZE (py-dfdatetime-20170719.tar.gz) = 72711 +SHA256 (py-dfdatetime-20171109.tar.gz) = TtQyq/inkzvrOyPmYizwzI1eWdXspeMz7jrO4bmwXgs= +SIZE (py-dfdatetime-20171109.tar.gz) = 77099
tiff 4.0.9
Hi, here's an update to graphics/tiff, with lots of fuzzing fixes which *might* be important, as usual with gfx libraries.. see http://www.simplesystems.org/libtiff/v4.0.9.html for the full list of changes. Bumped libtiff's minor for some symbol additions. Will put it in a bulk unless someone beats me to it. Landry ? tiff-4.0.8-libtiff.so.40.1 ? tiff-4.0.8-libtiffxx.so.40.1 ? tiff-4.0.9-libtiff.so.40.1 ? tiff-4.0.9-libtiffxx.so.40.1 Index: Makefile === RCS file: /cvs/ports/graphics/tiff/Makefile,v retrieving revision 1.84 diff -u -r1.84 Makefile --- Makefile26 Jul 2017 22:45:24 - 1.84 +++ Makefile21 Nov 2017 13:39:44 - @@ -2,9 +2,8 @@ COMMENT= tools and library routines for working with TIFF images -DISTNAME= tiff-4.0.8 -REVISION = 1 -SHARED_LIBS= tiff40.1# 7.6 +DISTNAME= tiff-4.0.9 +SHARED_LIBS= tiff40.2# 7.6 SHARED_LIBS+= tiffxx 40.1# 7.6 CATEGORIES=graphics Index: distinfo === RCS file: /cvs/ports/graphics/tiff/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- distinfo26 May 2017 20:50:57 - 1.20 +++ distinfo21 Nov 2017 13:39:44 - @@ -1,2 +1,2 @@ -SHA256 (tiff-4.0.8.tar.gz) = WdelqMzZIFmRPyRod9uVopGObAT7nUP9dOXDOQ2sKRA= -SIZE (tiff-4.0.8.tar.gz) = 2065574 +SHA256 (tiff-4.0.9.tar.gz) = bnve7CwxBzTnNNGarjpx6+N6TYQuDiPbsbiSHAAmz80= +SIZE (tiff-4.0.9.tar.gz) = 2305681 Index: patches/patch-test_Makefile_in === RCS file: /cvs/ports/graphics/tiff/patches/patch-test_Makefile_in,v retrieving revision 1.9 diff -u -r1.9 patch-test_Makefile_in --- patches/patch-test_Makefile_in 29 Nov 2016 20:00:35 - 1.9 +++ patches/patch-test_Makefile_in 21 Nov 2017 13:39:44 - @@ -2,9 +2,10 @@ Avoid picking up an old libtiff in ${LOCALBASE}. test/Makefile.in.orig Sat Nov 19 18:40:22 2016 -+++ test/Makefile.in Thu Nov 24 21:44:23 2016 -@@ -525,10 +525,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +Index: test/Makefile.in +--- test/Makefile.in.orig test/Makefile.in +@@ -526,10 +526,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ Index: pkg/PLIST === RCS file: /cvs/ports/graphics/tiff/pkg/PLIST,v retrieving revision 1.25 diff -u -r1.25 PLIST --- pkg/PLIST 26 May 2017 20:50:57 - 1.25 +++ pkg/PLIST 21 Nov 2017 13:39:44 - @@ -241,3 +241,4 @@ share/doc/tiff/v4.0.6.html share/doc/tiff/v4.0.7.html share/doc/tiff/v4.0.8.html +share/doc/tiff/v4.0.9.html
games/tome4 - remove powerpc arch
Building games/tome4 on powerpc (macppc kernel) fail [-] Building luajit2 (release) Creating ../obj/Release/luajit2 mkdir -p ../obj/Release/luajit2 Running pre-build commands [---cut] In file included from ../src/luajit2/src/lj_obj.h:14:0, from ../src/luajit2/src/lj_dispatch.c:9: ../src/luajit2/src/lj_arch.h:321:2: error: #error "No support for little-endian PowerPC" #error "No support for little-endian PowerPC" ^ I propose to remove powerpc as a supported arch Index: Makefile === RCS file: /cvs/ports/games/tome4/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile19 Nov 2017 19:47:43 - 1.11 +++ Makefile21 Nov 2017 12:38:45 - @@ -5,7 +5,7 @@ # Other arches will fail with # ../src/luajit2/src/lj_arch.h:55:2: error: #error "No support for # this architecture (yet)" -ONLY_FOR_ARCHS = powerpc i386 amd64 +ONLY_FOR_ARCHS = i386 amd64 COMMENT-main = graphical sdl rogue-like game COMMENT-data = data for Tales of Maj'Eyal
Re: [UPDATE] graphics/sxiv 2.3.1 -> 24
On Tue, Nov 21, 2017 at 01:44:44AM -0700, Anthony J. Bentley wrote: > Klemens Nanni writes: > > On Mon, Nov 06, 2017 at 02:21:41AM +0100, Klemens Nanni wrote: > > > Hey ports@, > > > > > > here's a simple diff updating sxiv to the newest release; Yes, upstream > > > jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes, > > > I've also updated the description as upstream did. > > > (snip) > > > -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \ > > > - CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \ > > > - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif > > -lgif" > > > +MAKE_FLAGS = CC=${CC} \ > > > + PREFIX=${PREFIX} \ > > No need to set PREFIX. PREFIX is hard coded to /usr/local in sxiv's Makefile and MANPATH uses it so why not letting users set PREFIX as they wish? Not passing it via MAKE_FLAGS would honor the user's PREFIX for MANPATH only. > Also, I set V=1 so we can actually see the compiler commands. > > > > + CFLAGS="${CFLAGS} -I${X11BASE}/include -I${X11BASE}/include/fre > > etype2 -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify" \ > > > + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib -L${LOC > > ALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif -Wl,-rpath > > ${ > > LOCALBASE}/lib/inotify" > > Couple things. Existing LDFLAGS don't need to be passed to LDFLAGS, > because unlike CFLAGS it's not a standard variable likely to be in > mk.conf. Also, sxiv uses LDLIBS for the -l chain so we don't have to > repeat it. Thanks, that's better. > > > > post-install: > > > - cd ${WRKSRC}/icon && make install > > > + make -C ${WRKSRC}/icon install > > No need for a cosmetic change like this... > > > Here's a (very) slightly modified version of your diff per above. I > don't understand the inotify stuff, but it matches what existing ports > do, so... Using inotify sxiv can automatically reload the currently displayed image if it changes on disk. > > Index: Makefile > === > RCS file: /cvs/ports/graphics/sxiv/Makefile,v > retrieving revision 1.10 > diff -u -p -r1.10 Makefile > --- Makefile 6 May 2017 13:45:49 - 1.10 > +++ Makefile 21 Nov 2017 08:39:17 - > @@ -1,11 +1,10 @@ > # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $ > > -COMMENT =simple (or small or suckless) X Image Viewer > +COMMENT =simple X Image Viewer > > GH_PROJECT = sxiv > GH_ACCOUNT = muennich > -GH_TAGNAME = v1.3.2 > -REVISION = 0 > +GH_TAGNAME = v24 > > CATEGORIES = graphics x11 > > @@ -14,17 +13,20 @@ MAINTAINER = Matthew Via # GPLv2+ > PERMIT_PACKAGE_CDROM = Yes > > -WANTLIB += Imlib2 exif gif X11 c > +WANTLIB += Imlib2 X11 Xft c exif gif lib/inotify/inotify > > RUN_DEPENDS =devel/desktop-file-utils \ > x11/gtk+3,-guic > > -LIB_DEPENDS =graphics/imlib2 \ > +LIB_DEPENDS =devel/libinotify \ > + graphics/imlib2 \ > graphics/libexif > > -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \ > - CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \ > - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif > -lgif" > +MAKE_FLAGS = CC="${CC}" \ > + V=1 \ > + MANPREFIX=${PREFIX}/man \ > + CFLAGS="${CFLAGS} -I${X11BASE}/include > -I${X11BASE}/include/freetype2 -I${LOCALBASE}/include > -I${LOCALBASE}/include/inotify" \ > + LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib > -L${LOCALBASE}/lib/inotify -linotify -Wl,-rpath ${LOCALBASE}/lib/inotify" > > NO_TEST =Yes > > Index: distinfo > === > RCS file: /cvs/ports/graphics/sxiv/distinfo,v > retrieving revision 1.5 > diff -u -p -r1.5 distinfo > --- distinfo 24 Dec 2015 21:54:09 - 1.5 > +++ distinfo 21 Nov 2017 08:39:17 - > @@ -1,2 +1,2 @@ > -SHA256 (sxiv-1.3.2.tar.gz) = n1No3o8PV+eOvgLLUxoxEHqZPydpzsUbzI1w9cZotlM= > -SIZE (sxiv-1.3.2.tar.gz) = 46560 > +SHA256 (sxiv-24.tar.gz) = UR3EXRKWKvnDHDBozmvKS4MqYmOUaye+/qSaSM8BkRA= > +SIZE (sxiv-24.tar.gz) = 47148 > Index: patches/patch-Makefile > === > RCS file: /cvs/ports/graphics/sxiv/patches/patch-Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-Makefile > --- patches/patch-Makefile24 Dec 2015 21:54:09 - 1.4 > +++ patches/patch-Makefile21 Nov 2017 08:39:17 - > @@ -1,53 +1,31 @@ > $OpenBSD: patch-Makefile,v 1.4 2015/12/24 21:54:09 mmcc Exp $ > Makefile.origSun Dec 20 07:21:25 2015 > -+++ Makefile Wed Dec 23 20:01:02 2015 > -@@ -11,11 +11,11 @@ LIBS := -lX11 -lImlib2 > - > - # optional dependencies: > - # giflib: gif animations > --CPPFLAGS += -DHAVE_GIFLIB > --LIBS += -lgif > -+CPPFLAGS += -DHAVE_GIFLIB > -+LIBS += -lgif > -
Re: fix PHP version in doku wiki
On Tue Nov 21, 2017 at 08:59:51AM +0100, Landry Breuil wrote: > On Mon, Nov 20, 2017 at 10:46:35PM +0100, Rafael Sadowski wrote: > > Hi All! > > > > Today I installed dokwiki on OpenBSD 6.2 and ran into different php > > issues. I uninstalled the default php 5.6 version and replaces it with > > php 7.x. Now everything works as usual. > > > > Please find below a simple -current diff. After an okay I would like to > > commit the same diff into -stable. > > > > Ok? Comments? > > Well, sorry but no. Upstream clearly states on > https://www.dokuwiki.org/requirements that 5.6 is the minimal version > ("but newer versions are highly recommended"), so that should work - but > since you didnt say what "different php issues" were we cant really > tell.. > > Landry > use-case: create a dokwiki account PHP message: PHP Fatal error: Uncaught exception 'Exception' with message 'There is no suitable CSPRNG installed on your system' in /dokuwiki/vendor/paragonie/random_compat/lib/random.php:203 Stack trace: #0 /dokuwiki/vendor/paragonie/random_compat/lib/random_int.php(153): random_bytes(1) #1 /dokuwiki/inc/PassHash.class.php(630): random_int(0, 61) #2 /dokuwiki/inc/PassHash.class.php(110): PassHash->random(0, 61) #3 /dokuwiki/inc/PassHash.class.php(127): PassHash->gen_salt(8) #4 /dokuwiki/inc/PassHash.class.php(153): PassHash->init_salt(NULL, 8) #5 /dokuwiki/install.php(390): PassHash->hash_smd5('Anibas') #6 /dokuwiki/install.php(142): store_data(Array) #7 {main} thrown in /dokuwiki/vendor/paragonie/random_compat/lib/random.php on line 203 "Note: Although this function was added to PHP in PHP 7.0, a » userland implementation is available for PHP 5.2 to 5.6, inclusive." -- http://php.net/manual/en/function.random-bytes.php
Re: x11/xclip: avoid printf %s NULL
On Tue, Nov 21, 2017 at 12:25:38AM -0700, Anthony J. Bentley wrote: > Theo Buehler writes: > > $ unset DISPLAY; xclip > > Error: Can't open display: (null) > > $ tail -1 /var/log/messages > > Nov 18 11:53:55 mimine xclip: vfprintf %s NULL in "Error: Can't open > > display: > > %s " > > > > ok? > > > > Index: Makefile > > === > > RCS file: /var/cvs/ports/x11/xclip/Makefile,v > > retrieving revision 1.15 > > diff -u -p -r1.15 Makefile > > --- Makefile13 Sep 2016 20:13:38 - 1.15 > > +++ Makefile18 Nov 2017 10:56:55 - > > @@ -4,6 +4,7 @@ COMMENT=command line interface to X se > > GH_ACCOUNT=astrand > > GH_PROJECT=xclip > > GH_TAGNAME=0.13 > > +REVISION= 0 > > CATEGORIES=x11 > > > > MAINTAINER=Dmitrij D. Czarkoff > > Index: patches/patch-xcprint_c > > === > > RCS file: patches/patch-xcprint_c > > diff -N patches/patch-xcprint_c > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ patches/patch-xcprint_c 18 Nov 2017 10:55:49 - > > @@ -0,0 +1,19 @@ > > +$OpenBSD$ > > + > > +Avoid printf "%s" NULL > > + > > +Index: xcprint.c > > +--- xcprint.c.orig > > xcprint.c > > +@@ -86,7 +86,10 @@ errxdisplay(char *display) > > + if (display == NULL) > > + display = getenv("DISPLAY"); > > + > > +-fprintf(stderr, "Error: Can't open display: %s\n", display); > > ++if (display == NULL || *display == '\0') > > ++ fprintf(stderr, "Error: Can't open display\n"); > > ++else > > ++ fprintf(stderr, "Error: Can't open display: %s\n", display); > > + exit(EXIT_FAILURE); > > + } > > + > > This makes the error vague when you actually have DISPLAY unset, e.g., > ssh'd into the wrong machine... I would prefer to keep the same output > in the null case. Alright, let's do the usual thing, then. I didn't wrap the line because there are longer lines already. Index: Makefile === RCS file: /var/cvs/ports/x11/xclip/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile13 Sep 2016 20:13:38 - 1.15 +++ Makefile18 Nov 2017 10:56:55 - @@ -4,6 +4,7 @@ COMMENT=command line interface to X se GH_ACCOUNT=astrand GH_PROJECT=xclip GH_TAGNAME=0.13 +REVISION= 0 CATEGORIES=x11 MAINTAINER=Dmitrij D. Czarkoff Index: patches/patch-xcprint_c === RCS file: patches/patch-xcprint_c diff -N patches/patch-xcprint_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-xcprint_c 21 Nov 2017 08:35:08 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Avoid printf "%s" NULL + +Index: xcprint.c +--- xcprint.c.orig xcprint.c +@@ -86,7 +86,7 @@ errxdisplay(char *display) + if (display == NULL) + display = getenv("DISPLAY"); + +-fprintf(stderr, "Error: Can't open display: %s\n", display); ++fprintf(stderr, "Error: Can't open display: %s\n", display ? display : "(null)"); + exit(EXIT_FAILURE); + } +
Re: [UPDATE] graphics/sxiv 2.3.1 -> 24
Klemens Nanni writes: > On Mon, Nov 06, 2017 at 02:21:41AM +0100, Klemens Nanni wrote: > > Hey ports@, > > > > here's a simple diff updating sxiv to the newest release; Yes, upstream > > jumped from 2.3.1 to 24 not 2.4. These are mostly mechanical changes, > > I've also updated the description as upstream did. > > (snip) > > -MAKE_FLAGS = CC=${CC} MANPREFIX=${PREFIX}/man \ > > - CFLAGS="${CFLAGS} -I${X11BASE}/include -I${PREFIX}/include" \ > > - LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib -lX11 -lImlib2 -lexif > -lgif" > > +MAKE_FLAGS = CC=${CC} \ > > + PREFIX=${PREFIX} \ No need to set PREFIX. Also, I set V=1 so we can actually see the compiler commands. > > + CFLAGS="${CFLAGS} -I${X11BASE}/include -I${X11BASE}/include/fre > etype2 -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify" \ > > + LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib -L${LOC > ALBASE}/lib/inotify -lX11 -lXft -lImlib2 -lexif -linotify -lgif -Wl,-rpath ${ > LOCALBASE}/lib/inotify" Couple things. Existing LDFLAGS don't need to be passed to LDFLAGS, because unlike CFLAGS it's not a standard variable likely to be in mk.conf. Also, sxiv uses LDLIBS for the -l chain so we don't have to repeat it. > > post-install: > > - cd ${WRKSRC}/icon && make install > > + make -C ${WRKSRC}/icon install No need for a cosmetic change like this... Here's a (very) slightly modified version of your diff per above. I don't understand the inotify stuff, but it matches what existing ports do, so... Index: Makefile === RCS file: /cvs/ports/graphics/sxiv/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile6 May 2017 13:45:49 - 1.10 +++ Makefile21 Nov 2017 08:39:17 - @@ -1,11 +1,10 @@ # $OpenBSD: Makefile,v 1.10 2017/05/06 13:45:49 fcambus Exp $ -COMMENT = simple (or small or suckless) X Image Viewer +COMMENT = simple X Image Viewer GH_PROJECT = sxiv GH_ACCOUNT = muennich -GH_TAGNAME = v1.3.2 -REVISION = 0 +GH_TAGNAME = v24 CATEGORIES = graphics x11 @@ -14,17 +13,20 @@ MAINTAINER =Matthew Via $(DESTDIR)$(MANPREFIX)/man1/sxiv.1 +- sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 \ +- >$(DESTDIR)$(MANPREFIX)/man1/sxiv.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sxiv.1 +- @echo "INSTALL share/sxiv/" - mkdir -p $(DESTDIR)$(PREFIX)/share/sxiv/exec - cp exec/* $(DESTDIR)$(PREFIX)/share/sxiv/exec/ - chmod 755 $(DESTDIR)$(PREFIX)/share/sxiv/exec/* + ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin + ${BSD_INSTALL_PROGRAM} sxiv ${DESTDIR}${PREFIX}/bin ++ sed -i "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1 -+ sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 > sxiv.1.tmp -+ mv sxiv.1.tmp sxiv.1 + ${BSD_INSTALL_MAN} sxiv.1 ${DESTDIR}${MANPREFIX}/man1 + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/sxiv -+ ${BSD_INSTALL_DATA} exec/image-info ${DESTDIR}${PREFIX}/share/examples/sxiv -+ ${BSD_INSTALL_DATA} exec/key-handler ${DESTDIR}${PREFIX}/share/examples/sxiv ++ ${BSD_INSTALL_DATA} exec/* ${DESTDIR}${PREFIX}/share/examples/sxiv uninstall: - rm -f $(DESTDIR)$(PREFIX)/bin/sxiv + @echo "REMOVE bin/sxiv" Index: patches/patch-sxiv_1 === RCS file: /cvs/ports/graphics/sxiv/patches/patch-sxiv_1,v retrieving revision 1.1 diff -u -p -r1.1 patch-sxiv_1 --- patches/patch-sxiv_125 Dec 2015 02:03:00 - 1.1 +++ patches/patch-sxiv_121 Nov 2017 08:39:17 - @@ -1,8 +1,9 @@ $OpenBSD: patch-sxiv_1,v 1.1 2015/12/25 02:03:00 mmcc Exp $ sxiv.1.origSun Dec 20 07:21:25 2015 -+++ sxiv.1 Wed Dec 23 20:11:36 2015 -@@ -354,7 +354,7 @@ image gets loaded. The path of this script is - and the first argument to this script is the path of the loaded image. +Index: sxiv.1 +--- sxiv.1.orig sxiv.1 +@@ -381,7 +381,7 @@ and the arguments given to it are: 1) path to image fi + 3) image height. .P There is also an example script installed together with sxiv as -.IR PREFIX/share/sxiv/exec/image-info . @@ -10,7 +11,7 @@ $OpenBSD: patch-sxiv_1,v 1.1 2015/12/25 .SH EXTERNAL KEY HANDLER Additional external keyboard commands can be defined using a handler program located in -@@ -372,7 +372,7 @@ where C/M/S indicate Ctrl/Meta(Alt)/Shift modifier sta +@@ -399,7 +399,7 @@ where C/M/S indicate Ctrl/Meta(Alt)/Shift modifier sta keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix. There is also an example script installed together with sxiv as Index: pkg/DESCR === RCS file: /cvs/ports/graphics/sxiv/pkg/DESCR,v retrieving revision 1.2 diff -u -p -r1.2 DESCR --- pkg
Re: fix PHP version in doku wiki
On Mon, Nov 20, 2017 at 10:46:35PM +0100, Rafael Sadowski wrote: > Hi All! > > Today I installed dokwiki on OpenBSD 6.2 and ran into different php > issues. I uninstalled the default php 5.6 version and replaces it with > php 7.x. Now everything works as usual. > > Please find below a simple -current diff. After an okay I would like to > commit the same diff into -stable. > > Ok? Comments? Well, sorry but no. Upstream clearly states on https://www.dokuwiki.org/requirements that 5.6 is the minimal version ("but newer versions are highly recommended"), so that should work - but since you didnt say what "different php issues" were we cant really tell.. Landry