haskell-pandoc

2012-12-04 Thread Predrag Punosevac
Alexander Polakov  wrote:

> * Predrag Punosevac  [121205 00:40]:
> > On Mon, Dec 03, 2012 at 10:32:56PM +0100, Matthias Kilian wrote:
> > > I'd like to add --enable-tests by default in ghc.port.mk, unless a
> > > hs-ports has set NO_REGRESS=Yes.
> > [...]
> > 
> > This is an OT. Any chance that one of you Haskell guys gets pandoc
> > ported to OpenBSD.
> > 
> > http://johnmacfarlane.net/pandoc/
> > 
> > P.S. I tried installing with cabal but it just returns a slue of
> > complains. 
> > 
>
> pandoc installs and works fine here on -current/i386.

I can confirm this! I just compiled cabal-install from ports on the i386
current.

$ uname -a
OpenBSD foo.my.domain 5.2 GENERIC.MP#107 i386

Inspite 

$ cabal update
Downloading the latest package list from hackage.haskell.org
Note: there is a new version of cabal-install available.
To upgrade, run: cabal install cabal-install


I didn't want to install new cabal-install I just went with the one from
ports. This is the result

Registering pandoc-1.9.4.5...
Preprocessing executable 'make-pandoc-man-pages' for pandoc-1.9.4.5...
[1 of 1] Compiling Main ( man/make-pandoc-man-pages.hs,
dist/build/make-pandoc-man-pages/make-pandoc-man-pages-tmp/Main.o )
Linking dist/build/make-pandoc-man-pages/make-pandoc-man-pages ...
/usr/local/lib/ghc/libHSrts.a(RtsFlags.o)(.text+0x2a2): In function
`copyArg':
: warning: strcpy() is almost always misused, please use strlcpy()
/usr/local/lib/ghc/libHSrts.a(RtsUtils.o)(.text+0x2f2): In function
`showStgWord64':
: warning: sprintf() is often misused, please use snprintf()
Installing library in /home/predrag/.cabal/lib/pandoc-1.9.4.5/ghc-7.4.2
Installing executable(s) in /home/predrag/.cabal/bin
Registering pandoc-1.9.4.5...
$ 

So it comes out successfully. 


Best,
Predrag



>
> -- 
> Alexander Polakov | plhk.ru



Re: UPDATE: audio/deadbeef

2012-12-04 Thread Stuart Henderson
> On Wed, Dec 05, 2012 at 01:46:43AM +0100, Mike Belopuhov wrote:
> > err, the whole point to bring deadbeef was not to use gtk3
> > with audacious.  i suggest not to convert deadbeef for this
> > update.  do it the next time.

we already have a perfectly good gtk+2 music player, aqualung ;)



UPDATE: QEMU 1.3.0

2012-12-04 Thread Brad Smith
Here is an update to QEMU 1.3.0.

I am looking for some testing of this update with some of the
more unusual configurations I'm sure people have cooked up
out there. I personally do not use the tap mode setup and
Stuart mentioned that there might be some breakage there
but following the README to make use of tap mode with
root and the qemu-ifup/qemu-ifdown scripts I noticed
this was not working with 1.2 either. Is this new? If
you have a setup using this mode do you see breakage
after an upgrade? Or am I doing something wrong?


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile21 Nov 2012 11:41:02 -  1.92
+++ Makefile3 Dec 2012 20:58:27 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.92 2012/11/21 11:41:02 brad Exp $
 
-ONLY_FOR_ARCHS=amd64 arm i386 mips64 mips64el powerpc sparc sparc64
+ONLY_FOR_ARCHS=amd64 arm i386 mips64 mips64el powerpc sparc64
 
 COMMENT=   multi system emulator
 
-DISTNAME=  qemu-1.2.1
+DISTNAME=  qemu-1.3.0
 CATEGORIES=emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
 EXTRACT_SUFX=  .tar.bz2
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_CDROM=   Yes
 PERMIT_DISTFILES_FTP=  Yes
 
 WANTLIB=   GL SDL X11 c curl glib-2.0 gthread-2.0 jpeg m ncurses \
-   png pthread util z
+   pixman-1 png pthread pthread-stubs util z
 
 MODULES=   devel/gettext \
