Re: WIP: VLC 2.0.0rc1

[Brad Smith]

On 01/02/12 7:20 AM, Brett wrote:

Hi,
One issue when building, I had to remove the line with libdvdread_plugin.so 
from PLIST-main, otherwise it would not build (see below). I could hear the 
popping noises you mentioned, but only when I turned the volume control above 
100%.
Brett.

[...]
if test x86_64-unknown-openbsd5.1 = x86_64-unknown-openbsd5.1; then \
 
LD_LIBRARY_PATH=/usr/ports/pobj/vlc-2.0.0-rc1/fake-amd64/usr/local/lib:$LD_LIBRARY_PATH
 \
 
/usr/ports/pobj/vlc-2.0.0-rc1/fake-amd64/usr/local/lib/vlc/vlc-cache-gen \
  
/usr/ports/pobj/vlc-2.0.0-rc1/fake-amd64/usr/local/lib/vlc/plugins ; \
else \
 echo Cross-compilation: cache generation skipped! ; \
fi
gmake[4]: Leaving directory `/usr/ports/pobj/vlc-2.0.0-rc1/vlc-2.0.0-rc1'
gmake[3]: Nothing to be done for `install-data-am'.
gmake[3]: Leaving directory `/usr/ports/pobj/vlc-2.0.0-rc1/vlc-2.0.0-rc1'
gmake[2]: Leaving directory `/usr/ports/pobj/vlc-2.0.0-rc1/vlc-2.0.
0-rc1'
gmake[1]: Leaving directory `/usr/ports/pobj/vlc-2.0.0-rc1/vlc-2.0.0-rc1'
===   Building package for vlc-2.0.0-rc1
Create /usr/ports/packages/amd64/all/vlc-2.0.0-rc1.tgz
Error: 
/usr/ports/pobj/vlc-2.0.0-rc1/fake-amd64/usr/local/lib/vlc/plugins/access/libdvdread_plugin.so
 does not exist
Fatal error: can't continue
  at /usr/libdata/perl5/OpenBSD/PkgCreate.pm line 1259
*** Error code 1


Ah, ok. It wants the newer libdvdread which I posted about here..

http://marc.info/?l=openbsd-portsm=132528121723235w=2

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

Re: devel/glib2 broken by rthread?

[Brad Smith]

On 15/02/12 11:03 AM, Joachim Schipper wrote:

Hi,

Just for fun, I've put dpb to work after updating to just past the
rthread commit and building from source. It appears that devel/glib2
does not build for me:

...
checking for thread implementation... posix
checking thread related cflags... -D_REENTRANT
checking for pthread_create/pthread_join... no
checking for pthread_create/pthread_join in -lpthread... no
checking for pthread_create/pthread_join in -lpthread32... no
checking for pthread_create/pthread_join in -lpthreads... no
checking for pthread_create/pthread_join in -lthread... no
checking for pthread_create/pthread_join in -ldce... no
configure: error: I can't find the libraries for the thread implementation
 posix. Please choose another thread implementation or
 provide information on your thread implementation.
 You can also run 'configure --disable-threads'
 to compile without thread support.
*** Error code 1

Build log attached. This is mainly a heads-up, I'll try to debug this
when/if I find the time (currently supposed to be working...)

Joachim


You need to send the config.log file. What you sent is mostly useless.
Also I cannot reproduce this.

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

UPDATE: automake 1.11.3

[Brad Smith]

Here is an update to automake 1.11.3.

Tested with everything in the tree using 1.11.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/automake/1.11/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile20 Jun 2011 20:28:44 -  1.5
+++ Makefile17 Feb 2012 06:37:39 -
@@ -3,8 +3,7 @@
 COMMENT=   GNU standards-compliant Makefile generator
 
 VERSION=   1.11
-DISTNAME=  automake-${VERSION}.1
-REVISION=  2
+DISTNAME=  automake-${VERSION}.3
 PKGSPEC=   automake-=${VERSION},1.12
 
 CATEGORIES=devel
@@ -23,7 +22,7 @@ MODULES=  lang/python
 MODPY_BUILDDEP=No
 MODPY_RUNDEP=  No
 
-AUTOCONF_VERSION=  2.65
+AUTOCONF_VERSION=  2.68
 
 BUILD_DEPENDS =${RUN_DEPENDS}
 RUN_DEPENDS=   ${MODGNU_AUTOCONF_DEPENDS}
@@ -48,14 +47,13 @@ REGRESS_DEPENDS=${BASE_PKGPATH} \
editors/emacs21 \
devel/dejagnu
 
-TESTS_ENVIRONMENT= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+REGRESS_ENV=   AUTOCONF_VERSION=${AUTOCONF_VERSION} \
MAKE=${GMAKE}
 
 do-regress:
ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
@cd ${WRKBUILD}  \
-   exec ${SETENV} ${MAKE_ENV} \
-   TESTS_ENVIRONMENT=${TESTS_ENVIRONMENT} \
+   exec ${SETENV} ${MAKE_ENV} ${REGRESS_ENV} \
${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} \
-f ${MAKE_FILE} ${REGRESS_TARGET}
 
@@ -69,7 +67,7 @@ post-install:
perl -pi -e s,aclocal\: \(automake\),aclocal: \(automake-1\.11\), \
${PREFIX}/info/automake${SUFFIX}.info
 
-.for f in info-1 info-2
+.for f in info-1 info-2 info-3
cd ${PREFIX}/info  mv automake.${f} automake${SUFFIX}.${f} \
 perl -pi -e s,automake.${f},automake${SUFFIX}.${f}, \
${PREFIX}/info/automake${SUFFIX}.info
Index: distinfo
===
RCS file: /home/cvs/ports/devel/automake/1.11/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo5 May 2011 18:55:34 -   1.1.1.1
+++ distinfo13 Feb 2012 00:49:25 -
@@ -1,5 +1,5 @@
-MD5 (automake-1.11.1.tar.gz) = Tufw/18ORn1Ytr1dqWscdA==
-RMD160 (automake-1.11.1.tar.gz) = Ovo77cMb5Jn5PZz4xiLYSvqff+c=
-SHA1 (automake-1.11.1.tar.gz) = 3GC4fXIM0mafPi4WWdkEs4MUnEA=
-SHA256 (automake-1.11.1.tar.gz) = t7N8DA8JoobPVcrUCNdK75d3TXPXRMiMOW/3lXBF1Ms=
-SIZE (automake-1.11.1.tar.gz) = 1383931
+MD5 (automake-1.11.3.tar.gz) = k+yzGfA2XLgBmQsA9ljQJg==
+RMD160 (automake-1.11.3.tar.gz) = vUuJgbRaaacCvQ+VC/zsBxfP9FU=
+SHA1 (automake-1.11.3.tar.gz) = U39ZZLt+x9DfZUTj0Q2WMf50YPA=
+SHA256 (automake-1.11.3.tar.gz) = khtRiAV+V73ZwLoG4h0LDqfa+mGpvQiisEEhW8/xL1U=
+SIZE (automake-1.11.3.tar.gz) = 1620860
Index: patches/patch-automake_in
===
RCS file: /home/cvs/ports/devel/automake/1.11/patches/patch-automake_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-automake_in
--- patches/patch-automake_in   5 May 2011 18:55:34 -   1.1.1.1
+++ patches/patch-automake_in   17 Feb 2012 03:28:21 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-automake_in,v 1.1.1.1 2011/05/05 18:55:34 jasper Exp $
 automake.in.orig   Tue Dec  8 19:15:40 2009
-+++ automake.inThu May  5 19:57:31 2011
-@@ -4337,7 +4337,7 @@ sub handle_configure ($$$@)
+--- automake.in.orig   Wed Feb  1 05:31:13 2012
 automake.inThu Feb 16 22:24:10 2012
+@@ -4384,7 +4384,7 @@ sub handle_configure ($$$@)
# Use $(install_sh), not $(MKDIR_P) because the latter requires
# at least one argument, and $(mkinstalldirs) used to work
# even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
@@ -10,7 +10,7 @@ $OpenBSD: patch-automake_in,v 1.1.1.1 20
  }
  
reject_var ('CONFIG_HEADER',
-@@ -5240,6 +5240,7 @@ sub scan_autoconf_traces ($)
+@@ -5337,6 +5337,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG = 0,
m4_include = 1,
m4_sinclude = 1,
@@ -18,7 +18,7 @@ $OpenBSD: patch-automake_in,v 1.1.1.1 20
sinclude = 1,
  );
  
-@@ -5263,6 +5264,7 @@ sub scan_autoconf_traces ($)
+@@ -5360,6 +5361,7 @@ sub scan_autoconf_traces ($)
my ($here, $depth, @args) = split (/::/);
$where = new Automake::Location $here;
my $macro = $args[0];
Index: patches/patch-doc_automake_texi
===
RCS file: /home/cvs/ports/devel/automake/1.11/patches/patch-doc_automake_texi,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-doc_automake_texi
--- patches/patch-doc_automake_texi 5 May 2011 18:55:34 -   1.1.1.1
+++ patches/patch-doc_automake_texi 17 Feb 2012 03:28:30 -
@@ -1,6 +1,6 @@
 $OpenBSD: 

Re: [NEW] libbluray

[Brad Smith]

On 19/02/12 7:26 AM, Peter Hessler wrote:

On 2012 Jan 26 (Thu) at 05:01:02 -0500 (-0500), Brad wrote:
:On 26/01/12 4:12 AM, Peter Hessler wrote:
:Upstream released a real version of libbluray.  I updated the port
:submission and the mplayer patch.
:
:Also, I am including libaacs, which is a research project to implement
:the Advanced Access Content System specification.
:
:The below caveat still applies.
:
:OK?
:
:I think these ports would be better suited to the multimedia category.
:
:Make use of the iconv / gettext MODULES as appropriate.
:
:For libaacs it looks like you can remove the CONFIGURE_ARGS as
:what is there is the default.
:
:The MPlayer diff looks like its missing a WANTLIB update.


Updated ports attached.

OK?


Looks good with me.

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

Re: [NEW] libbluray

[Brad Smith]

On 21/02/12 2:57 PM, Brad Smith wrote:

On 19/02/12 7:26 AM, Peter Hessler wrote:

On 2012 Jan 26 (Thu) at 05:01:02 -0500 (-0500), Brad wrote:
:On 26/01/12 4:12 AM, Peter Hessler wrote:
:Upstream released a real version of libbluray. I updated the port
:submission and the mplayer patch.
:
:Also, I am including libaacs, which is a research project to implement
:the Advanced Access Content System specification.
:
:The below caveat still applies.
:
:OK?
:
:I think these ports would be better suited to the multimedia category.
:
:Make use of the iconv / gettext MODULES as appropriate.
:
:For libaacs it looks like you can remove the CONFIGURE_ARGS as
:what is there is the default.
:
:The MPlayer diff looks like its missing a WANTLIB update.


Updated ports attached.

OK?


Looks good with me.


Doh. You almost had libaacs. For libaacs remove intl from WANTLIB and
replace the iconv module with gettext.

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

Re: UPDATE: libdvdread 4.2.0 / libdvdnav 4.2.0

[Brad Smith]

On 30/12/11 4:34 PM, Brad wrote:

Here is an update to libdvdread 4.2.0 and libdvdnav 4.2.0 and
adjustments for various dependencies. This also allows enabling
the use of external copies of libdvdread/libdvdnav for MPlayer.

Tested with a handful of DVDs on amd64 with VLC/Xine-ui/MPlayer.


Forgot to mention also testing Ogle.


http://comstyle.com/ports/libdvdread/


Still looking for some testing.

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

WIP: libvpx update - need help debugging build problem

[Brad Smith]

Here is what I have started with towards updating libvpx but I'm looking for
some assistance with trying to figure out where/why the build is failing
trying to call this libvpx.so target.


Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libvpx/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile17 Mar 2011 16:54:16 -  1.7
+++ Makefile30 Jan 2012 02:10:24 -
@@ -2,14 +2,14 @@
 
 COMMENT=   Google VP8 video codec
 
-V= 0.9.6
+V= 1.0.0
 DISTNAME=  libvpx-v${V}
 PKGNAME=   libvpx-${V}
 CATEGORIES=multimedia
 MASTER_SITES=  http://webm.googlecode.com/files/
 EXTRACT_SUFX=  .tar.bz2
 
-SHARED_LIBS=   vpx 2.0
+SHARED_LIBS=   vpx 3.0
 
 HOMEPAGE=  http://www.webmproject.org/
 
@@ -20,6 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
+
 WANTLIB=   c m pthread
 
 BUILD_DEPENDS+=shells/bash
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/libvpx/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo17 Mar 2011 16:54:16 -  1.3
+++ distinfo30 Jan 2012 02:10:39 -
@@ -1,5 +1,5 @@
-MD5 (libvpx-v0.9.6.tar.bz2) = OD8/B6dgmWgqu0P3m2krcg==
-RMD160 (libvpx-v0.9.6.tar.bz2) = uFA4uS2RGymzuRLD1xxg4T+JpVE=
-SHA1 (libvpx-v0.9.6.tar.bz2) = o1Ir0rc9Ujgbp2fe0cv0dg6cxvg=
-SHA256 (libvpx-v0.9.6.tar.bz2) = KL2KjvIW+1cJEvDTeGaAUdmWgb8Tc1tZ5ooSrXnyqnM=
-SIZE (libvpx-v0.9.6.tar.bz2) = 1230418
+MD5 (libvpx-v1.0.0.tar.bz2) = 2Ye1FAQS7dN9LGsQwprUhA==
+RMD160 (libvpx-v1.0.0.tar.bz2) = LuWi5/TLLxJsbQ2aNuhjZFX0KRU=
+SHA1 (libvpx-v1.0.0.tar.bz2) = KRnhEHT+9y/GHvGnUWAFD/qtYHQ=
+SHA256 (libvpx-v1.0.0.tar.bz2) = B87bChmkTm2B119S7qhk9Z7xDGxyXLhgQxvsZkHq/iE=
+SIZE (libvpx-v1.0.0.tar.bz2) = 1641411
Index: patches/patch-build_make_Makefile
===
RCS file: /home/cvs/ports/multimedia/libvpx/patches/patch-build_make_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_make_Makefile
--- patches/patch-build_make_Makefile   4 Oct 2010 23:56:16 -   1.1.1.1
+++ patches/patch-build_make_Makefile   30 Jan 2012 02:13:26 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-build_make_Makefile,v 1.1.1.1 2010/10/04 23:56:16 ckuethe Exp $
 build/make/Makefile.orig   Thu Sep  2 14:56:47 2010
-+++ build/make/MakefileSat Sep 25 16:48:26 2010
-@@ -222,8 +222,7 @@ define so_template
+--- build/make/Makefile.orig   Fri Jan 27 13:36:39 2012
 build/make/MakefileSun Jan 29 21:11:03 2012
+@@ -247,8 +247,7 @@ define so_template
  # This needs further abstraction for dealing with non-GNU linkers.
  $(1):
$(if $(quiet),@echo [LD] $$@)
@@ -11,7 +11,7 @@ $OpenBSD: patch-build_make_Makefile,v 1.
  -Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \
  $$(filter %.o,$$?) $$(extralibs)
  endef
-@@ -291,7 +290,7 @@ LIBS=$(call enabled,LIBS)
+@@ -316,7 +315,7 @@ LIBS=$(call enabled,LIBS)
  .libs: $(LIBS)
@touch $@
  $(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib
Index: patches/patch-build_make_configure_sh
===
RCS file: 
/home/cvs/ports/multimedia/libvpx/patches/patch-build_make_configure_sh,v
retrieving revision 1.3
diff -u -p -r1.3 patch-build_make_configure_sh
--- patches/patch-build_make_configure_sh   17 Mar 2011 16:54:16 -  
1.3
+++ patches/patch-build_make_configure_sh   30 Jan 2012 02:13:24 -
@@ -1,25 +1,16 @@
 $OpenBSD: patch-build_make_configure_sh,v 1.3 2011/03/17 16:54:16 edd Exp $
 build/make/configure.sh.orig   Fri Mar  4 15:40:37 2011
-+++ build/make/configure.shTue Mar  8 21:12:29 2011
+--- build/make/configure.sh.orig   Fri Jan 27 13:36:39 2012
 build/make/configure.shSun Jan 29 21:13:12 2012
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${BASH}
  ##
  ##  configure.sh
  ##
-@@ -880,8 +880,6 @@ process_common_toolchain() {
- esac
- ;;
- gcc*)
--add_cflags  -m${bits}
--add_ldflags -m${bits}
- link_with_cc=gcc
- tune_cflags=-march=
- setup_gnu_toolchain
-@@ -975,7 +973,7 @@ EOF
- if enabled multithread; then
+@@ -1019,7 +1019,7 @@ EOF
  case ${toolchain} in
  *-win*);;
+ *-android-gcc);;
 -*) check_header pthread.h  add_extralibs -lpthread
 +*) check_header pthread.h  add_extralibs -pthread
  esac
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/multimedia/libvpx/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure
--- patches/patch-configure 17 Mar 2011 

UPDATE: SDL 1.2.15

[Brad Smith]

Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
a few more. .15 should have resolved the XRandR issue that was reported
with .14. So please test and let me know how it goes.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile22 Feb 2012 08:22:39 -  1.81
+++ Makefile22 Feb 2012 19:46:31 -
@@ -2,11 +2,13 @@
 
 COMMENT=   cross-platform multimedia library
 
-VERSION=   1.2.13
+VERSION=   1.2.15
 DISTNAME=  SDL-${VERSION}
 PKGNAME=   ${DISTNAME:L}
-REVISION = 17
 CATEGORIES=devel
+MASTER_SITES=  ${HOMEPAGE}release/
+
+SHARED_LIBS=   SDL 8.0
 
 HOMEPAGE=  http://www.libsdl.org/
 
@@ -17,37 +19,23 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=   m sndio usbhid
 
-MASTER_SITES=  ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/ \
-   ${HOMEPAGE}release/
-MASTER_SITES0= http://dev.beastie.hu/ \
-   http://www.beastie.hu/
+WANTLIB=   m sndio usbhid
+
+MODULES=   converters/libiconv
 
 .if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=devel/yasm
+BUILD_DEPENDS+=devel/nasm
 .endif
 
-FLAVORS=   aa caca no_x11 altivec
+FLAVORS=   aa no_x11
 FLAVOR?=
 
+USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
-USE_GROFF =Yes
-MODULES=   converters/libiconv
-
 SEPARATE_BUILD=concurrent
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS=  ${WRKSRC} ${WRKSRC}/test
-SHARED_LIBS=   SDL 8.0
-CONFIGURE_ENV+=X11BASE=${X11BASE} \
-   CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
-   LDFLAGS=-L${LOCALBASE}/lib \
-   WITH_SNDIO=Yes
-
-# in case devel/usb is installed, don't pick it up.
-CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
-   ac_cv_header_usb_h=no
-
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 --disable-arts \
 --disable-esd \
@@ -55,36 +43,29 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 --disable-pulseaudio \
 --enable-nasm \
 --enable-pthread-sem
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
+   LDFLAGS=-L${LOCALBASE}/lib \
+   WITH_SNDIO=Yes
+
+# in case devel/usb is installed, don't pick it up.
+CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
+   ac_cv_header_usb_h=no
 
 .if ${FLAVOR:L:Maa}
+WANTLIB+=  aa
 LIB_DEPENDS+=  graphics/aalib
-WANTLIB += aa
 CONFIGURE_ARGS+= --enable-video-aalib
-.else
-CONFIGURE_ARGS+= --disable-video-aalib
-.endif
-
-.if ${FLAVOR:L:Mcaca}
-PATCH_DIST_STRIP= -p1
-PATCHFILES=patch-libsd1.2.7-libcaca0.9.diff:0
-LIB_DEPENDS+=  graphics/libcaca
-WANTLIB += caca
-CONFIGURE_ARGS+= --enable-video-caca
-.else
-SUPDISTFILES+= patch-libsd1.2.7-libcaca0.9.diff:0
 .endif
 
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-x \
 --disable-video-x11
-.else
-WANTLIB+=  X11=10 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
 .endif
 
 NO_REGRESS=Yes
 
 pre-configure:
-   mkdir -p ${WRKSRC}/src/audio/libsndio
-   cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
+   @mkdir -p ${WRKSRC}/src/audio/libsndio
+   @cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/devel/sdl/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo3 Jan 2008 17:39:40 -   1.17
+++ distinfo22 Feb 2012 19:40:46 -
@@ -1,10 +1,10 @@
-MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
+MD5 (SDL-1.2.15.tar.gz) = nZbfhBdXKir7eBp8TIEahQ==
 MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
-RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
+RMD160 (SDL-1.2.15.tar.gz) = 1IAqCQy0ok7rDIzlaQgC9ZbTlMM=
 RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
-SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
+SHA1 (SDL-1.2.15.tar.gz) = DF8ZPO2BCw1846sG2AjLte7wOiw=
 SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
-SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
+SHA256 (SDL-1.2.15.tar.gz) = 1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=
 SHA256 (patch-libsd1.2.7-libcaca0.9.diff) = 
fnf1KYlqBfccSHTtjR9npVtt976i2zFrClxN/ejoAS8=
-SIZE (SDL-1.2.13.tar.gz) = 3373673
+SIZE (SDL-1.2.15.tar.gz) = 3920622
 SIZE (patch-libsd1.2.7-libcaca0.9.diff) = 28259
Index: patches/patch-Makefile_in
===
RCS file: /home/cvs/ports/devel/sdl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   22 Sep 2007 01:12:38 -  1.3
+++ patches/patch-Makefile_in   

Re: UPDATE: SDL 1.2.15

[Brad Smith]

On Wed, Feb 22, 2012 at 02:58:25PM -0500, Brad Smith wrote:
 Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
 a few more. .15 should have resolved the XRandR issue that was reported
 with .14. So please test and let me know how it goes.

An updated diff rolling in 3 fixes from upstream and two minor tweaks to the
port..

Fixed bug 1390 - X11_KeyToUnicode
Fixed bug 1424 - Handling of alpha channel in Altivec accelerated blit functions
Fixed bug 1427 - integer passed to XChangeProperty() causes crash


Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile22 Feb 2012 08:22:39 -  1.81
+++ Makefile22 Feb 2012 20:21:13 -
@@ -2,11 +2,13 @@
 
 COMMENT=   cross-platform multimedia library
 
-VERSION=   1.2.13
+VERSION=   1.2.15
 DISTNAME=  SDL-${VERSION}
 PKGNAME=   ${DISTNAME:L}
-REVISION = 17
 CATEGORIES=devel
+MASTER_SITES=  ${HOMEPAGE}release/
+
+SHARED_LIBS=   SDL 8.0
 
 HOMEPAGE=  http://www.libsdl.org/
 
@@ -17,30 +19,29 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=   m sndio usbhid
 
-MASTER_SITES=  ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/ \
-   ${HOMEPAGE}release/
-MASTER_SITES0= http://dev.beastie.hu/ \
-   http://www.beastie.hu/
+WANTLIB=   m sndio usbhid
+
+MODULES=   converters/libiconv
 
 .if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=devel/yasm
+BUILD_DEPENDS+=devel/nasm
 .endif
 
-FLAVORS=   aa caca no_x11 altivec
+FLAVORS=   aa no_x11
 FLAVOR?=
 
+USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
-USE_GROFF =Yes
-MODULES=   converters/libiconv
-
 SEPARATE_BUILD=concurrent
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS=  ${WRKSRC} ${WRKSRC}/test
-SHARED_LIBS=   SDL 8.0
-CONFIGURE_ENV+=X11BASE=${X11BASE} \
-   CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+--disable-arts \
+--disable-esd \
+--disable-oss \
+--disable-pulseaudio
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
WITH_SNDIO=Yes
 
@@ -48,43 +49,21 @@ CONFIGURE_ENV+= X11BASE=${X11BASE} \
 CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
ac_cv_header_usb_h=no
 
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
---disable-arts \
---disable-esd \
---disable-oss \
---disable-pulseaudio \
---enable-nasm \
---enable-pthread-sem
-
 .if ${FLAVOR:L:Maa}
+WANTLIB+=  aa
 LIB_DEPENDS+=  graphics/aalib
-WANTLIB += aa
 CONFIGURE_ARGS+= --enable-video-aalib
-.else
-CONFIGURE_ARGS+= --disable-video-aalib
-.endif
-
-.if ${FLAVOR:L:Mcaca}
-PATCH_DIST_STRIP= -p1
-PATCHFILES=patch-libsd1.2.7-libcaca0.9.diff:0
-LIB_DEPENDS+=  graphics/libcaca
-WANTLIB += caca
-CONFIGURE_ARGS+= --enable-video-caca
-.else
-SUPDISTFILES+= patch-libsd1.2.7-libcaca0.9.diff:0
 .endif
 
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-x \
 --disable-video-x11
-.else
-WANTLIB+=  X11=10 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
 .endif
 
 NO_REGRESS=Yes
 
 pre-configure:
-   mkdir -p ${WRKSRC}/src/audio/libsndio
-   cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
+   @mkdir -p ${WRKSRC}/src/audio/libsndio
+   @cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/devel/sdl/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo3 Jan 2008 17:39:40 -   1.17
+++ distinfo22 Feb 2012 19:40:46 -
@@ -1,10 +1,10 @@
-MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
+MD5 (SDL-1.2.15.tar.gz) = nZbfhBdXKir7eBp8TIEahQ==
 MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
-RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
+RMD160 (SDL-1.2.15.tar.gz) = 1IAqCQy0ok7rDIzlaQgC9ZbTlMM=
 RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
-SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
+SHA1 (SDL-1.2.15.tar.gz) = DF8ZPO2BCw1846sG2AjLte7wOiw=
 SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
-SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
+SHA256 (SDL-1.2.15.tar.gz) = 1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=
 SHA256 (patch-libsd1.2.7-libcaca0.9.diff) = 
fnf1KYlqBfccSHTtjR9npVtt976i2zFrClxN/ejoAS8=
-SIZE (SDL-1.2.13.tar.gz) = 3373673
+SIZE (SDL-1.2.15.tar.gz) = 3920622
 SIZE (patch-libsd1.2.7-libcaca0.9.diff) = 28259
Index: patches/patch-Makefile_in

Re: WIP: libvpx update - need help debugging build problem

[Brad Smith]

On 23/02/12 4:36 AM, David Coppa wrote:

On Wed, Feb 22, 2012 at 7:06 PM, Brad Smithb...@comstyle.com  wrote:

Here is what I have started with towards updating libvpx but I'm looking for
some assistance with trying to figure out where/why the build is failing
trying to call this libvpx.so target.


Hi Brad,

I think I've properly fixed it: have a look at the attached patch.

ciao
David


Thank you. That seems to be it.

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

UPDATE: libvpx 1.0.0

[Brad Smith]

Here is an update to libvpx 1.0.0.

Tested on amd64.


Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libvpx/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile17 Mar 2011 16:54:16 -  1.7
+++ Makefile23 Feb 2012 20:04:38 -
@@ -2,14 +2,14 @@
 
 COMMENT=   Google VP8 video codec
 
-V= 0.9.6
+V= 1.0.0
 DISTNAME=  libvpx-v${V}
 PKGNAME=   libvpx-${V}
 CATEGORIES=multimedia
 MASTER_SITES=  http://webm.googlecode.com/files/
 EXTRACT_SUFX=  .tar.bz2
 
-SHARED_LIBS=   vpx 2.0
+SHARED_LIBS=   vpx 3.0
 
 HOMEPAGE=  http://www.webmproject.org/
 
@@ -20,6 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
+
 WANTLIB=   c m pthread
 
 BUILD_DEPENDS+=shells/bash
@@ -59,6 +60,8 @@ post-install:
@chmod ${SHAREMODE} ${PREFIX}/include/vpx/*.h
@chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lib*
@chmod ${SHAREMODE} ${PREFIX}/lib/lib*
+   @chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/pkgconfig/vpx.pc
+   @chmod ${SHAREMODE} ${PREFIX}/lib/pkgconfig/vpx.pc
 
 .include bsd.port.mk
 
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/libvpx/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo17 Mar 2011 16:54:16 -  1.3
+++ distinfo30 Jan 2012 02:10:39 -
@@ -1,5 +1,5 @@
-MD5 (libvpx-v0.9.6.tar.bz2) = OD8/B6dgmWgqu0P3m2krcg==
-RMD160 (libvpx-v0.9.6.tar.bz2) = uFA4uS2RGymzuRLD1xxg4T+JpVE=
-SHA1 (libvpx-v0.9.6.tar.bz2) = o1Ir0rc9Ujgbp2fe0cv0dg6cxvg=
-SHA256 (libvpx-v0.9.6.tar.bz2) = KL2KjvIW+1cJEvDTeGaAUdmWgb8Tc1tZ5ooSrXnyqnM=
-SIZE (libvpx-v0.9.6.tar.bz2) = 1230418
+MD5 (libvpx-v1.0.0.tar.bz2) = 2Ye1FAQS7dN9LGsQwprUhA==
+RMD160 (libvpx-v1.0.0.tar.bz2) = LuWi5/TLLxJsbQ2aNuhjZFX0KRU=
+SHA1 (libvpx-v1.0.0.tar.bz2) = KRnhEHT+9y/GHvGnUWAFD/qtYHQ=
+SHA256 (libvpx-v1.0.0.tar.bz2) = B87bChmkTm2B119S7qhk9Z7xDGxyXLhgQxvsZkHq/iE=
+SIZE (libvpx-v1.0.0.tar.bz2) = 1641411
Index: patches/patch-build_make_Makefile
===
RCS file: /home/cvs/ports/multimedia/libvpx/patches/patch-build_make_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_make_Makefile
--- patches/patch-build_make_Makefile   4 Oct 2010 23:56:16 -   1.1.1.1
+++ patches/patch-build_make_Makefile   30 Jan 2012 02:13:26 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-build_make_Makefile,v 1.1.1.1 2010/10/04 23:56:16 ckuethe Exp $
 build/make/Makefile.orig   Thu Sep  2 14:56:47 2010
-+++ build/make/MakefileSat Sep 25 16:48:26 2010
-@@ -222,8 +222,7 @@ define so_template
+--- build/make/Makefile.orig   Fri Jan 27 13:36:39 2012
 build/make/MakefileSun Jan 29 21:11:03 2012
+@@ -247,8 +247,7 @@ define so_template
  # This needs further abstraction for dealing with non-GNU linkers.
  $(1):
$(if $(quiet),@echo [LD] $$@)
@@ -11,7 +11,7 @@ $OpenBSD: patch-build_make_Makefile,v 1.
  -Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \
  $$(filter %.o,$$?) $$(extralibs)
  endef
-@@ -291,7 +290,7 @@ LIBS=$(call enabled,LIBS)
+@@ -316,7 +315,7 @@ LIBS=$(call enabled,LIBS)
  .libs: $(LIBS)
@touch $@
  $(foreach lib,$(filter %_g.a,$(LIBS)),$(eval $(call archive_template,$(lib
Index: patches/patch-build_make_configure_sh
===
RCS file: 
/home/cvs/ports/multimedia/libvpx/patches/patch-build_make_configure_sh,v
retrieving revision 1.3
diff -u -p -r1.3 patch-build_make_configure_sh
--- patches/patch-build_make_configure_sh   17 Mar 2011 16:54:16 -  
1.3
+++ patches/patch-build_make_configure_sh   30 Jan 2012 02:13:24 -
@@ -1,25 +1,16 @@
 $OpenBSD: patch-build_make_configure_sh,v 1.3 2011/03/17 16:54:16 edd Exp $
 build/make/configure.sh.orig   Fri Mar  4 15:40:37 2011
-+++ build/make/configure.shTue Mar  8 21:12:29 2011
+--- build/make/configure.sh.orig   Fri Jan 27 13:36:39 2012
 build/make/configure.shSun Jan 29 21:13:12 2012
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${BASH}
  ##
  ##  configure.sh
  ##
-@@ -880,8 +880,6 @@ process_common_toolchain() {
- esac
- ;;
- gcc*)
--add_cflags  -m${bits}
--add_ldflags -m${bits}
- link_with_cc=gcc
- tune_cflags=-march=
- setup_gnu_toolchain
-@@ -975,7 +973,7 @@ EOF
- if enabled multithread; then
+@@ -1019,7 +1019,7 @@ EOF
  case ${toolchain} in
  *-win*);;
+ *-android-gcc);;
 -*) check_header pthread.h  add_extralibs -lpthread
 +*) check_header pthread.h  add_extralibs -pthread
  esac
Index: patches/patch-configure

UPDATE: QEMU 1.0.1

[Brad Smith]

Here is an update to QEMU 1.0.1.


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- Makefile2 Feb 2012 22:07:33 -   1.84
+++ Makefile24 Feb 2012 20:01:07 -
@@ -1,14 +1,13 @@
 # $OpenBSD: Makefile,v 1.84 2012/02/02 22:07:33 sthen Exp $
 
-ONLY_FOR_ARCHS=amd64 i386 mips64 mips64el powerpc sparc sparc64
+ONLY_FOR_ARCHS=amd64 arm hppa i386 mips64 mips64el powerpc sparc 
sparc64
+BROKEN-hppa=   compiler bug with gcc 4.2
 
 COMMENT=   multi system emulator
 
-DISTNAME=  qemu-1.0
-REVISION=  1
+DISTNAME=  qemu-1.0.1
 CATEGORIES=emulators
-MASTER_SITES=  http://wiki.qemu.org/download/ \
-   http://comstyle.com/source/
+MASTER_SITES=  http://wiki.qemu.org/download/
 
 HOMEPAGE=  http://www.qemu.org/
 
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo12 Dec 2011 10:56:56 -  1.18
+++ distinfo17 Feb 2012 20:59:39 -
@@ -1,5 +1,5 @@
-MD5 (qemu-1.0.tar.gz) = pks2BnoZFFEyOw0067RJVA==
-RMD160 (qemu-1.0.tar.gz) = OmCu9s/rumiWvbEsmVJdpUVhcv0=
-SHA1 (qemu-1.0.tar.gz) = fcsbNRZVTW2JnXSIzURNu3ch/O4=
-SHA256 (qemu-1.0.tar.gz) = R2dLfaVZ1eG0TMQBr5rFrZYtFOnu3hJWexPkuEGYlzc=
-SIZE (qemu-1.0.tar.gz) = 10848714
+MD5 (qemu-1.0.1.tar.gz) = Xv0QkfAeO8Mb/ewnuO3rAA==
+RMD160 (qemu-1.0.1.tar.gz) = 3O80TxUOI4iAhxdo8vB8y26OzOc=
+SHA1 (qemu-1.0.1.tar.gz) = TQi1qDU4/NeyIr7G8cWE2o0SSXo=
+SHA256 (qemu-1.0.1.tar.gz) = GYkC4QeCUX9gfJ7Z5im153COo56zc+0+w/HIoWnZg3g=
+SIZE (qemu-1.0.1.tar.gz) = 10853005
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.21
diff -u -p -r1.21 patch-configure
--- patches/patch-configure 12 Dec 2011 10:56:56 -  1.21
+++ patches/patch-configure 17 Feb 2012 21:03:10 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure,v 1.21 2011/12/12 10:56:56 sthen Exp $
 configure.orig Mon Nov 28 17:22:15 2011
-+++ configure  Mon Nov 28 18:32:45 2011
+--- configure.orig Fri Feb 17 14:45:39 2012
 configure  Fri Feb 17 16:02:57 2012
 @@ -235,13 +235,11 @@ sdl_config=${SDL_CONFIG-${cross_prefix}sdl-config}
  
  # default flags for all hosts
@@ -15,15 +15,6 @@ $OpenBSD: patch-configure,v 1.21 2011/12
  
  # make source path absolute
  source_path=`cd $source_path; pwd`
-@@ -1116,7 +1114,7 @@ fi
- 
- if test $pie = ; then
-   case $cpu-$targetos in
--i386-Linux|x86_64-Linux)
-+i386-Linux|x86_64-Linux|i386-OpenBSD|x86_64-OpenBSD)
-   ;;
- *)
-   pie=no
 @@ -2684,8 +2682,9 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
Index: patches/patch-hw_e1000_c
===
RCS file: patches/patch-hw_e1000_c
diff -N patches/patch-hw_e1000_c
--- patches/patch-hw_e1000_c2 Feb 2012 22:07:33 -   1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-hw_e1000_c,v 1.4 2012/02/02 22:07:33 sthen Exp $
-
-Bounds packet size against buffer size, otherwise??we??can??write??beyond
-the??buffer??and??corrupt??memory. CVE-2012-0029.
-
-http://git.qemu.org/?p=qemu.git;a=commitdiff;h=65f82df0d7a71ce1b10cd4c5ab0d176ac840
-
 hw/e1000.c.origThu Feb  2 20:07:37 2012
-+++ hw/e1000.c Thu Feb  2 20:11:43 2012
-@@ -466,6 +466,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *d
- bytes = split_size;
- if (tp-size + bytes  msh)
- bytes = msh - tp-size;
-+
-+bytes = MIN(sizeof(tp-data) - tp-size, bytes);
- pci_dma_read(s-dev, addr, tp-data + tp-size, bytes);
- if ((sz = tp-size + bytes) = hdr  tp-size  hdr)
- memmove(tp-header, tp-data, hdr);
-@@ -481,6 +483,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *d
- // context descriptor TSE is not set, while data descriptor TSE is set
- DBGOUT(TXERR, TCP segmentaion Error\n);
- } else {
-+split_size = MIN(sizeof(tp-data) - tp-size, split_size);
- pci_dma_read(s-dev, addr, tp-data + tp-size, split_size);
- tp-size += split_size;
- }
Index: patches/patch-target-i386_translate_c
===
RCS file: patches/patch-target-i386_translate_c
diff -N patches/patch-target-i386_translate_c
--- patches/patch-target-i386_translate_c   12 Dec 2011 10:56:56 -  
1.6
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,32 +0,0 @@
-$OpenBSD: patch-target-i386_translate_c,v 1.6 2011/12/12 10:56:56 sthen Exp $
 target-i386/translate.c.orig   Mon Nov  7 16:24:56 2011
-+++ target-i386/translate.cMon Nov  7 17:39:18 2011
-@@ -4870,20 +4870,24 

Re: UPDATE: SDL 1.2.15

[Brad Smith]

On Wed, Feb 22, 2012 at 08:04:13PM -0500, Brad Smith wrote:
 On Wed, Feb 22, 2012 at 02:58:25PM -0500, Brad Smith wrote:
  Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
  a few more. .15 should have resolved the XRandR issue that was reported
  with .14. So please test and let me know how it goes.
 
 An updated diff rolling in 3 fixes from upstream and two minor tweaks to the
 port..
 
 Fixed bug 1390 - X11_KeyToUnicode
 Fixed bug 1424 - Handling of alpha channel in Altivec accelerated blit 
 functions
 Fixed bug 1427 - integer passed to XChangeProperty() causes crash

Updated diff to fix a build issue on PowerPC.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile22 Feb 2012 08:22:39 -  1.81
+++ Makefile22 Feb 2012 20:21:13 -
@@ -2,11 +2,13 @@
 
 COMMENT=   cross-platform multimedia library
 
-VERSION=   1.2.13
+VERSION=   1.2.15
 DISTNAME=  SDL-${VERSION}
 PKGNAME=   ${DISTNAME:L}
-REVISION = 17
 CATEGORIES=devel
+MASTER_SITES=  ${HOMEPAGE}release/
+
+SHARED_LIBS=   SDL 8.0
 
 HOMEPAGE=  http://www.libsdl.org/
 
@@ -17,30 +19,29 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-WANTLIB=   m sndio usbhid
 
-MASTER_SITES=  ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/ \
-   ${HOMEPAGE}release/
-MASTER_SITES0= http://dev.beastie.hu/ \
-   http://www.beastie.hu/
+WANTLIB=   m sndio usbhid
+
+MODULES=   converters/libiconv
 
 .if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=devel/yasm
+BUILD_DEPENDS+=devel/nasm
 .endif
 
-FLAVORS=   aa caca no_x11 altivec
+FLAVORS=   aa no_x11
 FLAVOR?=
 
+USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
-USE_GROFF =Yes
-MODULES=   converters/libiconv
-
 SEPARATE_BUILD=concurrent
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS=  ${WRKSRC} ${WRKSRC}/test
-SHARED_LIBS=   SDL 8.0
-CONFIGURE_ENV+=X11BASE=${X11BASE} \
-   CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+--disable-arts \
+--disable-esd \
+--disable-oss \
+--disable-pulseaudio
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
WITH_SNDIO=Yes
 
@@ -48,43 +49,21 @@ CONFIGURE_ENV+= X11BASE=${X11BASE} \
 CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
ac_cv_header_usb_h=no
 
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
---disable-arts \
---disable-esd \
---disable-oss \
---disable-pulseaudio \
---enable-nasm \
---enable-pthread-sem
-
 .if ${FLAVOR:L:Maa}
+WANTLIB+=  aa
 LIB_DEPENDS+=  graphics/aalib
-WANTLIB += aa
 CONFIGURE_ARGS+= --enable-video-aalib
-.else
-CONFIGURE_ARGS+= --disable-video-aalib
-.endif
-
-.if ${FLAVOR:L:Mcaca}
-PATCH_DIST_STRIP= -p1
-PATCHFILES=patch-libsd1.2.7-libcaca0.9.diff:0
-LIB_DEPENDS+=  graphics/libcaca
-WANTLIB += caca
-CONFIGURE_ARGS+= --enable-video-caca
-.else
-SUPDISTFILES+= patch-libsd1.2.7-libcaca0.9.diff:0
 .endif
 
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-x \
 --disable-video-x11
-.else
-WANTLIB+=  X11=10 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
 .endif
 
 NO_REGRESS=Yes
 
 pre-configure:
-   mkdir -p ${WRKSRC}/src/audio/libsndio
-   cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
+   @mkdir -p ${WRKSRC}/src/audio/libsndio
+   @cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/devel/sdl/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo3 Jan 2008 17:39:40 -   1.17
+++ distinfo22 Feb 2012 19:40:46 -
@@ -1,10 +1,10 @@
-MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
+MD5 (SDL-1.2.15.tar.gz) = nZbfhBdXKir7eBp8TIEahQ==
 MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
-RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
+RMD160 (SDL-1.2.15.tar.gz) = 1IAqCQy0ok7rDIzlaQgC9ZbTlMM=
 RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
-SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
+SHA1 (SDL-1.2.15.tar.gz) = DF8ZPO2BCw1846sG2AjLte7wOiw=
 SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
-SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
+SHA256 (SDL-1.2.15.tar.gz) = 1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=
 SHA256 (patch-libsd1.2.7-libcaca0.9.diff) = 
fnf1KYlqBfccSHTtjR9npVtt976i2zFrClxN/ejoAS8=
-SIZE (SDL-1.2.13.tar.gz) = 3373673
+SIZE (SDL

Re: UPDATE: SDL 1.2.15

[Brad Smith]

On 24/02/12 4:52 PM, Brad Smith wrote:

On Wed, Feb 22, 2012 at 08:04:13PM -0500, Brad Smith wrote:

On Wed, Feb 22, 2012 at 02:58:25PM -0500, Brad Smith wrote:

Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
a few more. .15 should have resolved the XRandR issue that was reported
with .14. So please test and let me know how it goes.


An updated diff rolling in 3 fixes from upstream and two minor tweaks to the
port..

Fixed bug 1390 - X11_KeyToUnicode
Fixed bug 1424 - Handling of alpha channel in Altivec accelerated blit functions
Fixed bug 1427 - integer passed to XChangeProperty() causes crash


Updated diff to fix a build issue on PowerPC.


Could someone please try out SDL on sparc64 with for example MPlayer 
using SDL as

video output?

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

Re: UPDATE: libvpx 1.0.0

[Brad Smith]

On 27/02/12 3:09 AM, David Coppa wrote:

On Thu, Feb 23, 2012 at 9:55 PM, Brad Smithb...@comstyle.com  wrote:

Here is an update to libvpx 1.0.0.

Tested on amd64.


Has this been tested with its consumers?

The diff reads and builds fine, so I can commit it right now if the
answer to my question above is yes...


Yes, it's working fine.

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

UPDATE: darkstat 3.0.715

[Brad Smith]

Here is an update to darkstat 3.0.715.

This release also fixes darkstat working on gif(4), gre(4), mpe(4)
and pppx(4) interfaces.


Index: Makefile
===
RCS file: /home/cvs/ports/net/darkstat/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile26 Jan 2012 08:03:57 -  1.16
+++ Makefile1 Mar 2012 23:39:59 -
@@ -2,27 +2,26 @@
 
 COMMENT=   network statistics gatherer with graphs
 
-DISTNAME=  darkstat-3.0.713
+DISTNAME=  darkstat-3.0.715
 CATEGORIES=net www
-REVISION=  0
 
-HOMEPAGE=  http://dmr.ath.cx/net/darkstat/
+HOMEPAGE=  http://unix4lyfe.org/darkstat/
 MAINTAINER=Chris Kuethe ckue...@openbsd.org
 
-# BSD with some code GPL'ed
+# GPLv2 and BSD
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
-WANTLIB= c pcap z
+
+WANTLIB=   c pcap z
 
 MASTER_SITES=  ${HOMEPAGE}
 EXTRACT_SUFX=  .tar.bz2
 
 CONFIGURE_STYLE=   gnu
-CONFIGURE_ARGS+=   --with-privdrop-user=_darkstat
+CONFIGURE_ARGS=--with-privdrop-user=_darkstat
 
-USE_GROFF =Yes
 NO_REGRESS=Yes
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/net/darkstat/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo10 Jun 2010 03:57:30 -  1.11
+++ distinfo1 Mar 2012 23:40:45 -
@@ -1,5 +1,5 @@
-MD5 (darkstat-3.0.713.tar.bz2) = P9Kk3bEjrRG7mfEJSmIG2Q==
-RMD160 (darkstat-3.0.713.tar.bz2) = Uu3yfq6eXxvq5s/6sgcUYM8ar2U=
-SHA1 (darkstat-3.0.713.tar.bz2) = muDyl7BiU8oj5zbiJNDtcDMdqPE=
-SHA256 (darkstat-3.0.713.tar.bz2) = 
fMTiDG5cxexjR/rUDPq9Dj7EiYPF7wbNY/sDMLc/Va4=
-SIZE (darkstat-3.0.713.tar.bz2) = 99671
+MD5 (darkstat-3.0.715.tar.bz2) = W3q8dTjc2OMGZ9rBUOgddw==
+RMD160 (darkstat-3.0.715.tar.bz2) = 2FqwCuc7o4j7zM+gCi+vwCg4xRM=
+SHA1 (darkstat-3.0.715.tar.bz2) = 5jX3rgxt/jp9H6w4VcpzMYcWOXM=
+SHA256 (darkstat-3.0.715.tar.bz2) = 
SSaUTuG67gMtDSClQlsTtHFiWqigUXcBHz2jw9+DNDk=
+SIZE (darkstat-3.0.715.tar.bz2) = 110881
Index: patches/patch-darkstat_8_in
===
RCS file: /home/cvs/ports/net/darkstat/patches/patch-darkstat_8_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-darkstat_8_in
--- patches/patch-darkstat_8_in 10 Jun 2010 03:51:39 -  1.1
+++ patches/patch-darkstat_8_in 23 Jan 2012 04:22:07 -
@@ -1,11 +1,12 @@
 $OpenBSD: patch-darkstat_8_in,v 1.1 2010/06/10 03:51:39 lum Exp $
 darkstat.8.in.orig Tue Jun  8 11:43:24 2010
-+++ darkstat.8.in  Tue Jun  8 11:42:25 2010
-@@ -122,6 +122,7 @@ Errors, warnings, and verbose messages will go to \fBs
- daemon, priority debug) instead of \fBstderr\fR.
+--- darkstat.8.in.orig Sun Jan 22 22:48:57 2012
 darkstat.8.in  Sun Jan 22 23:22:01 2012
+@@ -125,6 +125,8 @@ daemon, priority debug) instead of \fBstderr\fR.
  
  On some systems, these messages end up in \fB/var/log/debug\fR
-+by default. On OpenBSD, these messages end up in \fB/var/log/daemon\fR
  by default.
++On OpenBSD, these messages end up in \fB/var/log/daemon\fR
++by default.
  .\
  .TP
+ .BI \-\-verbose
Index: patches/patch-err_c
===
RCS file: /home/cvs/ports/net/darkstat/patches/patch-err_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-err_c
--- patches/patch-err_c 10 Jun 2010 03:51:39 -  1.1
+++ patches/patch-err_c 7 Jun 2011 22:20:04 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-err_c,v 1.1 2010/06/10 03:51:39 lum Exp $
 err.c.orig Fri Jun  4 04:46:38 2010
-+++ err.c  Fri Jun  4 04:41:44 2010
-@@ -47,7 +47,7 @@ to_syslog(const char *type, const int want_err,
+--- err.c.orig Tue Jun  7 06:54:05 2011
 err.c  Tue Jun  7 18:18:59 2011
+@@ -51,7 +51,7 @@ to_syslog(const char *type, const int want_err,
strlcat(buf, : , sizeof(buf));
strlcat(buf, strerror(saved_errno), sizeof(buf));
 }

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

Re: UPDATE: www/dansguardian flavors

[Brad Smith]

On 02/03/12 1:22 AM, Justin Jereza wrote:

Hello.

The diff below adds the icap and commandline flavors to
www/dansguardian. clamd was not given it's own flavor since the PLIST
contains files that require it.

Regards,

Justin Jereza


If you add FLAVORs they should be documented in pkg/DESCR.

I don't know what these FLAVORs do but what harm would it be to
enable the features by default seeing as this does not seem to
involve any external dependencies or any new files [in the PLIST]?


Index: Makefile
===
RCS file: /cvs/ports/www/dansguardian/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile22 Nov 2010 08:36:47 -  1.12
+++ Makefile2 Mar 2012 06:13:01 -
@@ -3,6 +3,7 @@
  COMMENT =  content scanning web filter
  DISTNAME = dansguardian-2.10.1.1
  CATEGORIES =   www net
+FLAVORS =  icap commandline

  HOMEPAGE = http://www.dansguardian.org/

@@ -38,5 +39,15 @@ USE_GROFF =  Yes

  FAKE_FLAGS +=  DGCONFDIR=${PREFIX}/share/examples/dansguardian \
 rel_group=_dansguardian rel_user=_dansguardian
+
+FLAVOR ?=
+
+.if ${FLAVOR:L:Micap}
+CONFIGURE_ARGS += --enable-icap
+.endif
+
+.if ${FLAVOR:L:Mcommandline}
+CONFIGURE_ARGS += --enable-commandline
+.endif

  .includebsd.port.mk




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

Re: make sdl dlopen the correct libraries

[Brad Smith]

On Sat, Mar 03, 2012 at 08:25:17PM +1100, Jonathan Gray wrote:
 The configure script for sdl selects the wrong libraries to dlopen,
 ie it picked libX11.so.10.0 on a system with libX11.so.9 - 15
 
 With the following diff sdl programs no longer segfault here.

This is great, just there is a typo with one entry. x11_libs vs x11_lib.
Here is an updated diff as well as re-adding the WANTLIB entries with a
comment so it is obvious why they were there in the first place.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile2 Mar 2012 09:10:38 -   1.82
+++ Makefile3 Mar 2012 10:25:45 -
@@ -5,6 +5,7 @@ COMMENT=cross-platform multimedia libra
 VERSION=   1.2.15
 DISTNAME=  SDL-${VERSION}
 PKGNAME=   ${DISTNAME:L}
+REVISION=  0
 CATEGORIES=devel
 MASTER_SITES=  ${HOMEPAGE}release/
 
@@ -58,6 +59,11 @@ CONFIGURE_ARGS+= --enable-video-aalib
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-x \
 --disable-video-x11
+.else
+#
+# X11/Xext/Xrender/Xrandr are dlopen'd by SDL
+#
+WANTLIB+=  X11 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
 .endif
 
 NO_REGRESS=Yes
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/devel/sdl/patches/patch-configure,v
retrieving revision 1.22
diff -u -p -r1.22 patch-configure
--- patches/patch-configure 2 Mar 2012 09:10:38 -   1.22
+++ patches/patch-configure 3 Mar 2012 10:22:30 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure,v 1.22 2012/03/02 09:10:38 dcoppa Exp $
 --- configure.orig Thu Jan 19 01:30:12 2012
-+++ configure  Wed Feb 22 13:39:54 2012
 configure  Sat Mar  3 05:22:20 2012
 @@ -21000,6 +21000,20 @@ _ACEOF
  fi
  }
@@ -22,7 +22,20 @@ $OpenBSD: patch-configure,v 1.22 2012/03
  CheckPulseAudio()
  {
  # Check whether --enable-pulseaudio was given.
-@@ -29551,6 +29565,7 @@ _ACEOF
+@@ -24073,6 +24087,12 @@ fi
+ x11_lib='libX11.so'
+ x11ext_lib='libXext.so'
+ ;;
++*-*-openbsd*)
++x11_lib='libX11.so'
++x11ext_lib='libXext.so'
++xrender_lib='libXrender.so'
++xrander_lib='libXrandr.so'
++;;
+ *)
+ x11_lib=`find_lib libX11.so.* $X_LIBS 
-L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir | sed 's/.*\/\(.*\)/\1/; q'`
+ x11ext_lib=`find_lib libXext.so.* $X_LIBS 
-L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir | sed 's/.*\/\(.*\)/\1/; q'`
+@@ -29551,6 +29571,7 @@ _ACEOF
  CheckALSA
  CheckARTSC
  CheckESD
@@ -30,7 +43,7 @@ $OpenBSD: patch-configure,v 1.22 2012/03
  CheckPulseAudio
  CheckNAS
  CheckX11
-@@ -29586,7 +29601,7 @@ _ACEOF
+@@ -29586,7 +29607,7 @@ _ACEOF
  SOURCES=$SOURCES $srcdir/src/audio/sun/*.c
  have_audio=yes
  ;;

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

WIP: dnsmasq 2.60rc5 - with DHCPv6/RA support

[Brad Smith]

For anyone using dnsmasq and wanting to try out 2.60, especially
if you're looking for the newly added DHCPv6 and minimalist RA
support with partial RFC 6106 support.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Oct 2011 10:20:26 -  1.21
+++ Makefile3 Mar 2012 11:16:54 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
 
-COMMENT=   caching DNS forwarder and DHCP server
+COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
 
-DISTNAME=  dnsmasq-2.59
+DISTNAME=  dnsmasq-2.60rc5
 CATEGORIES=net
-MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
+MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 
 HOMEPAGE=  http://www.thekelleys.org.uk/dnsmasq/doc.html
 
@@ -27,8 +27,8 @@ pre-build:
${WRKSRC}/dnsmasq.conf.example
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
+   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
${PREFIX}/share/examples/dnsmasq
${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo25 Oct 2011 10:20:26 -  1.16
+++ distinfo3 Mar 2012 11:16:54 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
-RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
-SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
-SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
-SIZE (dnsmasq-2.59.tar.gz) = 474036
+MD5 (dnsmasq-2.60rc5.tar.gz) = svzAAg4sSxSGetWqUn8HSQ==
+RMD160 (dnsmasq-2.60rc5.tar.gz) = 7XSrdFKDmDD+nlpTdw7A0erUlro=
+SHA1 (dnsmasq-2.60rc5.tar.gz) = 0P56cxeCCkhkSRKgvvFIXiqNLW8=
+SHA256 (dnsmasq-2.60rc5.tar.gz) = xdzRLmSfImGBVCcueGagbiE+Jk3/jvqelUBfKtPI4ik=
+SIZE (dnsmasq-2.60rc5.tar.gz) = 533195
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.10
diff -u -p -r1.10 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 7 Sep 2011 10:34:26 -   1.10
+++ patches/patch-man_dnsmasq_8 3 Mar 2012 11:16:54 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
 man/dnsmasq.8.orig Tue Aug  9 11:05:38 2011
-+++ man/dnsmasq.8  Mon Aug 29 17:35:40 2011
+--- man/dnsmasq.8.orig Wed Feb 29 16:43:37 2012
 man/dnsmasq.8  Wed Feb 29 18:39:43 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
+@@ -1338,7 +1337,7 @@ with # are always skipped. This flag may be given on t
  line or in a configuration file.
  .SH CONFIG FILE
  At startup, dnsmasq reads
@@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  if it exists. (On
  FreeBSD, the file is 
  .I /usr/local/etc/dnsmasq.conf
-@@ -1524,7 +1523,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1656,7 +1655,7 @@ dnsmasq has no direct way of determining the charset i
  assume that it is the system default. 
   
  .SH FILES
Index: patches/patch-src_config_h
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_config_h,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_config_h
--- patches/patch-src_config_h  6 Mar 2011 11:19:53 -   1.8
+++ patches/patch-src_config_h  3 Mar 2012 11:16:54 -
@@ -1,7 +1,18 @@
 $OpenBSD: patch-src_config_h,v 1.8 2011/03/06 11:19:53 sthen Exp $
 src/config.h.orig  Fri Feb 18 05:18:39 2011
-+++ src/config.h   Fri Feb 18 15:00:08 2011
-@@ -57,13 +57,13 @@
+--- src/config.h.orig  Tue Feb 14 15:55:25 2012
 src/config.h   Wed Feb 15 17:24:57 2012
+@@ -34,8 +34,8 @@
+ #define ETHERSFILE /etc/ethers
+ #define RUNFILE /var/run/dnsmasq.pid
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+-#define CHUSER nobody
+-#define CHGRP dip
++#define CHUSER _dnsmasq
++#define CHGRP _dnsmasq
+ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
+ #define LOG_MAX 5 /* log-queue length */
+ #define RANDFILE /dev/urandom
+@@ -145,7 +145,7 @@ RESOLVFILE
  #   if defined(__FreeBSD__)
  #  define CONFFILE /usr/local/etc/dnsmasq.conf
  #   else
@@ -10,11 +21,3 @@ $OpenBSD: patch-src_config_h,v 1.8 2011/
  #   endif
  #endif
  
- #define DEFLEASE 3600 /* default lease time, 1 hour 

UPDATE: dnsmasq 2.60

[Brad Smith]

Here is an update to dnsmasq 2.60.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Oct 2011 10:20:26 -  1.21
+++ Makefile5 Mar 2012 23:59:44 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
 
-COMMENT=   caching DNS forwarder and DHCP server
+COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
 
-DISTNAME=  dnsmasq-2.59
+DISTNAME=  dnsmasq-2.60
 CATEGORIES=net
 MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
 
@@ -27,8 +27,8 @@ pre-build:
${WRKSRC}/dnsmasq.conf.example
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
+   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
${PREFIX}/share/examples/dnsmasq
${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo25 Oct 2011 10:20:26 -  1.16
+++ distinfo5 Mar 2012 23:59:44 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
-RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
-SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
-SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
-SIZE (dnsmasq-2.59.tar.gz) = 474036
+MD5 (dnsmasq-2.60.tar.gz) = WgmQjgJyTXWaxg2cr9J96A==
+RMD160 (dnsmasq-2.60.tar.gz) = NfiIigt4iIQKX1IsI7RrL7S7TLQ=
+SHA1 (dnsmasq-2.60.tar.gz) = B/MHh5Q38VKZ1RZ157zv4pnr/6I=
+SHA256 (dnsmasq-2.60.tar.gz) = HJsGxNzVMQmSn/iC8T6g483m1O8poD5L9iLMzbl7Brg=
+SIZE (dnsmasq-2.60.tar.gz) = 513601
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.10
diff -u -p -r1.10 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 7 Sep 2011 10:34:26 -   1.10
+++ patches/patch-man_dnsmasq_8 5 Mar 2012 23:59:44 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
 man/dnsmasq.8.orig Tue Aug  9 11:05:38 2011
-+++ man/dnsmasq.8  Mon Aug 29 17:35:40 2011
+--- man/dnsmasq.8.orig Wed Feb 29 16:43:37 2012
 man/dnsmasq.8  Wed Feb 29 18:39:43 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
+@@ -1338,7 +1337,7 @@ with # are always skipped. This flag may be given on t
  line or in a configuration file.
  .SH CONFIG FILE
  At startup, dnsmasq reads
@@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  if it exists. (On
  FreeBSD, the file is 
  .I /usr/local/etc/dnsmasq.conf
-@@ -1524,7 +1523,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1656,7 +1655,7 @@ dnsmasq has no direct way of determining the charset i
  assume that it is the system default. 
   
  .SH FILES
Index: patches/patch-src_config_h
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_config_h,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_config_h
--- patches/patch-src_config_h  6 Mar 2011 11:19:53 -   1.8
+++ patches/patch-src_config_h  5 Mar 2012 23:59:44 -
@@ -1,7 +1,18 @@
 $OpenBSD: patch-src_config_h,v 1.8 2011/03/06 11:19:53 sthen Exp $
 src/config.h.orig  Fri Feb 18 05:18:39 2011
-+++ src/config.h   Fri Feb 18 15:00:08 2011
-@@ -57,13 +57,13 @@
+--- src/config.h.orig  Tue Feb 14 15:55:25 2012
 src/config.h   Wed Feb 15 17:24:57 2012
+@@ -34,8 +34,8 @@
+ #define ETHERSFILE /etc/ethers
+ #define RUNFILE /var/run/dnsmasq.pid
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+-#define CHUSER nobody
+-#define CHGRP dip
++#define CHUSER _dnsmasq
++#define CHGRP _dnsmasq
+ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
+ #define LOG_MAX 5 /* log-queue length */
+ #define RANDFILE /dev/urandom
+@@ -145,7 +145,7 @@ RESOLVFILE
  #   if defined(__FreeBSD__)
  #  define CONFFILE /usr/local/etc/dnsmasq.conf
  #   else
@@ -10,11 +21,3 @@ $OpenBSD: patch-src_config_h,v 1.8 2011/
  #   endif
  #endif
  
- #define DEFLEASE 3600 /* default lease time, 1 hour */
--#define CHUSER nobody
--#define CHGRP dip
-+#define CHUSER _dnsmasq
-+#define CHGRP _dnsmasq
- #define NAMESERVER_PORT 53
- #define DHCP_SERVER_PORT 67
- #define DHCP_CLIENT_PORT 68
Index: patches/patch-src_dnsmasq_h
===

Re: UPDATE: lang/lua bugfix

[Brad Smith]

On 06/03/12 2:49 AM, David Coppa wrote:

On Tue, Mar 6, 2012 at 3:38 AM, Piotr Sikorapiotr.sik...@frickle.com  wrote:


Attached patch fixes this, but to be honest I would consider completely
dropping our fix from the port .


me too would prefer the latter.
Other opinions?


Drop the patches.

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

Re: [UPDATE] sox-14.4.0

[Brad Smith]

On 06/03/12 11:09 AM, Jan Stary wrote:

On Mar 05 17:22:57, Jan Stary wrote:

On Mar 05 16:46:25, Jan Stary wrote:

Attached is a port of audio/sox, bringing it to 14.4.0.
Tested on i386 and amd.


Better now, courtesy of port-lib-depends-check.


Another few polished bits.

Comments? OK?

Jan


For the most part do not send tarballs for updates.. send the diff, 
preferably

inline.

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

Re: UPDATE: lang/lua bugfix

[Brad Smith]

On 06/03/12 9:14 AM, Piotr Sikora wrote:

Hi,


Drop the patches.


OKs?


I was thinking more about dropping only the smart patches (see:
attached patch), because changing sprintf() to snprintf() shouldn't
hurt, but I'm OK with both choices.


Local patches of these kind are frowned upon. Work with the upstream
community to get the patches integrated.

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

Re: UPDATE: QEMU 1.0.1

[Brad Smith]

On 07/03/12 5:54 PM, Jonathan Gray wrote:

On Wed, Mar 07, 2012 at 10:39:25PM +, Federico Schwindt wrote:

On Fri, Feb 24, 2012 at 8:02 PM, Brad Smithb...@comstyle.com  wrote:

Here is an update to QEMU 1.0.1.


anyone tested this?
come on, don't cry later. you know who you are.



on amd64 it segfaults and generally doesn't work with rthreads.


Strange. All I use is amd64 and it runs fine for me.

If you build both 1.0 and 1.0.1 on the same system do both versions
exhibit the same behavior?


qemu-system-x86_64 -m 64
Floating point exception (core dumped)


I have seen a crash like this with a particular test with VLC which
is fully reproducible.

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

Re: [Update] ntop

[Brad Smith]

On Wed, Mar 07, 2012 at 03:26:33PM -0300, Gonzalo L. R. wrote:
 Hi,
 
 A little update for ntop.
 
 Comments, Ok?

Looks good. Tested on amd64.

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

Re: NEW: games/eduke32 (again)

[Brad Smith]

On Fri, Mar 09, 2012 at 02:24:25AM -0800, Ryan Freeman wrote:
 On Tue, Mar 06, 2012 at 04:08:39PM -0800, Ryan Freeman wrote:
  On Tue, Mar 06, 2012 at 03:15:30PM -0800, Ryan Freeman wrote:
   Attached is the still-building port of eduke32 that I have
   been sitting on for far too long.  Antti Harri did most of
   the initial work of getting fixes pushed upstream.
   
   I have pulled a recent snapshot from their repos, and 
   as those are done daily, we may wish to wait for a real
   release, if those happen.  Here you go, Edd!
   
  
  Also: builds/runs good on i386 snapshot built as of yesterday,
  so with rthreads, and in fact with vmmap patches.
 
 
 here is a final draft.  now including Antti's suggestion that the
 MESSAGE should be README, and a fix to properly honor CC. 
 Also some work from Edd to strip excess gcc optimization flags
 from the build, and separate out the shareware data into a 
 games/duke3ddata port (will be posted just after) so it matches
 our current games/doomdata port. comments? ok?

Attached is an updated tarball with some fixes to the flags handling.
You went overboard removing things that don't need changing. This is
more appropriate.

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



eduke32.tgz
Description: application/tar-gz

Re: UPDATE: libdvdread 4.2.0 / libdvdnav 4.2.0

[Brad Smith]

On 30-Dec-11, at 4:34 PM, Brad wrote:


Here is an update to libdvdread 4.2.0 and libdvdnav 4.2.0 and
adjustments for various dependencies. This also allows enabling
the use of external copies of libdvdread/libdvdnav for MPlayer.

Tested with a handful of DVDs on amd64 with VLC/Xine-ui/MPlayer.

http://comstyle.com/ports/libdvdread/


Still looking for some more testing. Updated diffs for gst-plugins-bad  
and

mplayer after they had some commits. Updated libdvdcss for a new bug
fix release.

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

Re: NO_BUILD port

[Brad Smith]

On 12-Mar-12, at 4:42 PM, Jan Stary wrote:


I am working on a port of software that is only a collection
of sh(1) scripts. So there is no compilation; it doesn't even
have a Makefile (the installation is just a cp(1) call).

Is this special case described somewhere?  Could you please
point me to a port like this that already exists, so that
I may learn from it?


There are all kinds of NO_BUILD ports. You can easily find
them with find + grep.

From what you've desribed you shold set NO_BUILD and
define a do-install target which installs the scripts as appropriate.


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

UPDATE: Pidgin 2.10.2

[Brad Smith]

An update to Pidgin 2.10.2


Index: Makefile
===
RCS file: /home/cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
--- Makefile13 Dec 2011 14:42:55 -  1.102
+++ Makefile15 Mar 2012 03:47:56 -
@@ -6,7 +6,7 @@ COMMENT-main=   multi-protocol instant mes
 COMMENT-finch= multi-protocol instant messaging client, console client
 COMMENT-libpurple= multi-protocol instant messaging library
 
-VERSION=   2.10.1
+VERSION=   2.10.2
 DISTNAME=  pidgin-${VERSION}
 PKGNAME-main=  pidgin-${VERSION}
 PKGNAME-finch= finch-${VERSION}
Index: distinfo
===
RCS file: /home/cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.40
diff -u -p -r1.40 distinfo
--- distinfo13 Dec 2011 14:42:55 -  1.40
+++ distinfo15 Mar 2012 03:48:22 -
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.10.1.tar.bz2) = 6vsGtAg6IB/iLTEOiXoZ3Q==
-RMD160 (pidgin-2.10.1.tar.bz2) = 9zxVQP0B9irioK4jZDbwZ3Colu8=
-SHA1 (pidgin-2.10.1.tar.bz2) = BF7Q/X3+2tpuCC56RWRki1WVAGQ=
-SHA256 (pidgin-2.10.1.tar.bz2) = Lyi93F7c1xTWB9dBJsiViufCWGArOSnj5ueD08sb6sg=
-SIZE (pidgin-2.10.1.tar.bz2) = 9961580
+MD5 (pidgin-2.10.2.tar.bz2) = 8rIQ8lYoZdhw8ZP/H+jqdQ==
+RMD160 (pidgin-2.10.2.tar.bz2) = SBTxFiq1KC5X9jcvQCMoiT2tD3w=
+SHA1 (pidgin-2.10.2.tar.bz2) = XsCopRqdI38erye/iFhZno+m7M4=
+SHA256 (pidgin-2.10.2.tar.bz2) = 5c3SkFbTZnfLgSJcOzaxvN5kYF4gFJL24v3yf/JNMrg=
+SIZE (pidgin-2.10.2.tar.bz2) = 9967172
Index: patches/patch-configure_ac
===
RCS file: /home/cvs/ports/net/pidgin/patches/patch-configure_ac,v
retrieving revision 1.28
diff -u -p -r1.28 patch-configure_ac
--- patches/patch-configure_ac  22 Aug 2011 07:35:34 -  1.28
+++ patches/patch-configure_ac  15 Mar 2012 03:51:47 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure_ac,v 1.28 2011/08/22 07:35:34 jasper Exp $
 configure.ac.orig  Thu Aug 18 04:51:00 2011
-+++ configure.ac   Sun Aug 21 02:16:14 2011
-@@ -969,7 +969,7 @@ else
+--- configure.ac.orig  Wed Mar 14 01:27:57 2012
 configure.ac   Wed Mar 14 23:51:35 2012
+@@ -975,7 +975,7 @@ else
if test $ac_silc_libs != no; then
SILC_LIBS=-L$ac_silc_libs
fi
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.28 2011
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , 
$SILC_LIBS)
  
if test x$silcincludes = xyes -a x$silcclient = xyes; then
-@@ -1322,7 +1322,6 @@ if test x$GCC = xyes; then
+@@ -1328,7 +1328,6 @@ if test x$GCC = xyes; then
fi
  
DEBUG_CFLAGS=-Wall $DEBUG_CFLAGS
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.28 2011
  fi
  
  if test x$SUNCC = xyes; then
-@@ -1489,7 +1488,17 @@ if test x$enable_consoleui = xyes -a ! -z $PYTHON
+@@ -1495,7 +1494,17 @@ if test x$enable_consoleui = xyes -a ! -z $PYTHON
changequote([, ])dnl
if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a $PY_MAJOR 
= 2.; then
AC_MSG_RESULT()
@@ -37,7 +37,7 @@ $OpenBSD: patch-configure_ac,v 1.28 2011
AC_CHECK_LIB(util, openpty, )
AC_CHECK_LIB(db, dbopen, )
PY_LIBS=-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config 
-lpython$PY_VERSION
-@@ -1691,6 +1700,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test x$SSL_C
+@@ -1697,6 +1706,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test x$SSL_C
  
  dnl These two are inverses of each other -- stolen from evolution!
  
@@ -49,7 +49,7 @@ $OpenBSD: patch-configure_ac,v 1.28 2011
  AC_ARG_ENABLE(gnutls,
[  --enable-gnutls=[yes,no]  attempt to use GnuTLS for SSL support 
[default=yes]],
[enable_gnutls=$enableval],
-@@ -1701,10 +1715,98 @@ AC_ARG_ENABLE(nss,
+@@ -1707,10 +1721,98 @@ AC_ARG_ENABLE(nss,
[enable_nss=$enableval],
[enable_nss=yes])
  
@@ -150,7 +150,7 @@ $OpenBSD: patch-configure_ac,v 1.28 2011
  dnl #
  if test x$enable_gnutls != xno; then
enable_gnutls=no
-@@ -2102,17 +2204,32 @@ fi
+@@ -2108,17 +2210,32 @@ fi
  
  AM_CONDITIONAL(USE_NSS, test x$enable_nss = xyes)
  
Index: patches/patch-pidgin_gtkdialogs_c
===
RCS file: /home/cvs/ports/net/pidgin/patches/patch-pidgin_gtkdialogs_c,v
retrieving revision 1.24
diff -u -p -r1.24 patch-pidgin_gtkdialogs_c
--- patches/patch-pidgin_gtkdialogs_c   22 Aug 2011 07:35:34 -  1.24
+++ patches/patch-pidgin_gtkdialogs_c   15 Mar 2012 03:52:02 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-pidgin_gtkdialogs_c,v 1.24 2011/08/22 07:35:34 jasper Exp $
 pidgin/gtkdialogs.c.orig   Thu Aug 18 04:51:04 2011
-+++ pidgin/gtkdialogs.cSun Aug 21 02:16:05 2011
-@@ -617,6 +617,12 @@ g_string_append(str, br/  bLibrary Support/bbr
+--- pidgin/gtkdialogs.c.orig   Wed Mar 14 01:28:02 2012
 pidgin/gtkdialogs.cWed Mar 14 23:51:26 2012
+@@ -618,6 +618,12 @@ 

UPDATE: SDL_gfx / SDL_image / SDL_mixer / SDL_net / SDL_ttf

[Brad Smith]

Here are updates for most of the other SDL ports..

SDL_gfx 2.0.23
SDL_image 1.2.12
SDL_mixer 1.2.12
SDL_net 1.2.8
SDL_ttf 2.0.11

Tested with a handful of random games and apps using these libs on amd64.

http://comstyle.com/ports/sdl/

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

WebKit diff needs testing

[Brad Smith]

I'm looking for some WebKit users to test the following diff with
WebKit + their respective browser and let me know if there are any
issues with the JavaScript support. The update of WebKit does not
mention the reason for this workaround in the commit message or the
patch itself so it would be nice to see if this works without the
workaround since we had pthread_attr_getstack() even with uthreads.


Index: Makefile
===
RCS file: /home/cvs/ports/www/webkit/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile13 Mar 2012 07:50:05 -  1.62
+++ Makefile16 Mar 2012 15:58:30 -
@@ -7,7 +7,7 @@ COMMENT =   open source web browser engine
 V =1.6.3
 DISTNAME = webkit-${V}
 EPOCH =0
-REVISION = 0
+REVISION = 1
 CATEGORIES =   www
 EXTRACT_SUFX=  .tar.xz
 
Index: patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp
===
RCS file: 
/home/cvs/ports/www/webkit/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp
--- patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp 13 Oct 
2011 06:52:49 -  1.1
+++ patches/patch-Source_JavaScriptCore_heap_MachineStackMarker_cpp 15 Mar 
2012 07:55:59 -
@@ -12,18 +12,3 @@ $OpenBSD: patch-Source_JavaScriptCore_he
  #else
  // FIXME: this function is non-portable; other POSIX systems may have 
different np alternatives
  pthread_getattr_np(platformThread, regs);
-@@ -431,7 +433,14 @@ static inline void* otherThreadStackPointer(const Plat
- #elif USE(PTHREADS)
- void* stackBase = 0;
- size_t stackSize = 0;
-+# if defined(__OpenBSD__)
-+stack_t ss;
-+int rc = pthread_stackseg_np(pthread_self(), ss);
-+stackBase = (void*)((size_t) ss.ss_sp - ss.ss_size);
-+stackSize = ss.ss_size;
-+#else
- int rc = pthread_attr_getstack(regs, stackBase, stackSize);
-+#endif
- (void)rc; // FIXME: Deal with error code somehow? Seems fatal.
- ASSERT(stackBase);
- return static_castchar*(stackBase) + stackSize;

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

Re: WebKit diff needs testing

[Brad Smith]

On 19/03/12 10:39 AM, Antoine Jacoutot wrote:

On Mon, Mar 19, 2012 at 03:30:26PM +0100, Landry Breuil wrote:

On Mon, Mar 19, 2012 at 08:10:54AM -0400, Brad Smith wrote:

I'm looking for some WebKit users to test the following diff with
WebKit + their respective browser and let me know if there are any
issues with the JavaScript support. The update of WebKit does not
mention the reason for this workaround in the commit message or the
patch itself so it would be nice to see if this works without the
workaround since we had pthread_attr_getstack() even with uthreads.


Patch was added in webkit 1.4.0 (was previously
patch-Source_JavaScriptCore_runtime_MachineStackMarker_cpp) so i'll punt
to aja who might remember why it was needed... but i'd also be glad to
see it go away :)


I don't remember. But if I added it, it was probably because it failed to 
compile.
If it now compiles without it and that all work fine then just drop it.


Even if the workaround is necessary for the time being until something
else is fixed it would still be nice to put a comment indicating why it
is there.

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

Re: UPDATE: games/abuse

[Brad Smith]

On 09/03/12 4:18 PM, Antti Harri wrote:

Update to 0.8:

Frabs was reorganized and put into main distribution in
upstream so remove here.

Bundle abuse-free-sounds-20120309 that has free sounds
we can package. Most of the sounds that matter are available.


Working fine on amd64.

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

Re: UPDATE: SDL_gfx / SDL_image / SDL_mixer / SDL_net / SDL_ttf

[Brad Smith]

On 21/03/12 1:27 PM, Gonzalo L. R. wrote:

All builds fine on amd64, you have missing WANTLIB in all diff (Xrandr
Xrender).


That's something I noticed and needs fixing with the SDL port.


Tested for a while with games/warmux seems to be Ok.

Cheers.

On Sun, 18 Mar 2012 02:12:27 -0400, Brad Smith wrote:

Here are updates for most of the other SDL ports..

SDL_gfx 2.0.23
SDL_image 1.2.12
SDL_mixer 1.2.12
SDL_net 1.2.8
SDL_ttf 2.0.11

Tested with a handful of random games and apps using these libs on amd64.

http://comstyle.com/ports/sdl/




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

Another fix for SDL's dynamic loading of X libs

[Brad Smith]

*sigh* I had not noticed the second typo in the diff jsg@ sent out to
correct the dynamic loading of the X libs and this resulted in SDL
of course not using the dynamic loading with the XRender and Xrandr
libraries and having downstream projects link to Xrender and Xrandr
if using sdl-config.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.83
diff -u -p -r1.83 Makefile
--- Makefile4 Mar 2012 01:33:22 -   1.83
+++ Makefile21 Mar 2012 17:32:06 -
@@ -5,7 +5,7 @@ COMMENT=cross-platform multimedia libra
 VERSION=   1.2.15
 DISTNAME=  SDL-${VERSION}
 PKGNAME=   ${DISTNAME:L}
-REVISION=  0
+REVISION=  1
 CATEGORIES=devel
 MASTER_SITES=  ${HOMEPAGE}release/
 
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/devel/sdl/patches/patch-configure,v
retrieving revision 1.23
diff -u -p -r1.23 patch-configure
--- patches/patch-configure 4 Mar 2012 01:33:22 -   1.23
+++ patches/patch-configure 21 Mar 2012 17:42:21 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-configure,v 1.23 2012/03/04 01:33:22 jsg Exp $
 --- configure.orig Thu Jan 19 01:30:12 2012
-+++ configure  Sat Mar  3 05:22:20 2012
 configure  Wed Mar 21 13:42:07 2012
 @@ -21000,6 +21000,20 @@ _ACEOF
  fi
  }
@@ -30,7 +30,7 @@ $OpenBSD: patch-configure,v 1.23 2012/03
 +x11_lib='libX11.so'
 +x11ext_lib='libXext.so'
 +xrender_lib='libXrender.so'
-+xrander_lib='libXrandr.so'
++xrandr_lib='libXrandr.so'
 +;;
  *)
  x11_lib=`find_lib libX11.so.* $X_LIBS 
