Re: UPDATE: graphics/netpbm

2006-05-31 Thread Peter Valchev
> Builds on amd64, i386, sparc64.
> No checking of dependent ports done yet.

those are the only 2 that break i think (lib depends ones)

someone needs to make sure the RUN_DEPENDS ones work by
testing them too.

Index: converters/ppmtoTbmp/Makefile
===
RCS file: /cvs/ports/converters/ppmtoTbmp/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- converters/ppmtoTbmp/Makefile   21 Nov 2004 22:53:58 -  1.6
+++ converters/ppmtoTbmp/Makefile   1 Jun 2006 04:16:48 -
@@ -3,6 +3,7 @@
 COMMENT=   "PPM to Pilot bitmap converter"
 
 DISTNAME=  ppmtoTbmp-1.1
+PKGNAME=   ${DISTNAME}p0
 CATEGORIES=converters graphics
 HOMEPAGE=  http://www.isaac.cs.berkeley.edu/pilot/
 
@@ -12,14 +13,14 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=   c
+WANTLIB=   c m
 
 MASTER_SITES=  ${HOMEPAGE}
 
 MAKE_FLAGS=CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-   LDLIBS="-L${LOCALBASE}/lib -lpnm -lppm -lpgm -lpbm"
+   LDLIBS="-L${LOCALBASE}/lib -lnetpbm -lm"
 
-LIB_DEPENDS=   pnm,ppm,pgm,pbm::graphics/netpbm
+LIB_DEPENDS=   netpbm::graphics/netpbm
 
 do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/Tbmptopnm ${PREFIX}/bin
Index: converters/ppmtoTbmp/patches/patch-ppmtoTbmp_c
===
RCS file: converters/ppmtoTbmp/patches/patch-ppmtoTbmp_c
diff -N converters/ppmtoTbmp/patches/patch-ppmtoTbmp_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ converters/ppmtoTbmp/patches/patch-ppmtoTbmp_c  1 Jun 2006 04:11:38 
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- ppmtoTbmp.c.orig   Wed May 31 22:11:06 2006
 ppmtoTbmp.cWed May 31 22:11:32 2006
+@@ -5,8 +5,8 @@
+  * Based on ppmtopuzz.c by Jef Paskanzer, from the netpbm-1mar1994 package.
+  */
+ 
+-#include "ppm.h"
+-#include "ppmcmap.h"
++#include 
++#include 
+ 
+ static int colcompare(const void *a, const void *b)
+ {
Index: graphics/vid/Makefile
===
RCS file: /cvs/ports/graphics/vid/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- graphics/vid/Makefile   10 Sep 2005 18:29:55 -  1.9
+++ graphics/vid/Makefile   1 Jun 2006 04:09:57 -
@@ -4,7 +4,7 @@
 COMMENT=   "get images from USB cameras using the OV511(+) chipsets"
 
 DISTNAME=  vid-1.0.1
-PKGNAME=   ${DISTNAME}p2
+PKGNAME=   ${DISTNAME}p3
 CATEGORIES=graphics
 
 HOMEPAGE=  http://ovtvid-bsd.sourceforge.net/
@@ -18,11 +18,11 @@ PERMIT_DISTFILES_FTP=   Yes
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ovtvid-bsd/}
 
-LIB_DEPENDS=   pbm,pnm::graphics/netpbm
-WANTLIB=   c
+LIB_DEPENDS=   netpbm::graphics/netpbm
+WANTLIB=   c m
 
 MAKE_FLAGS=CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
-   LIBS="-L${LOCALBASE}/lib -lpnm -lpbm"
+   LIBS="-L${LOCALBASE}/lib -lnetpbm -lm"
 ALL_TARGET=default
 
 NO_REGRESS=Yes



Re: UPDATE: graphics/netpbm

2006-05-31 Thread Peter Valchev
> > Builds on amd64, i386, sparc64.
> 
> As Bernd learned the hard way, this port triggers an amazing 11
> ICEs (instances of internal compiler error) on alpha, unless compiled
> without optimization.

But soon with gcc3 this won't be a problem I guess (this
is good though for now)
 
> --- netpbm.orig/Makefile  Wed May 31 01:17:17 2006
> +++ netpbm/Makefile   Wed May 31 01:19:13 2006
> @@ -46,3 +46,8 @@
>  .else
>  MAKE_FLAGS+= NETPBMLIBTYPE=unixshared
>  .endif
> +
> +# multiple internal compiler errors
> +.if ${MACHINE_ARCH} == "alpha"
> +CFLAGS:= ${CFLAGS:N-O*}
> +.endif
> -- 
> Christian "naddy" Weisgerber  [EMAIL PROTECTED]



UPDATE: math/plplot

2006-05-31 Thread steven mestdagh
5.6.1, mainly a bugfix release. i've done some light testing on i386 and
amd64. feedback welcome.

Index: Makefile
===
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile2006/05/12 13:52:17 1.2
+++ Makefile2006/06/01 05:03:27
@@ -8,7 +8,7 @@
 COMMENT-octave="Octave bindings for plplot"
 COMMENT-tcl=   "Tcl bindings for plplot"
 
