Re: [UPDATE] devel/hub

[Dmitrij D. Czarkoff]

Michael Reed said:
>On 11/13/15 19:13, Michael Reed wrote:
>> devel/hub 2.2.2 was recently released [1], and I've been
>> using it for a few days with no issues.  The maintainer
>> (Fabian Raetz) told me he's busy, so sending it straight
>> to ports@ should be okay.
>> 
>> [1]: https://github.com/github/hub/releases/tag/v2.2.2
>> 
>> 
>> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/hub/Makefile,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 Makefile
>> --- Makefile 8 Jun 2015 10:07:38 -   1.1.1.1
>> +++ Makefile 13 Nov 2015 21:46:08 -
>> @@ -2,7 +2,7 @@
>>  
>>  COMMENT =   wraps git in order to extend it with extra features
>>  
>> -V = 2.2.1
>> +V = 2.2.2
>>  GH_ACCOUNT =github
>>  GH_PROJECT =hub
>>  GH_TAGNAME =v$V
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/devel/hub/distinfo,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 distinfo
>> --- distinfo 8 Jun 2015 10:07:38 -   1.1.1.1
>> +++ distinfo 13 Nov 2015 21:46:08 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (hub-2.2.1.tar.gz) = k1Crpqjj2p0mtyWKQCC/hEka9pWV90hPki11/IuG3BA=
>> -SIZE (hub-2.2.1.tar.gz) = 302030
>> +SHA256 (hub-2.2.2.tar.gz) = YQVy7pA66h+oYiwWq33e8r0b/sn0hURHq44Pvb5qDK4=
>> +SIZE (hub-2.2.2.tar.gz) = 311726
>> 
> 
> ping, I've been using this daily with no issues so far.

OK czarkoff@

-- 
Dmitrij D. Czarkoff

Re: update: devel/llvm

[Jonathan Gray]

On Thu, Nov 12, 2015 at 10:25:53AM +0100, Pascal Stumpf wrote:
> On Thu, 12 Nov 2015 00:08:35 +0100, Christian Weisgerber wrote:
> > Pascal Stumpf:
> > 
> > > I have done manual builds of some ports that use clang (various
> > > firefoxes, multimedia stuff, vlc, mplayer), but maybe this needs a bulk
> > > build?
> > 
> > If I get a complete patch, I can kick off an amd64 bulk build with it
> > tom^Hday.
> 
> Next try to get the diff unmangled.  If that fails, it's on cvs too ...

I tried to build mesa git with clang/clang++ but it seems clang can't
compile it's own headers?

libtool: compile:  /usr/local/bin/clang++ -DPACKAGE_NAME=\"Mesa\" 
-DPACKAGE_TARNAME=\"mesa\" -DPACKAGE_VERSION=\"11.2.0-devel\" 
"-DPACKAGE_STRING=\"Mesa 11.2.0-devel\"" 
"-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\";
 -DPACKAGE_URL=\"\" -DPACKAGE=\"mesa\" -DVERSION=\"11.2.0-devel\" 
-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 
-DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 
-DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" 
-DYYTEXT_POINTER=1 -DHAVE___BUILTIN_BSWAP32=1 -DHAVE___BUILTIN_BSWAP64=1 
-DHAVE___BUILTIN_CLZ=1 -DHAVE___BUILTIN_CLZLL=1 -DHAVE___BUILTIN_CTZ=1 
-DHAVE___BUILTIN_EXPECT=1 -DHAVE___BUILTIN_FFS=1 -DHAVE___BUILTIN_FFSLL=1 
-DHAVE___BUILTIN_POPCOUNT=1 -DHAVE___BUILTIN_POPCOUNTLL=1 
-DHAVE___BUILTIN_UNREACHABLE=1 -DHAVE_FUNC_ATTRIBUTE_CONST=1 
-DHAVE_FUNC_ATTRIBUTE_FLATTEN=1 -DHAVE_FUNC_ATTRIBUTE_FORMAT=1 
-DHAVE_FUNC_ATTRIBUTE_MALLOC=1 -DHAVE_FUNC_ATTRIBUTE_PACKED=1 
-DHAVE_FUNC_ATTRIBUTE_PURE=1 -DHAVE_FUNC_ATTRIBUTE_UNUSED=1 
-DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT=1 -DHAVE_DLADDR=1 
-DHAVE_CLOCK_GETTIME=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 -DHAVE_PTHREAD=1 
-DHAVE_SHA1_IN_LIBC=1 -I. -fvisibility=hidden -Werror=pointer-arith -Werror=vla 
-I../../../include -I../../../src -I../../../src/gallium/include 
-I../../../src/gallium/auxiliary -D__STDC_LIMIT_MACROS -DUSE_SSE41 -DDEBUG 
-DUSE_X86_64_ASM -DHAVE_SYS_SYSCTL_H -DHAVE_STRTOF -DHAVE_MKOSTEMP 
-DHAVE_DLOPEN -DHAVE_POSIX_MEMALIGN -DHAVE_LIBDRM -DHAVE_SHA1 -DGLX_USE_DRM 
-DGLX_INDIRECT_RENDERING -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_MINCORE 
-DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0 -I/usr/local/include -pipe -W 
-Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers 
-Wno-long-long -Wno-maybe-uninitialized -Wno-comment -std=c++11 
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -g -O2 
-Wall -fno-strict-aliasing -fno-builtin-memcmp -Qunused-arguments -MT 
gallivm/lp_bld_debug.lo -MD -MP -MF gallivm/.deps/lp_bld_debug.Tpo -c 
gallivm/lp_bld_debug.cpp  -fPIC -DPIC -o gallivm/.libs/lp_bld_debug.o
warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean 
'-Wno-uninitialized'? [-Wunknown-warning-option]
In file included from gallivm/lp_bld_debug.cpp:32:
In file included from /usr/local/include/llvm/Support/raw_ostream.h:17:
In file included from /usr/local/include/llvm/ADT/SmallVector.h:17:
/usr/local/include/llvm/ADT/iterator_range.h:36:29: error: no member named 
'move' in namespace 'std'; did you mean 'modf'?
  : begin_iterator(std::move(begin_iterator)),
   ~^~~~
modf
/usr/include/math.h:200:8: note: 'modf' declared here
double modf(double, double *);
   ^
