CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 01:48:00

Modified files:
infrastructure/build: pkg_subst 

Log message:
Add -o/-g options to set owner/group on target file like install(1) does,
so that we can get rid of several ${SUBST_CMD} -c + chown constructs in
the tree. For example:
${SUBST_CMD} -c src dest
chown username:groupname dest
becomes:
${SUBST_CMD} -o username -g groupname -c src dest
comments  ok espie@



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2010/06/05 01:59:05

Modified files:
infrastructure/build: pkg_subst 

Log message:
tweaks: create one single cache.
sort options in usage.
be paranoid about changes.



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2010/06/05 06:38:48

Modified files:
graphics/hugin : Makefile 

Log message:
glut is a LIB_DEPENDS, not a WANTLIB.
Build problem reported by naddy@



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Kevin Lo
CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2010/06/05 07:50:04

Modified files:
converters/p5-JSON-Any: Makefile distinfo 

Log message:
Update to 1.22

maintainer timeout



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Kevin Lo
CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2010/06/05 07:52:55

Modified files:
converters/p5-JSON-DWIW: Makefile distinfo 
converters/p5-JSON-DWIW/pkg: PLIST 
Added files:
converters/p5-JSON-DWIW/patches: patch-libjsonevt_int_defs_h 
 patch-libjsonevt_jsonevt_h 
 patch-libjsonevt_jsonevt_utils_h 

Log message:
Update to 0.40

maintainer timeout



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 08:37:42

Modified files:
productivity/grisbi: Makefile distinfo 
productivity/grisbi/patches: patch-configure 
productivity/grisbi/pkg: PLIST 
Removed files:
productivity/grisbi/files: grisbi.desktop 

Log message:
Update to grisbi 0.6.0, remove now bundled .desktop file, set
SHARED_ONLY, and make it correctly link/work with openssl.



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:19:41

Modified files:
x11/xfce4  : xfce4.port.mk 

Log message:
Moving to Xfce 4.6.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:20:25

Modified files:
x11/xfce4/exo  : Makefile distinfo 
x11/xfce4/exo/pkg: PLIST 

Log message:
Update to exo 0.3.107



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:21:25

Modified files:
x11/xfce4/libxfce4util: Makefile distinfo 
x11/xfce4/libxfce4util/pkg: PLIST 

Log message:
Update to libxfce4util 4.6.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:20:58

Modified files:
x11/xfce4/libxfce4menu: distinfo 
x11/xfce4/libxfce4menu/patches: patch-configure 
x11/xfce4/libxfce4menu/pkg: PLIST 

Log message:
Update to libxfce4menu 4.6.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:22:59

Modified files:
x11/xfce4/orage: Makefile 

Log message:
fix WANTLIB, bump PKGNAME



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:22:13

Modified files:
x11/xfce4/libxfcegui4: Makefile distinfo 
x11/xfce4/libxfcegui4/pkg: PLIST 

Log message:
Update to libxfcegui4 4.6.4



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:24:37

Modified files:
x11/xfce4/xfce-utils: Makefile distinfo 
x11/xfce4/xfce-utils/pkg: PLIST 

Log message:
Update to xfce-utils 4.6.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:25:05

Modified files:
x11/xfce4/xfce4-appfinder: Makefile distinfo 
x11/xfce4/xfce4-appfinder/pkg: PLIST 

Log message:
Update to xfce4-appfinder 4.6.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:25:40

Modified files:
x11/xfce4/xfce4-mixer: Makefile 
x11/xfce4/xfce4-mixer/pkg: PLIST 

Log message:
Fix WANTLIB/PLIST, bump PKGNAME



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:24:07

Modified files:
x11/xfce4/thunar: Makefile distinfo 
x11/xfce4/thunar/pkg: PLIST 
Removed files:
x11/xfce4/thunar/patches: patch-thunar-vfs_thunar-vfs-io-jobs_c 

Log message:
Update to thunar 1.0.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:26:03

Modified files:
x11/xfce4/xfce4-panel: Makefile distinfo 
x11/xfce4/xfce4-panel/pkg: PLIST 