-VERSION=   5.6.0
+VERSION=   5.6.1
 DISTNAME=  plplot-${VERSION}
 SHARED_LIBS=   csirocsa0.1 \
plplotcxxd  11.0\
@@ -23,7 +23,7 @@
 PKGNAME-octave=plplot-octave-${VERSION}
 PKGNAME-tcl=   plplot-tcl-${VERSION}
 
-CATEGORIES=math
+CATEGORIES=math graphics
 
 HOMEPAGE=  http://plplot.sourceforge.net/
 
@@ -47,7 +47,8 @@
 BUILD_DEPENDS= ::lang/tcl/${TCL_VERSION} \
::math/octave \
::graphics/gd \
-   ::print/ghostscript/gnu-fonts
+   ::print/ghostscript/gnu-fonts \
+   ::devel/pkgconfig
 RUN_DEPENDS=   ::print/ghostscript/gnu-fonts
 LIB_DEPENDS=   ltdl::devel/libtool,-ltdl
 
Index: distinfo
===
RCS file: /cvs/ports/math/plplot/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo2006/05/12 13:35:38 1.1.1.1
+++ distinfo2006/06/01 05:03:27
@@ -1,4 +1,4 @@
-MD5 (plplot-5.6.0.tar.gz) = 0f23cc477f0611adcfdd8ba39caf4213
-RMD160 (plplot-5.6.0.tar.gz) = 5d0cf6fd4910029472d8c942c3f299ed196a485a
-SHA1 (plplot-5.6.0.tar.gz) = e4a180fdb8b8cf648ef6110cbb44c4eac9aafb8f
-SIZE (plplot-5.6.0.tar.gz) = 6135094
+MD5 (plplot-5.6.1.tar.gz) = 51029b256f449de9bcd3e00c088f
+RMD160 (plplot-5.6.1.tar.gz) = 6111f871c2e5fcaabe3b1133f92ab266070211ee
+SHA1 (plplot-5.6.1.tar.gz) = fe1ed39939b34e43e426fa66c87b78ba6a98d89e
+SIZE (plplot-5.6.1.tar.gz) = 6357444
Index: patches/patch-bindings_Makefile_in
===
RCS file: patch-bindings_Makefile_in
diff -N patch-bindings_Makefile_in
--- /dev/null   Sat Aug 30 18:16:59 1997
+++ patch-bindings_Makefile_in  Thu Jun  1 05:03:27 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- bindings/Makefile.in.orig  Thu Jun  1 06:49:20 2006
 bindings/Makefile.in   Thu Jun  1 06:49:33 2006
+@@ -463,7 +463,7 @@ with_qhull_FALSE = @with_qhull_FALSE@
+ with_qhull_TRUE = @with_qhull_TRUE@
+ with_rpath_FALSE = @with_rpath_FALSE@
+ with_rpath_TRUE = @with_rpath_TRUE@
+-SUBDIRS = c++ f77 f95 python tcl tk octave java gnome2
++SUBDIRS = c++ f77 python tcl tk octave java gnome2
+ abovedatadir = $(DATA_DIR)
+ @[EMAIL PROTECTED] = tcl/pkgIndex.tcl
+ @[EMAIL PROTECTED] = tk/pkgIndex.tcl
Index: patches/patch-bindings_octave_demos_Makefile_in
===
RCS file: 
/cvs/ports/math/plplot/patches/patch-bindings_octave_demos_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-bindings_octave_demos_Makefile_in
--- patches/patch-bindings_octave_demos_Makefile_in 2006/05/12 13:35:39 
1.1.1.1
+++ patches/patch-bindings_octave_demos_Makefile_in 2006/06/01 05:03:27
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bindings_octave_demos_Makefile_in,v 1.1.1.1 2006/05/12 
13:35:39 steven Exp $
 bindings/octave/demos/Makefile.in.orig Wed May  3 03:08:08 2006
-+++ bindings/octave/demos/Makefile.in  Sat May  6 12:44:34 2006
-@@ -139,6 +139,7 @@ CXXDEPMODE = @CXXDEPMODE@
+--- bindings/octave/demos/Makefile.in.orig Tue May 30 01:07:09 2006
 bindings/octave/demos/Makefile.in  Wed May 31 18:32:16 2006
+@@ -138,6 +138,7 @@ CXXDEPMODE = @CXXDEPMODE@
  CXXFLAGS = @CXXFLAGS@
  CYGPATH_W = @CYGPATH_W@
  DATA_DIR = @DATA_DIR@
@@ -9,7 +9,7 @@
  DB2X_TEXIXML = @DB2X_TEXIXML@
  DB2X_XSLTPROC = @DB2X_XSLTPROC@
  DB_SS_HTML_PUBID = @DB_SS_HTML_PUBID@
-@@ -494,7 +495,7 @@ examples_octave = \
+@@ -500,7 +501,7 @@ examples_octave = \
lena.img
  
  EXTRA_DIST = $(examples_octave)