In file included from gallivm/lp_bld_debug.cpp:32:
In file included from /usr/local/include/llvm/Support/raw_ostream.h:17:
In file included from /usr/local/include/llvm/ADT/SmallVector.h:17:
/usr/local/include/llvm/ADT/iterator_range.h:37:27: error: no member named 
'move' in namespace 'std'; did you mean 'modf'?
end_iterator(std::move(end_iterator)) {}
 ~^~~~
  modf
/usr/include/math.h:200:8: note: 'modf' declared here
double modf(double, double *);
   ^
In file included from gallivm/lp_bld_debug.cpp:32:
In file included from /usr/local/include/llvm/Support/raw_ostream.h:17:
In file included from /usr/local/include/llvm/ADT/SmallVector.h:17:
/usr/local/include/llvm/ADT/iterator_range.h:48:33: error: no member named 
'move' in namespace 'std'; did you mean 'modf'?
  return iterator_range(std::move(x), std::move(y));
   ~^~~~
modf
/usr/include/math.h:200:8: note: 'modf' declared here
double modf(double, double *);
   ^
In file included from gallivm/lp_bld_debug.cpp:32:
In file included from /usr/local/include/llvm/Support/raw_ostream.h:17:
In file included from /usr/local/include/llvm/ADT/SmallVector.h:17:
/usr/local/include/llvm/ADT/iterator_range.h:48:47: error: no member named 
'move' in namespace 'std'; did you mean 'modf'?
  return iterator_range(std::move(x), std::move(y));
 ~^~~~
  modf