lang/python
@@ -65,11 +65,8 @@ CONFIGURE_ARGS=  --prefix=${PREFIX} \
--disable-uuid \
--disable-usb-redir \
--disable-vnc-sasl \
-   --disable-vnc-tls
-
-.if ${MACHINE_ARCH:Msparc}
-CONFIGURE_ARGS+=--sparc_cpu=v7
-.endif
+   --disable-vnc-tls \
+   --with-coroutine=sigaltstack
 
 FLAVORS=   debug
 FLAVOR?=
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo21 Nov 2012 11:41:02 -  1.23
+++ distinfo3 Dec 2012 20:59:02 -
@@ -1,2 +1,2 @@
-SHA256 (qemu-1.2.1.tar.bz2) = M7HnEXkM1Gi9pwPCsQHXuWHY5tdFxnwH72OUX5Z/sEY=
-SIZE (qemu-1.2.1.tar.bz2) = 9872533
+SHA256 (qemu-1.3.0.tar.bz2) = h4BV7AW8KP7P4tqX64vJkuhjVXW2fOvfxcoe3hcRQKg=
+SIZE (qemu-1.3.0.tar.bz2) = 10286423
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.26
diff -u -p -r1.26 patch-configure
--- patches/patch-configure 21 Nov 2012 11:41:02 -  1.26
+++ patches/patch-configure 3 Dec 2012 21:00:04 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.26 2012/11/21 11:41:02 brad Exp $
 configure.orig Mon Nov 19 20:08:21 2012
-+++ configure  Mon Nov 19 22:03:34 2012
-@@ -2991,10 +2991,6 @@ fi
+--- configure.orig Mon Dec  3 14:37:05 2012
 configure  Mon Dec  3 15:59:33 2012
+@@ -3066,10 +3066,6 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
  
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST
--- pkg/PLIST   24 Sep 2012 17:55:36 -  1.23
+++ pkg/PLIST   24 Nov 2012 21:52:22 -
@@ -56,7 +56,6 @@ share/examples/qemu/target-x86_64.conf
 share/qemu/
 share/qemu/bamboo.dtb
 share/qemu/bios.bin
-share/qemu/cpus-x86_64.conf
 share/qemu/keymaps/
 share/qemu/keymaps/ar
 share/qemu/keymaps/bepo

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



Re: UPDATE: audio/deadbeef

2012-12-04 Thread Brad Smith
On Wed, Dec 05, 2012 at 01:46:43AM +0100, Mike Belopuhov wrote:
> On 5 December 2012 01:40, Brad Smith  wrote:
> >
> > Although the build infrastructure allows for building
> > both the Gtk+2 and Gtk+3 support the resulting package
> > does not actually work properly trying to use both toolkits.
> > So do what actually makes sense and just build with one
> > of them. I have also improved the way plugins are handled.
> >
> 
> err, the whole point to bring deadbeef was not to use gtk3
> with audacious.  i suggest not to convert deadbeef for this
> update.  do it the next time.

What do you mean by next time? If by that you mean next
release what difference does it make?

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



Re: UPDATE: audio/deadbeef

2012-12-04 Thread Mike Belopuhov
On 5 December 2012 01:40, Brad Smith  wrote:
>
> Although the build infrastructure allows for building
> both the Gtk+2 and Gtk+3 support the resulting package
> does not actually work properly trying to use both toolkits.
> So do what actually makes sense and just build with one
> of them. I have also improved the way plugins are handled.
>

err, the whole point to bring deadbeef was not to use gtk3
with audacious.  i suggest not to convert deadbeef for this
update.  do it the next time.



Re: UPDATE: audio/deadbeef