Index: patches/patch-bindings_octave_misc_Makefile_in
===
RCS file: 
/cvs/ports/math/plplot/patches/patch-bindings_octave_misc_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-bindings_octave_misc_Makefile_in
--- patches/patch-bindings_octave_misc_Makefile_in  2006/05/12 13:35:39 
1.1.1.1
+++ patches/patch-bindings_octave_misc_Makefile_in  2006/06/01 05:03:27
@@ -1,7 +1,7 @@
 $OpenBSD: patch-bindings_octave_misc_Makefile_in,v 1.1.1.1 2006/05/12 13:35:39 
steven Exp $
 bindings/octave/misc/Makefile.in.orig  Wed May  3 03:08:08 2006
-+++ bindings/octave/misc/Makefile.in   Sat May  6 12:44:34 2006
-@@ -139,6 +139,7 @@ CXXDEPMODE = @CXXDEPMODE@
+--- bindings/octave/misc/Makefile.in.orig  Tue May 30 01:07:10 2006
 bindings/octave/misc/Makefile.in   Wed May 31 18:32:16 2006
+@@ -138,6 +138,7 @@ CXXDEPMODE = @CXXDEPMODE@
  CXXFLAGS = @CXXFLAGS@
 

Re: UPDATE: graphics/netpbm

2006-05-31 Thread Christian Weisgerber
Christian Weisgerber <[EMAIL PROTECTED]> wrote:

> Builds on amd64, i386, sparc64.

As Bernd learned the hard way, this port triggers an amazing 11
ICEs (instances of internal compiler error) on alpha, unless compiled
without optimization.

--- netpbm.orig/MakefileWed May 31 01:17:17 2006
+++ netpbm/Makefile Wed May 31 01:19:13 2006
@@ -46,3 +46,8 @@
 .else
 MAKE_FLAGS+=   NETPBMLIBTYPE=unixshared
 .endif
+
+# multiple internal compiler errors
+.if ${MACHINE_ARCH} == "alpha"
+CFLAGS:=   ${CFLAGS:N-O*}
+.endif
-- 
Christian "naddy" Weisgerber  [EMAIL PROTECTED]



Re: jdk 1.5 charset patch

2006-05-31 Thread Kurt Miller
Ok I see what's happening now. KOI8_U strikes again but
this time its related to the new bootstrap method. It works
for me because the last time I built the jdk was with
native_bootstrap. I'll work on a proper solution.

-Kurt



UPDATE: glib2 and gtk+2

2006-05-31 Thread Brad
Here are minor bug fix updates to the glib2 and gtk+2 ports. Please take
these updated ports for a spin and let me know how it goes. Here are the
release notes if you would like to know what has changed with the
new versions.

glib2
http://mail.gnome.org/archives/gtk-devel-list/2006-May/msg00277.html

gtk+2
http://mail.gnome.org/archives/gtk-devel-list/2006-May/msg00278.html


Index: Makefile
===
RCS file: /cvs/ports/devel/glib2/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile22 May 2006 01:39:36 -  1.25
+++ Makefile29 May 2006 16:46:07 -
@@ -3,7 +3,7 @@
 COMMENT=   "general-purpose utility library"
 COMMENT-docs=  "glib2 documentation"
 
-VERSION=   2.10.2
+VERSION=   2.10.3
 DISTNAME=  glib-${VERSION}
 PKGNAME=   glib2-${VERSION}
 PKGNAME-docs=  glib2-docs-${VERSION}
@@ -11,10 +11,10 @@ CATEGORIES= devel
 
 HOMEPAGE=  http://www.gtk.org
 
-SHARED_LIBS=   glib-2.01000.2 \
-   gmodule-2.0 1000.2 \
-   gobject-2.0 1000.2 \
-   gthread-2.0 1000.2
+SHARED_LIBS=   glib-2.01000.3 \
+   gmodule-2.0 1000.3 \
+   gobject-2.0 1000.3 \
+   gthread-2.0 1000.3
 
 # LGPL
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/glib2/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo22 May 2006 01:39:36 -  1.16
+++ distinfo29 May 2006 16:46:07 -
@@ -1,4 +1,4 @@
-MD5 (glib-2.10.2.tar.bz2) = 718961161ee1692c216a2d542196a04a
-RMD160 (glib-2.10.2.tar.bz2) = bf2586343e2ad08052f8eba3541104dfd97a725e
-SHA1 (glib-2.10.2.tar.bz2) = 14d055725a4fa347bc4c11d6f52ec5268da2454f
-SIZE (glib-2.10.2.tar.bz2) = 2784594
+MD5 (glib-2.10.3.tar.bz2) = 87206e721c12d185d17dd9ecd7e30369
+RMD160 (glib-2.10.3.tar.bz2) = da56e238f4f6e9c6e7c08d4e53f75128b5178047
+SHA1 (glib-2.10.3.tar.bz2) = bba1dea73c4426f6a130c82e0b7a07b78dfc73ce
+SIZE (glib-2.10.3.tar.bz2) = 2774011