/usr/include/math.h:200:8: note: 'modf' declared here
double modf(double, double 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/22 23:23:57

Modified files:
security/gnutls: Makefile distinfo 

Log message:
Update to gnutls-3.3.19.

infrastructure: fix Xr

[Michael Reed]

Found with `igor -x`

Index: dolock.1
===
RCS file: /cvs/ports/infrastructure/man/man1/dolock.1,v
retrieving revision 1.4
diff -u -p -r1.4 dolock.1
--- dolock.12 May 2015 16:42:55 -   1.4
+++ dolock.122 Nov 2015 23:16:05 -
@@ -47,5 +47,5 @@ in
 .Xr ports 7
 for details.
 See also
-.Xr dbp 1
+.Xr dpb 1
 for a complementary lock infrastructure when using dpb.

CVS: cvs.openbsd.org: ports

[Tim van der Molen]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2015/11/22 16:34:34

Modified files:
infrastructure/man/man1: dolock.1 

Log message:
Fix reference; from Michael Reed

Re: [UPDATE] devel/hub

[Michael Reed]

On 11/13/15 19:13, Michael Reed wrote:
> devel/hub 2.2.2 was recently released [1], and I've been
> using it for a few days with no issues.  The maintainer
> (Fabian Raetz) told me he's busy, so sending it straight
> to ports@ should be okay.
> 
> [1]: https://github.com/github/hub/releases/tag/v2.2.2
> 
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/hub/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile  8 Jun 2015 10:07:38 -   1.1.1.1
> +++ Makefile  13 Nov 2015 21:46:08 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =wraps git in order to extend it with extra features
>  
> -V =  2.2.1
> +V =  2.2.2
>  GH_ACCOUNT = github
>  GH_PROJECT = hub
>  GH_TAGNAME = v$V
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/hub/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo  8 Jun 2015 10:07:38 -   1.1.1.1
> +++ distinfo  13 Nov 2015 21:46:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (hub-2.2.1.tar.gz) = k1Crpqjj2p0mtyWKQCC/hEka9pWV90hPki11/IuG3BA=
> -SIZE (hub-2.2.1.tar.gz) = 302030
> +SHA256 (hub-2.2.2.tar.gz) = YQVy7pA66h+oYiwWq33e8r0b/sn0hURHq44Pvb5qDK4=
> +SIZE (hub-2.2.2.tar.gz) = 311726
> 

ping, I've been using this daily with no issues so far.

Re: [Fwd: [PATCH] pledge x11/wmii (and other ports?)]

[trondd]

On Sun, November 22, 2015 7:43 pm, Theo de Raadt wrote:
>> So I'm reading that as "Yes, but only if you know what you're doing."
>
> You can't just pick pledges; you also have to put them in the right
> place.
>
> You have the wrong pledge arguments, because you are calling pledge
> at the wrong place.
>

One mistake I made...  Was that I wanted pledge as soon as possible, and
forgot the init/main program structure that pledge is designed to work
*with*.  Then I didn't question the results.  Well, that's a benefit of
putting it out there.  I can learn.  And hopefully others do, too.

Tim.

Re: [Fwd: [PATCH] pledge x11/wmii (and other ports?)]

[Theo de Raadt]

> One mistake I made...  Was that I wanted pledge as soon as possible, and
> forgot the init/main program structure that pledge is designed to work
> *with*.  Then I didn't question the results.  Well, that's a benefit of
> putting it out there.  I can learn.  And hopefully others do, too.

"pledge as soon as possible" is a design mistake.

The source tree is full of examples showing that this won't work;
less than half of them pledge at the start.

Re: games/foobillard build failure after Mesa update

[Jonathan Gray]

On Sun, Nov 22, 2015 at 07:10:08PM +0100, Christian Weisgerber wrote:
> games/foobillard doesn't build any longer after the Mesa 11.0.6 update.
> 
> ...
> ball.o: In function `draw_balls':
> ball.c:(.text+0x65f0): undefined reference to `glGenProgramsNV'
> ball.c:(.text+0x6605): undefined reference to `glBindProgramNV'
> ball.c:(.text+0x6636): undefined reference to `glLoadProgramNV'
> ball.c:(.text+0x6fdc): undefined reference to `glTrackMatrixNV'
> ball.c:(.text+0x6ffa): undefined reference to `glTrackMatrixNV'
> ball.c:(.text+0x7018): undefined reference to `glTrackMatrixNV'
> ball.c:(.text+0x7050): undefined reference to `glProgramParameter4fNV'
> ball.c:(.text+0x7079): undefined reference to `glBindProgramNV'
> ball.c:(.text+0x71c0): undefined reference to `glProgramParameter4fNV'
> collect2: ld returned 1 exit status

Seems to build/run with the following:

Index: Makefile
===
RCS file: /cvs/ports/games/foobillard/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile11 Jul 2014 11:20:32 -  1.8
+++ Makefile23 Nov 2015 00:52:02 -
@@ -20,6 +20,7 @@ LIB_DEPENDS = graphics/png \
 
 USE_GMAKE =Yes
 CONFIGURE_STYLE =  gnu
+CONFIGURE_ARGS =   --enable-nvidia=no
 CFLAGS =   -DNO_NV_BUMPREF
 
 .include 
--- /dev/null   Mon Nov 23 11:52:23 2015
+++ patches/patch-src_ball_cMon Nov 23 11:49:39 2015
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/ball.c.origMon Nov 23 11:49:01 2015
 src/ball.c Mon Nov 23 11:49:30 2015
+@@ -32,6 +32,7 @@
+ #include "options.h"
+ #include "font.h"
+ 
++#undef GL_VERTEX_PROGRAM_NV
+ 
+ #ifdef GL_VERTEX_ARRAY
+#define USE_VERTEX_ARRAYS

Re: [Fwd: [PATCH] pledge x11/wmii (and other ports?)]

[Theo de Raadt]

> So I'm reading that as "Yes, but only if you know what you're doing."

You can't just pick pledges; you also have to put them in the right
place.

You have the wrong pledge arguments, because you are calling pledge
at the wrong place.

Re: [Fwd: [PATCH] pledge x11/wmii (and other ports?)]

[trondd]

On Sun, November 22, 2015 4:23 pm, Theo de Raadt wrote:
> That diff is completely wrong.
>
> The addition of "prot_exec" to a pledge should result in some
> significant questions.
>
> You can't pledge a program if you don't understand what it is doing,
> and why.
>
> Misapplication of pledge like this will result in a nightmare.
>
>
>> > I haven't seen much discussion about applying pledge to ports, so I
>> > thought I'd
>> > find out how people feel about it.
>>

So I'm reading that as "Yes, but only if you know what you're doing."

>> > I can see downsides to this such as, ports maintainers not necessarily
>> being
>> > involved in the development of the port and having a lower
>> understanding
>> > of the
>> > code as compared to OBSD developers with base code

I guess I fell into my own caveat.  Also, thanks for the additional
pointers off-list.

Tim.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/22 01:06:36

Modified files:
textproc/libxml: Makefile distinfo 
textproc/libxml/patches: patch-Makefile_in patch-configure_ac 
 patch-python_Makefile_in 
 patch-python_tests_Makefile_in 
 patch-xstc_Makefile_in 

Log message:
Update to libxml-2.9.3.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/22 01:12:12

Modified files:
multimedia/mkvtoolnix: Makefile distinfo 

Log message:
Update to mkvtoolnix-8.5.2.

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/22 01:08:26

Modified files:
devel/harfbuzz : Makefile distinfo 

Log message:
Update to harfbuzz-1.1.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/22 01:18:56

Modified files:
devel/msp430   : Makefile.inc 

Log message:
Add dependency on sysutils/coreutils for at least gmkdir which gets picked up
at configure time.

suggested by sthen@ ("these Makefiles/autoconf files are a horrible maze")

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/22 01:36:03

Modified files:
sysutils/login_krb5: Makefile distinfo 

Log message:
Update to login_krb5-5.8.6.

UPDATE: devel/doxygen 1.8.2 -> 1.8.10

[Rafael Sadowski]

Hi ports@

after my first attempt here is the new diff to update doxygen.

doxygen port highlights:

- switch to CMake
- Don't use own libmd5 but base md5
- Use MD5Data() instead of MD5Buffer+MD5SigToString

I checked all ports with doxygen usage.

- No changes with 1.8.10:

audio/liblo
database/soprano
devel/simulavr
devel/tclap
math/ginac
graphics/digikam-kde4
graphics/opencv
net/libktorrent
productivit/kmymoney
productivit/libalkimia
x11/awesome
x11/kde4/runtime
x11/kde4/nepomuk-core


- REVISION bump and update plist:

audio/libnjb
devel/libmtp
devel/qjson
geo/geos
graphics/lensfun
multimedia/libquicktime
x11/dbusmenu-qt
x11/ede/lib

I am looking forward about your feedback and I hope we will see 1.8.10
quickly in the tree.

Best regards, Rafael


Index: audio/libnjb/Makefile
===
RCS file: /cvs/ports/audio/libnjb/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- audio/libnjb/Makefile   2 May 2015 20:53:18 -   1.12
+++ audio/libnjb/Makefile   22 Nov 2015 14:44:29 -
@@ -4,6 +4,7 @@ COMMENT=communicate with some Creative
 
 DISTNAME=  libnjb-2.2.7
 CATEGORIES=audio devel
+REVISION = 0
 
 SHARED_LIBS +=  njb  0.0  # 6.1
 
Index: audio/libnjb/pkg/PLIST
===
RCS file: /cvs/ports/audio/libnjb/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/libnjb/pkg/PLIST  2 May 2015 20:53:18 -   1.3
+++ audio/libnjb/pkg/PLIST  22 Nov 2015 14:44:29 -
@@ -29,6 +29,8 @@ lib/pkgconfig/libnjb.pc
 share/doc/libnjb/
 share/doc/libnjb/html/
 share/doc/libnjb/html/annotated.html
+share/doc/libnjb/html/arrowdown.png
+share/doc/libnjb/html/arrowright.png
 share/doc/libnjb/html/base_8c.html
 share/doc/libnjb/html/base_8h_source.html
 share/doc/libnjb/html/bc_s.png
@@ -44,6 +46,7 @@ share/doc/libnjb/html/defs_8h_source.htm
 share/doc/libnjb/html/delfile_8c-example.html
 share/doc/libnjb/html/deltr_8c-example.html
 share/doc/libnjb/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+share/doc/libnjb/html/doc.png
 share/doc/libnjb/html/doxygen.css
 share/doc/libnjb/html/doxygen.png
 share/doc/libnjb/html/dumpeax_8c-example.html
@@ -55,22 +58,8 @@ share/doc/libnjb/html/examples.html
 share/doc/libnjb/html/examples_8h_source.html
 share/doc/libnjb/html/files.html
 share/doc/libnjb/html/files_8c-example.html
-share/doc/libnjb/html/ftv2blank.png
-share/doc/libnjb/html/ftv2cl.png
-share/doc/libnjb/html/ftv2doc.png
-share/doc/libnjb/html/ftv2folderclosed.png
-share/doc/libnjb/html/ftv2folderopen.png
-share/doc/libnjb/html/ftv2lastnode.png
-share/doc/libnjb/html/ftv2link.png
-share/doc/libnjb/html/ftv2mlastnode.png
-share/doc/libnjb/html/ftv2mnode.png
-share/doc/libnjb/html/ftv2mo.png
-share/doc/libnjb/html/ftv2node.png
-share/doc/libnjb/html/ftv2ns.png
-share/doc/libnjb/html/ftv2plastnode.png
-share/doc/libnjb/html/ftv2pnode.png
-share/doc/libnjb/html/ftv2splitbar.png
-share/doc/libnjb/html/ftv2vertline.png
+share/doc/libnjb/html/folderclosed.png
+share/doc/libnjb/html/folderopen.png
 share/doc/libnjb/html/functions.html
 share/doc/libnjb/html/functions_vars.html
 share/doc/libnjb/html/fwupgrade_8c-example.html
@@ -79,32 +68,32 @@ share/doc/libnjb/html/getowner_8c-exampl
 share/doc/libnjb/html/gettr_8c-example.html
 share/doc/libnjb/html/getusage_8c-example.html
 share/doc/libnjb/html/globals.html
-share/doc/libnjb/html/globals_0x64.html
-share/doc/libnjb/html/globals_0x65.html
-share/doc/libnjb/html/globals_0x66.html
-share/doc/libnjb/html/globals_0x67.html
-share/doc/libnjb/html/globals_0x6c.html
-share/doc/libnjb/html/globals_0x6d.html
-share/doc/libnjb/html/globals_0x6e.html
-share/doc/libnjb/html/globals_0x6f.html
-share/doc/libnjb/html/globals_0x70.html
-share/doc/libnjb/html/globals_0x73.html
-share/doc/libnjb/html/globals_0x74.html
-share/doc/libnjb/html/globals_0x75.html
+share/doc/libnjb/html/globals_d.html
 share/doc/libnjb/html/globals_defs.html
+share/doc/libnjb/html/globals_e.html
 share/doc/libnjb/html/globals_enum.html
+share/doc/libnjb/html/globals_f.html
 share/doc/libnjb/html/globals_func.html
-share/doc/libnjb/html/globals_func_0x64.html
-share/doc/libnjb/html/globals_func_0x65.html
-share/doc/libnjb/html/globals_func_0x66.html
-share/doc/libnjb/html/globals_func_0x67.html
-share/doc/libnjb/html/globals_func_0x6d.html
-share/doc/libnjb/html/globals_func_0x6e.html
-share/doc/libnjb/html/globals_func_0x70.html
-share/doc/libnjb/html/globals_func_0x73.html
-share/doc/libnjb/html/globals_func_0x74.html
-share/doc/libnjb/html/globals_func_0x75.html
+share/doc/libnjb/html/globals_func_d.html
+share/doc/libnjb/html/globals_func_e.html
+share/doc/libnjb/html/globals_func_f.html
+share/doc/libnjb/html/globals_func_g.html
+share/doc/libnjb/html/globals_func_m.html
+share/doc/libnjb/html/globals_func_n.html
+share/doc/libnjb/html/globals_func_p.html

Re: [UPDATE] audio/cmus => 2.7.1

[Florian Stinglmayr]

On 24.10.2015 14:58, Donovan Watteau wrote:

Thanks Micah and Florian for the feedback.

ping anyone?  Thanks.



Ping anyone? It's been a while, but having a new cmus would be appreciated.

Thanks,
Florian

Re: NEW: sysutils/noice

[Joerg Jung]

On Sun, Nov 22, 2015 at 09:15:46AM +, Dimitris Papastamos wrote:
> On Sat, Nov 21, 2015 at 08:55:19PM +, Stuart Henderson wrote:
> > On 2015/11/20 15:35, Dimitris Papastamos wrote:
> > > New version with some things fixed.
> > 
> > Here's an updated Makefile doing things more in the style of other ports,
> > and honouring CC..
> > 
> > --snip-- -- --
> > # $OpenBSD$
> > 
> > COMMENT =   minimalistic file browser
> > DISTNAME =  noice-0.3
> > CATEGORIES =sysutils
> > HOMEPAGE =  http://git.2f30.org/noice/
> > MAINTAINER =Dimitris Papastamos 
> > 
> > # BSD
> > PERMIT_PACKAGE_CDROM =  Yes
> > 
> > WANTLIB =   c curses
> > 
> > MASTER_SITES =  http://dl.2f30.org/releases/
> > 
> > MAKE_FLAGS =CC="${CC}"
> > NO_TEST =   Yes
> > 
> > .include 
> > --snip-- -- --
> > 
> > With that changed it's OK with me to import.
> 
> Attached is an update version, thanks!

Already committed. Thanks!

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2015/11/22 07:21:33

Modified files:
misc/mc: Makefile 
misc/mc/patches: patch-configure 
Added files:
misc/mc/patches: patch-src_diffviewer_ydiff_c 

Log message:
use GNU diff for diffing files as mc uses some opts that are
not available in diff(1); from Alessandro DE LAURENZIS

Re: NEW: sysutils/noice

[Dimitris Papastamos]

On Sat, Nov 21, 2015 at 08:55:19PM +, Stuart Henderson wrote:
> On 2015/11/20 15:35, Dimitris Papastamos wrote:
> > New version with some things fixed.
> 
> Here's an updated Makefile doing things more in the style of other ports,
> and honouring CC..
> 
> --snip-- -- --
> # $OpenBSD$
> 
> COMMENT = minimalistic file browser
> DISTNAME =noice-0.3
> CATEGORIES =  sysutils
> HOMEPAGE =http://git.2f30.org/noice/
> MAINTAINER =  Dimitris Papastamos 
> 
> # BSD
> PERMIT_PACKAGE_CDROM =Yes
> 
> WANTLIB = c curses
> 
> MASTER_SITES =http://dl.2f30.org/releases/
> 
> MAKE_FLAGS =  CC="${CC}"
> NO_TEST = Yes
> 
> .include 
> --snip-- -- --
> 
> With that changed it's OK with me to import.

Attached is an update version, thanks!


noice.tar
Description: Unix tar archive

Re: calibre error

[Jiri B]

On Sun, Nov 22, 2015 at 07:10:22AM +0100, misc nick wrote:
> I'm using the calibre package on OpenBSD 5.8/amd64 release.
> 
> When i try to convert anything to epub i get this:
> 
> calibre 1.48  isfrozen: False is64bit: True
> OpenBSD-5.8-amd64-64bit OpenBSD ('64bit', '')
> ('OpenBSD', '5.8', 'GENERIC.MP#1236')
> Python 2.7.10
> Linux: ('', '', '')
> Traceback (most recent call last):
>   File "/usr/local/lib/calibre/calibre/gui2/actions/convert.py", line 156, in 
> convert_ebook
> self.do_convert(book_ids, bulk=bulk)
>   File "/usr/local/lib/calibre/calibre/gui2/actions/convert.py", line 173, in 
> do_convert
> self.gui.library_view.model().db, book_ids, 
> out_format=prefs['output_format'])
>   File "/usr/local/lib/calibre/calibre/gui2/tools.py", line 41, in 
> convert_single_ebook
> d = SingleConfig(parent, db, book_id, None, out_format)
>   File "/usr/local/lib/calibre/calibre/gui2/convert/single.py", line 151, in 
> __init__
> self.setup_pipeline()
>   File "/usr/local/lib/calibre/calibre/gui2/convert/single.py", line 201, in 
> setup_pipeline
> self.mw = widget_factory(MetadataWidget)
>   File "/usr/local/lib/calibre/calibre/gui2/convert/single.py", line 199, in 
> widget_factory
> self.plumber.get_option_help, self.db, self.book_id)
>   File "/usr/local/lib/calibre/calibre/gui2/convert/metadata.py", line 55, in 
> __init__
> Widget.__init__(self, parent, ['prefer_metadata_cover'])
>   File "/usr/local/lib/calibre/calibre/gui2/convert/__init__.py", line 61, in 
> __init__
> self.setupUi(self)
>   File "/usr/local/lib/calibre/calibre/gui2/convert/metadata_ui.py", line 63, 
> in setupUi
> self.cover = ImageView(self.groupBox_4)
>   File "/usr/local/lib/calibre/calibre/gui2/widgets.py", line 292, in __init__
> self._pixmap = QPixmap(self)
> TypeError: QPixmap(): argument 1 has unexpected type 'ImageView'