2012-12-04 Thread Brad Smith
On Wed, Dec 05, 2012 at 12:15:11AM +0600, Alexandr Shadchin wrote:
> On Mon, Dec 03, 2012 at 09:16:48PM -0500, Brad Smith wrote:
> > On Fri, Nov 30, 2012 at 11:28:12AM +, Stuart Henderson wrote:
> > > On 2012/11/30 05:47, Brad Smith wrote:
> > > > - Original message -
> > > > > On 2012/11/28 23:14, Brad Smith wrote:
> > > > > > On Thu, Nov 29, 2012 at 12:14:33AM +0600, Alexandr Shadchin wrote:
> > > > > > > On Mon, Nov 19, 2012 at 11:33:09PM +0600, Alexandr Shadchin wrote:
> > > > > > > > Hi,
> > > > > > > > 
> > > > > > > > This update package deadbeef to the latest release 0.5.6.
> > > > > > > > Tested on amd64.
> > > > > > > > 
> > > > > > > > Split package on -main, -gtk2 and -gtk3.
> > > > > > > > Please make review this change.
> > > > > > > > 
> > > > > > > > Comments ? OK ?
> > > > > > > > 
> > > > > > > 
> > > > > > > Fix BUILD_DEPENDS.
> > > > > > 
> > > > > > The gtk2 sub-package should have a @pkgpath marker so upgrading
> > > > > > from the older package to the new main + gtk2 package set will
> > > > > > have the expected result.
> > > > > 
> > > > > good luck getting that to work ;)
> > > > 
> > > > Am I crazy for expecting that to actually work? I was fairly
> > > > certain it would but maybe it is another thing with the pkg tools
> > > > that doesn't work.
> > > 
> > > The gtk2 package is named deadbeef-gtk2-0.5.6, so it isn't considered
> > > as a replacement for deadbeef-0.5.5, so pkg_add -u doesn't consult the
> > > deadbeef-gtk2 package at all to even see the @pkgpath line.
> > > 
> > > One thing that could be done would be to name the -main package
> > > something like deadbeef-core-0.5.6, name the -gtk2 package deadbeef-0.5.6,
> > > remove @pkgpath in PLIST-main, add @pkgpath in PLIST-gtk2, and add 
> > > @conflicts
> > > as necessary.
> > 
> > Ewww. That's pretty awful.
> > 
> > > More than this would need Quirks.pm to be able to do version comparisons
> > > rather than the fast hash lookups, but doing those checks for every
> > > updated package will slow down pkg_add -u ..
> > 
> > Or better yet get rid of the nonsense of splitting up the port and
> > not having to worry about this stuff at all.
> > 
> 
> I agree, splitting brings more problems. Update diff.

Although the build infrastructure allows for building
both the Gtk+2 and Gtk+3 support the resulting package
does not actually work properly trying to use both toolkits.
So do what actually makes sense and just build with one
of them. I have also improved the way plugins are handled.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile10 Aug 2012 17:25:01 -  1.2
+++ Makefile4 Dec 2012 22:45:37 -
@@ -3,8 +3,7 @@
 SHARED_ONLY =  Yes
 
 COMMENT =  DeaDBeeF is an audio player
-DISTNAME = deadbeef-0.5.5
-REVISION = 0
+DISTNAME = deadbeef-0.5.6
 CATEGORIES =   audio
 
 HOMEPAGE = http://deadbeef.sourceforge.net/
@@ -16,16 +15,15 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
 WANTLIB += FLAC GL ICE Imlib2 SM X11 Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 avcodec
-WANTLIB += avformat avutil bz2 c cairo cddb cdio crypto curl dbus-1
-WANTLIB += expat faad ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0
-WANTLIB += gtk-x11-2.0 idn m mad mms mp3lame mpcdec ogg orc-0.4
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread pthread-stubs schroedinger-1.0 sndfile
-WANTLIB += sndio speex ssl theoradec theoraenc vorbis vorbisenc
-WANTLIB += vorbisfile vpx wavpack x264 xcb xcb-render xcb-shm
-WANTLIB += xvidcore z zip
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
+WANTLIB += atspi avcodec avformat avutil c cairo cairo-gobject
+WANTLIB += cddb cdio crypto curl dbus-1 expat faad ffi fontconfig
+WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gthread-2.0 gtk-3 harfbuzz icudata icule
+WANTLIB += icuuc idn m mad mms mpcdec ogg pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
+WANTLIB += sndfile sndio ssl vorbis vorbisfile wavpack xcb xcb-render
+WANTLIB += xcb-shm z zip
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=deadbeef/}
 EXTRACT_SUFX = .tar.bz2