Index: Makefile
===
RCS file: /cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile22 May 2006 02:16:40 -  1.36
+++ Makefile29 May 2006 17:04:53 -
@@ -5,18 +5,18 @@ NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
 COMMENT=   "multi-platform graphical toolkit"
 COMMENT-docs=  "gtk+-2 documentation"
 
-VERSION=   2.8.17
+VERSION=   2.8.18
 DISTNAME=  gtk+-${VERSION}
-PKGNAME=   gtk+2-${VERSION}p1
+PKGNAME=   gtk+2-${VERSION}
 PKGNAME-docs=  gtk+2-docs-${VERSION}
 CATEGORIES=x11 devel
 
 HOMEPAGE=  http://www.gtk.org
 
-SHARED_LIBS=   gdk-x11-2.0 802.0 \
-   gdk_pixbuf-2.0  802.0 \
-   gdk_pixbuf_xlib-2.0 802.0 \
-   gtk-x11-2.0 802.0
+SHARED_LIBS=   gdk-x11-2.0 802.1 \
+   gdk_pixbuf-2.0  802.1 \
+   gdk_pixbuf_xlib-2.0 802.1 \
+   gtk-x11-2.0 802.1
 
 # LGPL
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/ports/x11/gtk+2/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo22 May 2006 01:49:07 -  1.22
+++ distinfo29 May 2006 17:04:53 -
@@ -1,4 +1,4 @@
-MD5 (gtk+-2.8.17.tar.bz2) = 6d2deb63a5444808d2aeb7dcfffaa2f4
-RMD160 (gtk+-2.8.17.tar.bz2) = ff4d34eef948cd98c81d852a111d716b9cead94f
-SHA1 (gtk+-2.8.17.tar.bz2) = a6c62ec016bc076a9938ba962f0dd4bcc1e74e16
-SIZE (gtk+-2.8.17.tar.bz2) = 12261085
+MD5 (gtk+-2.8.18.tar.bz2) = 0d27a026428732337676d47d22e5e23c
+RMD160 (gtk+-2.8.18.tar.bz2) = f9b41fc90e16158ccc87872f07dc4eb269903e84
+SHA1 (gtk+-2.8.18.tar.bz2) = e4f0231b943418d8bb17b3bf9d79aa902ab3eb13
+SIZE (gtk+-2.8.18.tar.bz2) = 12258449



Re: Update libtheora-1.0alpha6

2006-05-31 Thread Moritz Grimm

Hi,


I'll try it with my ffmpeg2theora port (unreleased) tomorrow - or maybe 
Friday, my day off, hopefully - to see if encoding to Theora works as 
well now. Since the patch included in my old proposed update to alpha5 
is in alpha6, I have all the confidence. :)



Moritz



Re: FIX for net/freeradius

2006-05-31 Thread Antoine Jacoutot
Selon Antoine Jacoutot <[EMAIL PROTECTED]>:
> Please commit.