-L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir | sed 's/.*\/\(.*\)/\1/; q'`

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

Re: faac disabled in avidemux?

[Brad Smith]

On 22/03/12 5:48 PM, Joe Gidi wrote:

Hello,

I use avidemux on an OpenBSD 5.0 machine to transcode video for playback
on an Android phone; it works great. When I upgraded another machine to a
-current snapshot, I found that faac was disabled for avidemux in August
2011. However, I couldn't find an explanation for why this was done. It
looks like the discussion began off-list before ports@ was CC'ed in:

http://marc.info/?l=openbsd-portsm=131474115707784w=2

Could anyone let me know why this was done, and if there's any chance of
faac being re-enabled? Seems the Android media player requires AAC audio,
unfortunately...

Thanks in advance,


Because of licensing issues faac cannot be distributed with packages which
use the GPL license and everything in the ports tree it was being used with
was GPL.

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

UPDATE: znc 0.204

[Brad Smith]

Here is an update to znc 0.204.


Index: Makefile
===
RCS file: /home/cvs/ports/net/znc/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile6 Nov 2011 20:27:14 -   1.12
+++ Makefile24 Mar 2012 18:17:03 -
@@ -4,7 +4,7 @@ SHARED_ONLY=Yes
 
 COMMENT=   advanced IRC bouncer
 
-DISTNAME=  znc-0.202
+DISTNAME=  znc-0.204
 CATEGORIES=net
 MASTER_SITES=  ${HOMEPAGE}releases/
 
Index: distinfo
===
RCS file: /home/cvs/ports/net/znc/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo6 Nov 2011 20:27:14 -   1.9
+++ distinfo24 Mar 2012 18:17:10 -
@@ -1,5 +1,5 @@
-MD5 (znc-0.202.tar.gz) = PG/0Yg4Tnj2XRc1TERurIA==
-RMD160 (znc-0.202.tar.gz) = Fo+In26XAkN3ZxES+2HttIfnTZo=
-SHA1 (znc-0.202.tar.gz) = uXoelCw62MehYvumiYwGHAetdZQ=
-SHA256 (znc-0.202.tar.gz) = SNlef8V8vK7hkrwZiPp9zTVUQoZ3XTsC7k64IupXzBo=
-SIZE (znc-0.202.tar.gz) = 654083
+MD5 (znc-0.204.tar.gz) = fHJHQj/AiwxcYnWaUKm8ow==
+RMD160 (znc-0.204.tar.gz) = 8ESNRdiiH6YRQ/z9e/XueIu1qWg=
+SHA1 (znc-0.204.tar.gz) = xzzMPxUG681nQIV4Dm5POH235J8=
+SHA256 (znc-0.204.tar.gz) = gMXsUn/QuV/WvsB1XoawesiSW5fW7hV2z+Hg5lansFA=
+SIZE (znc-0.204.tar.gz) = 654739
Index: patches/patch-man_Makefile_in
===
RCS file: /home/cvs/ports/net/znc/patches/patch-man_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-man_Makefile_in
--- patches/patch-man_Makefile_in   6 Nov 2011 20:27:14 -   1.5
+++ patches/patch-man_Makefile_in   24 Mar 2012 18:22:34 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_Makefile_in,v 1.5 2011/11/06 20:27:14 kili Exp $
 man/Makefile.in.orig   Wed Sep 21 16:20:19 2011
-+++ man/Makefile.inMon Oct 24 00:19:53 2011
+--- man/Makefile.in.orig   Sun Jan 22 12:13:48 2012
 man/Makefile.inSat Mar 24 14:22:21 2012
 @@ -11,7 +11,7 @@ mandir  := @mandir@
  INSTALL  := @INSTALL@
  INSTALL_DATA := @INSTALL_DATA@
@@ -13,7 +13,7 @@ $OpenBSD: patch-man_Makefile_in,v 1.5 20
 @@ -35,7 +35,7 @@ clean:
  
  install: $(MAN1)
-   mkdir -p $(DESTDIR)$(mandir)/man1
+   test -d $(DESTDIR)$(mandir)/man1 || $(INSTALL) -d 
$(DESTDIR)$(mandir)/man1
 -  $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1
 +  cd $(VPATH)  $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1
  
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/net/znc/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   6 Nov 2011 20:27:14 -   1.8
+++ pkg/PLIST   24 Mar 2012 18:59:07 -
@@ -34,7 +34,6 @@ lib/znc/
 lib/znc/admin.so
 lib/znc/adminlog.so
 lib/znc/autoattach.so
-lib/znc/autocycle.so
 lib/znc/autoop.so
 lib/znc/autoreply.so
 lib/znc/awaynick.so

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

Re: Tcl and rthreads.

[Brad Smith]

On 24/03/12 4:53 PM, Stuart Cassoff wrote:

I'd like to (eventually) make threaded Tcl the default
and have a nonthreaded flavor.


The whole point of me getting you to enable this by default was to
remove the FLAVOR use all together not to add another one.

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

Re: magnet links

[Brad Smith]

On 28/03/12 11:45 AM, Kevin Chadwick wrote:

On Wed, 28 Mar 2012 16:21:17 +0200
Jan Stary wrote:


Now that ThePirateBay has switched from torrent files to magnet links,
what do people use instead of btpd?

Jan



Ktorrent supports magnet and DHE. Has many features and so probably
bugs but I expect you don't expect this machine getting torrents to be
secure?


Not with what is in ports... you fail.. as usual.

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

Re: UPDATE: audio/openal

[Brad Smith]

On Thu, Mar 29, 2012 at 02:03:32PM +0300, Antti Harri wrote:
 This updates OpenAL to 1.14 that was released yesterday. Release notes at
 http://kcat.strangesoft.net/openal.html

Tested with scorched3d/supertuxkart/warzone2100 on amd64.

There were API additions so I bumped the minor rev.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/openal/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile2 Jul 2011 07:34:31 -   1.24
+++ Makefile31 Mar 2012 01:34:51 -
@@ -2,11 +2,12 @@
 
 COMMENT =  cross-platform 3D audio API
 
-V =20110627
+V =1.14
+EPOCH =0
 DISTNAME = openal-soft-$V
 PKGNAME =  openal-$V
 CATEGORIES =   audio
-SHARED_LIBS =  openal  2.0
+SHARED_LIBS =  openal  2.1
 
 HOMEPAGE = http://kcat.strangesoft.net/openal.html
 
@@ -20,20 +21,26 @@ PERMIT_DISTFILES_FTP =  Yes
 
 WANTLIB =  c m pthread sndio
 
-MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,} \
-   http://openbsd.fi/dist/
+MASTER_SITES = ${HOMEPAGE:S,.html,-releases/,}
+EXTRACT_SUFX = .tar.bz2
 
 CONFIGURE_ARGS =-DCMAKE_C_FLAGS=${CFLAGS} -DNDEBUG   \
-DCMAKE_BUILD_TYPE=OpenBSD  \
-DDLOPEN=Off\
+   -DREQUIRE_SNDIO=On  \
-DPULSEAUDIO=Off\
-DPORTAUDIO=Off \
-DSOLARIS=Off   \
-DALSA=Off  \
-   -DOSS=Off
+   -DOSS=Off   \
+   -DCOREAUDIO=Off \
+   -DDSOUND=Off\
+   -DOPENSL=Off\
+   -DEXAMPLES=Off
 
 MODULES =  devel/cmake
 
+SEPARATE_BUILD =Yes
 NO_REGRESS =   Yes
 
 pre-build:
Index: distinfo
===
RCS file: /home/cvs/ports/audio/openal/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo2 Jul 2011 07:34:31 -   1.6
+++ distinfo31 Mar 2012 01:30:32 -
@@ -1,5 +1,5 @@
-MD5 (openal-soft-20110627.tar.gz) = dyIlarhDU4oZArAVhNi6Xw==
-RMD160 (openal-soft-20110627.tar.gz) = kWiXzE41A6/+Xvs8PKBCZKpb/Vs=
-SHA1 (openal-soft-20110627.tar.gz) = 22LbnwY5ForaALA6rXGj/QfB7LM=
-SHA256 (openal-soft-20110627.tar.gz) = 
/xXT1ihUatrb/4JSCAYYrrTVYbjP6medJwHdInFpS/w=
-SIZE (openal-soft-20110627.tar.gz) = 231964
+MD5 (openal-soft-1.14.tar.bz2) = PYuGwhovh6Kl5g9487PwPQ==
+RMD160 (openal-soft-1.14.tar.bz2) = NbTUbyF5+4R9IqvkwcuNSpdPilo=
+SHA1 (openal-soft-1.14.tar.bz2) = 5tadsT7BVGW4OkXviZeOig9Vvso=
+SHA256 (openal-soft-1.14.tar.bz2) = 
h72NYdWUM4eJjJK2oru7JhGOdF3sV1UMgXUmpw+tCRQ=
+SIZE (openal-soft-1.14.tar.bz2) = 221579
Index: patches/patch-Alc_sndio_c
===
RCS file: patches/patch-Alc_sndio_c
diff -N patches/patch-Alc_sndio_c
--- patches/patch-Alc_sndio_c   2 Jul 2011 07:34:31 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,36 +0,0 @@
-$OpenBSD: patch-Alc_sndio_c,v 1.2 2011/07/02 07:34:31 jasper Exp $
 Alc/sndio.c.orig   Mon Jun 27 01:40:15 2011
-+++ Alc/sndio.cThu Jun 30 23:37:31 2011
-@@ -142,25 +142,15 @@ static ALuint sndio_proc(ALvoid *ptr)
- 
- while(!data-killNow  device-Connected)
- {
--ALsizei len = data-data_size;
--ALubyte *WritePtr = data-mix_data;
--
--aluMixData(device, WritePtr, len/frameSize);
--while(len  0  !data-killNow)
-+aluMixData(device, data-mix_data, data-data_size / frameSize);
-+wrote = sio_write(data-sndHandle, data-mix_data, data-data_size);
-+if(wrote  data-data_size)
- {
--wrote = sio_write(data-sndHandle, WritePtr, len);
--if(wrote == 0)
--{
--AL_PRINT(sio_write failed\n);
--aluHandleDisconnect(device);
--break;
--}
--
--len -= wrote;
--WritePtr += wrote;
--}
-+  AL_PRINT(sio_write: short write\n);
-+  aluHandleDisconnect(device);
-+  break;
-+  }
- }
--
- return 0;
- }
- 
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/audio/openal/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   25 Jun 2011 18:42:02 -  1.4
+++ pkg/PLIST   31 Mar 2012 01:30:32 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.4 2011/06/25 18:42:02 jasper Exp $
+@bin bin/makehrtf
 @bin bin/openal-info
 include/AL/
 include/AL/al.h
@@ -6,6 +7,7 @@ include/AL/alc.h
 include/AL/alext.h
 %%SHARED%%
 include/AL/efx-creative.h
+include/AL/efx-presets.h
 include/AL/efx.h
 lib/pkgconfig/
 lib/pkgconfig/openal.pc

-- 
This message has 

WIP: dnsmasq 2.61rc1

[Brad Smith]

dnsmasq 2.61 is close to the next release. This release has had a number of
improvements and some bug fixes mainly with the new DHCPv6 and RA support.
The ra-names feature now works on OpenBSD.

Here is rc1 for anyone using dnsmasq that is interested in helping out
test this and provide any feedback to the author.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Oct 2011 10:20:26 -  1.21
+++ Makefile5 Apr 2012 16:22:47 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
 
-COMMENT=   caching DNS forwarder and DHCP server
+COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
 
-DISTNAME=  dnsmasq-2.59
+DISTNAME=  dnsmasq-2.61rc1
 CATEGORIES=net
-MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
+MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 
 HOMEPAGE=  http://www.thekelleys.org.uk/dnsmasq/doc.html
 
@@ -27,8 +27,8 @@ pre-build:
${WRKSRC}/dnsmasq.conf.example
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
+   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
${PREFIX}/share/examples/dnsmasq
${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo25 Oct 2011 10:20:26 -  1.16
+++ distinfo5 Apr 2012 16:22:47 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
-RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
-SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
-SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
-SIZE (dnsmasq-2.59.tar.gz) = 474036
+MD5 (dnsmasq-2.61rc1.tar.gz) = xE3HGqgfU5egP1AcXNtS8g==
+RMD160 (dnsmasq-2.61rc1.tar.gz) = yWMX85ClrZr1yZi2D5v8pfA4ILU=
+SHA1 (dnsmasq-2.61rc1.tar.gz) = vJOnx47TYfjriRROSTyrt4yqngA=
+SHA256 (dnsmasq-2.61rc1.tar.gz) = XelV6k89kUBsm1VJX1Qjx2L3aCzbTZRg4r7uZyhBFOI=
+SIZE (dnsmasq-2.61rc1.tar.gz) = 544897
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.10
diff -u -p -r1.10 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 7 Sep 2011 10:34:26 -   1.10
+++ patches/patch-man_dnsmasq_8 5 Apr 2012 16:22:47 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
 man/dnsmasq.8.orig Tue Aug  9 11:05:38 2011
-+++ man/dnsmasq.8  Mon Aug 29 17:35:40 2011
+--- man/dnsmasq.8.orig Sat Mar 31 16:35:12 2012
 man/dnsmasq.8  Sat Mar 31 21:50:13 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
+@@ -1420,7 +1419,7 @@ with # are always skipped. This flag may be given on t
  line or in a configuration file.
  .SH CONFIG FILE
  At startup, dnsmasq reads
@@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  if it exists. (On
  FreeBSD, the file is 
  .I /usr/local/etc/dnsmasq.conf
-@@ -1524,7 +1523,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1738,7 +1737,7 @@ dnsmasq has no direct way of determining the charset i
  assume that it is the system default. 
   
  .SH FILES
Index: patches/patch-src_config_h
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_config_h,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_config_h
--- patches/patch-src_config_h  6 Mar 2011 11:19:53 -   1.8
+++ patches/patch-src_config_h  5 Apr 2012 16:22:47 -
@@ -1,7 +1,18 @@
 $OpenBSD: patch-src_config_h,v 1.8 2011/03/06 11:19:53 sthen Exp $
 src/config.h.orig  Fri Feb 18 05:18:39 2011
-+++ src/config.h   Fri Feb 18 15:00:08 2011
-@@ -57,13 +57,13 @@
+--- src/config.h.orig  Tue Feb 14 15:55:25 2012
 src/config.h   Wed Feb 15 17:24:57 2012
+@@ -34,8 +34,8 @@
+ #define ETHERSFILE /etc/ethers
+ #define RUNFILE /var/run/dnsmasq.pid
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+-#define CHUSER nobody
+-#define CHGRP dip
++#define CHUSER _dnsmasq
++#define CHGRP _dnsmasq
+ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
+ #define LOG_MAX 5 /* log-queue length */
+ #define RANDFILE /dev/urandom
+@@ -145,7 +145,7 @@ RESOLVFILE
  #   if defined(__FreeBSD__)
  #  define CONFFILE /usr/local/etc/dnsmasq.conf
  

Re: WIP: dnsmasq 2.61rc1

[Brad Smith]

On Thu, Apr 05, 2012 at 12:28:48PM -0400, Brad Smith wrote:
 dnsmasq 2.61 is close to the next release. This release has had a number of
 improvements and some bug fixes mainly with the new DHCPv6 and RA support.
 The ra-names feature now works on OpenBSD.
 
 Here is rc1 for anyone using dnsmasq that is interested in helping out
 test this and provide any feedback to the author.

An updated diff with fixes mentioned by Stuart to use TRUEPREFIX in the
rc.d script and a tweak to DESCR.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Oct 2011 10:20:26 -  1.21
+++ Makefile5 Apr 2012 17:05:48 -
@@ -1,10 +1,10 @@
 # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
 
-COMMENT=   caching DNS forwarder and DHCP server
+COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
 
-DISTNAME=  dnsmasq-2.59
+DISTNAME=  dnsmasq-2.61rc1
 CATEGORIES=net
-MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
+MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 
 HOMEPAGE=  http://www.thekelleys.org.uk/dnsmasq/doc.html
 
@@ -27,8 +27,8 @@ pre-build:
${WRKSRC}/dnsmasq.conf.example
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
+   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
${PREFIX}/share/examples/dnsmasq
${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo25 Oct 2011 10:20:26 -  1.16
+++ distinfo5 Apr 2012 17:05:48 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
-RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
-SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
-SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
-SIZE (dnsmasq-2.59.tar.gz) = 474036
+MD5 (dnsmasq-2.61rc1.tar.gz) = xE3HGqgfU5egP1AcXNtS8g==
+RMD160 (dnsmasq-2.61rc1.tar.gz) = yWMX85ClrZr1yZi2D5v8pfA4ILU=
+SHA1 (dnsmasq-2.61rc1.tar.gz) = vJOnx47TYfjriRROSTyrt4yqngA=
+SHA256 (dnsmasq-2.61rc1.tar.gz) = XelV6k89kUBsm1VJX1Qjx2L3aCzbTZRg4r7uZyhBFOI=
+SIZE (dnsmasq-2.61rc1.tar.gz) = 544897
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.10
diff -u -p -r1.10 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 7 Sep 2011 10:34:26 -   1.10
+++ patches/patch-man_dnsmasq_8 5 Apr 2012 17:05:48 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
 man/dnsmasq.8.orig Tue Aug  9 11:05:38 2011
-+++ man/dnsmasq.8  Mon Aug 29 17:35:40 2011
+--- man/dnsmasq.8.orig Sat Mar 31 16:35:12 2012
 man/dnsmasq.8  Sat Mar 31 21:50:13 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
+@@ -1420,7 +1419,7 @@ with # are always skipped. This flag may be given on t
  line or in a configuration file.
  .SH CONFIG FILE
  At startup, dnsmasq reads
@@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  if it exists. (On
  FreeBSD, the file is 
  .I /usr/local/etc/dnsmasq.conf
-@@ -1524,7 +1523,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1738,7 +1737,7 @@ dnsmasq has no direct way of determining the charset i
  assume that it is the system default. 
   
  .SH FILES
Index: patches/patch-src_config_h
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-src_config_h,v
retrieving revision 1.8
diff -u -p -r1.8 patch-src_config_h
--- patches/patch-src_config_h  6 Mar 2011 11:19:53 -   1.8
+++ patches/patch-src_config_h  5 Apr 2012 17:05:48 -
@@ -1,7 +1,18 @@
 $OpenBSD: patch-src_config_h,v 1.8 2011/03/06 11:19:53 sthen Exp $
 src/config.h.orig  Fri Feb 18 05:18:39 2011
-+++ src/config.h   Fri Feb 18 15:00:08 2011
-@@ -57,13 +57,13 @@
+--- src/config.h.orig  Tue Feb 14 15:55:25 2012
 src/config.h   Wed Feb 15 17:24:57 2012
+@@ -34,8 +34,8 @@
+ #define ETHERSFILE /etc/ethers
+ #define RUNFILE /var/run/dnsmasq.pid
+ #define DEFLEASE 3600 /* default lease time, 1 hour */
+-#define CHUSER nobody
+-#define CHGRP dip
++#define CHUSER _dnsmasq
++#define CHGRP _dnsmasq
+ #define TFTP_MAX_CONNECTIONS 50 /* max simultaneous connections */
+ #define LOG_MAX

UPDATE: audacious-plugins

[Brad Smith]

Some fixes and improvements for the audacious-plugins port..

- sync/re-sort WANTLIBs
- enable GIO support since we have Glib in the dependency path anyway
- simplify one of the Makefile patches a bit
- invert the logic for enabling/disabling the sndio backend
- more appropriate fix for some of the autoconf checks as the LIBS
  variable was being polluted very early on breaking most of the
  checks using AC_CHECK_LIB as well as remove/fix some improper use
  of the AC_CHECK_LIB macro


Index: Makefile
===
RCS file: /home/cvs/ports/audio/audacious-plugins/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile21 Mar 2012 16:13:25 -  1.41
+++ Makefile4 Apr 2012 23:49:19 -
@@ -6,7 +6,7 @@ COMMENT =   input and output plugins for 
 
 V =3.2
 DISTNAME = audacious-plugins-$V
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   audio multimedia
 
@@ -18,16 +18,14 @@ PERMIT_PACKAGE_FTP =Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
-WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 audcore audgui cairo cairo-gobject
-WANTLIB += expat fontconfig freetype gdk-3
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-3 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs samplerate xcb
-WANTLIB += xcb-render xcb-shm z ${MODGETTEXT_WANTLIB}
-WANTLIB += FLAC SDL audtag cddb cdio cdio_cdda cue curl
-WANTLIB += dbus-1 dbus-glib-1 faad modplug mp3lame mpg123 neon notify ogg
-WANTLIB += sndfile sndio stdc++ vorbis vorbisenc vorbisfile wavpack xml2
+WANTLIB += FLAC GL SDL X11 Xcomposite Xrender atk-1.0 audcore
+WANTLIB += audgui audtag cairo cairo-gobject cddb cdio cdio_cdda
+WANTLIB += cue curl dbus-1 dbus-glib-1 expat faad fontconfig freetype
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
+WANTLIB += m modplug mp3lame mpg123 neon notify ogg pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 pthread-stubs
+WANTLIB += samplerate sndfile sndio stdc++ vorbis vorbisenc vorbisfile
+WANTLIB += wavpack xcb xcb-render xcb-shm xml2 z
 
 MASTER_SITES = http://distfiles.audacious-media-player.org/
 
@@ -62,8 +60,8 @@ USE_GMAKE =   Yes
 
 CONFIGURE_STYLE =  autoconf
 AUTOCONF_VERSION = 2.68
-CONFIGURE_ARGS +=  --enable-ipv6 \
-   --enable-sndio \
+CONFIGURE_ARGS +=  --enable-gio \
+   --enable-ipv6 \
--disable-pulse \
--disable-adplug \
--disable-sid \
@@ -75,7 +73,6 @@ CONFIGURE_ARGS += --enable-ipv6 \
--disable-ffaudio \
--disable-jack \
--disable-bs2b
-
 CONFIGURE_ENV =CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib
 
Index: patches/patch-configure_ac
===
RCS file: /home/cvs/ports/audio/audacious-plugins/patches/patch-configure_ac,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure_ac
--- patches/patch-configure_ac  21 Mar 2012 16:13:25 -  1.10
+++ patches/patch-configure_ac  2 Apr 2012 22:11:09 -
@@ -1,7 +1,17 @@
 $OpenBSD: patch-configure_ac,v 1.10 2012/03/21 16:13:25 dcoppa Exp $
 configure.ac.orig  Fri Jan 20 20:48:30 2012
-+++ configure.ac   Wed Mar 21 12:36:48 2012
-@@ -95,7 +95,7 @@ dnl ===
+--- configure.ac.orig  Fri Jan 20 14:48:30 2012
 configure.ac   Mon Apr  2 18:11:01 2012
+@@ -41,9 +41,6 @@ PKG_CHECK_MODULES(AUDACIOUS, [audacious = 3.2],
+ [AC_MSG_ERROR([Cannot find Audacious 3.2; have you installed Audacious 
yet?])]
+ )
+ 
+-CPPFLAGS=$CPPFLAGS $AUDACIOUS_CFLAGS
+-LIBS=$LIBS $AUDACIOUS_LIBS
+-
+ dnl Default Set of Plugins
+ dnl ==
+ 
+@@ -95,7 +92,7 @@ dnl ===
  PTHREAD_LIBS=
  PTHREAD_CFLAGS=
  
@@ -10,43 +20,25 @@ $OpenBSD: patch-configure_ac,v 1.10 2012
[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIBS=-lpthreads,
[AC_CHECK_LIB(pthreadGC2, pthread_create, PTHREAD_LIBS=-lpthreadGC2)]
)]
-@@ -490,7 +490,7 @@ if test x$enable_aac = xyes; then
-   AC_CHECK_DECL(NeAACDecInit2,,enable_aac=no,[#include 
neaacdec.h])
-   fi
-   if test x$enable_aac = xyes; then
--  AC_CHECK_LIB(faad,NeAACDecInit2,enable_aac=yes,enable_aac=no)
-+  AC_CHECK_LIB(faad -lGL -lXau -lXdmcp -lXxf86vm -ldrm -lxcb 
-pthread,NeAACDecInit2,enable_aac=yes,enable_aac=no)
-   fi
- fi
- 
-@@ -862,7 +862,7 @@ AC_ARG_ENABLE(neon,
- 
- if test x$have_neon = xyes; then
- PKG_CHECK_MODULES(NEON, [neon = 0.26], 
[TRANSPORT_PLUGINS=$TRANSPORT_PLUGINS neon ], [have_neon=no])
--AC_CHECK_LIB([neon], 

UPDATE: libquicktime 1.2.4

[Brad Smith]

Here is an update to libquicktime 1.2.4.


Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile16 Sep 2011 10:31:23 -  1.36
+++ Makefile3 Apr 2012 00:41:51 -
@@ -4,12 +4,11 @@ SHARED_ONLY=  Yes
 
 COMMENT=   library for reading and writing QuickTime files
 
-DISTNAME=  libquicktime-1.2.3
-REVISION=  0
+DISTNAME=  libquicktime-1.2.4
 CATEGORIES=multimedia
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libquicktime/}
 
-SHARED_LIBS=   quicktime   5.0
+SHARED_LIBS=   quicktime   5.1
 
 HOMEPAGE=  http://libquicktime.sourceforge.net/
 
@@ -22,13 +21,13 @@ PERMIT_DISTFILES_FTP=   Yes
 WANTLIB += GL ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp
 WANTLIB += Xext Xfixes Xi Xinerama Xmu Xpm Xrandr Xrender Xt Xv
 WANTLIB += Xxf86vm atk-1.0 avcodec avutil c cairo drm dv expat
-WANTLIB += faad fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += ffi faad 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 jpeg m mp3lame ogg orc-0.4 pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
-WANTLIB += schroedinger-1.0 sndio speex swscale theoradec theoraenc
-WANTLIB += vorbis vorbisenc vorbisfile vpx x264 xcb xcb-render
-WANTLIB += xcb-shm z
+WANTLIB += schroedinger-1.0 sndio speex stdc++ swscale theoradec
+WANTLIB += theoraenc vorbis vorbisenc vorbisfile vpx x264 xcb
+WANTLIB += xcb-render xcb-shm z
 
 MODULES=   devel/gettext
 BUILD_DEPENDS= devel/doxygen=1.7.2
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/libquicktime/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo29 Aug 2011 11:23:19 -  1.9
+++ distinfo2 Apr 2012 23:46:05 -
@@ -1,5 +1,5 @@
-MD5 (libquicktime-1.2.3.tar.gz) = moKhVGQIYF6oM3s6fHh4bg==
-RMD160 (libquicktime-1.2.3.tar.gz) = 5fjXt/vZm0Mry8lYjfYYeQnOIUU=
-SHA1 (libquicktime-1.2.3.tar.gz) = vaaa2tDf7e5BRivQ3RhA4ihyxdY=
-SHA256 (libquicktime-1.2.3.tar.gz) = 
xVdg+0Uj5F/CsuIkicN/CNGwQM5Z07T1YmxrKxN8dkY=
-SIZE (libquicktime-1.2.3.tar.gz) = 1022465
+MD5 (libquicktime-1.2.4.tar.gz) = gc/Outm37n58++/IYdbWGw==
+RMD160 (libquicktime-1.2.4.tar.gz) = Ta7QKqmZAyGK9oROh5M0zRrp4Bg=
+SHA1 (libquicktime-1.2.4.tar.gz) = cAiy3Ce5tAllvS30LTn/TLi2MF4=
+SHA256 (libquicktime-1.2.4.tar.gz) = 
HFM1nDOzE0e017ANNhFGP+XpQsrj7A/v4NL9QT/Uc2g=
+SIZE (libquicktime-1.2.4.tar.gz) = 1028626
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/multimedia/libquicktime/patches/patch-configure,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure
--- patches/patch-configure 29 Aug 2011 11:23:19 -  1.12
+++ patches/patch-configure 2 Apr 2012 23:49:55 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.12 2011/08/29 11:23:19 jasper Exp $
 configure.orig Tue Jul  5 15:36:53 2011
-+++ configure  Tue Jul  5 17:43:07 2011
-@@ -14957,7 +14957,7 @@ fi
+--- configure.orig Thu Mar 29 15:45:15 2012
 configure  Mon Apr  2 19:49:37 2012
+@@ -14951,7 +14951,7 @@ fi
  VORBIS_LIBS=-L$prefix/lib
fi
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.12 2011/08
VORBISFILE_LIBS=-lvorbisfile
VORBISENC_LIBS=-lvorbisenc
  
-@@ -15117,11 +15117,7 @@ if test x$with_lame != xno; then
+@@ -15111,11 +15111,7 @@ if test x$with_lame != xno; then
  OLD_CFLAGS=$CFLAGS
  OLD_LIBS=$LIBS
  

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

Re: X11 requirements for building ports.

[Brad Smith]

On 08/04/12 6:25 PM, Stuart Henderson wrote:

However a lot of non-GUI software does depend on things that are
provided with X (notably, fontconfig).


as well as freetype.

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

Re: Kill audio/bmp?

[Brad Smith]

On 12/04/12 2:49 PM, Edd Barrett wrote:

Does it even work? I have all of the plugins installed and there seems
to be only esound output in the outputs list.


Yes, it works. That is what is expected.

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

Re: [update] buildbot 0.8.6

[Brad Smith]

On 12/04/12 11:24 AM, Landry Breuil wrote:

Hi,

Here's an update to latest buildbot/buildslave, see
http://buildbot.net/buildbot/docs/0.8.6p1/release-notes.html for the
list of changes. Not much tweaking in master.cfg, my instance still
runs fine. Remember to run update-master of course.

Landry


Buildslave working fine for me on amd64 with a handful of slaves.

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

Re: [update] buildbot 0.8.6

[Brad Smith]

On 13/04/12 2:24 PM, Piotr Sikora wrote:

Hey,


Upstream provides a distname with p1 , meaning 0.8.6 patchlevel 1, so
lets use that for the packagename since pl is a valid version stem..


Yeah, I get it, but what's the advantage of having:

py-buildbot-0.8.6pl1
py-buildbot-0.8.6pl1p0
py-buildbot-0.8.6pl1p1
...

instead of the existing:

py-buildbot-0.8.6.1
py-buildbot-0.8.6.1p0
py-buildbot-0.8.6.1p1
...

?

The latter is IMHO more readable.


I agree. It is.

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

UPDATE: Tremor

[Brad Smith]

Attached is an update to an up to date snapshot of the Tremor decoder.
What is currently in the ports tree is pretty old and has a few security
related issues and there have been a good number of bug fixes along the
way as well. Also attached are some fixes for the dependent ports.

Tested on amd64 with xmms-tremor/xmms2/tremor-tools.

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

Index: Makefile
===
RCS file: /home/cvs/ports/audio/tremor/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile17 Aug 2011 12:38:35 -  1.17
+++ Makefile11 Apr 2012 00:13:45 -
@@ -2,10 +2,12 @@
 
 COMMENT=   integer-only, fully Ogg Vorbis compliant decoder library
 
-DISTNAME=  tremor-20080326
-REVISION=  0
-SHARED_LIBS += vorbisidec   2.0  # .1.2
+DISTNAME=  tremor-20120410
 CATEGORIES=audio
+MASTER_SITES=  http://comstyle.com/source/
+EXTRACT_SUFX=  .tar.bz2
+
+SHARED_LIBS=   vorbisidec  3.0
 
 HOMEPAGE=  http://www.xiph.org/vorbis/
 
@@ -15,25 +17,24 @@ PERMIT_DISTFILES_FTP=   Yes
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 
-MASTER_SITES=  http://distfiles.bsdfrog.org/   
+WANTLIB=   ogg
+
+LIB_DEPENDS=   audio/libogg
 
 # autogen.sh needs libtoolize
 BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
 
-AUTOCONF_VERSION=2.61
-AUTOMAKE_VERSION=1.9
+AUTOCONF_VERSION=  2.61
+AUTOMAKE_VERSION=  1.10
 
 USE_LIBTOOL=   Yes
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE= gnu
 
 WRKDIST=   ${WRKDIR}/Tremor
 
-post-extract:
-   @perl -pi -e 's/\r\n/\n/g' ${WRKSRC}/Version_script.in
-
-pre-configure:
+post-patch:
@cd ${WRKSRC}  env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
 
Index: distinfo
===
RCS file: /home/cvs/ports/audio/tremor/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo7 Apr 2008 04:08:35 -   1.3
+++ distinfo11 Apr 2012 00:14:29 -
@@ -1,5 +1,5 @@
-MD5 (tremor-20080326.tar.gz) = //zUUE/tHg9nxv1fTvJJ/w==
-RMD160 (tremor-20080326.tar.gz) = 5SPJbqKCzgCC4i2QCDAKWPniWIo=
-SHA1 (tremor-20080326.tar.gz) = 7p0VLjkcSlY3Bn9pLhWR7Eycu6Q=
-SHA256 (tremor-20080326.tar.gz) = TIqNDWm6RsdEZpy19fNmi6+xWnqdeWbteLVi1G4wxUY=
-SIZE (tremor-20080326.tar.gz) = 313582
+MD5 (tremor-20120410.tar.bz2) = eXAO0PXXjhsQi0zZ/Q13sw==
+RMD160 (tremor-20120410.tar.bz2) = QvPTs7uOeACVa9ZuHtapOXhE2fM=
+SHA1 (tremor-20120410.tar.bz2) = BHdlg+w+DZImxXZkI5Ojz9EQucA=
+SHA256 (tremor-20120410.tar.bz2) = RM3oW90YOsiG9Vjf57Ms03BdmgdtONrQTu7l+dc7tOA=
+SIZE (tremor-20120410.tar.bz2) = 256053
Index: patches/patch-Version_script_in
===
RCS file: patches/patch-Version_script_in
diff -N patches/patch-Version_script_in
--- patches/patch-Version_script_in 17 Aug 2011 12:38:35 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-Version_script_in,v 1.1 2011/08/17 12:38:35 jasper Exp $
 Version_script.in.orig Sat Jul 30 20:16:15 2011
-+++ Version_script.in  Sat Jul 30 20:21:11 2011
-@@ -43,6 +43,17 @@
-   vorbis_comment_query;
-   vorbis_comment_query_count;
-   vorbis_comment_clear;
-+  vorbis_block_init;
-+  vorbis_block_clear;
-+  vorbis_dsp_clear;
-+  vorbis_synthesis_headerin;
-+  vorbis_synthesis_init;
-+  vorbis_synthesis_restart;
-+  vorbis_synthesis;
-+  vorbis_synthesis_blockin;
-+  vorbis_synthesis_pcmout;
-+  vorbis_synthesis_read;
-+  vorbis_packet_blocksize;
- 
-   local:
-   *;
Index: patches/patch-configure_in
===
RCS file: /home/cvs/ports/audio/tremor/patches/patch-configure_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_in
--- patches/patch-configure_in  17 Aug 2011 12:38:35 -  1.1
+++ patches/patch-configure_in  5 Oct 2011 05:23:48 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure_in,v 1.1 2011/08/17 12:38:35 jasper Exp $
 configure.in.orig  Tue Mar 25 22:56:24 2008
-+++ configure.in   Sat Jul 30 20:33:10 2011
-@@ -59,13 +59,13 @@ else
+--- configure.in.orig  Wed Oct  5 01:12:59 2011
 configure.in   Wed Oct  5 01:23:43 2011
+@@ -62,13 +62,13 @@ else
  case $host in 
  arm-*-*)
  DEBUG=-g -Wall -D__NO_MATH_INLINES -fsigned-char 
-D_ARM_ASSEM_
@@ -19,21 +19,3 @@ $OpenBSD: patch-configure_in,v 1.1 2011/
  esac
  fi
  CFLAGS=$CFLAGS $cflags_save -D_REENTRANT
-@@ -76,16 +76,7 @@ LDFLAGS=$LDFLAGS $ldflags_save
- 

Re: FLAC/Ogg/Vorbis support for audio/libsndfile (Was Re: [NEW] audio/mumble)

[Brad Smith]

On Mon, 16 Apr 2012, Pascal Stumpf wrote:

I now remember why I've gone down this route. There's no way to enable
just ogg support. The only option with libsndfile's configure is
--enable-external-libs which will enable (and require) FLAC, Ogg,
Speex and Vorbis: frankly, it's a bit overkill imo...


Having Ogg support without Vorbis support makes no sense. Vorbis is the
codec used in the vast majority of Ogg files. It would be pretty useless
to have libsndfile be able to access the container but not be able to
encode/decode the audio within it.

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

UPDATE: FFmpeg 20120422 snapshot

[Brad Smith]

Here is an update to an FFmpeg 20120422 snapshot taken from the 0.7
branch. This doesn't buy us anything for features but it does fix a
whole lot of security related issues and bugs. Builds with everything
in the tree. Tested on amd64 with VLC/Xine-lib/MPlayer.


Index: Makefile
===
RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile8 Apr 2012 16:56:51 -   1.85
+++ Makefile22 Apr 2012 04:52:33 -
@@ -2,21 +2,20 @@
 
 COMMENT=   audio/video converter and streamer
 
-V= 2026
+V= 20120422
 DISTNAME=  ffmpeg-git-${V}
 PKGNAME=   ffmpeg-${V}
-REVISION=  0
 CATEGORIES=graphics multimedia
 MASTER_SITES=  http://comstyle.com/source/
 EXTRACT_SUFX=  .tar.bz2
 
-SHARED_LIBS=   avcodec 16.2 \
-   avdevice4.1 \
-   avfilter2.2 \
-   avformat14.2 \
-   avutil  8.2 \
+SHARED_LIBS=   avcodec 17.0 \
+   avdevice5.0 \
+   avfilter3.0 \
+   avformat15.0 \
+   avutil  9.0 \
postproc14.0 \
-   swscale 3.2
+   swscale 4.0
 
 HOMEPAGE=  http://ffmpeg.org/
 
@@ -67,11 +66,6 @@ FFMPEG_ARCH= generic
 FFMPEG_ARCH=   ${MACHINE_ARCH}
 .endif
 
-OPTFLAGS=  ${CFLAGS}
-
-# until the system headers are fixed properly.
-OPTFLAGS+= -Wno-redundant-decls
-
 USE_GMAKE= Yes
 CONFIGURE_STYLE= simple
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
@@ -103,8 +97,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-x11grab \
--extra-cflags=-I${LOCALBASE}/include -I${X11BASE}/include \
--extra-libs=-L${LOCALBASE}/lib -L${X11BASE}/lib \
-   --mandir=${PREFIX}/man \
-   --optflags=${OPTFLAGS}
+   --mandir=${PREFIX}/man
 
 CONFIGURE_ENV+=LIBavcodec_EXTRALIBS=${LIBavcodec_EXTRALIBS} \
LIBavdevice_EXTRALIBS=${LIBavdevice_EXTRALIBS} \
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo30 Dec 2011 17:34:39 -  1.20
+++ distinfo22 Apr 2012 04:25:59 -
@@ -1,5 +1,5 @@
-MD5 (ffmpeg-git-2026.tar.bz2) = 8wE3eHPiBIVeKeC28Jfgpg==
-RMD160 (ffmpeg-git-2026.tar.bz2) = 82Jpr5wP9s3edVjXrKPNB/+Yfo8=
-SHA1 (ffmpeg-git-2026.tar.bz2) = nodItiAZOLJ9N3HOPH7nPoxYSEM=
-SHA256 (ffmpeg-git-2026.tar.bz2) = 
LVfk+XnuoYk0wNqCebPHgCUC1ioprRQcpcO6Dfl9wlE=
-SIZE (ffmpeg-git-2026.tar.bz2) = 4500115
+MD5 (ffmpeg-git-20120422.tar.bz2) = FIvZR59fVAYWfyYA3SibHQ==
+RMD160 (ffmpeg-git-20120422.tar.bz2) = EFkAKIN6d6XvX/rVL4A+cDSeGNc=
+SHA1 (ffmpeg-git-20120422.tar.bz2) = 3ivLDfdrywb5n9fu4DyVyeCwIlg=
+SHA256 (ffmpeg-git-20120422.tar.bz2) = 
zbO5f21FhD+X1HgeIsdFbCPNgOswuIqHhx2iZXgAVyc=
+SIZE (ffmpeg-git-20120422.tar.bz2) = 4488962
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v
retrieving revision 1.28
diff -u -p -r1.28 patch-configure
--- patches/patch-configure 30 Dec 2011 17:34:39 -  1.28
+++ patches/patch-configure 22 Apr 2012 04:51:02 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.28 2011/12/30 17:34:39 edd Exp $
 configure.orig Thu Sep 22 14:48:24 2011
-+++ configure  Thu Sep 22 23:08:31 2011
-@@ -1093,7 +1093,6 @@ HAVE_LIST=
+--- configure.orig Sat Apr 21 23:53:38 2012
 configure  Sun Apr 22 00:50:49 2012
+@@ -1092,7 +1092,6 @@ HAVE_LIST=
  lzo1x_999_compress
  machine_ioctl_bt848_h
  machine_ioctl_meteor_h
@@ -9,16 +9,15 @@ $OpenBSD: patch-configure,v 1.28 2011/12
  MapViewOfFile
  memalign
  mkstemp
-@@ -2413,6 +2412,8 @@ case $target_os in
+@@ -2425,6 +2424,7 @@ case $target_os in
  enable pic
  disable symver
  SHFLAGS='-shared'
 +SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)'
-+SLIB_INSTALL_LINKS=
  oss_indev_extralibs=-lossaudio
  oss_outdev_extralibs=-lossaudio
  ;;
-@@ -2591,7 +2592,7 @@ die_license_disabled version3 libvo_amrwbenc
+@@ -2601,7 +2601,7 @@ die_license_disabled version3 libvo_amrwbenc
  
  enabled version3  { enabled gpl  enable gplv3 || enable lgplv3; }
  
@@ -27,7 +26,7 @@ $OpenBSD: patch-configure,v 1.28 2011/12
  
  enable_pic() {
  enable pic
-@@ -2772,8 +2773,6 @@ if enabled asm; then
+@@ -2797,8 +2797,6 @@ if enabled asm; then
  $nogas GNU assembler not found, install gas-preprocessor
  fi
  
@@ -36,7 +35,7 @@ $OpenBSD: patch-configure,v 1.28 2011/12
  if check_func dlopen; then
  ldl=
  elif check_func dlopen -ldl; then
-@@ -2906,7 +2905,7 @@ enabled libdirac

Re: tedu print/acroread?

[Brad Smith]

On 24/04/12 5:17 PM, Marc Espie wrote:

On Tue, Apr 24, 2012 at 07:00:06PM +0200, David Coppa wrote:

On Tue, Apr 24, 2012 at 5:48 PM, Ted Unangstt...@tedunangst.com  wrote:

On Tue, Apr 24, 2012 at 17:03, David Coppa wrote:

Who uses this?


Ironically, I was using it not all that long ago, because xpdf shit
its pants on about half the PDFs I was trying to read.  But it doesn't
seem to be installed currently, so I haven't needed it recently.


Then, I'll see if it can be updated... The pre-WWII version we have
now is pretty useless

That would be cool...

you may find out the linux emul is now dreadfully old.


Being limited to i386 is pretty killer too.

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

Re: WIP: dnsmasq 2.61rc1

[Brad Smith]

On Thu, Apr 05, 2012 at 12:28:48PM -0400, Brad Smith wrote:
 dnsmasq 2.61 is close to the next release. This release has had a number of
 improvements and some bug fixes mainly with the new DHCPv6 and RA support.
 The ra-names feature now works on OpenBSD.
 
 Here is rc1 for anyone using dnsmasq that is interested in helping out
 test this and provide any feedback to the author.
 
Here is an updated diff for the rc4 release.

While testing the TFTP server with the pending IPv6 support diff for
tftp(1) I found that the TFTP server was broken over IPv4 back at
version 2.56 when IPv6 support was added. This has now been fixed.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile25 Oct 2011 10:20:26 -  1.21
+++ Makefile27 Apr 2012 18:43:33 -
@@ -1,10 +1,12 @@
 # $OpenBSD: Makefile,v 1.21 2011/10/25 10:20:26 sthen Exp $
 
-COMMENT=   caching DNS forwarder and DHCP server
+NOT_FOR_ARCHS= ${GCC2_ARCHS}
 
-DISTNAME=  dnsmasq-2.59
+COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
+
+DISTNAME=  dnsmasq-2.61rc4
 CATEGORIES=net
-MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
+MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/release-candidates/
 
 HOMEPAGE=  http://www.thekelleys.org.uk/dnsmasq/doc.html
 
@@ -27,8 +29,8 @@ pre-build:
${WRKSRC}/dnsmasq.conf.example
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dnsmasq
+   ${INSTALL_PROGRAM} ${WRKSRC}/src/dnsmasq ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/dnsmasq.conf.example 
${PREFIX}/share/examples/dnsmasq
${INSTALL_MAN} ${WRKSRC}/man/dnsmasq.8 ${PREFIX}/man/man8
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo25 Oct 2011 10:20:26 -  1.16
+++ distinfo27 Apr 2012 18:43:33 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.59.tar.gz) = tXV+8te2UXSO7ruIrynX1g==
-RMD160 (dnsmasq-2.59.tar.gz) = 0u2FX0/BcH3zI92sAnq4/QdwuCc=
-SHA1 (dnsmasq-2.59.tar.gz) = kwLzjRLQCCPSDMkScJBQi0h2xa4=
-SHA256 (dnsmasq-2.59.tar.gz) = vcHmYJn6/6sOL9OUwGRscYsk9BfssP8ygzgqIEbxQQs=
-SIZE (dnsmasq-2.59.tar.gz) = 474036
+MD5 (dnsmasq-2.61rc4.tar.gz) = zcTYZlzKwwmWrDx5e8nMwQ==
+RMD160 (dnsmasq-2.61rc4.tar.gz) = mGINzfOloDKyoxfrAZWr/Mm/4Ks=
+SHA1 (dnsmasq-2.61rc4.tar.gz) = 8A1dgRhFebGURqLZfDRA2jlHw5U=
+SHA256 (dnsmasq-2.61rc4.tar.gz) = hPVtSo3Zd1vqsjmSeB116/kCn/xmF7blAnzy2/XJU+8=
+SIZE (dnsmasq-2.61rc4.tar.gz) = 547656
Index: patches/patch-dnsmasq_conf_example
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-dnsmasq_conf_example,v
retrieving revision 1.1
diff -u -p -r1.1 patch-dnsmasq_conf_example
--- patches/patch-dnsmasq_conf_example  14 Jun 2009 17:07:25 -  1.1
+++ patches/patch-dnsmasq_conf_example  27 Apr 2012 18:43:33 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-dnsmasq_conf_example,v 1.1 2009/06/14 17:07:25 kili Exp $
 dnsmasq.conf.example.orig  Mon Jun  8 23:05:30 2009
-+++ dnsmasq.conf.example   Sat Jun 13 12:34:06 2009
+--- dnsmasq.conf.example.orig  Mon Apr 16 12:26:19 2012
 dnsmasq.conf.example   Mon Apr 16 20:42:36 2012
 @@ -2,7 +2,7 @@
  #
  # Format is one option per line, legal options are the same
@@ -8,5 +8,5 @@ $OpenBSD: patch-dnsmasq_conf_example,v 1
 -# /usr/sbin/dnsmasq --help or man 8 dnsmasq for details.
 +# ${LOCALBASE}/sbin/dnsmasq --help or man 8 dnsmasq for details.
  
- # The following two options make you a better netizen, since they
- # tell dnsmasq to filter out queries which the public DNS cannot
+ # Listen on this specific port instead of the standard DNS port
+ # (53). Setting this to zero completely disables DNS function,
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.10
diff -u -p -r1.10 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 7 Sep 2011 10:34:26 -   1.10
+++ patches/patch-man_dnsmasq_8 27 Apr 2012 18:43:33 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.10 2011/09/07 10:34:26 jasper Exp $
 man/dnsmasq.8.orig Tue Aug  9 11:05:38 2011
-+++ man/dnsmasq.8  Mon Aug 29 17:35:40 2011
+--- man/dnsmasq.8.orig Fri Apr 20 16:28:49 2012
 man/dnsmasq.8  Fri Apr 20 23:04:18 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.10 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1206,7 +1205,7 @@ with # are always skipped. This flag may be given on t
+@@ -1430,7 +1429,7 @@ with # are always skipped. This flag may

Re: [update] libmp4v2 1.9.1

[Brad Smith]

On 02/05/12 11:14 AM, Landry Breuil wrote:

Hi,

so i wanted to update easytag and now it needs a newer libmp4v2.. which
changed homepage/maintainers/moved headers around/etc.. so here's a diff
updating it, and 3 diffs to fix the consumers (gtkpod, faac, daapd).
mediatomb builds fine with that updated libmp4v2 so no diff for it.

I'd like real users of daapd/gtkpod/faac to report whether it breaks
nothing for them.. so far only build-tested @amd64.

Landry


I don't use any of the dependent ports but the diffs look good to me.


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

Re: pjsua 1.12 - 1.14

[Brad Smith]

On 04/05/12 6:15 PM, Holger Mikolon wrote:

A new pjsua release is out.

Release notes can be found here:
http://trac.pjsip.org/repos/milestone/release-1.14

Proposal patch for ports tree below.

On my amd64 machine running -current I get multiple pjsua
logs like this: pthread_mutex_destroy on mutex with waiters!
However making calls works. Identical behavior with both
pjsua versions 1.12 and 1.14.

Holger



Index: Makefile
===
RCS file: /cvs/ports/telephony/pjsua/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile7 Mar 2012 12:35:39 -   1.22
+++ Makefile4 May 2012 20:50:30 -
@@ -2,10 +2,10 @@

  COMMENT=  lightweight sip client

-VERSION=   1.12
+VERSION=   1.14
  DISTNAME= pjproject-${VERSION}
  PKGNAME=  pjsua-${VERSION}
-REVISION=  2
+REVISION=  
  EXTRACT_SUFX= .tar.bz2
  CATEGORIES=   telephony


Remove the REVISION line.

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

Re: WIP: FFmpeg 20120428 snapshot

[Brad Smith]

On 02/05/12 6:30 PM, Brad Smith wrote:

Here is a work in progress update to an FFmpeg snaphot dated 20120428
but now from the 0.10 branch. This brings us up to date with a modern
FFmpeg release branch and buys us a whole load of new encoders/decoders,
bug fixes and varius improvements. As well as some diffs for some of
the dependent ports.

Most of the ports tree is in good shape to be able to build with this
update but there are still some ports that need some work.

transcode - update pending
picard - update pending
opencv - needs build checking
k3b - needs patching/testing
h323plus - needs patching/testing
mplayer - needs patching/testing or updating

http://comstyle.com/ports/ffmpeg/



Posted a diff for MPlayer. So that leaves just h323plus left.

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

Re: UPDATE: graphics/gimp

[Brad Smith]

On 09/05/12 10:16 AM, Giovanni Bechis wrote:

Hi,
major update to gimp, works fine @amd64, tests on other arches are welcome.
  Cheers
   Giovanni


It looks like you missed cvs add'ing a patch for babl.


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

QEMU 1.1-rc1 for testing

[Brad Smith]

Here is an update to QEMU 1.1-rc1 for anyone wanting to do any
testing and provide any feedback before the actual release.


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile16 Mar 2012 11:40:53 -  1.85
+++ Makefile14 May 2012 03:46:41 -
@@ -5,7 +5,7 @@ BROKEN-hppa=compiler bug with gcc 4.2
 
 COMMENT=   multi system emulator
 
-DISTNAME=  qemu-1.0.1
+DISTNAME=  qemu-1.1-rc1
 CATEGORIES=emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
 
@@ -34,7 +34,7 @@ LIB_DEPENDS=  devel/glib2 \
 MODPY_RUNDEP=  No
 
 MAKE_ENV=  V=1
-FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples
+FAKE_FLAGS=qemu_confdir=${PREFIX}/share/examples/qemu
 
 EXTRA_CFLAGS=  -I${LOCALBASE}/include -I${X11BASE}/include
 EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
@@ -75,13 +75,15 @@ FLAVORS=debug
 FLAVOR?=
 
 .if ${FLAVOR:Mdebug}
+CFLAGS+=   -O0
 CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug-info
 .endif
 
 NO_REGRESS=Yes
 
 post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup \
${PREFIX}/share/examples/qemu
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown \
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo16 Mar 2012 11:40:53 -  1.19
+++ distinfo14 May 2012 01:10:24 -
@@ -1,5 +1,5 @@
-MD5 (qemu-1.0.1.tar.gz) = Xv0QkfAeO8Mb/ewnuO3rAA==
-RMD160 (qemu-1.0.1.tar.gz) = 3O80TxUOI4iAhxdo8vB8y26OzOc=
-SHA1 (qemu-1.0.1.tar.gz) = TQi1qDU4/NeyIr7G8cWE2o0SSXo=
-SHA256 (qemu-1.0.1.tar.gz) = GYkC4QeCUX9gfJ7Z5im153COo56zc+0+w/HIoWnZg3g=
-SIZE (qemu-1.0.1.tar.gz) = 10853005
+MD5 (qemu-1.1-rc1.tar.gz) = +5KS6Fg8DAmAPrJVZPjGng==
+RMD160 (qemu-1.1-rc1.tar.gz) = 5T/eyaTVJYlWZSIOiVyS7ennL6o=
+SHA1 (qemu-1.1-rc1.tar.gz) = o7qbN0Z+qUqqVnMJp1ZNY/9GBqM=
+SHA256 (qemu-1.1-rc1.tar.gz) = GnQwYheSUHfTJ4iRb5tl0swrJLAOW7O7rw7bDrSU6CQ=
+SIZE (qemu-1.1-rc1.tar.gz) = 11702330
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.22
diff -u -p -r1.22 patch-configure
--- patches/patch-configure 16 Mar 2012 11:40:53 -  1.22
+++ patches/patch-configure 14 May 2012 01:19:24 -
@@ -1,29 +1,14 @@
 $OpenBSD: patch-configure,v 1.22 2012/03/16 11:40:53 fgsch Exp $
 configure.orig Fri Feb 17 14:45:39 2012
-+++ configure  Fri Feb 17 16:02:57 2012
-@@ -235,13 +235,11 @@ sdl_config=${SDL_CONFIG-${cross_prefix}sdl-config}
- 
- # default flags for all hosts
- QEMU_CFLAGS=-fno-strict-aliasing $QEMU_CFLAGS
--CFLAGS=-g $CFLAGS
- QEMU_CFLAGS=-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS
- QEMU_CFLAGS=-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS
- QEMU_CFLAGS=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 
$QEMU_CFLAGS
- QEMU_CFLAGS=-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS
- QEMU_INCLUDES=-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu
--LDFLAGS=-g $LDFLAGS
- 
- # make source path absolute
- source_path=`cd $source_path; pwd`
-@@ -2684,8 +2682,9 @@ fi
+--- configure.orig Thu May 10 08:11:22 2012
 configure  Sun May 13 21:19:06 2012
+@@ -2835,10 +2835,6 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
  
 -if test $debug = no ; then
 -  CFLAGS=-O2 $CFLAGS
-+if test $debug = yes ; then
-+  CFLAGS=$CFLAGS -O0 -g
-+  LDFLAGS=$LDFLAGS -g
- fi
- 
+-fi
+-
  # Consult white-list to determine whether to enable werror
+ # by default.  Only enable by default for git builds
+ z_version=`cut -f3 -d. $source_path/VERSION`
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST   12 Dec 2011 10:56:56 -  1.20
+++ pkg/PLIST   14 May 2012 03:42:26 -
@@ -89,6 +89,7 @@ share/qemu/keymaps/sl
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
+share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
 share/qemu/mpc8544ds.dtb
 share/qemu/multiboot.bin
@@ -105,6 +106,7 @@ share/qemu/pxe-ne2k_pci.rom
 share/qemu/pxe-pcnet.rom
 share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
+share/qemu/qemu-icon.bmp
 share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin
 share/qemu/slof.bin

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

Re: [new] audio/deadbeef

[Brad Smith]

On 14/05/12 3:16 PM, Alexandr Shadchin wrote:

Hi,

pkg/DESCR:
DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux, BSD,
OpenSolaris and probably other UNIX-like systems.

Some features (more can be found on the homepage):

* mp3, ogg vorbis, flac, ape, wv, wav, cd audio (and many more)
* ID3v1, ID3v2.2, ID3v2.3, ID3v2.4, APEv2, xing/info tags support
* no GNOME or KDE dependencies
* minimize to tray, with scrollwheel volume control
* drag and drop, both inside the playlist, and from other applications
* control playback from command line
* global hotkeys
* multiple playlists
* album artwork display
* 18-band graphical equalizer
* metadata editor
* user-customizable groups in playlists
* user-customizable columns with flexible title formatting
* radio and podcast support for ogg vorbis, mp3 and aac streams
* gapless playback
* plugin support; bundled with lots of plugins, such as global
   hotkeys and last.fm scrobbler; sdk is included

Tested on amd64.

Comments ? OK ?


So far I'm just taking a quick look over the port.

Check the usage of yasm. That is usually only used on amd64 and/or i386.

Change CONFIGURE_STYLE to gnu. Get rid of the pre-configure target and
change the aclocal to autoreconf.

The Makefile.am does not make any sense.

The alloca patching should probably do something similar to what naddy@ 
did for misc/dvtm..


+#if defined(__GNUC__)  defined(__STRICT_ANSI__)
+#define alloca(size)   __builtin_alloca(size)
+#endif

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

UPDATE: faad 2.7

[Brad Smith]

Here is an update to faad 2.7 and some adjustments for some of the 
dependent ports.


Everything in the tree builds Ok. Tested with Xine-lib,
Audacious-plugins and faad-xmms on amd64. Looking for
testing on i386 and sparc64.

http://comstyle.com/ports/faad/

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

UPDATE: liba52 0.7.5

[Brad Smith]

Here is an update to a snapshot of liba52 which was intended to be
0.7.5. The upstream project is essentially dead but I think the fixes
and improvements since 0.7.4 are worth getting in.

Tested with a handful of DVDs on amd64 with Xine-lib and Ogle. All
dependent ports build Ok.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/liba52/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile29 Mar 2012 13:38:13 -  1.17
+++ Makefile15 May 2012 20:32:52 -
@@ -1,30 +1,32 @@
-#$OpenBSD: Makefile,v 1.17 2012/03/29 13:38:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2012/03/29 13:38:13 sthen Exp $
 
+COMMENT =  free library for decoding ATSC A/52 streams, aka AC-3
+
+DISTFILES =a52dec-snapshot.tar.gz
+DISTNAME = a52dec-0.7.5-cvs
+PKGNAME =  liba52-0.7.5
 CATEGORIES =   audio
+MASTER_SITES = http://comstyle.com/source/
+
+SHARED_LIBS =  a52 1.0
 
-COMMENT =  AC-3 decoding library
-DISTNAME = a52dec-0.7.4
-PKGNAME =  liba52-0.7.4
-REVISION = 2
-MASTER_SITES = http://liba52.sourceforge.net/files/
 HOMEPAGE = http://liba52.sourceforge.net/
-SHARED_LIBS += a52  0.0  # .0.0
 
 MAINTAINER =   Marc Espie es...@openbsd.org
 
-CONFIGURE_STYLE =  gnu
-CONFIGURE_ARGS +=  ${CONFIGURE_SHARED}
-MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/autotools
-SEPARATE_BUILD =   Yes
-USE_LIBTOOL =  Yes
-USE_GROFF =Yes
-
-# GPL
+# GPLv2+
 PERMIT_DISTFILES_CDROM = Yes
-PERMIT_DISTFILES_FTP = Yes
-PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP = Yes
-
-WANTLIB =  c m ossaudio
+PERMIT_DISTFILES_FTP = Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+
+WANTLIB =  c m ossaudio
+
+USE_LIBTOOL =  Yes
+SEPARATE_BUILD = Yes
+CONFIGURE_STYLE = autoconf
+AUTOCONF_VERSION = 2.59
+CONFIGURE_ARGS += ${CONFIGURE_SHARED}
+MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/autotools
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/audio/liba52/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo5 Apr 2007 15:37:43 -   1.5
+++ distinfo3 Jul 2011 13:47:35 -
@@ -1,5 +1,5 @@
-MD5 (a52dec-0.7.4.tar.gz) = yqn1vEQjLciu6nc/6la+gA==
-RMD160 (a52dec-0.7.4.tar.gz) = W2OzTFhA5xgrczytQekWqNSHXrE=
-SHA1 (a52dec-0.7.4.tar.gz) = ebM72NidrXQ2+FuRVK01ZnqjcyE=
-SHA256 (a52dec-0.7.4.tar.gz) = oh1ySrOzkzMwGUNTaH34LEdbXfuZdRPu9MJd5shl7DM=
-SIZE (a52dec-0.7.4.tar.gz) = 241507
+MD5 (a52dec-snapshot.tar.gz) = FynHUH92sNTMBFQJJsXQ1w==
+RMD160 (a52dec-snapshot.tar.gz) = d3yeskVYwXuHgAdyCjlzGpYKHHM=
+SHA1 (a52dec-snapshot.tar.gz) = LmSHj9xbzXnia4AgnnpEOyAT6cE=
+SHA256 (a52dec-snapshot.tar.gz) = kETGWygUNg+s8B1Ndn17M8oXRlQLNa3158bZDkeFb/4=
+SIZE (a52dec-snapshot.tar.gz) = 389367
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 7 Feb 2006 07:43:11 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2006/02/07 07:43:11 steven Exp $
 configure.orig Sun Jul 28 05:50:42 2002
-+++ configure  Tue Feb  7 01:03:57 2006
-@@ -2751,9 +2751,8 @@ if test x$GCC = xyes; then
- 
- 
- 
--OPT_CFLAGS=`echo $CFLAGS|sed s/-O[0-9]*//g`
-+OPT_CFLAGS=$CFLAGS
- 
--OPT_CFLAGS=$OPT_CFLAGS -O3
- echo $as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags 5
- echo $ECHO_N checking if $CC supports $OPT_CFLAGS flags... $ECHO_C 6
- SAVE_CFLAGS=$CFLAGS
Index: patches/patch-configure_in
===
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure_in  15 May 2012 06:34:23 -
@@ -0,0 +1,40 @@
+$OpenBSD$
+--- configure.in.orig  Tue May 15 02:33:28 2012
 configure.in   Tue May 15 02:34:15 2012