@@ -58,7 +56,7 @@ LIB_DEPENDS = archivers/libzip \
multimedia/libmms \
net/curl \
x11/dbus \
-   x11/gtk+2
+   x11/gtk+3
 
 USE_GMAKE =Yes
 USE_LIBTOOL =  gnu
@@ -81,7 +79,10 @@ CONFIGURE_ARGS +=${CONFIGURE_SHARED} \
--disable-wildmidi \
--disable-supereq \
  

Re: Enable cabal test-suites for hs-ports by default?

2012-12-04 Thread Alexander Polakov
* Predrag Punosevac  [121205 00:40]:
> On Mon, Dec 03, 2012 at 10:32:56PM +0100, Matthias Kilian wrote:
> > I'd like to add --enable-tests by default in ghc.port.mk, unless a
> > hs-ports has set NO_REGRESS=Yes.
> [...]
> 
> This is an OT. Any chance that one of you Haskell guys gets pandoc
> ported to OpenBSD.
> 
> http://johnmacfarlane.net/pandoc/
> 
> P.S. I tried installing with cabal but it just returns a slue of
> complains. 
> 

pandoc installs and works fine here on -current/i386.

-- 
Alexander Polakov | plhk.ru



Re: UPDATE: misc/dvtm

2012-12-04 Thread Stuart Henderson
On 2012/12/04 22:38, Dennis Herrmann wrote:
> [03] "warning: sprintf() is often misused, please use snprintf()"

We're not patching these in ports unless there's a serious
bug - feeding this type of fix upstream is usually the best course
of actionhowever

> + static void send_curs(Vt *t)
> + {
> + char keyseq[16];
> +-sprintf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), 
> t->curs_col);
> ++printf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), t->curs_col);
> + vt_write(t, keyseq, strlen(keyseq));
> + }
> +

in this case the patch is bogus, the intent is to print to a string,
it should either be changed to snprintf with a size limit, (and check
the return code to avoid possibly not terminating the escape sequence
properly if the string does get truncated), or (as there is a finite
maximum length the %d can expand to) use a buffer large enough to
hold the longest possible output of the sprintf.



UPDATE: misc/dvtm

2012-12-04 Thread Dennis Herrmann

# $Id: UPDATE,v 1.2 2012/11/11 10:29:47 dhn Exp $

2012-11-11 Dennis Herrmann 

 * The Maintainer has no more time to work at this port.
   So I take the maintainership now. [04]

 * Remove: "# LGPL: madtty.c" in the Makefile,
   because madtty.c is no longer a part of the package.

2012-11-10 Dennis Herrmann 

 * Update to 0.8
 * Update/Fix some patches
   - Updated: patches/patch-config_mk: [01]
   - Fix: patches/patch-dvtm_c: [02]
   - Fix: patches/patch-vt_c: [03]

[01] Update for the new release
[02] "warning: comparison is always false due to limited range of data type"
[03] "warning: sprintf() is often misused, please use snprintf()"
[04] Approved by: Emilien Gaspar  (old maintainer), (via mail)

EOF

Index: Makefile
===
RCS file: /cvs/ports/misc/dvtm/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile24 Apr 2012 19:28:31 -  1.14
+++ Makefile4 Dec 2012 21:34:28 -
@@ -2,15 +2,13 @@

 COMMENT=   tiling window management for the console

-DISTNAME=  dvtm-0.6
-REVISION=  1
+DISTNAME=  dvtm-0.8
 CATEGORIES=misc

 HOMEPAGE=  http://www.brain-dump.org/projects/dvtm/
-MAINTAINER=Emilien Gaspar 
+MAINTAINER=Dennis Herrmann 

 # MIT/X