No idea but I would recomment not to spend time
on this ancient calibre version but instead to try
to update the port itself. But iirc we need py-qt5,
poppler-qt5 and maybe something else.

j.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2015/11/22 03:27:44

Modified files:
graphics/gegl03: Makefile distinfo 
graphics/gegl03/pkg: PLIST 

Log message:
Update to gegl03-0.3.2.

misc/mc Enabling compare file function

[Alessandro DE LAURENZIS]

Dear maintainer,

To my best understanding, comparing two files in mc requires the
availability of GNU diff, since some specific options () are hard coded;
the following diffs add gdiff(1) as run dependency and change the
executable name in ydiff.c

[snip]
--- /usr/ports/misc/mc/Makefile Wed Jun  3 08:37:36 2015
+++ ./Makefile  Sat Nov 21 23:46:19 2015
@@ -26,7 +26,8 @@
devel/libslang
 RUN_DEPENDS=   archivers/unzip \
archivers/zip \
-   security/libssh2
+   security/libssh2 \
+   textproc/gdiff
 
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ARGS+=   --with-subshell \
[snip]

[snip]
$OpenBSD$
--- src/diffviewer/ydiff.c.orig Fri Mar 20 19:06:04 2015
+++ src/diffviewer/ydiff.c  Sat Nov 21 23:47:04 2015
@@ -821,7 +821,7 @@ dff_execute (const char *args, const char *extra, cons
 /* escape potential $ to avoid shell variable substitutions in popen() */
 file1_esc = strutils_shell_escape (file1);
 file2_esc = strutils_shell_escape (file2);
-cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, 
file2_esc);
+cmd = g_strdup_printf ("gdiff %s %s %s %s %s", args, extra, opt, 
file1_esc, file2_esc);
 g_free (file1_esc);
 g_free (file2_esc);
 