And while you're at it, don't forget to bump PKGNAME like I did in my diff :(
Sorry about that.

-- 
Antoine



Re: jdk 1.5 charset patch

2006-05-31 Thread Matt Jibson

Well, without the patch, on amd64, I get the following error:

Exception in thread "main" java.lang.NullPointerException
at java.nio.charset.Charset.put(Charset.java:493)
at java.nio.charset.Charset.access$300(Charset.java:240)
at java.nio.charset.Charset$4.run(Charset.java:529)
at java.security.AccessController.doPrivileged(Native Method)
at java.nio.charset.Charset.availableCharsets(Charset.java:525)
at TestCase.main(TestCase.java:7)


On 5/31/06, Kurt Miller <[EMAIL PROTECTED]> wrote:

On Wednesday 31 May 2006 1:27 am, Matt Jibson wrote:
> FreeBSD's jdk1.5 has the same problem as OpenBSD's, discussed in [1].
> Kurt Miller said it would be fixed in patchset 3 [2], but it wasn't.
> Attached is the patch from [1]. There's a NullPointerException if
> Charset.availableCharsets() is called without the patch. Tested on
> amd64, -current.
>
> [1] 
http://lists.freebsd.org/mailman/htdig/freebsd-java/2005-September/004355.html
> [2] http://lists.freebsd.org/pipermail/freebsd-java/2006-February/004963.html
>

Hi Matt,

Its kinda strange that you're quoting me with references
on a public mailing list without contacting me directly
first.

Anyway, the patch proposed on the freebsd mailing list
was incorrect. It did not fix the root cause of the NPE.
The root cause was the incomplete addition of the KOI8_U
charset and the fix was in j2se/make/java/sun_io FILES_java.gmk.

The TestCase program provided in your references pass on
OpenBSD/i386, so I don't know what you are trying to fix
now.

-Kurt





FIX for net/freeradius

2006-05-31 Thread Antoine Jacoutot

Hi.

Another fix for freeradius to resolve the following errors:
Error: rlm_detail: Failed to create directory 
/var/log/radius/radacct/192.168.1.6: Permission denied

Please commit.
Thanks!

--
Antoine Jacoutot
Observatoire de Paris
SIO - Centre de calcul (Bat 15)
5, Place Jules Janssen
92195 Meudon Cedex
Tel : +33 (0)1.45.07.71.95diff -uNr --exclude=CVS /usr/ports/net/freeradius/pkg/PLIST freeradius/pkg/PLIST
--- /usr/ports/net/freeradius/pkg/PLIST Sun May 28 01:37:36 2006
+++ freeradius/pkg/PLISTWed May 31 22:14:25 2006
@@ -417,9 +417,9 @@
 share/freeradius/dictionary.xedia
 share/freeradius/dictionary.xylan
 share/freeradius/dictionary.zyxel
[EMAIL PROTECTED] _freeradius
 @sample /var/log/radius/
 @sample /var/log/radius/radacct/
[EMAIL PROTECTED] _freeradius
 @sample /var/run/radiusd/
 @owner
 @extra /var/log/radius/radwtmp


UPDATE: textproc/intltool

2006-05-31 Thread Jasper Lievisse Adriaanse
Hi,

here's an update for textproc/intltool. This diff does the following:
- Update the port to version 0.35.0;
- Remove EXTRACT_SUFX, a .tar.gz is present on the server;
- Add PKG_ARCH=*, since it's all Perl;
- Reformat pkg/DESCR to a width of 72 chars and remove unneeded.

Cheers,
Jasper


Index: Makefile
===
RCS file: /cvs/ports/textproc/intltool/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile12 Apr 2005 06:34:16 -  1.5
+++ Makefile31 May 2006 16:31:56 -
@@ -2,13 +2,12 @@
 
 COMMENT=   "Internationalization tool"
 
-DISTNAME=  intltool-0.33
+DISTNAME=  intltool-0.35.0
 CATEGORIES=textproc
 
 HOMEPAGE=  http://www.gnome.org
 
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/intltool/0.33/}
-EXTRACT_SUFX=   .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/intltool/0.35/}
 
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
@@ -21,5 +20,7 @@
 
 USE_GMAKE= Yes
 CONFIGURE_STYLE=   gnu
+
+PKG_ARCH=  *
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/intltool/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo12 Apr 2005 06:34:16 -  1.6
+++ distinfo31 May 2006 16:31:56 -
@@ -1,4 +1,4 @@
-MD5 (intltool-0.33.tar.bz2) = 7d3b6d421b0fb9beee7faf97daab45e6
-RMD160 (intltool-0.33.tar.bz2) = 2d756fa882e04f80afa9cd16ae73acf7e0495263
-SHA1 (intltool-0.33.tar.bz2) = 6230179c8429deb0c310a0261d1a75ec8068630f
-SIZE (intltool-0.33.tar.bz2) = 126936
+MD5 (intltool-0.35.0.tar.gz) = 58a9ea9dee510dd5feee7530d70107a4
+RMD160 (intltool-0.35.0.tar.gz) = d3c11260773ea1e8622926d472153584b10612ee
+SHA1 (intltool-0.35.0.tar.gz) = ddc634dced78add9d4267a752f6734e03713bb68
+SIZE (intltool-0.35.0.tar.gz) = 170811
Index: pkg/DESCR
===
RCS file: /cvs/ports/textproc/intltool/pkg/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- pkg/DESCR   15 Dec 2003 21:55:30 -  1.2
+++ pkg/DESCR   31 May 2006 16:31:56 -
@@ -1,4 +1,2 @@
-The intltool package is a set of tools for translating the
-contents of data files using the gettext translation framework.
-
-For more information about intltool, visit:
+The intltool package is a set of tools for translating the contents of
+data files using the gettext translation framework.

-- 
Humppa is a serious thing!



Re: Update libtheora-1.0alpha6

