CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2018/08/19 17:45:00 Modified files: lang/gprolog : Makefile Added files: lang/gprolog/patches: patch-Ma2Asm_powerpc_any_c Log message: Let gprolog build on macppc. Maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2018/08/19 14:23:25 Modified files: databases/influxdb: Makefile distinfo databases/influxdb/pkg: PLIST Log message: Update to influxdb 1.6.1. ok remi@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2018/08/19 12:18:00 Modified files: geo/geoclue2 : Makefile distinfo Log message: update to geoclue2-2.4.12
Update emulators/mednafen 0.9.48 -> 1.21.3
This upgrades mednafen to the latest released version. Initial diff from an...@disroot.org, some changes by me. I tested most of the emulator types, and all appear to work except SNES, which crashes for me right after the window opens, with no useful debug output. Not sure if that is a regression or not, or if it is due to my video card. I generally use snes9x for SNES emulation. Ports-wise, the main change is that mednafen now requires SDL2. OKs? Thanks, Jeremy Index: Makefile === RCS file: /cvs/ports/emulators/mednafen/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- Makefile21 Nov 2017 00:13:00 - 1.24 +++ Makefile17 Aug 2018 19:13:00 - @@ -3,8 +3,7 @@ BROKEN-hppa = ../../include/mednafen/state.h:21:7: error: 'exception_ptr' in namespace 'std' does not name a type COMMENT = emulates numerous game consoles -DISTNAME = mednafen-0.9.48 -REVISION = 0 +DISTNAME = mednafen-1.21.3 CATEGORIES = emulators games HOMEPAGE = https://mednafen.github.io @@ -17,27 +16,26 @@ PERMIT_PACKAGE_CDROM = Yes MASTER_SITES = ${HOMEPAGE}/releases/files/ EXTRACT_SUFX = .tar.xz -WANTLIB += SDL c iconv intl m pthread sndfile sndio usbhid z -WANTLIB += FLAC ogg vorbis vorbisenc ${COMPILER_LIBCXX} +WANTLIB += SDL2 c iconv intl m pthread sndfile sndio usbhid z +WANTLIB += FLAC ogg samplerate vorbis vorbisenc ${COMPILER_LIBCXX} USE_GMAKE =Yes COMPILER = base-clang ports-gcc LIB_DEPENDS = audio/libsndfile \ devel/gettext \ - devel/sdl + devel/sdl2 WRKDIST = ${WRKDIR}/mednafen USE_WXNEEDED = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ENV =CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL" \ +CONFIGURE_ENV =CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2" \ LDFLAGS="-L${LOCALBASE}/lib -pthread -nopie" CONFIGURE_ARGS = --disable-alsa \ --disable-rpath \ --disable-jack \ - --with-x \ --with-gnu-ld # this intrinsic is not supported with our old gcc Index: distinfo === RCS file: /cvs/ports/emulators/mednafen/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo14 Nov 2017 06:46:20 - 1.10 +++ distinfo17 Aug 2018 17:02:11 - @@ -1,2 +1,2 @@ -SHA256 (mednafen-0.9.48.tar.xz) = 08wMg49JZRGUbW6hj9pZZdK3FXfGEKzIEYNcyH0VIQI= -SIZE (mednafen-0.9.48.tar.xz) = 3203080 +SHA256 (mednafen-1.21.3.tar.xz) = LnYeiDSwmLfxqzXcyqbSvnFe6RBs9Ar0kZ9spLme48Y= +SIZE (mednafen-1.21.3.tar.xz) = 3208956
Re: Porting puNES emulator on OpenBSD
You are absolutely right. Thank you for your suggestion. https://github.com/punesemu/puNES/tree/openbsd
Re: Porting puNES emulator on OpenBSD
Hi Fabio -- On 08/19/18 12:55, FHorse Author wrote: I have attached the new patch in which I added the sndio support. I developed it on my linux box and it works perfectly but tested on the virtual machine it didn't help me much, the virtual system is too slow to get usable feedback. Fabio Cavallo Since your software is being hosted on GitHub, it might be easier for you to make a separate branch and pointing interested parties to that, rather than sending large-ish diffs to the mailing list. I'll look at this a little later today. ~Brian
Re: net/nng
Hi -- On 08/19/18 12:32, francisc.si...@evalgo.org wrote: Hey Jason, thank you for the information. Here is the tar.gz port file attached to this email. :-) Jason Valencia hat am 19. August 2018 um 18:10 geschrieben: francisc.si...@evalgo.org wrote: What are the next steps, what should I do to bring it into the ports tree? The normal way it to make a gzipped tarball of the port and send it to this list (ports@). To do that, go to the directory containing the port and run some variation of: $ tar -czf nng.tar.gz nng And attach the resulting file in an email to this list. I'll preface by saying that you should read (or re-read) the porter's handbook in the FAQ, and perhaps the manual pages for ports (`apropos ports' should get you started). Your COMMENT is not a comment; "light-weight brokerless messaging" would be a start. But maybe it's more correct to say it's a "light-weight brokerless messaging library" or something? Maybe "suite"? I don't know, I've never heard of this software but I feel like it needs some sort of clarifying word at the end. You use one of GH_* or MASTER_SITES, not both. See Makefile.template in PORTSDIR/infrastructure/templates. Also, the MASTER_SITES points to a different repo than GH_ACCOUNT, so pick one. It seems like you're trying to use an intermediate version, which makes sense to my reading since OpenBSD support was just added upstream. So you should host your own tarball instead and version it accordingly. Judging by the release structure of nng, it would be something like 1.0.1.20180819, at least that's how I usually do such things (though it's not the only way you can do it). This will fix your distinfo as a side effect, which is good because currently the distinfo entries are unacceptable since they're not versioned. There's no license marker. See Makefile.template, or any other port Makefile. You should rearrange all variables according to Makefile.template and reel in extra tabs. You have a SHARED_LIBS line but no shared libraries listed in pkg/PLIST. You should use MODULES=devel/cmake only, see port-modules(5). You have both a MODULES line and a BDEP line. If you're using the cmake MODULE, it automagically uses Ninja, so you don't need a ninja BDEP line either. If you have unzip listed in BDEPs because you're downloading a zip file, don't do that. The ports infrastructure is smart enough to do that for you. So basically, you don't need the BDEPs at all here. You don't need SEPARATE_BUILD or CONFIGURE_ARGS, as the cmake MODULES does this for you. Your pkg/DESCR isn't a description. Please look at any other port, but perhaps best to look at a port that does something similar to nng for a model to follow. You are using the old PLIST @comment $RCS ID$ line. Meaning you either made this port on OpenBSD 6.3 (you should be using -current in that case), you made this a very long time ago, or you did it by hand. There are convenient `make plist' and `make update-plist' targets that do this for you. Start with that and resubmit. Then we can move on to building and run-testing this. ~Brian
Re: Porting puNES emulator on OpenBSD
I have attached the new patch in which I added the sndio support. I developed it on my linux box and it works perfectly but tested on the virtual machine it didn't help me much, the virtual system is too slow to get usable feedback. Fabio Cavallo diff --git a/autogen.sh b/autogen.sh index 872167c6..07e8905d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,3 +1,16 @@ #!/bin/sh +if [[ "$(uname)" == "OpenBSD" ]] ; then + if [[ -z "${AUTOCONF_VERSION:-}" ]] ; then + export AUTOCONF_VERSION + AUTOCONF_VERSION="$(ls -1 /usr/local/bin/autoreconf-* | sort | tail -n 1)" + AUTOCONF_VERSION="${AUTOCONF_VERSION##*-}" + fi + if [[ -z "${AUTOMAKE_VERSION:-}" ]] ; then + export AUTOMAKE_VERSION + AUTOMAKE_VERSION="$(ls -1 /usr/local/bin/automake-* | sort | tail -n 1)" + AUTOMAKE_VERSION="${AUTOMAKE_VERSION##*-}" + fi +fi + autoreconf -vif diff --git a/configure.ac b/configure.ac index 647763b0..4b51688c 100644 --- a/configure.ac +++ b/configure.ac @@ -108,14 +108,29 @@ AS_CASE(["$host_os"], CUSTOMDEFINES="${CUSTOMDEFINES} -DWITH_OPENGL -DGLEW_STATIC" my_CPPFLAGS="${my_CPPFLAGS} -I${TOP_SRCDIR}/src/gui/linux -I${TOP_SRCDIR}/src/video/sdl" linux=yes + openbsd=no windows=no with_d3d9=no with_opengl=yes ], + [openbsd*], [ + MOCDEFINES="${MOCDEFINES} -D__OpenBSD__" + CUSTOMDEFINES="${CUSTOMDEFINES} -DWITH_OPENGL -DGLEW_STATIC" + my_CPPFLAGS="${my_CPPFLAGS} -I${TOP_SRCDIR}/src/gui/openbsd -I${TOP_SRCDIR}/src/video/sdl" + linux=no + openbsd=yes + windows=no + with_d3d9=no + with_opengl=yes + my_CXXFLAGS="-fmessage-length=0 -finline-functions" + export CC + export CXX + ], [mingw32*], [ MOCDEFINES="${MOCDEFINES} -D__WIN32__" my_CPPFLAGS="${my_CPPFLAGS} -I${TOP_SRCDIR}/src/gui/windows" linux=no + openbsd=no windows=yes AS_IF([test "x$with_opengl" = xyes], [ with_d3d9=no @@ -142,6 +157,7 @@ AS_CASE(["$host_os"], ) AM_CONDITIONAL(LINUX,[test "x$linux" = xyes]) +AM_CONDITIONAL(OPENBSD,[test "x$openbsd" = xyes]) AM_CONDITIONAL(WINDOWS,[test "x$windows" = xyes]) AM_CONDITIONAL(ENAB_RELEASE,[test "x$enable_release" = xyes]) AM_CONDITIONAL(ENAB_QT5,[test "x$enable_qt5" = xyes]) @@ -864,6 +880,37 @@ void blah(){ my_LIBS="${my_LIBS} ${alsa_LIBS}" ]) +AM_COND_IF([OPENBSD], [ + AM_COND_IF([WITH_OPENGL_CG], [ + PKG_CHECK_MODULES(nvidia_cg_toolkit_pkgconfig, [nvidia-cg-toolkit-gl], [ + CUSTOMDEFINES="${CUSTOMDEFINES} -DWITH_OPENGL_CG" + my_CPPFLAGS="${my_CPPFLAGS} ${nvidia_cg_toolkit_pkgconfig_CFLAGS}" + my_LIBS="${my_LIBS} ${nvidia_cg_toolkit_pkgconfig_LIBS}" + ], [ + # Check if NVIDIA CG toolkit is present without pkg-config + AC_MSG_CHECKING([NVIDIA CG toolkit is present]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +#include "Cg/cg.h" +#include "Cg/cgGL.h" +void blah(){ + CGcontext cgx = cgCreateContext(); +}]) + ], [ +AC_MSG_RESULT([yes]) +CUSTOMDEFINES="${CUSTOMDEFINES} -DWITH_OPENGL_CG" +my_LIBS="${my_LIBS} -lCg -lCgGL" + ], [ +AC_MSG_RESULT([no]) + ]) + ]) + ]) + AC_CHECK_LIB(sndio, main, [ + my_LIBS="${my_LIBS} -lsndio" + ], [ + AC_MSG_ERROR([libsdnio.so not found]) + ]) +]) + AS_CASE(["$host_os"], [mingw32*], [ AC_CHECK_TOOL(WINDRES, windres, [no]) @@ -893,6 +940,12 @@ AC_SUBST(LIB7ZIP_SRC) AC_SUBST(LIB7ZIP_LIBS) # The End +AM_COND_IF([LINUX], [ + my_LIBS="${my_LIBS} -ldl -lpthread" +]) +AM_COND_IF([OPENBSD], [ + my_LIBS="${my_LIBS} -lstdc++ -lpthread" +]) AM_COND_IF([WINDOWS], [ AM_COND_IF([ENAB_RELEASE], [ my_LDFLAGS="${my_LDFLAGS} -Wl,-subsystem,windows" @@ -902,9 +955,6 @@ AM_COND_IF([WINDOWS], [ my_LDFLAGS="${my_LDFLAGS} -static-libgcc -static-libstdc++" my_LIBS="${my_LIBS} -lwinmm -luuid -lole32 -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lgdi32 -loleaut32 -lcomdlg32 -limm32 -lwinspool" ]) -AM_COND_IF([LINUX], [ - my_LIBS="${my_LIBS} -ldl -lpthread" -]) AC_SUBST(CUSTOMDEFINES) AC_SUBST(MOCDEFINES) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 19712065..0be11b95 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -21,6 +21,11 @@ libaudio_a_SOURCES += \ alsa/snd.c endif +if OPENBSD +libaudio_a_SOURCES += \ + sndio/snd.c +endif + if WINDOWS libaudio_a_SOURCES += \ xaudio/snd.c diff --git a/src/audio/sndio/snd.c b/src/audio/sndio/snd.c index e69de29b..4eb24484 100644 --- a/src/audio/sndio/snd.c +++ b/src/audio/sndio/snd.c @@ -0,0 +1,447 @@ +/* + * Copyright (C) 2010-2019 Fabio Cavallo (aka FHorse) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy
Re: net/nng
Hey Jason, thank you for the information. Here is the tar.gz port file attached to this email. :-) > Jason Valencia hat am 19. August 2018 um 18:10 > geschrieben: > > > francisc.si...@evalgo.org wrote: > > What are the next steps, what should I do to bring it into the ports > > tree? > The normal way it to make a gzipped tarball of the port and send it to > this list (ports@). To do that, go to the directory containing the port > and run some variation of: > > $ tar -czf nng.tar.gz nng > > And attach the resulting file in an email to this list. > nng.tar.gz Description: GNU Zip compressed data signature.asc Description: PGP signature
Re: net/nng
francisc.si...@evalgo.org wrote: > What are the next steps, what should I do to bring it into the ports > tree? The normal way it to make a gzipped tarball of the port and send it to this list (ports@). To do that, go to the directory containing the port and run some variation of: $ tar -czf nng.tar.gz nng And attach the resulting file in an email to this list.
[NEW/WIP] Qflow porting // [4/7] qrouter
Dear ports@ readers, enclosed please find a port for qrouter [1], the tool required by Qflow [2] for routing: [... snip ...] $ pkg_info qrouter Information for inst:qrouter-1.3.104 Comment: multi-level, over-the-cell maze router for VLSI design Description: Qrouter is a tool to generate metal layers and vias to physically connect together a netlist in a VLSI fabrication technology. It is a maze router, otherwise known as an "over-the-cell" router or "sea-of-gates" router. That is, unlike a channel router, it begins with a description of placed standard cells, usually packed together at minimum spacing, and places metal routes over the standard cells. Qrouter uses the open standard LEF and DEF formats as file input and output. It takes the cell definitions from a LEF file, and analyzes the geometry for each cell to determine contact points and route obstructions. It then reads the cell placement, pin placement, and netlist from a DEF file, performs the detailed route, and writes an annotated DEF file as output. Maintainer: Alessandro De Laurenzis WWW: http://opencircuitdesign.com/qrouter/ [... snip ...] This port is very similar to cad/xcircuit (same author, same overall "style", but older code), so I tried to stay as close as possible to the correspondent Makefile. There are two branches, "stable" and "development"; choosing the former should reduce the maintainer's work :-), so the port is for the stable latest release, 1.3.104. configure.in and qrouter.h must be lightly patched in order to behave correctly when the __OpenBSD__ identifier is present. I also patched Makefile.in since it seems that ${X_LIBS} is missing from a target which requires it (I'll report this to upstream in the coming days). Compiles and runs correctly on amd64, lightly tested in Qflow. Of course, I step-up for maintainership. [1] http://opencircuitdesign.com/qrouter/index.html [2] https://marc.info/?l=openbsd-ports=153270090320035=2 -- Alessandro DE LAURENZIS [mailto:jus...@atlantide.t28.net] Web: http://www.atlantide.t28.net LinkedIn: http://it.linkedin.com/in/delaurenzis qrouter.tar.gz Description: application/gzip
Re: [NEW/WIP] Qflow porting // [3/7] graywolf
Hi Brian, On 08/17/18 17:33, Brian Callahan wrote: I think this one is fine. The other one is probably a little too much. ~Brian [... snip ...] graywolf is a fork of TimberWolf 6.3.5, a placement tool used in VLSI design. TimberWolf is an integrated set of placement (and routing) programs, based on the general combinatorial optimization technique known as simulated annealing. Its last open-source distribution by Yale University is suitable for standard cell, macro/custom cell, and gate-array professional-grade placement. The main improvement in graywolf is that the build process is more streamlined and that it behaves as a normal tool - you can call it from anywhere and no environment variables must be set first. graywolf is mainly used together with Qflow (http://opencircuitdesign.com/qflow/). [... snip ...] I finally had a look at the new graywolf's release. Upstream has been very active in the last weeks and made 3 point releases for 0.1.5 and a brand new 0.1.6. I considered directly the latter, of course. We can save 2 patches (for src/Ylib/okmalloc.c and src/date/getdate.c), but we need to remove a (unintended?) cast to void from src/genrows/draw.c cmake is now able to include and link libs from OPENBSD_X11BASE, but still need a patch because they added devel/gsl as LIB_DEPENDS and OPENBSD_LOCALBASE is not seen. No regression in my (limited) set of test-cases. Updated tarball attached. Ok to import? -- Alessandro DE LAURENZIS [mailto:jus...@atlantide.t28.net] Web: http://www.atlantide.t28.net LinkedIn: http://it.linkedin.com/in/delaurenzis graywolf.tar.gz Description: application/gzip
[UPDATE] sysutils/p5-File-Rename 0.20 -> 1.00
Hi ports, Here is an update for sysutils/p5-File-Rename, a perl module that renames files using regular expressions, including a 'rename' script for direct command-line use. What's new upstream (full changelog[1]): - File::Rename::Options has been added, it's used for parsing the script options - Various fixes and improved test suite What's new in the port: - Followed Stuart Henderson's suggestion [2] to rename 'rename' to 'prename' as it's usually found by this name on other operating systems. It shouldn't cause too much disruption doing it now, as the port has been imported ~ 3 months ago. A MESSAGE has been added to this effect, and DESCR modified accordingly. - A DESCR example of prename wasn't working. I fixed it. Testing: Tested with proot on amd64 (it's noarch anyway): - 'make test' returns PASSED - i've let pod coverage as-is, but checked that manpages are properly generated. - prename examples given in DESCR are working - Tried the module itself with a simple example: perl -e 'use File::Rename; File::Rename::rename(["/etc/motd"], {_code=>sub{s/m/M/}, verbose=>1, no_action=>1})' Any comment and feedback is welcome! Charlène. [1] https://metacpan.org/changes/distribution/File-Rename [2] https://marc.info/?l=openbsd-ports=152767952308067=2 p5-File-Rename.diff Description: Binary data
devel/protobuf on macppc
Hi! Building devel/protobuf on macppc fails with the error: /usr/bin/libtool --tag=CXX --mode=link c++ -std=c++11 -pthread -DHAVE_PTHREAD=1 -DHAVE_ZLIB=1 -Wall -Wno-sign-compare -O2 -pipe -pthread -o protoc google/protobuf/compiler/main.o libprotobuf.la libprotoc.la -lz libtool: link: c++ -o .libs/protoc -pthread -std=c++11 -DHAVE_PTHREAD=1 -DHAVE_ZLIB=1 -Wall -Wno-sign-compare -O2 -pipe google/protobuf/compiler/main.o -L.libs -lprotobuf -lz -lprotoc -Wl,-rpath-link,/usr/local/lib .libs/libprotobuf.so.3.0: warning: sprintf() is often misused, please use snprintf() .libs/libprotobuf.so.3.0: undefined reference to `__atomic_fetch_add_8' collect2: error: ld returned 1 exit status Adding CONFIGURE_ENV += LIBS=-latomic fixes the build. Is it a right thing to add for gcc arches? Or it's powerpc-specific? I haven't seen such tweaks in other ports.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/08/19 03:36:43 Modified files: graphics/gegl04: Makefile distinfo graphics/gegl04/patches: patch-operations_seamless-clone_Makefile_in Log message: Update to gegl04-0.4.8.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/08/19 03:23:40 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py-botocore-1.10.80.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/08/19 03:23:50 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.15.81.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/08/19 03:06:20 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py-boto3-1.7.80.
Re: NEW: graphics/mypaint-brushes [2/3]
On 08/18/18 22:08, Rafael Sadowski wrote: > On Fri Aug 17, 2018 at 03:13:14PM +0200, Giovanni Bechis wrote: >> On 08/16/18 06:51, Elias M. Mariani wrote: >>> Required to update GIMP to 2.10.4. >>> Requires graphics/libmypaint in previous mail. >>> https://marc.info/?l=openbsd-ports=15343949955 >>> >>> Brushes used by MyPaint and other software using libmypaint. >>> >>> Cheers. >>> Elias. >>> >> gimp 2.4.10 (wip) works fine. >> ok giovanni@ if someone wants to commit. >> Cheers >> Giovanni >> > > Please use SETENV like: > > cd ${WRKSRC} && ${SETENV} AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ > AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh > correct, ok giovanni@ with this fix added. Giovanni
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/08/19 03:00:45 Modified files: mail/mailpile : Makefile productivity/gbirthday: Makefile sysutils/boar : Makefile sysutils/google-cloud-sdk: Makefile Log message: Drop the empty do-build target and use NO_BUILD=Yes and MODPY_BUILDDEP=Yes.
Re: Unable to fetch tarballs from github archive
On Sat, Aug 18, 2018 at 11:39:50PM -0600, Anthony J. Bentley wrote: > > just noticed that I'm no more able to fetch tarballs for ports relying > > on github's on-the-fly archive creation... > > GitHub's autogenerated tarballs have had URLs like the following for as > long as I can remember: > > https://github.com/tklauser/libtar/archive/v1.2.20.tar.gz > > Notice how the filename is ${GH_TAGNAME}, and doesn't include the name > of the project. > > The trouble is the ports infrastructure fetches ${GH_TAGNAME}/${DISTNAME}. > This happened to work but was undocumented. > > https://github.com/tklauser/libtar/archive/v1.2.20/libtar-1.2.20.tar.gz > > It looks like we'll have to rename it afterward, or use some other trick > (like "${GH_TAGNAME}.tar.gz?/${DISTNAME}.tar.gz"). This solves the issue for me. I'm not an expert on the inner workings of the ports infrastructure, so there might be a better way. Comments? Index: infrastructure/mk/bsd.port.mk === RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v retrieving revision 1.1438 diff -u -p -r1.1438 bsd.port.mk --- infrastructure/mk/bsd.port.mk 9 Aug 2018 19:53:41 - 1.1438 +++ infrastructure/mk/bsd.port.mk 19 Aug 2018 08:22:22 - @@ -607,7 +607,8 @@ GH_ACCOUNT ?= GH_PROJECT ?= .if !empty(GH_PROJECT) && !empty(GH_TAGNAME) -DISTNAME ?=${GH_PROJECT}-${GH_TAGNAME:C/^v//} +DISTNAME ?=${GH_TAGNAME:C/^v//} +DISTFILES ?= ${GH_PROJECT:L}-${DISTNAME}{${DISTNAME}}.tar.gz .endif PKGNAME ?= ${DISTNAME} @@ -1159,7 +1160,7 @@ ERRORS += "Fatal: specifying both GH_TAG ERRORS += "Fatal: using master as GH_TAGNAME is invalid" . endif MASTER_SITES_GITHUB += \ - https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/${GH_TAGNAME:S/$/\//} + https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/ MASTER_SITES ?= ${MASTER_SITES_GITHUB} HOMEPAGE ?= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/08/19 02:32:32 Modified files: print/qpdf : Makefile distinfo print/qpdf/pkg : PLIST Log message: Update to qpdf-8.2.1.
Re: liblouis-3.6.0: mismatch in Unicode width: liblouis is 2 and python isn't
On Sun, Aug 19, 2018 at 03:37:26AM +, Mike Burns wrote: > Sorry for a drive-by bug report without a fix: > > ~% python3 > Python 3.6.6 (default, Aug 16 2018, 06:08:51) > [GCC 4.2.1 Compatible OpenBSD Clang 6.0.0 (tags/RELEASE_600/final)] on > openbsd6 > Type "help", "copyright", "credits" or "license" for more information. > >>> import louis > Traceback (most recent call last): >File "", line 1, in >File "/usr/local/lib/python3.6/site-packages/louis/__init__.py", line 358, > in > raise Exception("mismatch in Unicode width: liblouis is 2 and python > isn't") > Exception: mismatch in Unicode width: liblouis is 2 and python isn't > > ~% pkg_info -E /usr/local/lib/python3.6/site-packages/louis/__init__.py > /usr/local/lib/python3.6/site-packages/louis/__init__.py: liblouis-3.6.0 > liblouis-3.6.0 braille translator, back-translator and formatter > ~% pkg_info liblouis-3.6.0 | grep Mainta > Maintainer: The OpenBSD ports mailing-list Hi. Thanks for the report. This should now be fixed in current and stable. > For quick reference, this is the code leading up to the crash: > > ``` > if charSize() == 2 and sys.maxunicode != 65535: > raise Exception("mismatch in Unicode width: liblouis is 2 and python > isn't") > elif charSize() == 4 and sys.maxunicode != 1114111: > raise Exception("mismatch in Unicode width: liblouis is 4 and python > isn't") > > def charSize(): > return liblouis.lou_charSize() > > liblouis.lou_charSize.restype = c_int > ``` > > In addition: > > >>> import sys > >>> sys.maxunicode > 1114111 > > > This all happened when I tried starting Orca: > > ~% orca > Traceback (most recent call last): >File "/usr/local/bin/orca", line 44, in > from orca import orca >File "/usr/local/lib/python3.6/site-packages/orca/orca.py", line 67, in > > from . import braille >File "/usr/local/lib/python3.6/site-packages/orca/braille.py", line 41, in > > import louis >File "/usr/local/lib/python3.6/site-packages/louis/__init__.py", line 358, > in > raise Exception("mismatch in Unicode width: liblouis is 2 and python > isn't") > Exception: mismatch in Unicode width: liblouis is 2 and python isn't > > -Mike > > OpenBSD 6.4-beta (GENERIC.MP) #224: Fri Aug 17 23:42:30 MDT 2018 > dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP > real mem = 8255762432 (7873MB) > avail mem = 7996362752 (7625MB) > mpath0 at root > scsibus0 at mpath0: 256 targets > mainbus0 at root > bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xdae9d000 (71 entries) > bios0: vendor LENOVO version "G6ET93WW (2.53 )" date 02/04/2013 > bios0: LENOVO 3444CUU > acpi0 at bios0: rev 2 > acpi0: sleep states S0 S3 S4 S5 > acpi0: tables DSDT FACP SLIC TCPA SSDT SSDT SSDT HPET APIC MCFG ECDT FPDT > ASF! UEFI UEFI MSDM SSDT SSDT UEFI SSDT DBG2 > acpi0: wakeup devices LID_(S4) SLPB(S3) IGBE(S4) EXP2(S4) XHCI(S3) EHC1(S3) > EHC2(S3) HDEF(S4) > acpitimer0 at acpi0: 3579545 Hz, 24 bits > acpihpet0 at acpi0: 14318179 Hz > acpimadt0 at acpi0 addr 0xfee0: PC-AT compat > cpu0 at mainbus0: apid 0 (boot processor) > cpu0: Intel(R) Core(TM) i7-3667U CPU @ 2.00GHz, 1896.07 MHz > cpu0: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS,IBRS,IBPB,STIBP,SENSOR,ARAT,XSAVEOPT,MELTDOWN > cpu0: 256KB 64b/line 8-way L2 cache > cpu0: smt 0, core 0, package 0 > mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges > cpu0: apic clock running at 99MHz > cpu0: mwait min=64, max=64, C-substates=0.2.1.1.2, IBE > cpu1 at mainbus0: apid 1 (application processor) > cpu1: Intel(R) Core(TM) i7-3667U CPU @ 2.00GHz, 1895.71 MHz > cpu1: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS,IBRS,IBPB,STIBP,SENSOR,ARAT,XSAVEOPT,MELTDOWN > cpu1: 256KB 64b/line 8-way L2 cache > cpu1: smt 1, core 0, package 0 > cpu2 at mainbus0: apid 2 (application processor) > cpu2: Intel(R) Core(TM) i7-3667U CPU @ 2.00GHz, 1895.71 MHz > cpu2: > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,SMEP,ERMS,IBRS,IBPB,STIBP,SENSOR,ARAT,XSAVEOPT,MELTDOWN > cpu2: 256KB 64b/line 8-way L2 cache > cpu2: smt 0, core 1, package 0 > cpu3 at mainbus0: apid 3 (application processor) > cpu3: Intel(R) Core(TM) i7-3667U CPU @ 2.00GHz, 1895.71 MHz >
net/nng
Hey, I would like to contribute to the ports the port for the project nano message NG. The port sources can be found at https://github.com/evalgo/ports. I tested the port with all commands I know, make , make install, make package, make clean ... etc. The script /usr/ports/infrastructure/bin/portcheck also returns the port name net/nng only so I fixed all things there too. What are the next steps, what should I do to bring it into the ports tree? Is it enough if I commit the port to the ports GitHub repository(https://github.com/openbsd/ports) which I already forked(https://github.com/opunix/ports) and send you a pull request? Thx! BR Frank :-)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/08/19 01:54:04 Modified files: devel/liblouis : Makefile Added files: devel/liblouis/patches: patch-liblouis_compileTranslationTable_c Log message: SECURITY fix for CVE-2018-12085: check index before writing to result->chars While here, configure with --enable-ucs4 to unbreak python3 bindings (reported by Mike Burns, thanks!)
Re: NEW: x11/kde-applications/dolphin
On Sat Aug 18, 2018 at 10:32:12PM -0700, Thomas Frohwein wrote: > > please find attached dolphin-17.12.3. Only conflicts with: > > Vadim pointed out before that an upcoming kde dolphin port would carry > the same name as emulators/dolphin and likely lead to confusion. Below > diff is my best shot at moving it to emulators/dolphin-emu, including > @conflict, @pkgpath, and a quirks entry. > > Feedback or ok? I don't like the quirks bits because KDE5 dolphin has the same name. Maybe that's no problem. I would prefer to go the easier way. Let's rename KDE5 dolphin pkgname into "kf5-dolphin" and dolphin-plugins into "kf5-dolphin-plugins". packages(7) should be happy with this.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/08/19 00:14:10 Modified files: x11/kde-applications: Makefile Log message: hook KDE5 ark
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/08/19 00:13:22 Modified files: meta/kde4 : Makefile Log message: rm KDE4 ark from KDE4-meta
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/08/19 00:12:55 Modified files: x11/kde4 : Makefile Log message: unhook KDE4 ark
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/08/19 00:08:18 Log message: Import ark-17.12.3 (Replacement for x11/kde4/ark) Ark is a graphical file compression/decompression utility with support for multiple formats. ok abieber@ Thanks! Status: Vendor Tag: rsadowski Release Tags: rsadowski_20180819 N ports/x11/kde-applications/ark/Makefile N ports/x11/kde-applications/ark/distinfo N ports/x11/kde-applications/ark/pkg/DESCR N ports/x11/kde-applications/ark/pkg/PLIST No conflicts created by this import
[PATCH] databases/openldap - rm -Rf %SYSCONFDIR%/openldap/slapd.d/*
Hi, Upon OpenLDAP server upgrade, I received a message prompting me to remove files in: %SYSCONFDIR%/openldap/slapd.d/* I believe the correct directory should have been: /etc/openldap/slapd.d/* in which case the below patch is required. Regards, Raf Index: databases/openldap/pkg/PLIST-server === RCS file: /cvs/ports/databases/openldap/pkg/PLIST-server,v retrieving revision 1.23 diff -u -p -r1.23 PLIST-server --- databases/openldap/pkg/PLIST-server 29 Mar 2018 19:32:12 - 1.23 +++ databases/openldap/pkg/PLIST-server 19 Aug 2018 06:02:32 - @@ -5,7 +5,7 @@ @ask-update openldap-server-<2.4 Make sure your existing database is backed up @newgroup _openldap:544 @newuser _openldap:544:_openldap:daemon:OpenLDAP Account:/nonexistent:/sbin/nologin -@extraunexec rm -Rf %SYSCONFDIR%/openldap/slapd.d/* +@extraunexec rm -Rf ${SYSCONFDIR}/openldap/slapd.d/* @extraunexec rm -Rf /var/openldap-data/* @bin libexec/slapd @man man/man5/slapd-bdb.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2018/08/19 00:04:23 Modified files: devel/universal-ctags: Makefile distinfo Log message: Update universal-ctags-0.20180817