Log message:
Update to xfce4-panel 4.6.4



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:26:33

Modified files:
x11/xfce4/xfce4-session: Makefile distinfo 
x11/xfce4/xfce4-session/patches: patch-xfce4-tips_Makefile_in 
x11/xfce4/xfce4-session/pkg: PLIST 
Removed files:
x11/xfce4/xfce4-session/patches: 
 
patch-xfce4-session_xfsm-shutdown-helper_c 

Log message:
Update to xfce4-session 4.6.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:27:44

Modified files:
x11/xfce4/xfconf: Makefile distinfo 
x11/xfce4/xfconf/pkg: PLIST 

Log message:
Update to xfconf 4.6.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:28:19

Modified files:
x11/xfce4/xfdesktop: Makefile distinfo 
x11/xfce4/xfdesktop/pkg: PLIST 

Log message:
Update to xfdesktop 4.6.2



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:27:16

Modified files:
x11/xfce4/xfce4-settings: Makefile distinfo 
x11/xfce4/xfce4-settings/pkg: PLIST 
Removed files:
x11/xfce4/xfce4-settings/patches: 
  
patch-dialogs_keyboard-settings_xfce-keyboard-settings_c 

Log message:
Update to xfce4-settings 4.6.5



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:28:47

Modified files:
x11/xfce4/xfprint: Makefile 

Log message:
Fix WANTLIB, bump PKGNAME



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 09:30:29

Modified files:
x11/xfce4/xfwm4: Makefile distinfo 
x11/xfce4/xfwm4/pkg: PLIST 

Log message:
Update to xfwm4 4.6.2.
Thanks to robert at openbsd dot pap dot st and pea@ for testing the
whole xfce 4.6.2 update.



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2010/06/05 10:36:44

Modified files:
www/webkit : Makefile 

Log message:
Add STDCPPLIB to WANTLIB and bump. Fixes PLISTDB complains..
prompted/cluebat by espie@



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2010/06/05 10:38:47

Modified files:
infrastructure/mk: fortran.port.mk 

Log message:
BREAK the tree in a very obvious way for people who did not remove
/usr/bin/f77 and /usr/bin/g77



CVS: cvs.openbsd.org: ports

2010-06-05 Thread Matthias Kilian
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2010/06/05 10:58:33

Modified files:
audio/libsidplay: Makefile 

Log message:
Yet another WANTLIB = m stdc++



Contest Spirits of the World 2010/Information

2010-06-05 Thread Menu Magazine
 Dear Sir,

Group Menu Magazine will be held next November in Estoril an event called
Spirits of the World 2010, which extend to all categories of spirits, so we
want to inform us of your name and contact responsible for inclusion in our
list of invitees to participate as compete.

We will be launching on the international market a new publication in English
called Spirits Magazine and we ask if you are interested in sending news of
your brand, assessment tests or future releases of new products for this may
be via our mail or send CD with a minimum resolution of 300 dpi

We present our compliments,


Sales Management


age...@spiritsmagazine.eu
www.spiritsmagazine.eu

Group Menu Magazine
P.O.Box. 1020
2776-810 Parede
Portugal






www.winemasterschallenge.com
www.worldbeerchallenge.com
www.spiritsoftheworld.eu
Under construction
www.groupmenumagazine.eu
www.winemastersmagazine.eu
www.spiritsmagazine.eu
www.menumagazine.eu
www.firstchoicemagazine.eu
www.hotelsedecoration.eu
www.linesecruises.eu

Group Menu Magazine

PS: This email and its attachments are intended for the above named only and
are confidential. If they have come to you in error, please informs us
immediately and destroy it. It is prohibited to retain, distribute, disclose
or using any information contained herein. Images rights belong to Menu
Magazine, and cannot be used without our permission Group Menu Magazine uses
anti virus software. However, email transmission cannot guarantee to be
secure, error free or even arrive on time as information can be intercepted,
corrupted or contain viruses although all precautions have been taken. We
cannot accept liability for any errors or omissions in the contents of this
message, and it is responsibility of the recipient to ensure that they are
virus free.

 P Please consider the environment before printing this page.