-# LGPL: madtty.c
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/misc/dvtm/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo24 Nov 2010 08:19:24 -  1.5
+++ distinfo4 Dec 2012 21:34:28 -
@@ -1,5 +1,2 @@
-MD5 (dvtm-0.6.tar.gz) = 23ejdEho3ZGlrlrZi333CQ==
-RMD160 (dvtm-0.6.tar.gz) = GSAcgt8YpMzPRSKKoFZSnJ9KFsM=
-SHA1 (dvtm-0.6.tar.gz) = XVtcdRjq2fCLrijAgb8qu7RHKTM=
-SHA256 (dvtm-0.6.tar.gz) = lhCSLCBnjKls0tm/3o+Xu8KnvV5TbVAVxW34EkaKBIE=
-SIZE (dvtm-0.6.tar.gz) = 26542
+SHA256 (dvtm-0.8.tar.gz) = TIS3wy9s1HbvkhUMTByiEYNu0A8WyovdQImTORKzmng=
+SIZE (dvtm-0.8.tar.gz) = 27543
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/misc/dvtm/patches/patch-config_mk,v
retrieving revision 1.7
diff -u -r1.7 patch-config_mk
--- patches/patch-config_mk 24 Nov 2010 13:09:11 -  1.7
+++ patches/patch-config_mk 4 Dec 2012 21:34:28 -
@@ -1,7 +1,6 @@
-$OpenBSD: patch-config_mk,v 1.7 2010/11/24 13:09:11 jasper Exp $
 config.mk.orig Fri Oct  8 18:06:05 2010
-+++ config.mk  Wed Nov 24 09:28:42 2010
-@@ -3,15 +3,15 @@ VERSION = 0.6
+--- config.mk.orig Sat Nov 10 21:51:59 2012
 config.mk  Sat Nov 10 21:53:26 2012
+@@ -3,11 +3,12 @@

  # Customize below to fit your system

@@ -10,21 +9,22 @@
 +#PREFIX = /usr/local
 +MANPREFIX = ${PREFIX}/man

--INCS = -I. -I/usr/include -I/usr/local/include
+-INCS = -I. -I/usr/include -I/usr/local/include
 -LIBS = -lc -lutil -lncursesw
--#LIBS = -lc -lutil -lncurses
 +INCS = -I. -I/usr/include
 +#LIBS = -lc -lutil -lncursesw
 +LIBS = -lc -lutil -lncurses
+ # NetBSD
+ #LIBS = -lc -lutil -lcurses
+ # AIX
+@@ -15,9 +16,9 @@
+ # Cygwin
+ #INCS += -I/usr/include/ncurses

 -CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG
 -LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS}
 +CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG
 +LDFLAGS += -L/usr/lib ${LIBS}
-
- # Mouse handling
- CFLAGS += -DCONFIG_MOUSE
-@@ -20,4 +20,4 @@ CFLAGS += -DCONFIG_STATUSBAR

  DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall

Index: patches/patch-dvtm_c
===
RCS file: patches/patch-dvtm_c
diff -N patches/patch-dvtm_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-dvtm_c4 Dec 2012 21:34:28 -
@@ -0,0 +1,11 @@
+--- dvtm.c.origSat Nov 10 21:55:39 2012
 dvtm.c Sat Nov 10 21:55:52 2012
