CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2015/01/09 17:36:08 Modified files: x11/worker : Makefile distinfo x11/worker/pkg : PLIST Log message: Update to 3.6.0
Re: UPDATE: redshift 1.9.1 - 1.10
On 2015-01-09 21:34:02, Scarlett scarl...@xavin.net wrote: Needs testing on non-amd64 and of redshift-gtk by someone with a gnomish setup. Are the makefile changes ok? I can't comment on the Makefile changes, but it seems to working fine so far on i386. I don't use Gnome, so I can't comment on the -gtk portion of it either, but the base program is doing what I expect it to do. -- Bryan
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2015/01/09 22:24:25 Modified files: www/liferea: Makefile distinfo Log message: Bugfix update to 1.10.13
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2015/01/09 17:30:49 Modified files: graphics/blender: Makefile distinfo graphics/blender/patches: patch-intern_cycles_CMakeLists_txt patch-intern_cycles_util_CMakeLists_txt patch-intern_guardedalloc_intern_mallocn_c patch-source_blender_blenloader_intern_writefile_c patch-source_blender_render_intern_source_shadbuf_c graphics/blender/pkg: PLIST Removed files: graphics/blender/patches: patch-source_blender_blenfont_intern_blf_glyph_c Log message: Update to blender 2.73.
Re: UPDATE: redshift 1.9.1 - 1.10
On Fri, Jan 09, 2015 at 09:34:02PM +, Scarlett wrote:
Needs testing on non-amd64 and of redshift-gtk by someone with a
gnomish setup.
Are the makefile changes ok?
Seems fine at first glance.
I'll have a deeper look tomorrow, thanks for the diff.
Just one question, what's the point in installing the appdata file -- I don't
think there's any application that can make use of it on OpenBSD.
Scarlett
Index: Makefile
===
RCS file: /cvs/ports/misc/redshift/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 12 Sep 2014 06:24:01 - 1.21
+++ Makefile 9 Jan 2015 21:24:56 -
@@ -2,9 +2,8 @@
COMMENT= automatic color temperature adjustment
-V= 1.9.1
+V= 1.10
DISTNAME=redshift-${V}
-REVISION=0
GH_PROJECT= redshift
GH_ACCOUNT= jonls
@@ -17,11 +16,14 @@ HOMEPAGE= http://jonls.dk/redshift/
# GPLv3
PERMIT_PACKAGE_CDROM=Yes
-WANTLIB += X11 Xxf86vm c dbus-1 dbus-glib-1 drm geoclue glib-2.0
-WANTLIB += gobject-2.0 m pthread xcb xcb-randr xml2
+WANTLIB += X11 Xau Xdmcp Xext Xxf86vm c dbus-1 dbus-glib-1 drm
+WANTLIB += ffi geoclue gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += lzma m pcre pthread pthread-stubs xcb xcb-randr xml2
+WANTLIB += z
MODULES= devel/gettext \
- lang/python
+ lang/python \
+ textproc/intltool
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODPY_ADJ_FILES= src/redshift-gtk/redshift-gtk.in
@@ -44,12 +46,19 @@ CONFIGURE_ARGS= --enable-gui
AUTOCONF_VERSION=2.69
AUTOMAKE_VERSION=1.14
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ devel/libtool
pre-configure:
cd ${WRKSRC} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- autoreconf -i
+ ./bootstrap
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/appdata
+ ${INSTALL_DATA} \
+ ${WRKSRC}/data/appdata/redshift-gtk.appdata.xml \
+ ${PREFIX}/share/appdata
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/misc/redshift/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 29 Aug 2014 22:07:38 - 1.5
+++ distinfo 9 Jan 2015 21:24:56 -
@@ -1,2 +1,2 @@
-SHA256 (v1.9.1.tar.gz) = MWNqdsNUTNHv081D9EPZe2P50nxLzJBhmJfPSJ6nR2Y=
-SIZE (v1.9.1.tar.gz) = 163257
+SHA256 (v1.10.tar.gz) = 96HKHsz2YplXN+FPiUwrFRk5I/u+N40VHjRqgBNkTxY=
+SIZE (v1.10.tar.gz) = 519595
Index: pkg/PLIST
===
RCS file: /cvs/ports/misc/redshift/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 29 Aug 2014 22:07:38 - 1.7
+++ pkg/PLIST 9 Jan 2015 21:24:56 -
@@ -16,6 +16,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/redshift_gtk/statusicon.py
lib/python${MODPY_VERSION}/site-packages/redshift_gtk/utils.py
@man man/man1/redshift.1
+share/appdata/
+share/appdata/redshift-gtk.appdata.xml
share/applications/redshift-gtk.desktop
share/icons/hicolor/scalable/apps/redshift-status-off.svg
share/icons/hicolor/scalable/apps/redshift-status-on.svg
@@ -36,6 +38,7 @@ share/locale/gl/LC_MESSAGES/redshift.mo
share/locale/he/LC_MESSAGES/redshift.mo
share/locale/hi/LC_MESSAGES/redshift.mo
share/locale/hr/LC_MESSAGES/redshift.mo
+share/locale/hu/LC_MESSAGES/redshift.mo
share/locale/it/LC_MESSAGES/redshift.mo
share/locale/ja/LC_MESSAGES/redshift.mo
share/locale/ka/LC_MESSAGES/redshift.mo
--
Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/01/09 17:38:39 Modified files: www/webkit : Makefile distinfo www/webkit/patches: patch-GNUmakefile_in patch-Source_WTF_wtf_Platform_h Log message: Update to webkit-2.4.8.
Re: [PATCHES] www/w3m bug fixes
On 01/07/15 15:32, Scarlett wrote:
Updated diff to bump revision (whoops), and carrying over the change to use
overflow-detecting malloc to matrix.c (patch-matrix_c). I forgot about
this because my local fork of w3m has been fixed to build without MATRIX.
I think this is fine. I will note that you need to add RCS ID tags at
the top of every patch file (make update-patches is kind enough to do
this for you, for future reference). But besides that one nit w3m looks
like it works as expected. It's too bad you can't get all this
upstreamed (or can you?).
Anyone else want to weigh in/give oks?
~Brian
Index: w3m/Makefile
===
RCS file: /cvs/ports/www/w3m/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- w3m/Makefile 16 Jul 2014 08:20:01 - 1.84
+++ w3m/Makefile 7 Jan 2015 20:21:59 -
@@ -3,7 +3,7 @@
COMMENT= pager/text-based web browser
DISTNAME=w3m-0.5.3
-REVISION=3
+REVISION=4
CATEGORIES= www
HOMEPAGE=http://w3m.sourceforge.net/
@@ -50,6 +50,9 @@ DOCSRC= ${WRKSRC}/doc-jp
CONFIGURE_ARGS+=--enable-m17n=ISO-8859-1
DOCSRC= ${WRKSRC}/doc
.endif
+
+post-patch:
+ @cp ${FILESDIR}/alloc.h ${WRKSRC}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/w3m
Index: w3m/files/alloc.h
===
RCS file: w3m/files/alloc.h
diff -N w3m/files/alloc.h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ w3m/files/alloc.h 7 Jan 2015 20:21:59 -
@@ -0,0 +1,39 @@
+/*
+ * by Scarlett. public domain.
+ * replacements for w3m's allocation macros which add overflow
+ * detection and concentrate the macros in one file
+ */
+#ifndef W3_ALLOC_H
+#define W3_ALLOC_H
+#include gc.h
+#include stdlib.h
+#include stdio.h
+#include limits.h
+
+static inline size_t
+z_mult_no_oflow_(size_t n, size_t size)
+{
+ if (size != 0 n SIZE_MAX / size) {
+ fprintf(stderr,
+ w3m: overflow in malloc, %zu*%zu\n, n, size);
+ exit(1);
+ }
+ return n * size;
+}
+
+#define New(type) \
+ (GC_MALLOC(sizeof(type)))
+
+#define NewAtom(type) \
+ (GC_MALLOC_ATOMIC(sizeof(type)))
+
+#define New_N(type, n) \
+ (GC_MALLOC(z_mult_no_oflow_((n), sizeof(type
+
+#define NewAtom_N(type, n) \
+ (GC_MALLOC_ATOMIC(z_mult_no_oflow_((n), sizeof(type
+
+#define New_Reuse(type, ptr, n) \
+ (GC_REALLOC((ptr), z_mult_no_oflow_((n), sizeof(type
+
+#endif /* W3_ALLOC_H */
Index: w3m/patches/patch-Str_c
===
RCS file: w3m/patches/patch-Str_c
diff -N w3m/patches/patch-Str_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ w3m/patches/patch-Str_c 7 Jan 2015 20:21:59 -
@@ -0,0 +1,127 @@
+Use asprintf() instead of rolling our own printf string length detection.
+
+--- Str.c.orig Mon Jan 5 22:49:07 2015
Str.cMon Jan 5 22:52:59 2015
+@@ -427,103 +427,27 @@
+ Str
+ Sprintf(char *fmt, ...)
+ {
+-int len = 0;
+-int status = SP_NORMAL;
+-int p = 0;
+-char *f;
+-Str s;
+-va_list ap;
++Str s;
++char *cb;
++int ret;
++size_t n;
++va_list ap;
+
+-va_start(ap, fmt);
+-for (f = fmt; *f; f++) {
+- redo:
+-switch (status) {
+-case SP_NORMAL:
+-if (*f == '%') {
+-status = SP_PREC;
+-p = 0;
+-}
+-else
+-len++;
+-break;
+-case SP_PREC:
+-if (IS_ALPHA(*f)) {
+-/* conversion char. */
+-double vd;
+-int vi;
+-char *vs;
+-void *vp;
+-
+-switch (*f) {
+-case 'l':
+-case 'h':
+-case 'L':
+-case 'w':
+-continue;
+-case 'd':
+-case 'i':
+-case 'o':
+-case 'x':
+-case 'X':
+-case 'u':
+-vi = va_arg(ap, int);
+-len += (p 0) ? p : 10;
+-break;
+-case 'f':
+-case 'g':
+-case 'e':
+-case 'G':
+-case 'E':
+-vd = va_arg(ap, double);
+-len += (p 0) ? p : 15;
+-break;
+-case 'c':
+-len += 1;
+-vi = va_arg(ap, int);
+-break;
+-case 's':
+-vs = va_arg(ap, char *);
+-vi = strlen(vs);
+-len += (p vi) ? p : vi;
+-break;
+-case 'p':
+-vp = va_arg(ap, void *);
+-len += 10;
+-break;
+-case 'n':
+-vp = va_arg(ap, void *);
+-break;
+-}
Re: [NEW] devel/greg
On 01/08/15 16:26, attila wrote: Hi ports@, Third time is a charm, I hope. Attached is an updated version of devel/greg, a parser generator based on Parsing Expression Grammars. This version corrects issues with my original patches discovered by bcallah@ and the update-patches target. The other port I have submitted, textproc/multimarkdown, built-depends on this port. I'll commit this if someone can give an ok. ~Brian pkg/DESCR: greg is a recursive-descent parser generator based on Ian Piumarta's peg/leg. It implements a formalism called Parsing Expression Grammars. --- Works well on i386. I'm working on getting my patches upstream. Thanks again to bcallah@ for helping me with this. Testing and comments welcome! Pax, -A -- att...@stalphonsos.com | http://trac.haqistan.net/~attila
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2015/01/09 22:00:40 Modified files: archivers/quazip: Makefile distinfo Log message: Bugfix update to 0.7.1 - marble (it's only dependent) compiles/runs ok.
Re: UPDATE: redshift 1.9.1 - 1.10
On 01/09/15 19:46, Antoine Jacoutot wrote: On Fri, Jan 09, 2015 at 09:34:02PM +, Scarlett wrote: Needs testing on non-amd64 and of redshift-gtk by someone with a gnomish setup. Are the makefile changes ok? Seems fine at first glance. I'll have a deeper look tomorrow, thanks for the diff. Just one question, what's the point in installing the appdata file -- I don't think there's any application that can make use of it on OpenBSD. I was curious what these files were for as I noticed one pop up when I updated Pidgin as I didn't have to install it myself with a post-install target. But looking around I see this is part of the fd.o specs. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2015/01/09 08:51:02 Modified files: devel/p5-Package-Stash: Makefile distinfo devel/p5-Package-Stash/pkg: PLIST Log message: Update devel/p5-Package-Stash to 0.37 ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2015/01/09 08:53:22 Modified files: devel/p5-Class-Accessor-Grouped: Makefile distinfo Log message: Update devel/p5-Class-Accessor-Grouped to 0.10012 ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2015/01/09 08:57:11 Modified files: devel/p5-Module-Implementation: Makefile distinfo Log message: Update devel/p5-Module-Implementation to 0.09 ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2015/01/09 08:54:46 Modified files: devel/p5-Hash-Merge: Makefile distinfo Log message: Update devel/p5-Hash-Merge to 0.200 ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2015/01/09 08:56:14 Modified files: devel/p5-Dist-CheckConflicts: Makefile distinfo Log message: Update devel/p5-Dist-CheckConflicts to 0.11 ok benoit@
Re: First attempt at ports: password-store
Am Donnerstag, den 08.01.2015, 16:33 + schrieb Mikolaj Kucharski:
As tree(1) is already run depends, I would stay below with it. Any
reason you are changing it to find(1)?
Yes. The tree in OpenBSD ports is http://spootnik.org/tree/tree-0.61.tgz
by Pierre-Ives Ritschard, the password-store developers depend according
to their documentation on tree = 1.7.0 from Steve Baker
http://mama.indstate.edu/users/ice/tree, whose feature set it much
bigger than the one of the ports version.
The ports version is good enough for the base functionality (display a
fancy directory tree in ascii-art), but it cannot do stuff like pattern
matching. This is the reason, why I did say, that that particular line
needs some consideration whether there might be a more satisfying
solution. Be it in the upstream or the port.
The reason for me to use find(1) is that it is the straight-forward way
to display the expected (good enough) result for pass find foo.
Drawbacks: The format is different:
| Password Store
| | bar/foo
| | baz/foo
instead of the original
| Password Store
| |-- bar
| | `-- foo
| `-- baz
| `-- foo
And because of that of course it breaks the regression test
test/t0400-grep.sh. Although, the output format could graphics
could be magicked to to resemble the original, I do not think
consider it to be worthwhile.
What do you think about below change? Be aware, didn't tested it with
pass(1)
--- files/openbsd.sh Thu Jan 8 12:33:37 2015
+++ files/openbsd.sh Thu Jan 8 16:24:39 2015
@@ -6,7 +6,7 @@
local warn=1
[[ $1 == nowarn ]] warn=0
local template=$PROGRAM.X
- if sysctl kern.usermount | grep -q =1$; then
+ if [ `sysctl -n kern.usermount` == 1 ]; then
SECURE_TMPDIR=$(mktemp -d ${TMPDIR:-/tmp}/$template)
mount -t tmpfs -o -s16M tmpfs $SECURE_TMPDIR || die
Error: could not create tmpfs.
unmount_tmpdir() {
Surely. And still works of course.
As a side note, in OpenBSD
ports, examples are usually placed under:
${PREFIX}/share/examples/${PKGNAME}
Yes. I noticed (and changed) that aready locally. Also that one can
install multiple files/dirs with {foo,bar,baz}.
Scanning other ports, some place more or less the same kinds of files
to doc/$PACKAGE/examples, some place them to examples/$PACKAGE. As
the documentation lists examples/$PACKAGE, I consider this to be the
right place though.
--
David Dahlberg
Fraunhofer FKIE, Dept. Communication Systems (KOM) | Tel: +49-228-9435-845
Fraunhoferstr. 20, 53343 Wachtberg, Germany| Fax: +49-228-856277
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2015/01/09 01:10:56 Modified files: x11/qt5: Makefile Log message: Fix in powerpc by linking with --relax. ok toolchain@ via landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2015/01/09 03:10:43 Modified files: net/unison : Makefile distinfo Removed files: net/unison/patches: patch-ubase_util_ml patch-uicommon_ml Log message: Update to 2.48.3 Same diff from Björn Ketelaars, thanks
update: games/gnuchess 6.2.1
ok?
Index: Makefile
===
RCS file: /cvs/ports/games/gnuchess/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile28 Jan 2014 09:12:57 - 1.32
+++ Makefile9 Jan 2015 18:52:54 -
@@ -2,7 +2,7 @@
COMMENT= chess program
-DISTNAME= gnuchess-6.1.1
+DISTNAME= gnuchess-6.2.1
DISTFILES= ${DISTNAME}.tar.gz book_1.02.pgn.gz
CATEGORIES=games
Index: distinfo
===
RCS file: /cvs/ports/games/gnuchess/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo28 Jan 2014 09:12:57 - 1.8
+++ distinfo9 Jan 2015 18:52:54 -
@@ -1,4 +1,4 @@
SHA256 (book_1.02.pgn.gz) = 3qx37bBhpZJJoZ3rA9o0nK4FHlJSemy1r4CNk5jTLUQ=
-SHA256 (gnuchess-6.1.1.tar.gz) = dqJPsehs7Ihvpq4P0+l8Fdiax422AY3vyHKHiMO7k8k=
+SHA256 (gnuchess-6.2.1.tar.gz) = F8qrclU5RHvLF6FLF5BSQsvyhwh+U6Z3dST+t7uu7QY=
SIZE (book_1.02.pgn.gz) = 26265281
-SIZE (gnuchess-6.1.1.tar.gz) = 699439
+SIZE (gnuchess-6.2.1.tar.gz) = 730761
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/gnuchess/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 28 Jan 2014 09:12:57 - 1.7
+++ pkg/PLIST 9 Jan 2015 18:52:54 -
@@ -3,8 +3,15 @@
bin/gnuchessu
bin/gnuchessx
@info info/gnuchess.info
+@man man/man1/gnuchess.1
share/doc/gnuchess/
share/doc/gnuchess/README
+share/games/
+share/games/plugins/
+share/games/plugins/logos/
+share/games/plugins/logos/gnuchess.png
+share/games/plugins/xboard/
+share/games/plugins/xboard/gnuchess.eng
share/gnuchess/
share/gnuchess/book.bin
share/gnuchess/gnuchess.ini
@@ -12,7 +19,10 @@ share/gnuchess/smallbook.bin
share/locale/de/LC_MESSAGES/gnuchess.mo
share/locale/eo/LC_MESSAGES/gnuchess.mo
share/locale/es/LC_MESSAGES/gnuchess.mo
+share/locale/gl/LC_MESSAGES/gnuchess.mo
+share/locale/nb/LC_MESSAGES/gnuchess.mo
share/locale/nl/LC_MESSAGES/gnuchess.mo
share/locale/pt_BR/LC_MESSAGES/gnuchess.mo
share/locale/sr/LC_MESSAGES/gnuchess.mo
share/locale/uk/LC_MESSAGES/gnuchess.mo
+share/locale/vi/LC_MESSAGES/gnuchess.mo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/09 10:15:29 Modified files: audio/beets: Makefile distinfo audio/beets/pkg: PLIST Log message: update to beets 1.3.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/09 11:04:19 Modified files: net/nfsen : Makefile distinfo net/nfsen/patches: patch-etc_nfsen-dist_conf patch-html_nfsen_php patch-install_pl Removed files: net/nfsen/patches: patch-libexec_AbuseWhois_pm patch-libexec_Lookup_pm Log message: update to nfsen 1.3.7
Re: urlview manpage
On 2015/01/09 14:56, Ingo Schwarze wrote: Yes. The source code if of inferior quality in multiple respects. ;-) The actual DEFAULT_REGEXP is defined here (obviously with C quoting): #define DEFAULT_REGEXP (((https?|ftp|gopher)://|(mailto|file|news):)[^' \t\]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;\\\):] So I think the diff should be something like this .. No. You almost never want \\ in roff(7) source code, unless you are defining macros. You certainly don't want \\ in manual pages. Seing that you consider this documentation bug bad enough that it warrants patching, we can as well fix all the bugs instead of just one of them and provide a patch suitable for upstreaming. It was more a case of the proposed diff showing something up that wasn't quite right, rather than me thinking it's especially bad. * properly escape backslashes * .ec is not used properly and doesn't belong in a manual anyway * an RR font exists neither in groff -Tascii nor in groff -Tps, no idea what it is supposed to be * .TH all caps convention * drop a redundant .PP * new sentence, new line * trailing whitespace OK? Certainly, thank you. Index: Makefile === RCS file: /cvs/ports/textproc/urlview/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile 9 Jan 2015 13:21:03 - 1.23 +++ Makefile 9 Jan 2015 13:48:44 - @@ -3,7 +3,7 @@ COMMENT= curses-based URL ripper DISTNAME=urlview-0.9 -REVISION=5 +REVISION=6 CATEGORIES= textproc MASTER_SITES=ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \ ftp://ftp.mutt.org/mutt/contrib/ \ @@ -12,7 +12,8 @@ MASTER_SITES= ftp://ftp.fu-berlin.de/pub # GPLv2 PERMIT_PACKAGE_CDROM=Yes -WANTLIB= c + +WANTLIB += c CONFIGURE_STYLE= gnu Index: patches/patch-urlview_man === RCS file: patches/patch-urlview_man diff -N patches/patch-urlview_man --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-urlview_man 9 Jan 2015 13:48:44 - @@ -0,0 +1,111 @@ +$OpenBSD$ +Fix incorrect escaping resulting in incorrectly shown regexp. +While here, fix various other nits. +--- urlview.man.orig Tue Jul 4 12:14:30 2000 urlview.man Fri Jan 9 14:41:54 2015 +@@ -7,18 +7,18 @@ + .\ Copyright (c) 1997 Michael Elkins m...@cs.hmc.edu + .\ Copyright (c) 2000 Thomas Roessler roess...@does-not-exist.org + .\ +-.\ This document is free software; you can redistribute it and/or ++.\ This document 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. + .\ +-.TH urlview 1 ++.TH URLVIEW 1 + .SH NAME + .PP + urlview \- URL extractor/launcher + .SH SYNOPSIS + .PP +-.B urlview ++.B urlview + \fIfilename\fP [ \fIfilename\fP ... ] + .SH DESCRIPTION + .PP +@@ -29,53 +29,50 @@ specific item. + .SH CONFIGURATION + .PP + .B urlview +-attempts to read ++attempts to read + .I ~/.urlview +-upon startup. If this file +-doesn't exist, it will try to read a system wide file +-in ++upon startup. ++If this file doesn't exist, it will try to read a system wide file in + .IR /etc/urlview.conf . + There are two configuration commands (order does not matter): + .TP + REGEXP \fIregexp\fP + .B urlview +-uses a regular expression to extract URLs from the specified +-text files. \\r, \\t, \\n and \\f are all converted to +-their normal ++uses a regular expression to extract URLs from the specified text files. ++\er, \et, \en and \ef are all converted to their normal + .BR printf (3) +-meanings. The default REGEXP is: ++meanings. ++The default REGEXP is: + .PP +-.sp +-.ft RR ++.sp + .nf +-(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t]+|(www|web|w3)\.[-a-z0-9.]+)[^' \t.,;\):] ++(((https?|ftp|gopher)://|(mailto|file|news):)[^' \et]+|(www|web|w3)\e.[-a-z0-9.]+)[^' \et.,;\e):] + .fi +-.ec +-.ft P + .sp + .TP + COMMAND \fIcommand\fP +-If the specified command contains a ++If the specified command contains a + .BR %s , + it will be subsituted + with the URL that was requested, otherwise the URL is appended to +-the COMMAND string. The default COMMAND is: ++the COMMAND string. ++The default COMMAND is: + .br + .sp + url_handler.sh %s + .PP + .B Note: +-You should ++You should + .I never +-put single quotes around the ++put single quotes around the + .BR %s . + .B urlview + does this for you, and also makes sure that single quotes eventually +-showing up inside the URL are handled properly. (Note that this ++showing up inside the URL are handled properly. ++(Note that this + shouldn't happen with the default regular expression, which
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2015/01/09 11:48:29 Modified files: security/keychain: Makefile Added files: security/keychain/patches: patch-keychain Log message: adopt to new ssh-add -l and ssh-keygen -l format
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/01/09 09:47:55 Modified files: inputmethods/uim-tomoe-gtk: Makefile distinfo inputmethods/uim-tomoe-gtk/pkg: PLIST Added files: inputmethods/uim-tomoe-gtk/patches: patch-configure Removed files: inputmethods/uim-tomoe-gtk/patches: patch-src_uim-tomoe-gtk_c Log message: Update to uim-tomoe-gtk-0.6.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/01/09 09:45:37 Modified files: inputmethods/uim: Makefile distinfo inputmethods/uim/patches: patch-configure_ac inputmethods/uim/pkg: DESCR-gtk DESCR-main DESCR-qt PLIST-gtk PLIST-kde PLIST-main PLIST-qt Added files: inputmethods/uim/patches: patch-qt3_toolbar_Makefile_in inputmethods/uim/pkg: DESCR-gtk3 DESCR-qt4 PLIST-gtk3 PLIST-qt4 Removed files: inputmethods/uim/patches: patch-helper_Makefile_in patch-qt_Makefile_in patch-uim_uim_x_kana_input_hack_c Log message: Update to uim-1.8.6. Add new gtk3 and qt4 subpackages.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/09 10:34:52 Modified files: net/lldpd : Makefile distinfo Added files: net/lldpd/patches: patch-configure_ac Log message: update to lldpd 0.7.13 patch to avoid using -fdiagnostics compiler flags which are not supported by our gcc, but AX_CFLAGS_GCC_OPTION thinks they are valid
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/01/09 09:46:49 Modified files: inputmethods/tomoe: Makefile distinfo inputmethods/tomoe/pkg: PFRAG.shared PLIST Added files: inputmethods/tomoe/patches: patch-configure patch-lib_glib-utils_h patch-lib_tomoe_c Log message: Update to tomoe-0.6.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/01/09 09:47:18 Modified files: inputmethods/libtomoe-gtk: Makefile distinfo inputmethods/libtomoe-gtk/pkg: PLIST Removed files: inputmethods/libtomoe-gtk/pkg: PFRAG.shared Log message: Update to libtomoe-gtk-0.6.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/01/09 09:46:17 Modified files: inputmethods/uim-chewing: Makefile distinfo inputmethods/uim-chewing/patches: patch-scm_Makefile_in Log message: Update to uim-chewing-0.1.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2015/01/09 08:52:16 Modified files: devel/p5-Class-XSAccessor: Makefile distinfo devel/p5-Class-XSAccessor/pkg: PLIST Log message: Update devel/p5-Class-XSAccessor to 1.19 ok benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/09 11:15:36 ports/www/squidclamav/patches Update of /cvs/ports/www/squidclamav/patches In directory cvs.openbsd.org:/tmp/cvs-serv23928/patches Log Message: Directory /cvs/ports/www/squidclamav/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/09 11:16:56 Modified files: www/squidclamav: Makefile distinfo Added files: www/squidclamav/patches: patch-configure_in Log message: update to squidclamav 6.12 patch to revert upstream's config path change
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/09 11:39:18 Modified files: net/openconnect: Makefile distinfo Log message: update to openconnect 7.03
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/09 11:36:32 Modified files: security/openssl: Makefile distinfo Log message: update to openssl 1.0.1k
rsyslog crashes in debug printf
Hi,
With MALLOC_OPTIONS=J rsyslogd crashes when it receives a line via
UDP in debug mode. There is no terminating '\0', so it tries to
print the line infinitly. Without debug printing, the missing '\0'
is added later.
I found this while testing interoprability of our syslogd with
rsyslog.
ok?
bluhm
Index: sysutils/rsyslog/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- sysutils/rsyslog/Makefile 9 Jan 2015 21:04:02 - 1.21
+++ sysutils/rsyslog/Makefile 9 Jan 2015 21:04:16 -
@@ -20,7 +20,7 @@ PKGNAME-mysql = rsyslog-mysql-$V
PKGNAME-pgsql =rsyslog-pgsql-$V
CATEGORIES = sysutils
-REVISION-main =6
+REVISION-main =7
REVISION-docs =0
REVISION-mysql = 6
REVISION-pgsql = 3
Index: sysutils/rsyslog/patches/patch-plugins_imudp_imudp_c
===
RCS file: sysutils/rsyslog/patches/patch-plugins_imudp_imudp_c
diff -N sysutils/rsyslog/patches/patch-plugins_imudp_imudp_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ sysutils/rsyslog/patches/patch-plugins_imudp_imudp_c9 Jan 2015
21:32:33 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- plugins/imudp/imudp.c.orig Thu Aug 5 11:33:54 2010
plugins/imudp/imudp.c Fri Jan 9 22:31:59 2015
+@@ -241,6 +241,8 @@ processSocket(int fd, struct sockaddr_storage *fromine
+ }
+ }
+
++ if(Debug)
++ pRcvBuf[lenRcvBuf] = '\0';
+ DBGPRINTF(recv(%d,%d)/%s,acl:%d,msg:%s\n, fd, (int)
lenRcvBuf, fromHost, *pbIsPermitted, pRcvBuf);
+
+ if(*pbIsPermitted) {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2015/01/09 14:04:02 Modified files: sysutils/rsyslog: Makefile Added files: sysutils/rsyslog/patches: patch-doc_Makefile_in sysutils/rsyslog/pkg: DESCR-docs PLIST-docs Log message: The rsyslog distribution comes with basic man pages that reference to extensive documentation in html format. Install the html pages and images in a -docs subpackage. While there adjust the wantlib. OK jung@ sthen@
UPDATE: redshift 1.9.1 - 1.10
Needs testing on non-amd64 and of redshift-gtk by someone with a
gnomish setup.
Are the makefile changes ok?
Scarlett
Index: Makefile
===
RCS file: /cvs/ports/misc/redshift/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile12 Sep 2014 06:24:01 - 1.21
+++ Makefile9 Jan 2015 21:24:56 -
@@ -2,9 +2,8 @@
COMMENT= automatic color temperature adjustment
-V= 1.9.1
+V= 1.10
DISTNAME= redshift-${V}
-REVISION= 0
GH_PROJECT=redshift
GH_ACCOUNT=jonls
@@ -17,11 +16,14 @@ HOMEPAGE= http://jonls.dk/redshift/
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += X11 Xxf86vm c dbus-1 dbus-glib-1 drm geoclue glib-2.0
-WANTLIB += gobject-2.0 m pthread xcb xcb-randr xml2
+WANTLIB += X11 Xau Xdmcp Xext Xxf86vm c dbus-1 dbus-glib-1 drm
+WANTLIB += ffi geoclue gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += lzma m pcre pthread pthread-stubs xcb xcb-randr xml2
+WANTLIB += z
MODULES= devel/gettext \
- lang/python
+ lang/python \
+ textproc/intltool
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODPY_ADJ_FILES= src/redshift-gtk/redshift-gtk.in
@@ -44,12 +46,19 @@ CONFIGURE_ARGS= --enable-gui
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.14
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
+ ${MODGNU_AUTOMAKE_DEPENDS} \
+ devel/libtool
pre-configure:
cd ${WRKSRC} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- autoreconf -i
+ ./bootstrap
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/appdata
+ ${INSTALL_DATA} \
+ ${WRKSRC}/data/appdata/redshift-gtk.appdata.xml \
+ ${PREFIX}/share/appdata
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/misc/redshift/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo29 Aug 2014 22:07:38 - 1.5
+++ distinfo9 Jan 2015 21:24:56 -
@@ -1,2 +1,2 @@
-SHA256 (v1.9.1.tar.gz) = MWNqdsNUTNHv081D9EPZe2P50nxLzJBhmJfPSJ6nR2Y=
-SIZE (v1.9.1.tar.gz) = 163257
+SHA256 (v1.10.tar.gz) = 96HKHsz2YplXN+FPiUwrFRk5I/u+N40VHjRqgBNkTxY=
+SIZE (v1.10.tar.gz) = 519595
Index: pkg/PLIST
===
RCS file: /cvs/ports/misc/redshift/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 29 Aug 2014 22:07:38 - 1.7
+++ pkg/PLIST 9 Jan 2015 21:24:56 -
@@ -16,6 +16,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/redshift_gtk/statusicon.py
lib/python${MODPY_VERSION}/site-packages/redshift_gtk/utils.py
@man man/man1/redshift.1
+share/appdata/
+share/appdata/redshift-gtk.appdata.xml
share/applications/redshift-gtk.desktop
share/icons/hicolor/scalable/apps/redshift-status-off.svg
share/icons/hicolor/scalable/apps/redshift-status-on.svg
@@ -36,6 +38,7 @@ share/locale/gl/LC_MESSAGES/redshift.mo
share/locale/he/LC_MESSAGES/redshift.mo
share/locale/hi/LC_MESSAGES/redshift.mo
share/locale/hr/LC_MESSAGES/redshift.mo
+share/locale/hu/LC_MESSAGES/redshift.mo
share/locale/it/LC_MESSAGES/redshift.mo
share/locale/ja/LC_MESSAGES/redshift.mo
share/locale/ka/LC_MESSAGES/redshift.mo
Re: urlview manpage
Hi Stuart, maybe i was too quick with my commit, but seing a typical case of mandoc(1) handling broken input more gracefully, i simply deleted the USE_GROFF. Stuart Henderson wrote on Fri, Jan 09, 2015 at 01:18:16PM +: On 2015/01/09 13:44, Jan Stary wrote: The man(7) page of urlview looks OK to me with mandoc. The diff below removes the GROFF dependence. They're all wrong :-) There is actually a difference in the regular expression displayed - (((https?|ftp|gopher)://|(mailto|file|news):)[^' ]+|(www|web|w3).[-a-z0-9.]+)[^' .,;:] + (((https?|ftp|gopher)://|(mailto|file|news):)[^' ]+|(www|web|w3).[-a-z0-9.]+)[^' .,;):] [snip] so mandoc is slightly better, but it seems that the manpage source is wrong because there should be a couple of backslashes. Yes. The source code if of inferior quality in multiple respects. The actual DEFAULT_REGEXP is defined here (obviously with C quoting): #define DEFAULT_REGEXP (((https?|ftp|gopher)://|(mailto|file|news):)[^' \t\]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;\\\):] So I think the diff should be something like this .. No. You almost never want \\ in roff(7) source code, unless you are defining macros. You certainly don't want \\ in manual pages. Seing that you consider this documentation bug bad enough that it warrants patching, we can as well fix all the bugs instead of just one of them and provide a patch suitable for upstreaming. * properly escape backslashes * .ec is not used properly and doesn't belong in a manual anyway * an RR font exists neither in groff -Tascii nor in groff -Tps, no idea what it is supposed to be * .TH all caps convention * drop a redundant .PP * new sentence, new line * trailing whitespace OK? Ingo Index: Makefile === RCS file: /cvs/ports/textproc/urlview/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- Makefile9 Jan 2015 13:21:03 - 1.23 +++ Makefile9 Jan 2015 13:48:44 - @@ -3,7 +3,7 @@ COMMENT= curses-based URL ripper DISTNAME= urlview-0.9 -REVISION= 5 +REVISION= 6 CATEGORIES=textproc MASTER_SITES= ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \ ftp://ftp.mutt.org/mutt/contrib/ \ @@ -12,7 +12,8 @@ MASTER_SITES= ftp://ftp.fu-berlin.de/pub # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c + +WANTLIB += c CONFIGURE_STYLE= gnu Index: patches/patch-urlview_man === RCS file: patches/patch-urlview_man diff -N patches/patch-urlview_man --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-urlview_man 9 Jan 2015 13:48:44 - @@ -0,0 +1,111 @@ +$OpenBSD$ +Fix incorrect escaping resulting in incorrectly shown regexp. +While here, fix various other nits. +--- urlview.man.orig Tue Jul 4 12:14:30 2000 urlview.manFri Jan 9 14:41:54 2015 +@@ -7,18 +7,18 @@ + .\ Copyright (c) 1997 Michael Elkins m...@cs.hmc.edu + .\ Copyright (c) 2000 Thomas Roessler roess...@does-not-exist.org + .\ +-.\ This document is free software; you can redistribute it and/or ++.\ This document 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. + .\ +-.TH urlview 1 ++.TH URLVIEW 1 + .SH NAME + .PP + urlview \- URL extractor/launcher + .SH SYNOPSIS + .PP +-.B urlview ++.B urlview + \fIfilename\fP [ \fIfilename\fP ... ] + .SH DESCRIPTION + .PP +@@ -29,53 +29,50 @@ specific item. + .SH CONFIGURATION + .PP + .B urlview +-attempts to read ++attempts to read + .I ~/.urlview +-upon startup. If this file +-doesn't exist, it will try to read a system wide file +-in ++upon startup. ++If this file doesn't exist, it will try to read a system wide file in + .IR /etc/urlview.conf . + There are two configuration commands (order does not matter): + .TP + REGEXP \fIregexp\fP + .B urlview +-uses a regular expression to extract URLs from the specified +-text files. \\r, \\t, \\n and \\f are all converted to +-their normal ++uses a regular expression to extract URLs from the specified text files. ++\er, \et, \en and \ef are all converted to their normal + .BR printf (3) +-meanings. The default REGEXP is: ++meanings. ++The default REGEXP is: + .PP +-.sp +-.ft RR ++.sp + .nf +-(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t]+|(www|web|w3)\.[-a-z0-9.]+)[^' \t.,;\):] ++(((https?|ftp|gopher)://|(mailto|file|news):)[^' \et]+|(www|web|w3)\e.[-a-z0-9.]+)[^' \et.,;\e):] + .fi +-.ec +-.ft P + .sp + .TP + COMMAND \fIcommand\fP +-If the specified command contains a ++If the specified command contains a + .BR %s , + it will be subsituted + with the URL that was requested, otherwise the URL is appended to +-the COMMAND string. The default COMMAND is: ++the COMMAND string. ++The
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/01/09 06:56:48 ports/inputmethods/tomoe/patches Update of /cvs/ports/inputmethods/tomoe/patches In directory cvs.openbsd.org:/tmp/cvs-serv29640/patches Log Message: Directory /cvs/ports/inputmethods/tomoe/patches added to the repository
Re: urlview manpage
Hi Jan, Jan Stary wrote on Fri, Jan 09, 2015 at 01:44:09PM +0100: I rewrote the manpage into mdoc(7) anyway (see below) and offered that upstream; no response. How unfortunate. If upstream doesn't want it, i don't know what to do with it. I don't think we should put it into the ports tree if upstream sticks to man(7). .Nm uses a regular expression to extract URLs from the specified text files. \\r, \\t, \\n and \\f are all converted to their normal .Xr printf 3 meanings. This is still wrong. Use \e, not \\, see mandoc_char(7). The default REGEXP is: .Bd -literal -offset indent (((https?|ftp|gopher)://|(mailto|file|news):)[^' \\t]+|(www|web|w3)\.[-a-z0-9.]+)[^' \\t.,;\):] .Ed Same thing, and \. and \) are still unescaped. Yours, Ingo
Re: urlview manpage
On 2015/01/09 13:44, Jan Stary wrote: The man(7) page of urlview looks OK to me with mandoc. The diff below removes the GROFF dependence. They're all wrong :-) There is actually a difference in the regular expression displayed - (((https?|ftp|gopher)://|(mailto|file|news):)[^' ]+|(www|web|w3).[-a-z0-9.]+)[^' .,;:] + (((https?|ftp|gopher)://|(mailto|file|news):)[^' ]+|(www|web|w3).[-a-z0-9.]+)[^' .,;):] [snip] so mandoc is slightly better, but it seems that the manpage source is wrong because there should be a couple of backslashes. The actual DEFAULT_REGEXP is defined here (obviously with C quoting): #define DEFAULT_REGEXP (((https?|ftp|gopher)://|(mailto|file|news):)[^' \t\]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \t.,;\\\):] So I think the diff should be something like this .. Index: Makefile === RCS file: /cvs/ports/textproc/urlview/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile16 Jul 2014 14:35:37 - 1.22 +++ Makefile9 Jan 2015 13:17:21 - @@ -3,7 +3,7 @@ COMMENT= curses-based URL ripper DISTNAME= urlview-0.9 -REVISION= 5 +REVISION= 6 CATEGORIES=textproc MASTER_SITES= ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \ ftp://ftp.mutt.org/mutt/contrib/ \ @@ -12,11 +12,11 @@ MASTER_SITES= ftp://ftp.fu-berlin.de/pub # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c + +WANTLIB += c CONFIGURE_STYLE= gnu -USE_GROFF =Yes NO_TEST= Yes # see patch-url_handler_sh Index: patches/patch-urlview_man === RCS file: patches/patch-urlview_man diff -N patches/patch-urlview_man --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-urlview_man 9 Jan 2015 13:17:21 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- urlview.man.orig Fri Jan 9 13:15:56 2015 urlview.manFri Jan 9 13:16:07 2015 +@@ -48,7 +48,7 @@ meanings. The default REGEXP is: + .sp + .ft RR + .nf +-(((https?|ftp|gopher)://|(mailto|file|news):)[^' \t]+|(www|web|w3)\.[-a-z0-9.]+)[^' \t.,;\):] ++(((https?|ftp|gopher)://|(mailto|file|news):)[^' \\t]+|(www|web|w3)\\.[-a-z0-9.]+)[^' \\t.,;\\):] + .fi + .ec + .ft P
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2015/01/09 06:21:03 Modified files: textproc/urlview: Makefile Log message: This hand-maintained man(7) page does not need to USE_GROFF. Pointed out by Jan Stary hans at stare dot cz. No bump needed.
urlview manpage
The man(7) page of urlview looks OK to me with mandoc. The diff below removes the GROFF dependence. Index: Makefile === RCS file: /cvs/ports/textproc/urlview/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile16 Jul 2014 14:35:37 - 1.22 +++ Makefile9 Jan 2015 12:37:25 - @@ -3,7 +3,7 @@ COMMENT= curses-based URL ripper DISTNAME= urlview-0.9 -REVISION= 5 +REVISION= 6 CATEGORIES=textproc MASTER_SITES= ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \ ftp://ftp.mutt.org/mutt/contrib/ \ @@ -16,7 +16,6 @@ WANTLIB= c CONFIGURE_STYLE= gnu -USE_GROFF =Yes NO_TEST= Yes # see patch-url_handler_sh I rewrote the manpage into mdoc(7) anyway (see below) and offered that upstream; no response. Jan .Dd January 9, 2015 .Dt URLVIEW 1 .Os .Sh NAME .Nm urlview .Nd extract and launch URLs found in text .Sh SYNOPSIS .Nm urlview .Ar .Sh DESCRIPTION .Nm urlview is a screen oriented program for extracting URLs from text files and displaying a menu allowing the user to launch a command to view a specific item. .Ss Configuration .Nm attempts to read .Pa ~/.urlview upon startup. If this file doesn't exist, it will try to read .Pa /etc/urlview.conf . Two configuration commands are recognized (order does not matter): .Bl -tag -width COMMAND .It REGEXP Ar regexp .Nm uses a regular expression to extract URLs from the specified text files. \\r, \\t, \\n and \\f are all converted to their normal .Xr printf 3 meanings. The default REGEXP is: .Bd -literal -offset indent (((https?|ftp|gopher)://|(mailto|file|news):)[^' \\t]+|(www|web|w3)\.[-a-z0-9.]+)[^' \\t.,;\):] .Ed .It COMMAND Ar command This specifies the command used to launch the URLs found. If .Ar command contains a .Cm %s , it will be subsituted with the URL that was requested; otherwise the URL is simply appended to the COMMAND string. The default COMMAND is: .Bd -literal -offset indent url_handler.sh %s .Ed .Pp Do .Em not put single quotes around the .Cm %s argument. .Nm does this for you, and makes sure that single quotes possibly appearing in the URL are handled properly. (Note that this shouldn't happen with the default regular expression, which explicitly excludes single quotes.) .El .Sh FILES .Bl -tag -width /etc/urlview.confXX -compact .It Pa /etc/urlview.conf system-wide urlview configuration file .It Pa ~/.urlview user configuration file .El .Sh SEE ALSO .Xr printf 3 , .Xr regcomp 3 , .Xr regex 7 .Sh AUTHORS .An Michael Elkins Aq Mt m...@cs.hmc.edu .An Luis Francisco Gonzalez Aq Mt lui...@debian.org .An Werner Fink Aq Mt wer...@suse.de .An Stepan Kasal Aq Mt ka...@suse.cz .An Thomas Roessler Aq Mt roess...@does-not-exist.org
update: database/hs-postgresql-simple-0.4.6.0 - 0.4.9.0
Tested with ghc-7.8.4/amd64. Index: Makefile === RCS file: /cvs/ports/databases/hs-postgresql-simple/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile3 Dec 2014 21:56:43 - 1.15 +++ Makefile9 Jan 2015 09:58:38 - @@ -2,8 +2,7 @@ COMMENT = mid-level PostgreSQL client library -DISTNAME = postgresql-simple-0.4.6.0 -REVISION = 1 +DISTNAME = postgresql-simple-0.4.9.0 CATEGORIES = databases HOMEPAGE = https://github.com/lpsmith/postgresql-simple @@ -22,6 +21,7 @@ RUN_DEPENDS = databases/hs-postgresql-l devel/hs-aeson=0.6 \ devel/hs-blaze-builder \ devel/hs-blaze-textual \ + devel/hs-case-insensitive \ devel/hs-hashable \ devel/hs-scientific \ devel/hs-text=0.11.1 \ Index: distinfo === RCS file: /cvs/ports/databases/hs-postgresql-simple/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- distinfo14 Oct 2014 13:23:13 - 1.8 +++ distinfo9 Jan 2015 09:58:38 - @@ -1,2 +1,2 @@ -SHA256 (ghc/postgresql-simple-0.4.6.0.tar.gz) = eQqobPF0wTrWCVrtnEBLIk+kObNWtJPU2VMrA9C98Zo= -SIZE (ghc/postgresql-simple-0.4.6.0.tar.gz) = 60990 +SHA256 (ghc/postgresql-simple-0.4.9.0.tar.gz) = mlMtjZgYpzutHZN3GgQTpUMbvgMVPfSdmP/wU3j1Y1U= +SIZE (ghc/postgresql-simple-0.4.9.0.tar.gz) = 62146
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2015/01/09 04:32:11 Modified files: devel/hs-uuid : Makefile distinfo devel/hs-scientific: Makefile distinfo databases/hs-postgresql-simple: Makefile distinfo Log message: Updates: devel/hs-uuid-1.3.6 - 1.3.8 devel/hs-scientific-0.3.3.1 - 0.3.3.5 database/hs-postgresql-simple-0.4.6.0 - 0.4.9.0 From maintainer David Schaefer
update: devel/hs-uuid-1.3.6 - 1.3.8
Tested with ghc-7.8.4/amd64. Index: Makefile === RCS file: /cvs/ports/devel/hs-uuid/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile20 Dec 2014 01:37:32 - 1.3 +++ Makefile9 Jan 2015 09:43:49 - @@ -2,7 +2,7 @@ COMMENT = creating, comparing, parsing and printing UUIDs -DISTNAME = uuid-1.3.6 +DISTNAME = uuid-1.3.8 CATEGORIES = devel HOMEPAGE = http://projects.haskell.org/uuid/ Index: distinfo === RCS file: /cvs/ports/devel/hs-uuid/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo20 Dec 2014 01:37:32 - 1.3 +++ distinfo9 Jan 2015 09:43:49 - @@ -1,2 +1,2 @@ -SHA256 (ghc/uuid-1.3.6.tar.gz) = 7+kw6G5LGKXh7ZVsgjt9qBxnuBjXLFQRmk5faTq7jlI= -SIZE (ghc/uuid-1.3.6.tar.gz) = 17355 +SHA256 (ghc/uuid-1.3.8.tar.gz) = ZoVBdi0yzGnV2L1yU1qBVTFUyKr9phzEwdDTLs4x+Bw= +SIZE (ghc/uuid-1.3.8.tar.gz) = 17791
update: devel/hs-scientific-0.3.3.1 - 0.3.3.5
Tested with ghc-7.8.4/amd64. Index: Makefile === RCS file: /cvs/ports/devel/hs-scientific/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile25 Nov 2014 22:11:04 - 1.2 +++ Makefile9 Jan 2015 09:10:36 - @@ -2,8 +2,7 @@ COMMENT = scientific number type -DISTNAME = scientific-0.3.3.1 -REVISION = 0 +DISTNAME = scientific-0.3.3.5 CATEGORIES = devel HOMEPAGE = https://github.com/basvandijk/scientific Index: distinfo === RCS file: /cvs/ports/devel/hs-scientific/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo14 Oct 2014 13:06:02 - 1.1.1.1 +++ distinfo9 Jan 2015 09:10:36 - @@ -1,2 +1,2 @@ -SHA256 (ghc/scientific-0.3.3.1.tar.gz) = C/DcRLhBmsYY3NhEqlzfgmce3z43fmP1DwsegSRLL9w= -SIZE (ghc/scientific-0.3.3.1.tar.gz) = 17647 +SHA256 (ghc/scientific-0.3.3.5.tar.gz) = PQdomnhsIChZgvRjthyEjUhCFZxG+jiGixqJZZei8sw= +SIZE (ghc/scientific-0.3.3.5.tar.gz) = 18196
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2015/01/09 07:40:27 Modified files: math/py-scipy : Makefile distinfo math/py-scipy/pkg: PLIST Added files: math/py-scipy/patches: patch-scipy_weave_tests_test_catalog_py Log message: Update py-scipy to 0.14.1 and take over maintainer from eric@ with his permission. ok benoit@