2006-05-31 Thread steven mestdagh
Vladimir Támara Patiño [2006-05-31, 09:32:50]:
> Good morning in the Lord
> 
> I'm sending un update for the port of multimedia/libtheora to
> upgrade it from alpha4 to alpha6. It includes suggestions of
> Moritz Grimm, Jakob Mauser and Jonathan Gray
> http://archives.neohapsis.com/archives/openbsd/2005-12/1990.html
> http://archives.neohapsis.com/archives/openbsd/2006-03/1595.html
> 
> I tested it on i386 with current.  mplayer and vlc both play theora.
> 
> Please note that with this patch it would be better to remove
> from the repository:
> 
> patches/patch-Makefile_in
> patches/patch-configure
> 
> Best regards. God illuminate us.
> -- 
> Dios, por favor, ayudanos a hacer Tu voluntad que es felicidad desbordante.
> http://www.primarilypublicdomain.org/letter/
> --  
>   Vladimir Támara Patiño.  
>   http://www.geocities.com/v-tamara
> 
> diff -pruN --exclude=CVS ../libtheora.orig/Makefile ./Makefile
> --- ../libtheora.orig/MakefileWed May 31 08:29:37 2006
> +++ ./MakefileWed May 31 06:40:41 2006
> @@ -1,11 +1,9 @@
>  # $OpenBSD: Makefile,v 1.3 2005/12/30 05:35:56 jakemsr Exp $
>  
>  COMMENT= "open video codec"
> -DISTNAME=libtheora-1.0alpha4
> -PKGNAME= ${DISTNAME}p0
> +DISTNAME=libtheora-1.0alpha6
>  CATEGORIES=  multimedia
>  SHARED_LIBS= theora  1.0
> -MODGNU_SHARED_LIBS=  theora  ''
>  
>  MASTER_SITES=http://downloads.xiph.org/releases/theora/
>  
> @@ -26,6 +24,8 @@ LIB_DEPENDS=ogg.5::audio/libogg
>  USE_LIBTOOL= Yes
>  SEPARATE_BUILD=  concurrent
>  CONFIGURE_STYLE=gnu
> +
> +REGRESS_TARGET=check
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libtheora
> diff -pruN --exclude=CVS ../libtheora.orig/distinfo ./distinfo
> --- ../libtheora.orig/distinfoWed May 31 08:29:37 2006
> +++ ./distinfoWed May 31 06:42:00 2006
> @@ -1,4 +1,4 @@
> -MD5 (libtheora-1.0alpha4.tar.gz) = 75f436a980b80f8b8102ee182ddb8748
> -RMD160 (libtheora-1.0alpha4.tar.gz) = 
> 1eca6dba519c8af94fa27c4112d3d3ec41aa54d3
> -SHA1 (libtheora-1.0alpha4.tar.gz) = 524416a44bcc159bfe53893bb37983046b97522c
> -SIZE (libtheora-1.0alpha4.tar.gz) = 2045695
> +MD5 (libtheora-1.0alpha6.tar.gz) = 0309b6e6da4b3a5e5d27adfc8558a73d
> +RMD160 (libtheora-1.0alpha6.tar.gz) = 
> e03f232416f0c4160bd5034bb0bc7234020b6892
> +SHA1 (libtheora-1.0alpha6.tar.gz) = 93ec6eaccc841581a723c251db06138fd9e783f4
> +SIZE (libtheora-1.0alpha6.tar.gz) = 1863054
> diff -pruN --exclude=CVS ../libtheora.orig/patches/patch-Makefile_in 
> ./patches/patch-Makefile_in
> --- ../libtheora.orig/patches/patch-Makefile_in   Wed May 31 08:29:37 2006
> +++ ./patches/patch-Makefile_in   Wed Dec 31 19:00:00 1969
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2005/07/09 00:35:02 jolan Exp $
>  Makefile.in.orig Wed Dec 15 14:06:17 2004
> -+++ Makefile.in  Fri Jul  8 19:03:16 2005
> -@@ -206,7 +206,7 @@ target_cpu = @target_cpu@
> - target_os = @target_os@
> - target_vendor = @target_vendor@
> - AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
> --SUBDIRS = lib include doc examples debian
> -+SUBDIRS = lib include
> - EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
> - theora-uninstalled.pc.in
> - 
> diff -pruN --exclude=CVS ../libtheora.orig/patches/patch-configure 
> ./patches/patch-configure
> --- ../libtheora.orig/patches/patch-configure Wed May 31 08:29:37 2006
> +++ ./patches/patch-configure Wed Dec 31 19:00:00 1969
> @@ -1,20 +0,0 @@
> -$OpenBSD: patch-configure,v 1.2 2005/12/30 05:35:56 jakemsr Exp $
>  configure.orig   Wed Dec 15 12:06:19 2004
> -+++ configureThu Dec 29 20:56:15 2005
> -@@ -19863,6 +19863,7 @@ fi
> - 
> - HAVE_VORBIS=no
> - 
> -+if false ; then
> - 
> - if test "x$HAVE_PKG_CONFIG" = "xyes"
> - then
> -@@ -20632,7 +20633,7 @@ echo "$as_me: WARNING: OSS audio support
> - fi
> - 
> - done
> --
> -+fi
> - 
> - if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes; then
> -   BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"
> diff -pruN --exclude=CVS ../libtheora.orig/patches/patch-examples_Makefile_in 
> ./patches/patch-examples_Makefile_in
> --- ../libtheora.orig/patches/patch-examples_Makefile_in  Wed Dec 31 
> 19:00:00 1969
> +++ ./patches/patch-examples_Makefile_in  Wed May 31 07:24:15 2006
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- examples/Makefile.in.origTue May 30 17:47:41 2006
>  examples/Makefile.in Wed May 31 07:24:09 2006
> +@@ -216,7 +216,7 @@ encoder_example$(EXEEXT): $(encoder_exam
> + player_example-player_example.$(OBJEXT): player_example.c
> + player_example$(EXEEXT): $(player_example_OBJECTS) 
> $(player_example_DEPENDENCIES) 
> + @rm -f player_example$(EXEEXT)
> +-$(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) 
> $(player_example_LDADD) $(LIBS)
> ++#$(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) 
> $(player_example_LDADD) $(LIBS)
> + 
> + mostlyclean-compile:
> + -rm -f *.$(OBJEXT) core *.core
> diff -pruN --exclude=CVS

Update libtheora-1.0alpha6

2006-05-31 Thread Vladimir Támara Patiño
Good morning in the Lord

I'm sending un update for the port of multimedia/libtheora to
upgrade it from alpha4 to alpha6. It includes suggestions of
Moritz Grimm, Jakob Mauser and Jonathan Gray
http://archives.neohapsis.com/archives/openbsd/2005-12/1990.html
http://archives.neohapsis.com/archives/openbsd/2006-03/1595.html

I tested it on i386 with current.  mplayer and vlc both play theora.

Please note that with this patch it would be better to remove
from the repository:

patches/patch-Makefile_in
patches/patch-configure

Best regards. God illuminate us.
-- 
Dios, por favor, ayudanos a hacer Tu voluntad que es felicidad desbordante.
http://www.primarilypublicdomain.org/letter/
--  
  Vladimir Támara Patiño.  
  http://www.geocities.com/v-tamara

diff -pruN --exclude=CVS ../libtheora.orig/Makefile ./Makefile
--- ../libtheora.orig/Makefile  Wed May 31 08:29:37 2006
+++ ./Makefile  Wed May 31 06:40:41 2006
@@ -1,11 +1,9 @@
 # $OpenBSD: Makefile,v 1.3 2005/12/30 05:35:56 jakemsr Exp $
 
 COMMENT=   "open video codec"
-DISTNAME=  libtheora-1.0alpha4
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  libtheora-1.0alpha6
 CATEGORIES=multimedia
 SHARED_LIBS=   theora  1.0
-MODGNU_SHARED_LIBS=theora  ''
 
 MASTER_SITES=  http://downloads.xiph.org/releases/theora/
 
@@ -26,6 +24,8 @@ LIB_DEPENDS=  ogg.5::audio/libogg
 USE_LIBTOOL=   Yes
 SEPARATE_BUILD=concurrent
 CONFIGURE_STYLE=gnu
+
+REGRESS_TARGET=check
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libtheora
diff -pruN --exclude=CVS ../libtheora.orig/distinfo ./distinfo
--- ../libtheora.orig/distinfo  Wed May 31 08:29:37 2006
+++ ./distinfo  Wed May 31 06:42:00 2006
@@ -1,4 +1,4 @@
-MD5 (libtheora-1.0alpha4.tar.gz) = 75f436a980b80f8b8102ee182ddb8748
-RMD160 (libtheora-1.0alpha4.tar.gz) = 1eca6dba519c8af94fa27c4112d3d3ec41aa54d3
-SHA1 (libtheora-1.0alpha4.tar.gz) = 524416a44bcc159bfe53893bb37983046b97522c
-SIZE (libtheora-1.0alpha4.tar.gz) = 2045695
+MD5 (libtheora-1.0alpha6.tar.gz) = 0309b6e6da4b3a5e5d27adfc8558a73d
+RMD160 (libtheora-1.0alpha6.tar.gz) = e03f232416f0c4160bd5034bb0bc7234020b6892
+SHA1 (libtheora-1.0alpha6.tar.gz) = 93ec6eaccc841581a723c251db06138fd9e783f4
+SIZE (libtheora-1.0alpha6.tar.gz) = 1863054
diff -pruN --exclude=CVS ../libtheora.orig/patches/patch-Makefile_in 
./patches/patch-Makefile_in
--- ../libtheora.orig/patches/patch-Makefile_in Wed May 31 08:29:37 2006
+++ ./patches/patch-Makefile_in Wed Dec 31 19:00:00 1969
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2005/07/09 00:35:02 jolan Exp $
 Makefile.in.orig   Wed Dec 15 14:06:17 2004
-+++ Makefile.inFri Jul  8 19:03:16 2005
-@@ -206,7 +206,7 @@ target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
--SUBDIRS = lib include doc examples debian
-+SUBDIRS = lib include
- EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
-   theora-uninstalled.pc.in
- 
diff -pruN --exclude=CVS ../libtheora.orig/patches/patch-configure 
./patches/patch-configure
--- ../libtheora.orig/patches/patch-configure   Wed May 31 08:29:37 2006
+++ ./patches/patch-configure   Wed Dec 31 19:00:00 1969
@@ -1,20 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2005/12/30 05:35:56 jakemsr Exp $
 configure.orig Wed Dec 15 12:06:19 2004
-+++ configure  Thu Dec 29 20:56:15 2005
-@@ -19863,6 +19863,7 @@ fi
- 
- HAVE_VORBIS=no
- 
-+if false ; then
- 
- if test "x$HAVE_PKG_CONFIG" = "xyes"
- then
-@@ -20632,7 +20633,7 @@ echo "$as_me: WARNING: OSS audio support
- fi
- 
- done
--
-+fi
- 
- if test x$HAVE_SDL = xyes -a x$HAVE_OSS = xyes; then
-   BUILDABLE_EXAMPLES="$BUILDABLE_EXAMPLES player_example"
diff -pruN --exclude=CVS ../libtheora.orig/patches/patch-examples_Makefile_in 
./patches/patch-examples_Makefile_in
--- ../libtheora.orig/patches/patch-examples_Makefile_inWed Dec 31 
19:00:00 1969
+++ ./patches/patch-examples_Makefile_inWed May 31 07:24:15 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- examples/Makefile.in.orig  Tue May 30 17:47:41 2006
 examples/Makefile.in   Wed May 31 07:24:09 2006
+@@ -216,7 +216,7 @@ encoder_example$(EXEEXT): $(encoder_exam
+ player_example-player_example.$(OBJEXT): player_example.c
+ player_example$(EXEEXT): $(player_example_OBJECTS) 
$(player_example_DEPENDENCIES) 
+   @rm -f player_example$(EXEEXT)
+-  $(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) 
$(player_example_LDADD) $(LIBS)
++  #$(LINK) $(player_example_LDFLAGS) $(player_example_OBJECTS) 
$(player_example_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+   -rm -f *.$(OBJEXT) core *.core
diff -pruN --exclude=CVS ../libtheora.orig/pkg/PFRAG.shared ./pkg/PFRAG.shared
--- ../libtheora.orig/pkg/PFRAG.shared  Wed May 31 08:29:37 2006
+++ ./pkg/PFRAG.shared  Thu May 25 07:17:45 2006
@@ -1,2 +1,3 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/07/09 00:35:02 jolan 
Exp $
 @comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/3

Re: Specifying Alternative Dependencies?

2006-05-31 Thread Marc Espie
On Wed, May 31, 2006 at 04:16:36PM +0200, Toni Mueller wrote:
> So, if eg any kind of database will do, then I need to enumerate them
> all, and possibly with all their flavours, too. Right?

More or less, it's a bit simpler. Read packages-specs(7). You'll find
out that all flavors are allowed unless you explicitly ask for more
specific stuff.

With recent pkg_add, if you use pkg_add -i, you'll get a choice. Otherwise,
it will pick up the default package, or whatever is already installed that
solves the dependency.



Re: Specifying Alternative Dependencies?

2006-05-31 Thread Toni Mueller

Hello Marc,

On Wed, 31.05.2006 at 12:37:28 +0200, Marc Espie <[EMAIL PROTECTED]> wrote:
> runtime depends do support alternates just fine, use |.

ok, thank you. Somehow I didn't find that.

> There's no require/depend thingy, though, you have to specify the package
> specs that can solve the dependency yourself.

So, if eg any kind of database will do, then I need to enumerate them
all, and possibly with all their flavours, too. Right?


Best,
--Toni++



Re: jdk 1.5 charset patch

2006-05-31 Thread Kurt Miller
On Wednesday 31 May 2006 1:27 am, Matt Jibson wrote:
> FreeBSD's jdk1.5 has the same problem as OpenBSD's, discussed in [1].
> Kurt Miller said it would be fixed in patchset 3 [2], but it wasn't.
> Attached is the patch from [1]. There's a NullPointerException if
> Charset.availableCharsets() is called without the patch. Tested on
> amd64, -current.
> 
> [1] 
> http://lists.freebsd.org/mailman/htdig/freebsd-java/2005-September/004355.html
> [2] http://lists.freebsd.org/pipermail/freebsd-java/2006-February/004963.html
> 

Hi Matt,

Its kinda strange that you're quoting me with references
on a public mailing list without contacting me directly
first.

Anyway, the patch proposed on the freebsd mailing list
was incorrect. It did not fix the root cause of the NPE.
The root cause was the incomplete addition of the KOI8_U
charset and the fix was in j2se/make/java/sun_io FILES_java.gmk.

The TestCase program provided in your references pass on
OpenBSD/i386, so I don't know what you are trying to fix
now.

-Kurt



Re: Specifying Alternative Dependencies?

2006-05-31 Thread Marc Espie
On Wed, May 31, 2006 at 09:46:21AM +0200, Toni Mueller wrote:
> 
> 
> Hello,
> 
> I'd like to specify that a port depends on one out of a group of
> "similar" programs. Example: Some program that depends on one out of a
> group of SQL-speaking services. How do I specify this w/o using a
> flavour? I thought of a capability similar to "Provides:" in Debian so
> you can depend on such a virtual package, but couldn't find a similar
> thing in the ports system.

runtime depends do support alternates just fine, use |.

There's no require/depend thingy, though, you have to specify the package
specs that can solve the dependency yourself.



Specifying Alternative Dependencies?

2006-05-31 Thread Toni Mueller


Hello,

I'd like to specify that a port depends on one out of a group of
"similar" programs. Example: Some program that depends on one out of a
group of SQL-speaking services. How do I specify this w/o using a
flavour? I thought of a capability similar to "Provides:" in Debian so
you can depend on such a virtual package, but couldn't find a similar
thing in the ports system.


Best,
--Toni++