[snip]

All the best
-- 
Alessandro DE LAURENZIS
[mailto:just22@gmail.com]
LinkedIn: http://it.linkedin.com/in/delaurenzis

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2015/11/22 12:34:00

Modified files:
games/puzzles  : Makefile distinfo 
games/puzzles/patches: patch-Makefile_gtk patch-gtk_c 
games/puzzles/pkg: PLIST 

Log message:
Update to a newer git snapshot, adds a new 'palisade' puzzle.

Re: [Fwd: [PATCH] pledge x11/wmii (and other ports?)]

[Joerg Jung]

On Sun, Nov 22, 2015 at 12:38:22PM -0500, trondd wrote:
> ...And I meant for this to go to ports.  Sorry.
> 
>  Original Message 
> Subject: [PATCH] pledge x11/wmii (and other ports?)
> From:tro...@kagu-tsuchi.com
> Date:Sun, November 22, 2015 12:24 pm
> To:  m...@openbsd.org
> --
> 
> I haven't seen much discussion about applying pledge to ports, so I
> thought I'd
> find out how people feel about it.

I like it.
 
> I chose to start with x11/wmii because
> a) It's no longer officially developed so (other than updating the port to
> the
> last release) it's not going to change.
> b) I might be the only one left who uses it.

Yes.  I'm pretty sure you are ;)

However, I would consider github sunaku/wmii the "new" upstream, so
maybe try to push the patches there as and gently ask for release.