+@@ -30,13 +30,6 @@ if test x$GCC = xyes; then
+ TRY_CFLAGS=$OPT_CFLAGS -Wall
+ AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS])
+ 
+-dnl -O3
+-changequote(,)
+-TRY_CFLAGS=`echo $OPT_CFLAGS $CFLAGS|sed s/-O[0-9]*//g`
+-changequote([,])
+-TRY_CFLAGS=$TRY_CFLAGS -O3
+-AC_TRY_CFLAGS([$TRY_CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS; CFLAGS=])
+-
+ AC_ARG_ENABLE([debug],
+   [  --enable-debug  debug mode configuration])
+ if test x$enable_debug = xyes; then
+@@ -50,22 +43,6 @@ if test x$GCC = xyes; then
+ dnl -fno-common
+ TRY_CFLAGS=$OPT_CFLAGS -fno-common
+ AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS=$TRY_CFLAGS])
+-
+-dnl arch-specific flags
+-case $host in
+-i?86-* | k?-*)
+-  case $host in
+-  i386-*) TRY_CFLAGS=$OPT_CFLAGS -mcpu=i386;;
+-  i486-*) TRY_CFLAGS=$OPT_CFLAGS -mcpu=i486;;
+-  i586-*) TRY_CFLAGS=$OPT_CFLAGS 

