Re: misc/uniutils fix %n
Looks good to me, ok nicm
I would probably have used snprintf first myself, to be fair.
The tempstr stuff is hilarious though...
On Tue, 14 Sept 2021 at 17:42, Ingo Schwarze wrote:
> Hi,
>
> Stefan Hagen wrote on Sat, Sep 11, 2021 at 09:00:18AM +0200:
>
> > Is this better?
>
> No, it is no good whatsoever.
>
> * It introduces yet another pointless static buffer.
> * It pointlessly uses snprintf(3) where printf(3)
>is obviously sufficient.
> * It introduces error checking for operations
>that obviously cannot fail when done properly.
> * It needlessly does pointer arithmetic.
>
> So far, so bad, but the worst part is that it apparently wasn't
> tested on a 64-bit platform (a platform where sizeof(long) == 64,
> for example amd64). On such a platform, there is another bug on
> the very same line. The function binfmtl() has platform-dependent
> behaviour and does not behave as intended on a 64-bit platform and
> prints 32 spurious zero-digit characters, breaking the desired
> output alignment and making the content of the output
> self-contradictory on top of that.
>
> Rather than try to change binfmtl(), which is mostly pointless
> in the first place, let's just trivially inline the desired
> functionality, it's just two lines of very simple C code.
>
> OK?
> Ingo
>
> P.S.
> Usually, we would want to upstream such a bugfix. But the overall
> quality of this code is so abysmal that i'm not sure upstreaming
> anything is worth the hassle. Doing minimal cleanup of the most
> glaring style issues in this code would require changing 99% of it,
> and given how it is written throughout, my suspicion is that it is
> likely full of bugs, and having two bugs on this one line may not
> be an exception. Just look at the totally ridiculous tempstr
> gymnastics right below, which is incredibly stupid. Or look just
> a few lines above and admire the hand-rolled code handling six-byte
> UTF-8 characters (which are invalid according to the standard).
> The code is just very, very bad throughout in large numbers of
> respects.
>
> I'm ashamed to admit that i have occasionally been using this port
> myself, and after looking at the code, i'm no longer convinced i
> should do that. Not sure yet what to do about that. Cleaning this
> up looks like a project of significant size, and quite a painful one.
>
> I just looked up the author of this code:
> https://en.wikipedia.org/wiki/William_Poser
> https://billposer.org/
> It looks like he is probably an eminent linguist, but he is clearly
> not a software developer by any stretch of the imagination.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/uniutils/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile28 Jun 2021 21:34:19 - 1.9
> +++ Makefile14 Sep 2021 15:52:32 -
> @@ -3,7 +3,7 @@
> COMMENT= Unicode utilities
>
> DISTNAME= uniutils-2.27
> -REVISION= 3
> +REVISION= 4
> CATEGORIES=misc
>
> HOMEPAGE= http://billposer.org/Software/unidesc.html
> Index: patches/patch-ExplicateUTF8_c
> ===
> RCS file: patches/patch-ExplicateUTF8_c
> diff -N patches/patch-ExplicateUTF8_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-ExplicateUTF8_c 14 Sep 2021 15:52:32 -
> @@ -0,0 +1,30 @@
> +$OpenBSD$
> +
> +Remove %n format specifier
> +and stop using the platform-dependent function binfmtl().
> +We want 32 bits here, not whatever sizeof(long) might be.
> +
> +Index: ExplicateUTF8.c
> +--- ExplicateUTF8.c.orig
> ExplicateUTF8.c
> +@@ -87,7 +87,7 @@ main(int ac, char **av){
> + int UsefulBits;
> + unsigned char c[6];
> + int i;
> +- UTF32 ch;
> ++ UTF32 ch, mask;
> + unsigned char *cptr;
> + unsigned char ShiftedByte;
> + char tempstr[33];
> +@@ -214,7 +214,10 @@ main(int ac, char **av){
> + printf("%s ",tempstr);
> + }
> + printf("\n");
> +- printf("This is padded to 32 places with %d zeros:
> %n%s\n",(32-GotBits),,binfmtl(ch));
> ++ spaces = printf("This is padded to 32 places with %d zeros:
> ",(32-GotBits));
> ++ for (mask = 1UL << 31; mask; mask >>= 1)
> ++putchar(ch & mask ? '1' : '0');
> ++ putchar('\n');
> + sprintf(tempstr,"");
> + sprintf(tempstr,"%08lX",ch);
> + tempstr[28] = tempstr[7];
>
Re: oolite: fix -fno-common
Hi
I don't have any OpenBSD machines capable of running this now so there
is not much point in me staying as maintainer.
Thanks
Index: Makefile
===
RCS file: /cvs/ports/games/oolite/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile20 Oct 2019 08:02:59 - 1.22
+++ Makefile7 Mar 2021 07:46:55 -
@@ -10,8 +10,6 @@ CATEGORIES= games
HOMEPAGE= http://www.oolite.org/
-MAINTAINER=Nicholas Marriott
-
# GPLv2
PERMIT_PACKAGE=Yes
On Sat, Mar 06, 2021 at 11:34:28AM -0800, Greg Steuck wrote:
> Thanks Martin!
>
> Martin Vahlensieck writes:
>
> > Rather mechanical fix for -fno-common. Builds and starts, but I don't
> > know how to play it, so can't judge if that works.
>
> Makefile needs this little bit too:
>
> @@ -33,6 +33,7 @@ ALL_TARGET= release
>
> FIX_CRLF_FILES = GNUmakefile.postamble \
> Makefile \
> + src/Cocoa/JoystickHandler.h \
> src/Core/Debug/OODebugTCPConsoleClient.m \
> src/Core/Materials/OOPNGTextureLoader.m \
> src/Core/OOAsyncQueue.m \
>
> Nicholas, WDYT? OK gnezdo@ if you want to use it :)
>
> >
> > Best,
> >
> > Martin
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/oolite/Makefile,v
> > retrieving revision 1.24
> > diff -u -p -r1.24 Makefile
> > --- Makefile26 Feb 2021 18:20:33 - 1.24
> > +++ Makefile6 Mar 2021 18:01:30 -
> > @@ -3,7 +3,7 @@
> > COMMENT= space combat and trading game in the style of Elite
> >
> > VERSION= 1.73.4
> > -REVISION = 16
> > +REVISION = 17
> > DISTNAME= oolite-dev-source-${VERSION}
> > PKGNAME= oolite-${VERSION}
> > CATEGORIES=games
> > Index: patches/patch-src_Cocoa_JoystickHandler.h
> > ===
> > RCS file: patches/patch-src_Cocoa_JoystickHandler.h
> > diff -N patches/patch-src_Cocoa_JoystickHandler.h
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_Cocoa_JoystickHandler.h 6 Mar 2021 18:01:30
> > -
> > @@ -0,0 +1,21 @@
> > +$OpenBSD$
> > +--- src/Cocoa/JoystickHandler.hSat Mar 6 18:11:04 2021
> > src/Cocoa/JoystickHandler.hSat Mar 6 18:20:16 2021
> > +@@ -66,7 +66,7 @@
> > + AXIS_VIEWX,
> > + AXIS_VIEWY,
> > + AXIS_end
> > +-} axfn;
> > ++};
> > +
> > + // Controls that can be a button
> > + enum {
> > +@@ -102,7 +102,7 @@
> > + BUTTON_VIEWPORT,
> > + BUTTON_VIEWSTARBOARD,
> > + BUTTON_end
> > +-} butfn;
> > ++};
> > +
> > + // Stick constants
> > + #define MAX_STICKS 4
> > Index: patches/patch-src_Core_Entities_PlanetEntity_h
> > ===
> > RCS file:
> > /cvs/ports/games/oolite/patches/patch-src_Core_Entities_PlanetEntity_h,v
> > retrieving revision 1.1
> > diff -u -p -r1.1 patch-src_Core_Entities_PlanetEntity_h
> > --- patches/patch-src_Core_Entities_PlanetEntity_h 22 Oct 2013 16:52:09
> > - 1.1
> > +++ patches/patch-src_Core_Entities_PlanetEntity_h 6 Mar 2021 18:01:30
> > -
> > @@ -6,9 +6,9 @@ $OpenBSD: patch-src_Core_Entities_Planet
> > } VertexData;
> >
> > +// straight c
> > -+doublecorona_speed_factor;// multiply delta_t by this
> > before adding it to corona_stage
> > -+doublecorona_stage; // 0.0 -> 1.0
> > -+GLfloat rvalue[729];// stores random values
> > for adjusting colors in the corona
> > ++extern double corona_speed_factor;// multiply delta_t by
> > this before adding it to corona_stage
> > ++extern double corona_stage; // 0.0 -> 1.0
> > ++extern GLfloatrvalue[729];// stores
> > random values for adjusting colors in the corona
> > +
> > +
> > @interface PlanetEntity: OOSelfDrawingEntity
> > Index: patches/patch-src_Core_Entities_PlanetEntity_m
> > ===
> > RCS file: patches/patch-src_Core_Entities_PlanetEntity_m
> > diff -N patches/patch-src_Core_Entities_PlanetEntity_m
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_Core_Entities_PlanetEntity_m 6 Mar 2021 18:01:30
> > -
update-plist change
Hi all I have changed FS.pm to use objdump(1) rather than file(1) to detect executables and shared objects. The change affects make-plist(1) which is used by the update-plist target. This is part of replacing file(1) - we do not want to include the complex ELF(5) parsing that it does in code. Everybody please keep an eye on update-plist and generated PLISTs and let me know of any problems. Thanks
Re: [UPDATE] pekwm-0.17
Reads alright to me but I don't use pekwm anymore and I have no OpenBSD
boxes with X at the moment so I can't test this diff. Do you want to
take over as maintainer?
On Sun, Jan 25, 2015 at 10:16:21PM +0200, Timo Myyr?? wrote:
Hi,
Here's an update for the pekwm window manager to latest version.
I removed --enable-xinerama flag as it seems to be an default option.
The man page seems loses some bold and underline lines without groff but
otherwise renders just fine with mandoc.
Big difference is the USE_GMAKE. The port builds without it but I couldn't
get
it to generate the script files under data/scripts directory without it. I
could
have used build targets and patching to process the scripts without using
Gmake
but this seemed easier for now. The only thing GMake seems to do is patch the
shell used to run the scripts and path to sed binary.
Also added patch to remove unnecessary bash dependency from
pekwm_screenshot.sh
as was done on FreeBSD port.
Been using this daily on amd64 but more testing wouldn't hurt.
Timo
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.25
diff -u -u -p -r1.25 Makefile
--- Makefile 23 Oct 2014 07:21:06 - 1.25
+++ Makefile 25 Jan 2015 20:11:57 -
@@ -2,19 +2,18 @@
COMMENT= aewm++ based pretty themable window manager
-DISTNAME=pekwm-0.1.15
-REVISION=0
+DISTNAME=pekwm-0.1.17
CATEGORIES= x11
-HOMEPAGE=http://pekwm.org/
+HOMEPAGE=https://www.pekwm.org/projects/pekwm/
MAINTAINER= Nicholas Marriott n...@openbsd.org
# GPLv2
PERMIT_PACKAGE_CDROM=Yes
-WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c jpeg m png
-WANTLIB += stdc++ z
+WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv
+WANTLIB += jpeg m png stdc++
MODULES= converters/libiconv
@@ -23,13 +22,13 @@ EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= graphics/jpeg \
graphics/png
-USE_GROFF = Yes
+# Use GNU make so pekwm scripts will get processed
+USE_GMAKE = Yes
NO_TEST= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-xinerama
post-install:
@mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.10
diff -u -u -p -r1.10 distinfo
--- distinfo 12 Nov 2012 10:03:21 - 1.10
+++ distinfo 25 Jan 2015 20:11:57 -
@@ -1,2 +1,2 @@
-SHA256 (pekwm-0.1.15.tar.bz2) = VtQFuH89hY68U6In5N4juScwZ3ByURRckK8I01vHWC8=
-SIZE (pekwm-0.1.15.tar.bz2) = 395557
+SHA256 (pekwm-0.1.17.tar.bz2) = ih/Tv5846Me7KyhkwJD5hrYM7CKB7PG7pGLRIPsyfQA=
+SIZE (pekwm-0.1.17.tar.bz2) = 405742
cvs server: Diffing patches
Index: patches/patch-data_scripts_pekwm_screenshot_sh
===
RCS file: patches/patch-data_scripts_pekwm_screenshot_sh
diff -N patches/patch-data_scripts_pekwm_screenshot_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-data_scripts_pekwm_screenshot_sh25 Jan 2015 20:11:57
-
@@ -0,0 +1,68 @@
+$OpenBSD$
+No need for bash here, use /bin/sh
+--- data/scripts/pekwm_screenshot.sh.origSun Jan 25 21:32:06 2015
data/scripts/pekwm_screenshot.sh Sun Jan 25 21:33:18 2015
+@@ -1,30 +1,30 @@
+-#!/usr/bin/env bash
++#!/bin/sh
+ #
+ # Copyright ?? 2013 the pekwm development team
+ #
+
+-function screenshot_scrot
++screenshot_scrot()
+ {
+ scrot -z $1
+ }
+
+-function screenshot_xwd_netpbm
++screenshot_xwd_netpbm()
+ {
+ xwd -root | xwdtopnm 2/dev/null | pnmtopng $1
+ }
+
+-function screenshot_imagemagick
++screenshot_imagemagick()
+ {
+ import -window root $1
+ }
+
+-function is_in_path
++is_in_path()
+ {
+ which $1 /dev/null 21
+ return $?
+ }
+
+-function detect_command
++detect_command()
+ {
+ is_in_path scrot
+ if test $? -eq 0; then
+@@ -45,7 +45,7 @@ function detect_command
+ fi
+ }
+
+-function usage
++usage()
+ {
+ echo usage: pekwm_screenshot.sh [-c scrot|netpbm|magick] [-d delay]
[-o output.png]
+ echo
+@@ -61,7 +61,7 @@ function usage
+ exit 0
+ }
+
+-function usage_command
++usage_command()
+ {
+ echo Unable to find any supported commands for taking screenshots
+ echo
+@@ -74,7 +74,7 @@ function usage_command
+ exit 1
+ }
+
+-function main
++main()
+ {
+ # Initialize for strict mode
+ command=
cvs server: Diffing pkg
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v
retrieving revision 1.7
diff -u -u -p -r1.7 PLIST
--- pkg/PLIST 12 Nov 2012 10:03:21 - 1.7
+++ pkg/PLIST 25
Re: please remove the procmail port
Hi I'm away next week but I can make a release when I get back. On Wed, Nov 19, 2014 at 01:27:38PM -0500, Bryan Steele wrote: On Tue, Nov 18, 2014 at 10:32:58PM +0100, Landry Breuil wrote: On Tue, Nov 18, 2014 at 10:01:33PM +0100, frantisek holop wrote: Philip Guenther, 18 Nov 2014 12:42: Executive summary: delete the procmail port; the code is not safe and should not be used as a basis for any further work. just for the record, what is the alternative you would recommend? fdm, what else ? Landry fdm is quite nice, but nicm@ hasn't rolled a release in a bit. There are a few patches that should probably be added to the port. http://sourceforge.net/p/fdm/mailman/message/30918981/ http://sourceforge.net/p/fdm/mailman/fdm-cvs/ CC'd nicm@, -Bryan.
Re: NEW: editors/le
Hmm yes I need to check it is definitely right for screen then I'll commit it Original message From: Brian Callahan bcal...@devio.us Date: 07/09/2014 21:23 (GMT+00:00) To: Nicholas Marriott nicholas.marri...@gmail.com,Ivan Rambius Ivanov rambiusparkisan...@gmail.com Cc: Vadim Zhukov persg...@gmail.com,ports@openbsd.org Subject: Re: NEW: editors/le On 08/26/14 17:22, Brian Callahan wrote: On 08/25/14 04:41, Nicholas Marriott wrote: It looks like le is a rare application that believes kbs from terminfo which in TERM=screen is ^H but in tmux (and in screen) the actual key defaults to ^?. We could probably fix our terminfo entry (it looks like some Linuxes have done this): This works for me. Not sure if an ok from me on this is meaningful, though. Any consensus or movement on this? ~Brian Index: share/termtypes//termtypes.master === RCS file: /cvs/src/share/termtypes/termtypes.master,v retrieving revision 1.49 diff -u -p -r1.49 termtypes.master --- share/termtypes//termtypes.master 7 Apr 2014 09:58:25 - 1.49 +++ share/termtypes//termtypes.master 25 Aug 2014 08:35:31 - @@ -5734,7 +5734,7 @@ screen|VT 100/ANSI X3.64 virtual termina cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z, + il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=\177, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, On Sat, Aug 23, 2014 at 02:31:20AM -0400, Ivan Rambius Ivanov wrote: Hello, On Fri, Aug 22, 2014 at 11:15 AM, Brian Callahan bcal...@devio.us wrote: On 08/22/14 10:25, Vadim Zhukov wrote: 2014-08-22 18:05 GMT+04:00 Brian Callahan bcal...@devio.us: On 08/22/14 10:00, Vadim Zhukov wrote: 1. For MAINTAINER line, please, get rid of quotes. Ivan Ivanov em...@domain.com is enough. (Trying to not joke about name. Trying hard, ever) I changed the MAINTAINER line. 2. Backspace key doesn't work for me correctly: in editing mode, it acts like Delete key, and in calculator it does nothing. Hmm... backspace key works in both editing mode and calculator mode just fine (amd64). I don't have a i386 to test (that's what you're using, right Vadim?) Yes. I've did more tests, it looks like the problem arises under tmux only (thus adding nicm@ to a conversation). Not sure what should be blamed then. Probably worths a note in DESCR or README, though. But I don't insist. Not sure either, but I was able to reproduce backspace not working in tmux on amd64 as well. I was able to reproduce the issue about backspace in tmux as well. I will contact le's developer about it. Regards Rambius -- Tangra Mega Rock: http://www.radiotangra.com le COMMENT = text editor inspired by Norton Commander DISTNAME = le-1.15.0 CATEGORIES = editors HOMEPAGE = http://lav.yar.ru/programs.html MAINTAINER = Ivan Ivanov rambiusparkisan...@gmail.com # GPLv3+ PERMIT_PACKAGE_CDROM = Yes WANTLIB += c m ncursesw stdc++ MASTER_SITES = http://lav.yar.ru/download/le/ MODULES = converters/libiconv CONFIGURE_STYLE = gnu .include bsd.port.mk SIZE (le-1.15.0.tar.gz) = 844748 44 its features: various operations with stream and rectangular blocks, search and replace with full regular expressions, text formatting, undelete/uninsert, hex editing, tunable key sequences, tunable colors, tunable syntax highlighting, mouse support via ncurses. Can use mmap to edit very large files or even devices. @bin bin/le @comment lib/charset.alias @man man/man1/le.1 share/le/ share/le/colors-black share/le/colors-blue share/le/colors-defbg share/le/colors-green share/le/colors-white share/le/help share/le/keymap-emacs share/le/le.hlp share/le/mainmenu share/le/mainmenu-ru share/le/syntax share/le/syntax.d/ share/le/syntax.d/ada share/le/syntax.d/as share/le/syntax.d/awk share/le/syntax.d/c++-comment share/le/syntax.d/c-comment share/le/syntax.d/c-literal share/le/syntax.d/cpp share/le/syntax.d/eiffel share/le/syntax.d/fvwm2 share/le/syntax.d/gema share/le/syntax.d/golang share/le/syntax.d/haskell share/le/syntax.d/html share/le/syntax.d/java share/le/syntax.d/javascript share/le/syntax.d/logrotate-conf share/le/syntax.d/lout share/le/syntax.d/make-file share/le/syntax.d/metafont share/le/syntax.d/named-conf share/le/syntax.d/ocaml share/le/syntax.d/pascal share/le/syntax.d/perl share/le/syntax.d/php share/le/syntax.d/python share/le/syntax.d/sather share/le/syntax.d/shell share/le/syntax.d/snmp-mib share/le/syntax.d/sql share/le/syntax.d/tcl share/le/syntax.d/tex share/le/syntax.d/texinfo share/le
Re: NEW: editors/le
It looks like le is a rare application that believes kbs from terminfo which in TERM=screen is ^H but in tmux (and in screen) the actual key defaults to ^?. We could probably fix our terminfo entry (it looks like some Linuxes have done this): Index: share/termtypes//termtypes.master === RCS file: /cvs/src/share/termtypes/termtypes.master,v retrieving revision 1.49 diff -u -p -r1.49 termtypes.master --- share/termtypes//termtypes.master 7 Apr 2014 09:58:25 - 1.49 +++ share/termtypes//termtypes.master 25 Aug 2014 08:35:31 - @@ -5734,7 +5734,7 @@ screen|VT 100/ANSI X3.64 virtual termina cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z, + il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=\177, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, On Sat, Aug 23, 2014 at 02:31:20AM -0400, Ivan Rambius Ivanov wrote: Hello, On Fri, Aug 22, 2014 at 11:15 AM, Brian Callahan bcal...@devio.us wrote: On 08/22/14 10:25, Vadim Zhukov wrote: 2014-08-22 18:05 GMT+04:00 Brian Callahan bcal...@devio.us: On 08/22/14 10:00, Vadim Zhukov wrote: 1. For MAINTAINER line, please, get rid of quotes. Ivan Ivanov em...@domain.com is enough. (Trying to not joke about name. Trying hard, ever) I changed the MAINTAINER line. 2. Backspace key doesn't work for me correctly: in editing mode, it acts like Delete key, and in calculator it does nothing. Hmm... backspace key works in both editing mode and calculator mode just fine (amd64). I don't have a i386 to test (that's what you're using, right Vadim?) Yes. I've did more tests, it looks like the problem arises under tmux only (thus adding nicm@ to a conversation). Not sure what should be blamed then. Probably worths a note in DESCR or README, though. But I don't insist. Not sure either, but I was able to reproduce backspace not working in tmux on amd64 as well. I was able to reproduce the issue about backspace in tmux as well. I will contact le's developer about it. Regards Rambius -- Tangra Mega Rock: http://www.radiotangra.com le COMMENT = text editor inspired by Norton Commander DISTNAME =le-1.15.0 CATEGORIES = editors HOMEPAGE =http://lav.yar.ru/programs.html MAINTAINER = Ivan Ivanov rambiusparkisan...@gmail.com # GPLv3+ PERMIT_PACKAGE_CDROM =Yes WANTLIB += c m ncursesw stdc++ MASTER_SITES =http://lav.yar.ru/download/le/ MODULES = converters/libiconv CONFIGURE_STYLE = gnu .include bsd.port.mk SIZE (le-1.15.0.tar.gz) = 844748 44 its features: various operations with stream and rectangular blocks, search and replace with full regular expressions, text formatting, undelete/uninsert, hex editing, tunable key sequences, tunable colors, tunable syntax highlighting, mouse support via ncurses. Can use mmap to edit very large files or even devices. @bin bin/le @comment lib/charset.alias @man man/man1/le.1 share/le/ share/le/colors-black share/le/colors-blue share/le/colors-defbg share/le/colors-green share/le/colors-white share/le/help share/le/keymap-emacs share/le/le.hlp share/le/mainmenu share/le/mainmenu-ru share/le/syntax share/le/syntax.d/ share/le/syntax.d/ada share/le/syntax.d/as share/le/syntax.d/awk share/le/syntax.d/c++-comment share/le/syntax.d/c-comment share/le/syntax.d/c-literal share/le/syntax.d/cpp share/le/syntax.d/eiffel share/le/syntax.d/fvwm2 share/le/syntax.d/gema share/le/syntax.d/golang share/le/syntax.d/haskell share/le/syntax.d/html share/le/syntax.d/java share/le/syntax.d/javascript share/le/syntax.d/logrotate-conf share/le/syntax.d/lout share/le/syntax.d/make-file share/le/syntax.d/metafont share/le/syntax.d/named-conf share/le/syntax.d/ocaml share/le/syntax.d/pascal share/le/syntax.d/perl share/le/syntax.d/php share/le/syntax.d/python share/le/syntax.d/sather share/le/syntax.d/shell share/le/syntax.d/snmp-mib share/le/syntax.d/sql share/le/syntax.d/tcl share/le/syntax.d/tex share/le/syntax.d/texinfo share/le/syntax.d/txt2tags share/le/syntax.d/verilog
Re: mark libtorrent/rtorrent as broken
I've never had any problems with rtorrent so long as I don't use softdep. On Tue, May 13, 2014 at 10:56:40AM +0200, David Coppa wrote: I've received too much reports (last one from bentley@) about this being practically unusable. So, stop fooling the users and mark these ports BROKEN. transmission is better! Ok? Index: libtorrent/Makefile === RCS file: /cvs/ports/net/libtorrent/Makefile,v retrieving revision 1.38 diff -u -p -u -p -r1.38 Makefile --- libtorrent/Makefile 18 Oct 2013 14:29:16 - 1.38 +++ libtorrent/Makefile 13 May 2014 08:45:24 - @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.38 2013/10/18 14:29:16 miod Exp $ +BROKEN= constantly brings the system to its knees + COMMENT= BitTorrent library written in C++ # requires C++ tr1 headers Index: rtorrent/Makefile === RCS file: /cvs/ports/net/rtorrent/Makefile,v retrieving revision 1.43 diff -u -p -u -p -r1.43 Makefile --- rtorrent/Makefile 21 Apr 2014 21:46:23 - 1.43 +++ rtorrent/Makefile 13 May 2014 08:45:28 - @@ -1,8 +1,6 @@ # $OpenBSD: Makefile,v 1.43 2014/04/21 21:46:23 tobiasu Exp $ -BROKEN-hppa =undefined references to __sync atomic ops -BROKEN-mips64 = undefined references to __sync atomic ops -BROKEN-sh = undefined references to __sync atomic ops +BROKEN= constantly brings the system to its knees COMMENT= ncurses BitTorrent client based on libTorrent
Re: mark libtorrent/rtorrent as broken
I use it often. I'd rather not see it marked broken because some have trouble, even if you can't debug it any further. On Tue, May 13, 2014 at 04:00:15AM -0600, Anthony J. Bentley wrote: Nicholas Marriott writes: I've never had any problems with rtorrent so long as I don't use softdep. I have had the system become close to unusable many times, no softdep. I'd rather see it fixed than marked broken, especially if it's true what I hear about it being a kernel IPI issue rather than a bug in the program. But I've never heard what the exact problem is, only experienced the results. On Tue, May 13, 2014 at 10:56:40AM +0200, David Coppa wrote: I've received too much reports (last one from bentley@) about this being practically unusable. So, stop fooling the users and mark these ports BROKEN. transmission is better! Ok? Index: libtorrent/Makefile === RCS file: /cvs/ports/net/libtorrent/Makefile,v retrieving revision 1.38 diff -u -p -u -p -r1.38 Makefile --- libtorrent/Makefile 18 Oct 2013 14:29:16 - 1.38 +++ libtorrent/Makefile 13 May 2014 08:45:24 - @@ -1,5 +1,7 @@ # $OpenBSD: Makefile,v 1.38 2013/10/18 14:29:16 miod Exp $ +BROKEN= constantly brings the system to its knees + COMMENT= BitTorrent library written in C++ # requires C++ tr1 headers Index: rtorrent/Makefile === RCS file: /cvs/ports/net/rtorrent/Makefile,v retrieving revision 1.43 diff -u -p -u -p -r1.43 Makefile --- rtorrent/Makefile 21 Apr 2014 21:46:23 - 1.43 +++ rtorrent/Makefile 13 May 2014 08:45:28 - @@ -1,8 +1,6 @@ # $OpenBSD: Makefile,v 1.43 2014/04/21 21:46:23 tobiasu Exp $ -BROKEN-hppa =undefined references to __sync atomic ops -BROKEN-mips64 = undefined references to __sync atomic ops -BROKEN-sh = undefined references to __sync atomic ops +BROKEN= constantly brings the system to its knees COMMENT= ncurses BitTorrent client based on libTorrent
Re: [net/tor] switch to libevent2?
Hi
This doesn't change anything, event-internal.h is not installed. It
needs to go in event.h.
On Mon, Aug 27, 2012 at 11:56:58AM +0200, David Coppa wrote:
On Mon, Aug 27, 2012 at 11:50 AM, Pascal Stumpf pascal.stu...@cubes.de
wrote:
On Mon, 27 Aug 2012 11:03:56 +0200, David Coppa wrote:
On Mon, Aug 27, 2012 at 10:50 AM, Pascal Stumpf pascal.stu...@cubes.de
wrote:
On Mon, 27 Aug 2012 02:33:45 -0600, David Coppa wrote:
Hi,
What do you think about this?
What's the gain?
http://marc.info/?l=openbsd-portsm=134416408711375
And performances should be far better.
As I said, I think something like this would be the clean solution. As
for performance, I don't think libevent is the bottleneck when using
tor, really ...
(Also needs at least a minor shlib bump)
Index: event-internal.h
===
RCS file: /cvs/src/lib/libevent/event-internal.h,v
retrieving revision 1.6
diff -u -p -r1.6 event-internal.h
--- event-internal.h21 Apr 2010 20:02:40 - 1.6
+++ event-internal.h27 Aug 2012 09:48:03 -
@@ -95,6 +95,8 @@ int _evsignal_restore_handler(struct eve
/* defined in evutil.c */
const char *evutil_getenv(const char *varname);
+#define _EVENT_VERSION 1.4.14b-stable
+
#ifdef __cplusplus
}
#endif
Index: event.c
===
RCS file: /cvs/src/lib/libevent/event.c,v
retrieving revision 1.25
diff -u -p -r1.25 event.c
--- event.c 30 Aug 2010 07:54:29 - 1.25
+++ event.c 27 Aug 2012 09:48:03 -
@@ -1020,7 +1020,7 @@ event_queue_insert(struct event_base *ba
const char *
event_get_version(void)
{
- return (1.4.14b-stable);
+ return (_EVENT_VERSION);
}
/*
I'm ok with this too.
nicm?
Thanks,
David
Re: [net/tor] switch to libevent2?
sure, go for it, ok nicm
On Mon, Aug 27, 2012 at 12:37:33PM +0200, David Coppa wrote:
On Mon, Aug 27, 2012 at 12:12 PM, Pascal Stumpf pascal.stu...@cubes.de
wrote:
On Mon, 27 Aug 2012 11:07:16 +0100, Nicholas Marriott wrote:
Hi
This doesn't change anything, event-internal.h is not installed. It
needs to go in event.h.
Ah, right. :/
Ok, this is the one :)
Index: event.c
===
RCS file: /cvs/src/lib/libevent/event.c,v
retrieving revision 1.25
diff -u -p -r1.25 event.c
--- event.c 30 Aug 2010 07:54:29 - 1.25
+++ event.c 27 Aug 2012 10:11:59 -
@@ -1020,7 +1020,7 @@ event_queue_insert(struct event_base *ba
const char *
event_get_version(void)
{
- return (1.4.14b-stable);
+ return (_EVENT_VERSION);
}
/*
Index: event.h
===
RCS file: /cvs/src/lib/libevent/event.h,v
retrieving revision 1.24
diff -u -p -r1.24 event.h
--- event.h 7 Jul 2011 14:25:15 - 1.24
+++ event.h 27 Aug 2012 10:11:59 -
@@ -1187,6 +1187,8 @@ int evtag_unmarshal_string(struct evbuff
int evtag_unmarshal_timeval(struct evbuffer *evbuf, ev_uint32_t need_tag,
struct timeval *ptv);
+#define _EVENT_VERSION 1.4.14b-stable
+
#ifdef __cplusplus
}
#endif
Re: CVS: cvs.openbsd.org: ports
hmm you're right, i must be confusing it with something else that was safe and already fixed On Wed, Sep 28, 2011 at 02:47:47AM +0200, Marc Espie wrote: On Tue, Sep 27, 2011 at 11:45:09PM +0100, Nicholas Marriott wrote: This would make it build... dunno why this was missed before :-/. IIRC libbfd plays games with arrays for ELF that cause warnings, probably easy enough to shut up in code if someone wants to look. That's definitely NOT a solution. We're talking about an actual buffer overflow here, and a bad one, since the code in that version of gdb is fucked enough to #define a size TWICE to different values. Who knows what other problems that encurs besides a buffer overflow in memcpy ? Sorry, but the actual problem must be fixed... apparently, has even been noticed in more recent versions of gdb.
Re: CVS: cvs.openbsd.org: ports
This would make it build... dunno why this was missed before :-/. IIRC libbfd plays games with arrays for ELF that cause warnings, probably easy enough to shut up in code if someone wants to look. Index: Makefile === RCS file: /cvs/ports/devel/gdb/Makefile,v retrieving revision 1.10 diff -u -p -r1.10 Makefile --- Makefile27 Sep 2011 20:26:45 - 1.10 +++ Makefile27 Sep 2011 22:36:14 - @@ -26,7 +26,8 @@ CONFIGURE_ARGS= --program-transform-name --disable-nls \ --enable-target=all \ --without-expat \ - --without-python + --without-python \ + --disable-werror USE_GMAKE= Yes On Tue, Sep 27, 2011 at 11:15:14PM +0100, Stuart Henderson wrote: On 2011/09/27 22:32, Stuart Henderson wrote: On 2011/09/27 13:01, Landry Breuil wrote: CVSROOT: /cvs Module name: ports Changes by: lan...@cvs.openbsd.org 2011/09/27 13:01:25 Modified files: lang/ocaml : Makefile Log message: Switch ocaml to use the static libbfd.a from devel/gdb port now that it's hooked up to the build on all archs. Tested on i386/amd64/sparc64. If the amd64 test worked, I'd like to know how you got gdb built :-) Ah, as oga pointed out (and espie did but I missed it), this built until -Wbounded support was added recently.
Re: NEW: x11/st
I'm ok with doing this. You can compile it there using tic with -o. Note that tic makes the directories 777 so umask needs to be correct, not sure if the package makefiles ensure this On Mon, Sep 19, 2011 at 12:54:20PM +0200, David Coppa wrote: On Mon, Sep 19, 2011 at 12:21 PM, m...@umaxx.net wrote: Hi, okay, I've contacted suckless community on this topic: http://lists.suckless.org/dev/1109/9327.html So, I would like to move on with the PLIST approach but I think since we are talking about ports data it makes more sense to put the files under: /usr/local/share/termino/s/* instead of /usr/share/terminfo/s/* The directory can be installed/created by the Port itself if required. So how hard is it to change the ncurses/terminfo search path? Simple diff? It's just a matter of changing TERMINFO_DIRS from: #define TERMINFO_DIRS /usr/share/terminfo to: #define TERMINFO_DIRS /usr/share/terminfo:/usr/local/share/terminfo into src/lib/libcurses/ncurses_cfg.h ciao, David
Re: NEW: x11/st
You could install the terminfo file under share/ and point people at it so they can run tic themselves to either install it globally or in ~/.terminfo. On Fri, Sep 16, 2011 at 01:28:10PM +0200, Joerg Zinke wrote: Hi! please find attached a port for st-0.1.1 Description: st is a simple virtual terminal emulator for X which sucks less. More info: http://st.suckless.org/ Port is attached or can be downloaded from: https://www.umaxx.net/src/st.tar.gz The port and patches are modeled after other suckless ports (dwm). I'm not sure about the tic -s part as this seems to change terminfo database in base and this change is not reverted on port uninstall. Any hints/suggestions how to handle this? Please test, comment and give OKs. Regards, Joerg
Re: [please test] subversion-1.7.0-rc2
I've been using RC2 for a while with no probalems, will try this
too. Cheers
On Fri, Sep 16, 2011 at 08:04:06PM +0200, Stefan Sperling wrote:
On Wed, Aug 31, 2011 at 07:29:02PM +0200, Stefan Sperling wrote:
Please test this update if you are using Subversion.
You won't regret it.
In case anyone would like another milestone to test against, here's RC3.
Index: Makefile
===
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- Makefile 22 Jul 2011 22:21:06 - 1.95
+++ Makefile 16 Sep 2011 12:10:48 -
@@ -6,9 +6,11 @@ COMMENT-python= python interface to sub
COMMENT-ruby=ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
-VERSION= 1.6.17
+VERSION= 1.7.0rc3
DISTNAME=subversion-${VERSION}
-PKGNAME-main=${DISTNAME}
+DISTFILES= subversion-1.7.0-rc3.tar.bz2
+WRKDIST= ${WRKDIR}/subversion-1.7.0-rc3
+PKGNAME-main=subversion-${VERSION}
FULLPKGNAME-perl=p5-SVN-${VERSION}
FULLPKGPATH-perl=devel/subversion,-perl
FULLPKGNAME-python= py-subversion-${VERSION}
@@ -18,13 +20,7 @@ FULLPKGPATH-ruby= devel/subversion,-ruby
FULLPKGNAME-ap2= ap2-subversion-${VERSION}
FULLPKGPATH-ap2= devel/subversion,-ap2
-REVISION-main= 2
-REVISION-python= 0
-REVISION-perl= 0
-REVISION-ruby= 2
-REVISION-ap2=0
-
-SO_VERSION= 1.2
+SO_VERSION= 1.3
SVN_LIBS=svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 svn_ra_neon-1 \
svn_ra_local-1 svn_ra_neon-1 svn_ra_svn-1 svn_repos-1
svn_subr-1 svn_wc-1
@@ -44,8 +40,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP=Yes
-# Subversion 1.6.x tarballs are still hosted at tigris.org, not apache.org
-MASTER_SITES=http://subversion.tigris.org/downloads/
+MASTER_SITES=${MASTER_SITE_APACHE:=subversion/}
EXTRACT_SUFX=.tar.bz2
PSEUDO_FLAVORS= no_bindings no_ap2
@@ -55,7 +50,7 @@ FLAVOR?=
MODULES= devel/gettext lang/python
USE_GROFF = Yes
-WANTLIB= expat db z
+WANTLIB= expat db magic z
# autogen.sh checks for libtoolize
@@ -70,34 +65,19 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
devel/apr \
devel/apr-util \
security/cyrus-sasl2 \
- databases/sqlite3
+ databases/sqlite3 \
+ devel/libmagic
WANTLIB-main=${WANTLIB} asn1 c crypto gssapi krb5 ssl \
neon=26 apr-1 aprutil-1 sasl2=2 sqlite3
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS}
-CONTRIB_HOOK_SCRIPTS=case-insensitive.py pre-commit-check.py \
- check-mime-type.pl pre-lock-require-needs-lock.py \
- commit-block-joke.py remove-zombie-locks.py \
- syntax-check.sh commit-email.pl
-# There's also 'enforcer', but we handle it separately, see post-install
-
TOOLS_HOOK_SCRIPTS= commit-access-control.cfg.example \
commit-access-control.pl commit-email.rb \
log-police.py svn2feed.py svnperms.conf.example \
svnperms.py verify-po.py
# There's also 'mailer', but we handle it separately, see post-install
-CONTRIB_CLIENT_SIDE_SCRIPTS= incremental-update.py search-svnlog.pl \
- svn-clean svn-merge-vendor.py svn_apply_autoprops.py \
- svn_export_empty_files.py
-
-SVN_LOAD_DIRS_FILES= LICENSE_AFL3.txt svn_load_dirs.README \
- svn_load_dirs.pl svn_load_dirs_property_table.example
-
-CONTRIB_SERVER_SIDE_SCRIPTS= authz_svn_group.py fsfsverify.py \
- svn-fast-backup svn-tweak-author.py
-
TOOLS_CLIENT_SIDE_SCRIPTS= bash_completion change-svn-wc-format.py \
server-version.py showchange.pl svn-graph.pl
@@ -171,13 +151,15 @@ MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
USE_LIBTOOL= Yes
AUTOCONF_VERSION=2.64
CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= PYTHON2=${MODPY_BIN}
+CONFIGURE_ENV= PYTHON2=${MODPY_BIN} MKDIR=/bin/mkdir -p
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-sasl=${LOCALBASE} \
--without-jikes \
- --without-jdk
+ --without-jdk \
+ --with-libmagic=${LOCALBASE}
.if !${FLAVOR:L:Mno_bindings}
CONFIGURE_ARGS+=--with-swig
+CONFIGURE_ENV+= RUBY=ruby${MODRUBY_BINREV} RDOC=rdoc${MODRUBY_BINREV}
.else
CONFIGURE_ARGS+=--without-swig
.endif
@@ -268,34 +250,6 @@ post-install:
${INSTALL_DATA_DIR}
${PREFIX}/share/examples/subversion/hook-scripts/enforcer
${INSTALL_DATA_DIR}
${PREFIX}/share/examples/subversion/server-side/mod_dontdothat
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/xslt
- ${INSTALL_DATA} ${WRKSRC}/contrib/cgi/* \
-
Re: wsemul_vt100.c diff (was Re: [NEW] audio/ncmpcpp)
when i get time
i think we might want to do the same in the STRING_ESCAPE state too, and
it will need miod's ok
On Fri, Jul 29, 2011 at 09:41:55AM +0200, David Coppa wrote:
Hi Nicholas,
What about this?
On Tue, Jul 26, 2011 at 7:05 PM, David Coppa dco...@gmail.com wrote:
On Tue, Jul 26, 2011 at 9:23 AM, Nicholas Marriott
nicholas.marri...@gmail.com wrote:
Yes it is trying to set the window title (three times in fact for some
reason):
^[]0;Paolo Fresu Uri Caine - Darn That Dream^G
IIRC this will make wscons freeze. This is because it expects OSC to be
terminated by ST (\033\) not by ^G (\007). So it sits waiting for the
end that will never arrive.
I can't try it right now but you will probably be able to see the same
with eg:
$ printf \033]0;abc\007
If that does reproduce the behaviour then that's the problem.
I think wscons actually technically does the right thing here - C0 are
supposed to operate as normal inside escape sequences. I'm not sure
where this idea that BEL should terminate OSC came from. However, it is
pretty much the de facto standard now (ie, xterm supports it). Something
like this might do it but not tested:
Index: wsemul_vt100.c
===
RCS file: /cvs/src/sys/dev/wscons/wsemul_vt100.c,v
retrieving revision 1.27
diff -u -p -r1.27 wsemul_vt100.c
--- wsemul_vt100.c ? ? ?1 Sep 2010 21:17:16 - ? ? ? 1.27
+++ wsemul_vt100.c ? ? ?26 Jul 2011 07:19:20 -
@@ -386,7 +386,10 @@ wsemul_vt100_output_c0c1(struct wsemul_v
? ? ? ? ? ? ? ?/* ignore */
? ? ? ? ? ? ? ?break;
? ? ? ?case ASCII_BEL:
- ? ? ? ? ? ? ? wsdisplay_emulbell(edp-cbcookie);
+ ? ? ? ? ? ? ? if (edp-state == VT100_EMUL_STATE_STRING)
+ ? ? ? ? ? ? ? ? ? ? ? edp-state = VT100_EMUL_STATE_NORMAL;
+ ? ? ? ? ? ? ? else
+ ? ? ? ? ? ? ? ? ? ? ? wsdisplay_emulbell(edp-cbcookie);
? ? ? ? ? ? ? ?break;
? ? ? ?case ASCII_BS:
? ? ? ? ? ? ? ?if (edp-ccol 0) {
Your patch works.
ncmpcpp no longer hangs on console *with enable_window_title set to yes*.
Can it be committed?
cheers,
David
Re: [NEW] audio/ncmpcpp
Yes it is trying to set the window title (three times in fact for some reason):
^[]0;Paolo Fresu Uri Caine - Darn That Dream^G
IIRC this will make wscons freeze. This is because it expects OSC to be
terminated by ST (\033\) not by ^G (\007). So it sits waiting for the
end that will never arrive.
I can't try it right now but you will probably be able to see the same
with eg:
$ printf \033]0;abc\007
If that does reproduce the behaviour then that's the problem.
I think wscons actually technically does the right thing here - C0 are
supposed to operate as normal inside escape sequences. I'm not sure
where this idea that BEL should terminate OSC came from. However, it is
pretty much the de facto standard now (ie, xterm supports it). Something
like this might do it but not tested:
Index: wsemul_vt100.c
===
RCS file: /cvs/src/sys/dev/wscons/wsemul_vt100.c,v
retrieving revision 1.27
diff -u -p -r1.27 wsemul_vt100.c
--- wsemul_vt100.c 1 Sep 2010 21:17:16 - 1.27
+++ wsemul_vt100.c 26 Jul 2011 07:19:20 -
@@ -386,7 +386,10 @@ wsemul_vt100_output_c0c1(struct wsemul_v
/* ignore */
break;
case ASCII_BEL:
- wsdisplay_emulbell(edp-cbcookie);
+ if (edp-state == VT100_EMUL_STATE_STRING)
+ edp-state = VT100_EMUL_STATE_NORMAL;
+ else
+ wsdisplay_emulbell(edp-cbcookie);
break;
case ASCII_BS:
if (edp-ccol 0) {
Alternatively, tmux used to only do this when the terminal matched
xterm*, rxvt* but that is pretty unmaintainable. terminfo has tsl and
fsl to start and end the title but they are hardly set in any entries.
However, latest terminfo has the XT property to mark xterm-compatible
terminals, so what we do is set tsl and fsl manually if XT is present
(this is tmux internal representation of terminfo but I guess ncmpcpp
will be able to do something similar):
/* On terminals with xterm titles (XT), fill in tsl and fsl. */
if (tty_term_flag(term, TTYC_XT)
!tty_term_has(term, TTYC_TSL)
!tty_term_has(term, TTYC_FSL)) {
code = term-codes[TTYC_TSL];
code-value.string = xstrdup(\033]0;);
code-type = TTYCODE_STRING;
code = term-codes[TTYC_FSL];
code-value.string = xstrdup(\007);
code-type = TTYCODE_STRING;
}
So really (assuming this is the actual issue and I'm not on crack), you
can either test the diff above and let me know or go talk to upstream
and ask them not to send this to the terminal ;-).
If they changed it to terminate with ST rather than BEL it would
probably fix wscons but there may be obscure terminals out there that
don't like that either.
On Tue, Jul 26, 2011 at 07:04:44AM +0200, David Coppa wrote:
On Tue, Jul 26, 2011 at 2:56 AM, Bryan Linton b...@shoshoni.info wrote:
On 2011-07-26 01:29:34, Nicholas Marriott nicholas.marri...@gmail.com
wrote:
Run ncmppc in script(1) and see what it is sending with TERM=wsvt25.
Probably it is bypassing terminfo or doing something silly like trying
to set the xterm window title which tends to make wscons unhappy.
Script attached.
This is mine.
ciao,
david
Re: [NEW] audio/ncmpcpp
Yep yours is doing it too similar to what's in my mail to dcoppa except it sets an empty title: ^[]0;^G On Mon, Jul 25, 2011 at 05:56:22PM -0700, Bryan Linton wrote: On 2011-07-26 01:29:34, Nicholas Marriott nicholas.marri...@gmail.com wrote: Run ncmppc in script(1) and see what it is sending with TERM=wsvt25. Probably it is bypassing terminfo or doing something silly like trying to set the xterm window title which tends to make wscons unhappy. Script attached. -- Bryan
Re: [NEW] audio/ncmpcpp
Well, this will stop it setting the title in xterm.
I guess it is right and the intent here is to STOP it setting the title
in the Linux console, even if the user turns it on.
On Tue, Jul 26, 2011 at 09:46:48AM +0200, David Coppa wrote:
On Tue, 26 Jul 2011, Nicholas Marriott wrote:
Yes it is trying to set the window title (three times in fact for some
reason):
^[]0;Paolo Fresu Uri Caine - Darn That Dream^G
IIRC this will make wscons freeze. This is because it expects OSC to be
terminated by ST (\033\) not by ^G (\007). So it sits waiting for the
end that will never arrive.
I can't try it right now but you will probably be able to see the same
with eg:
$ printf \033]0;abc\007
If that does reproduce the behaviour then that's the problem.
Well, there's a bug in ncmpcpp, into ncmpcpp-0.5.7/src/status.cpp:
#ifndef USE_PDCURSES
void WindowTitle(const std::string status)
{
if (strcmp(getenv(TERM), linux) Config.set_window_title)
std::cout \033]0; status \7;
}
#endif // !USE_PDCURSES
Here's the diff.
Ok?
Index: Makefile
===
RCS file: /cvs/ports/audio/ncmpcpp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 25 Jul 2011 20:08:23 - 1.1.1.1
+++ Makefile 26 Jul 2011 07:45:09 -
@@ -3,6 +3,7 @@
COMMENT =ncurses mpd client inspired by ncmpc
DISTNAME = ncmpcpp-0.5.7
+REVISION = 0
EXTRACT_SUFX = .tar.bz2
Index: patches/patch-src_status_cpp
===
RCS file: patches/patch-src_status_cpp
diff -N patches/patch-src_status_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_status_cpp 26 Jul 2011 07:45:09 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/status.cpp.orig Tue Jul 26 09:34:42 2011
src/status.cpp Tue Jul 26 09:34:56 2011
+@@ -66,7 +66,7 @@ namespace
+ #ifndef USE_PDCURSES
+ void WindowTitle(const std::string status)
+ {
+-if (strcmp(getenv(TERM), linux) Config.set_window_title)
++if (!strcmp(getenv(TERM), linux) Config.set_window_title)
+ std::cout \033]0; status \7;
+ }
+ #endif // !USE_PDCURSES
Re: [NEW] audio/ncmpcpp
Yes this is what tmux used to do, but you are forgetting konsole,
gnome-terminal, Eterm and many others.
I would check for the XT flag in terminfo in preference. Our terminfo is
new enough that it is present.
If setupterm() or similar has already been called by this point you can
try tigetflag(XT).
The other possibility is to default Config.set_window_title to off and
allow users to turn it on only when they are running on a terminal which
supports it.
On Tue, Jul 26, 2011 at 11:28:00AM +0200, David Coppa wrote:
On Tue, 26 Jul 2011, Nicholas Marriott wrote:
Well, this will stop it setting the title in xterm.
I guess it is right and the intent here is to STOP it setting the title
in the Linux console, even if the user turns it on.
Unfortunately I cannot test your patch until I'll be back home this evening.
Btw, I think that relying on the fact that linux is the only console not
understanding '\033' and '\007' is likewise wrong.
Maybe, this is a better diff:
Index: Makefile
===
RCS file: /cvs/ports/audio/ncmpcpp/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 25 Jul 2011 20:08:23 - 1.1.1.1
+++ Makefile 26 Jul 2011 09:26:33 -
@@ -3,6 +3,7 @@
COMMENT =ncurses mpd client inspired by ncmpc
DISTNAME = ncmpcpp-0.5.7
+REVISION = 0
EXTRACT_SUFX = .tar.bz2
Index: patches/patch-src_status_cpp
===
RCS file: patches/patch-src_status_cpp
diff -N patches/patch-src_status_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_status_cpp 26 Jul 2011 09:26:33 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/status.cpp.orig Tue Jul 26 11:11:16 2011
src/status.cpp Tue Jul 26 11:11:21 2011
+@@ -66,7 +66,7 @@ namespace
+ #ifndef USE_PDCURSES
+ void WindowTitle(const std::string status)
+ {
+-if (strcmp(getenv(TERM), linux) Config.set_window_title)
++if (Config.set_window_title (strstr(xterm, getenv(TERM)) != NULL
|| strstr(rxvt, getenv(TERM)) != NULL))
+ std::cout \033]0; status \7;
+ }
+ #endif // !USE_PDCURSES
Re: [NEW] audio/ncmpcpp
If it uses ncurses then yes it does use terminfo. But sure, disable window title is easiest. On Tue, Jul 26, 2011 at 12:08:37PM +0200, David Coppa wrote: On Tue, 26 Jul 2011, Nicholas Marriott wrote: Yes this is what tmux used to do, but you are forgetting konsole, gnome-terminal, Eterm and many others. I would check for the XT flag in terminfo in preference. Our terminfo is new enough that it is present. If setupterm() or similar has already been called by this point you can try tigetflag(XT). No way :( ncmpcpp does not use terminfo(3) The other possibility is to default Config.set_window_title to off and allow users to turn it on only when they are running on a terminal which supports it. This is probably the better/easiest thing to do. I think I'll commit the diff below: if you want the window title, just uncomment '#enable_window_title = yes' in your ~/.ncmpcpp/config... Index: Makefile === RCS file: /cvs/ports/audio/ncmpcpp/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 25 Jul 2011 20:08:23 - 1.1.1.1 +++ Makefile 26 Jul 2011 10:07:32 - @@ -3,6 +3,7 @@ COMMENT =ncurses mpd client inspired by ncmpc DISTNAME = ncmpcpp-0.5.7 +REVISION = 0 EXTRACT_SUFX = .tar.bz2 Index: patches/patch-src_settings_cpp === RCS file: patches/patch-src_settings_cpp diff -N patches/patch-src_settings_cpp --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_settings_cpp26 Jul 2011 10:07:32 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Disable set_window_title by default as it causes troubles +with wscons + +--- src/settings.cpp.origTue Jul 26 11:49:54 2011 src/settings.cpp Tue Jul 26 11:49:31 2011 +@@ -428,7 +428,7 @@ void NcmpcppConfig::SetDefaults() + media_library_disable_two_column_mode = false; + discard_colors_if_item_is_selected = true; + store_lyrics_in_song_dir = false; +-set_window_title = true; ++set_window_title = false; + mpd_port = 6600; + mpd_connection_timeout = 15; + crossfade_time = 5;
Re: [NEW] audio/ncmpcpp
Well, I don't know about that, tigetflag is in libncurses and if you've called setupterm or whatever it should work just fine. But if you like. On Tue, Jul 26, 2011 at 12:19:33PM +0200, David Coppa wrote: On Tue, Jul 26, 2011 at 12:10 PM, Nicholas Marriott nicholas.marri...@gmail.com wrote: If it uses ncurses then yes it does use terminfo. yes, i meant it doesn't already use terminfo's routines directly, thus the patch would become a little too intrusive...
Re: [NEW] audio/ncmpcpp
Run ncmppc in script(1) and see what it is sending with TERM=wsvt25. Probably it is bypassing terminfo or doing something silly like trying to set the xterm window title which tends to make wscons unhappy. On Mon, Jul 25, 2011 at 05:19:31PM -0700, Bryan Linton wrote: On 2011-07-25 10:49:47, David Coppa dco...@gmail.com wrote: On Sun, Jul 24, 2011 at 10:06 PM, Bryan Linton b...@shoshoni.info wrote: On 2011-07-24 18:38:55, David Coppa dco...@gmail.com wrote: No one wants to comment/ok this? (Mostly) works for me on i386. ?The tag editor/search page doesn't respond to a backspace key at all. ?Delete functions as a backspace key instead (deleting to the left of the cursor). Works for me. Please, can you retry with: $ env LC_CTYPE=en_US.UTF-8 ncmpcpp No change. However, unchecking Backarrow Key (BS/DEL) in the xterm main options menu causes ncmpcpp to behave the same as ncmpc WRT backspace. Leaving it unchecked causes the xterm window to treat both backspace and delete as delete so I can't disable it permanently but it's a simple workaround to disable it just for ncmpcpp. I tried running it on the console. The system bell beeped once and then everything on the screen disappeared except a flashing underscore character two lines above the bottom of the screen. ncmpc and mutt work fine with TERM=wsvt25. I tried setting TERM to vt100 and vt220. Mutt and ncmpc work fine with them, albeit without color, but ncmpcpp still causes the screen to blank as above. If I press ^C I hear the system bell beep again. When followed by a ^D and enter I get the login prompt back. I get no coredump afterwards. Packages were updated with the snapshot I'm running. Two potentially relevant files follow. I can't think of anything else that could be causing this. Can you reproduce this at all? If not I'll do some more digging on my own. I don't think I have anything weird going on with my system or configuration but if I do I'd like to fix it. ### wsconsctl.conf # $OpenBSD: wsconsctl.conf,v 1.2 2007/05/14 05:06:03 tedu Exp $ # # wscons configurable parameters # keyboard.repeat.del1=300 # change keyboard repeat/delay keyboard.repeat.deln=30 #keyboard.encoding=ru # use different keyboard encoding #keyboard.bell.volume=0 # mute keyboard beep #display.vblank=on# enable vertical sync blank for screen burner #display.screen_off=6 # set screen burner timeout to 60 seconds #display.msact=off# disable screen unburn w/ mouse keyboard.map+=keysym Caps_Lock = Escape # set caps-lock to escape keyboard.bell.pitch=440 ### dmesg OpenBSD 4.9-current (GENERIC) #8: Wed Jul 13 09:47:42 MDT 2011 dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC cpu0: AMD Athlon(tm) Processor (AuthenticAMD 686-class, 256KB L2 cache) 1.01 GHz cpu0: FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR real mem = 804753408 (767MB) avail mem = 781537280 (745MB) mainbus0 at root bios0 at mainbus0: AT/286+ BIOS, date 04/23/02, BIOS32 rev. 0 @ 0xf0f80, SMBIOS rev. 2.3 @ 0xf2940 (49 entries) bios0: vendor Award Software, Inc. version ASUS A7V ACPI BIOS Revision 1011 date 04/23/2002 bios0: ASUSTeK Computer INC. A7V apm0 at bios0: Power Management spec V1.2 acpi at bios0 function 0x0 not configured pcibios0 at bios0: rev 2.1 @ 0xf/0x1802 pcibios0: PCI IRQ Routing Table rev 1.0 @ 0xf1750/176 (9 entries) pcibios0: PCI Interrupt Router at 000:04:0 (VIA VT82C686 ISA rev 0x00) pcibios0: PCI bus #1 is the last bus bios0: ROM list: 0xc/0xf400 0xd/0x4000! cpu0 at mainbus0: (uniprocessor) pci0 at mainbus0 bus 0: configuration mode 1 (bios) pchb0 at pci0 dev 0 function 0 VIA VT8363 Host rev 0x02 viaagp0 at pchb0: v2 agp0 at viaagp0: aperture at 0xe000, size 0x1000 ppb0 at pci0 dev 1 function 0 VIA VT8363 AGP rev 0x00 pci1 at ppb0 bus 1 vga1 at pci1 dev 0 function 0 ATI Radeon X1300/X1550 rev 0x00 wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation) wsdisplay0: screen 1-5 added (80x25, vt100 emulation) radeondrm0 at vga1: irq 11 drm0 at radeondrm0 ATI Radeon X1300/X1550 Sec rev 0x00 at pci1 dev 0 function 1 not configured pcib0 at pci0 dev 4 function 0 VIA VT82C686 ISA rev 0x22 pciide0 at pci0 dev 4 function 1 VIA VT82C571 IDE rev 0x10: ATA66, channel 0 configured to compatibility, channel 1 configured to compatibility wd0 at pciide0 channel 0 drive 0: TRANSCEND wd0: 1-sector PIO, LBA, 3823MB, 7831152 sectors wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 4 atapiscsi0 at pciide0 channel 1 drive 0 scsibus0 at atapiscsi0: 2 targets cd0 at scsibus0 targ 0 lun 0: ASUS, DVD-ROM E608, l.40 ATAPI 5/cdrom removable atapiscsi1 at pciide0 channel 1 drive 1 scsibus1 at atapiscsi1: 2 targets cd1 at scsibus1 targ 0 lun 0: PLEXTOR, CD-R PX-W1610A, 1.05 ATAPI 5/cdrom removable cd0(pciide0:1:0): using PIO mode 4,
Re: [NEW] audio/ncmpcpp
The bs key thing is probably something like it assumes backspace will be ^H but on OpenBSD it is \177. Dunno why it works for dcoppa unless he is using a terminal which sends something else for backspace. Delete is typically \033[3~ but I would guess it just gets that from ncurses and pretends it is backspace. On Tue, Jul 26, 2011 at 01:29:34AM +0100, Nicholas Marriott wrote: Run ncmppc in script(1) and see what it is sending with TERM=wsvt25. Probably it is bypassing terminfo or doing something silly like trying to set the xterm window title which tends to make wscons unhappy. On Mon, Jul 25, 2011 at 05:19:31PM -0700, Bryan Linton wrote: On 2011-07-25 10:49:47, David Coppa dco...@gmail.com wrote: On Sun, Jul 24, 2011 at 10:06 PM, Bryan Linton b...@shoshoni.info wrote: On 2011-07-24 18:38:55, David Coppa dco...@gmail.com wrote: No one wants to comment/ok this? (Mostly) works for me on i386. ?The tag editor/search page doesn't respond to a backspace key at all. ?Delete functions as a backspace key instead (deleting to the left of the cursor). Works for me. Please, can you retry with: $ env LC_CTYPE=en_US.UTF-8 ncmpcpp No change. However, unchecking Backarrow Key (BS/DEL) in the xterm main options menu causes ncmpcpp to behave the same as ncmpc WRT backspace. Leaving it unchecked causes the xterm window to treat both backspace and delete as delete so I can't disable it permanently but it's a simple workaround to disable it just for ncmpcpp. I tried running it on the console. The system bell beeped once and then everything on the screen disappeared except a flashing underscore character two lines above the bottom of the screen. ncmpc and mutt work fine with TERM=wsvt25. I tried setting TERM to vt100 and vt220. Mutt and ncmpc work fine with them, albeit without color, but ncmpcpp still causes the screen to blank as above. If I press ^C I hear the system bell beep again. When followed by a ^D and enter I get the login prompt back. I get no coredump afterwards. Packages were updated with the snapshot I'm running. Two potentially relevant files follow. I can't think of anything else that could be causing this. Can you reproduce this at all? If not I'll do some more digging on my own. I don't think I have anything weird going on with my system or configuration but if I do I'd like to fix it. ### wsconsctl.conf # $OpenBSD: wsconsctl.conf,v 1.2 2007/05/14 05:06:03 tedu Exp $ # # wscons configurable parameters # keyboard.repeat.del1=300# change keyboard repeat/delay keyboard.repeat.deln=30 #keyboard.encoding=ru # use different keyboard encoding #keyboard.bell.volume=0 # mute keyboard beep #display.vblank=on # enable vertical sync blank for screen burner #display.screen_off=6 # set screen burner timeout to 60 seconds #display.msact=off # disable screen unburn w/ mouse keyboard.map+=keysym Caps_Lock = Escape # set caps-lock to escape keyboard.bell.pitch=440 ### dmesg OpenBSD 4.9-current (GENERIC) #8: Wed Jul 13 09:47:42 MDT 2011 dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC cpu0: AMD Athlon(tm) Processor (AuthenticAMD 686-class, 256KB L2 cache) 1.01 GHz cpu0: FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR real mem = 804753408 (767MB) avail mem = 781537280 (745MB) mainbus0 at root bios0 at mainbus0: AT/286+ BIOS, date 04/23/02, BIOS32 rev. 0 @ 0xf0f80, SMBIOS rev. 2.3 @ 0xf2940 (49 entries) bios0: vendor Award Software, Inc. version ASUS A7V ACPI BIOS Revision 1011 date 04/23/2002 bios0: ASUSTeK Computer INC. A7V apm0 at bios0: Power Management spec V1.2 acpi at bios0 function 0x0 not configured pcibios0 at bios0: rev 2.1 @ 0xf/0x1802 pcibios0: PCI IRQ Routing Table rev 1.0 @ 0xf1750/176 (9 entries) pcibios0: PCI Interrupt Router at 000:04:0 (VIA VT82C686 ISA rev 0x00) pcibios0: PCI bus #1 is the last bus bios0: ROM list: 0xc/0xf400 0xd/0x4000! cpu0 at mainbus0: (uniprocessor) pci0 at mainbus0 bus 0: configuration mode 1 (bios) pchb0 at pci0 dev 0 function 0 VIA VT8363 Host rev 0x02 viaagp0 at pchb0: v2 agp0 at viaagp0: aperture at 0xe000, size 0x1000 ppb0 at pci0 dev 1 function 0 VIA VT8363 AGP rev 0x00 pci1 at ppb0 bus 1 vga1 at pci1 dev 0 function 0 ATI Radeon X1300/X1550 rev 0x00 wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation) wsdisplay0: screen 1-5 added (80x25, vt100 emulation) radeondrm0 at vga1: irq 11 drm0 at radeondrm0 ATI Radeon X1300/X1550 Sec rev 0x00 at pci1 dev 0 function 1 not configured pcib0 at pci0 dev 4 function 0 VIA VT82C686 ISA rev 0x22 pciide0 at pci0 dev 4 function 1 VIA VT82C571 IDE rev 0x10: ATA66, channel 0 configured to compatibility, channel 1 configured to compatibility wd0 at pciide0 channel 0
Re: suversion-1.7.0-alpha2 (was: Re: for TESTING only: subversion-1.7.0-alpha1)
Yep, I'll test, cheers.
The no_bindings FLAVOR doesn't seem to build because of something about
Python but I guess that is either my system or I need a later diff?
On Fri, Jun 24, 2011 at 12:33:32AM +0200, Stefan Sperling wrote:
On Sun, Jun 12, 2011 at 04:17:40PM +0200, Stefan Sperling wrote:
If you run Subversion please consider testing this release and report
any problems to the us...@subversion.apache.org mailing list or directly
to me if you prefer (but not to any OpenBSD list, please).
So nobody here uses svn?
You're all either sticking to CVS or have moved on to git, is it?
Anyway, here's the alpha2 release in case anyone is interested.
(nicm, I know you use svn, and I've added the -r {one day ago} feature
to 1.7 just for you, so please test! :)
Re: suversion-1.7.0-alpha2 (was: Re: for TESTING only: subversion-1.7.0-alpha1)
Never mind, apparently my ports cvs up cron job is busted so the tree is
way old and that's why it complains about Python.
On Thu, Jun 23, 2011 at 11:48:02PM +0100, Nicholas Marriott wrote:
Yep, I'll test, cheers.
The no_bindings FLAVOR doesn't seem to build because of something about
Python but I guess that is either my system or I need a later diff?
On Fri, Jun 24, 2011 at 12:33:32AM +0200, Stefan Sperling wrote:
On Sun, Jun 12, 2011 at 04:17:40PM +0200, Stefan Sperling wrote:
If you run Subversion please consider testing this release and report
any problems to the us...@subversion.apache.org mailing list or directly
to me if you prefer (but not to any OpenBSD list, please).
So nobody here uses svn?
You're all either sticking to CVS or have moved on to git, is it?
Anyway, here's the alpha2 release in case anyone is interested.
(nicm, I know you use svn, and I've added the -r {one day ago} feature
to 1.7 just for you, so please test! :)
Re: UPDATE: scmpc
Hi
Still says every file is not tagged properly, same as the old version
did after mpd was updated (even files it was previously happy with). Am
I doing something silly?
On Mon, Apr 25, 2011 at 07:28:44PM +0200, Jasper Lievisse Adriaanse wrote:
Hi,
Are there any mpd and last.fm users who could test the following scmpc diff
please?
This version is a completely rewrite, so I'd appreciate some testing (esp. on
sparc).
--
Cheers,
Jasper
Capable, generous men do not create victims, they nurture them.
Index: Makefile
===
RCS file: /cvs/ports/audio/scmpc/Makefile,v
retrieving revision 1.15
diff -p -u -r1.15 Makefile
--- Makefile 15 Nov 2010 00:22:48 - 1.15
+++ Makefile 25 Apr 2011 17:28:14 -
@@ -2,39 +2,37 @@
COMMENT= client for MPD to submit tracks to Last.fm
CATEGORIES= audio
-DISTNAME=scmpc-0.2.2
-REVISION=8
+DISTNAME=scmpc-0.3.0
HOMEPAGE=http://scmpc.berlios.de/
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM=Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP=Yes
-WANTLIB= c pthread argtable2=1 confuse daemon=2 curl=5
+WANTLIB += c confuse curl glib-2.0
MASTER_SITES=${MASTER_SITE_BERLIOS:=scmpc/}
EXTRACT_SUFX=.tar.bz2
-MODULES= gcc3
-MODGCC3_ARCHES= sparc
-MODGCC3_LANGS= c
+# XXX: Still needed?
+#MODULES=gcc3
+#MODGCC3_ARCHES= sparc
+#MODGCC3_LANGS= c
MODULES+=devel/gettext
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+= LDFLAGS=-L${LOCALBASE}/lib \
- CPPFLAGS=-I${LOCALBASE}/include \
- CFLAGS=-I${LOCALBASE}/include
-USE_GROFF = Yes
-LIB_DEPENDS= devel/argtable \
+LIB_DEPENDS= devel/glib2 \
devel/libconfuse \
- devel/libdaemon \
net/curl
-USE_GMAKE= Yes
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scmpc/
+ ${INSTALL_DATA} ${WRKSRC}/scmpc.conf.example \
+ ${PREFIX}/share/examples/scmpc/
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/audio/scmpc/distinfo,v
retrieving revision 1.2
diff -p -u -r1.2 distinfo
--- distinfo 5 Apr 2007 15:37:44 - 1.2
+++ distinfo 25 Apr 2011 17:28:14 -
@@ -1,5 +1,5 @@
-MD5 (scmpc-0.2.2.tar.bz2) = 9CSC5NvzmN+So21WELQD5Q==
-RMD160 (scmpc-0.2.2.tar.bz2) = taq2ty//GRDI4kX6gB7XiL2Y7s4=
-SHA1 (scmpc-0.2.2.tar.bz2) = QQXvMvVDxLq8IL8VacoAQmxxKP4=
-SHA256 (scmpc-0.2.2.tar.bz2) = ONWZKr0LTuVfnH5A6XnFbpDGhSFum2H8hnXi3ezlYt4=
-SIZE (scmpc-0.2.2.tar.bz2) = 72561
+MD5 (scmpc-0.3.0.tar.bz2) = AHh/WYP5J+Dx4WTVwAeidw==
+RMD160 (scmpc-0.3.0.tar.bz2) = 9uy6X7WD4uR61rE5TOuV3KLrXj0=
+SHA1 (scmpc-0.3.0.tar.bz2) = Nl2SSGae0jVfNAqhgVR7050fiDs=
+SHA256 (scmpc-0.3.0.tar.bz2) = 3YWcqMOAavYJ3N+vdNjdkkVzDIoj+Tnmtir1no2Khb8=
+SIZE (scmpc-0.3.0.tar.bz2) = 84496
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 31 May 2009 20:47:08 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2009/05/31 20:47:08 jasper Exp $
Makefile.in.orig Sun Dec 3 05:59:18 2006
-+++ Makefile.in Fri Jun 22 00:06:00 2007
-@@ -17,7 +17,7 @@ LIBS := @LIBS@ @libcurl_LIBS@ @confuse_LIBS@ @libdaemo
- LIBOBJS := @LIBOBJS@
-
- # This is probably broken if gcc isn't being used...
--BUILD_CFLAGS := -Wall -Wextra -pedantic -Wno-unused-parameter -std=c99
$(CFLAGS)
-+BUILD_CFLAGS := -Wall -pedantic -Wno-unused-parameter $(CFLAGS)
-
- INSTALL := @INSTALL@
-
Index: patches/patch-examples-scmpc_in
===
RCS file: patches/patch-examples-scmpc_in
diff -N patches/patch-examples-scmpc_in
--- patches/patch-examples-scmpc_in 31 May 2009 20:47:08 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-examples-scmpc_in,v 1.2 2009/05/31 20:47:08 jasper Exp $
examples/scmpc.conf.in.orig Fri Dec 8 16:38:28 2006
-+++ examples/scmpc.conf.in Fri Dec 8 16:38:40 2006
-@@ -31,7 +31,7 @@
- # cache_file
- #
- # The file in which scmpc will store the unsubmitted songs cache.
--#cache_file = /var/lib/scmpc/scmpc.cache
-+#cache_file = /var/scmpc/scmpc.cache
-
- # queue_length
- #
Index: patches/patch-man-scmpc_man
===
RCS file: patches/patch-man-scmpc_man
diff -N patches/patch-man-scmpc_man
--- patches/patch-man-scmpc_man 31 May 2009 20:47:08
Re: UPDATE: scmpc
Er sorry, I forgot I found the reason for this last time I looked. I had
to set metadata_to_use none to fix the stupid sorting behaviour and
that breaks scmpc.
This seems to work fine without that set on amd64.
On Mon, Apr 25, 2011 at 07:45:41PM +0100, Nicholas Marriott wrote:
Hi
Still says every file is not tagged properly, same as the old version
did after mpd was updated (even files it was previously happy with). Am
I doing something silly?
On Mon, Apr 25, 2011 at 07:28:44PM +0200, Jasper Lievisse Adriaanse wrote:
Hi,
Are there any mpd and last.fm users who could test the following scmpc diff
please?
This version is a completely rewrite, so I'd appreciate some testing (esp.
on sparc).
--
Cheers,
Jasper
Capable, generous men do not create victims, they nurture them.
Index: Makefile
===
RCS file: /cvs/ports/audio/scmpc/Makefile,v
retrieving revision 1.15
diff -p -u -r1.15 Makefile
--- Makefile15 Nov 2010 00:22:48 - 1.15
+++ Makefile25 Apr 2011 17:28:14 -
@@ -2,39 +2,37 @@
COMMENT= client for MPD to submit tracks to Last.fm
CATEGORIES=audio
-DISTNAME= scmpc-0.2.2
-REVISION= 8
+DISTNAME= scmpc-0.3.0
HOMEPAGE= http://scmpc.berlios.de/
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c pthread argtable2=1 confuse daemon=2 curl=5
+WANTLIB += c confuse curl glib-2.0
MASTER_SITES= ${MASTER_SITE_BERLIOS:=scmpc/}
EXTRACT_SUFX= .tar.bz2
-MODULES= gcc3
-MODGCC3_ARCHES=sparc
-MODGCC3_LANGS= c
+# XXX: Still needed?
+#MODULES= gcc3
+#MODGCC3_ARCHES= sparc
+#MODGCC3_LANGS=c
MODULES+= devel/gettext
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+=LDFLAGS=-L${LOCALBASE}/lib \
- CPPFLAGS=-I${LOCALBASE}/include \
- CFLAGS=-I${LOCALBASE}/include
-USE_GROFF =Yes
-LIB_DEPENDS= devel/argtable \
+LIB_DEPENDS= devel/glib2 \
devel/libconfuse \
- devel/libdaemon \
net/curl
-USE_GMAKE= Yes
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scmpc/
+ ${INSTALL_DATA} ${WRKSRC}/scmpc.conf.example \
+ ${PREFIX}/share/examples/scmpc/
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/audio/scmpc/distinfo,v
retrieving revision 1.2
diff -p -u -r1.2 distinfo
--- distinfo5 Apr 2007 15:37:44 - 1.2
+++ distinfo25 Apr 2011 17:28:14 -
@@ -1,5 +1,5 @@
-MD5 (scmpc-0.2.2.tar.bz2) = 9CSC5NvzmN+So21WELQD5Q==
-RMD160 (scmpc-0.2.2.tar.bz2) = taq2ty//GRDI4kX6gB7XiL2Y7s4=
-SHA1 (scmpc-0.2.2.tar.bz2) = QQXvMvVDxLq8IL8VacoAQmxxKP4=
-SHA256 (scmpc-0.2.2.tar.bz2) = ONWZKr0LTuVfnH5A6XnFbpDGhSFum2H8hnXi3ezlYt4=
-SIZE (scmpc-0.2.2.tar.bz2) = 72561
+MD5 (scmpc-0.3.0.tar.bz2) = AHh/WYP5J+Dx4WTVwAeidw==
+RMD160 (scmpc-0.3.0.tar.bz2) = 9uy6X7WD4uR61rE5TOuV3KLrXj0=
+SHA1 (scmpc-0.3.0.tar.bz2) = Nl2SSGae0jVfNAqhgVR7050fiDs=
+SHA256 (scmpc-0.3.0.tar.bz2) = 3YWcqMOAavYJ3N+vdNjdkkVzDIoj+Tnmtir1no2Khb8=
+SIZE (scmpc-0.3.0.tar.bz2) = 84496
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 31 May 2009 20:47:08 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2009/05/31 20:47:08 jasper Exp $
Makefile.in.orig Sun Dec 3 05:59:18 2006
-+++ Makefile.inFri Jun 22 00:06:00 2007
-@@ -17,7 +17,7 @@ LIBS := @LIBS@ @libcurl_LIBS@ @confuse_LIBS@ @libdaemo
- LIBOBJS := @LIBOBJS@
-
- # This is probably broken if gcc isn't being used...
--BUILD_CFLAGS := -Wall -Wextra -pedantic -Wno-unused-parameter -std=c99
$(CFLAGS)
-+BUILD_CFLAGS := -Wall -pedantic -Wno-unused-parameter $(CFLAGS)
-
- INSTALL := @INSTALL@
-
Index: patches/patch-examples-scmpc_in
===
RCS file: patches/patch-examples-scmpc_in
diff -N patches/patch-examples-scmpc_in
--- patches/patch-examples-scmpc_in 31 May 2009 20:47:08 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-examples-scmpc_in,v 1.2 2009/05/31 20:47:08 jasper Exp $
examples/scmpc.conf.in.origFri Dec 8 16:38:28 2006
-+++ examples/scmpc.conf.in Fri Dec 8 16:38:40 2006
-@@ -31,7 +31,7 @@
- # cache_file
Re: suggestion for new port
There is also btpd On Tue, Jan 25, 2011 at 01:28:01PM +, Stuart Henderson wrote: On 2011/01/25 14:23, Michael Pounov wrote: rtorrent is fat, heavy and many depends from 3th party libraries. there is nothing wrong in rtorrent, but why not other light torrent client with ports ? btw, are you aware of unworkable? $ pkg_info unworkable Information for http://mirror.bytemark.co.uk/OpenBSD/snapshots/packages/amd64/unworkable-0.53.tgz Comment: simple BitTorrent implementation Description: unworkable is an asynchronous, single-thread BitTorrent implementation written in C using libevent and mmap(). Goals of the project include efficiency, simplicity and high code quality. Maintainer: Niall O Higgins nia...@openbsd.org WWW: http://p2presearch.com/unworkable
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/09/06 12:33:37 Added files: net/pidgin/patches: patch-finch_libgnt_gntwm_c Log message: Actually add the patch.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/09/06 12:35:34 ports/misc/lifelines/patches Update of /cvs/ports/misc/lifelines/patches In directory cvs.openbsd.org:/tmp/cvs-serv11533/patches Log Message: Directory /cvs/ports/misc/lifelines/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/09/06 12:38:07 Modified files: misc/lifelines : Makefile Added files: misc/lifelines/patches: patch-src_hdrs_mycurses_h Log message: Fix build with ncursesw. ok landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/09/06 12:53:51 Modified files: shells/zsh : Makefile shells/zsh/patches: patch-Doc_zsh_texi Added files: shells/zsh/patches: patch-configure_ac Log message: Set _XOPEN_SOURCE_EXTENDED on OpenBSD as well. Fixes build with ncursesw. ok landry
misc/lifelines + ncursesw
Adding this patch fixes the build. ok? Cheers $OpenBSD$ --- src/hdrs/mycurses.h.origSat Sep 24 01:46:56 2005 +++ src/hdrs/mycurses.h Mon Aug 30 09:40:26 2010 @@ -5,7 +5,7 @@ #include config.h #if defined(HAVE_LIBNCURSESW) -#include ncursesw/curses.h +#include curses.h #elif defined(HAVE_LIBNCURSES) || defined(HAVE_LIBCURSES) #include curses.h #elif defined(HAVE_WINDOWS_H)
[nicholas.marri...@gmail.com: pidgin + ncursesw]
forwarding to ports as well which might be quicker - Forwarded message from Nicholas Marriott nicholas.marri...@gmail.com - From: Nicholas Marriott nicholas.marri...@gmail.com To: b...@comstyle.com Date: Mon, 6 Sep 2010 18:41:07 +0100 Subject: pidgin + ncursesw User-Agent: Mutt/1.5.20 (2009-06-14) Hi Fixes build with ncursesw, comments/ok? Index: patches/patch-finch_libgnt_gntwm_c === RCS file: patches/patch-finch_libgnt_gntwm_c diff -N patches/patch-finch_libgnt_gntwm_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-finch_libgnt_gntwm_c 30 Aug 2010 08:42:48 - @@ -0,0 +1,17 @@ +$OpenBSD$ +--- finch/libgnt/gntwm.c.orig Tue Aug 10 08:35:44 2010 finch/libgnt/gntwm.c Mon Aug 30 09:42:25 2010 +@@ -24,11 +24,10 @@ + + #ifdef USE_PYTHON + #include Python.h +-#else ++#endif + #define _GNU_SOURCE +-#if (defined(__APPLE__) || defined(__unix__)) !defined(__FreeBSD__) !defined(__OpenBSD__) ++#if (defined(__APPLE__) || defined(__unix__)) !defined(__FreeBSD__) + #define _XOPEN_SOURCE_EXTENDED +-#endif + #endif + + #include glib.h - End forwarded message -
[nicholas.marri...@gmail.com: zsh + ncursesw]
likewise in case ports is quicker :-)
- Forwarded message from Nicholas Marriott nicholas.marri...@gmail.com
-
From: Nicholas Marriott nicholas.marri...@gmail.com
To: p...@openbsd.org
Date: Mon, 6 Sep 2010 18:46:05 +0100
Subject: zsh + ncursesw
User-Agent: Mutt/1.5.20 (2009-06-14)
Hi
New patch fixes build with ncursesw, and regen other patch.
Comments/ok?
Index: patches/patch-Doc_zsh_texi
===
RCS file: /cvs/ports/shells/zsh/patches/patch-Doc_zsh_texi,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Doc_zsh_texi
--- patches/patch-Doc_zsh_texi 4 Nov 2008 10:00:59 - 1.5
+++ patches/patch-Doc_zsh_texi 30 Aug 2010 08:37:10 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/11/04 10:00:59 pea Exp $
Doc/zsh.texi.orig Mon Nov 3 10:33:05 2008
-+++ Doc/zsh.texi Mon Nov 3 22:44:34 2008
+--- Doc/zsh.texi.orig Mon Jun 1 10:00:26 2009
Doc/zsh.texi Wed Aug 25 08:44:01 2010
@@ -7,6 +7,10 @@
@end iftex
@setfilename zsh.info
@@ -12,7 +12,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/
@c %**end of header
@ifinfo
-@@ -3690,7 +3694,7 @@ you may see in your prompt (see
+@@ -3740,7 +3744,7 @@ you may see in your prompt (see
A history expansion begins with the first character of the @t{histchars}
parameter, which is `...@t{!}' by default, and may occur anywhere on the
command line; history expansions do not nest. The `...@t{!}' can be escaped
@@ -21,7 +21,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/
to suppress its special meaning. Double quotes will @emph{not} work for
this. Following this history character is an optional event designator
(@ref{Event Designators}) and then an optional word
-@@ -8808,7 +8812,7 @@ For example,
+@@ -9346,7 +9350,7 @@ For example,
@example
unsetopt localtraps
trap - INT
@@ -30,7 +30,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/
@end example
@noindent
-@@ -17755,7 +17759,7 @@ zstyle ':completion:*:default' list-colors
$...@{(s.:.)LS
+@@ -18601,7 +18605,7 @@ zstyle ':completion:*:default' list-colors
$...@{(s.:.)LS
@noindent
The default colors are the same as for the GNU @t{ls} command and can be
@@ -39,7 +39,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/
@kindex list-dirs-first, completion style
@item @t{list-dirs-first}
-@@ -17888,7 +17892,7 @@ generates no matches, case-insensitive completion:
+@@ -18734,7 +18738,7 @@ generates no matches, case-insensitive completion:
@noindent
@example
@@ -48,7 +48,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/
@end example
@noindent
-@@ -17912,7 +17916,7 @@ case-insensitive completion with @t{_complete}:
+@@ -18758,7 +18762,7 @@ case-insensitive completion with @t{_complete}:
@example
zstyle ':completion:*' completer _complete _prefix
zstyle ':completion:*:complete:*' matcher-list \
@@ -57,7 +57,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/
@end example
@noindent
-@@ -21303,7 +21307,7 @@ generates at least one match. E.g.:
+@@ -22175,7 +22179,7 @@ generates at least one match. E.g.:
@noindent
@example
@@ -66,7 +66,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/
@end example
@noindent
-@@ -21515,7 +21519,7 @@ use is
+@@ -22387,7 +22391,7 @@ use is
@noindent
@example
@@ -75,7 +75,7 @@ $OpenBSD: patch-Doc_zsh_texi,v 1.5 2008/
@end example
@noindent
-@@ -21603,7 +21607,7 @@ performed on the first word in the range. For example
+@@ -22475,7 +22479,7 @@ performed on the first word in the range. For example
@noindent
@example
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 30 Aug 2010 08:37:11 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Mon Aug 30 09:36:42 2010
configure.ac Mon Aug 30 09:37:03 2010
+@@ -701,7 +701,7 @@ AH_TEMPLATE([ZSH_NO_XOPEN],
+ AC_CACHE_CHECK(if _XOPEN_SOURCE_EXTENDED should not be defined,
+ zsh_cv_no_xopen,
+ [[case $host_os in
+- *openbsd*|*freebsd5*|*freebsd6.[012]*|*aix*)
++ *freebsd5*|*freebsd6.[012]*|*aix*)
+ zsh_cv_no_xopen=yes
+ ;;
+ *)
- End forwarded message -
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/08/24 11:24:20 Modified files: net/btpd : Makefile distinfo net/btpd/pkg : PLIST Removed files: net/btpd/patches: patch-btpd_addrinfo_c patch-misc_http_client_c Log message: Update to 0.16, ok jasper
update: btpd 0.1.6
btpd is alive again on github.
patches are now upstream so patch -E.
comments/ok?
cheers
Index: Makefile
===
RCS file: /cvs/ports/net/btpd/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2010 22:07:37 - 1.9
+++ Makefile9 Aug 2010 18:30:24 -
@@ -2,15 +2,14 @@
COMMENT= BitTorrent Protocol Daemon
-DISTNAME= btpd-0.15
-REVISION= 1
+DISTNAME= btpd-0.16
CATEGORIES=net
MAINTAINER=Nicholas Marriott n...@openbsd.org
-HOMEPAGE= http://www.murmeldjur.se/btpd/
+HOMEPAGE= http://wiki.github.com/btpd/btpd/
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= http://github.com/downloads/btpd/btpd/
# BSD
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/net/btpd/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo12 Feb 2009 12:27:35 - 1.5
+++ distinfo9 Aug 2010 18:30:51 -
@@ -1,5 +1,5 @@
-MD5 (btpd-0.15.tar.gz) = tk4ui5k26ZaFvB5yRmVVYQ==
-RMD160 (btpd-0.15.tar.gz) = ID6olCpTAu0m2QCP0aCNo1hZHTw=
-SHA1 (btpd-0.15.tar.gz) = 1hOuPUbz71SK2Kfg3yeLDicrtmw=
-SHA256 (btpd-0.15.tar.gz) = wiKSRMPLNwrJVWDi6f9/XQlGEu4rKh42I37H8ncH250=
-SIZE (btpd-0.15.tar.gz) = 144706
+MD5 (btpd-0.16.tar.gz) = /gQqro18UV7NhVZz0cKzPg==
+RMD160 (btpd-0.16.tar.gz) = Ba8ULY7MWCZ3kJCHvVMSlWHIYTU=
+SHA1 (btpd-0.16.tar.gz) = +305btXCJNxudDrEgeT+tKPPe3U=
+SHA256 (btpd-0.16.tar.gz) = KWvbcY6rqcqTi+5W8JdmIgBslWmAq3/HozlTDYj1Hrg=
+SIZE (btpd-0.16.tar.gz) = 159716
Index: patches/patch-btpd_addrinfo_c
===
RCS file: patches/patch-btpd_addrinfo_c
diff -N patches/patch-btpd_addrinfo_c
--- patches/patch-btpd_addrinfo_c 11 Jan 2010 22:53:35 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-btpd_addrinfo_c,v 1.1 2010/01/11 22:53:35 nicm Exp $
btpd/addrinfo.c.orig Wed Dec 23 18:45:51 2009
-+++ btpd/addrinfo.cWed Dec 23 18:45:54 2009
-@@ -52,7 +52,7 @@ addrinfo_td_cb(void *arg)
- struct ai_ctx *ctx = arg;
- if (!ctx-cancel)
- ctx-cb(ctx-arg, ctx-error, ctx-res);
--else if (ctx-error != 0)
-+else if (ctx-res != NULL)
- freeaddrinfo(ctx-res);
- free(ctx);
- }
Index: patches/patch-misc_http_client_c
===
RCS file: patches/patch-misc_http_client_c
diff -N patches/patch-misc_http_client_c
--- patches/patch-misc_http_client_c11 Jan 2010 22:53:35 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-misc_http_client_c,v 1.1 2010/01/11 22:53:35 nicm Exp $
misc/http_client.c.origMon Jan 12 14:43:18 2009
-+++ misc/http_client.c Tue Dec 22 23:19:29 2009
-@@ -230,6 +230,12 @@ again:
- else
- goto error;
- }
-+
-+/* req-rbuf.buf may be reallocated inside iobuf_write()
-+ * so we should calculate the offset before that happens
-+ */
-+size_t consumed = end - (char *)req-rbuf.buf + dlen;
-+
- if (!iobuf_write(req-rbuf, , 1))
- goto error;
- req-rbuf.off--;
-@@ -237,7 +243,7 @@ again:
- goto error;
- if (req-cancel)
- goto cancel;
--iobuf_consumed(req-rbuf, end - (char *)req-rbuf.buf + dlen);
-+iobuf_consumed(req-rbuf, consumed);
- goto again;
- case PS_CHUNK_SIZE:
- assert(req-chunked);
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/btpd/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 8 Feb 2009 14:36:01 - 1.2
+++ pkg/PLIST 11 Aug 2010 07:50:32 -
@@ -2,5 +2,8 @@
@bin bin/btcli
@bin bin/btinfo
@bin bin/btpd
+...@man man/man1/btcli.1
+...@man man/man1/btinfo.1
+...@man man/man1/btpd.1
share/doc/btpd/
share/doc/btpd/README
Re: ajaxterm not working
the ajaxterm js or css files are broken, you need to fix them. check for javascript errors in firefox. there are a couple iirc. also with later python versions the 64-bit ioctl fix can cause trouble (look for python bug in /usr/local/bin/ajaxterm). On Mon, Aug 16, 2010 at 08:53:06AM +0200, Jiri B. wrote: I tried www/ajaxterm and it is not working. I just only started it and tried to connect directly with Firefox 3.6.8 from our ports. Does it work for you in FF 3.6.x ? This seems to be a known bug in ajaxterm: http://git.kirya.net/?p=ajaxterm.git;a=commit;h=311a125977ceef28a324c50824330ec5111eda37 OK thanks. Anybody using anyterm as it works in FF 3.6.x on OpenBSD? It also looks it is still somehow maintained. jirib
Re: ajaxterm not working
go for it On Mon, Aug 16, 2010 at 09:53:18AM +0200, Jiri B. wrote: Date: Mon, 16 Aug 2010 08:45:24 +0100 From: nicholas.marri...@gmail.com To: ji...@live.com CC: stuer...@deterministisch.de; ports@openbsd.org Subject: Re: ajaxterm not working the ajaxterm js or css files are broken, you need to fix them. check for javascript errors in firefox. there are a couple iirc. also with later python versions the 64-bit ioctl fix can cause trouble (look for python bug in /usr/local/bin/ajaxterm). On Mon, Aug 16, 2010 at 08:53:06AM +0200, Jiri B. wrote: I tried www/ajaxterm and it is not working. I just only started it and tried to connect directly with Firefox 3.6.8 from our ports. Does it work for you in FF 3.6.x ? This seems to be a known bug in ajaxterm: http://git.kirya.net/?p=ajaxterm.git;a=commit;h=311a125977ceef28a324c50824330ec5111eda37 Well this is in ports and obviously it is not working. So it is not only 'me' to repair it, but its maintainer and us together so we do not distributed not working crap. jirib
Re: syslog - darkstat-3.0.317
Hi
Did you try adding daemon.debug to syslog.conf?
On Thu, Jun 03, 2010 at 08:33:21AM +0100, Mark Lumsden wrote:
Syslogging has been added to the latest version of darkstat:
http://dmr.ath.cx/net/darkstat/changelog.txt
However, in order to get it working I've had to make two changes:
1. Comment out a line that makes a call to openlog, here is the call:
openlog(darkstat, LOG_NDELAY | LOG_PID, LOG_DAEMON);
2. Change a call to syslog that uses LOG_DEBUG as its priority. Logging
starts to work by changing LOG_DEBUG to LOG_INFO.
After looking at the respective man pages, I can't see anything wrong with
the original calls. Any ideas why logging shouldn't work unless the 2
changes are made?
-mark
P.S. Coincidentally, I made a small test for syslog. With LOG_INFO as the
priority this works, with LOG_DEBUG it doesn't.
#include stdarg.h
#include syslog.h
int
main(void)
{
syslog(LOG_INFO, %s, hello);
}
Re: small x11/rxvt-unicode diff
On Tue, May 18, 2010 at 07:00:01AM -0400, Brynet wrote: In anything = 4.7, the 'xterm' termcap entry supports 256 colours, if Not true. $ TERM=xterm tput colors 8 $ TERM=xterm tput setaf 100|cat -v ^[[3100m I'm reading this patch correctly, this will hardcode the TERM environment variable to 'xterm-color256' which isn't required. It should be xterm-256color or more likely rxvt-256color. Does this change behaviour for you? or are you just guessing? -Bryan.
Re: small x11/rxvt-unicode diff
I don't use rxvt-unicode but it is fine by me, I suggest you talk to the
maintainer though.
Neither of rxvt or xterm seems to be a perfect fit for rxvt-unicode but
rxvt looks closer, particularly for common keys like home and end.
On Tue, May 18, 2010 at 02:48:29PM +0200, David Coppa wrote:
On Tue, 18 May 2010, Nicholas Marriott wrote:
On Tue, May 18, 2010 at 07:00:01AM -0400, Brynet wrote:
In anything = 4.7, the 'xterm' termcap entry supports 256 colours, if
Not true.
$ TERM=xterm tput colors
8
$ TERM=xterm tput setaf 100|cat -v
^[[3100m
I'm reading this patch correctly, this will hardcode the TERM
environment variable to 'xterm-color256' which isn't required.
It should be xterm-256color or more likely rxvt-256color.
Oh, so I was right ;)
Ok with this?
Index: Makefile
===
RCS file: /cvs/ports/x11/rxvt-unicode/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 3 May 2010 16:35:20 - 1.1.1.1
+++ Makefile 18 May 2010 12:44:57 -
@@ -3,6 +3,7 @@
COMMENT =clone of rxvt with Unicode and Xft support
DISTNAME = rxvt-unicode-9.07
+PKGNAME =${DISTNAME}p0
CATEGORIES = x11
EXTRACT_SUFX = .tar.bz2
@@ -26,7 +27,7 @@ CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.61
CONFIGURE_ARGS = --enable-perl \
--disable-afterimage \
- --with-term=xterm \
+ --with-term=rxvt-256color \
--enable-xterm-colors=256
# missing locale support
CONFIGURE_ARGS +=--disable-xim
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/05/05 16:48:20 Modified files: x11/pekwm : Makefile distinfo Log message: Update to 0.1.12. ok sthen
pekwm update
Hi
Trivial update to 0.1.12:
Comments/oks?
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile11 Aug 2009 08:42:09 - 1.16
+++ Makefile20 Apr 2010 00:36:29 -
@@ -2,9 +2,8 @@
COMMENT= aewm++ based pretty themable window manager
-DISTNAME= pekwm-0.1.11
+DISTNAME= pekwm-0.1.12
CATEGORIES=x11
-PKGNAME= ${DISTNAME}p0
HOMEPAGE= http://pekwm.org/
@@ -22,9 +21,7 @@ WANTLIB= ICE SM X11 Xext Xft Xpm Xrandr
MODULES= converters/libiconv
-EXTRACT_SUFX= .tar.bz2
-MASTER_SITES= ${HOMEPAGE}projects/3/files/
-
+MASTER_SITES= ${HOMEPAGE}projects/pekwm/files/
LIB_DEPENDS= jpeg.=62::graphics/jpeg \
png.=5::graphics/png
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo14 Jul 2009 07:09:57 - 1.8
+++ distinfo20 Apr 2010 00:36:41 -
@@ -1,5 +1,5 @@
-MD5 (pekwm-0.1.11.tar.bz2) = ed9tAcSObrGQfc06gkZBDA==
-RMD160 (pekwm-0.1.11.tar.bz2) = aborrfdVFEEOZ91IsN8fw1T5qJY=
-SHA1 (pekwm-0.1.11.tar.bz2) = KM+jDPwEZED25ZJCFJWfhke8Cp0=
-SHA256 (pekwm-0.1.11.tar.bz2) = pkbl8JphrE5xlf+KzxANutygNehN1nf77coAphCKdB8=
-SIZE (pekwm-0.1.11.tar.bz2) = 385262
+MD5 (pekwm-0.1.12.tar.gz) = H3+e0yzAP1ZaOtMP1gRcHw==
+RMD160 (pekwm-0.1.12.tar.gz) = qj7xbovDwi4Dj6tHFbDG5fGvq2Q=
+SHA1 (pekwm-0.1.12.tar.gz) = o5sE8uFCTZxa0L4IZrpzXzF4atc=
+SHA256 (pekwm-0.1.12.tar.gz) = l7HAF8RrFDtsX+nu6JhxZ62lQVgo5eDwVK8nsfLVWDQ=
+SIZE (pekwm-0.1.12.tar.gz) = 488625
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/04/21 16:55:34 Log message: Import libeventextra with all the bits of libevent 1.4 we don't want in the base system: DNS resolver, HTTP and RPC functions. Status: Vendor Tag: nicm Release Tags: nicm_20100421 N ports/devel/libeventextra/Makefile N ports/devel/libeventextra/distinfo N ports/devel/libeventextra/pkg/PLIST N ports/devel/libeventextra/pkg/DESCR N ports/devel/libeventextra/pkg/PFRAG.shared N ports/devel/libeventextra/files/Makefile N ports/devel/libeventextra/patches/patch-evdns_c N ports/devel/libeventextra/patches/patch-http_c No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/04/21 17:00:18 Modified files: devel : Makefile Log message: +libeventextra
Re: CVS: cvs.openbsd.org: ports
This was ok landry@, and kili@ (slightly earlier version), and with some help from a...@. On Wed, Apr 21, 2010 at 04:55:34PM -0600, Nicholas Marriott wrote: CVSROOT: /cvs Module name: ports Changes by: n...@cvs.openbsd.org2010/04/21 16:55:34 Log message: Import libeventextra with all the bits of libevent 1.4 we don't want in the base system: DNS resolver, HTTP and RPC functions. Status: Vendor Tag: nicm Release Tags: nicm_20100421 N ports/devel/libeventextra/Makefile N ports/devel/libeventextra/distinfo N ports/devel/libeventextra/pkg/PLIST N ports/devel/libeventextra/pkg/DESCR N ports/devel/libeventextra/pkg/PFRAG.shared N ports/devel/libeventextra/files/Makefile N ports/devel/libeventextra/patches/patch-evdns_c N ports/devel/libeventextra/patches/patch-http_c No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/04/19 17:44:55 Log message: Import oolite, 3d space combat/trading game in the style of elite. tweaked by and ok aja Status: Vendor Tag: nicm Release Tags: nicm_20100420 N ports/games/oolite/Makefile N ports/games/oolite/distinfo N ports/games/oolite/pkg/PLIST N ports/games/oolite/pkg/DESCR N ports/games/oolite/pkg/MESSAGE N ports/games/oolite/patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk N ports/games/oolite/patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk N ports/games/oolite/patches/patch-Makefile N ports/games/oolite/patches/patch-GNUmakefile N ports/games/oolite/patches/patch-src_Core_GameController_h N ports/games/oolite/patches/patch-src_SDL_MyOpenGLView_m N ports/games/oolite/patches/patch-src_Core_ResourceManager_m N ports/games/oolite/patches/patch-GNUmakefile_postamble N ports/games/oolite/patches/patch-src_Core_OOLogOutputHandler_m N ports/games/oolite/patches/patch-src_Core_GameController_m N ports/games/oolite/patches/patch-src_Core_OOCacheManager_m N ports/games/oolite/patches/patch-src_Core_OOLogHeader_m N ports/games/oolite/patches/patch-src_Core_Entities_PlayerEntity_m N ports/games/oolite/patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m N ports/games/oolite/patches/patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m N ports/games/oolite/patches/patch-src_Core_Scripting_OOJSOolite_m No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/04/19 17:47:12 Modified files: games : Makefile Log message: +oolite.
Re: samba 3.51, tdb, talloc
Hi
On Tue, Apr 20, 2010 at 01:34:37AM +0100, Stuart Henderson wrote:
On 2010/04/20 00:27, Nicholas Marriott wrote:
They got rid of the tdb man pages? :-/
There are manpages for tdbbackup/tdbdump/tdbtool (need xsltproc and an
stylesheet that's retrieved via http) but the library docs definitely
are worse in this release :( all we have is a couple of text files in
docs/. It would make sense to install those though, the diff below
does that.
Yeah. I think tdb is nice but if they weren't going to maintain it
properly I wish they'd never spun it off.
Not tested but the fdm and tdb bits look fine to me.
Lightly tested here, but most of my mail bypasses fdm.
I use a database to discard duplicate mails and it seems fine to me at
least with fdm cache list/fdm cache dump.
I didn't realise they still did a separate release of tdb.
Nor did I until today - I've looked for updates before but didn't find
any, googleing didn't help me find this one, I just noticed that a few
OS had a newer version of tdb as a separate library and after seeing
talloc, I thought to try http://tdb.samba.org, and there it was...
Good of them to link this from the old SF site :-/.
Index: Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 22 Mar 2010 09:38:36 - 1.3
+++ Makefile 20 Apr 2010 00:32:42 -
@@ -2,10 +2,9 @@
COMMENT= trivial database library
-DISTNAME=tdb-1.0.6
-PKGNAME= ${DISTNAME}p1
+DISTNAME=tdb-1.2.1
CATEGORIES= databases
-SHARED_LIBS+=tdb 1.0
+SHARED_LIBS+=tdb 2.0
MAINTAINER= Nicholas Marriott n...@users.sourceforge.net
@@ -15,10 +14,22 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP=Yes
-MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=tdb/}
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ARGS= --includedir=${TRUEPREFIX}/include/tdb
-AUTOCONF_VERSION=2.13
+WANTLIB= c
+
+HOMEPAGE=http://tdb.samba.org/
+MASTER_SITES=http://samba.org/ftp/tdb/
+
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS= --disable-python
+USE_GMAKE= Yes
USE_LIBTOOL= Yes
+MAKE_FLAGS= TDB_SOLIB=libtdb.so.${LIBtdb_VERSION} \
+ TDB_SONAME=libtdb.so.${LIBtdb_VERSION}
+
+INSTALL_TARGET= installdirs installbin installheaders installlibs
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tdb
+ ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/tdb/
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 28 Jul 2007 21:37:26 - 1.1.1.1
+++ distinfo 20 Apr 2010 00:32:42 -
@@ -1,5 +1,5 @@
-MD5 (tdb-1.0.6.tar.gz) = a2Q/3rSDBAENzV9nXkWLWA==
-RMD160 (tdb-1.0.6.tar.gz) = UWPK8cx2yfOmnoj3Q47NmOxeUs8=
-SHA1 (tdb-1.0.6.tar.gz) = 0YdlIvG4/6jPhEofZgXgwy04eno=
-SHA256 (tdb-1.0.6.tar.gz) = I1vU+CMhZ1d5sO0Jl1PQg1sPPlO8RYRvNy/VE1AlK7I=
-SIZE (tdb-1.0.6.tar.gz) = 139948
+MD5 (tdb-1.2.1.tar.gz) = c+qBKCqC5clZ2cCCry0CFQ==
+RMD160 (tdb-1.2.1.tar.gz) = 8kiCJXu0Yu3BDI7w2jnYLOhHVGw=
+SHA1 (tdb-1.2.1.tar.gz) = mjsrh++3t7FGsRzNfUgCOaGaMNI=
+SHA256 (tdb-1.2.1.tar.gz) = 70I7k0xd3+3ao9OxVnBysNb3JDu65f02OhsJCwVzzfo=
+SIZE (tdb-1.2.1.tar.gz) = 268142
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 28 Jul 2007 21:37:26 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,34 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/28 21:37:26 jasper Exp $
Makefile.in.orig Tue Dec 11 04:08:49 2001
-+++ Makefile.in Thu Jun 28 12:15:24 2007
-@@ -80,8 +80,8 @@ LDADD = libtdb.la
- @build_tdbtorture_t...@tdbtorture = tdbtorture
- @build_tdbtorture_fa...@tdbtorture =
-
--noinst_PROGRAMS = tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE)
--bin_PROGRAMS = tdbtool tdbdump
-+noinst_PROGRAMS = tdbtool tdbdump tdbspeed tdbiterate $(TDBTEST)
$(TDBTORTURE)
-+bin_PROGRAMS =
-
- lib_LTLIBRARIES = libtdb.la
-
-@@ -115,7 +115,7 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- libtdb_la_LIBADD =
- libtdb_la_OBJECTS = tdb.lo spinlock.lo
--PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+PROGRAMS =
-
- tdbtool_OBJECTS = tdbtool.o
- tdbtool_LDADD = $(LDADD)
-@@ -159,8 +159,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEX
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libtdb_la_SOURCES) $(tdbtool_SOURCES) $(tdbdump_SOURCES)
$(tdbspeed_SOURCES) $(tdbiterate_SOURCES) $(tdbtest_SOURCES)
$(tdbtorture_SOURCES)
--OBJECTS = $(libtdb_la_OBJECTS) $(tdbtool_OBJECTS) $(tdbdump_OBJECTS)
$(tdbspeed_OBJECTS) $(tdbiterate_OBJECTS) $(tdbtest_OBJECTS
Re: mandoc errors in ports
mandoc doesn't understand Spanish, it expects NAME not NOMBRE. I'd guess this should probably be a warning not an error? On Fri, Apr 02, 2010 at 09:56:44PM -0500, Marco Peereboom wrote: x11/scrotwm scrotwm_es.1:21:2: error: NAME section must be first I don't understand the issue. What does this mean?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/04/02 16:02:05 Modified files: net/bitlbee: Makefile distinfo Added files: net/bitlbee/patches: patch-configure Log message: Update to 1.2.5, from Tom Doherty. ok landry@, and maintainer Andrew Dalgleish
Re: new: games/oolite
And here's a version that actually lets you save your game... On Wed, Mar 31, 2010 at 01:21:02AM +0100, Nicholas Marriott wrote: Hi Port attached of elite-a-like oolite, http://www.oolite.org. This is quite a large program and mostly ObjC so comments very welcome. It uses its own internal spidermonkey because it needs a later version than the current release. Note that gnustep-base seems to be missing a dependency on devel/libffi so you may have to install that manually. Only tested a bit on amd64, there may be problems on i386 and I'd be surprised if it worked on anything else first time. I have to reduce the detail settings (after starting press N, space, F2) and my screen size or it is too slow but YMMV. Comments, etc? oolite-port2.tar.gz Description: application/tar-gz
Re: new: games/oolite
If anyone wants to try this but finds it is a bit slow even with all the options turned off, try adding these as well to the oolite clause in ~/GNUstep/Defaults/.GNUstepDefaults: max-texture-size = 64; texture-anisotropy-scale = 0; use-texture-lod-bias = NO; This makes it work better for me at 640x480. On Wed, Mar 31, 2010 at 10:05:32PM +0100, Nicholas Marriott wrote: And here's a version that actually lets you save your game... On Wed, Mar 31, 2010 at 01:21:02AM +0100, Nicholas Marriott wrote: Hi Port attached of elite-a-like oolite, http://www.oolite.org. This is quite a large program and mostly ObjC so comments very welcome. It uses its own internal spidermonkey because it needs a later version than the current release. Note that gnustep-base seems to be missing a dependency on devel/libffi so you may have to install that manually. Only tested a bit on amd64, there may be problems on i386 and I'd be surprised if it worked on anything else first time. I have to reduce the detail settings (after starting press N, space, F2) and my screen size or it is too slow but YMMV. Comments, etc?
new: games/oolite
Hi Port attached of elite-a-like oolite, http://www.oolite.org. This is quite a large program and mostly ObjC so comments very welcome. It uses its own internal spidermonkey because it needs a later version than the current release. Note that gnustep-base seems to be missing a dependency on devel/libffi so you may have to install that manually. Only tested a bit on amd64, there may be problems on i386 and I'd be surprised if it worked on anything else first time. I have to reduce the detail settings (after starting press N, space, F2) and my screen size or it is too slow but YMMV. Comments, etc? oolite-port.tar.gz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/01/11 15:51:43 ports/net/btpd/patches Update of /cvs/ports/net/btpd/patches In directory cvs.openbsd.org:/tmp/cvs-serv3391/patches Log Message: Directory /cvs/ports/net/btpd/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/01/11 15:53:35 Modified files: net/btpd : Makefile Added files: net/btpd/patches: patch-btpd_addrinfo_c patch-misc_http_client_c Log message: Add patches to fix two annoying crashes, from Aaron Stellman. ok sthen
Re: UPDATE: misc/rlwrap
Hi I can reproduce this behaviour inside tmux (AND in screen) running in xterm, although oddly not outside even with TERM=screen. I'll look into it. On Sun, Jan 10, 2010 at 09:48:33PM +0100, Matthias Kilian wrote: On Mon, Jan 11, 2010 at 01:07:15AM +0500, Alexandr Shadchin wrote: This update package rlwrap to the latest release 0.35. Tested on i386 and amd64. Comments ? OK ? Forgot patches Unfortunately, this doesn't work well in vi-mode within tmux within an xterm: if I run the new rlwrap on cat (with a non-empty ~/.cat_history) and start to scroll back in the history (using ESC k), an empty line is displayed by rlwrap (instead of the last line of the history). If I scroll back further (using ESC k a second time), the *last* line of the history is displayed instead of the second-last one, and so on. If I then hit return, the display switches to the correct history line. For example, if ~/.cat_history contains foo bar frob you'll get (for rlwrap cat): - an empty line after the first ESC k - `frob' after the second ESC k - `bar' after the third ESC k - `foo' after a return (and after a second return this `foo' is passed to cat) This doesn't happen with rlwrap-0.28. I'm not sure wether this is a problem of rlwrap or tmux. Ciao, Kili
Re: UPDATE: misc/rlwrap
I think this is a bug of some sort in rlwrap or readline rather than in tmux. It looks like rlwrap isn't actually writing anything to the terminal after the first ESC k. Running tmux with -, I get (the ^M is me pressing enter at the end of rlwrap cat): keys are 1 (^M) writing key 0xd -- c0 1: 13 -- c0 2: 13 -- c0 3: 10 -- c0 1: 13 -- c0 2: 13 -- sq 5: 75 (K): 0 [sx=81, sy=48, cx=0, cy=5, ru=0, rl=47] -- c0 6: 13 keys are 1 (^[) keys are 2 (^[k) writing key 0x206b -- c0 1: 13 -- c0 1: 13 -- sq 1: 75 (K): 0 [sx=96, sy=30, cx=0, cy=1, ru=0, rl=29] -- c0 1: 13 keys are 1 (k) writing key 0x6b -- ch 1: 102 (f) -- ch 2: 114 (r) -- ch 3: 111 (o) -- ch 4: 98 (b) -- c0 5: 13 So on pressing ESC k for the first time it just sends two carriage returns and \\033[K which is EL 0 (erase to end of line) followed by another CR. So tmux is correct not to show anything until the second k keypress when rlwrap sends frob. Running rlwrap in script(1) inside tmux or screen and doing the same (ESC k followed by k) shows the same output: rlwrap cat^M^M ^M^M^[[K^M^M^M^[[K^Mfrob^M^M But if I run it in script(1) inside xterm with TERM=screen and again press ESC k followed by a second k: TERM=screen rlwrap cat^M^M ^M^M^[[K^M^M^M^[[K^Mfrob^M^[[1Pbar^M^M There is nothing odd about this sequence and it works fine in tmux - if you send ^M^M^[[K^M^M^M^[[K^Mfrob^M, it correctly prints frob. So rlwrap or readline must be sending ^M^M^[[K^M and then incorrectly requiring a second key press before sending the rest of the data. I wonder if it is doing anything funny with termios, although I can't see why it would possibly need to for something as simple as this. I think you should speak to upstream about this. Feel free to let me know if they need any other information. On Sun, Jan 10, 2010 at 09:37:03PM +, Nicholas Marriott wrote: Hi I can reproduce this behaviour inside tmux (AND in screen) running in xterm, although oddly not outside even with TERM=screen. I'll look into it. On Sun, Jan 10, 2010 at 09:48:33PM +0100, Matthias Kilian wrote: On Mon, Jan 11, 2010 at 01:07:15AM +0500, Alexandr Shadchin wrote: This update package rlwrap to the latest release 0.35. Tested on i386 and amd64. Comments ? OK ? Forgot patches Unfortunately, this doesn't work well in vi-mode within tmux within an xterm: if I run the new rlwrap on cat (with a non-empty ~/.cat_history) and start to scroll back in the history (using ESC k), an empty line is displayed by rlwrap (instead of the last line of the history). If I scroll back further (using ESC k a second time), the *last* line of the history is displayed instead of the second-last one, and so on. If I then hit return, the display switches to the correct history line. For example, if ~/.cat_history contains foo bar frob you'll get (for rlwrap cat): - an empty line after the first ESC k - `frob' after the second ESC k - `bar' after the third ESC k - `foo' after a return (and after a second return this `foo' is passed to cat) This doesn't happen with rlwrap-0.28. I'm not sure wether this is a problem of rlwrap or tmux. Ciao, Kili
Re: net/btpd patch
This looks good and works for me, these are longstanding and annoying bugs, and
upstream seems to be unresponsive at the moment, so I'd like to add this
(although obviously the package would go to p1 now).
ok anyone?
On Wed, Dec 23, 2009 at 06:55:38PM -0800, Aaron Stellman wrote:
As discussed with NicM, here are two fixes to btpd port:
* make sure we don't pass NULL to freeaddrinfo()
* calculate offset before req-rbuf.buf is potentially reallocated, and
thus prevent from using a dangling pointer when making offset
calculation
the 2nd patch has been submitted to upstream mailing list, but no
response yet:
http://lists.stargirl.org/pipermail/btpd-users/2009-December/000570.html
If there are any users of btpd, please test
Index: Makefile
===
RCS file: /cvs/ports/net/btpd/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 12 Feb 2009 12:27:35 - 1.6
+++ Makefile 24 Dec 2009 02:48:58 -
@@ -3,6 +3,7 @@
COMMENT= BitTorrent Protocol Daemon
DISTNAME=btpd-0.15
+PKGNAME= ${DISTNAME}p0
CATEGORIES= net
MAINTAINER= Martin Cronier hex...@openbsd.se
Index: patches/patch-btpd_addrinfo_c
===
RCS file: patches/patch-btpd_addrinfo_c
diff -N patches/patch-btpd_addrinfo_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-btpd_addrinfo_c 24 Dec 2009 02:48:58 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- btpd/addrinfo.c.orig Wed Dec 23 18:45:51 2009
btpd/addrinfo.c Wed Dec 23 18:45:54 2009
+@@ -52,7 +52,7 @@ addrinfo_td_cb(void *arg)
+ struct ai_ctx *ctx = arg;
+ if (!ctx-cancel)
+ ctx-cb(ctx-arg, ctx-error, ctx-res);
+-else if (ctx-error != 0)
++else if (ctx-res != NULL)
+ freeaddrinfo(ctx-res);
+ free(ctx);
+ }
Index: patches/patch-misc_http_client_c
===
RCS file: patches/patch-misc_http_client_c
diff -N patches/patch-misc_http_client_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-misc_http_client_c 24 Dec 2009 02:48:58 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- misc/http_client.c.orig Mon Jan 12 14:43:18 2009
misc/http_client.c Tue Dec 22 23:19:29 2009
+@@ -230,6 +230,12 @@ again:
+ else
+ goto error;
+ }
++
++/* req-rbuf.buf may be reallocated inside iobuf_write()
++ * so we should calculate the offset before that happens
++ */
++size_t consumed = end - (char *)req-rbuf.buf + dlen;
++
+ if (!iobuf_write(req-rbuf, , 1))
+ goto error;
+ req-rbuf.off--;
+@@ -237,7 +243,7 @@ again:
+ goto error;
+ if (req-cancel)
+ goto cancel;
+-iobuf_consumed(req-rbuf, end - (char *)req-rbuf.buf + dlen);
++iobuf_consumed(req-rbuf, consumed);
+ goto again;
+ case PS_CHUNK_SIZE:
+ assert(req-chunked);
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2009/12/31 14:33:42 Modified files: net/btpd : Makefile Log message: Take maintainership, ok okan
Re: net/btpd resigning maintainership
I use this a lot so I'll take it, not that I have an awful lot of time in recent days either... :'( Anyone object/ok? Also PS happy new year ;-) Index: Makefile === RCS file: /cvs/ports/net/btpd/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile12 Feb 2009 12:27:35 - 1.6 +++ Makefile31 Dec 2009 20:33:44 - @@ -5,7 +5,7 @@ COMMENT=BitTorrent Protocol Daemon DISTNAME= btpd-0.15 CATEGORIES=net -MAINTAINER=Martin Cronier hex...@openbsd.se +MAINTAINER=Nicholas Marriott n...@openbsd.org HOMEPAGE= http://www.murmeldjur.se/btpd/ On Thu, Dec 31, 2009 at 09:04:41PM +0100, Martin wrote: Since I'm not using the application any more nor has the time hacking ports, I now respectfully tender my resignation as maintainer for btpd. ./Martin ps .Happy New Year!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2009/12/04 08:44:44 Modified files: sysutils/colorls: Makefile sysutils/colorls/pkg: DESCR Log message: TERM=xterm now has colour by default in -current, so change the notes in DESCR to talk about sun/sun-color instead. ok naddy
Re: net/btpd patch
Hi
A friend and I hit this a while ago but we got no useful response to a fix from
upstream either, so fixing it is good with me.
However, I don't think your fix is correct.
We want to call freeaddrinfo only if the getaddrinfo call succeeds (returns 0).
If it doesn't return 0 (error), res should never be non-NULL. So your check
will never be true and will leak if cancelled after getaddrinfo is called (when
error == 0, res != NULL).
It should be sufficient to check for one of either error == 0 or res != NULL (I
would favour the latter but I guess the author intended the former).
On Wed, Nov 18, 2009 at 07:51:56PM -0800, Aaron Stellman wrote:
Tried contacting upstream, but no response from there. This patch
prevents NULL being passed to freeaddrinfo()
Index: Makefile
===
RCS file: /cvs/ports/net/btpd/Makefile,v
retrieving revision 1.6
diff -N -u -p Makefile
--- Makefile 12 Feb 2009 12:27:35 - 1.6
+++ Makefile 19 Nov 2009 03:51:30 -
@@ -3,6 +3,7 @@
COMMENT= BitTorrent Protocol Daemon
DISTNAME=btpd-0.15
+PKGNAME= ${DISTNAME}p0
CATEGORIES= net
MAINTAINER= Martin Cronier hex...@openbsd.se
Index: patches/patch-btpd_addrinfo_c
===
RCS file: patches/patch-btpd_addrinfo_c
diff -N -u -p patches/patch-btpd_addrinfo_c
--- /dev/null 18 Nov 2009 20:51:30 -
+++ patches/patch-btpd_addrinfo_c 19 Nov 2009 03:51:30 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- btpd/addrinfo.c.orig Wed Aug 5 12:18:57 2009
btpd/addrinfo.c Wed Aug 5 12:19:42 2009
+@@ -52,7 +52,7 @@ addrinfo_td_cb(void *arg)
+ struct ai_ctx *ctx = arg;
+ if (!ctx-cancel)
+ ctx-cb(ctx-arg, ctx-error, ctx-res);
+-else if (ctx-error != 0)
++else if ((ctx-error != 0) (ctx-res != NULL))
+ freeaddrinfo(ctx-res);
+ free(ctx);
+ }
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2009/10/13 10:52:40 Modified files: misc/vttest: Makefile distinfo misc/vttest/pkg: PLIST Log message: Update to 20071216. Change log says modify VT420 rectangle tests to provide ANSI/ISO colors and line-drawing as test-options and some configure changes. ok naddy
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2009/10/12 06:38:28 Log message: Import uniutils, a set of Unicode utility programs ok aja Status: Vendor Tag: nicm Release Tags: nicm_20091012 N ports/misc/uniutils/Makefile N ports/misc/uniutils/distinfo N ports/misc/uniutils/pkg/PLIST N ports/misc/uniutils/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2009/10/12 06:41:02 Modified files: misc : Makefile Log message: +uniutils
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2009/07/14 01:09:57 Modified files: x11/pekwm : Makefile distinfo Removed files: x11/pekwm/patches: patch-data_Makefile_in patch-data_scripts_Makefile_in patch-src_ManagerWindows_cc Log message: Update to 0.1.11. ok sthen
update: x11/pekwm 0.1.11
Hi
pekwm update to 0.1.11.
Tested on amd64, i386.
All the patches go away (yay) and it now installs the conf stuff into etc
itself so only a mv is necessary.
Comments/ok?
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile29 Apr 2009 20:11:25 - 1.14
+++ Makefile13 Jul 2009 12:18:24 -
@@ -2,7 +2,7 @@
COMMENT= aewm++ based pretty themable window manager
-DISTNAME= pekwm-0.1.10
+DISTNAME= pekwm-0.1.11
CATEGORIES=x11
HOMEPAGE= http://pekwm.org/
@@ -36,14 +36,6 @@ CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/
CONFIGURE_ARGS=--enable-xinerama
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pekwm
- ${INSTALL_DATA} ${WRKSRC}/data/autoproperties \
- ${WRKSRC}/data/config \
- ${WRKSRC}/data/keys \
- ${WRKSRC}/data/menu \
- ${WRKSRC}/data/mouse \
- ${WRKSRC}/data/start \
- ${WRKSRC}/data/vars \
-${PREFIX}/share/examples/pekwm
+ @mv ${WRKINST}/etc/pekwm ${PREFIX}/share/examples
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo29 Apr 2009 20:11:25 - 1.7
+++ distinfo13 Jul 2009 12:18:24 -
@@ -1,5 +1,5 @@
-MD5 (pekwm-0.1.10.tar.bz2) = BDLyCR4a/IvgTb9fCsIq0A==
-RMD160 (pekwm-0.1.10.tar.bz2) = jo8Wj4SIl9gH+/uS9n7MuhBgkAE=
-SHA1 (pekwm-0.1.10.tar.bz2) = WpL7P2RGJwkA/k3s1JGuhBqS3jg=
-SHA256 (pekwm-0.1.10.tar.bz2) = J8BUu7wZLZuPEhK/4ncvX+yJZtQfG1WX/lTQ/s+tP90=
-SIZE (pekwm-0.1.10.tar.bz2) = 372622
+MD5 (pekwm-0.1.11.tar.bz2) = ed9tAcSObrGQfc06gkZBDA==
+RMD160 (pekwm-0.1.11.tar.bz2) = aborrfdVFEEOZ91IsN8fw1T5qJY=
+SHA1 (pekwm-0.1.11.tar.bz2) = KM+jDPwEZED25ZJCFJWfhke8Cp0=
+SHA256 (pekwm-0.1.11.tar.bz2) = pkbl8JphrE5xlf+KzxANutygNehN1nf77coAphCKdB8=
+SIZE (pekwm-0.1.11.tar.bz2) = 385262
Index: patches/patch-data_Makefile_in
===
RCS file: patches/patch-data_Makefile_in
diff -N patches/patch-data_Makefile_in
--- patches/patch-data_Makefile_in 29 Apr 2009 20:11:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-data_Makefile_in,v 1.2 2009/04/29 20:11:25 sthen Exp $
data/Makefile.in.orig Mon Jan 26 17:59:45 2009
-+++ data/Makefile.in Sat Apr 4 20:32:32 2009
-@@ -461,7 +461,7 @@ info: info-recursive
-
- info-am:
-
--install-data-am: install-cfgdataDATA
-+install-data-am:
-
- install-exec-am:
-
-@@ -507,8 +507,10 @@ uninstall-info: uninstall-info-recursive
-
- all-local: config menu
-
--%: $(srcdir)/%.in
-- @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $ $@
-+config:
-+ @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $...@.in
$@
-+menu:
-+ @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $...@.in
$@
-
- distclean-local:
- rm -f *\~ .\#*
Index: patches/patch-data_scripts_Makefile_in
===
RCS file: patches/patch-data_scripts_Makefile_in
diff -N patches/patch-data_scripts_Makefile_in
--- patches/patch-data_scripts_Makefile_in 29 Apr 2009 20:11:25 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-data_scripts_Makefile_in,v 1.1 2009/04/29 20:11:25 sthen Exp $
data/scripts/Makefile.in.orig Mon Jan 26 17:59:45 2009
-+++ data/scripts/Makefile.in Sat Apr 4 20:18:57 2009
-@@ -345,8 +345,11 @@ uninstall-am: uninstall-info-am uninstall-scriptsSCRIP
-
- all-local: $(scripts_SCRIPTS)
-
--%.sh: $(srcdir)/%.sh.in
-- @SED@ -e 's:SH:$(SH):g' -e 's:SED:$(SED):g' $ $@
-+
-+pekwm_ws_menu.sh:
-+ @SED@ -e 's:SH:$(SH):g' -e 's:SED:$(SED):g' $...@.in $@
-+pekwm_themeset.sh:
-+ @SED@ -e 's:SH:$(SH):g' -e 's:SED:$(SED):g' $...@.in $@
-
- distclean-local:
- rm -f *\~ .\#*
Index: patches/patch-src_ManagerWindows_cc
===
RCS file: patches/patch-src_ManagerWindows_cc
diff -N patches/patch-src_ManagerWindows_cc
--- patches/patch-src_ManagerWindows_cc 29 Apr 2009 20:11:25 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_ManagerWindows_cc,v 1.1 2009/04/29 20:11:25 sthen Exp $
src/ManagerWindows.cc.orig Sat Apr 4 19:52:11 2009
-+++ src/ManagerWindows.cc Sat Apr 4 19:52:12 2009
-@@ -18,6 +18,8 @@
-
- #include string
-
-+#include unistd.h
-+
- using std::cerr;
- using std::endl;
- using std::string;
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2009/06/05 11:37:16 Modified files: geo/openbsd-developers: Makefile geo/openbsd-developers/files: OpenBSD Log message: Add myself. launch missiles! wcmaier@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2009/06/02 01:48:40 Modified files: misc/tmux : Makefile Log message: COMES_WITH= 4.6. From and ok merdely
update: pekwm 0.1.10
Update to pekwm 0.1.10.
pekwm now has builtin compat code for swprintf so the following patches may be
removed:
patches/patch-configure
patches/patch-src_FrameListMenu_cc
patches/patch-src_Frame_cc
patches/patch-src_PDecor_cc
Builds and works fine on i386; also builds okay on amd64.
Please test, etc.
Thanks!
Nicholas
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile9 Oct 2008 16:56:12 - 1.13
+++ Makefile4 Apr 2009 19:40:50 -
@@ -2,7 +2,7 @@
COMMENT= aewm++ based pretty themable window manager
-DISTNAME= pekwm-0.1.7
+DISTNAME= pekwm-0.1.10
CATEGORIES=x11
HOMEPAGE= http://pekwm.org/
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo9 Oct 2008 16:56:12 - 1.6
+++ distinfo4 Apr 2009 19:40:50 -
@@ -1,5 +1,5 @@
-MD5 (pekwm-0.1.7.tar.bz2) = MKz6QaUAWp8xEXBB7DLrDQ==
-RMD160 (pekwm-0.1.7.tar.bz2) = d8YY3e/qrRapt1cwTKIz7Omxjjw=
-SHA1 (pekwm-0.1.7.tar.bz2) = 3NkdyNCAAL2N9AKwi3z7LXGwOLw=
-SHA256 (pekwm-0.1.7.tar.bz2) = IhbrDHIvSq0Vdhp/Ts7WfqEoSgDjLgPWbeS1X4wclSQ=
-SIZE (pekwm-0.1.7.tar.bz2) = 363788
+MD5 (pekwm-0.1.10.tar.bz2) = BDLyCR4a/IvgTb9fCsIq0A==
+RMD160 (pekwm-0.1.10.tar.bz2) = jo8Wj4SIl9gH+/uS9n7MuhBgkAE=
+SHA1 (pekwm-0.1.10.tar.bz2) = WpL7P2RGJwkA/k3s1JGuhBqS3jg=
+SHA256 (pekwm-0.1.10.tar.bz2) = J8BUu7wZLZuPEhK/4ncvX+yJZtQfG1WX/lTQ/s+tP90=
+SIZE (pekwm-0.1.10.tar.bz2) = 372622
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 9 Oct 2008 16:56:12 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,35 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2008/10/09 16:56:12 ajacoutot Exp $
configure.orig Tue Oct 7 17:37:23 2008
-+++ configure Tue Oct 7 17:37:15 2008
-@@ -7397,12 +7397,12 @@ if test -n $libpng12_CFLAGS; then
- pkg_cv_libpng12_CFLAGS=$libpng12_CFLAGS
- elif test -n $PKG_CONFIG; then
- if test -n $PKG_CONFIG \
--{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng12
= 1.2.0\) 5
-- ($PKG_CONFIG --exists --print-errors libpng12 = 1.2.0) 25
-+{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng =
1.2.0\) 5
-+ ($PKG_CONFIG --exists --print-errors libpng = 1.2.0) 25
- ac_status=$?
- echo $as_me:$LINENO: \$? = $ac_status 5
- (exit $ac_status); }; then
-- pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags libpng12 = 1.2.0
2/dev/null`
-+ pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags libpng = 1.2.0 2/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -7413,12 +7413,12 @@ if test -n $libpng12_LIBS; then
- pkg_cv_libpng12_LIBS=$libpng12_LIBS
- elif test -n $PKG_CONFIG; then
- if test -n $PKG_CONFIG \
--{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng12
= 1.2.0\) 5
-- ($PKG_CONFIG --exists --print-errors libpng12 = 1.2.0) 25
-+{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng =
1.2.0\) 5
-+ ($PKG_CONFIG --exists --print-errors libpng = 1.2.0) 25
- ac_status=$?
- echo $as_me:$LINENO: \$? = $ac_status 5
- (exit $ac_status); }; then
-- pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs libpng12 = 1.2.0 2/dev/null`
-+ pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs libpng = 1.2.0 2/dev/null`
- else
- pkg_failed=yes
- fi
Index: patches/patch-data_Makefile_in
===
RCS file: /cvs/ports/x11/pekwm/patches/patch-data_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-data_Makefile_in
--- patches/patch-data_Makefile_in 11 Jun 2007 08:56:43 - 1.1
+++ patches/patch-data_Makefile_in 4 Apr 2009 19:40:50 -
@@ -1,12 +1,25 @@
-$OpenBSD: patch-data_Makefile_in,v 1.1 2007/06/11 08:56:43 ajacoutot Exp $
data/Makefile.in.orig Mon Jun 11 10:39:01 2007
-+++ data/Makefile.in Mon Jun 11 10:39:11 2007
-@@ -439,7 +439,7 @@ info: info-recursive
+$OpenBSD$
+--- data/Makefile.in.orig Mon Jan 26 17:59:45 2009
data/Makefile.in Sat Apr 4 20:32:32 2009
+@@ -461,7 +461,7 @@ info: info-recursive
info-am:
-install-data-am: install-cfgdataDATA
+install-data-am:
- install-dvi: install-dvi-recursive
+ install-exec-am:
+@@ -507,8 +507,10 @@ uninstall-info: uninstall-info-recursive
+
+ all-local: config menu
+
+-%: $(srcdir)/%.in
+- @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $ $@
++config:
++ @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $...@.in
$@
++menu:
++ @SED@ -e 's:PREFIX:$(pkgdatadir):g' -e s:THEME:@THEME@:g $...@.in
$@
+
+ distclean-local:
+ rm -f *\~ .\#*
Index: patches/patch-data_scripts_Makefile_in
Re: update: misc/tmux 0.6
On Mon, Jan 19, 2009 at 03:12:29PM +, Christian Weisgerber wrote: Nicholas Marriott nicholas.marri...@gmail.com wrote: Update to new tmux version 0.6. Clock-mode doesn't seem to work. It clears the screen, except for the status line, and positions the cursor in the lower right corner. There is no clock, apart from the one in the status line. ... Oh. Let me revise that. Clock-mode requires color. Running with TERM=xterm-xfree86, I see this big clock in the middle of the screen. With default monochrome xterm, the clock is white on white, I guess. Whoops, yes, it draws it by setting the background colour and using spaces, obviously if the terminal doesn't support setting colours then this doesn't work... doh. I've changed it to use reverse attributes instead which works with both bw and colour terminals - this change will be in 0.7. Now the only problem is terminals which doesn't support reverse, but I don't think there is much to be done about them. Thanks, Nicholas
update: mail/fdm 1.6
[I sent this before but I think my mail system wasn't working, apologies if
this is a duplicate.]
Update to 1.6. Changes:
https://sf.net/project/shownotes.php?group_id=174568release_id=648979
Tested on amd64, sparc64. Please note patches/patch-Makefile can go now.
Please test, etc.
Thanks!
Index: Makefile
===
RCS file: /cvs/ports/mail/fdm/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile1 May 2008 21:05:04 - 1.7
+++ Makefile22 Dec 2008 20:34:22 -
@@ -2,7 +2,7 @@
COMMENT= fetch, filter and deliver mail
-DISTNAME= fdm-1.5
+DISTNAME= fdm-1.6
CATEGORIES=mail
HOMEPAGE= http://fdm.sourceforge.net/
Index: distinfo
===
RCS file: /cvs/ports/mail/fdm/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo1 May 2008 21:05:04 - 1.7
+++ distinfo22 Dec 2008 20:34:22 -
@@ -1,5 +1,5 @@
-MD5 (fdm-1.5.tar.gz) = +rdo41tBdD8scYtqLJ6ccA==
-RMD160 (fdm-1.5.tar.gz) = pjLL+AGdsU6XkpjkaiJewnOVjLk=
-SHA1 (fdm-1.5.tar.gz) = Nt0VITH2JqIGVXTC4jGVXQrfZKg=
-SHA256 (fdm-1.5.tar.gz) = 2CPjClprtlsTJAscMAllBdLq4OimBsYHHjKA3nSqOU0=
-SIZE (fdm-1.5.tar.gz) = 187289
+MD5 (fdm-1.6.tar.gz) = srm/6VIXspAUK94WIeuaNw==
+RMD160 (fdm-1.6.tar.gz) = fiyEa5fc4g4SO4RTcy4Qf4jg3o8=
+SHA1 (fdm-1.6.tar.gz) = +4BC8jVQYoSP8ULJYEBptmV+aoI=
+SHA256 (fdm-1.6.tar.gz) = cmmkCic3j0nA08yStCKdHgZrukhu+f+FyqLsTLzqNwY=
+SIZE (fdm-1.6.tar.gz) = 192159
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 20 Aug 2008 14:57:57 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1 2008/08/20 14:57:57 naddy Exp $
Makefile.orig Thu Aug 7 06:10:08 2008
-+++ Makefile Thu Aug 7 06:10:21 2008
-@@ -117,7 +117,7 @@ CLEANFILES= ${PROG} *.o compat/*.o y.tab.c y.tab.h .de
- all: ${PROG}
-
- ${PROG}: ${OBJS}
-- ${CC} ${LDFLAGS} -o ${PROG} ${LIBS} ${OBJS}
-+ ${CC} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBS}
-
- dist: clean manual
- grep '^#DEBUG=' Makefile
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/fdm/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 2 Aug 2007 06:18:37 - 1.4
+++ pkg/PLIST 22 Dec 2008 20:34:22 -
@@ -1,5 +1,5 @@
-...@comment $OpenBSD: PLIST,v 1.4 2007/08/02 06:18:37 steven Exp $
-bin/fdm
+...@comment $OpenBSD$
+...@bin bin/fdm
@man man/man1/fdm.1
@man man/man5/fdm.conf.5
share/doc/fdm/
@@ -8,6 +8,7 @@ share/doc/fdm/README
share/examples/fdm/
share/examples/fdm/f-terbeck.conf
share/examples/fdm/g-lando.conf
+share/examples/fdm/n-marriott-old.conf
share/examples/fdm/n-marriott.conf
share/examples/fdm/t-ulmer.conf
share/examples/fdm/w-maier.conf
update: pekwm 0.1.7
Diff below updates x11/pekwm to 0.1.7.
New patches are to make it use libpng instead of looking for libpng12, and to
replace swprintf (which OpenBSD doesn't seem to have).
Tested on i386.
Please test, comment, etc.
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile26 Aug 2007 19:21:07 - 1.12
+++ Makefile7 Oct 2008 18:18:16 -
@@ -2,8 +2,7 @@
COMMENT= aewm++ based pretty themable window manager
-DISTNAME= pekwm-0.1.6
-PKGNAME= ${DISTNAME}p1
+DISTNAME= pekwm-0.1.7
CATEGORIES=x11
HOMEPAGE= http://pekwm.org/
@@ -19,7 +18,10 @@ PERMIT_DISTFILES_FTP=Yes
WANTLIB= ICE SM X11 Xext Xft Xpm Xrandr Xrender Xau Xdmcp \
Xinerama expat z c fontconfig freetype m stdc++
-MASTER_SITES= ${HOMEPAGE}files/
+MODULES= converters/libiconv
+
+EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${HOMEPAGE}projects/3/files/
LIB_DEPENDS= jpeg.=62::graphics/jpeg \
png.=5::graphics/png
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo11 Jun 2007 08:56:43 - 1.5
+++ distinfo7 Oct 2008 18:18:16 -
@@ -1,5 +1,5 @@
-MD5 (pekwm-0.1.6.tar.gz) = ppJAGhGTb0PbHbU7z/XrUQ==
-RMD160 (pekwm-0.1.6.tar.gz) = VLDTx6pftTtEShj7UBIObZPh4u4=
-SHA1 (pekwm-0.1.6.tar.gz) = Q/vFLA00CXfm0BlPGd8cPFXgcgQ=
-SHA256 (pekwm-0.1.6.tar.gz) = HkUtjASZYKtb3RNrTlzL4hmvPkXwxWpC1rpIA+SPJFM=
-SIZE (pekwm-0.1.6.tar.gz) = 357267
+MD5 (pekwm-0.1.7.tar.bz2) = MKz6QaUAWp8xEXBB7DLrDQ==
+RMD160 (pekwm-0.1.7.tar.bz2) = d8YY3e/qrRapt1cwTKIz7Omxjjw=
+SHA1 (pekwm-0.1.7.tar.bz2) = 3NkdyNCAAL2N9AKwi3z7LXGwOLw=
+SHA256 (pekwm-0.1.7.tar.bz2) = IhbrDHIvSq0Vdhp/Ts7WfqEoSgDjLgPWbeS1X4wclSQ=
+SIZE (pekwm-0.1.7.tar.bz2) = 363788
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 7 Oct 2008 18:18:16 -
@@ -0,0 +1,35 @@
+$OpenBSD$
+--- configure.orig Tue Oct 7 17:37:23 2008
configure Tue Oct 7 17:37:15 2008
+@@ -7397,12 +7397,12 @@ if test -n $libpng12_CFLAGS; then
+ pkg_cv_libpng12_CFLAGS=$libpng12_CFLAGS
+ elif test -n $PKG_CONFIG; then
+ if test -n $PKG_CONFIG \
+-{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng12
= 1.2.0\) 5
+- ($PKG_CONFIG --exists --print-errors libpng12 = 1.2.0) 25
++{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng =
1.2.0\) 5
++ ($PKG_CONFIG --exists --print-errors libpng = 1.2.0) 25
+ ac_status=$?
+ echo $as_me:$LINENO: \$? = $ac_status 5
+ (exit $ac_status); }; then
+- pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags libpng12 = 1.2.0
2/dev/null`
++ pkg_cv_libpng12_CFLAGS=`$PKG_CONFIG --cflags libpng = 1.2.0 2/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -7413,12 +7413,12 @@ if test -n $libpng12_LIBS; then
+ pkg_cv_libpng12_LIBS=$libpng12_LIBS
+ elif test -n $PKG_CONFIG; then
+ if test -n $PKG_CONFIG \
+-{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng12
= 1.2.0\) 5
+- ($PKG_CONFIG --exists --print-errors libpng12 = 1.2.0) 25
++{ (echo $as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \libpng =
1.2.0\) 5
++ ($PKG_CONFIG --exists --print-errors libpng = 1.2.0) 25
+ ac_status=$?
+ echo $as_me:$LINENO: \$? = $ac_status 5
+ (exit $ac_status); }; then
+- pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs libpng12 = 1.2.0 2/dev/null`
++ pkg_cv_libpng12_LIBS=`$PKG_CONFIG --libs libpng = 1.2.0 2/dev/null`
+ else
+ pkg_failed=yes
+ fi
Index: patches/patch-src_FrameListMenu_cc
===
RCS file: patches/patch-src_FrameListMenu_cc
diff -N patches/patch-src_FrameListMenu_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_FrameListMenu_cc 7 Oct 2008 18:18:16 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- src/FrameListMenu.cc.orig Tue Oct 7 18:21:44 2008
src/FrameListMenu.cc Tue Oct 7 18:23:23 2008
+@@ -118,6 +118,7 @@ FrameListMenu::updateFrameListMenu(void)
+ removeAll();
+
+ wchar_t buf[16];
++char buf2[16];
+ wstring name;
+
+ // need to add an action, otherwise it looks as if we don't have anything
+@@ -141,7 +142,8 @@ FrameListMenu::updateFrameListMenu(void)
+
+ for (uint i = 0; i Workspaces::instance()-size(); ++i) {
+ if (Workspaces::instance()-size() 1) {
+-swprintf(buf, 16, L%d , i + 1);
++ snprintf(buf2, sizeof buf2, %d , i + 1);
++ mbstowcs(buf, buf2, 16);
+ }
+
+ for (it = Frame::frame_begin(); it != Frame::frame_end(); ++it) {
Index: patches/patch-src_Frame_cc
update: tmux 0.4
Update to 0.4, tested on i386 and sparc64. Change log is at: http://sf.net/project/shownotes.php?group_id=200378release_id=610515 -- Nicholas Index: Makefile === RCS file: /cvs/ports/misc/tmux/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile18 Jun 2008 15:07:11 - 1.2 +++ Makefile1 Jul 2008 17:12:00 - @@ -2,7 +2,7 @@ COMMENT= terminal multiplexer -DISTNAME= tmux-0.3 +DISTNAME= tmux-0.4 CATEGORIES=misc HOMEPAGE= http://www.sourceforge.net/projects/tmux/ Index: distinfo === RCS file: /cvs/ports/misc/tmux/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo18 Jun 2008 15:07:11 - 1.2 +++ distinfo1 Jul 2008 17:12:00 - @@ -1,5 +1,5 @@ -MD5 (tmux-0.3.tar.gz) = o+oAt2YpGA+7UOd92o476g== -RMD160 (tmux-0.3.tar.gz) = IPY3P+Fxc/FoNtkGZFh69qHaKR4= -SHA1 (tmux-0.3.tar.gz) = RUB72pSlA/0FBG+FNfWDG4KuJ0w= -SHA256 (tmux-0.3.tar.gz) = qOgehp5zOo/ny1Ps3yMseU3wjJsZtLMFX0FbpeNUrCU= -SIZE (tmux-0.3.tar.gz) = 87339 +MD5 (tmux-0.4.tar.gz) = IfNtJYf0M5vnf+whdptXPQ== +RMD160 (tmux-0.4.tar.gz) = GZO5IWzjyGhGVckW0js6a80QI10= +SHA1 (tmux-0.4.tar.gz) = ttJSG9jtKWL5R8H6iUWu9wSNUAw= +SHA256 (tmux-0.4.tar.gz) = r2slPAxd+WXQV80dcVkofBwTkqOtsO3PLyrbwAca6Ao= +SIZE (tmux-0.4.tar.gz) = 100671
update: tmux 0.3
Update to 0.3. patches/patch-tty_c should be removed.
Tested on i386, sparc64.
Change log is at:
http://sf.net/project/shownotes.php?release_id=607660group_id=200378
-- Nicholas
Index: Makefile
===
RCS file: /cvs/ports/misc/tmux/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile31 May 2008 20:51:28 - 1.1.1.1
+++ Makefile18 Jun 2008 07:38:45 -
@@ -2,7 +2,7 @@
COMMENT= terminal multiplexer
-DISTNAME= tmux-0.2
+DISTNAME= tmux-0.3
CATEGORIES=misc
HOMEPAGE= http://www.sourceforge.net/projects/tmux/
@@ -20,5 +20,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
FAKE_FLAGS=PREFIX=${PREFIX}
NO_REGRESS=Yes
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tmux
+ ${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/tmux
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/misc/tmux/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo31 May 2008 20:51:28 - 1.1.1.1
+++ distinfo18 Jun 2008 07:38:45 -
@@ -1,5 +1,5 @@
-MD5 (tmux-0.2.tar.gz) = RVppvOvNMmoMNzb5se+eow==
-RMD160 (tmux-0.2.tar.gz) = K0znFHUeEskTPuD6wEGkP/eHAOw=
-SHA1 (tmux-0.2.tar.gz) = zO6ySjj8WP+vDtHV6zHsEnBiZwY=
-SHA256 (tmux-0.2.tar.gz) = GGbIOpcAY2Fw5NNC0h9rTCJ6GasQcHAiWMGsn54d9KM=
-SIZE (tmux-0.2.tar.gz) = 76574
+MD5 (tmux-0.3.tar.gz) = o+oAt2YpGA+7UOd92o476g==
+RMD160 (tmux-0.3.tar.gz) = IPY3P+Fxc/FoNtkGZFh69qHaKR4=
+SHA1 (tmux-0.3.tar.gz) = RUB72pSlA/0FBG+FNfWDG4KuJ0w=
+SHA256 (tmux-0.3.tar.gz) = qOgehp5zOo/ny1Ps3yMseU3wjJsZtLMFX0FbpeNUrCU=
+SIZE (tmux-0.3.tar.gz) = 87339
Index: patches/patch-tty_c
===
RCS file: patches/patch-tty_c
diff -N patches/patch-tty_c
--- patches/patch-tty_c 31 May 2008 20:51:28 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tty_c,v 1.1.1.1 2008/05/31 20:51:28 steven Exp $
tty.c.orig Sat May 31 10:35:06 2008
-+++ tty.c Sat May 31 10:35:11 2008
-@@ -478,7 +478,7 @@ tty_vwrite(struct tty *tty, unused struct screen *s, i
- tty_puts(tty, delete_character);
- } else {
- while (ua-- 0)
-- tty_putc(tty, '\008');
-+ tty_putc(tty, '\010');
- }
- break;
- case TTY_CURSORON:
Index: pkg/PLIST
===
RCS file: /cvs/ports/misc/tmux/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 31 May 2008 20:51:28 - 1.1.1.1
+++ pkg/PLIST 18 Jun 2008 07:38:45 -
@@ -1,3 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/31 20:51:28 steven Exp $
-bin/tmux
[EMAIL PROTECTED] bin/tmux
@man man/man1/tmux.1
+share/examples/tmux/
+share/examples/tmux/n-marriott.conf
+share/examples/tmux/n-marriott.sh
Re: Emacs 22 port?
text console. BTW, does anybody actually use the no_x11 flavor? I always use it - it is the nicest way to stop emacs ever opening with X11 UI. Please don't get rid of it :-). -- Nicholas
Re: Emacs 22 port?
FWIW your port builds and works fine for me on i386 (no_x11 FLAVOR at least). If you let me know once you have the port naming and gtk/athena decisions sorted out I'll give it a spin on sparc and sparc64 too. emacs 22 is pretty cool, it would be nice to have it. On Sat, Jun 14, 2008 at 11:52:21AM +0200, Andreas V?gele wrote: Brad Walker writes: On Mon, 2008-04-14 at 21:42 +0200, Eric Faurot wrote: On Sun, 13 Apr 2008 14:35:57 -0700 Matthew Dempsky [EMAIL PROTECTED] wrote: Is anyone working on an Emacs 22 port? I thought I'd check before making a redundant effort. This is a work-in-progress port of emacs 22.2 based on a post by Fulvio Ciriaco. Contributions are most welcome. I've attached a patch for Emacs 22 diffed against Eric's tarball[...]. This patch incorporates Matthew Dempsky's gtk FLAVOR patch and plist fixes[...] as well as an athena flavor. I also attempted to resolve the problems Eric mentioned. [...] Here's yet another proposal. * The port attached to the end of this message is named emacs instead of emacs22. It conflicts with emacs21. I think that there's no need to support different Emacs versions in the ports tree. Naming the port emacs eases package updates to newer Emacs versions. * The port isn't split into -main and -el. I don't see the point. Users who are low on disk space can use mg oder jmacs, i.e. joe. * By default Emacs is built against GTK+ since GTK+ will be the default toolkit in Emacs 23. There are two flavors: * no_x11: Don't build against any widget set. Don't build against image libraries like jpeg and png which arent't of much use on a text console. BTW, does anybody actually use the no_x11 flavor? * athena: Build against the Athena widget set instead of GTK+. This flavor will provide minimal GUI support. For example, when Emacs 23 is released the default flavor will support librsvg, dbus and all the other bells and whistles that the upstream developers are currently adding to Emacs. The athena flavor, on the other hand, will be kept small. What do you think? Tested on i386 only. The GCCARCH variable at the end of the makefile needs to be checked on other platforms.
Re: NEW: misc/tmux
Window splitting is on the todo list but it won't be any time soon.
Port looks good to me aside from a couple of things. You can do:
FAKE_FLAGS= PREFIX=${PREFIX}
And lose the Makefile patch. Also, PKGNAME doesn't need to be defined if it
is the same as DISTNAME.
Port works for me on i386.
-- Nicholas
On Fri, May 30, 2008 at 09:58:33AM +0200, Guillaume Sellier wrote:
Brynet wrote:
No problem, thanks for testing.. attaching a fixed copy.
tested on amd64, working well.
Do you know if horizontal splitting feature is planned (as in screen-cvs) ?
--
Guillaume
update: fdm 1.5
Tested on i386, sparc64, sparc. Changelog: http://sf.net/project/shownotes.php?group_id=174568release_id=581598 -- Nicholas Index: Makefile === RCS file: /cvs/ports/mail/fdm/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile4 Jan 2008 17:48:36 - 1.6 +++ Makefile29 Apr 2008 22:00:03 - @@ -2,8 +2,7 @@ COMMENT= fetch, filter and deliver mail -DISTNAME= fdm-1.4+regress -PKGNAME= fdm-1.4 +DISTNAME= fdm-1.5 CATEGORIES=mail HOMEPAGE= http://fdm.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/mail/fdm/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo15 Oct 2007 19:25:34 - 1.6 +++ distinfo29 Apr 2008 22:00:03 - @@ -1,5 +1,5 @@ -MD5 (fdm-1.4+regress.tar.gz) = 5Rl1ppefvQ8t2cIy+yB6qg== -RMD160 (fdm-1.4+regress.tar.gz) = mRO0J2SxHJ5cyaH66BPjcmePiUE= -SHA1 (fdm-1.4+regress.tar.gz) = 05E+azFrZi3IrJIEqonEu4Xi6gE= -SHA256 (fdm-1.4+regress.tar.gz) = ZF7YDYFn9sfBE9u3ttvD7dKwTAqT74K3vekHJ3x/mXs= -SIZE (fdm-1.4+regress.tar.gz) = 191268 +MD5 (fdm-1.5.tar.gz) = +rdo41tBdD8scYtqLJ6ccA== +RMD160 (fdm-1.5.tar.gz) = pjLL+AGdsU6XkpjkaiJewnOVjLk= +SHA1 (fdm-1.5.tar.gz) = Nt0VITH2JqIGVXTC4jGVXQrfZKg= +SHA256 (fdm-1.5.tar.gz) = 2CPjClprtlsTJAscMAllBdLq4OimBsYHHjKA3nSqOU0= +SIZE (fdm-1.5.tar.gz) = 187289
Re: NEW: bunny the fuzzer
Hi, Bunny uses automatically generated C-level instrumentation to focus on runtime inputs observed to trigger new control flow paths or interesting parameter variations - and to bail out early on dead-end fuzzing routes. snip With these, it builds fine and bunny-gcc/bunny-trace both work fine for me on amd64 and i386. I haven't had time to try it as a fuzzer yet though. Attached is an updated port of version 0.92 which has fixed several bugs that prevented it working on OpenBSD. The program uses some inline asm to do locking so the port is ONLY_FOR_ARCHS amd64, i386. Now works for me without problems on i386, amd64. Please test, etc. -- Nicholas. bunny092.tar.gz Description: application/tar-gz
Re: NEW: bunny the fuzzer
Hi, Bunny uses automatically generated C-level instrumentation to focus on runtime inputs observed to trigger new control flow paths or interesting parameter variations - and to bail out early on dead-end fuzzing routes. I tidied this up a bit (please see attached), notably: - tidy the Makefile - lose the custom CFLAGS and let the ports system use its standard one - -lm isn't actually necessary - only install the man page once as bunny(1) - install the README which has useful stuff about how to use it - several fixes for pointer casting/arithmetic problems, and lose ONLY_FOR_ARCH With these, it builds fine and bunny-gcc/bunny-trace both work fine for me on amd64 and i386. I haven't had time to try it as a fuzzer yet though. -- Nicholas. bunny.tar.gz Description: application/tar-gz
update: fdm 1.4
Hi,
Update to fdm 1.4. Change log:
http://sourceforge.net/project/shownotes.php?group_id=174568release_id=543562
I've stopped shipping the regression tests as part of the tarball, so I've
added NO_REGRESS=Yes to the port Makefile, also TDB is no longer optional so
the MAKE_FLAGS can go.
Tested on amd64, i386, sparc, sparc64.
-- Nicholas.
Index: Makefile
===
RCS file: /cvs/ports/mail/fdm/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile2 Aug 2007 06:18:37 - 1.4
+++ Makefile5 Oct 2007 19:33:27 -
@@ -2,7 +2,7 @@
COMMENT= fetch, filter and deliver mail
-DISTNAME= fdm-1.3c
+DISTNAME= fdm-1.4
CATEGORIES=mail
HOMEPAGE= http://fdm.sourceforge.net/
@@ -19,9 +19,10 @@ WANTLIB= c crypto ssl z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/}
LIB_DEPENDS+= tdb::databases/tdb
-MAKE_FLAGS+= -DDB
FAKE_FLAGS=DESTDIR=${WRKINST} PREFIX=${PREFIX}
+
+NO_REGRESS=Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/fdm
Index: distinfo
===
RCS file: /cvs/ports/mail/fdm/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo2 Aug 2007 06:18:37 - 1.5
+++ distinfo5 Oct 2007 19:33:27 -
@@ -1,5 +1,5 @@
-MD5 (fdm-1.3c.tar.gz) = Nt+HN5EvFcufaVv7CpgyVQ==
-RMD160 (fdm-1.3c.tar.gz) = YxQ187zVMxCKWtjjTKOYl7fyVYw=
-SHA1 (fdm-1.3c.tar.gz) = wYNyYhL56i09yb9jePsQKp5sCSA=
-SHA256 (fdm-1.3c.tar.gz) = dbj53U9IqUmNJ6KzxY7iS6Yp+GFbAaVgjniWGrtPsok=
-SIZE (fdm-1.3c.tar.gz) = 160993
+MD5 (fdm-1.4.tar.gz) = yosXzJU0Ei+v2cHKg4zWmQ==
+RMD160 (fdm-1.4.tar.gz) = wHHvjB45WupexyHKAjGwBNVfC5I=
+SHA1 (fdm-1.4.tar.gz) = wYmFAYEaPrkwITBsjaOSGNBW3iI=
+SHA256 (fdm-1.4.tar.gz) = sC+jZs1UHfoKRnSW0Ar3DbB8RwHpeqqCeMNgWDoBD4E=
+SIZE (fdm-1.4.tar.gz) = 168731
update: mail/fdm 1.3
Hi,
Update to 1.3. Changelog:
http://sf.net/project/shownotes.php?group_id=174568release_id=528628
Tested on i386, sparc64, sparc.
Please test, etc.
-- Nicholas.
Index: Makefile
===
RCS file: /cvs/ports/mail/fdm/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile7 Apr 2007 04:38:44 - 1.3
+++ Makefile30 Jul 2007 10:36:48 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2007/04/07 04:38:44 steven Exp $
-COMMENT= fetch, filter and deliver mail
+COMMENT= fetch, filter and deliver mail
-DISTNAME= fdm-1.1
+DISTNAME= fdm-1.3
CATEGORIES=mail
HOMEPAGE= http://fdm.sourceforge.net/
@@ -14,9 +14,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto ssl z
+WANTLIB= c crypto ssl tdb z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/}
+
+LIB_DEPENDS+= tdb::databases/tdb
+MAKE_FLAGS+= -DDB
+
+FAKE_FLAGS=${MAKE_FLAGS} PREFIX=${PREFIX}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/fdm
Index: distinfo
===
RCS file: /cvs/ports/mail/fdm/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo7 Apr 2007 04:38:44 - 1.4
+++ distinfo30 Jul 2007 10:36:48 -
@@ -1,5 +1,5 @@
-MD5 (fdm-1.1.tar.gz) = e9L2k9pkpmq3DgAx09rJnw==
-RMD160 (fdm-1.1.tar.gz) = eKz6Ml2YIE5buECQ3psSZq775pY=
-SHA1 (fdm-1.1.tar.gz) = REYkKQCqTWYK8ys6mmFbx52nPYw=
-SHA256 (fdm-1.1.tar.gz) = OQjZqrYptukniddwzhGWPfKf+qDMkt1bE7KYN2Ew6Zk=
-SIZE (fdm-1.1.tar.gz) = 141981
+MD5 (fdm-1.3.tar.gz) = H4KY27Ze/3cCB4HOjJqqdQ==
+RMD160 (fdm-1.3.tar.gz) = hh8MJ7py3xMcPpyQVEP05FF0PAQ=
+SHA1 (fdm-1.3.tar.gz) = l3p3Vjylmy+57nGFLucMMsufrwk=
+SHA256 (fdm-1.3.tar.gz) = 92g0VAUsmqcc6kI9KGs+DWGocLn+BAZ3JODy4ItE+uw=
+SIZE (fdm-1.3.tar.gz) = 160429
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/fdm/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 7 Apr 2007 04:38:44 - 1.3
+++ pkg/PLIST 30 Jul 2007 10:36:48 -
@@ -7,6 +7,7 @@ share/doc/fdm/MANUAL
share/doc/fdm/README
share/examples/fdm/
share/examples/fdm/f-terbeck.conf
+share/examples/fdm/g-lando.conf
share/examples/fdm/n-marriott.conf
share/examples/fdm/t-ulmer.conf
share/examples/fdm/w-maier.conf
update: mail/fdm 1.3b
Hi,
This is an updated diff for fdm 1.3b which includes a bug fix for a problem
with timeouts and SSL on OpenBSD reported by [EMAIL PROTECTED]
Changelog same place:
http://sf.net/project/shownotes.php?group_id=174568release_id=528628
Tested again on i386, sparc64, sparc.
Please test, etc.
-- Nicholas.
Index: Makefile
===
RCS file: /cvs/ports/mail/fdm/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile7 Apr 2007 04:38:44 - 1.3
+++ Makefile30 Jul 2007 21:34:16 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.3 2007/04/07 04:38:44 steven Exp $
-COMMENT= fetch, filter and deliver mail
+COMMENT= fetch, filter and deliver mail
-DISTNAME= fdm-1.1
+DISTNAME= fdm-1.3b
CATEGORIES=mail
HOMEPAGE= http://fdm.sourceforge.net/
@@ -14,9 +14,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto ssl z
+WANTLIB= c crypto ssl tdb z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/}
+
+LIB_DEPENDS+= tdb::databases/tdb
+MAKE_FLAGS+= -DDB
+
+FAKE_FLAGS=${MAKE_FLAGS} PREFIX=${PREFIX}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/fdm
Index: distinfo
===
RCS file: /cvs/ports/mail/fdm/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo7 Apr 2007 04:38:44 - 1.4
+++ distinfo30 Jul 2007 21:34:16 -
@@ -1,5 +1,5 @@
-MD5 (fdm-1.1.tar.gz) = e9L2k9pkpmq3DgAx09rJnw==
-RMD160 (fdm-1.1.tar.gz) = eKz6Ml2YIE5buECQ3psSZq775pY=
-SHA1 (fdm-1.1.tar.gz) = REYkKQCqTWYK8ys6mmFbx52nPYw=
-SHA256 (fdm-1.1.tar.gz) = OQjZqrYptukniddwzhGWPfKf+qDMkt1bE7KYN2Ew6Zk=
-SIZE (fdm-1.1.tar.gz) = 141981
+MD5 (fdm-1.3b.tar.gz) = IWKx6dEVOjf+zHiTXN9D4g==
+RMD160 (fdm-1.3b.tar.gz) = 9j78l85nD9kFLD7DmKqE9xAKcjQ=
+SHA1 (fdm-1.3b.tar.gz) = Q25mdJ2ZYAQRn7Ng+y9494qeRPs=
+SHA256 (fdm-1.3b.tar.gz) = lhv9kEBJ85wBKuClu2UNUc2MQHMf6pf/EfM6kT1Z8mk=
+SIZE (fdm-1.3b.tar.gz) = 160747
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/fdm/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 7 Apr 2007 04:38:44 - 1.3
+++ pkg/PLIST 30 Jul 2007 21:34:16 -
@@ -7,6 +7,7 @@ share/doc/fdm/MANUAL
share/doc/fdm/README
share/examples/fdm/
share/examples/fdm/f-terbeck.conf
+share/examples/fdm/g-lando.conf
share/examples/fdm/n-marriott.conf
share/examples/fdm/t-ulmer.conf
share/examples/fdm/w-maier.conf
Re: new: databases/tdb
Hi, No comments on this? (I've reattached the tgz to this mail.) On Sun, Jul 08, 2007 at 12:53:12AM +0100, Nicholas Marriott wrote: Hi, Attached is a port of TDB (http://sf.net/projects/tdb), a nice little database library which will probably be a dependency for the next version of fdm (mail/fdm). I disabled building the binaries because the tests depend on GDBM (and aren't installed in any case) and tdbtool and tdbdump would cause the package to conflict with Samba, which is probably a bad idea. Tested to build and correctly create/read/add to database files on i386 and sparc64. Please test, comment, etc. -- Nicholas. tdb.tar.gz Description: application/tar-gz
Re: UPDATE: devel/mercurial
Hi, On Fri, Jul 13, 2007 at 07:02:39AM -0500, Will Maier wrote: Diff attached and available via HTTP: http://www.lfod.us/files/ports/mercurial-0.9.4.diff Any feedback on this update? Works for me on sparc64. -- Nicholas.
new: databases/tdb
Hi, Attached is a port of TDB (http://sf.net/projects/tdb), a nice little database library which will probably be a dependency for the next version of fdm (mail/fdm). I disabled building the binaries because the tests depend on GDBM (and aren't installed in any case) and tdbtool and tdbdump would cause the package to conflict with Samba, which is probably a bad idea. Tested to build and correctly create/read/add to database files on i386 and sparc64. Please test, comment, etc. -- Nicholas. tdb.tar.gz Description: application/tar-gz
update: mail/fdm 1.2
Hi,
Update to 1.2, changelog here:
http://sf.net/project/shownotes.php?group_id=174568release_id=519102
Tested on i386, sparc64, sparc.
-- Nicholas.
Index: Makefile
===
RCS file: /cvs/ports/mail/fdm/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile7 Apr 2007 04:38:44 - 1.3
+++ Makefile27 Jun 2007 08:11:34 -
@@ -2,7 +2,7 @@
COMMENT= fetch, filter and deliver mail
-DISTNAME= fdm-1.1
+DISTNAME= fdm-1.2
CATEGORIES=mail
HOMEPAGE= http://fdm.sourceforge.net/
@@ -17,6 +17,8 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto ssl z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/}
+
+FAKE_FLAGS=${MAKE_FLAGS} PREFIX=${PREFIX}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/fdm
Index: distinfo
===
RCS file: /cvs/ports/mail/fdm/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo7 Apr 2007 04:38:44 - 1.4
+++ distinfo27 Jun 2007 08:11:34 -
@@ -1,5 +1,5 @@
-MD5 (fdm-1.1.tar.gz) = e9L2k9pkpmq3DgAx09rJnw==
-RMD160 (fdm-1.1.tar.gz) = eKz6Ml2YIE5buECQ3psSZq775pY=
-SHA1 (fdm-1.1.tar.gz) = REYkKQCqTWYK8ys6mmFbx52nPYw=
-SHA256 (fdm-1.1.tar.gz) = OQjZqrYptukniddwzhGWPfKf+qDMkt1bE7KYN2Ew6Zk=
-SIZE (fdm-1.1.tar.gz) = 141981
+MD5 (fdm-1.2.tar.gz) = 4q4sNDZNrvmFKM6CauAGyQ==
+RMD160 (fdm-1.2.tar.gz) = TLVDzO8yAfl3bhTjlkw87IOahG4=
+SHA1 (fdm-1.2.tar.gz) = oV7RTR+t/CCnKs4eIGTwU3RISvM=
+SHA256 (fdm-1.2.tar.gz) = X1fVlJ9jd0kbLZytuS610HD+fV5t0RxqAsDKG/lQHhE=
+SIZE (fdm-1.2.tar.gz) = 147483
update: mail/fdm 1.1
Update to 1.1. Tested on i386, sparc64, sparc. Please test, etc. -- Nicholas. Index: Makefile === RCS file: /cvs/ports/mail/fdm/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile6 Feb 2007 07:27:24 - 1.2 +++ Makefile6 Apr 2007 14:10:58 - @@ -2,7 +2,7 @@ COMMENT= fetch, filter and deliver mail -DISTNAME= fdm-0.9a +DISTNAME= fdm-1.1 CATEGORIES=mail HOMEPAGE= http://fdm.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/mail/fdm/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo5 Apr 2007 16:20:01 - 1.3 +++ distinfo6 Apr 2007 14:10:58 - @@ -1,5 +1,5 @@ -MD5 (fdm-0.9a.tar.gz) = H8RDsCwf5mVzEt6gquw/eQ== -RMD160 (fdm-0.9a.tar.gz) = eXEoxH/bPu3svBznm7xqGLfw0hE= -SHA1 (fdm-0.9a.tar.gz) = BsP6FRpCgaXLYIhwzp9aFgz8J54= -SHA256 (fdm-0.9a.tar.gz) = 6ItGA5Da/+Jnzdt0wz5mlgj2J3J0dGiwKL01ga+Hamo= -SIZE (fdm-0.9a.tar.gz) = 102575 +MD5 (fdm-1.1.tar.gz) = e9L2k9pkpmq3DgAx09rJnw== +RMD160 (fdm-1.1.tar.gz) = eKz6Ml2YIE5buECQ3psSZq775pY= +SHA1 (fdm-1.1.tar.gz) = REYkKQCqTWYK8ys6mmFbx52nPYw= +SHA256 (fdm-1.1.tar.gz) = OQjZqrYptukniddwzhGWPfKf+qDMkt1bE7KYN2Ew6Zk= +SIZE (fdm-1.1.tar.gz) = 141981 Index: pkg/PLIST === RCS file: /cvs/ports/mail/fdm/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 6 Feb 2007 07:27:24 - 1.2 +++ pkg/PLIST 6 Apr 2007 14:10:58 - @@ -6,7 +6,9 @@ share/doc/fdm/ share/doc/fdm/MANUAL share/doc/fdm/README share/examples/fdm/ +share/examples/fdm/f-terbeck.conf share/examples/fdm/n-marriott.conf +share/examples/fdm/t-ulmer.conf share/examples/fdm/w-maier.conf share/fdm/ share/fdm/fdm-sanitize
update: mail/fdm
Update to 0.9a. Works on i386, sparc, sparc64.
Please test, etc.
-- Nicholas.
Index: Makefile
===
RCS file: /cvs/ports/mail/fdm/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile18 Jan 2007 21:47:01 - 1.1.1.1
+++ Makefile1 Feb 2007 16:17:02 -
@@ -2,7 +2,7 @@
COMMENT= fetch, filter and deliver mail
-DISTNAME= fdm-0.8a
+DISTNAME= fdm-0.9a
CATEGORIES=mail
HOMEPAGE= http://fdm.sourceforge.net/
@@ -14,11 +14,13 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c crypto ssl
+WANTLIB= c crypto ssl z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fdm/}
post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/fdm
+ ${INSTALL_DATA} ${WRKSRC}/fdm-sanitize ${PREFIX}/share/fdm
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fdm
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/fdm
${INSTALL_DATA} ${WRKSRC}/MANUAL ${PREFIX}/share/doc/fdm
Index: distinfo
===
RCS file: /cvs/ports/mail/fdm/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo18 Jan 2007 21:47:01 - 1.1.1.1
+++ distinfo1 Feb 2007 16:17:02 -
@@ -1,4 +1,4 @@
-MD5 (fdm-0.8a.tar.gz) = bdc1435711bc0144e0d44203a87d758e
-RMD160 (fdm-0.8a.tar.gz) = 04d1f1aff8dac261fb1a1d578d888f639381db21
-SHA1 (fdm-0.8a.tar.gz) = 37e5a0a7491648613e368a4cdfbb365ede5f5a19
-SIZE (fdm-0.8a.tar.gz) = 95532
+MD5 (fdm-0.9a.tar.gz) = 1fc443b02c1fe6657312dea0aaec3f79
+RMD160 (fdm-0.9a.tar.gz) = 797128c47fdb3eedecbc1ce79bbc6a18b7f0d211
+SHA1 (fdm-0.9a.tar.gz) = 06c3fa151a4281a5cb608870ce9f5a160cfc279e
+SIZE (fdm-0.9a.tar.gz) = 102575
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/fdm/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Jan 2007 21:47:01 - 1.1.1.1
+++ pkg/PLIST 1 Feb 2007 16:17:02 -
@@ -8,3 +8,5 @@ share/doc/fdm/README
share/examples/fdm/
share/examples/fdm/n-marriott.conf
share/examples/fdm/w-maier.conf
+share/fdm/
+share/fdm/fdm-sanitize
NEW: mail/fdm
Port of fdm, my mail fetch/filter/delivery program. pkg/DESCR: fdm is a simple, lightweight replacement for mail fetch, filter and delivery programs such as fetchmail and procmail. It can fetch using POP3 or IMAP (with SSL) or from stdin, and deliver to a pipe, file, maildir, mbox or SMTP server, based on regexps. Tested on i386, sparc sparc64. Please test, comment, etc. -- Nicholas. fdm.tar.gz Description: application/tar-gz
update: x11/pekwm 0.1.5
Hi,
Diff below updates pekwm to 0.1.5.
Only caveat is that this release is completely incompatible with config files
from the previous version 0.1.1. Should this be mentioned somewhere?
Please test, etc.
-- Nicholas.
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile14 Feb 2005 00:35:54 - 1.6
+++ Makefile26 Jul 2006 15:29:48 -
@@ -2,11 +2,11 @@
COMMENT= aewm++ based pretty themable window manager
-VERSION= 0.1.1
+VERSION= 0.1.5
DISTNAME= pekwm-${VERSION}
CATEGORIES=x11
-HOMEPAGE= http://pekwm.babblica.net/
+HOMEPAGE= http://pekwm.org/
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -15,7 +15,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xpm c m stdc++
-MASTER_SITES= ${HOMEPAGE}files/source/
+MASTER_SITES= ${HOMEPAGE}files/
USE_X11= Yes
CONFIGURE_STYLE= simple
@@ -24,7 +24,14 @@ NO_REGRESS= Yes
USE_GMAKE= Yes
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pekwm
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pekwm
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pekwm
+ ${INSTALL_DATA} ${WRKSRC}/data/autoproperties \
+ ${WRKSRC}/data/config \
+ ${WRKSRC}/data/keys \
+ ${WRKSRC}/data/menu \
+ ${WRKSRC}/data/mouse \
+ ${WRKSRC}/data/start \
+ ${WRKSRC}/data/vars \
+${PREFIX}/share/examples/pekwm
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo5 Jan 2005 17:54:08 - 1.2
+++ distinfo26 Jul 2006 15:29:48 -
@@ -1,4 +1,4 @@
-MD5 (pekwm-0.1.1.tar.gz) = 807e46e33d88e3b054005ace38267ce2
-RMD160 (pekwm-0.1.1.tar.gz) = af360e160fef2e7e2308fd699ef45496d5a68bc3
-SHA1 (pekwm-0.1.1.tar.gz) = 419b7d9318021b5a4fb61fa488d778e46d7248d3
-SIZE (pekwm-0.1.1.tar.gz) = 187248
+MD5 (pekwm-0.1.5.tar.gz) = 4475e0176f70b38455ac8c427fa0ca0e
+RMD160 (pekwm-0.1.5.tar.gz) = 9a4ebad815c66d060867b83667de509c7885b8a7
+SHA1 (pekwm-0.1.5.tar.gz) = 95394dbd924a181c403066540555b710bfb70593
+SIZE (pekwm-0.1.5.tar.gz) = 298565
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 15 Sep 2004 19:26:30 - 1.2
+++ pkg/PLIST 26 Jul 2006 15:29:48 -
@@ -1,35 +1,26 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:30 espie Exp $
bin/pekwm
-share/doc/pekwm/
-share/doc/pekwm/README
+share/examples/pekwm/
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/
+share/examples/pekwm/autoproperties
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/autoproperties
+share/examples/pekwm/config
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/config
+share/examples/pekwm/keys
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/keys
+share/examples/pekwm/menu
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/menu
+share/examples/pekwm/mouse
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/mouse
+share/examples/pekwm/start
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/start
+share/examples/pekwm/vars
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/vars
share/pekwm/
-share/pekwm/autoprops
-share/pekwm/config
-share/pekwm/keys
-share/pekwm/menu
-share/pekwm/start
+share/pekwm/scripts/
+share/pekwm/scripts/pekwm_themeset.pl
+share/pekwm/scripts/pekwm_themeset.sh
+share/pekwm/scripts/pekwm_ws_menu.pl
share/pekwm/themes/
share/pekwm/themes/default/
-share/pekwm/themes/default/border.xpm
-share/pekwm/themes/default/bottom.xpm
-share/pekwm/themes/default/btn-close-fo.xpm
-share/pekwm/themes/default/btn-close-pr.xpm
-share/pekwm/themes/default/btn-close-un.xpm
-share/pekwm/themes/default/btn-max-fo.xpm
-share/pekwm/themes/default/btn-max-pr.xpm
-share/pekwm/themes/default/btn-max-un.xpm
-share/pekwm/themes/default/btn-min-fo.xpm
-share/pekwm/themes/default/btn-min-pr.xpm
-share/pekwm/themes/default/btn-min-un.xpm
-share/pekwm/themes/default/left.xpm
-share/pekwm/themes/default/right.xpm
-share/pekwm/themes/default/separator-fo.xpm
-share/pekwm/themes/default/separator-un.xpm
-share/pekwm/themes/default/side-un.xpm
-share/pekwm/themes/default/side.xpm
share/pekwm/themes/default/theme
-share/pekwm/themes/default/theme.in
-share/pekwm/themes/default/top.xpm
-share/pekwm/themes/default/win-focus.xpm
-share/pekwm/themes/default/win-select.xpm
-share/pekwm/themes/default/win-unfocus.xpm
Re: update: x11/pekwm 0.1.5
Hi,
Thanks for testing.
It fails on startup for me trying to copy stuff from
/usr/local/etc/pekwm (which doesn't exist) to ~/.pekwm. It should
probably be reading from /usr/local/share/examples/pekwm instead.
Oops! I had already set it up so I forgot to test this. Updated diff below.
-- Nicholas.
Index: Makefile
===
RCS file: /cvs/ports/x11/pekwm/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- Makefile14 Feb 2005 00:35:54 - 1.6
+++ Makefile27 Jul 2006 00:55:05 -
@@ -2,11 +2,11 @@
COMMENT= aewm++ based pretty themable window manager
-VERSION= 0.1.1
+VERSION= 0.1.5
DISTNAME= pekwm-${VERSION}
CATEGORIES=x11
-HOMEPAGE= http://pekwm.babblica.net/
+HOMEPAGE= http://pekwm.org/
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -15,16 +15,23 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xpm c m stdc++
-MASTER_SITES= ${HOMEPAGE}files/source/
+MASTER_SITES= ${HOMEPAGE}files/
USE_X11= Yes
CONFIGURE_STYLE= simple
-CONFIGURE_ARGS+= --prefix=${LOCALBASE}
+CONFIGURE_ARGS+= --prefix=${LOCALBASE} --sysconfdir=${SYSCONFDIR}
NO_REGRESS=Yes
USE_GMAKE= Yes
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pekwm
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pekwm
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pekwm
+ ${INSTALL_DATA} ${WRKSRC}/data/autoproperties \
+ ${WRKSRC}/data/config \
+ ${WRKSRC}/data/keys \
+ ${WRKSRC}/data/menu \
+ ${WRKSRC}/data/mouse \
+ ${WRKSRC}/data/start \
+ ${WRKSRC}/data/vars \
+${PREFIX}/share/examples/pekwm
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/x11/pekwm/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo5 Jan 2005 17:54:08 - 1.2
+++ distinfo27 Jul 2006 00:55:05 -
@@ -1,4 +1,4 @@
-MD5 (pekwm-0.1.1.tar.gz) = 807e46e33d88e3b054005ace38267ce2
-RMD160 (pekwm-0.1.1.tar.gz) = af360e160fef2e7e2308fd699ef45496d5a68bc3
-SHA1 (pekwm-0.1.1.tar.gz) = 419b7d9318021b5a4fb61fa488d778e46d7248d3
-SIZE (pekwm-0.1.1.tar.gz) = 187248
+MD5 (pekwm-0.1.5.tar.gz) = 4475e0176f70b38455ac8c427fa0ca0e
+RMD160 (pekwm-0.1.5.tar.gz) = 9a4ebad815c66d060867b83667de509c7885b8a7
+SHA1 (pekwm-0.1.5.tar.gz) = 95394dbd924a181c403066540555b710bfb70593
+SIZE (pekwm-0.1.5.tar.gz) = 298565
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST 15 Sep 2004 19:26:30 - 1.2
+++ pkg/PLIST 27 Jul 2006 00:55:05 -
@@ -1,35 +1,26 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:30 espie Exp $
bin/pekwm
-share/doc/pekwm/
-share/doc/pekwm/README
+share/examples/pekwm/
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/
+share/examples/pekwm/autoproperties
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/autoproperties
+share/examples/pekwm/config
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/config
+share/examples/pekwm/keys
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/keys
+share/examples/pekwm/menu
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/menu
+share/examples/pekwm/mouse
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/mouse
+share/examples/pekwm/start
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/start
+share/examples/pekwm/vars
[EMAIL PROTECTED] ${SYSCONFDIR}/pekwm/vars
share/pekwm/
-share/pekwm/autoprops
-share/pekwm/config
-share/pekwm/keys
-share/pekwm/menu
-share/pekwm/start
+share/pekwm/scripts/
+share/pekwm/scripts/pekwm_themeset.pl
+share/pekwm/scripts/pekwm_themeset.sh
+share/pekwm/scripts/pekwm_ws_menu.pl
share/pekwm/themes/
share/pekwm/themes/default/
-share/pekwm/themes/default/border.xpm
-share/pekwm/themes/default/bottom.xpm
-share/pekwm/themes/default/btn-close-fo.xpm
-share/pekwm/themes/default/btn-close-pr.xpm
-share/pekwm/themes/default/btn-close-un.xpm
-share/pekwm/themes/default/btn-max-fo.xpm
-share/pekwm/themes/default/btn-max-pr.xpm
-share/pekwm/themes/default/btn-max-un.xpm
-share/pekwm/themes/default/btn-min-fo.xpm
-share/pekwm/themes/default/btn-min-pr.xpm
-share/pekwm/themes/default/btn-min-un.xpm
-share/pekwm/themes/default/left.xpm
-share/pekwm/themes/default/right.xpm
-share/pekwm/themes/default/separator-fo.xpm
-share/pekwm/themes/default/separator-un.xpm
-share/pekwm/themes/default/side-un.xpm
-share/pekwm/themes/default/side.xpm
share/pekwm/themes/default/theme
-share/pekwm/themes/default/theme.in
-share/pekwm/themes/default/top.xpm
-share/pekwm/themes/default/win-focus.xpm
-share/pekwm/themes/default/win-select.xpm
-share/pekwm/themes/default/win-unfocus.xpm