> I've been running it pledged since it was tame.
> 
> I can see downsides to this such as, ports maintainers not necessarily being
> involved in the development of the port and having a lower understanding
> of the
> code as compared to OBSD developers with base code, or not having the ability
> to reorganize or change the code in a way that improves it for pledge.
> 
> Tim.
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/wmii/Makefile,v
> retrieving revision 1.21
> diff -u -p -r1.21 Makefile
> --- Makefile12 Nov 2015 09:59:41 -  1.21
> +++ Makefile20 Nov 2015 22:33:36 -
> @@ -3,7 +3,7 @@
>  COMMENT=   dynamic window manager
>  DISTNAME=  wmii-3.6
> -REVISION=  6
> +REVISION=  7
>  CATEGORIES=x11
>  HOMEPAGE=  http://wmii.suckless.org/
> cvs server: Diffing patches
> Index: patches/patch-cmd_wmii_main_c
> ===
> RCS file: patches/patch-cmd_wmii_main_c
> diff -N patches/patch-cmd_wmii_main_c
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-cmd_wmii_main_c   20 Nov 2015 22:33:36 - @@ -0,0
> +1,13 @@
> +$OpenBSD$
> +--- cmd/wmii/main.c.orig   Sun Oct 18 15:10:20 2015
>  cmd/wmii/main.cSun Oct 18 15:10:33 2015
> +@@ -408,6 +408,9 @@ main(int argc, char *argv[]) {
> +   WinAttr wa;
> +   int i;
> +
> ++  if (pledge("stdio rpath cpath fattr unix proc exec prot_exec",
> NULL) == -1)
> ++  err(1, "pledge");
> ++
> +   fmtinstall('r', errfmt);
> +   fmtinstall('C', Cfmt);
> +
> Index: patches/patch-cmd_wmiir_c
> ===
> RCS file: patches/patch-cmd_wmiir_c
> diff -N patches/patch-cmd_wmiir_c
> --- /dev/null   1 Jan 1970 00:00:00 -
> +++ patches/patch-cmd_wmiir_c   20 Nov 2015 22:33:36 -
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +--- cmd/wmiir.c.orig   Sun Oct 18 15:09:57 2015
>  cmd/wmiir.cSun Oct 18 15:10:44 2015
> +@@ -312,6 +312,9 @@ main(int argc, char *argv[]) {
> +   exectab *tab;
> +   int ret;
> +
> ++  if (pledge("stdio unix", NULL) == -1)
> ++  err(1, "pledge");
> ++
> +   fmtinstall('r', errfmt);
> +
> +   address = getenv("WMII_ADDRESS");
> 
> 

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2015/11/22 12:51:28

Modified files:
databases/py-sqlite2: Makefile distinfo 
databases/py-sqlite2/pkg: PLIST 
Removed files:
databases/py-sqlite2/patches: patch-setup_cfg 

Log message:
update py-sqlite2 to 2.8.1.
ok shadchin@ with a small fix.

games/foobillard build failure after Mesa update

[Christian Weisgerber]

games/foobillard doesn't build any longer after the Mesa 11.0.6 update.

...
ball.o: In function `draw_balls':
ball.c:(.text+0x65f0): undefined reference to `glGenProgramsNV'
ball.c:(.text+0x6605): undefined reference to `glBindProgramNV'
ball.c:(.text+0x6636): undefined reference to `glLoadProgramNV'
ball.c:(.text+0x6fdc): undefined reference to `glTrackMatrixNV'
ball.c:(.text+0x6ffa): undefined reference to `glTrackMatrixNV'
ball.c:(.text+0x7018): undefined reference to `glTrackMatrixNV'
ball.c:(.text+0x7050): undefined reference to `glProgramParameter4fNV'
ball.c:(.text+0x7079): undefined reference to `glBindProgramNV'
ball.c:(.text+0x71c0): undefined reference to `glProgramParameter4fNV'
collect2: ld returned 1 exit status

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

CVS: cvs.openbsd.org: ports

[Dmitrij Czarkoff]

CVSROOT:/cvs
Module name:ports
Changes by: czark...@cvs.openbsd.org2015/11/22 11:33:04

Modified files:
multimedia/mpv : Makefile distinfo 
multimedia/mpv/patches: patch-DOCS_man_options_rst 
patch-TOOLS_old-configure 
Added files:
multimedia/mpv/patches: patch-TOOLS_old-makefile 
Removed files:
multimedia/mpv/patches: patch-DOCS_man_mpv_rst 
patch-video_out_opengl_video_c 

Log message:
update mpv to 0.13.0

Patch from brad@

[Fwd: [PATCH] pledge x11/wmii (and other ports?)]

[trondd]

...And I meant for this to go to ports.  Sorry.

 Original Message 
Subject: [PATCH] pledge x11/wmii (and other ports?)
From:tro...@kagu-tsuchi.com
Date:Sun, November 22, 2015 12:24 pm
To:  m...@openbsd.org
--

I haven't seen much discussion about applying pledge to ports, so I
thought I'd
find out how people feel about it.

I chose to start with x11/wmii because
a) It's no longer officially developed so (other than updating the port to
the
last release) it's not going to change.
b) I might be the only one left who uses it.

I've been running it pledged since it was tame.

I can see downsides to this such as, ports maintainers not necessarily being
involved in the development of the port and having a lower understanding
of the
code as compared to OBSD developers with base code, or not having the ability
to reorganize or change the code in a way that improves it for pledge.

Tim.


Index: Makefile
===
RCS file: /cvs/ports/x11/wmii/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile12 Nov 2015 09:59:41 -  1.21
+++ Makefile20 Nov 2015 22:33:36 -
@@ -3,7 +3,7 @@
 COMMENT=   dynamic window manager
 DISTNAME=  wmii-3.6
-REVISION=  6
+REVISION=  7
 CATEGORIES=x11
 HOMEPAGE=  http://wmii.suckless.org/
cvs server: Diffing patches
Index: patches/patch-cmd_wmii_main_c
===
RCS file: patches/patch-cmd_wmii_main_c
diff -N patches/patch-cmd_wmii_main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cmd_wmii_main_c   20 Nov 2015 22:33:36 - @@ -0,0
+1,13 @@
+$OpenBSD$
+--- cmd/wmii/main.c.orig   Sun Oct 18 15:10:20 2015
 cmd/wmii/main.cSun Oct 18 15:10:33 2015