infrastructure, some older new thingy, REORDER_SITES

2010-06-05 Thread Marc Espie
Apologies, there were some similar patches floating around a while ago.
This introduces a small wedge to reorder distsites before fetching.

Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.999
diff -u -p -r1.999 bsd.port.mk
--- bsd.port.mk 28 May 2010 12:34:22 -  1.999
+++ bsd.port.mk 5 Jun 2010 06:51:39 -
@@ -995,6 +1001,7 @@ _SITE_SELECTOR += *:${_I}) echo 2 Err
 .endfor
 _SITE_SELECTOR += *) sites=${MASTER_SITES};; esac
 
+REORDER_SITES ?= :
 
 # OpenBSD code to handle ports distfiles on a CDROM.
 #
@@ -2452,6 +2459,7 @@ ${_F}:
f=${_F:s...@^${fulldistdir}/@@}; \
${_CDROM_OVERRIDE}; \
${_SITE_SELECTOR}; \
+   ${REORDER_SITES}; \
for site in $$sites; do \
${ECHO_MSG}  Fetch $${site}$$f; \
if ${FETCH_CMD} $${site}$$f; then \


You can then define in /etc/mk.conf:
REORDER_SITES=sites=`perl ${PORTSDIR}/infrastructure/fetch/reorder_sites -v 
$$sites`

With the following script:
--
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD$
#
# Copyright (c) 2010 Marc Espie es...@openbsd.org
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

use strict;
use warnings;

sub write_list
{
my ($fh, $l, $join) = @_;
$join //= ' ';
print $fh join($join, @$l), \n;
}

my $order;
do /etc/order_sites.conf;

my $scores = {};
my $verbose = 0;
if ($ARGV[0] eq '-v') {
shift;
$verbose = 1;
}

write_list(\*STDERR, \...@argv) if $verbose;
for my $i (@ARGV) {
$scores-{$i} = 0;
while (my ($s, $score) = (each %$order)) {
if ($i =~ m/$s/) {
$scores-{$i} += $score;
}
}
}

my @result = 
sort {$scores-{$b} = $scores-{$a}} 
grep {$scores-{$_} = 0} 
(keys %$scores);
write_list(\*STDERR, \...@result) if $verbose;
write_list(\*STDOUT, \...@result, \n);
exit 0;

-
This does expect a small config file /etc/order_sites.conf (actually a bit
of perl) with the following format:
$order = {
regexp = score,
...
};

for instance:
$order = {
'\bfr\b' = 50,
'^http:' = 150,
};

this one will select http: urls  in preference to ftp, and give a smaller
greater score to fr.

It does sum up all regexps that match for a given site, and discards
everything with a strictly negative score. The -v means it will show
sites before/after for debugging purposes.

Comments welcome.



fix games/einstein

2010-06-05 Thread Matthias Kilian
Fix build with gcc4 on amd64.
From FreeBSD.

Index: Makefile
===
RCS file: /cvs/ports/games/einstein/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile3 Apr 2009 17:56:41 -   1.1.1.1
+++ Makefile5 Jun 2010 11:20:04 -
@@ -3,6 +3,7 @@
 COMMENT =  open source remake of old DOS game Sherlock
 
 DISTNAME = einstein-2.0
+PKGNAME =  ${DISTNAME}p0
 
 CATEGORIES =   games
 
Index: patches/patch-formatter_cpp
===
RCS file: patches/patch-formatter_cpp
diff -N patches/patch-formatter_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-formatter_cpp 5 Jun 2010 11:20:04 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+--- formatter.cpp.orig Sun Aug 14 04:40:58 2005
 formatter.cpp  Sat Jun  5 13:04:52 2010