Re: QEMU 1.1-rc1 for testing

[Brad Smith]

On Mon, May 14, 2012 at 12:02:00AM -0400, Brad Smith wrote:
 Here is an update to QEMU 1.1-rc1 for anyone wanting to do any
 testing and provide any feedback before the actual release.

Here is 1.1.0-rc2.


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile16 Mar 2012 11:40:53 -  1.85
+++ Makefile16 May 2012 05:54:58 -
@@ -5,9 +5,10 @@ BROKEN-hppa=   compiler bug with gcc 4.2
 
 COMMENT=   multi system emulator
 
-DISTNAME=  qemu-1.0.1
+DISTNAME=  qemu-1.1.0-rc2
 CATEGORIES=emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
+EXTRACT_SUFX=  .tar.bz2
 
 HOMEPAGE=  http://www.qemu.org/
 
@@ -34,7 +35,7 @@ LIB_DEPENDS=  devel/glib2 \
 MODPY_RUNDEP=  No
 
 MAKE_ENV=  V=1
-FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples
+FAKE_FLAGS=qemu_confdir=${PREFIX}/share/examples/qemu
 
 EXTRA_CFLAGS=  -I${LOCALBASE}/include -I${X11BASE}/include
 EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
@@ -75,13 +76,15 @@ FLAVORS=debug
 FLAVOR?=
 
 .if ${FLAVOR:Mdebug}