+@@ -408,6 +408,9 @@ main(int argc, char *argv[]) {
+   WinAttr wa;
+   int i;
+
++  if (pledge("stdio rpath cpath fattr unix proc exec prot_exec",
NULL) == -1)
++  err(1, "pledge");
++
+   fmtinstall('r', errfmt);
+   fmtinstall('C', Cfmt);
+
Index: patches/patch-cmd_wmiir_c
===
RCS file: patches/patch-cmd_wmiir_c
diff -N patches/patch-cmd_wmiir_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-cmd_wmiir_c   20 Nov 2015 22:33:36 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- cmd/wmiir.c.orig   Sun Oct 18 15:09:57 2015
 cmd/wmiir.cSun Oct 18 15:10:44 2015
+@@ -312,6 +312,9 @@ main(int argc, char *argv[]) {
+   exectab *tab;
+   int ret;
+
++  if (pledge("stdio unix", NULL) == -1)
++  err(1, "pledge");
++
+   fmtinstall('r', errfmt);
+
+   address = getenv("WMII_ADDRESS");

[maintainer update] update to Openfire 3.10.3

[Marc Peters]

Hi list,

here's an update to Openfire 3.10.3. The changelog can be found here:
http://www.igniterealtime.org/builds/openfire/docs/latest/changelog.html

Attached as patch to avoid mangling.

Tested on amd64. Comments/OKs?


Marc
Index: Makefile
===
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile	26 Jun 2015 07:29:09 -	1.35
+++ Makefile	22 Nov 2015 20:38:38 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.35 2015/06/26 07:29:09 ajacoutot Exp $
 
 COMMENT=	XMPP real time collaboration server
-V=		3.10.2
+V=		3.10.3
 DISTNAME=	openfire_src_${V:S/./_/g}
 PKGNAME=	openfire-$V
 CATEGORIES=	net
Index: distinfo
===
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	26 Jun 2015 07:29:09 -	1.9
+++ distinfo	22 Nov 2015 20:38:38 -
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_10_2.tar.gz) = a+IoeycwXBnbbarjYLG4mEKNKJQT6BFKNenOBMbePYA=
-SIZE (openfire_src_3_10_2.tar.gz) = 128442398
+SHA256 (openfire_src_3_10_3.tar.gz) = BPzSBcECNruT3dshJ1cE0YpZUJZPV7jGPlI7/FL+Ndg=
+SIZE (openfire_src_3_10_3.tar.gz) = 128443231

Re: calibre error

[Stuart Henderson]

On 2015/11/22 07:10, misc nick wrote:
> I'm using the calibre package on OpenBSD 5.8/amd64 release.
> 
> When i try to convert anything to epub i get this:

This was broken by a py-qt4 update that went in too late to get it fixed
in time for release. You can build calibre from 5.8-stable ports (or I think
it will probably be in mtier stable packages) or for a dirty fix you could
edit /usr/local/lib/calibre/calibre/gui2/widgets.py as done here:

https://github.com/kovidgoyal/calibre/commit/72d47ba9377d70e786bf3d93b323544188c894

Another problem you might run into with epub is if there's no cover and
calibre tries to generate one; if you run into this it's fixed with the
ImageMagick update but that isn't suitable for -stable; at least using
the command-line ebook-convert tool you can add --no-default-epub-cover
to the command line to work around this.

Re: [update] abcde 2.5.4 -> 2.7.1

[Marc Peters]

Am 10/22/15 um 16:05 schrieb Marc Peters:
> Hi,
> 
> here's a diff to bring abcde to the latest release (attached to avoid
> mangling). Working here on amd64, just tested with flac, though.
> 
> Comments/ok?
> 

Here an updated diff against -current ports.

Comments/OKs?


Marc
? abcde-2.7.1.patch
Index: Makefile
===
RCS file: /cvs/ports/audio/abcde/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile	24 Aug 2015 23:19:57 -	1.23
+++ Makefile	22 Nov 2015 21:09:09 -
@@ -2,7 +2,7 @@
 
 COMMENT=	command-line utility to rip and encode audio cds
 
-DISTNAME=	abcde-2.5.4
+DISTNAME=	abcde-2.7.1
 REVISION=	1
 CATEGORIES=	audio
 
Index: distinfo
===
RCS file: /cvs/ports/audio/abcde/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	2 Mar 2013 13:03:17 -	1.9
+++ distinfo	22 Nov 2015 21:09:09 -
@@ -1,2 +1,2 @@
-SHA256 (abcde-2.5.4.tar.gz) = hbZ5uXDnKKmGSHrcv/fFHrDnL5+hDERQUh+OAp+m5ZE=
-SIZE (abcde-2.5.4.tar.gz) = 104229
+SHA256 (abcde-2.7.1.tar.gz) = NAHjl4WyDt7oQ9TYdbR9K1WfdkaBxILESRqMi6YF8lA=
+SIZE (abcde-2.7.1.tar.gz) = 144302
Index: patches/patch-abcde
===
RCS file: /cvs/ports/audio/abcde/patches/patch-abcde,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-abcde
--- patches/patch-abcde	21 Nov 2012 20:38:48 -	1.7
+++ patches/patch-abcde	22 Nov 2015 21:09:09 -
@@ -1,14 +1,13 @@
-$OpenBSD: patch-abcde,v 1.7 2012/11/21 20:38:48 sthen Exp $
 abcde.orig	Tue Sep 18 15:09:31 2012
-+++ abcde	Sat Nov 17 16:09:52 2012
+--- abcde.orig	Sun Oct  4 11:30:28 2015
 abcde	Thu Oct 22 15:51:49 2015
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${LOCALBASE}/bin/bash
  # Copyright (c) 1998-2001 Robert Woodcock 
  # Copyright (c) 2003-2006 Jesus Climent 
  # Copyright (c) 2009-2012 Colin Tuckley 
-@@ -833,6 +833,16 @@ do_tag ()
- 		${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+@@ -839,6 +839,16 @@
+ 		${TPE2:+--TPE2 "$TPE2"} \
  		"$ABCDETEMPDIR/track$1.$OUTPUT"
  	;;
 +id3tag)
@@ -21,56 +20,55 @@ $OpenBSD: patch-abcde,v 1.7 2012/11/21 2
 +		${TRACKNUM:+-T "$TRACKS"} \
 +		"$ABCDETEMPDIR/track$1.$OUTPUT"
 +	;;
- # FIXME # Still not activated...
- id3ed)
- 	run_command tagtrack-$OUTPUT-$1 nice $ENCNICE \
-@@ -3165,7 +3175,7 @@ VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}
+ eyed3*)
+ 	# FIXME # track numbers in mp3 come with 1/10, so we cannot
+ 	# happily substitute them with $TRACKNUM
+@@ -3471,7 +3481,7 @@
  VAPLAYLISTDATAPREFIX=''
  DOSPLAYLIST=n
  COMMENT=''
--ID3TAGV=2
+-ID3TAGV=id3v2.4
 +ID3TAGV=id3tag
  ENCNICE=10
  READNICE=10
  DISTMP3NICE=10
-@@ -3207,6 +3217,7 @@ AACENC=faac
- 
+@@ -3537,6 +3547,7 @@
  ID3=id3
  ID3V2=id3v2
+ MID3V2=mid3v2
 +ID3TAG=id3tag
  EYED3=eyeD3
  VORBISCOMMENT=vorbiscomment
  METAFLAC=metaflac
-@@ -3259,6 +3270,7 @@ AACENCOPTS=
+@@ -3621,6 +3632,7 @@
+ FFMPEGENCOPTS=
  
  ID3OPTS=