+@@ -58,7 +58,7 @@ Formatter::Formatter(unsigned char *data, int offset)
+ if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
+ (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
+ {
+-int no = (int)c.data;
++long no = (long)c.data;
+ args[no - 1] = c.type;
+ }
+ }
+@@ -123,7 +123,7 @@ class StrArgValue: public ArgValue
+ std::wstring Formatter::format(std::vectorArgValue* argValues) const
+ {
+ std::wstring s;
+-int no;
++long no;
+ 
+ for (int i = 0; i  commandsCnt; i++) {
+ Command *cmd = commands[i];
+@@ -135,8 +135,8 @@ std::wstring Formatter::format(std::vectorArgValue* 
+ 
+ case STRING_ARG:
+ case INT_ARG:
+-no = (int)cmd-data - 1;
+-if (no  (int)argValues.size())
++no = (long)cmd-data - 1;
++if (no  (long)argValues.size())
+ s += argValues[no]-format(cmd);
+ break;
+ 



fix www/amaya/browser

2010-06-05 Thread Matthias Kilian
Fix www/amaya/browser:

- don't declare static stuff (that's only needed in one file) as
  extern in a header file.

- Use system jpeg again.


Index: Makefile
===
RCS file: /cvs/ports/www/amaya/browser/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile24 Apr 2010 20:18:39 -  1.21
+++ Makefile5 Jun 2010 12:37:53 -
@@ -6,7 +6,7 @@ COMMENT=test-bed browser/authoring too
 
 AMAYA_VERSION= 5.1
 DISTNAME=  amaya-src-${AMAYA_VERSION}
-PKGNAME=   amaya-${AMAYA_VERSION}p5
+PKGNAME=   amaya-${AMAYA_VERSION}p6
 
 HOMEPAGE=  http://www.w3.org/Amaya/
 
Index: patches/patch-Amaya_configure_in
===
RCS file: /cvs/ports/www/amaya/browser/patches/patch-Amaya_configure_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Amaya_configure_in
--- patches/patch-Amaya_configure_in20 Dec 2003 01:17:43 -  1.2
+++ patches/patch-Amaya_configure_in5 Jun 2010 12:37:53 -
@@ -1,6 +1,17 @@
 $OpenBSD: patch-Amaya_configure_in,v 1.2 2003/12/20 01:17:43 espie Exp $
 Amaya/configure.in.orig2001-07-03 13:23:50.0 +0200
-+++ Amaya/configure.in 2003-12-20 02:05:54.0 +0100
+--- Amaya/configure.in.origTue Jul  3 13:23:50 2001
 Amaya/configure.in Sat Jun  5 14:30:06 2010
+@@ -55,8 +55,8 @@ AC_PATH_PROG(DIFF, diff, /usr/bin/diff, $PATH:/bin:/us
+ AC_ARG_WITH(graphic-libs, [  --without-graphic-libsdoesn't use provided 
libjpeg, libpng.])
+ if test $withval = no ; then
+ dnl
+-AC_MSG_CHECKING([for libjpeg version = 6b])
+-AC_EGREP_CPP([x 62 *x],
++AC_MSG_CHECKING([for libjpeg version = 7])
++AC_EGREP_CPP([x 70 *x],
+ [#include jpeglib.h
+  x JPEG_LIB_VERSION x],
+ dnl
 @@ -69,8 +69,8 @@ dnl
  )
  dnl
@@ -45,7 +56,7 @@ $OpenBSD: patch-Amaya_configure_in,v 1.2
 -  break
 -fi
 -  done
-+
+ 
 +motif_includes_with=
 +AC_ARG_WITH(motif-includes,
 +[  --with-motif-includes=DIR
@@ -61,7 +72,7 @@ $OpenBSD: patch-Amaya_configure_in,v 1.2
 +  use_gtk=$withval)
 +no_gtk=yes
 +if test $use_gtk != no ; then
- 
++
  GTK_INCLUDES=`gtk-config --cflags`
  AC_SUBST(GTK_INCLUDES)
  GTK_LIBRARIES=`gtk-config --libs` -lgdk_imlib -ltiff -lgif
Index: patches/patch-Amaya_thotlib_internals_var_boxes_tv_h
===
RCS file: patches/patch-Amaya_thotlib_internals_var_boxes_tv_h
diff -N patches/patch-Amaya_thotlib_internals_var_boxes_tv_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Amaya_thotlib_internals_var_boxes_tv_h5 Jun 2010 
12:37:53 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- Amaya/thotlib/internals/var/boxes_tv.h.origThu Mar  2 12:50:29 2000
 Amaya/thotlib/internals/var/boxes_tv.h Sat Jun  5 13:47:13 2010
+@@ -23,12 +23,3 @@ THOT_EXPORT ThotBoolAnyWidthUpdate;
+ /* paragraphe to be reformatted after insertion */
+ THOT_EXPORT PtrAbstractBox LastInsertParagraph;
+ THOT_EXPORT PtrAbstractBox LastInsertCell;
+-
+-/* text element where the last insertion is done */
+-THOT_EXPORT PtrElement   LastInsertElText;
+-THOT_EXPORT PtrElement   LastInsertElement;
+-THOT_EXPORT int  LastInsertThotWindow;
+-
+-/* attribute for which a presentation abstract box has been modified */
+-THOT_EXPORT PtrAttribute LastInsertAttr;
+-THOT_EXPORT PtrElement   LastInsertAttrElem;



dot (math/graphviz) broken pthread

2010-06-05 Thread Anthony J. Bentley
Hi guys,

Dot is installed as part of math/graphviz. It's used to make flowcharts.

When I try it on a certain project that requires it, many instances of the
same error pop up:

dot:/usr/local/lib/libgthread-2.0.so.1803.0: undefined symbol \
'pthread_mutex_trylock'
lazy binding failed!
Segmentation fault (core dumped)
Problems running dot: exit code=139, command='dot', \
arguments='structupdate__box__coll__graph.dot -Tpng -o \
structupdate__box__coll_graph.png'

This looks extremely similar to an error brought up recently on the list:
http://marc.info/?l=openbsd-portsm=127238426613149w=2

You can reproduce it as follows:
- install devel/gmake, devel/doxygen, math/graphviz
- download+extract 
http://www.netsurf-browser.org/downloads/releases/netsurf-2.5-src.tar.gz
- gmake docs

Any info would be appreciated.
--Anthony J. Bentley



fix cad/qcad

2010-06-05 Thread Matthias Kilian
Fix build with gcc4.

Index: Makefile
===
RCS file: /cvs/ports/cad/qcad/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile10 Aug 2009 06:30:30 -  1.17
+++ Makefile5 Jun 2010 21:27:24 -
@@ -4,7 +4,7 @@ COMMENT=Qt-based 2D CAD system
 
 V= 2.0.5.0
 DISTNAME=  qcad-${V}-1-community.src
-PKGNAME=   qcad-${V}p0
+PKGNAME=   qcad-${V}p1
 CATEGORIES=cad graphics
 
 HOMEPAGE=  http://www.ribbonsoft.com/qcad.html
Index: patches/patch-qcadlib_src_engine_rs_entity_cpp
===
RCS file: patches/patch-qcadlib_src_engine_rs_entity_cpp
diff -N patches/patch-qcadlib_src_engine_rs_entity_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-qcadlib_src_engine_rs_entity_cpp  5 Jun 2010 21:27:24 
-
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qcadlib/src/engine/rs_entity.cpp.orig  Tue Nov 22 12:52:32 2005
 qcadlib/src/engine/rs_entity.cpp   Sat Jun  5 19:00:52 2010
+@@ -861,7 +861,7 @@ std::ostream operator  (std::ostream os, RS_Entity
+ os   layer: NULL ;
+ } else {
+ os   layer:   e.layer-getName().latin1()   ;
+-os   layer address:   (int)(e.layer)   ;
++os   layer address:   (long)(e.layer)   ;
+ }
+ 
+ os  e.pen  \n;
Index: patches/patch-qcadlib_src_engine_rs_layer_cpp
===
RCS file: patches/patch-qcadlib_src_engine_rs_layer_cpp
diff -N patches/patch-qcadlib_src_engine_rs_layer_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-qcadlib_src_engine_rs_layer_cpp   5 Jun 2010 21:27:24 
-
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- qcadlib/src/engine/rs_layer.cpp.orig   Tue Nov 22 12:52:38 2005
 qcadlib/src/engine/rs_layer.cppSat Jun  5 19:10:20 2010
+@@ -55,7 +55,7 @@ std::ostream operator  (std::ostream os, const RS_
+ os   name:   l.getName().latin1()
+   pen:   l.getPen()
+ frozen:   (int)l.isFrozen()
+-address:   (int)(l)
++address:   (long)(l)
+  std::endl;
+ return os;
+ }



Re: fix cad/qcad

2010-06-05 Thread Antti Harri

On Sun, 6 Jun 2010, Matthias Kilian wrote:


Fix build with gcc4.


Hello,

I would like to propose these things to be patched as well:

- Better license marker
- Use of SUBST*
- @bin for the PLIST
- Fix the order of recent files menu

I must warn though, looks like those changes have
been in my mystuff/ for two years, so they could use
some double-checking to make sure they are up-to-date.
And for the menu fix, I was unable to get
it into upstream back then and it had done no good
anyway, there have been no new releases.
So in my opinion it could be committed as well.

The diff is at: http://openbsd.fi/iku/tmp/qcad2.diff

--
Antti Harri



Está na hora de...

2010-06-05 Thread Info Mail website na hora
se não conseguir visualizar correctamente o conteúdo deste e-mail, por
favor, clique aqui

Está na hora de...

...ter um website profissional que seja o reflexo do seu negócio;

...ter um design único em conformidade com a sua imagem corporativa;
...ter um Gestor de Conteúdos que lhe permite facilmente actualizar o seu
website;
...ter um domínio próprio com endereços de e-mail personalizados;
...ter o seu website alojado num servidor que lhe garante fiabilidade.

saiba mais em:

Para mais informações, contacte-nos:

De acordo com a legislação internacional que regulamenta o correio
electrónico, Secção 301, parágrafo (a)(2)(c) Decreto S 1618, título
terceiro aprovado pelo 105 Congresso Base Das Normativas Internacionais
Sobre Spam diz o seguinte: O email não poderá ser considerado SPAM
quando incluir uma forma do receptor ser removido da lista. Se por algum
acaso o seu nome está incluído nesta lista por erro ou gostaria de ser
removido desta lista, por favor clique aqui
Esta mensagem (incluindo quaisquer anexos) pode conter informação
confidencial ou legalmente protegida para uso exclusivo do destinatário.
Se não for o destinatário pretendido da mesma, não deverá usar, copiar,
distribuir ou revelar o seu conteúdo (incluindo quaisquer anexos) a
terceiros, sem autorização. Se recebeu esta mensagem por engano, por
favor informe o emissor por e-mail e elimine-a imediatamente. Obrigado. A
transmissão de mensagens via e-mail não pode ser considerada protegida ou
isenta de erros uma vez que a informação poderá ser interceptada,
corrompida, perdida, destruída, chegar ao destino com atraso ou conter
vírus. Assim, o remetente não poderá ser responsabilizado por quaisquer
erros ou omissões.


/usr/local/man/ru/cat1/scrotwm.0

2010-06-05 Thread Emilio Perea
I've just been deleting the file, but wonder if the problem is with the
file itself or with something else that does not recognize its format?

- Forwarded message from r...@hermes.walkereng.com -

Date: 5 Jun 2010 08:32:32 -
From: r...@hermes.walkereng.com
To: r...@hermes.walkereng.com
Subject: hermes.walkereng.com weekly output

Rebuilding whatis databases:
Can't parse /usr/local/man/ru/cat1/scrotwm.0 (not a manpage ?)

- End forwarded message -



Re: fix to buil tcl-8.5.8 on vax (and probably on m88k too)

2010-06-05 Thread Sebastian Reitenbach

Hi,

Stuart Cassoff wrote:

This takes care of the two issues and brings another bit into alignment with 
the Tcl source.
I think I got the p0's right and I don't think there's a need to bump the lib.
I didn't put --disable-load in. It takes an insane amount of time for me to
even get a vax emu setup with -current and such and I'm not much of a vaxochist.
I doubt I coined that word. Looks ok to me on i386.
Stu
  


the patch works fine for me on sparc64 and mips64, as said in the other 
mail, tcl doesn't link on the vax. Appended patches to tcl and tk are 
against a cvs checkout, since I had to apply parts of the tcl patch 
manually.


cheers,
Sebastian
? tcl-patch
Index: Makefile
===
RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile6 Feb 2010 10:27:21 -   1.9
+++ Makefile6 Jun 2010 05:28:00 -
@@ -3,7 +3,7 @@
 COMMENT =  Tool Command Language
 
 DISTNAME = tcl8.5.8
-PKGNAME =  tcl-8.5.8
+PKGNAME =  tcl-8.5.8p0
 SHARED_LIBS =  tcl85 0.5
 CATEGORIES =   lang lang/tcl
 HOMEPAGE = http://www.tcl.tk/
Index: patches/patch-generic_tclStrToD_c
===
RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-generic_tclStrToD_c,v
retrieving revision 1.1
diff -u -r1.1 patch-generic_tclStrToD_c
--- patches/patch-generic_tclStrToD_c   22 Nov 2009 22:58:30 -  1.1
+++ patches/patch-generic_tclStrToD_c   6 Jun 2010 05:28:00 -
@@ -1,21 +1,50 @@
 $OpenBSD: patch-generic_tclStrToD_c,v 1.1 2009/11/22 22:58:30 jasper Exp $
 generic/tclStrToD.c.orig   Sun Nov 22 13:37:00 2009
-+++ generic/tclStrToD.cSun Nov 22 13:39:08 2009
+--- generic/tclStrToD.c.orig   Thu Jul 16 22:50:54 2009
 generic/tclStrToD.cThu Jun  3 21:56:48 2010
 @@ -73,7 +73,7 @@ typedef unsigned int fpu_control_t __attribute__ ((__m
   * MIPS floating-point units need special settings in control registers
   * to use gradual underflow as we expect.
   */
 -#if defined(__mips)
-+#if defined(__mips)  !defined(__OpenBSD__)
++#if defined(__sgi)  defined(_COMPILER_VERSION)
  #include sys/fpu.h
  #endif
  /*
-@@ -2166,7 +2166,7 @@ TclInitDoubleConversion(void)
+@@ -947,12 +947,14 @@ TclParseNumber(
+   case sINFIN:
+   case sINFINI:
+   case sINFINIT:
++#ifdef IEEE_FLOATING_POINT
+   case sN:
+   case sNA:
+   case sNANPAREN:
+   case sNANHEX:
+   Tcl_Panic(TclParseNumber: bad acceptState %d parsing '%s',
+   acceptState, bytes);
++#endif
+ 
+   case BINARY:
+   shift = numTrailZeros;
+@@ -1134,11 +1136,13 @@ TclParseNumber(
+   objPtr-typePtr = tclDoubleType;
+   break;
+ 
++#ifdef IEEE_FLOATING_POINT
+   case sNAN:
+   case sNANFINISH:
+   objPtr-internalRep.doubleValue = MakeNaN(signum, significandWide);
+   objPtr-typePtr = tclDoubleType;
+   break;
++#endif
+ 
+   case INITIAL:
+   /* This case only to silence compiler warning */
+@@ -2166,7 +2170,7 @@ TclInitDoubleConversion(void)
  } bitwhack;
  #endif
  
 -#if defined(__mips)
-+#if defined(__mips)  !defined(__OpenBSD__)
++#if defined(__sgi)  defined(_COMPILER_VERSION)
  union fpc_csr mipsCR;
  
  mipsCR.fc_word = get_fpc_csr();
? tk-patch
? patches/patch-unix_tkUnixWm_c
Index: Makefile
===
RCS file: /cvs/ports/x11/tk/8.5/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile21 Nov 2009 02:50:23 -  1.12
+++ Makefile6 Jun 2010 05:29:03 -
@@ -3,7 +3,7 @@
 COMMENT =  graphical toolkit for Tcl
 
 DISTNAME = tk8.5.8
-PKGNAME =  tk-8.5.8
+PKGNAME =  tk-8.5.8p0
 SHARED_LIBS =  tk85 0.5
 CATEGORIES =   x11 x11/tk
 HOMEPAGE = http://www.tcl.tk/
@@ -15,13 +15,13 @@
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 
-WANTLIB =  X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig 
freetype m z \
-   pthread-stubs xcb
+WANTLIB =  X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig 
freetype m z
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/}
 DISTFILES =${DISTNAME}-src.tar.gz
 
 .if ${MACHINE_ARCH} != m88k  ${MACHINE_ARCH} != vax
+WANTLIB += pthread-stubs xcb
 MAKE_FLAGS +=  TK_BUILD_EXP_FILE=libtk85.a \
TK_EXP_FILE=libtk85.a
 .endif
@@ -56,9 +56,9 @@
 .if ${FLAVOR:L:Mthreaded}
 CONFIGURE_ARGS +=  --enable-threads
 WANTLIB += pthread
-LIB_DEPENDS =  tcl85:tcl-=8.5.8,8.5.9-${FLAVOR}:lang/tcl/8.5
+LIB_DEPENDS =  tcl85:tcl-=8.5.8p0,8.5.9-${FLAVOR}:lang/tcl/8.5
 .else
-LIB_DEPENDS =  tcl85:tcl-=8.5.8,8.5.9:lang/tcl/8.5
+LIB_DEPENDS =  

UPDATE: x11/openbox

2010-06-05 Thread blq

Hi,

This diff updates openbox to the latest release 3.4.11.2, a bugfix release.

Tested on amd64.

Cheers,
benoit


Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.53
diff -N -u Makefile
--- Makefile2 May 2010 09:10:53 -   1.53
+++ Makefile6 Jun 2010 05:47:04 -
@@ -2,7 +2,7 @@
 
 COMMENT =  small, fast  usable window manager
 
-V =3.4.11.1
+V =3.4.11.2
 DISTNAME = openbox-${V}
 SHARED_LIBS += obparser9.1 # .21.7
 SHARED_LIBS += obrender9.1 # .21.7
Index: distinfo
===
RCS file: /cvs/ports/x11/openbox/distinfo,v
retrieving revision 1.28
diff -N -u distinfo
--- distinfo2 May 2010 09:10:53 -   1.28
+++ distinfo6 Jun 2010 05:47:04 -
@@ -1,5 +1,5 @@
-MD5 (openbox-3.4.11.1.tar.gz) = VtGzZalbEZ5ICYAq7qc0+w==
-RMD160 (openbox-3.4.11.1.tar.gz) = mvJ/zsuo7PIUrOepaeQiWM//7q0=
-SHA1 (openbox-3.4.11.1.tar.gz) = 84BstVRO1XOOqzeIzeeBENpAC/A=
-SHA256 (openbox-3.4.11.1.tar.gz) = lgyJo4DH1Y8QWFkL5yFfL1Jye3Jal57KyJVy5Ly3Mq0=
-SIZE (openbox-3.4.11.1.tar.gz) = 875340
+MD5 (openbox-3.4.11.2.tar.gz) = MOZpE0+oHfgQ/n0dxZzZMQ==
+RMD160 (openbox-3.4.11.2.tar.gz) = 0eLA1ImG39+RazdAlcIPNU9sZjw=
+SHA1 (openbox-3.4.11.2.tar.gz) = 6estkbOupUFY0M44aUiW5WaadhA=
+SHA256 (openbox-3.4.11.2.tar.gz) = LnV5OJww5rsIzHIaLBr1EuBJ/sJnDnFxWqHE4SnsNJ0=
+SIZE (openbox-3.4.11.2.tar.gz) = 877633