+CFLAGS+=   -O0
 CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug-info
 .endif
 
 NO_REGRESS=Yes
 
 post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup \
${PREFIX}/share/examples/qemu
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown \
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo16 Mar 2012 11:40:53 -  1.19
+++ distinfo16 May 2012 05:57:43 -
@@ -1,5 +1,5 @@
-MD5 (qemu-1.0.1.tar.gz) = Xv0QkfAeO8Mb/ewnuO3rAA==
-RMD160 (qemu-1.0.1.tar.gz) = 3O80TxUOI4iAhxdo8vB8y26OzOc=
-SHA1 (qemu-1.0.1.tar.gz) = TQi1qDU4/NeyIr7G8cWE2o0SSXo=
-SHA256 (qemu-1.0.1.tar.gz) = GYkC4QeCUX9gfJ7Z5im153COo56zc+0+w/HIoWnZg3g=
-SIZE (qemu-1.0.1.tar.gz) = 10853005
+MD5 (qemu-1.1.0-rc2.tar.bz2) = brgaB/1S9rANf/a93FL6hA==
+RMD160 (qemu-1.1.0-rc2.tar.bz2) = 7ulAss973hUFKHzBLzUjUvdMPHk=
+SHA1 (qemu-1.1.0-rc2.tar.bz2) = xMLOBEsF3O7qx+W617o2CW0hk0g=
+SHA256 (qemu-1.1.0-rc2.tar.bz2) = Oz73Z5RKjwPT0u5vRjrxeinPDav4vHgsnI7u38VvpYw=
+SIZE (qemu-1.1.0-rc2.tar.bz2) = 9627250
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.22
diff -u -p -r1.22 patch-configure
--- patches/patch-configure 16 Mar 2012 11:40:53 -  1.22
+++ patches/patch-configure 14 May 2012 01:19:24 -
@@ -1,29 +1,14 @@
 $OpenBSD: patch-configure,v 1.22 2012/03/16 11:40:53 fgsch Exp $
 configure.orig Fri Feb 17 14:45:39 2012
-+++ configure  Fri Feb 17 16:02:57 2012
-@@ -235,13 +235,11 @@ sdl_config=${SDL_CONFIG-${cross_prefix}sdl-config}
- 
- # default flags for all hosts
- QEMU_CFLAGS=-fno-strict-aliasing $QEMU_CFLAGS
--CFLAGS=-g $CFLAGS
- QEMU_CFLAGS=-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS
- QEMU_CFLAGS=-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS
- QEMU_CFLAGS=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 
$QEMU_CFLAGS
- QEMU_CFLAGS=-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS
- QEMU_INCLUDES=-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu
--LDFLAGS=-g $LDFLAGS
- 
- # make source path absolute
- source_path=`cd $source_path; pwd`
-@@ -2684,8 +2682,9 @@ fi
+--- configure.orig Thu May 10 08:11:22 2012
 configure  Sun May 13 21:19:06 2012
+@@ -2835,10 +2835,6 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
  
 -if test $debug = no ; then
 -  CFLAGS=-O2 $CFLAGS
-+if test $debug = yes ; then
-+  CFLAGS=$CFLAGS -O0 -g
-+  LDFLAGS=$LDFLAGS -g
- fi
- 
+-fi
+-
  # Consult white-list to determine whether to enable werror
+ # by default.  Only enable by default for git builds
+ z_version=`cut -f3 -d. $source_path/VERSION`
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST   12 Dec 2011 10:56:56 -  1.20
+++ pkg/PLIST   16 May 2012 18:43:18 -
@@ -53,6 +53,7 @@ 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/common
@@ -89,6 +90,7 @@ share/qemu/keymaps/sl
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
+share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
 share/qemu/mpc8544ds.dtb
 share/qemu/multiboot.bin
@@ -105,6 +107,7 @@ share/qemu/pxe-ne2k_pci.rom
 share/qemu/pxe-pcnet.rom
 share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
+share/qemu/qemu-icon.bmp
 share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin
 share/qemu/slof.bin

-- 
This message

UPDATE: libvpx 1.1.0

[Brad Smith]

Here is an update to libvpx 1.1.0.

Tested on amd64.


Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libvpx/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile28 Feb 2012 12:28:29 -  1.8
+++ Makefile17 May 2012 00:21:34 -
@@ -2,14 +2,14 @@
 
 COMMENT=   Google VP8 video codec
 
-V= 1.0.0
+V= 1.1.0
 DISTNAME=  libvpx-v${V}
 PKGNAME=   libvpx-${V}
 CATEGORIES=multimedia
 MASTER_SITES=  http://webm.googlecode.com/files/
 EXTRACT_SUFX=  .tar.bz2
 
-SHARED_LIBS=   vpx 3.0
+SHARED_LIBS=   vpx 4.0
 
 HOMEPAGE=  http://www.webmproject.org/
 
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/libvpx/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo28 Feb 2012 12:28:29 -  1.4
+++ distinfo16 May 2012 21:03:32 -
@@ -1,5 +1,5 @@
-MD5 (libvpx-v1.0.0.tar.bz2) = 2Ye1FAQS7dN9LGsQwprUhA==
-RMD160 (libvpx-v1.0.0.tar.bz2) = LuWi5/TLLxJsbQ2aNuhjZFX0KRU=
-SHA1 (libvpx-v1.0.0.tar.bz2) = KRnhEHT+9y/GHvGnUWAFD/qtYHQ=
-SHA256 (libvpx-v1.0.0.tar.bz2) = B87bChmkTm2B119S7qhk9Z7xDGxyXLhgQxvsZkHq/iE=
-SIZE (libvpx-v1.0.0.tar.bz2) = 1641411
+MD5 (libvpx-v1.1.0.tar.bz2) = euFjrDGWx57C8JBCgAeKRQ==
+RMD160 (libvpx-v1.1.0.tar.bz2) = b0YsFCGlGvd9NAHqTB6vDb6vR5E=
+SHA1 (libvpx-v1.1.0.tar.bz2) = NWr193DFDNAhxghjID2PMBZPYCE=
+SHA256 (libvpx-v1.1.0.tar.bz2) = nOB0z0s7zZpJ/5PgVIW3HCc7/DaFowXlWg5/pRvrcsU=
+SIZE (libvpx-v1.1.0.tar.bz2) = 1653485
Index: patches/patch-build_make_configure_sh
===
RCS file: 
/home/cvs/ports/multimedia/libvpx/patches/patch-build_make_configure_sh,v
retrieving revision 1.4
diff -u -p -r1.4 patch-build_make_configure_sh
--- patches/patch-build_make_configure_sh   28 Feb 2012 12:28:29 -  
1.4
+++ patches/patch-build_make_configure_sh   16 May 2012 21:10:17 -
@@ -1,13 +1,13 @@
 $OpenBSD: patch-build_make_configure_sh,v 1.4 2012/02/28 12:28:29 dcoppa Exp $
 build/make/configure.sh.orig   Fri Jan 27 13:36:39 2012
-+++ build/make/configure.shSun Jan 29 21:13:12 2012
+--- build/make/configure.sh.orig   Tue May  8 19:14:00 2012
 build/make/configure.shWed May 16 17:07:35 2012
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${BASH}
  ##
  ##  configure.sh
  ##
-@@ -1019,7 +1019,7 @@ EOF
+@@ -1082,7 +1082,7 @@ EOF
  case ${toolchain} in
  *-win*);;
  *-android-gcc);;
Index: patches/patch-build_make_gen_asm_deps_sh
===
RCS file: 
/home/cvs/ports/multimedia/libvpx/patches/patch-build_make_gen_asm_deps_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-build_make_gen_asm_deps_sh
--- patches/patch-build_make_gen_asm_deps_sh31 Oct 2010 21:05:38 -  
1.2
+++ patches/patch-build_make_gen_asm_deps_sh16 May 2012 21:10:12 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-build_make_gen_asm_deps_sh,v 1.2 2010/10/31 21:05:38 ckuethe 
Exp $
 build/make/gen_asm_deps.sh.origThu Oct 28 09:14:14 2010
-+++ build/make/gen_asm_deps.sh Thu Oct 28 21:59:18 2010
+--- build/make/gen_asm_deps.sh.origTue May  8 19:14:00 2012
 build/make/gen_asm_deps.sh Wed May 16 17:10:06 2012
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${BASH}
@@ -11,8 +11,8 @@ $OpenBSD: patch-build_make_gen_asm_deps_
  
  [ -n $srcfile ] || show_help
  sfx=${sfx:-asm}