- ID3V2OPTS=
 +ID3TAGOPTS=
+ EYED3OPTS=""
+ ATOMICPARSLEYOPTS=
  CDPARANOIAOPTS=
- CDDA2WAVOPTS=
- DAGRABOPTS=
-@@ -3310,7 +3322,7 @@ elif [ X$(uname) = "XDarwin" ] ; then
- 	NEEDDISKUTIL=y
- 	CDROMREADERSYNTAX=cddafs
+@@ -3683,7 +3695,7 @@
+ 	# We won't find the eject program in OSX, and doing checkexec will fail further below...
+ 	unset EJECT
  elif [ X$(uname) = "XOpenBSD" ] ; then
 -	HTTPGET=wget
 +	HTTPGET=ftp
  	MD5SUM=md5
  	OSFLAVOUR=OBSD
  elif [ X$(uname) = "XNetBSD" ] ; then
-@@ -3875,11 +3887,15 @@ esac
- if [ "$ID3TAGV" = "1" ]; then
- 	TAGGER="$ID3"
- 	TAGGEROPTS="$ID3OPTS"
-+else if [ "$ID3TAGV" = "id3tag" ]; then
-+	TAGGER="$ID3TAG"
-+	TAGGEROPTS="$ID3TAGOPTS"
- else
- 	TAGGER="$EYED3"
- 	TAGGEROPTS="$ID3V2OPTS"
- 	ID3SYNTAX=eyed3
- 	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+fi
- fi
- 
- # NOGAP is specific to lame. Other encoders fail ...
+@@ -4427,8 +4439,13 @@
+ 			TAGGEROPTS="--encoding utf16 $EYED3OPTS"
+ 		fi
+ 		;;
++	id3tag)
++		TAGGER="$ID3TAG"
++		ID3SYNTAX=id3tag
++		TAGGEROPTS="$ID3TAGOPTS"
++		;;
+ 	*)
+-		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\" or \"id3v2.4\""
++		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\", \"id3v2.4\" or \"id3tag\""
+ 		exit 1
+ 		;;
+ esac

Re: [Fwd: [PATCH] pledge x11/wmii (and other ports?)]

[Theo de Raadt]

That diff is completely wrong.

The addition of "prot_exec" to a pledge should result in some
significant questions.

You can't pledge a program if you don't understand what it is doing,
and why.

Misapplication of pledge like this will result in a nightmare.

> On Sun, Nov 22, 2015 at 12:38:22PM -0500, trondd wrote:
> > ...And I meant for this to go to ports.  Sorry.
> > 
> >  Original Message 
> > Subject: [PATCH] pledge x11/wmii (and other ports?)
> > From:tro...@kagu-tsuchi.com
> > Date:Sun, November 22, 2015 12:24 pm
> > To:  m...@openbsd.org
> > --
> > 
> > I haven't seen much discussion about applying pledge to ports, so I
> > thought I'd
> > find out how people feel about it.
> 
> I like it.
>  
> > I chose to start with x11/wmii because
> > a) It's no longer officially developed so (other than updating the port to
> > the
> > last release) it's not going to change.
> > b) I might be the only one left who uses it.
> 
> Yes.  I'm pretty sure you are ;)
> 
> However, I would consider github sunaku/wmii the "new" upstream, so
> maybe try to push the patches there as and gently ask for release.
> 
> > I've been running it pledged since it was tame.
> > 
> > I can see downsides to this such as, ports maintainers not necessarily being
> > involved in the development of the port and having a lower understanding
> > of the
> > code as compared to OBSD developers with base code, or not having the 
> > ability
> > to reorganize or change the code in a way that improves it for pledge.
> > 
> > Tim.
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/wmii/Makefile,v
> > retrieving revision 1.21
> > diff -u -p -r1.21 Makefile
> > --- Makefile12 Nov 2015 09:59:41 -  1.21
> > +++ Makefile20 Nov 2015 22:33:36 -
> > @@ -3,7 +3,7 @@
> >  COMMENT=   dynamic window manager
> >  DISTNAME=  wmii-3.6
> > -REVISION=  6
> > +REVISION=  7
> >  CATEGORIES=x11
> >  HOMEPAGE=  http://wmii.suckless.org/
> > cvs server: Diffing patches
> > Index: patches/patch-cmd_wmii_main_c
> > ===
> > RCS file: patches/patch-cmd_wmii_main_c
> > diff -N patches/patch-cmd_wmii_main_c
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-cmd_wmii_main_c   20 Nov 2015 22:33:36 - @@ -0,0
> > +1,13 @@
> > +$OpenBSD$
> > +--- cmd/wmii/main.c.orig   Sun Oct 18 15:10:20 2015
> >  cmd/wmii/main.cSun Oct 18 15:10:33 2015
> > +@@ -408,6 +408,9 @@ main(int argc, char *argv[]) {
> > +   WinAttr wa;
> > +   int i;
> > +
> > ++  if (pledge("stdio rpath cpath fattr unix proc exec prot_exec",
> > NULL) == -1)
> > ++  err(1, "pledge");
> > ++
> > +   fmtinstall('r', errfmt);
> > +   fmtinstall('C', Cfmt);
> > +
> > Index: patches/patch-cmd_wmiir_c
> > ===
> > RCS file: patches/patch-cmd_wmiir_c
> > diff -N patches/patch-cmd_wmiir_c
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-cmd_wmiir_c   20 Nov 2015 22:33:36 -
> > @@ -0,0 +1,13 @@
> > +$OpenBSD$
> > +--- cmd/wmiir.c.orig   Sun Oct 18 15:09:57 2015
> >  cmd/wmiir.cSun Oct 18 15:10:44 2015
> > +@@ -312,6 +312,9 @@ main(int argc, char *argv[]) {
> > +   exectab *tab;
> > +   int ret;
> > +
> > ++  if (pledge("stdio unix", NULL) == -1)
> > ++  err(1, "pledge");
> > ++
> > +   fmtinstall('r', errfmt);
> > +
> > +   address = getenv("WMII_ADDRESS");
> > 
> > 
> 

Re: calibre error

[Stuart Henderson]

On 2015/11/22 06:53, Jiri B wrote:
> No idea but I would recomment not to spend time
> on this ancient calibre version but instead to try
> to update the port itself. But iirc we need py-qt5,
> poppler-qt5 and maybe something else.
> 
> j.
> 

That's not a very helpful mail.