+@@ -408,7 +408,7 @@
+   short fg = -1, bg = -1;
+   const ColorRule *r;
+
+-  for (i = 0; i < countof(colorrules); i++) {
++  for (int i = 0; i < countof(colorrules); i++) {
+   r = &colorrules[i];
+   if (strstr(c->title, r->title)) {
+   attrs = r->attrs;
Index: patches/patch-madtty_c
===
RCS file: patches/patch-madtty_c
diff -N patches/patch-madtty_c
--- patches/patch-madtty_c  24 Apr 2012 19:28:31 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-madtty_c,v 1.1 2012/04/24 19:28:31 naddy Exp $
 madtty.c.orig  Tue Apr 24 21:20:01 2012
-+++ madtty.c   Tue Apr 24 21:22:45 2012
-@@ -47,6 +47,10 @@
-
- #include "madtty.h"
-
-+#if defined(__GNUC__) && defined(__STRICT_ANSI__)
-+#define alloca(size)  __builtin_alloca(size)
-+#endif
-+
- #ifndef NCURSES_ATTR_SHIFT
- # define NCURSES_ATTR_SHIFT 8
- #endif
Index: patches/patch-vt_c
=

Re: UPDATE: audio/deadbeef

2012-12-04 Thread Brad Smith
On Wed, Dec 05, 2012 at 12:15:11AM +0600, Alexandr Shadchin wrote:
> On Mon, Dec 03, 2012 at 09:16:48PM -0500, Brad Smith wrote:
> > On Fri, Nov 30, 2012 at 11:28:12AM +, Stuart Henderson wrote:
> > > On 2012/11/30 05:47, Brad Smith wrote:
> > > > - Original message -
> > > > > On 2012/11/28 23:14, Brad Smith wrote:
> > > > > > On Thu, Nov 29, 2012 at 12:14:33AM +0600, Alexandr Shadchin wrote:
> > > > > > > On Mon, Nov 19, 2012 at 11:33:09PM +0600, Alexandr Shadchin wrote:
> > > > > > > > Hi,
> > > > > > > > 
> > > > > > > > This update package deadbeef to the latest release 0.5.6.
> > > > > > > > Tested on amd64.
> > > > > > > > 
> > > > > > > > Split package on -main, -gtk2 and -gtk3.
> > > > > > > > Please make review this change.
> > > > > > > > 
> > > > > > > > Comments ? OK ?
> > > > > > > > 
> > > > > > > 
> > > > > > > Fix BUILD_DEPENDS.
> > > > > > 
> > > > > > The gtk2 sub-package should have a @pkgpath marker so upgrading
> > > > > > from the older package to the new main + gtk2 package set will
> > > > > > have the expected result.
> > > > > 
> > > > > good luck getting that to work ;)
> > > > 
> > > > Am I crazy for expecting that to actually work? I was fairly
> > > > certain it would but maybe it is another thing with the pkg tools
> > > > that doesn't work.
> > > 
> > > The gtk2 package is named deadbeef-gtk2-0.5.6, so it isn't considered
> > > as a replacement for deadbeef-0.5.5, so pkg_add -u doesn't consult the
> > > deadbeef-gtk2 package at all to even see the @pkgpath line.
> > > 
> > > One thing that could be done would be to name the -main package
> > > something like deadbeef-core-0.5.6, name the -gtk2 package deadbeef-0.5.6,
> > > remove @pkgpath in PLIST-main, add @pkgpath in PLIST-gtk2, and add 
> > > @conflicts
> > > as necessary.
> > 
> > Ewww. That's pretty awful.
> > 
> > > More than this would need Quirks.pm to be able to do version comparisons
> > > rather than the fast hash lookups, but doing those checks for every
> > > updated package will slow down pkg_add -u ..
> > 
> > Or better yet get rid of the nonsense of splitting up the port and
> > not having to worry about this stuff at all.
> > 
> 
> I agree, splitting brings more problems. Update diff.

I see a lot of patches for this port. Have you approached the author
about pushing these upstream? Specifically the sndio backend and
the patches to remove versioning for the plugins to start off with.

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



text/hs-pandoc (was: Enable cabal test-suites for hs-ports by default?)

2012-12-04 Thread Matthias Kilian
On Tue, Dec 04, 2012 at 02:38:02PM -0500, Predrag Punosevac wrote:
> This is an OT. Any chance that one of you Haskell guys gets pandoc
> ported to OpenBSD.
> 
> http://johnmacfarlane.net/pandoc/

Looking at http://hackage.haskell.org/package/pandoc, there are a
couple of dependencies currently not in our ports tree (at least
citeproc-hs, highlighting-kate, json, pandoc-types, temporary,
texmath, and everything those depend on).

This may be an easy job, or it may open a whole can of worms.

> P.S. I tried installing with cabal but it just returns a slue of
> complains. 

Can you send me some logs? Using cabal (the program, from package
"cabal-install") should work. If it doesn't, there's some bug either
in pandoc or some of its dependencies, or in our ghc / hs-* ports.

Ciao,
Kili



Re: Enable cabal test-suites for hs-ports by default?

2012-12-04 Thread Predrag Punosevac
On Mon, Dec 03, 2012 at 10:32:56PM +0100, Matthias Kilian wrote:
> I'd like to add --enable-tests by default in ghc.port.mk, unless a
> hs-ports has set NO_REGRESS=Yes.
[...]

This is an OT. Any chance that one of you Haskell guys gets pandoc
ported to OpenBSD.

http://johnmacfarlane.net/pandoc/

I use txt2tags in general but there are few situations where I would
like to be able to use pandoc (yes I know it is available on-line). 

Thank,
Predrag

P.S. I tried installing with cabal but it just returns a slue of
complains. 



ruby-dbm 1.9

2012-12-04 Thread Jeremy Evans
Starting in ruby 1.9.3, ruby's dbm extension picks up the libc db code
and does not use databases/db4, so fix the dependencies.

Because of this, I plan to drop the separate package for the dbm
extension in ruby 2.0.  I debated doing that for ruby 1.9, but concluded
that it was not worth the effort.

OKs?

Jeremy 

Index: Makefile
===
RCS file: /cvs/ports/lang/ruby/1.9/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile20 Nov 2012 16:52:32 -  1.30
+++ Makefile4 Dec 2012 17:33:50 -
@@ -17,6 +17,8 @@ PKGNAME-dbm = ruby-dbm-${VERSION}.${PAT
 PKGNAME-tk =   ruby-tk-${VERSION}.${PATCHLEVEL}
 PKGNAME-ri_docs =  ruby-ri_docs-${VERSION}.${PATCHLEVEL}
 
+REVISION-dbm = 0
+
 PKG_ARCH-ri_docs = *
 WANTLIB-ri_docs =  # empty
 
@@ -60,9 +62,8 @@ LIB_DEPENDS-gdbm =databases/gdbm \
lang/ruby/${REV},-main>=${VERSION}.${PATCHLEVEL},<1.10
 RUN_DEPENDS-gdbm = 
 
-WANTLIB-dbm =  c m db pthread ruby19
-LIB_DEPENDS-dbm =  databases/db/v4 \
-   lang/ruby/${REV},-main>=${VERSION}.${PATCHLEVEL},<1.10
+WANTLIB-dbm =  c m pthread ruby19
+LIB_DEPENDS-dbm =  lang/ruby/${REV},-main>=${VERSION}.${PATCHLEVEL},<1.10
 RUN_DEPENDS-dbm =  
  
 .if !${FLAVOR:Mno_x11}



Re: Enable cabal test-suites for hs-ports by default?

2012-12-04 Thread Matthias Kilian
On Mon, Dec 03, 2012 at 10:32:56PM +0100, Matthias Kilian wrote:
> I'd like to add --enable-tests by default in ghc.port.mk, unless a
> hs-ports has set NO_REGRESS=Yes.
[...]

Ignore this for now. Amit Kulkarni suggested to change the behaviour
of Cabal (and push this upstream), and I'll have a look at the code
to check how difficult this would be.

Ciao,
Kili



Re: UPDATE: audio/deadbeef

2012-12-04 Thread Alexandr Shadchin
On Mon, Dec 03, 2012 at 09:16:48PM -0500, Brad Smith wrote:
> On Fri, Nov 30, 2012 at 11:28:12AM +, Stuart Henderson wrote:
> > On 2012/11/30 05:47, Brad Smith wrote:
> > > - Original message -
> > > > On 2012/11/28 23:14, Brad Smith wrote:
> > > > > On Thu, Nov 29, 2012 at 12:14:33AM +0600, Alexandr Shadchin wrote:
> > > > > > On Mon, Nov 19, 2012 at 11:33:09PM +0600, Alexandr Shadchin wrote:
> > > > > > > Hi,
> > > > > > > 
> > > > > > > This update package deadbeef to the latest release 0.5.6.
> > > > > > > Tested on amd64.
> > > > > > > 
> > > > > > > Split package on -main, -gtk2 and -gtk3.
> > > > > > > Please make review this change.
> > > > > > > 
> > > > > > > Comments ? OK ?
> > > > > > > 
> > > > > > 
> > > > > > Fix BUILD_DEPENDS.
> > > > > 
> > > > > The gtk2 sub-package should have a @pkgpath marker so upgrading
> > > > > from the older package to the new main + gtk2 package set will
> > > > > have the expected result.
> > > > 
> > > > good luck getting that to work ;)
> > > 
> > > Am I crazy for expecting that to actually work? I was fairly
> > > certain it would but maybe it is another thing with the pkg tools
> > > that doesn't work.
> > 
> > The gtk2 package is named deadbeef-gtk2-0.5.6, so it isn't considered
> > as a replacement for deadbeef-0.5.5, so pkg_add -u doesn't consult the
> > deadbeef-gtk2 package at all to even see the @pkgpath line.
> > 
> > One thing that could be done would be to name the -main package
> > something like deadbeef-core-0.5.6, name the -gtk2 package deadbeef-0.5.6,
> > remove @pkgpath in PLIST-main, add @pkgpath in PLIST-gtk2, and add 
> > @conflicts
> > as necessary.
> 
> Ewww. That's pretty awful.
> 
> > More than this would need Quirks.pm to be able to do version comparisons
> > rather than the fast hash lookups, but doing those checks for every
> > updated package will slow down pkg_add -u ..
> 
> Or better yet get rid of the nonsense of splitting up the port and
> not having to worry about this stuff at all.
> 

I agree, splitting brings more problems. Update diff.

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile10 Aug 2012 17:25:01 -  1.2
+++ Makefile4 Dec 2012 18:02:40 -
@@ -3,8 +3,7 @@
 SHARED_ONLY =  Yes
 
 COMMENT =  DeaDBeeF is an audio player
-DISTNAME = deadbeef-0.5.5
-REVISION = 0
+DISTNAME = deadbeef-0.5.6
 CATEGORIES =   audio
 
 HOMEPAGE = http://deadbeef.sourceforge.net/
@@ -16,16 +15,15 @@ PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
 WANTLIB += FLAC GL ICE Imlib2 SM X11 Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 avcodec
-WANTLIB += avformat avutil bz2 c cairo cddb cdio crypto curl dbus-1
-WANTLIB += expat faad ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0
-WANTLIB += gtk-x11-2.0 idn m mad mms mp3lame mpcdec ogg orc-0.4
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
+WANTLIB += atspi avcodec avformat avutil c cairo cairo-gobject
+WANTLIB += cddb cdio crypto curl dbus-1 expat faad ffi fontconfig
+WANTLIB += freetype gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 gtk-x11-2.0
+WANTLIB += harfbuzz icudata icule icuuc idn m mad mms mpcdec ogg
 WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread pthread-stubs schroedinger-1.0 sndfile
-WANTLIB += sndio speex ssl theoradec theoraenc vorbis vorbisenc
-WANTLIB += vorbisfile vpx wavpack x264 xcb xcb-render xcb-shm
-WANTLIB += xvidcore z zip
+WANTLIB += png pthread pthread-stubs sndfile sndio ssl vorbis
+WANTLIB += vorbisfile wavpack xcb xcb-render xcb-shm z zip
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=deadbeef/}
 EXTRACT_SUFX = .tar.bz2
@@ -58,7 +56,8 @@ LIB_DEPENDS = archivers/libzip \
multimedia/libmms \
net/curl \
x11/dbus \
-   x11/gtk+2
+   x11/gtk+2 \
+   x11/gtk+3
 
 USE_GMAKE =Yes
 USE_LIBTOOL =  gnu
@@ -81,7 +80,9 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--disable-wildmidi \
--disable-supereq \
--disable-src \
-   --disable-mono2stereo
+   --disable-mono2stereo \
+   --disable-abstract-socket \
+   --enable-ffmpeg
 CONFIGURE_ENV +=   CPPFLAGS='-I${LOCALBASE}/lib/libzip/include 
-I${X11BASE}/include' \
LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
 
Index: distinfo
=

Re: Cfengine 3.4.0 segfaults (rthreads?)

2012-12-04 Thread Martijn Rijkeboer
Hi,

> I'm working on updating sysutils/cfengine to 3.4.0 (see attachment for
> port). When running cf-agent it segfaults on both 5.2/amd64 and
> current/amd64. In gdb, on current/amd64, it looks like the segfault
> happens in the rthread library.

Using git bisect I've found that the following commit introduces the
segfault and not rthreads:
https://github.com/cfengine/core/commit/6746590d2c00766ce7a8e12ac3cf0aeb60fef37f

Unfortunately this is a rather big change. Can anyone with better C skills
point me in the right direction?

Kind regards,


Martijn Rijkeboer