--includes=$(egrep -i include +\?+[a-z0-9_/]+\.${sfx} $srcfile |
-+includes=$(egrep -i include +\*[a-z0-9_/]+\.${sfx} $srcfile |
+-includes=$(LC_ALL=C egrep -i include +\?+[a-z0-9_/]+\.${sfx} $srcfile |
++includes=$(LC_ALL=C egrep -i include +\*[a-z0-9_/]+\.${sfx} $srcfile |
 perl -p -e s;.*?([a-z0-9_/]+.${sfx}).*;\1;)
  # restore editor state
  for inc in ${includes}; do
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/multimedia/libvpx/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure
--- patches/patch-configure 28 Feb 2012 12:28:29 -  1.6
+++ patches/patch-configure 16 May 2012 21:10:13 -
@@ -1,13 +1,13 @@
 $OpenBSD: patch-configure,v 1.6 2012/02/28 12:28:29 dcoppa Exp $
 configure.orig Fri Jan 27 13:36:39 2012
-+++ configure  Sun Jan 29 21:11:03 2012
+--- configure.orig Tue May  8 19:14:00 2012
 configure  Wed May 16 17:07:35 2012
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!${BASH}
  ##
  ##  configure
  ##
-@@ -101,6 +101,7 @@ all_platforms=${all_platforms} ppc32-linux-gcc
+@@ -103,6 +103,7 @@ all_platforms=${all_platforms} ppc32-linux-gcc
  all_platforms=${all_platforms} ppc64-darwin8-gcc
  all_platforms=${all_platforms} ppc64-darwin9-gcc
  all_platforms=${all_platforms} ppc64-linux-gcc
@@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.6 2012/02/
  all_platforms=${all_platforms} sparc-solaris-gcc
  

Re: [new] audio/deadbeef

[Brad Smith]

- Original message -
 My uaudio(4) is fixed sample-rate so I need to use the resampler
 to output at 48KHz. (well actually there are dip switches which I can
 adjust which take effect when it attaches, but if I unplug it I need
 to reboot my workstation before OpenBSD will detect it again, but
 that's a different story...)

I don't get the point of this comment. This should just work with sndio.

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

Re: [new] audio/deadbeef

[Brad Smith]

- Original message -
 On 2012/05/17 04:03, Brad Smith wrote:
  - Original message -
   My uaudio(4) is fixed sample-rate so I need to use the resampler
   to output at 48KHz. (well actually there are dip switches which I can
   adjust which take effect when it attaches, but if I unplug it I need
   to reboot my workstation before OpenBSD will detect it again, but
   that's a different story...)
  
  I don't get the point of this comment. This should just work with
  sndio.
 
 well, yes, and it does with most programs, but it doesn't with deadbeef.

Well the sndio backend that has been written obviously has a few bugs to be 
worked out ;)

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

Re: CVS: cvs.openbsd.org: ports

[Brad Smith]

On Thu, May 17, 2012 at 01:44:40AM -0600, Jasper Lievisse Adriaanse wrote:
 CVSROOT:  /cvs
 Module name:  ports
 Changes by:   jas...@cvs.openbsd.org  2012/05/17 01:44:40
 
 Modified files:
   net/argus  : Makefile 
 
 Log message:
 missing bump

A bump was left out as there was no change to the resulting package.

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

WIP: Dovecot 2.1

[Brad Smith]

Attached is a start at providing updates to Dovecot 2.1 and the
associated add-ons. The antispam update was provided by sthen@.
So if you have a new enough -current system and can provide any
feedback please do so.

Note: none of this has been tested so far other than ensuring
it builds.

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

Index: Makefile
===
RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.187
diff -u -p -r1.187 Makefile
--- Makefile17 May 2012 07:48:15 -  1.187
+++ Makefile17 May 2012 21:35:15 -
@@ -6,11 +6,10 @@ COMMENT-server=   compact IMAP/POP3 server
 COMMENT-ldap=  LDAP authentication support for Dovecot
 COMMENT-mysql= MySQL authentication / dictionary support for Dovecot
 COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
-REVISION-server= 0
 
 # Bump dovecot-pigeonhole every time you update to a new Dovecot version.
-V_MAJOR=   2.0
-V_DOVECOT= 2.0.20
+V_MAJOR=   2.1
+V_DOVECOT= 2.1.6
 
 DISTNAME=  dovecot-${V_DOVECOT}
 PKGNAME=   dovecot-${V_DOVECOT}
@@ -21,11 +20,12 @@ PKGNAME-postgresql= dovecot-postgresql-$
 CATEGORIES=mail
 MASTER_SITES=  ${HOMEPAGE}releases/${V_MAJOR}/
 
-SHARED_LIBS=   dovecot-lda 0.0 \
-   dovecot-login   0.0 \
-   dovecot-sql 0.0 \
-   dovecot-storage 0.0 \
-   dovecot 0.0
+SHARED_LIBS=   dovecot-lda 1.0 \
+   dovecot-login   1.0 \
+   dovecot-sql 1.0 \
+   dovecot-ssl 0.0 \
+   dovecot-storage 1.0 \
+   dovecot 1.0
 
 HOMEPAGE=  http://www.dovecot.org/
 
@@ -39,7 +39,7 @@ PERMIT_DISTFILES_FTP= Yes
 
 WANTLIB-server=asn1 bz2 c crypto gssapi krb5 sqlite3 ssl z \
${MODLIBICONV_WANTLIB}
-WANTLIB-ldap=  asn1 com_err crypto gssapi krb5 lber-2.4 ldap-2.4 sasl2 ssl
+WANTLIB-ldap=  asn1 com_err crypto gssapi krb5 lber ldap sasl2 ssl
 WANTLIB-mysql= crypto m lib/mysql/mysqlclient=10 ssl z
 WANTLIB-postgresql= com_err crypto pq=4 ssl
 
@@ -52,7 +52,7 @@ RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_D
 LIB_DEPENDS-postgresql= databases/postgresql
 RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
 
-USE_LIBTOOL=   Yes
+USE_LIBTOOL=   gnu
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=--with-gssapi \
--with-rundir=/var/dovecot \
Index: distinfo
===
RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.97
diff -u -p -r1.97 distinfo
--- distinfo10 Apr 2012 22:39:08 -  1.97
+++ distinfo13 May 2012 02:37:07 -
@@ -1,5 +1,5 @@
-MD5 (dovecot-2.0.20.tar.gz) = 5nwWxbfKaCRK6IVpq1eQPw==
-RMD160 (dovecot-2.0.20.tar.gz) = T7Pv5s6hzaRzYBKAg1Vz6NtGNMc=
-SHA1 (dovecot-2.0.20.tar.gz) = xCHprLb7TlCabJu9gpcCCVQ8//A=
-SHA256 (dovecot-2.0.20.tar.gz) = +mMBWRJ+cQ3NYjuZvGVdH1+FiR/RYV8ZTqctT+PPgsA=
-SIZE (dovecot-2.0.20.tar.gz) = 3360751
+MD5 (dovecot-2.1.6.tar.gz) = VtKo1Sc9OcqkHWqN2fRELA==
+RMD160 (dovecot-2.1.6.tar.gz) = gH3cxBQCsOpsi/0z7I357R/3XZU=
+SHA1 (dovecot-2.1.6.tar.gz) = iL3oqBEGRu8aW1lDN6IZZOWzWFA=
+SHA256 (dovecot-2.1.6.tar.gz) = S4GyzfYkNExsL/kb4beUkRtRyY3/okCVpty8fra8Hok=
+SIZE (dovecot-2.1.6.tar.gz) = 3773967
Index: patches/patch-doc_example-config_Makefile_in
===
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_Makefile_in
--- patches/patch-doc_example-config_Makefile_in23 May 2011 22:54:38 
-  1.1
+++ patches/patch-doc_example-config_Makefile_in13 May 2012 02:49:32 
-
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_example-config_Makefile_in,v 1.1 2011/05/23 22:54:38 sthen 
Exp $
 doc/example-config/Makefile.in.origWed May 11 10:35:51 2011
-+++ doc/example-config/Makefile.in Wed May 11 20:26:49 2011
-@@ -285,7 +285,7 @@ top_srcdir = @top_srcdir@
+--- doc/example-config/Makefile.in.origFri May  4 17:14:16 2012
 doc/example-config/Makefile.in Sat May 12 22:47:30 2012
+@@ -296,7 +296,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = conf.d
  pkgsysconfdir = $(sysconfdir)/dovecot
  nodist_pkgsysconf_DATA = README
Index: patches/patch-doc_example-config_conf_d_10-mail_conf
===
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_10-mail_conf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_conf_d_10-mail_conf
--- patches/patch-doc_example-config_conf_d_10-mail_conf23 May 2011 
22:54:38 -  1.1
+++ patches/patch-doc_example-config_conf_d_10-mail_conf13 May 2012 
02:49:31 -
@@ -1,7 +1,7 @@
 $OpenBSD: 

Re: WIP: FFmpeg 20120428 snapshot

[Brad Smith]

On 22/05/12 1:25 AM, patrick keshishian wrote:

On Mon, May 7, 2012 at 10:21 PM, Brad Smithb...@comstyle.com  wrote:

On Wed, May 02, 2012 at 06:30:08PM -0400, Brad Smith wrote:

Here is a work in progress update to an FFmpeg snaphot dated 20120428
but now from the 0.10 branch. This brings us up to date with a modern
FFmpeg release branch and buys us a whole load of new encoders/decoders,
bug fixes and varius improvements. As well as some diffs for some of
the dependent ports.

Most of the ports tree is in good shape to be able to build with this
update but there are still some ports that need some work.

h323plus - needs patching/testing

http://comstyle.com/ports/ffmpeg/


Can't get to Brad's server. Anyone have the patch files archived elsewhere?


Sorry about that. Server is back up again.

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

UPDATE: x264-20120520

[Brad Smith]

Here is an update to x264-20120520.

Builds with everything in the tree Ok.

Tested on amd64 and sparc64.


Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/x264/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile7 Nov 2011 15:53:08 -   1.17
+++ Makefile21 May 2012 00:37:32 -
@@ -2,14 +2,14 @@
 
 COMMENT=   free H264/AVC encoder
 
-V= 20111027
+V= 20120520
 DISTNAME=  x264-snapshot-${V}-2245
 PKGNAME=   x264-${V}
 CATEGORIES=multimedia
-MASTER_SITES=  ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
+MASTER_SITES=  http://downloads.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=  .tar.bz2
 
-SHARED_LIBS=   x2648.0
+SHARED_LIBS=   x2649.0
 
 HOMEPAGE=  http://www.videolan.org/developers/x264.html
 
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/x264/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo7 Nov 2011 15:53:08 -   1.9
+++ distinfo21 May 2012 00:00:51 -
@@ -1,5 +1,5 @@
-MD5 (x264-snapshot-20111027-2245.tar.bz2) = 2HX9KPjoVvQEnEQ3AQqFEg==
-RMD160 (x264-snapshot-20111027-2245.tar.bz2) = 4Xfz0ZIGh2qVoCOlKYeob+IpLaU=
-SHA1 (x264-snapshot-20111027-2245.tar.bz2) = QCjXnRZv+JJ3OzZGk/EHn2yB7ek=
-SHA256 (x264-snapshot-20111027-2245.tar.bz2) = 
Oj58zGo13/HpbVDniNXhGq8+2zYpZpARsh9DOiBFQnI=
-SIZE (x264-snapshot-20111027-2245.tar.bz2) = 531078
+MD5 (x264-snapshot-20120520-2245.tar.bz2) = 3MoCmaBr6+WRBItvjH9xsg==
+RMD160 (x264-snapshot-20120520-2245.tar.bz2) = HST4DFZA4swqls1/nk+V0lvpOPM=
+SHA1 (x264-snapshot-20120520-2245.tar.bz2) = 5cNMwQ8IHGfHIrbSaJ2/Ai8YXlA=
+SHA256 (x264-snapshot-20120520-2245.tar.bz2) = 
bpgZ5MRvm4HN2X1gl3+WfXZC05+bhx43RmwCc20hWjA=
+SIZE (x264-snapshot-20120520-2245.tar.bz2) = 552411
Index: patches/patch-Makefile
===
RCS file: /home/cvs/ports/multimedia/x264/patches/patch-Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Makefile
--- patches/patch-Makefile  7 Nov 2011 15:53:08 -   1.9
+++ patches/patch-Makefile  21 May 2012 00:23:17 -
@@ -1,28 +1,28 @@
 $OpenBSD: patch-Makefile,v 1.9 2011/11/07 15:53:08 ajacoutot Exp $
 Makefile.orig  Thu Oct 27 16:45:03 2011
-+++ Makefile   Fri Oct 28 01:31:11 2011
-@@ -87,7 +87,9 @@ ifdef ARCH_X86
- ASFLAGS += -Icommon/x86/
+--- Makefile.orig  Sun May 20 16:45:03 2012
 Makefile   Sun May 20 20:23:07 2012
+@@ -100,7 +100,9 @@ ifdef ARCH_X86
+ ASFLAGS += -I$(SRCPATH)/common/x86/
  SRCS   += common/x86/mc-c.c common/x86/predict-c.c
  OBJASM  = $(ASMSRC:%.asm=%.o)
 +SOBJASM = $(ASMSRC:%.asm=%.so)
  $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
 +$(SOBJASM): common/x86/x86inc.asm common/x86/x86util.asm
- checkasm: tools/checkasm-a.o
+ OBJCHK += tools/checkasm-a.o
  endif
  endif
-@@ -131,8 +133,10 @@ endif
+@@ -146,8 +148,10 @@ endif
  endif
  
- OBJS = $(SRCS:%.c=%.o)
-+SOBJS = $(SRCS:%.c=%.so)
- OBJCLI = $(SRCCLI:%.c=%.o)
- OBJSO = $(SRCSO:%.c=%.o)
-+SOBJSO = $(SRCSO:%.c=%.so)
- DEP  = depend
+ OBJS   += $(SRCS:%.c=%.o)
++SOBJS  += $(SRCS:%.c=%.so)
+ OBJCLI += $(SRCCLI:%.c=%.o)
+ OBJSO  += $(SRCSO:%.c=%.o)
++SOBJSO += $(SRCSO:%.c=%.so)
  
- .PHONY: all default fprofiled clean distclean install uninstall dox test 
testclean lib-static lib-shared cli install-lib-dev install-lib-static 
install-lib-shared install-cli
-@@ -147,11 +151,11 @@ $(LIBX264): .depend $(OBJS) $(OBJASM)
+ .PHONY: all default fprofiled clean distclean install uninstall lib-static 
lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli
+ 
+@@ -160,8 +164,8 @@ $(LIBX264): .depend $(OBJS) $(OBJASM)
$(AR)$@ $(OBJS) $(OBJASM)
$(if $(RANLIB), $(RANLIB) $@)
  
@@ -31,13 +31,18 @@ $OpenBSD: patch-Makefile,v 1.9 2011/11/0
 +$(SONAME): .depend $(SOBJS) $(SOBJASM) $(SOBJSO)
 +  $(LD)$@ $(SOBJS) $(SOBJASM) $(SOBJSO) $(SOFLAGS) $(LDFLAGS)
  
+ ifneq ($(EXE),)
+ .PHONY: x264 checkasm
+@@ -170,7 +174,7 @@ checkasm: checkasm$(EXE)
+ endif
+ 
  x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264)
 -  $(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
 +  $(LD)$@ $(OBJCLI) -L. -lx264 $(LDFLAGSCLI) $(LDFLAGS)
  
- checkasm: tools/checkasm.o $(LIBX264)
-   $(LD)$@ $+ $(LDFLAGS)
-@@ -160,10 +164,21 @@ checkasm: tools/checkasm.o $(LIBX264)
+ checkasm$(EXE): .depend $(OBJCHK) $(LIBX264)
+   $(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
+@@ -181,10 +185,21 @@ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depen
$(AS) $(ASFLAGS) -o $@ $
-@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so 
they don't show up in oprofile
  
@@ -56,19 +61,19 @@ $OpenBSD: patch-Makefile,v 1.9 2011/11/0
 +%.so: %.c
 +  $(CC) $(CFLAGS) -fPIC -c -o $@ $
 +
- .depend: config.mak
-   @rm -f .depend
-   @$(foreach SRC, $(SRCS) 

Re: UPDATE: liba52 0.7.5

[Brad Smith]

On Tue, May 15, 2012 at 04:33:56PM -0400, Brad Smith wrote:
 Here is an update to a snapshot of liba52 which was intended to be
 0.7.5. The upstream project is essentially dead but I think the fixes
 and improvements since 0.7.4 are worth getting in.
 
 Tested with a handful of DVDs on amd64 with Xine-lib and Ogle. All
 dependent ports build Ok.

Tested with same DVDs on sparc64 with Ogle.

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

Re: llvm 3.1

[Brad Smith]

On Wed, May 23, 2012 at 08:15:20PM +0100, Stuart Henderson wrote:
 any comments, OK?
 
 rubinius fails hard during configure if this is installed, as it assumes
 llvm-config is a perl script, will send a diff for that next.

- You missed cvs rm'ing the patch-tools_clang_lib_Driver_Tools_cpp patch.
- Remove the first line from pre-configure.

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

Re: WIP: Dovecot 2.1

[Brad Smith]

On Thu, May 17, 2012 at 07:10:59PM -0400, Brad Smith wrote:
 Attached is a start at providing updates to Dovecot 2.1 and the
 associated add-ons. The antispam update was provided by sthen@.
 So if you have a new enough -current system and can provide any
 feedback please do so.
 
 Note: none of this has been tested so far other than ensuring
 it builds.

Tested now. Here is an updated diff with a README added to hint
at the fact that at least the max number of open file descriptors
needs to be bumped up.


Index: Makefile
===
RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.187
diff -u -p -r1.187 Makefile
--- Makefile17 May 2012 07:48:15 -  1.187
+++ Makefile17 May 2012 23:12:30 -
@@ -6,11 +6,10 @@ COMMENT-server=   compact IMAP/POP3 server
 COMMENT-ldap=  LDAP authentication support for Dovecot
 COMMENT-mysql= MySQL authentication / dictionary support for Dovecot
 COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
-REVISION-server= 0
 
 # Bump dovecot-pigeonhole every time you update to a new Dovecot version.
-V_MAJOR=   2.0
-V_DOVECOT= 2.0.20
+V_MAJOR=   2.1
+V_DOVECOT= 2.1.6
 
 DISTNAME=  dovecot-${V_DOVECOT}
 PKGNAME=   dovecot-${V_DOVECOT}
@@ -21,11 +20,12 @@ PKGNAME-postgresql= dovecot-postgresql-$
 CATEGORIES=mail
 MASTER_SITES=  ${HOMEPAGE}releases/${V_MAJOR}/
 
-SHARED_LIBS=   dovecot-lda 0.0 \
-   dovecot-login   0.0 \
-   dovecot-sql 0.0 \
-   dovecot-storage 0.0 \
-   dovecot 0.0
+SHARED_LIBS=   dovecot-lda 1.0 \
+   dovecot-login   1.0 \
+   dovecot-sql 1.0 \
+   dovecot-ssl 0.0 \
+   dovecot-storage 1.0 \
+   dovecot 1.0
 
 HOMEPAGE=  http://www.dovecot.org/
 
@@ -39,7 +39,7 @@ PERMIT_DISTFILES_FTP= Yes
 
 WANTLIB-server=asn1 bz2 c crypto gssapi krb5 sqlite3 ssl z \
${MODLIBICONV_WANTLIB}
-WANTLIB-ldap=  asn1 com_err crypto gssapi krb5 lber-2.4 ldap-2.4 sasl2 ssl
+WANTLIB-ldap=  asn1 com_err crypto gssapi krb5 lber ldap sasl2 ssl
 WANTLIB-mysql= crypto m lib/mysql/mysqlclient=10 ssl z
 WANTLIB-postgresql= com_err crypto pq=4 ssl
 
@@ -52,7 +52,7 @@ RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_D
 LIB_DEPENDS-postgresql= databases/postgresql
 RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
 
-USE_LIBTOOL=   Yes
+USE_LIBTOOL=   gnu
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=--with-gssapi \
--with-rundir=/var/dovecot \
@@ -61,6 +61,7 @@ CONFIGURE_ARGS=   --with-gssapi \
--with-statedir=/var/dovecot \
--without-pam \
--without-shadow \
+   --without-stemmer \
--without-vpopmail
 CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
Index: distinfo
===
RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.97
diff -u -p -r1.97 distinfo
--- distinfo10 Apr 2012 22:39:08 -  1.97
+++ distinfo13 May 2012 02:37:07 -
@@ -1,5 +1,5 @@
-MD5 (dovecot-2.0.20.tar.gz) = 5nwWxbfKaCRK6IVpq1eQPw==
-RMD160 (dovecot-2.0.20.tar.gz) = T7Pv5s6hzaRzYBKAg1Vz6NtGNMc=
-SHA1 (dovecot-2.0.20.tar.gz) = xCHprLb7TlCabJu9gpcCCVQ8//A=
-SHA256 (dovecot-2.0.20.tar.gz) = +mMBWRJ+cQ3NYjuZvGVdH1+FiR/RYV8ZTqctT+PPgsA=
-SIZE (dovecot-2.0.20.tar.gz) = 3360751
+MD5 (dovecot-2.1.6.tar.gz) = VtKo1Sc9OcqkHWqN2fRELA==
+RMD160 (dovecot-2.1.6.tar.gz) = gH3cxBQCsOpsi/0z7I357R/3XZU=
+SHA1 (dovecot-2.1.6.tar.gz) = iL3oqBEGRu8aW1lDN6IZZOWzWFA=
+SHA256 (dovecot-2.1.6.tar.gz) = S4GyzfYkNExsL/kb4beUkRtRyY3/okCVpty8fra8Hok=
+SIZE (dovecot-2.1.6.tar.gz) = 3773967
Index: patches/patch-doc_example-config_Makefile_in
===
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_Makefile_in
--- patches/patch-doc_example-config_Makefile_in23 May 2011 22:54:38 
-  1.1
+++ patches/patch-doc_example-config_Makefile_in13 May 2012 02:49:32 
-
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_example-config_Makefile_in,v 1.1 2011/05/23 22:54:38 sthen 
Exp $
 doc/example-config/Makefile.in.origWed May 11 10:35:51 2011
-+++ doc/example-config/Makefile.in Wed May 11 20:26:49 2011
-@@ -285,7 +285,7 @@ top_srcdir = @top_srcdir@
+--- doc/example-config/Makefile.in.origFri May  4 17:14:16 2012
 doc/example-config/Makefile.in Sat May 12 22:47:30 2012
+@@ -296,7 +296,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = conf.d
  pkgsysconfdir = $(sysconfdir)/dovecot
  nodist_pkgsysconf_DATA = README
Index: patches/patch-doc_example-config_conf_d_10-mail_conf

Re: x11/vlc: sndio backend for testing

[Brad Smith]

On Tue, May 22, 2012 at 08:23:58PM +1000, Brett wrote:
 On Sun, 20 May 2012 23:59:48 +0200
 Alexandre Ratchov a...@caoua.org wrote:
 
  This diff is supposed to make video smoother with the sndio
  backend. It also adds support for 24-bit encodings, makes use of
  the sndiod volume knob, removes the need for portaudio and makes
  sndio the default backend on OpenBSD.
  
  I'm very interested in any regressions, and stuff that used to
  work, possibly with other backends, but that doesn't work with this
  one.
  
  Comments? OK?
  
  -- Alexandre
  
  Index: Makefile
  ===
  RCS file: /cvs/ports/x11/vlc/Makefile,v
 
 Hi Alexandre and ports,
 
 I'm not sure if vlc played these before (I normally use mplayer) but
 .mkv and .webm files have no audio with these patches :-(

Yes, VLC very much could play such files, not being able to would be
a pretty big deal.

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

UPDATE: xcache 2.0.0

[Brad Smith]

Here is an update to xcache 2.0.0.

Tested on amd64.


Index: Makefile
===
RCS file: /cvs/anoncvs/cvs/ports/www/xcache/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile16 Nov 2011 15:56:38 -  1.14
+++ Makefile25 May 2012 07:01:19 -
@@ -4,8 +4,7 @@ SHARED_ONLY=Yes
 
 COMMENT=   fast and stable PHP opcode cacher
 
-VERSION=   1.3.2
-REVISION=  3
+VERSION=   2.0.0
 DISTNAME=  xcache-${VERSION}
 CATEGORIES=www
 MASTER_SITES=  http://xcache.lighttpd.net/pub/Releases/${VERSION}/
@@ -25,7 +24,8 @@ AUTOCONF_VERSION= 2.59
 MODULES=   lang/php
 
 BUILD_DEPENDS+=${MODGNU_AUTOCONF_DEPENDS} \
-   devel/re2c=0.13.4
+   devel/re2c=0.13.4 \
+   devel/gindent
 
 WEBROOT=   /var/www
 SUBST_VARS=WEBROOT
@@ -50,6 +50,9 @@ CONFIGURE_ARGS+=  --enable-xcache-coverag
 MODPHP_DO_PHPIZE=  Yes
 MODPHP_DO_SAMPLE=  xcache
 MESSAGE=   ${PKGDIR}/MESSAGE
+
+post-extract:
+   @ln -sf ${LOCALBASE}/bin/gindent ${WRKDIR}/bin/indent
 
 post-install:
${INSTALL_DATA_DIR} ${WRKINST}/${WEBROOT}/xcache
Index: distinfo
===
RCS file: /cvs/anoncvs/cvs/ports/www/xcache/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo16 Jun 2011 20:24:43 -  1.5
+++ distinfo25 May 2012 06:40:48 -
@@ -1,5 +1,5 @@
-MD5 (xcache-1.3.2.tar.gz) = IF4iCfJOGKawhEpLbFLy5A==
-RMD160 (xcache-1.3.2.tar.gz) = MNs7+kScSSiyXQLg7OEK/7N7F94=
-SHA1 (xcache-1.3.2.tar.gz) = 6lVhNt6/eguZBIZQw/HjVkp1EAs=
-SHA256 (xcache-1.3.2.tar.gz) = KBLTEmexczmXA9V/Fr4/AmPt7lG0LYSoG/Zp4S8YhcU=
-SIZE (xcache-1.3.2.tar.gz) = 113715
+MD5 (xcache-2.0.0.tar.gz) = DJA8LrcOMcvDWuZv23UL3A==
+RMD160 (xcache-2.0.0.tar.gz) = 4r/fAXLe3v/muA5SW92MhJLGH3U=
+SHA1 (xcache-2.0.0.tar.gz) = jIEgf4MedWcr/foK4Y0ASgx6ZNs=
+SHA256 (xcache-2.0.0.tar.gz) = swynPHXcn4Bz3WWA0Vmzvti8jdXkR8xpOxq8ogK+qrI=
+SIZE (xcache-2.0.0.tar.gz) = 130536

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

Re: llvm 3.1

[Brad Smith]

On Sat, May 26, 2012 at 11:53:17PM +0100, Stuart Henderson wrote:
 BTW it would be nice if somebody could add to ONLY_FOR_ARCHS
 and try this on some of the various mips arch. Don't forget to
 log the build. (It's in the tree now).

BTW, sparc64 should be removed as LLVM has no 64-bit SPARC support.

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

Re: UPDATE: textproc/sphinx

[Brad Smith]

On Sun, May 27, 2012 at 10:22:36PM +0200, Giovanni Bechis wrote:
 Il 25/05/2012 18.38, Giovanni Bechis ha scritto:
  Long overdue update to latest version, many improvements and bug fixes.
 
 It would be better if we would have pthread_mutexattr_setpshared, is
 it difficult to implement ?

Process shared mutexes are not supported by rthreads.

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

Re: llvm 3.1

[Brad Smith]

On Sun, May 27, 2012 at 11:18:27AM +0100, Stuart Henderson wrote:
 On 2012/05/26 20:10, Brad Smith wrote:
  On Sat, May 26, 2012 at 11:53:17PM +0100, Stuart Henderson wrote:
   BTW it would be nice if somebody could add to ONLY_FOR_ARCHS
   and try this on some of the various mips arch. Don't forget to
   log the build. (It's in the tree now).
  
  BTW, sparc64 should be removed as LLVM has no 64-bit SPARC support.
 
 I think that was fixed, from docs/WritingAnLLVMBackend.html:
 
 For example, the LLVM SPARC implementation provided covers
 three major versions of the SPARC microprocessor architecture:
 Version 8 (V8, which is a 32-bit architecture), Version 9
 (V9, a 64-bit architecture), and the UltraSPARC architecture.

I don't see any indication that is really true. I see one commit to the
SPARC backend to enable 64-bit support 3 years ago and zero work on the
SPARC backend since then. The LLVM developers have been talking about
ripping out the SPARC backend for awhile now as it is unmaintained.

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

Re: llvm 3.1

[Brad Smith]

On Mon, May 28, 2012 at 10:32:51AM +1000, Jonathan Gray wrote:
 On Sun, May 27, 2012 at 11:52:47AM -0400, Brian Callahan wrote:
  Sorry, I forgot to add a few more caveats to the mips64el build:
  
  You need the patch at the bottom of this email (hopefully
  Thunderbird won't mangle it).
  
  Additionally, I ported gas-2.22 to the loongson, which is needed for
  the loongson build. I can send that separately, if such a port is
  desired.
  
  Thanks.
  
  ~Brian
 
 you'll need to modify the driver as well
 
 Here is a diff against clang svn that adds OpenBSD specific
 arm/mips64/mips64el/powerpc/sparc targets.  If the gcc config has
 arch specific OpenBSD settings that differ from the defaults
 more will have to be done.
 
 I don't know if this is enough as I've only compile tested
 it on i386.  In particular I'm not sure which arm/mips64 abi
 is being defaulted to.

ARM support is dead in the water until OpenBSD updates to binutils
2.17 and switches to the ARM EABI ABI.

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

UPDATE: netatalk 2.2.3

[Brad Smith]

Here is an update to netatalk 2.2.3.


Index: Makefile
===
RCS file: /home/cvs/ports/net/netatalk/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile22 Apr 2012 13:44:09 -  1.39
+++ Makefile28 May 2012 02:29:43 -
@@ -4,8 +4,7 @@ SHARED_ONLY=Yes
 
 COMMENT=   AFP file and print services for IP networks
 
-DISTNAME=  netatalk-2.2.2
-REVISION=  0
+DISTNAME=  netatalk-2.2.3
 CATEGORIES=net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=  .tar.bz2
Index: distinfo
===
RCS file: /home/cvs/ports/net/netatalk/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo11 Apr 2012 18:39:13 -  1.5
+++ distinfo28 May 2012 02:29:47 -
@@ -1,5 +1,5 @@
-MD5 (netatalk-2.2.2.tar.bz2) = vUK2huxyCdmrR72OLiQxxA==
-RMD160 (netatalk-2.2.2.tar.bz2) = ze3V/0uLrnz5D4xETDnbhQ/CEOc=
-SHA1 (netatalk-2.2.2.tar.bz2) = 1Dx10EpmrVnFsMeX/6Hm4+E7IQU=
-SHA256 (netatalk-2.2.2.tar.bz2) = RDAxuQ2d1icNmGWdIQ9AhDfY5x6AlNbwtxcGpcSB46A=
-SIZE (netatalk-2.2.2.tar.bz2) = 1239433
+MD5 (netatalk-2.2.3.tar.bz2) = C1oGRYNhg7DlSMz71cAi+A==
+RMD160 (netatalk-2.2.3.tar.bz2) = QNHdK22jheSN5fwPnMqFzbEwswk=
+SHA1 (netatalk-2.2.3.tar.bz2) = 1tDPKnToso4Hb3aHJi8pc7VaB88=
+SHA256 (netatalk-2.2.3.tar.bz2) = sIjmzGI3962Yr2WBKnS8yDCi1K6+6nHP2TKs6O+TEyw=
+SIZE (netatalk-2.2.3.tar.bz2) = 1288642
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/net/netatalk/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 11 Apr 2012 18:39:13 -  1.2
+++ patches/patch-configure 28 May 2012 03:58:31 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.2 2012/04/11 18:39:13 sthen Exp $
 configure.orig Thu Jan 12 04:11:55 2012
-+++ configure  Mon Jan 16 16:35:56 2012
-@@ -25308,8 +25308,8 @@ for ac_lib in '' pthread; do
+--- configure.orig Sun May 27 23:01:21 2012
 configure  Sun May 27 23:04:06 2012
+@@ -14154,8 +14154,8 @@ for ac_lib in '' pthread; do
if test -z $ac_lib; then
  ac_res=none required
else
@@ -10,5 +10,14 @@ $OpenBSD: patch-configure,v 1.2 2012/04/
 +ac_res=-$ac_lib
 +LIBS=-$ac_lib  $ac_func_search_save_LIBS
fi
-   rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try=$ac_link
+   if ac_fn_c_try_link $LINENO; then :
+   ac_cv_search_pthread_sigmask=$ac_res
+@@ -15761,7 +15761,7 @@ fi
+   for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h
+ do :
+   as_ac_Header=`$as_echo ac_cv_header_$ac_header | $as_tr_sh`
+-ac_fn_c_check_header_mongrel $LINENO $ac_header $as_ac_Header 
$ac_includes_default
++ac_fn_c_check_header_mongrel $LINENO $ac_header $as_ac_Header #include 
rpc/rpc.h
+ if eval test \x\$$as_ac_Header\ = xyes; then :
+   cat confdefs.h _ACEOF
+ #define `$as_echo HAVE_$ac_header | $as_tr_cpp` 1
Index: patches/patch-etc_uams_Makefile_in
===
RCS file: patches/patch-etc_uams_Makefile_in
diff -N patches/patch-etc_uams_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-etc_uams_Makefile_in  28 May 2012 07:05:30 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- etc/uams/Makefile.in.orig  Mon May 28 03:04:55 2012
 etc/uams/Makefile.in   Mon May 28 03:05:16 2012
+@@ -893,7 +893,7 @@ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+ 
+ install-am: all-am
+-  @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++  @$(MAKE) $(AM_MAKEFLAGS) install-data-am install-exec-am
+ 
+ installcheck: installcheck-recursive
+ install-strip:

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

Re: net/snort update to 2.9.2.3

[Brad Smith]

On Tue, May 29, 2012 at 09:54:11PM +0200, Markus Lude wrote:
 On Tue, May 29, 2012 at 11:27:08AM +0100, Community - Dogn?dis wrote:
  On 05/28/2012 10:47 PM, Markus Lude wrote:
   builds on i386 and sparc64, so far tested with unflavored version on
   i386.
  
  Hi,
  Glad you're working on this again.
  I've been running Lawrence (lteo@) version for a while, 2.9.2 without 
  issues.
  I only have an amd64/5.0 (with the libcap diff applied) for tests so
  all of this has been there.
  
  But I can't get yours to download because of dl.snort.org on MASTER_SITES,
  I was using www.snort.org before, so I changed it and it works.
  Did dl.snort.org work for you without issues?
 
 It worked somewere in the past, I changed it. Thanks for the hint.
 
  After that I got a build error on snort:
  /usr/bin/ld: /usr/local/lib/libdaq_static.a(libdaq_static_la-daq_base.o): 
  relocation R_X86_64_32S can not be used when making a shar
  ed object; recompile with -fPIC
  /usr/local/lib/libdaq_static.a(libdaq_static_la-daq_base.o): could not read 
  symbols: Bad value
  collect2: ld returned 1 exit status
  Error while executing cc -shared -fPIC -DPIC -o .libs/libsf_engine.so -O2 
  -pipe -DSF_VISIBILITY -fvisibility=hidden -fno-strict-alia
  sing -Wall -shared -Wl,-R/usr/local/lib .libs/bmh.o 
  .libs/sf_snort_detection_engine.o .libs/sf_snort_plugin_api.o 
  .libs/sf_snort_plu
  gin_byte.o .libs/sf_snort_plugin_content.o .libs/sf_snort_plugin_hdropts.o 
  .libs/sf_snort_plugin_loop.o .libs/sf_snort_plugin_pcre.o
   .libs/sf_snort_plugin_rc4.o .libs/sf_decompression.o .libs/sfhashfcn.o 
  .libs/sfghash.o .libs/sfprimetable.o .libs/sf_ip.o -L.libs -
  Wl,-whole-archive /usr/local/lib/libdaq_static.a -Wl,-no-whole-archive 
  -ldnet -lpcre -lm -Wl,-whole-archive /usr/local/lib/libdaq_st
  atic_modules.a -Wl,-no-whole-archive -lsfbpf -lpcap -lz -lpthread
  *** Error code 2
  
  Tracked it down to daq port. I also was using:
   CFLAGS=-fPIC
  which is missing, so I added it and built daq again.
  And now snort builds without any probs.
  Just did light running with it and seems to run.
 
 This seems only to appear on amd64. I added it.
 I also removed comments which were left over from former versions.
 
 Updated tarball for daq-0.6.2 attached.

No no no. Don't create more nasty hacks like this. Linking non-PIC code
to shared libraries is not portable. Get upstream to fix this properly
and use the shared library that is already built. This issue is not
specific to OpenBSD either.

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

Re: update: audio/xmms2

[Brad Smith]

On Sat, May 26, 2012 at 07:52:43PM +0200, Pascal Stumpf wrote:
 Update to latest version (0.8); no feedback from maintainer yet.
 
 Working fine here on amd64, but some more testing is never wrong.

There is a missing LIB_DEPENDS on audio/libsndfile.

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

Re: [new] audio/deadbeef

[Brad Smith]

On Fri, Jun 01, 2012 at 12:50:14AM +0600, Alexandr Shadchin wrote:
 On Sun, May 20, 2012 at 12:45:52AM +0600, Alexandr Shadchin wrote:
  On Tue, May 15, 2012 at 01:16:12AM +0600, Alexandr Shadchin wrote:
   Hi,
   
   pkg/DESCR:
   DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux, BSD,
   OpenSolaris and probably other UNIX-like systems.
   
   Some features (more can be found on the homepage):
   
   * mp3, ogg vorbis, flac, ape, wv, wav, cd audio (and many more)
   * ID3v1, ID3v2.2, ID3v2.3, ID3v2.4, APEv2, xing/info tags support
   * no GNOME or KDE dependencies
   * minimize to tray, with scrollwheel volume control
   * drag and drop, both inside the playlist, and from other applications
   * control playback from command line
   * global hotkeys
   * multiple playlists
   * album artwork display
   * 18-band graphical equalizer
   * metadata editor
   * user-customizable groups in playlists
   * user-customizable columns with flexible title formatting
   * radio and podcast support for ogg vorbis, mp3 and aac streams
   * gapless playback
   * plugin support; bundled with lots of plugins, such as global
 hotkeys and last.fm scrobbler; sdk is included
   
  
  Change:
   * change CONFIGURE_STYLE to gnu
   * check the usage of yasm
   * rework alloca patches
   * sndio plugins on default
  
 
 Change:
  * Add textproc/intltool to MODULES
  * Fix pthread_mutex_destroy on mutex with waiters!
(thanks to dcoppa@ for both fix)
  * Simplify sndio backend
(+ fix sthen@ segfault, but resampling still does not work for him)

That sucks. You'll really have to get ratchov to take a look at the sndio
backend.

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

Re: update: audio/xmms2

[Brad Smith]

On Wed, May 30, 2012 at 09:14:35PM -0400, Brad Smith wrote:
 On Sat, May 26, 2012 at 07:52:43PM +0200, Pascal Stumpf wrote:
  Update to latest version (0.8); no feedback from maintainer yet.
  
  Working fine here on amd64, but some more testing is never wrong.
 
 There is a missing LIB_DEPENDS on audio/libsndfile.

Also the tremor support is not disabled but WAF is not
detecting the header appropriately so it think it does
not exist.

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

UPDATE: Dovecot 2.1.7 Dovecot-pigeonhole / Dovecot-antispam

[Brad Smith]

Attached are updates to Dovecot 2.1.7 and Dovecot-pigeonhole / Dovecot-antispam.

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

Index: Makefile
===
RCS file: /cvs/anoncvs/cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.187
diff -u -p -r1.187 Makefile
--- Makefile17 May 2012 07:48:15 -  1.187
+++ Makefile1 Jun 2012 20:25:59 -
@@ -6,11 +6,10 @@ COMMENT-server=   compact IMAP/POP3 server
 COMMENT-ldap=  LDAP authentication support for Dovecot
 COMMENT-mysql= MySQL authentication / dictionary support for Dovecot
 COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
-REVISION-server= 0
 
 # Bump dovecot-pigeonhole every time you update to a new Dovecot version.
-V_MAJOR=   2.0
-V_DOVECOT= 2.0.20
+V_MAJOR=   2.1
+V_DOVECOT= 2.1.7
 
 DISTNAME=  dovecot-${V_DOVECOT}
 PKGNAME=   dovecot-${V_DOVECOT}
@@ -21,11 +20,12 @@ PKGNAME-postgresql= dovecot-postgresql-$
 CATEGORIES=mail
 MASTER_SITES=  ${HOMEPAGE}releases/${V_MAJOR}/
 
-SHARED_LIBS=   dovecot-lda 0.0 \
-   dovecot-login   0.0 \
-   dovecot-sql 0.0 \
-   dovecot-storage 0.0 \
-   dovecot 0.0
+SHARED_LIBS=   dovecot-lda 1.0 \
+   dovecot-login   1.0 \
+   dovecot-sql 1.0 \
+   dovecot-ssl 0.0 \
+   dovecot-storage 1.0 \
+   dovecot 1.0
 
 HOMEPAGE=  http://www.dovecot.org/
 
@@ -39,7 +39,7 @@ PERMIT_DISTFILES_FTP= Yes
 
 WANTLIB-server=asn1 bz2 c crypto gssapi krb5 sqlite3 ssl z \
${MODLIBICONV_WANTLIB}
-WANTLIB-ldap=  asn1 com_err crypto gssapi krb5 lber-2.4 ldap-2.4 sasl2 ssl
+WANTLIB-ldap=  asn1 com_err crypto gssapi krb5 lber ldap sasl2 ssl
 WANTLIB-mysql= crypto m lib/mysql/mysqlclient=10 ssl z
 WANTLIB-postgresql= com_err crypto pq=4 ssl
 
@@ -52,7 +52,7 @@ RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_D
 LIB_DEPENDS-postgresql= databases/postgresql
 RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
 
-USE_LIBTOOL=   Yes
+USE_LIBTOOL=   gnu
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=--with-gssapi \
--with-rundir=/var/dovecot \
@@ -61,6 +61,7 @@ CONFIGURE_ARGS=   --with-gssapi \
--with-statedir=/var/dovecot \
--without-pam \
--without-shadow \
+   --without-stemmer \
--without-vpopmail
 CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
Index: distinfo
===
RCS file: /cvs/anoncvs/cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.97
diff -u -p -r1.97 distinfo
--- distinfo10 Apr 2012 22:39:08 -  1.97
+++ distinfo1 Jun 2012 20:26:22 -
@@ -1,5 +1,5 @@
-MD5 (dovecot-2.0.20.tar.gz) = 5nwWxbfKaCRK6IVpq1eQPw==
-RMD160 (dovecot-2.0.20.tar.gz) = T7Pv5s6hzaRzYBKAg1Vz6NtGNMc=
-SHA1 (dovecot-2.0.20.tar.gz) = xCHprLb7TlCabJu9gpcCCVQ8//A=
-SHA256 (dovecot-2.0.20.tar.gz) = +mMBWRJ+cQ3NYjuZvGVdH1+FiR/RYV8ZTqctT+PPgsA=
-SIZE (dovecot-2.0.20.tar.gz) = 3360751
+MD5 (dovecot-2.1.7.tar.gz) = tS0PrxuewhvFVSaR/g/x0Q==
+RMD160 (dovecot-2.1.7.tar.gz) = cide8vFAjxw2H5TTehTTNUVwa0Q=
+SHA1 (dovecot-2.1.7.tar.gz) = aPxsgLcZRtiPSSsxgstztDuSG74=
+SHA256 (dovecot-2.1.7.tar.gz) = 1be8Yf/5R3Iq6+EuuyXpLDjOPifhTrxUz8ZvCzRs9FI=
+SIZE (dovecot-2.1.7.tar.gz) = 3778791
Index: patches/patch-doc_example-config_Makefile_in
===
RCS file: 
/cvs/anoncvs/cvs/ports/mail/dovecot/patches/patch-doc_example-config_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_Makefile_in
--- patches/patch-doc_example-config_Makefile_in23 May 2011 22:54:38 
-  1.1
+++ patches/patch-doc_example-config_Makefile_in23 May 2012 01:59:29 
-
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_example-config_Makefile_in,v 1.1 2011/05/23 22:54:38 sthen 
Exp $
 doc/example-config/Makefile.in.origWed May 11 10:35:51 2011
-+++ doc/example-config/Makefile.in Wed May 11 20:26:49 2011
-@@ -285,7 +285,7 @@ top_srcdir = @top_srcdir@
+--- doc/example-config/Makefile.in.origFri May  4 17:14:16 2012
 doc/example-config/Makefile.in Sat May 12 22:47:30 2012
+@@ -296,7 +296,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = conf.d
  pkgsysconfdir = $(sysconfdir)/dovecot
  nodist_pkgsysconf_DATA = README
Index: patches/patch-doc_example-config_conf_d_10-mail_conf
===
RCS file: 
/cvs/anoncvs/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_10-mail_conf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_conf_d_10-mail_conf
--- patches/patch-doc_example-config_conf_d_10-mail_conf23 May 2011 
22:54:38 -  1.1

UPDATE: QEMU 1.1.0

[Brad Smith]

Here is an update to QEMU 1.1.0.

Tested on amd64.


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile16 Mar 2012 11:40:53 -  1.85
+++ Makefile1 Jun 2012 21:08:47 -
@@ -5,9 +5,10 @@ BROKEN-hppa=   compiler bug with gcc 4.2
 
 COMMENT=   multi system emulator
 
-DISTNAME=  qemu-1.0.1
+DISTNAME=  qemu-1.1.0
 CATEGORIES=emulators
 MASTER_SITES=  http://wiki.qemu.org/download/
+EXTRACT_SUFX=  .tar.bz2
 
 HOMEPAGE=  http://www.qemu.org/
 
@@ -34,7 +35,7 @@ LIB_DEPENDS=  devel/glib2 \
 MODPY_RUNDEP=  No
 
 MAKE_ENV=  V=1
-FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples
+FAKE_FLAGS=qemu_confdir=${PREFIX}/share/examples/qemu
 
 EXTRA_CFLAGS=  -I${LOCALBASE}/include -I${X11BASE}/include
 EXTRA_LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
@@ -75,13 +76,15 @@ FLAVORS=debug
 FLAVOR?=
 
 .if ${FLAVOR:Mdebug}
+CFLAGS+=   -O0
 CONFIGURE_ARGS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--disable-debug-info
 .endif
 
 NO_REGRESS=Yes
 
 post-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup \
${PREFIX}/share/examples/qemu
${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown \
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/qemu/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo16 Mar 2012 11:40:53 -  1.19
+++ distinfo1 Jun 2012 21:09:16 -
@@ -1,5 +1,5 @@
-MD5 (qemu-1.0.1.tar.gz) = Xv0QkfAeO8Mb/ewnuO3rAA==
-RMD160 (qemu-1.0.1.tar.gz) = 3O80TxUOI4iAhxdo8vB8y26OzOc=
-SHA1 (qemu-1.0.1.tar.gz) = TQi1qDU4/NeyIr7G8cWE2o0SSXo=
-SHA256 (qemu-1.0.1.tar.gz) = GYkC4QeCUX9gfJ7Z5im153COo56zc+0+w/HIoWnZg3g=
-SIZE (qemu-1.0.1.tar.gz) = 10853005
+MD5 (qemu-1.1.0.tar.bz2) = FRxZdhC46HeI9Z76z80omA==
+RMD160 (qemu-1.1.0.tar.bz2) = 8gZvmygpjP5sfffTIQ+pWxd8xCA=
+SHA1 (qemu-1.1.0.tar.bz2) = n3YdF77otudzf7yru6rFC8mZoO4=
+SHA256 (qemu-1.1.0.tar.bz2) = kn9Jjv+NziM03pM4yunjp8Y71HLIVFEjXEXeUCkUD8A=
+SIZE (qemu-1.1.0.tar.bz2) = 9629317
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/emulators/qemu/patches/patch-configure,v
retrieving revision 1.22
diff -u -p -r1.22 patch-configure
--- patches/patch-configure 16 Mar 2012 11:40:53 -  1.22
+++ patches/patch-configure 1 Jun 2012 02:42:40 -
@@ -1,29 +1,14 @@
 $OpenBSD: patch-configure,v 1.22 2012/03/16 11:40:53 fgsch Exp $
 configure.orig Fri Feb 17 14:45:39 2012
-+++ configure  Fri Feb 17 16:02:57 2012
-@@ -235,13 +235,11 @@ sdl_config=${SDL_CONFIG-${cross_prefix}sdl-config}
- 
- # default flags for all hosts
- QEMU_CFLAGS=-fno-strict-aliasing $QEMU_CFLAGS
--CFLAGS=-g $CFLAGS
- QEMU_CFLAGS=-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS
- QEMU_CFLAGS=-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS
- QEMU_CFLAGS=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 
$QEMU_CFLAGS
- QEMU_CFLAGS=-D_FORTIFY_SOURCE=2 $QEMU_CFLAGS
- QEMU_INCLUDES=-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu
--LDFLAGS=-g $LDFLAGS
- 
- # make source path absolute
- source_path=`cd $source_path; pwd`
-@@ -2684,8 +2682,9 @@ fi
+--- configure.orig Wed May 30 20:54:30 2012
 configure  Thu May 31 22:41:49 2012
+@@ -2850,10 +2850,6 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
  
 -if test $debug = no ; then
 -  CFLAGS=-O2 $CFLAGS
-+if test $debug = yes ; then
-+  CFLAGS=$CFLAGS -O0 -g
-+  LDFLAGS=$LDFLAGS -g
- fi
- 
+-fi
+-
  # Consult white-list to determine whether to enable werror
+ # by default.  Only enable by default for git builds
+ z_version=`cut -f3 -d. $source_path/VERSION`
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/emulators/qemu/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST   12 Dec 2011 10:56:56 -  1.20
+++ pkg/PLIST   16 May 2012 18:43:18 -
@@ -53,6 +53,7 @@ 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/common
@@ -89,6 +90,7 @@ share/qemu/keymaps/sl
 share/qemu/keymaps/sv
 share/qemu/keymaps/th
 share/qemu/keymaps/tr
+share/qemu/kvmvapic.bin
 share/qemu/linuxboot.bin
 share/qemu/mpc8544ds.dtb
 share/qemu/multiboot.bin
@@ -105,6 +107,7 @@ share/qemu/pxe-ne2k_pci.rom
 share/qemu/pxe-pcnet.rom
 share/qemu/pxe-rtl8139.rom
 share/qemu/pxe-virtio.rom
+share/qemu/qemu-icon.bmp
 share/qemu/s390-zipl.rom
 share/qemu/sgabios.bin
 share/qemu/slof.bin

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

Re: CogVM OpenBSD and the Call Stack

[Brad Smith]

On Sat, Jun 02, 2012 at 08:19:17PM +0100, Stuart Henderson wrote:
 On 2012/06/02 15:07, Dusty wrote:
  In my feeble and ignorance, I'm  attempting to build CogVM on OpenBSD.
  I've come across some problems that my limited skills cannot solve.
 
  -I/home/dusty/CogVM/openCogVm/platforms/Cross/vm
  -I/home/dusty/CogVM/openCogVm/src/vm -I/usr/X11R6/include   -c -o
  sqUnixMain.o /home/dusty/CogVM/openCogVm/platforms/unix/vm/sqUnixMain.c
  /home/dusty/CogVM/openCogVm/platforms/unix/vm/sqUnixMain.c:62:22:
  error: execinfo.h: No such file or directory
 
 Build with -I/usr/local/include (and install the libexecinfo port if you 
 haven't already)
 
  /home/dusty/CogVM/openCogVm/platforms/unix/vm/sqUnixMain.c:820:3:
  error: #error need to implement extracting pc from a ucontext_t on
  this system
 
 If this is the ucontext.h stuff, afaik nobody has implemented ucontext
 for OpenBSD, certainly it's not in-tree.

No one should bother to either. The API is now obsolete.

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

UPDATE: dnsmasq 2.62

[Brad Smith]

Here is an update to dnsmasq 2.62.

Tested on amd64 and i386.


Index: Makefile
===
RCS file: /cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile23 May 2012 09:16:19 -  1.24
+++ Makefile6 Jun 2012 23:10:23 -
@@ -4,8 +4,7 @@ NOT_FOR_ARCHS=  ${GCC2_ARCHS}
 
 COMMENT=   lightweight caching DNS forwarder, DHCP and TFTP server
 
-DISTNAME=  dnsmasq-2.61
-REVISION=  1
+DISTNAME=  dnsmasq-2.62
 CATEGORIES=net
 MASTER_SITES=  http://www.thekelleys.org.uk/dnsmasq/
 
Index: distinfo
===
RCS file: /cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo30 Apr 2012 06:02:51 -  1.17
+++ distinfo6 Jun 2012 23:10:23 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.61.tar.gz) = btClwlJN/Dp070lO4kafCQ==
-RMD160 (dnsmasq-2.61.tar.gz) = aNrDAOY3wz/iMMGRMlEs6G+61nw=
-SHA1 (dnsmasq-2.61.tar.gz) = 0KSoCpsxaByCRggwKwSk3SgtOVg=
-SHA256 (dnsmasq-2.61.tar.gz) = dN/tAQgFv0Zj95UlB7SOMXiMpp4g4ceirxRu5Cl0lJ8=
-SIZE (dnsmasq-2.61.tar.gz) = 534596
+MD5 (dnsmasq-2.62.tar.gz) = 9H5cuPW6xjQ/JLLb4xerQA==
+RMD160 (dnsmasq-2.62.tar.gz) = i3zYkKhr+x7KUE+g5DakQSfqSV8=
+SHA1 (dnsmasq-2.62.tar.gz) = wBFTGoqSs17eOHUlKTv9+TsgEDk=
+SHA256 (dnsmasq-2.62.tar.gz) = LytOQGLzvsNan9ZjYpXyL+BCskOLIwXhpXAxTyQ/8hA=
+SIZE (dnsmasq-2.62.tar.gz) = 531616
Index: patches/patch-man_dnsmasq_8
===
RCS file: /cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.11
diff -u -p -r1.11 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 30 Apr 2012 06:02:51 -  1.11
+++ patches/patch-man_dnsmasq_8 6 Jun 2012 23:10:23 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-man_dnsmasq_8,v 1.11 2012/04/30 06:02:51 ajacoutot Exp $
 man/dnsmasq.8.orig Fri Apr 20 16:28:49 2012
-+++ man/dnsmasq.8  Fri Apr 20 23:04:18 2012
+--- man/dnsmasq.8.orig Tue May 29 12:06:02 2012
 man/dnsmasq.8  Thu May 31 00:12:54 2012
 @@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
  .TP
  .B \-u, --user=username
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.11 201
  .TP
  .B \-v, --version
  Print the version number.
-@@ -1430,7 +1429,7 @@ with # are always skipped. This flag may be given on t
+@@ -1436,7 +1435,7 @@ with # are always skipped. This flag may be given on t
  line or in a configuration file.
  .SH CONFIG FILE
  At startup, dnsmasq reads
@@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.11 201
  if it exists. (On
  FreeBSD, the file is 
  .I /usr/local/etc/dnsmasq.conf
-@@ -1748,7 +1747,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1754,7 +1753,7 @@ dnsmasq has no direct way of determining the charset i
  assume that it is the system default. 
   
  .SH FILES
Index: patches/patch-src_dnsmasq_c
===
RCS file: patches/patch-src_dnsmasq_c
diff -N patches/patch-src_dnsmasq_c
--- patches/patch-src_dnsmasq_c 23 May 2012 09:16:19 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,44 +0,0 @@
-$OpenBSD: patch-src_dnsmasq_c,v 1.2 2012/05/23 09:16:19 ajacoutot Exp $
-
-- code-size tweak.
-- Fix non-response to router-solicitations when router-advertisement
-  configured, but DHCPv6 not configured.
-
 src/dnsmasq.c.orig Sun Apr 29 11:01:28 2012
-+++ src/dnsmasq.c  Mon May 21 13:57:13 2012
-@@ -849,14 +849,11 @@ int main (int argc, char **argv)
-   }
- 
- #ifdef HAVE_DHCP6
--  if (daemon-dhcp6)
--  {
--if (FD_ISSET(daemon-dhcp6fd, rset))
--  dhcp6_packet(now);
-+  if (daemon-dhcp6  FD_ISSET(daemon-dhcp6fd, rset))
-+  dhcp6_packet(now);
- 
--if (daemon-ra_contexts  FD_ISSET(daemon-icmp6fd, rset))
--  icmp6_packet();
--  }
-+  if (daemon-ra_contexts  FD_ISSET(daemon-icmp6fd, rset))
-+  icmp6_packet();
- #endif
- 
- #  ifdef HAVE_SCRIPT
-@@ -1209,13 +1206,9 @@ void clear_cache_and_reload(time_t now)
- }
- #ifdef HAVE_DHCP6
-   else if (daemon-ra_contexts)
--{
--  /* Not doing DHCP, so no lease system, manage 
--   alarms for ra only */
--  time_t next_event = periodic_ra(now);
--  if (next_event != 0)
--  alarm((unsigned)difftime(next_event, now)); 
--}
-+/* Not doing DHCP, so no lease system, manage 
-+   alarms for ra only */
-+send_alarm(periodic_ra(now), now);
- #endif
- #endif
- }
Index: patches/patch-src_lease_c
===
RCS file: patches/patch-src_lease_c
diff -N patches/patch-src_lease_c
--- patches/patch-src_lease_c   14 May 2012 13:57:09 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-$OpenBSD: patch-src_lease_c,v 1.1 2012/05/14 13:57:09 ajacoutot Exp $
-
-Fixed bug which caused missing periodic router advertisements 

Re: [raf...@sizeofvoid.org: WIP build x11/kde4/runtime with the new audio/pulseaudio]

[Brad Smith]

On Thu, Jun 07, 2012 at 05:30:39AM -0500, Amit Kulkarni wrote:
 Hi guys,
 
 I am building kdelibs, runtime and am hitting the same problem as Rafael.
 The undefined references to pthread_* functions in kdelibs was easy to fix.

Disable building with PulseAudio support.

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

Re: [raf...@sizeofvoid.org: WIP build x11/kde4/runtime with the new audio/pulseaudio]

[Brad Smith]

On Thu, Jun 07, 2012 at 03:32:41PM +0200, Rafael Sadowski wrote:
 On Thu Jun 07, 2012 at 06:49:37AM -0400, Brad Smith wrote:
  On Thu, Jun 07, 2012 at 05:30:39AM -0500, Amit Kulkarni wrote:
   Hi guys,
   
   I am building kdelibs, runtime and am hitting the same problem as Rafael.
   The undefined references to pthread_* functions in kdelibs was easy to 
   fix.
  
  Disable building with PulseAudio support.
  
 I think it's not the worst idea to disable PulseAudio
 (-DWITH=PulseAudio:BOOL=OFF). The speaker setup GUI needs pulseaudio.
 
 But, does it's really everything OK with our pulseaudio libs?

It doesn't matter. You cannot use PulseAudio. Disable it.

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

Re: [raf...@sizeofvoid.org: WIP build x11/kde4/runtime with the new audio/pulseaudio]

[Brad Smith]

- Original message -
 On Thu, Jun 07, 2012 at 09:40:52AM -0400, Brad Smith wrote:
  On Thu, Jun 07, 2012 at 03:32:41PM +0200, Rafael Sadowski wrote:
   On Thu Jun 07, 2012 at 06:49:37AM -0400, Brad Smith wrote:
On Thu, Jun 07, 2012 at 05:30:39AM -0500, Amit Kulkarni wrote:
 Hi guys,
 
 I am building kdelibs, runtime and am hitting the same problem
 as Rafael. The undefined references to pthread_* functions in
 kdelibs was easy to fix.

Disable building with PulseAudio support.

   I think it's not the worst idea to disable PulseAudio
   (-DWITH=PulseAudio:BOOL=OFF). The speaker setup GUI needs pulseaudio.
   
   But, does it's really everything OK with our pulseaudio libs?
  
  It doesn't matter. You cannot use PulseAudio. Disable it.
 
 I use PulseAudio on gnome everyday.

There is still no sndio backend..

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

UPDATE: ISC-DHCP 4.2.4

[Brad Smith]

Here is an update to ISC-DHCP 4.2.4.


Index: Makefile
===
RCS file: /home/cvs/ports/net/isc-dhcp/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile8 Jun 2012 14:12:57 -   1.25
+++ Makefile10 Jun 2012 04:12:22 -
@@ -4,7 +4,7 @@ COMMENT-main=   ISC DHCP Server
 COMMENT-client=ISC DHCP Client
 COMMENT-omapi= ISC DHCP OMAPI
 
-VERSION=   4.2.3-P2
+VERSION=   4.2.4
 DISTNAME=  isc-dhcp-${VERSION}
 PKGNAME=   isc-dhcp-${VERSION:S/-P/./}
 PKGNAME-main=  isc-dhcp-server-${VERSION:S/-P/./}
Index: distinfo
===
RCS file: /home/cvs/ports/net/isc-dhcp/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo14 Jan 2012 12:43:25 -  1.15
+++ distinfo10 Jun 2012 04:12:36 -
@@ -1,5 +1,5 @@
-MD5 (dhcp-4.2.3-P2.tar.gz) = FPV/1YDQFjPQ+tSAkAeoAQ==
-RMD160 (dhcp-4.2.3-P2.tar.gz) = RFZjpEsYrNLwJJe2UscmVvmg4yg=
-SHA1 (dhcp-4.2.3-P2.tar.gz) = bOET2OYwE0O2bU1xvlmjw0gFN40=
-SHA256 (dhcp-4.2.3-P2.tar.gz) = XPeuLK2cTKAQN0iyR27I6nhITkCPj+WX5OCkr7BRtGk=
-SIZE (dhcp-4.2.3-P2.tar.gz) = 9527546
+MD5 (dhcp-4.2.4.tar.gz) = wkTO/mY9QxAK91fY/2JaHw==
+RMD160 (dhcp-4.2.4.tar.gz) = ma+H6tOIB9QUoyYimW6YFda2qV0=
+SHA1 (dhcp-4.2.4.tar.gz) = uod7avXyHfhIMfaYGHgUZoQy6P4=
+SHA256 (dhcp-4.2.4.tar.gz) = qfd+smNyrak27DnYQ+D+jImLfmmANB52yM2mlHSPv5o=
+SIZE (dhcp-4.2.4.tar.gz) = 8063457
Index: patches/patch-common_socket_c
===
RCS file: /home/cvs/ports/net/isc-dhcp/patches/patch-common_socket_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-common_socket_c
--- patches/patch-common_socket_c   14 Jan 2012 12:43:25 -  1.1
+++ patches/patch-common_socket_c   10 Jun 2012 04:13:05 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-common_socket_c,v 1.1 2012/01/14 12:43:25 sthen Exp $
 common/socket.c.orig   Mon Jun 27 12:18:20 2011
-+++ common/socket.cFri Dec 23 14:14:40 2011
-@@ -717,6 +717,7 @@ ssize_t send_packet6(struct interface_info *interface,
+--- common/socket.c.orig   Fri Mar  9 06:28:11 2012
 common/socket.cSun Jun 10 00:12:59 2012
+@@ -718,6 +718,7 @@ ssize_t send_packet6(struct interface_info *interface,
/*
 * Set the target address we're sending to.
 */
@@ -9,7 +9,7 @@ $OpenBSD: patch-common_socket_c,v 1.1 20
m.msg_name = to;
m.msg_namelen = sizeof(*to);
  
-@@ -747,7 +748,6 @@ ssize_t send_packet6(struct interface_info *interface,
+@@ -748,7 +749,6 @@ ssize_t send_packet6(struct interface_info *interface,
pktinfo = (struct in6_pktinfo *)CMSG_DATA(cmsg);
memset(pktinfo, 0, sizeof(*pktinfo));
pktinfo-ipi6_ifindex = if_nametoindex(interface-name);

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

Re: NEW: net/ttg

[Brad Smith]

On Mon, May 28, 2012 at 10:00:47PM +0100, Stuart Henderson wrote:
 TTG is a small command-line utility to display the throughput (bandwidth
 usage) on an interface of a remote device such as a router, switch, etc.,
 over SNMP.
 
 Unlike tools like MRTG which sample bandwidth over a relatively long
 interval (often 5 minutes), TTG is normally used to display throughput
 over as little as one second.
 
 OK?

This seems to be buggy..

$ ttg -x vault comstyle list
1 : lo [up/up]
2 : eth1 [up/down]
3 : eth0 [up/up]
4 : ipddp0 [down/down]
$ ttg -x vault comstyle eth0 
Unable to find Etherneth0. Use 'list' to display all interfaces.
$ ttg -x vault comstyle ipaddp0
Unable to find ipaddp0. Use 'list' to display all interfaces.
$ ttg -x vault comstyle lo  
Found lo at index 1:
[04:37:28] current throughput: in0.0  B/s  out0.0  B/s
[04:37:29] current throughput: in0.0  B/s  out0.0  B/s

$ ttg -x fw comstyle list  
1 : vr0 [down/down]
2 : em0 [up/up]
3 : em1 [up/up]
4 : enc0 [down/down]
5 : lo0 [up/unkn]
6 : vlan1 [up/up]
7 : vlan2 [up/up]
8 : carp0 [up/up]
9 : carp1 [up/up]
10 : gif0 [up/unkn]
11 : pflog0 [up/unkn]
$ ttg -x fw comstyle vlan1
Unable to find Vlanan1. Use 'list' to display all interfaces.
$ ttg -x fw comstyle gif0  
Unable to find GigabitEthernetf0. Use 'list' to display all interfaces.
$ ttg -x fw comstyle em1  
Found em1 at index 3:
[04:38:54] current throughput: in0.0  B/s  out0.0  B/s
[04:38:55] current throughput: in  419.0  B/s  out  604.0  B/s
[04:38:56] current throughput: in0.0  B/s  out0.0  B/s

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

Re: NEW: net/ttg

[Brad Smith]

On Sun, Jun 10, 2012 at 04:40:17AM -0400, Brad Smith wrote:
 On Mon, May 28, 2012 at 10:00:47PM +0100, Stuart Henderson wrote:
  TTG is a small command-line utility to display the throughput (bandwidth
  usage) on an interface of a remote device such as a router, switch, etc.,
  over SNMP.
  
  Unlike tools like MRTG which sample bandwidth over a relatively long
  interval (often 5 minutes), TTG is normally used to display throughput
  over as little as one second.
  
  OK?
 
 This seems to be buggy..

Never mind. Looking at the code I see why it is doing this. Kind of a
nice feature if you were only using this in a Cisco based environment
or with other vendor switches/routers with the same naming scheme for
interfaces, but annoying when using it against *BSD systems for example.

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

UPDATE: Xine-ui 0.99.7

[Brad Smith]

Here is an update to Xine-ui 0.99.7.

Tested on amd64.


Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/xine-ui/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile9 May 2012 06:30:38 -   1.25
+++ Makefile11 Jun 2012 02:08:26 -
@@ -2,13 +2,12 @@
 
 COMMENT=   multimedia player
 
-DISTNAME=  xine-ui-0.99.6
-REVISION=  5
+DISTNAME=  xine-ui-0.99.7
 CATEGORIES=multimedia
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xine/}
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
-HOMEPAGE=  http://xinehq.de/
+HOMEPAGE=  http://www.xine-project.org/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
@@ -16,21 +15,25 @@ PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB += X11 Xext Xft Xinerama Xtst Xv Xxf86vm c curl m ncurses
-WANTLIB += png pthread readline xine z
+WANTLIB=   X11 Xext Xft Xinerama Xss Xtst Xv Xxf86vm c curl jpeg m ncurses 
\
+   png pthread readline xine z
 
 MODULES=   devel/gettext
 RUN_DEPENDS=   devel/desktop-file-utils \
misc/shared-mime-info
-LIB_DEPENDS=   multimedia/xine-lib \
-   net/curl \
-   graphics/png
+LIB_DEPENDS=   graphics/jpeg \
+   graphics/png \
+   multimedia/xine-lib \
+   net/curl
 
+MAKE_FLAGS=V=1
+
+USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
 USE_GROFF= Yes
-CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.65
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+=--disable-lirc \
+   --disable-nvtvsimple \
--disable-vdr-keys \
--without-aalib \
--without-caca
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/xine-ui/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Apr 2010 20:59:39 -  1.4
+++ distinfo11 Jun 2012 01:32:10 -
@@ -1,5 +1,5 @@
-MD5 (xine-ui-0.99.6.tar.bz2) = GAV9r9L4Qi0JCmvvYkVlLg==
-RMD160 (xine-ui-0.99.6.tar.bz2) = bN9jm1//9Uus+gp772WvHn68rO4=
-SHA1 (xine-ui-0.99.6.tar.bz2) = qNarmp5MvrCl1nfWlI4j0RAZ/Fs=
-SHA256 (xine-ui-0.99.6.tar.bz2) = bH0wR5UEFU3sECoUMaBjK+QIPH7H3+YjByCiZ2qofzo=
-SIZE (xine-ui-0.99.6.tar.bz2) = 2180633
+MD5 (xine-ui-0.99.7.tar.xz) = Kvb8wq1q9rouRxSXxdFA3A==
+RMD160 (xine-ui-0.99.7.tar.xz) = 4vIxH2Klxce5kStMiswFnEJAanw=
+SHA1 (xine-ui-0.99.7.tar.xz) = yoLgnPgkXQOIE7xNvYOEunnL8Zc=
+SHA256 (xine-ui-0.99.7.tar.xz) = nYzf0cXIQlHWl4dlsFmt9XCZ/2xEfz5LWQZshWP2a8Q=
+SIZE (xine-ui-0.99.7.tar.xz) = 1752328
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac  18 Apr 2010 20:59:39 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2010/04/18 20:59:39 sthen Exp $
 configure.ac.orig  Fri Mar  5 20:31:43 2010
-+++ configure.ac   Fri Apr  9 18:26:10 2010
-@@ -88,13 +88,17 @@ dnl  linked to thread lib, so the following AC
- dnl  in src/xitk/xine-toolkit/Makefile.am
- dnl
- case $host in
--  *-*-freebsd*|*-*-openbsd*)
-+  *-*-freebsd*)
- THREAD_LIBS=-L/usr/local/lib -pthread
- THREAD_CFLAGS=-I/usr/local/include -D_THREAD_SAFE
- CFLAGS=-L/usr/local/lib $THREAD_CFLAGS $CFLAGS
- CPPFLAGS=-I/usr/local/include -L/usr/local/lib $CPPFLAGS
- ;;
- 
-+  *-*-openbsd*)
-+THREAD_LIBS=-pthread
-+;;
-+
-   *-*-hpux11*)
- THREAD_LIBS= -pthread
- THREAD_CFLAGS=-D_REENTRANT
-@@ -471,7 +475,7 @@ dnl
- dnl
- BUILD_CC=`$CC -v 21 | tail -n 1`
- BUILD_OS=`uname -s -r -m`
--BUILD_DATE=`date \+%a %d %b %Y %T\`
-+BUILD_DATE=`date +%a %d %b %Y %T`
- AC_SUBST(BUILD_CC)
- AC_SUBST(BUILD_OS)
- AC_SUBST(BUILD_DATE)
Index: patches/patch-misc_desktops_Makefile_in
===
RCS file: patches/patch-misc_desktops_Makefile_in
diff -N patches/patch-misc_desktops_Makefile_in
--- patches/patch-misc_desktops_Makefile_in 18 Apr 2010 20:59:39 -  
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-misc_desktops_Makefile_in,v 1.2 2010/04/18 20:59:39 sthen Exp $
 misc/desktops/Makefile.in.orig Fri Mar  5 20:34:49 2010
-+++ misc/desktops/Makefile.in  Sat Apr  3 12:57:12 2010
-@@ -269,7 +269,7 @@ icon22_DATA = icons/22/xine.png
- icon32_DATA = icons/32/xine.png
- icon48_DATA = icons/48/xine.png
- pixmap_DATA = xine.xpm
--desktopdir = $(datadir)/xine/desktop
-+desktopdir = $(datadir)/applications
- desktop_DATA = xine.desktop
- all: all-am
- 
Index: patches/patch-src_xitk_Imlib-light_load_c
===
RCS file: patches/patch-src_xitk_Imlib-light_load_c
diff -N patches/patch-src_xitk_Imlib-light_load_c
--- patches/patch-src_xitk_Imlib-light_load_c 

WIP: simh 3.9.0

[Brad Smith]

Here is a first rev of an attempt at a SimH 3.9.0 update.

I don't use simh so I'm looking for anyone using simh to
test this out.


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/simh/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile24 Dec 2011 12:57:10 -  1.72
+++ Makefile13 Jun 2012 11:18:39 -
@@ -1,13 +1,12 @@
 # $OpenBSD: Makefile,v 1.72 2011/12/24 12:57:10 sthen Exp $
-# $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $
 
 COMMENT=   PDP, IBM 1401, Nova and other CPUs simulator
 
-PKGNAME=   simh-3.8.1
-DISTNAME=  simhv38-1
-REVISION=  6
+DISTNAME=  simhv39-0
+PKGNAME=   simh-3.9.0
 CATEGORIES=emulators
 MASTER_SITES=  ${HOMEPAGE}/sources/
+EXTRACT_SUFX=  .zip
 
 HOMEPAGE=  http://simh.trailing-edge.com/
 
@@ -17,21 +16,18 @@ PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   c m pcap
+WANTLIB=   c m pcap pthread
 
 WRKDIST=   ${WRKDIR}
-EXTRACT_SUFX=  .zip
-MASTER_SITES0= http://spacehopper.org/mirrors/
-# Files from http://simh.trailing-edge.com/interim.html repackaged as a diff
-PATCHFILES=simh-3.8.1-interim.diff:0
 
 UNZIP= unzip -a -o
 
-COPTS+=-DPATH_KA655X_BIN=\${PREFIX}/lib/simh/vax/ka655x.bin\ 
\
-   -DPATH_VMB_EXE=\${PREFIX}/lib/simh/vax/vmb.exe\
+CFLAGS+=   -DPATH_KA655X_BIN=\${PREFIX}/lib/simh/vax/ka655x.bin\ 
\
+   -DPATH_VMB_EXE=\${PREFIX}/lib/simh/vax/vmb.exe\
 
+USE_GMAKE= Yes
 MAKE_FILE= makefile
-MAKE_FLAGS=CC=${CC}
+MAKE_FLAGS=GCC=${CC} USE_NETWORK=1
 
 NO_REGRESS=Yes
 VMEM_WARNING=  Yes
@@ -40,13 +36,13 @@ pre-build:
@mkdir -p ${WRKBUILD}/BIN
 
 do-install:
+   ${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
@cd ${WRKBUILD}/BIN  for f in `echo *`; do \
${INSTALL_PROGRAM} $${f} ${PREFIX}/bin/simh-$${f}; \
done;
-   ${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
${INSTALL_DATA} ${WRKDIST}/VAX/ka655x.bin ${PREFIX}/lib/simh/vax
${INSTALL_DATA} ${WRKDIST}/VAX/vmb.exe ${PREFIX}/lib/simh/vax
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
${INSTALL_DATA} ${WRKBUILD}/*.txt ${WRKBUILD}/*/*.txt \
${PREFIX}/share/doc/simh
 
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/simh/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo7 Oct 2011 19:39:09 -   1.30
+++ distinfo13 Jun 2012 10:31:24 -
@@ -1,10 +1,5 @@
-MD5 (simh-3.8.1-interim.diff) = JJYiU313/E+rzZJ16ZNGPQ==
-MD5 (simhv38-1.zip) = 4V9lqC4h6knhS0ODJtk9XA==
-RMD160 (simh-3.8.1-interim.diff) = 3IQeLrF8hSlc+YuEKh/VdoSaaYs=
-RMD160 (simhv38-1.zip) = 8IXFLskkJfhPZbPzYFy3q6i+ezI=
-SHA1 (simh-3.8.1-interim.diff) = ixpJMs6+sSto2omfoA04ytaRU0k=
-SHA1 (simhv38-1.zip) = XqwvjlC+EWAHJ5g+BQcmkKcGZwI=
-SHA256 (simh-3.8.1-interim.diff) = c+fnjFbbZ9i+ormiXU7UDBX7FWjwcyQbjEoStFG7oIc=
-SHA256 (simhv38-1.zip) = T+KU+lKFsdbQvWn2CInADlGM4r5fAKvCvUrfqNqoWwY=
-SIZE (simh-3.8.1-interim.diff) = 57923
-SIZE (simhv38-1.zip) = 2954982
+MD5 (simhv39-0.zip) = uAOFiI8jJpq67gutfYTqfA==
+RMD160 (simhv39-0.zip) = pGTn0fxtWN0jo+9iPDwBjV1gsFA=
+SHA1 (simhv39-0.zip) = HeOTjw3LUdVbDlOuqK6XaczFe9s=
+SHA256 (simhv39-0.zip) = 5Jslm2atYxHKkGbe49NpPNkVEGppOKUu1oXNutqO2js=
+SIZE (simhv39-0.zip) = 3103657
Index: patches/patch-PDP11_pdp11_hk_c
===
RCS file: /home/cvs/ports/emulators/simh/patches/patch-PDP11_pdp11_hk_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-PDP11_pdp11_hk_c
--- patches/patch-PDP11_pdp11_hk_c  20 Apr 2011 05:16:33 -  1.1
+++ patches/patch-PDP11_pdp11_hk_c  13 Jun 2012 10:47:35 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-PDP11_pdp11_hk_c,v 1.1 2011/04/20 05:16:33 form Exp $
 PDP11/pdp11_hk.c.orig  Sat Nov 22 18:40:26 2008
-+++ PDP11/pdp11_hk.c   Wed Apr 20 11:37:12 2011
-@@ -904,7 +904,7 @@ switch (fnc) {
+--- PDP11/pdp11_hk.c.orig  Mon Mar 19 17:41:44 2012
 PDP11/pdp11_hk.c   Wed Jun 13 06:36:24 2012
+@@ -905,7 +905,7 @@ switch (fnc) {
  for (i = wc; i  awc; i++)  /* fill buf */
  hkxb[i] = 0;
  if (wc  !err) {   /* write buf */
Index: patches/patch-PDP11_pdp11_vh_c
===
RCS file: /home/cvs/ports/emulators/simh/patches/patch-PDP11_pdp11_vh_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-PDP11_pdp11_vh_c
--- 

UPDATE: lcms2 2.3

[Brad Smith]

Here is an update to lcms2 2.3.

Tested on amd64.


Index: Makefile
===
RCS file: /home/cvs/ports/graphics/lcms2/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile28 Jun 2011 23:12:29 -  1.1.1.1
+++ Makefile20 May 2012 23:01:48 -
@@ -2,8 +2,8 @@
 
 COMMENT =  color management library
 
-DISTNAME = lcms2-2.2
-SHARED_LIBS =  lcms2   0.0
+DISTNAME = lcms2-2.3
+SHARED_LIBS =  lcms2   0.1
 CATEGORIES =   graphics
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=lcms/}
 
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/lcms2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo28 Jun 2011 23:12:29 -  1.1.1.1
+++ distinfo20 May 2012 22:56:45 -
@@ -1,5 +1,5 @@
-MD5 (lcms2-2.2.tar.gz) = qvM8fCVnXmFjGJukiK4g9Q==
-RMD160 (lcms2-2.2.tar.gz) = jjWjUclUnlPr5PEgzcXPNei2k/w=
-SHA1 (lcms2-2.2.tar.gz) = Va5IhKksf71JHBGKo7NWgUsQFN8=
-SHA256 (lcms2-2.2.tar.gz) = tvKhvhorfKVL+rabMiQtODoXZjfxYe7q70Ub2fwRlcw=
-SIZE (lcms2-2.2.tar.gz) = 4193353
+MD5 (lcms2-2.3.tar.gz) = MnNI1nyXnIjC3sWaI6F9hQ==
+RMD160 (lcms2-2.3.tar.gz) = tqMuU6vj48oZwQpvrH2mPG8L+j4=
+SHA1 (lcms2-2.3.tar.gz) = Z9X6vaL1d3yoOHdmU5uchx2ZMTM=
+SHA256 (lcms2-2.3.tar.gz) = PqF3u96Ue+W5JWuBfRz5irnGfFWLNXA8SPXb+OCvr+Q=
+SIZE (lcms2-2.3.tar.gz) = 4461644
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/graphics/lcms2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   28 Jun 2011 23:12:29 -  1.1.1.1
+++ pkg/PLIST   20 May 2012 22:57:44 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2011/06/28 23:12:29 sthen Exp $
+%%SHARED%%
 @bin bin/jpgicc
 @bin bin/linkicc
 @bin bin/psicc
@@ -12,7 +13,6 @@ lib/pkgconfig/
 lib/pkgconfig/lcms2.pc
 @man man/man1/jpgicc.1
 @man man/man1/tificc.1
-%%SHARED%%
 share/doc/lcms2/
 share/doc/lcms2/api.pdf
 share/doc/lcms2/plugin-api.pdf

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

Re: WIP: FFmpeg 20120428 snapshot

[Brad Smith]

On Wed, May 02, 2012 at 06:30:08PM -0400, Brad Smith wrote:
 Here is a work in progress update to an FFmpeg snaphot dated 20120428
 but now from the 0.10 branch. This brings us up to date with a modern
 FFmpeg release branch and buys us a whole load of new encoders/decoders,
 bug fixes and varius improvements. As well as some diffs for some of
 the dependent ports.
 
 Most of the ports tree is in good shape to be able to build with this
 update but there are still some ports that need some work.
 
 http://comstyle.com/ports/ffmpeg/

I have updated the diffs and updated to a newer FFmpeg snapshot to include
the same set of security/bug fixes along the branch as was included for the
FFmpeg in the ports tree.

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

Re: WIP: UPDATE: OpenCV 2.4.0

[Brad Smith]

On Sun, Jun 03, 2012 at 04:55:50PM +0200, Rafael Sadowski wrote:
 On Sat Jun 02, 2012 at 09:25:13PM -0400, Brad Smith wrote:
  On Sat, Jun 02, 2012 at 05:33:03PM -0400, Brad Smith wrote:
   On Sat, Jun 02, 2012 at 09:20:13PM +0200, Rafael Sadowski wrote:
Hey ports@,

here is the UPDATE from 2.2.0 to 2.4.0 with -python. It need tests and
reviews. Tested on amd64. We need to build it on i386.

https://github.com/jasperla/openbsd-wip/tree/master/graphics/opencv

Cheers, Rafael
   
   An updated diff with some tweaks..
   
   - tweaked the Python COMMNENT
   - removed REVISION
   - SEPARATE_BUILD only takes Yes for an option now
   - fixes for the FFmpeg backend, without the previous patch that was in
 the port being brought over to the new file where the equivalent code
 is this would not have built on i386
   
   I don't use OpenCV and I was just taking a look at the FFmpeg backend.
   What about share/opencv vs share/OpenCV and using share/opencv
   consistently?
  
  Here is an updated diff.
  
  The Python sub-package was all broken. Also garbage collected
  USE_LIBTOOL since the port is using CMake.
   
 
 Hey Brad,
 
 really thank you for review, update and comments.  It is totally  clear
 I still have a lot to learn. It was my first attempt to create a
 multi-package.
 
 I tested it on amd64 and all looks fine.
 
 cheers, Rafael

If you could take a look at the issue I mentioned above about share/opencv
vs share/OpenCV then this looks like it would be good to go.

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

Re: remove useless (and harmul) patches from automake 1.11

[Brad Smith]

On Sun, Jun 24, 2012 at 05:27:18PM +0200, Matthieu Herrb wrote:
 Hi,
 
 Automake 1.10 used to call various shell scripts (mostly the infamous
 install-sh one) without an explicit /bin/sh in front of them, which
 caused Xenocara builds to fail, since no shell script in /usr/xenocara
 is supposed to have the 'x' bit set (since OpenBSD doesn't want files
 with the 'x' bit set in the CVS repository for various reasons).
 
 This has been fixed somewhere in the automake 1.11 release, so now if
 I regenerate autotools-produced files in Xenocara with automake 1.11,
 I see failures like 
 
 /bin/sh /bin/sh /usr/xenocara/lib/fontconfig/install -d /etc/fonts 
 /var/cache/fontconfig 
 /bin/sh[1]: syntax error: `(' unexpected
 
 No ${install_sh} is defined as ${SHELL} /path/to/install-sh
 
 So remove the now useless patches. ok ? 

These patches also need to be removed for automake 1.10 and 1.12.

 Index: Makefile
 ===
 RCS file: /cvs/OpenBSD/ports/devel/automake/1.11/Makefile,v
 retrieving revision 1.8
 diff -u -p -u -r1.8 Makefile
 --- Makefile  23 Apr 2012 08:01:14 -  1.8
 +++ Makefile  24 Jun 2012 14:09:42 -
 @@ -5,6 +5,7 @@ COMMENT=  GNU standards-compliant Makefil
  VERSION= 1.11
  DISTNAME=automake-${VERSION}.5
  PKGSPEC= automake-=${VERSION},1.12
 +REVISION=0
  
  CATEGORIES=  devel
  MASTER_SITES=${MASTER_SITE_GNU:=automake/}
 Index: patches/patch-automake_in
 ===
 RCS file: /cvs/OpenBSD/ports/devel/automake/1.11/patches/patch-automake_in,v
 retrieving revision 1.2
 diff -u -p -u -r1.2 patch-automake_in
 --- patches/patch-automake_in 22 Feb 2012 07:14:20 -  1.2
 +++ patches/patch-automake_in 24 Jun 2012 14:08:33 -
 @@ -1,15 +1,6 @@
  $OpenBSD: patch-automake_in,v 1.2 2012/02/22 07:14:20 ajacoutot Exp $
  --- automake.in.orig Wed Feb  1 05:31:13 2012
  +++ automake.in  Thu Feb 16 22:24:10 2012
 -@@ -4384,7 +4384,7 @@ sub handle_configure ($$$@)
 -   # Use $(install_sh), not $(MKDIR_P) because the latter requires
 -   # at least one argument, and $(mkinstalldirs) used to work
 -   # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
 --  define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL);
 -+  define_variable ('mkinstalldirs', '$(SHELL) $(install_sh) -d', 
 INTERNAL);
 - }
 - 
 -   reject_var ('CONFIG_HEADER',
  @@ -5337,6 +5337,7 @@ sub scan_autoconf_traces ($)
   _LT_AC_TAGCONFIG = 0,
   m4_include = 1,
 Index: patches/patch-lib_am_header-vars_am
 ===
 RCS file: patches/patch-lib_am_header-vars_am
 diff -N patches/patch-lib_am_header-vars_am
 --- patches/patch-lib_am_header-vars_am   8 Apr 2012 07:12:56 -   
 1.2
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -1,16 +0,0 @@
 -$OpenBSD: patch-lib_am_header-vars_am,v 1.2 2012/04/08 07:12:56 ajacoutot 
 Exp $
  lib/am/header-vars.am.orig   Mon Apr  2 06:09:39 2012
 -+++ lib/am/header-vars.amSat Apr  7 22:15:00 2012
 -@@ -63,9 +63,9 @@ pkglibdir = $(libdir)/@PACKAGE@
 - pkglibexecdir = $(libexecdir)/@PACKAGE@
 - 
 - am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
 --install_sh_DATA = $(install_sh) -c -m 644
 --install_sh_PROGRAM = $(install_sh) -c
 --install_sh_SCRIPT = $(install_sh) -c
 -+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
 -+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
 -+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 - INSTALL_HEADER = $(INSTALL_DATA)
 - transform = $(program_transform_name)
 - 
 
 
 -- 
 Matthieu Herrb
 
 
 -- 
 This message has been scanned for viruses and
 dangerous content by MailScanner, and is
 believed to be clean.
 

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

Re: remove useless (and harmul) patches from automake 1.11

[Brad Smith]

On Sun, Jun 24, 2012 at 06:06:30PM -0400, Brad Smith wrote:
 On Sun, Jun 24, 2012 at 05:27:18PM +0200, Matthieu Herrb wrote:
  Hi,
  
  Automake 1.10 used to call various shell scripts (mostly the infamous
  install-sh one) without an explicit /bin/sh in front of them, which
  caused Xenocara builds to fail, since no shell script in /usr/xenocara
  is supposed to have the 'x' bit set (since OpenBSD doesn't want files
  with the 'x' bit set in the CVS repository for various reasons).
  
  This has been fixed somewhere in the automake 1.11 release, so now if
  I regenerate autotools-produced files in Xenocara with automake 1.11,
  I see failures like 
  
  /bin/sh /bin/sh /usr/xenocara/lib/fontconfig/install -d /etc/fonts 
  /var/cache/fontconfig 
  /bin/sh[1]: syntax error: `(' unexpected
  
  No ${install_sh} is defined as ${SHELL} /path/to/install-sh
  
  So remove the now useless patches. ok ? 
 
 These patches also need to be removed for automake 1.10 and 1.12.

Here is an updated diff covering all the appropriate versions.


Index: 1.10/Makefile
===
RCS file: /home/cvs/ports/devel/automake/1.10/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- 1.10/Makefile   22 Feb 2012 07:43:58 -  1.12
+++ 1.10/Makefile   25 Jun 2012 04:16:14 -
@@ -4,7 +4,7 @@ COMMENT=GNU standards-compliant Makefil
 
 VERSION=   1.10
 DISTNAME=  automake-${VERSION}.3
-REVISION=  3
+REVISION=  4
 PKGSPEC=   automake-=${VERSION},1.11
 
 CATEGORIES=devel
Index: 1.10/patches/patch-automake_in
===
RCS file: /home/cvs/ports/devel/automake/1.10/patches/patch-automake_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-automake_in
--- 1.10/patches/patch-automake_in  22 Jul 2010 19:12:22 -  1.1.1.1
+++ 1.10/patches/patch-automake_in  25 Jun 2012 04:19:31 -
@@ -1,15 +1,6 @@
 $OpenBSD: patch-automake_in,v 1.1.1.1 2010/07/22 19:12:22 ajacoutot Exp $
 automake.in.orig   Tue Dec  8 20:36:30 2009
-+++ automake.inThu Jul 22 06:54:11 2010
-@@ -4055,7 +4055,7 @@ sub handle_configure ($$$@)
-   # Use $(install_sh), not $(MKDIR_P) because the latter requires
-   # at least one argument, and $(mkinstalldirs) used to work
-   # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
--  define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL);
-+  define_variable ('mkinstalldirs', '$(SHELL) $(install_sh) -d', 
INTERNAL);
- }
- 
-   reject_var ('CONFIG_HEADER',
+--- automake.in.orig   Tue Dec  8 14:36:30 2009
 automake.inMon Jun 25 00:19:06 2012
 @@ -4815,6 +4815,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG = 0,
m4_include = 1,
Index: 1.10/patches/patch-lib_am_header-vars_am
===
RCS file: 1.10/patches/patch-lib_am_header-vars_am
diff -N 1.10/patches/patch-lib_am_header-vars_am
--- 1.10/patches/patch-lib_am_header-vars_am18 May 2011 19:38:15 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib_am_header-vars_am,v 1.1 2011/05/18 19:38:15 matthieu Exp $
 lib/am/header-vars.am.orig Tue Dec  8 20:35:33 2009
-+++ lib/am/header-vars.am  Mon May 16 08:16:06 2011
-@@ -35,9 +35,9 @@ pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- 
- am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
--install_sh_DATA = $(install_sh) -c -m 644
--install_sh_PROGRAM = $(install_sh) -c
--install_sh_SCRIPT = $(install_sh) -c
-+install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
-+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
-+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
- INSTALL_HEADER = $(INSTALL_DATA)
- transform = $(program_transform_name)
- 
Index: 1.11/Makefile
===
RCS file: /home/cvs/ports/devel/automake/1.11/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- 1.11/Makefile   23 Apr 2012 08:01:14 -  1.8
+++ 1.11/Makefile   25 Jun 2012 04:17:21 -
@@ -4,6 +4,7 @@ COMMENT=GNU standards-compliant Makefil
 
 VERSION=   1.11
 DISTNAME=  automake-${VERSION}.5
+REVISION=  0
 PKGSPEC=   automake-=${VERSION},1.12
 
 CATEGORIES=devel
Index: 1.11/patches/patch-automake_in
===
RCS file: /home/cvs/ports/devel/automake/1.11/patches/patch-automake_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-automake_in
--- 1.11/patches/patch-automake_in  22 Feb 2012 07:14:20 -  1.2
+++ 1.11/patches/patch-automake_in  25 Jun 2012 04:19:58 -
@@ -1,15 +1,6 @@
 $OpenBSD: patch-automake_in,v 1.2 2012/02/22 07:14:20 ajacoutot Exp $
 automake.in.orig   Wed Feb  1 05:31:13 2012
-+++ automake.inThu Feb 16 22:24:10 2012