CVS: cvs.openbsd.org: ports

2012-12-20 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2012/12/20 05:05:22

Modified files:
devel/node-gir : Makefile 
devel/node-gir/patches: patch-binding_gyp 
devel/node-gir/pkg: PLIST 
Added files:
devel/node-gir/patches: patch-gir_js 

Log message:
Fix node-gyp from recent upgrade of lang/node to 0.8.15.

OK sthen

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Gonzalo L. Rodriguez 
CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2012/12/20 05:36:28

Modified files:
www/bluefish   : Makefile distinfo 
www/bluefish/pkg: MESSAGE PLIST 

Log message:
Update to 2.2.3:

http://bluefish.svn.sourceforge.net/viewvc/bluefish/tags/bluefish_2_2_3/ChangeLog?revision=7537view=markup

Tons of change from our version on tree, a lot of help from aja@ and giovanni@,
thanks for your time guys.

Ok aja@ giovanni@

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Gonzalo L. Rodriguez 
CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2012/12/20 05:38:12

Removed files:
www/bluefish/pkg: MESSAGE 

Log message:
whoops, delete MESSAGE

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/12/20 07:24:05

ports/mail/mailgraph/patches

Update of /cvs/ports/mail/mailgraph/patches
In directory cvs.openbsd.org:/tmp/cvs-serv25621/patches

Log Message:
Directory /cvs/ports/mail/mailgraph/patches added to the repository

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/12/20 07:24:58

Modified files:
mail/mailgraph : Makefile 
Added files:
mail/mailgraph/patches: patch-mailgraph_pl 

Log message:
Support long queue IDs. From Liviu Daia.

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2012/12/20 08:18:01

Modified files:
www/owncloud   : Makefile distinfo 
www/owncloud/pkg: PLIST 

Log message:
SECURITY update to owncloud-4.5.5.

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2012/12/20 08:52:36

Modified files:
lang/swi-prolog: Makefile 

Log message:
Mark as BROKEN on sparc64 and hppa. crashes/infinite loops on the
former, undefined refs to atomic ops on the latter.

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2012/12/20 09:16:34

Log message:
Add postgresql-plv8 1.3.0

PLV8 is a shared library that provides a PostgreSQL procedual language
powered by V8 JavaScript Engine. With this program you can write in
JavaScript your function that is callable from SQL.

Supported features are:

* Functions can receive any arguments, and return a value or set of
records.
* Execute any SQL commands with built-in plv8.execute() function.
* Automatic data conversion between PostgreSQL and JavaScript,
including string, numbers, timestamps, arrays, and records.
* Records are converted to JSON which keys are column names.
* Other types are converted to strings.
* Partial support to write TRIGGER handlers.
* EXTENSION support.
* CoffeeScript and LiveScript support.

OK abieber@

Status:

Vendor Tag: jeremy
Release Tags:   jeremy_2012-Dec-20

N ports/databases/postgresql-plv8/Makefile
N ports/databases/postgresql-plv8/distinfo
N ports/databases/postgresql-plv8/pkg/DESCR
N ports/databases/postgresql-plv8/pkg/PLIST
N ports/databases/postgresql-plv8/pkg/README

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2012/12/20 09:18:25

Modified files:
databases  : Makefile 

Log message:
+ SUBDIR += postgresql-plv8

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2012/12/20 09:20:31

Log message:
Add ruby-xpath-0.1.4

XPath is a Ruby DSL around a subset of XPath 1.0. Its primary purpose is
to facilitate writing complex XPath queries from Ruby code.

OK sthen@

Status:

Vendor Tag: jeremy
Release Tags:   jeremy_2012-Dec-20

N ports/www/ruby-xpath/distinfo
N ports/www/ruby-xpath/Makefile
N ports/www/ruby-xpath/pkg/DESCR
N ports/www/ruby-xpath/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2012/12/20 09:21:24

Log message:
Add ruby-capybara-1.1.2

Capybara helps you test Rails and Rack applications by simulating how a
real user would interact with your app. It is agnostic about the driver
running your tests and comes with Rack::Test and Selenium support built
in. WebKit is supported through an external gem.

OK sthen@

Status:

Vendor Tag: jeremy
Release Tags:   jeremy_2012-Dec-20

N ports/www/ruby-capybara/distinfo
N ports/www/ruby-capybara/Makefile
N ports/www/ruby-capybara/patches/patch-_metadata
N ports/www/ruby-capybara/pkg/DESCR
N ports/www/ruby-capybara/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2012/12/20 09:22:28

Log message:
Add ruby-capybara-webkit-0.13.0

A capybara driver that uses WebKit via QtWebKit.

OK sthen@

Status:

Vendor Tag: jeremy
Release Tags:   jeremy_2012-Dec-20

N ports/www/ruby-capybara-webkit/Makefile
N ports/www/ruby-capybara-webkit/distinfo
N 
ports/www/ruby-capybara-webkit/patches/patch-lib_capybara_webkit_connection_rb
N 
ports/www/ruby-capybara-webkit/patches/patch-lib_capybara_webkit_builder_rb
N ports/www/ruby-capybara-webkit/patches/patch-webkit_server_pro
N ports/www/ruby-capybara-webkit/pkg/DESCR
N ports/www/ruby-capybara-webkit/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Jeremy Evans 
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2012/12/20 09:25:36

Modified files:
www: Makefile 

Log message:
+ SUBDIR += ruby-capybara
+ SUBDIR += ruby-capybara-webkit
+ SUBDIR += ruby-xpath

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2012/12/20 09:46:39

Modified files:
fonts/cantarell-fonts: Makefile distinfo 

Log message:
Update to cantarell-fonts-0.0.12.

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Anthony J. Bentley 
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2012/12/20 10:38:36

Modified files:
emulators/openmsx: Makefile distinfo 
emulators/openmsx/pkg: PLIST 
Removed files:
emulators/openmsx/patches: patch-build_detectsys_py 

Log message:
Update to openmsx-0.9.1.

While here, take maintainership.

Release notes:
http://sourceforge.net/projects/openmsx/files/openmsx/0.9.0/README_release-notes.txt/view
http://sourceforge.net/projects/openmsx/files/openmsx/0.9.1/README_release-notes.txt/view

Re: CVS: cvs.openbsd.org: ports

2012-12-20 Thread Anthony J. Bentley 
Anthony J. Bentley writes:
 CVSROOT:  /cvs
 Module name:  ports
 Changes by:   bent...@cvs.openbsd.org 2012/12/20 10:38:36
 
 Modified files:
   emulators/openmsx: Makefile distinfo 
   emulators/openmsx/pkg: PLIST 
 Removed files:
   emulators/openmsx/patches: patch-build_detectsys_py 
 
 Log message:
 Update to openmsx-0.9.1.
 
 While here, take maintainership.

This was ok jasper@

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2012/12/20 12:51:29

Modified files:
emulators/fs-uae: Makefile 

Log message:
Mark BROKEN-sparc64 : error: invalid 'asm': invalid operand output code

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Christian Weisgerber 
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2012/12/20 13:30:54

Modified files:
net/transmission: Makefile distinfo 

Log message:
bugfix update to 2.75; requested and tested by brad@

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/12/20 14:23:43

Modified files:
net/openconnect: Makefile 

Log message:
build depends on py-xml

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Jasper Lievisse Adriaanse 
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/12/20 14:48:41

Modified files:
www/squid  : Makefile 

Log message:
mark broken on mips64 for the same reason hppa fails.

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Edd Barrett 
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2012/12/20 15:29:32

Modified files:
emulators/fs-uae: Makefile 
emulators/fs-uae/patches: patch-libfsemu_Makefile 

Log message:
Make fs-uae listen to CFLAGS and CXXFLAGS.

OK sthen@

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Edd Barrett 
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2012/12/20 15:44:37

Modified files:
print/texlive/base: Makefile 

Log message:
Unbreak build on big endian arches. This fix was supposed to be in the
big update, but went missing somewhere.

OK sthen@

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Brad Smith 
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2012/12/20 16:12:20

Modified files:
emulators/qemu : Makefile 
Added files:
emulators/qemu/patches: patch-hw_e1000_c 

Log message:
e1000: Also discard oversized packets if LPE is enabled.

ok sthen@

CVS: cvs.openbsd.org: ports

2012-12-20 Thread Jasper Lievisse Adriaanse 
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/12/21 00:56:42

Modified files:
www/ruby-capybara-webkit: Makefile 
www/ruby-capybara-webkit/pkg: DESCR 

Log message:
tweak DESCR

Re: MAINTAINER UPDATE: x11/gnustep/sqlclient

2012-12-20 Thread Sebastian Reitenbach 
Hi,

anyone?
Nothing uses it (yet), but in not too far future, MPDCon will make use of it.

cheers,
Sebastian
 
On Saturday, November 10, 2012 16:38 CET, Sebastian Reitenbach 
sebas...@l00-bugdead-prods.de wrote: 
 
 Hi,
 
 below an easy update of the GNUstep SQLClient library to 1.6.0. Changes:
 
  * Change execute methods to return a count of the rows to which the
executed operation applies, or -1 if not supported.
Implement for postgresql and mysql.
  * Add support for asynchronous notifications
 
 OK?
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/x11/gnustep/sqlclient/Makefile,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile
 --- Makefile  22 Aug 2012 07:15:52 -  1.5
 +++ Makefile  10 Nov 2012 15:32:14 -
 @@ -2,12 +2,11 @@
  
  COMMENT =GNUstep database abstraction layer
  
 -VERSION =1.5.3
 +VERSION =1.6.0
  DISTNAME =   SQLClient-${VERSION}
  PKGNAME =gnustep-sqlclient-${VERSION}
 -REVISION =   2
  
 -SHARED_LIBS +=  SQLClient0.0
 +SHARED_LIBS +=  SQLClient1.0
  
  CATEGORIES = databases
  
 @@ -18,7 +17,7 @@
  MODULES =x11/gnustep
  MODGNUSTEP_NEEDS_GUI =   No
  WANTLIB +=   Performance pq ecpg mysqlclient sqlite3
 -WANTLIB +=   gnustep-base m objc2
 +WANTLIB +=   gnustep-base m objc2 pthread
  LIB_DEPENDS +=   x11/gnustep/performance \
   databases/mysql \
   databases/postgresql
 Index: distinfo
 ===
 RCS file: /cvs/ports/x11/gnustep/sqlclient/distinfo,v
 retrieving revision 1.2
 diff -u -r1.2 distinfo
 --- distinfo  15 Oct 2011 08:02:23 -  1.2
 +++ distinfo  10 Nov 2012 15:32:14 -
 @@ -1,5 +1,2 @@
 -MD5 (gnustep/SQLClient-1.5.3.tar.gz) = RsQynJIlaQVvFlEnM/SPwg==
 -RMD160 (gnustep/SQLClient-1.5.3.tar.gz) = 2kDwgrZTECfoJVv5h+XwQk3kBWQ=
 -SHA1 (gnustep/SQLClient-1.5.3.tar.gz) = 1Bv4XWzv+vxL6+xpL5Zg/IPSFEo=
 -SHA256 (gnustep/SQLClient-1.5.3.tar.gz) = 
 SNnfsQU7KKOwa6vSVlOprvT739U8E7pYgZ3E0pR55rU=
 -SIZE (gnustep/SQLClient-1.5.3.tar.gz) = 157196
 +SHA256 (gnustep/SQLClient-1.6.0.tar.gz) = 
 lLjH5qS4fPnD8LcuBXS6egyV1nm4h/t/O/tDlDia+/k=
 +SIZE (gnustep/SQLClient-1.6.0.tar.gz) = 161099
 Index: patches/patch-GNUmakefile
 ===
 RCS file: patches/patch-GNUmakefile
 diff -N patches/patch-GNUmakefile
 --- /dev/null 1 Jan 1970 00:00:00 -
 +++ patches/patch-GNUmakefile 10 Nov 2012 15:32:14 -
 @@ -0,0 +1,62 @@
 +$OpenBSD$
 +
 +Do not hardcode the base and objc library which
 +gets linked against, fix from upstream:
 +http://svn.gna.org/viewcvs/gnustep?view=revisionrevision=35788
 +
 +--- GNUmakefile.orig Sat Nov 10 16:14:47 2012
  GNUmakefile  Sat Nov 10 16:14:54 2012
 +@@ -81,7 +81,7 @@ BUNDLE_NAME += ECPG_libs
 + ECPG_libs_OBJC_FILES = ECPG.m
 + ECPG_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
 + ECPG_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
 +--lgnustep-base -lobjc -lecpg
 ++$(FND_LIBS) $(OBJC_LIBS) -lecpg
 + ECPG_libs_PRINCIPAL_CLASS = SQLClientECPG_libs
 + endif
 + TEST_TOOL_NAME += testECPG
 +@@ -107,7 +107,7 @@ BUNDLE_NAME += Postgres_libs
 + Postgres_libs_OBJC_FILES = Postgres.m
 + Postgres_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
 + Postgres_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
 +--lgnustep-base -lobjc -lpq
 ++$(FND_LIBS) $(OBJC_LIBS) -lpq
 + Postgres_libs_PRINCIPAL_CLASS = SQLClientPostgres_libs
 + endif
 + TEST_TOOL_NAME += testPostgres
 +@@ -133,7 +133,7 @@ BUNDLE_NAME += JDBC_libs
 + JDBC_libs_OBJC_FILES = JDBC.m
 + JDBC_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR) $(JDBC_VM_LIBDIRS)
 + JDBC_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
 +--lgnustep-base -lobjc $(JDBC_VM_LIBS)
 ++$(FND_LIBS) $(OBJC_LIBS) $(JDBC_VM_LIBS)
 + JDBC_libs_PRINCIPAL_CLASS = SQLClientJDBC_libs
 + endif
 + TEST_TOOL_NAME += testJDBC
 +@@ -159,7 +159,7 @@ BUNDLE_NAME += MySQL_libs
 + MySQL_libs_OBJC_FILES = MySQL.m
 + MySQL_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
 + MySQL_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
 +--lgnustep-base -lobjc -lmysqlclient
 ++$(FND_LIBS) $(OBJC_LIBS) -lmysqlclient
 + MySQL_libs_PRINCIPAL_CLASS = SQLClientMySQL_libs
 + endif
 + TEST_TOOL_NAME += testMySQL
 +@@ -185,7 +185,7 @@ BUNDLE_NAME += SQLite_libs
 + SQLite_libs_OBJC_FILES = SQLite.m
 + SQLite_libs_LIB_DIRS = -L./$(GNUSTEP_OBJ_DIR)
 + SQLite_libs_BUNDLE_LIBS += -lSQLClient -lPerformance \
 +--lgnustep-base -lobjc -lsqlite3
 ++$(FND_LIBS) $(OBJC_LIBS) -lsqlite3
 + SQLite_libs_PRINCIPAL_CLASS = SQLClientSQLite_libs
 + endif
 + TEST_TOOL_NAME += testSQLite
 +@@ -208,7 +208,7 @@ Oracle_libs_OBJC_FILES = Oracle.m
 + Oracle_libs_LIB_DIRS = -L$(ORACLE_HOME)/lib -L./$(GNUSTEP_OBJ_DIR) \
 + $(shell cat $(ORACLE_HOME)/lib/ldflags)
 + Oracle_libs_BUNDLE_LIBS += -lclntsh \
 +-  -lSQLClient -lPerformance -lgnustep-base -lobjc \
 ++

FIX: texlive_base on big endian

2012-12-20 Thread Edd Barrett 
Hi,

Looks like the big endian fix for texlive base got lost somewhere along
the line.  My sparc64 has fallen over, so I can't test this, but I
believe this is the fix. Markus Lude is currently running a build but he
tells me his machine is slow. How slow I don't know...

Index: Makefile
===
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile17 Dec 2012 20:28:04 -  1.62
+++ Makefile19 Dec 2012 10:21:34 -
@@ -55,8 +55,14 @@ CPPFLAGS +=  -DU_PLATFORM=U_PF_BSD
 
 # Big endian ICU bug
 # http://tug.org/pipermail/tlbuild/2012q2/002266.html
+.include bsd.port.arch.mk
+.if ${PROPERTIES:Mbe}
+CPPFLAGS +=-DU_IS_BIG_ENDIAN=1
+.endif
+
 CONFIGURE_ENV +=   TL_MAKE=${GMAKE} \
CPPFLAGS=${CPPFLAGS}
+
 # Can't build in same dir
 WRKBUILD =  ${WRKSRC}/Work
 CONFIGURE_SCRIPT =  ../configure

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

[PATCH] mailgraph: postfix log parsing

2012-12-20 Thread Liviu Daia 
Relatively recent versions of postfix can be configured to use
non-repeating queue IDs.  This simplifies log correlation, and can be
enabled with the main.cf parameter enable_long_queue_ids.  However, the
new queue IDs can include lower-case letters, and this breaks mailgraph
parsing of the logs.  The patch below seems to fix the bit rot.

Regards,

Liviu Daia
Index: Makefile
===
RCS file: /cvs/ports/mail/mailgraph/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile19 Nov 2010 07:23:07 -  1.9
+++ Makefile20 Dec 2012 12:50:59 -
@@ -3,6 +3,7 @@
 COMMENT=   RRDtool frontend for Postfix statistics
 
 DISTNAME=  mailgraph-1.14
+REVISION=  0
 CATEGORIES=net mail
 
 MASTER_SITES=  ${HOMEPAGE}/pub/ \
Index: patches/patch-mailgraph_pl
===
RCS file: patches/patch-mailgraph_pl
diff -N patches/patch-mailgraph_pl
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-mailgraph_pl  20 Dec 2012 12:50:59 -
@@ -0,0 +1,42 @@
+$OpenBSD$
+--- mailgraph.pl.orig  Wed Aug 29 12:06:01 2007
 mailgraph.pl   Thu Dec 20 14:41:13 2012
+@@ -596,7 +596,7 @@ sub process_line($)
+   }
+   }
+   elsif($prog eq 'smtpd') {
+-  if($text =~ /^[0-9A-Z]+: client=(\S+)/) {
++  if($text =~ /^[0-9a-zA-Z]+: client=(\S+)/) {
+   my $client = $1;
+   return if $opt{'ignore-localhost'} and
+   $client =~ /\[127\.0\.0\.1\]$/;
+@@ -604,16 +604,16 @@ sub process_line($)
+   $client =~ /$opt{'ignore-host'}/oi;
+   event($time, 'received');
+   }
+-  elsif($opt{'virbl-is-virus'} and $text =~ 
/^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using 
virbl.dnsbl.bit.nl/) {
++  elsif($opt{'virbl-is-virus'} and $text =~ 
/^(?:[0-9a-zA-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using 
virbl.dnsbl.bit.nl/) {
+   event($time, 'virus');
+   }
+-  elsif($opt{'rbl-is-spam'} and $text=~ 
/^(?:[0-9A-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) {
++  elsif($opt{'rbl-is-spam'} and $text=~ 
/^(?:[0-9a-zA-Z]+: |NOQUEUE: )?reject: .*: 554.* blocked using/) {
+   event($time, 'spam');
+   }
+-  elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: )?reject: /) {
++  elsif($text =~ /^(?:[0-9a-zA-Z]+: |NOQUEUE: )?reject: 
/) {
+   event($time, 'rejected');
+   }
+-  elsif($text =~ /^(?:[0-9A-Z]+: |NOQUEUE: 
)?milter-reject: /) {
++  elsif($text =~ /^(?:[0-9a-zA-Z]+: |NOQUEUE: 
)?milter-reject: /) {
+   if($text =~ /Blocked by SpamAssassin/) {
+   event($time, 'spam');
+   }
+@@ -628,7 +628,7 @@ sub process_line($)
+   }
+   }
+   elsif($prog eq 'cleanup') {
+-  if($text =~ /^[0-9A-Z]+: (?:reject|discard): /) {
++  if($text =~ /^[0-9a-zA-Z]+: (?:reject|discard): /) {
+   event($time, 'rejected');
+   }
+   }

Cranking the optimiser on selected ports?

2012-12-20 Thread Edd Barrett 
Hi,

Having been pretty unsatisfied with the performance of fs-uae (and
emulators in general) on OpenBSD, I asked upstream what I could do to
make it run faster and rid of jerky screen updates and frame drops. If
you press ctrl+f10 in fs-uae it displays diagnostics. I sent upstream a
screenshot. Surprisingly the slowness is not a symptom of slow graphics
rendering, but rather of cpu core emulation.

I experimented by cranking the optimiser to -O3 for fs-uae only.  I
wasn't expecting much of a difference, but in this particular case it
makes a big difference. It makes some of the more demanding amiga games,
like pinball dreams and pinball fantasies usable on OpenBSD (even with
the accuracy knob set to the highest).

Now, I know we don't usually like to turn the optimiser up past -O2 for
fear of compiler bugs making crappy code, however, the code gcc has made
in this case for my amd64 machine seems to be ok.

I spoke to Jasper on icb about the possibility of making exceptions. We
came to the conclusion that we could allow exceptions for selected
ports (I guess where latency/lag is critical) as long as we test
carefully.

We could:
 * Turn on -O3 unconditionally for selected ports.
 * Turn on -O3 for selected ports on a subset of architectures.
 * Make -O3 package flavours for selected ports.
 * Any other suggestions?

I prefer one of the first two options.

What do people think? Are any of the options acceptable?

Below is a diff that makes fs-uae listen to CFLAGS and CXXFLAGS and
unconditionally turns on -O3. Try twhat we have in tree and then using
the diff an older machine (say an x61).

If you do testing, please let me know how you get on.

Index: Makefile
===
RCS file: /cvs/ports/emulators/fs-uae/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile7 Dec 2012 08:43:06 -   1.5
+++ Makefile20 Dec 2012 13:19:23 -
@@ -6,7 +6,7 @@ COMMENT =   modern Amiga emulator
 V =2.0.1
 DISTNAME = fs-uae-$V
 CATEGORIES =   emulators
-REVISION = 1
+REVISION = 2
 
 HOMEPAGE = http://fengestad.no/fs-uae/
 MAINTAINER =   Edd Barrett e...@openbsd.org
@@ -34,7 +34,12 @@ RUN_DEPENDS =devel/desktop-file-utils 
x11/py-wxPython
 
 USE_GMAKE =Yes
-MAKE_FLAGS +=  prefix=${PREFIX}
+
+# We don't usually crank the optimiser up this high, but
+# if you don't it really impacts emulation performace.
+CFLAGS =   -O3 -pipe
+CXXFLAGS=  ${CFLAGS}
+MAKE_FLAGS +=  prefix=${PREFIX} CXXFLAGS=${CXXFLAGS} 
CFLAGS=${CFLAGS}
 
 NO_REGRESS =   Yes
 
Index: patches/patch-libfsemu_Makefile
===
RCS file: /cvs/ports/emulators/fs-uae/patches/patch-libfsemu_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-libfsemu_Makefile
--- patches/patch-libfsemu_Makefile 22 Nov 2012 23:45:20 -  1.1.1.1
+++ patches/patch-libfsemu_Makefile 20 Dec 2012 13:19:23 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-libfsemu_Makefile,v 1.1.1.1 2012/11/22 23:45:20 edd Exp $
 
-Missing libpng flags
+Missing libpng flags. Strip hardcoded CFLAGS
 
 libfsemu/Makefile.orig Tue Nov 20 00:28:32 2012
-+++ libfsemu/Makefile  Tue Nov 20 00:28:44 2012
+--- libfsemu/Makefile.orig Fri Oct 26 17:28:39 2012
 libfsemu/Makefile  Tue Dec 18 21:28:36 2012
 @@ -36,7 +36,7 @@ warnings = -Wall
  errors = -Werror=implicit-function-declaration
  cppflags = $(CXXFLAGS)
@@ -13,3 +13,16 @@ Missing libpng flags
$(CFLAGS) -D_FILE_OFFSET_BITS=64
  objects = obj/emu_emu.o obj/emu_video.o obj/emu_audio.o obj/emu_input.o \
obj/emu_menu.o obj/emu_texture.o obj/emu_font.o \
+@@ -53,12 +53,6 @@ objects = obj/emu_emu.o obj/emu_video.o obj/emu_audio.
+ 
+ ldflags = $(LDFLAGS)
+ libs =
+-
+-ifeq ($(debug), 1)
+-  cflags += -g -O0 -fno-inline
+-else ifneq ($(noflags), 1)
+-  cflags += -g -O2
+-endif
+ 
+ ifeq ($(os), windows)
+ 

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Antoine Jacoutot 
On Thu, Dec 20, 2012 at 01:54:25PM +, Edd Barrett wrote:
 Hi,
 
 Having been pretty unsatisfied with the performance of fs-uae (and
 emulators in general) on OpenBSD, I asked upstream what I could do to
 make it run faster and rid of jerky screen updates and frame drops. If
 you press ctrl+f10 in fs-uae it displays diagnostics. I sent upstream a
 screenshot. Surprisingly the slowness is not a symptom of slow graphics
 rendering, but rather of cpu core emulation.
 
 I experimented by cranking the optimiser to -O3 for fs-uae only.  I
 wasn't expecting much of a difference, but in this particular case it
 makes a big difference. It makes some of the more demanding amiga games,
 like pinball dreams and pinball fantasies usable on OpenBSD (even with
 the accuracy knob set to the highest).
 
 Now, I know we don't usually like to turn the optimiser up past -O2 for
 fear of compiler bugs making crappy code, however, the code gcc has made
 in this case for my amd64 machine seems to be ok.
 
 I spoke to Jasper on icb about the possibility of making exceptions. We
 came to the conclusion that we could allow exceptions for selected
 ports (I guess where latency/lag is critical) as long as we test
 carefully.

FYI there are already ports that do this.

 We could:
  * Turn on -O3 unconditionally for selected ports.
  * Turn on -O3 for selected ports on a subset of architectures.
  * Make -O3 package flavours for selected ports.
  * Any other suggestions?
 
 I prefer one of the first two options.
 
 What do people think? Are any of the options acceptable?
 
 Below is a diff that makes fs-uae listen to CFLAGS and CXXFLAGS and
 unconditionally turns on -O3. Try twhat we have in tree and then using
 the diff an older machine (say an x61).
 
 If you do testing, please let me know how you get on.
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/emulators/fs-uae/Makefile,v
 retrieving revision 1.5
 diff -u -p -u -r1.5 Makefile
 --- Makefile  7 Dec 2012 08:43:06 -   1.5
 +++ Makefile  20 Dec 2012 13:19:23 -
 @@ -6,7 +6,7 @@ COMMENT = modern Amiga emulator
  V =  2.0.1
  DISTNAME =   fs-uae-$V
  CATEGORIES = emulators
 -REVISION =   1
 +REVISION =   2
  
  HOMEPAGE =   http://fengestad.no/fs-uae/
  MAINTAINER = Edd Barrett e...@openbsd.org
 @@ -34,7 +34,12 @@ RUN_DEPENDS =  devel/desktop-file-utils 
   x11/py-wxPython
  
  USE_GMAKE =  Yes
 -MAKE_FLAGS +=prefix=${PREFIX}
 +
 +# We don't usually crank the optimiser up this high, but
 +# if you don't it really impacts emulation performace.
 +CFLAGS = -O3 -pipe
 +CXXFLAGS=${CFLAGS}
 +MAKE_FLAGS +=prefix=${PREFIX} CXXFLAGS=${CXXFLAGS} 
 CFLAGS=${CFLAGS}
  
  NO_REGRESS = Yes
  
 Index: patches/patch-libfsemu_Makefile
 ===
 RCS file: /cvs/ports/emulators/fs-uae/patches/patch-libfsemu_Makefile,v
 retrieving revision 1.1.1.1
 diff -u -p -u -r1.1.1.1 patch-libfsemu_Makefile
 --- patches/patch-libfsemu_Makefile   22 Nov 2012 23:45:20 -  1.1.1.1
 +++ patches/patch-libfsemu_Makefile   20 Dec 2012 13:19:23 -
 @@ -1,9 +1,9 @@
  $OpenBSD: patch-libfsemu_Makefile,v 1.1.1.1 2012/11/22 23:45:20 edd Exp $
  
 -Missing libpng flags
 +Missing libpng flags. Strip hardcoded CFLAGS
  
  libfsemu/Makefile.orig   Tue Nov 20 00:28:32 2012
 -+++ libfsemu/MakefileTue Nov 20 00:28:44 2012
 +--- libfsemu/Makefile.orig   Fri Oct 26 17:28:39 2012
  libfsemu/MakefileTue Dec 18 21:28:36 2012
  @@ -36,7 +36,7 @@ warnings = -Wall
   errors = -Werror=implicit-function-declaration
   cppflags = $(CXXFLAGS)
 @@ -13,3 +13,16 @@ Missing libpng flags
   $(CFLAGS) -D_FILE_OFFSET_BITS=64
   objects = obj/emu_emu.o obj/emu_video.o obj/emu_audio.o obj/emu_input.o \
   obj/emu_menu.o obj/emu_texture.o obj/emu_font.o \
 +@@ -53,12 +53,6 @@ objects = obj/emu_emu.o obj/emu_video.o obj/emu_audio.
 + 
 + ldflags = $(LDFLAGS)
 + libs =
 +-
 +-ifeq ($(debug), 1)
 +-cflags += -g -O0 -fno-inline
 +-else ifneq ($(noflags), 1)
 +-cflags += -g -O2
 +-endif
 + 
 + ifeq ($(os), windows)
 + 
 
 -- 
 Best Regards
 Edd Barrett
 
 http://www.theunixzoo.co.uk
 

-- 
Antoine

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Stuart Henderson 
On 2012/12/20 13:54, Edd Barrett wrote:
 We could:
  * Turn on -O3 unconditionally for selected ports.
  * Turn on -O3 for selected ports on a subset of architectures.
  * Make -O3 package flavours for selected ports.
  * Any other suggestions?
 
 I prefer one of the first two options.

I prefer 2.

On i386 you might also want to experiment with -fomit-frame-pointer which
frees up another register (of which i386 does not have many in the first
place) and avoids a couple of instructions per function call, at the
expense of debuggers not working with the produced object code.

Re: FIX: texlive_base on big endian

2012-12-20 Thread John Long 
On Thu, Dec 20, 2012 at 01:21:15PM +, Edd Barrett wrote:
 Hi,
 
 Looks like the big endian fix for texlive base got lost somewhere along
 the line.  My sparc64 has fallen over, so I can't test this, but I
 believe this is the fix. Markus Lude is currently running a build but he
 tells me his machine is slow. How slow I don't know...

What is OpenBSD using for SPARC64 build machine(s)?

Re: Firefox 18.0b3 Thunderbird 18.0b1

2012-12-20 Thread Christian Weisgerber 
Landry Breuil lan...@rhaalovely.net wrote:

 The two reported failures (that one and the other on
 sydney_audio_sndio.c) should be fixed by the last two git commits.

Builds on amd64 now.

-- 
Christian naddy Weisgerber  na...@mips.inka.de

Re: FIX: texlive_base on big endian

2012-12-20 Thread Edd Barrett 
Hi,

We are talking about personally owned machines here. I have a blade 1K
which is in a remote location and has fallen over somehow. I dont know what
marcus has.

The project has (fast?) sparc64 machines for bulk builds, but these
machines would not be used for one off patch tests like this.

Cheers
 On 20 Dec 2012 16:20, John Long codeb...@inbox.lv wrote:

 On Thu, Dec 20, 2012 at 01:21:15PM +, Edd Barrett wrote:
  Hi,
 
  Looks like the big endian fix for texlive base got lost somewhere along
  the line.  My sparc64 has fallen over, so I can't test this, but I
  believe this is the fix. Markus Lude is currently running a build but he
  tells me his machine is slow. How slow I don't know...

 What is OpenBSD using for SPARC64 build machine(s)?

Update: ruby-nokogiri 1.5.5 - 1.5.6

2012-12-20 Thread Jeremy Evans 
Minor update to nokogiri, with a few bugfixes, see
http://www.ruby-forum.com/topic/4409201

Tested on amd64 and i386.  Will probably be committing within the next
few weeks.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/textproc/ruby-nokogiri/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile23 Sep 2012 16:57:35 -  1.16
+++ Makefile20 Dec 2012 16:51:11 -
@@ -2,8 +2,7 @@
 
 COMMENT=   HTML, XML, SAX and Reader parser
 
-DISTNAME=  nokogiri-1.5.5
-REVISION = 0
+DISTNAME=  nokogiri-1.5.6
 CATEGORIES=textproc
 
 HOMEPAGE=  http://nokogiri.rubyforge.org/nokogiri
@@ -16,7 +15,7 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   xml2 exslt xslt
+WANTLIB=   xml2 exslt xslt z
 LIB_DEPENDS=   textproc/libxslt
 
 BUILD_DEPENDS= ${MODRUBY_RAKE_DEPENDS}
Index: distinfo
===
RCS file: /cvs/ports/textproc/ruby-nokogiri/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo29 Jun 2012 16:41:53 -  1.6
+++ distinfo20 Dec 2012 16:47:42 -
@@ -1,5 +1,2 @@
-MD5 (nokogiri-1.5.5.gem) = tlsmB78bPmzbBJH6q4FuaA==
-RMD160 (nokogiri-1.5.5.gem) = vJ+da3r6ppf8z7L0W3gqLctr+MU=
-SHA1 (nokogiri-1.5.5.gem) = xQW0YPzwOdtpwIzP5p2i3Li5Xxo=
-SHA256 (nokogiri-1.5.5.gem) = dkACGKnnCZ1NbUrSu28SGNgK6Toetn40tB5obTeI1I8=
-SIZE (nokogiri-1.5.5.gem) = 209920
+SHA256 (nokogiri-1.5.6.gem) = KKuZ7roicLM2+PlhLltK79xnOnMZrYdL9MYJIiaCZYg=
+SIZE (nokogiri-1.5.6.gem) = 217600
Index: patches/patch-Rakefile
===
RCS file: /cvs/ports/textproc/ruby-nokogiri/patches/patch-Rakefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Rakefile
--- patches/patch-Rakefile  29 Jun 2012 16:41:53 -  1.3
+++ patches/patch-Rakefile  20 Dec 2012 16:49:20 -
@@ -3,23 +3,16 @@ $OpenBSD: patch-Rakefile,v 1.3 2012/06/2
 Allow regress tests to work.
 
 --- Rakefile.orig  Wed Dec 31 16:00:00 1969
-+++ Rakefile   Tue Jun 26 15:04:00 2012
-@@ -47,12 +47,12 @@ HOE = Hoe.spec 'nokogiri' do
- [minitest,~ 2.2.2],
- [rake,= 0.9],
- [rake-compiler,   =  0.8.0]
--  ]
-+  ].clear
-   if ! java?
- self.extra_dev_deps += [
-   [racc,= 1.4.6],
-   [rexical, = 1.0.5]
--]
-+].clear
-   end
 Rakefile   Thu Dec 20 08:49:16 2012
+@@ -52,6 +52,7 @@ HOE = Hoe.spec 'nokogiri' do
+ [racc,= 1.4.6],
+ [rexical, = 1.0.5]
+   ]
++  self.extra_dev_deps = []
  
if java?
-@@ -90,6 +90,7 @@ else
+ self.spec_extras = { :platform = 'java' }
+@@ -88,6 +89,7 @@ else
mingw_available = true
begin
  require 'tasks/cross_compile'
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/ruby-nokogiri/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   7 Jun 2012 15:35:58 -   1.6
+++ pkg/PLIST   20 Dec 2012 16:57:22 -
@@ -237,6 +237,10 @@ ${GEM_LIB}/gems/${DISTNAME}/test/files/s
 ${GEM_LIB}/gems/${DISTNAME}/test/files/staff.dtd
 ${GEM_LIB}/gems/${DISTNAME}/test/files/staff.xml
 ${GEM_LIB}/gems/${DISTNAME}/test/files/staff.xslt
+${GEM_LIB}/gems/${DISTNAME}/test/files/test_document_url/
+${GEM_LIB}/gems/${DISTNAME}/test/files/test_document_url/bar.xml
+${GEM_LIB}/gems/${DISTNAME}/test/files/test_document_url/document.dtd
+${GEM_LIB}/gems/${DISTNAME}/test/files/test_document_url/document.xml
 ${GEM_LIB}/gems/${DISTNAME}/test/files/tlm.html
 ${GEM_LIB}/gems/${DISTNAME}/test/files/to_be_xincluded.xml
 ${GEM_LIB}/gems/${DISTNAME}/test/files/valid_bar.xml

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Christian Weisgerber 
Edd Barrett vex...@gmail.com wrote:

 Subject: Cranking the optimiser on selected ports?

No.

 Now, I know we don't usually like to turn the optimiser up past -O2 for
 fear of compiler bugs making crappy code, however, the code gcc has made
 in this case for my amd64 machine seems to be ok.

Optimizer levels other than -O2 are essentially untested.  They may
reveal compiler bugs.  (We discovered a lot of instances of -O1 in
the ports tree because gcc3 on alpha frequently blew up on it.)
They may reveal broken source code (-fstrict-aliasing).  They may
produce broken code.  This will vary by architecture.  The produced
code is typically larger, which may be a pessimization if it overflows
a cache level.

 I spoke to Jasper on icb about the possibility of making exceptions.

I'm afraid this will lead to people asking for exceptions for more
and more ports.

 What do people think? Are any of the options acceptable?

I don't like it.  FWIW.

-- 
Christian naddy Weisgerber  na...@mips.inka.de

Re: FIX: texlive_base on big endian

2012-12-20 Thread John Long 
On Thu, Dec 20, 2012 at 05:00:42PM +, Edd Barrett wrote:
 Hi,
 
 We are talking about personally owned machines here. I have a blade 1K
 which is in a remote location and has fallen over somehow. I dont know what
 marcus has.
 
 The project has (fast?) sparc64 machines for bulk builds, but these
 machines would not be used for one off patch tests like this.

Hi,

I realize that, I was just curious what build machines they have. 

If I can get a PSU fixed I'll probably have a V210 to run OpenBSD on and I
would hopefully be able to help out on stuff like this. 

Thanks,

/jl

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Marc Espie 
On Thu, Dec 20, 2012 at 05:46:33PM +, Christian Weisgerber wrote:
 Edd Barrett vex...@gmail.com wrote:
 
  Subject: Cranking the optimiser on selected ports?
 
 No.
 
  Now, I know we don't usually like to turn the optimiser up past -O2 for
  fear of compiler bugs making crappy code, however, the code gcc has made
  in this case for my amd64 machine seems to be ok.
 
 Optimizer levels other than -O2 are essentially untested.  They may
 reveal compiler bugs.  (We discovered a lot of instances of -O1 in
 the ports tree because gcc3 on alpha frequently blew up on it.)
 They may reveal broken source code (-fstrict-aliasing).  They may
 produce broken code.  This will vary by architecture.  The produced
 code is typically larger, which may be a pessimization if it overflows
 a cache level.
 
  I spoke to Jasper on icb about the possibility of making exceptions.
 
 I'm afraid this will lead to people asking for exceptions for more
 and more ports.
 
  What do people think? Are any of the options acceptable?
 
 I don't like it.  FWIW.

same as naddy. Specifically because -O2 is the only optimization level
that's really tested...

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread John Long 
On Thu, Dec 20, 2012 at 07:17:00PM +0100, Marc Espie wrote:
 On Thu, Dec 20, 2012 at 05:46:33PM +, Christian Weisgerber wrote:
  Edd Barrett vex...@gmail.com wrote:
  
   Subject: Cranking the optimiser on selected ports?
  
  No.
  
   Now, I know we don't usually like to turn the optimiser up past -O2 for
   fear of compiler bugs making crappy code, however, the code gcc has made
   in this case for my amd64 machine seems to be ok.
  
  Optimizer levels other than -O2 are essentially untested.  They may
  reveal compiler bugs.  (We discovered a lot of instances of -O1 in
  the ports tree because gcc3 on alpha frequently blew up on it.)
  They may reveal broken source code (-fstrict-aliasing).  They may
  produce broken code.  This will vary by architecture.  The produced
  code is typically larger, which may be a pessimization if it overflows
  a cache level.
  
   I spoke to Jasper on icb about the possibility of making exceptions.
  
  I'm afraid this will lead to people asking for exceptions for more
  and more ports.
  
   What do people think? Are any of the options acceptable?
  
  I don't like it.  FWIW.
 
 same as naddy. Specifically because -O2 is the only optimization level
 that's really tested...
 

What about a FLAVOR on specific ports where somebody happens to know it
helps?

/jl

-- 
ASCII ribbon campaign ( ) Powered by Lemote Fuloong
 against HTML e-mail   X  Loongson MIPS and OpenBSD
   and proprietary/ \http://www.mutt.org
 attachments /   \  Code Blue or Go Home!
 Encrypted email preferred  PGP Key 2048R/DA65BC04

Update: ruby-pg 0.14.0 - 0.14.1

2012-12-20 Thread Jeremy Evans 
Simple update to  pg 0.14.1.  Contains one significant bugfix:

- Fix stack overflow bug in PG::Result#values and #column_values.

Tested on amd64 and i386.  Will probably be committing within the next
few weeks.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/databases/ruby-pg/Makefile,v
retrieving revision 1.19
diff -N -u -p Makefile
--- Makefile23 Sep 2012 16:57:33 -  1.19
+++ Makefile20 Dec 2012 18:19:39 -
@@ -2,8 +2,7 @@
 
 COMMENT =  PostgreSQL database interface for ruby
 
-DISTNAME = pg-0.14.0
-REVISION = 0
+DISTNAME = pg-0.14.1
 CATEGORIES =   databases
 
 MAINTAINER =   Jeremy Evans jer...@openbsd.org
Index: distinfo
===
RCS file: /cvs/ports/databases/ruby-pg/distinfo,v
retrieving revision 1.10
diff -N -u -p distinfo
--- distinfo29 Jun 2012 16:39:01 -  1.10
+++ distinfo20 Dec 2012 18:19:39 -
@@ -1,5 +1,2 @@
-MD5 (pg-0.14.0.gem) = 89dNOsGHWUpR0pbsmFoWQw==
-RMD160 (pg-0.14.0.gem) = 4K1y0oo6gIxuYNzv7yAyg09TNWA=
-SHA1 (pg-0.14.0.gem) = NG5GAsqfXV0BRxH1uhjaZ0pihDw=
-SHA256 (pg-0.14.0.gem) = 1tcLk8/jJdTm+9qOHn5cBGr1M5edhmXfsAdLQff8USI=
-SIZE (pg-0.14.0.gem) = 108032
+SHA256 (pg-0.14.1.gem) = nnkR8vbs7ylcotoa/MDJf1R2WeBWlslChTgXSp65GT0=
+SIZE (pg-0.14.1.gem) = 108544

Update: ruby-sequel_pg 1.6.1 - 1.6.3

2012-12-20 Thread Jeremy Evans 
Simple update to sequel_pg 1.6.3. Contains a single bugfix:

* Make streaming support not swallow errors when rows are not retrieved

Tested on amd64 and i386.  Will probably be committing within the next
few weeks.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/databases/ruby-sequel_pg/Makefile,v
retrieving revision 1.17
diff -N -u -p Makefile
--- Makefile7 Nov 2012 19:05:14 -   1.17
+++ Makefile20 Dec 2012 18:19:32 -
@@ -2,7 +2,7 @@
 
 COMMENT =  faster SELECTs when using ruby-sequel with ruby-pg
 
-DISTNAME = sequel_pg-1.6.1
+DISTNAME = sequel_pg-1.6.3
 CATEGORIES =   databases
 
 MAINTAINER =   Jeremy Evans jer...@openbsd.org
Index: distinfo
===
RCS file: /cvs/ports/databases/ruby-sequel_pg/distinfo,v
retrieving revision 1.8
diff -N -u -p distinfo
--- distinfo7 Nov 2012 19:05:14 -   1.8
+++ distinfo20 Dec 2012 18:19:32 -
@@ -1,2 +1,2 @@
-SHA256 (sequel_pg-1.6.1.gem) = StpB1fYm8T9U21bmsxqv4cnFt+1JIg383njPPXU4D2s=
-SIZE (sequel_pg-1.6.1.gem) = 16896
+SHA256 (sequel_pg-1.6.3.gem) = 9a8hw10hhDPpxfOSxp27Lwl6Ej2y8r/ZMGyWL01Vg4M=
+SIZE (sequel_pg-1.6.3.gem) = 16896

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Marc Espie 
On Thu, Dec 20, 2012 at 06:20:50PM +, John Long wrote:
 
 What about a FLAVOR on specific ports where somebody happens to know it
 helps?
 
 /jl

It's still very likely to cause extra amount of grief in most cases.
And more work for porters.

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread John Long 
On Thu, Dec 20, 2012 at 07:32:44PM +0100, Marc Espie wrote:
 On Thu, Dec 20, 2012 at 06:20:50PM +, John Long wrote:
  
  What about a FLAVOR on specific ports where somebody happens to know it
  helps?
  
  /jl
 
 It's still very likely to cause extra amount of grief in most cases.
 And more work for porters.

Ok, thanks/sorry.

Add pthread to WANTLIB for ruby 1.9 C extension ports

2012-12-20 Thread Jeremy Evans 
When using port-lib-depends-check when updating some recent ruby ports,
I noticied that they were missing a WANTLIB for pthread.  c and m
are automatically added to WANTLIB for both ruby 1.8 and ruby 1.9
C extension ports, but on ruby 1.9, C extensions are linked to
libpthread as well, so it should be added to WANTLIB automatically.

Here's a diff that adds pthread to WANTLIB automatically for
ruby 1.9 C extension ports and REVISION bumps all such ports.

Note that there is no REVISION bump for nokogiri, pg, or sequel_pg.
I plan to commit this first, and then commit version updates for
those directly after.

Tested on amd64.  Will probably be committing within the next
few weeks.

Thanks,
Jeremy

Index: lang/ruby/ruby.port.mk
===
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.52
diff -N -u -p lang/ruby/ruby.port.mk
--- lang/ruby/ruby.port.mk  24 Oct 2012 22:51:26 -  1.52
+++ lang/ruby/ruby.port.mk  20 Dec 2012 17:31:41 -
@@ -294,6 +294,9 @@ MODRUBY_WANTLIB_m?= Yes
 .  if ${MODRUBY_WANTLIB_m:L:Myes}
 WANTLIB+=  m
 .  endif
+.  if ${MODRUBY_REV} == 1.9
+WANTLIB+=  pthread
+.  endif
 LIB_DEPENDS+=  ${MODRUBY_LIB_DEPENDS}
 
 .  if ${MODRUBY_REV} == rbx
Index: audio/ruby-id3lib/Makefile
===
RCS file: /cvs/ports/audio/ruby-id3lib/Makefile,v
retrieving revision 1.19
diff -N -u -p audio/ruby-id3lib/Makefile
--- audio/ruby-id3lib/Makefile  23 Sep 2012 16:57:32 -  1.19
+++ audio/ruby-id3lib/Makefile  20 Dec 2012 17:31:50 -
@@ -5,7 +5,7 @@ COMMENT=Ruby interface to the id3lib C++ library
 VERSION=   0.6.0
 DISTNAME=  id3lib-ruby-${VERSION}
 PKGNAME=   id3lib-${VERSION}
-REVISION = 2
+REVISION = 3
 CATEGORIES=audio
 
 # Ruby License
Index: audio/ruby-vorbis_comment/Makefile
===
RCS file: /cvs/ports/audio/ruby-vorbis_comment/Makefile,v
retrieving revision 1.7
diff -N -u -p audio/ruby-vorbis_comment/Makefile
--- audio/ruby-vorbis_comment/Makefile  23 Sep 2012 16:57:32 -  1.7
+++ audio/ruby-vorbis_comment/Makefile  20 Dec 2012 17:31:50 -
@@ -4,7 +4,7 @@ COMMENT =   ruby library for reading/writing vorbis comm
 
 DISTNAME = vorbis_comment-1.0.1
 CATEGORIES =   audio
-REVISION = 4
+REVISION = 5
 
 HOMEPAGE=  http://vorbiscomment.rubyforge.org/
 
Index: converters/ruby-json/Makefile
===
RCS file: /cvs/ports/converters/ruby-json/Makefile,v
retrieving revision 1.19
diff -N -u -p converters/ruby-json/Makefile
--- converters/ruby-json/Makefile   31 Oct 2012 22:04:08 -  1.19
+++ converters/ruby-json/Makefile   20 Dec 2012 17:31:50 -
@@ -3,6 +3,7 @@
 COMMENT=   JSON implementation for Ruby
 
 DISTNAME=  json-1.7.5
+REVISION = 0
 CATEGORIES=converters
 
 HOMEPAGE=  http://json.rubyforge.org/
Index: databases/ruby-amalgalite/Makefile
===
RCS file: /cvs/ports/databases/ruby-amalgalite/Makefile,v
retrieving revision 1.8
diff -N -u -p databases/ruby-amalgalite/Makefile
--- databases/ruby-amalgalite/Makefile  23 Sep 2012 16:57:32 -  1.8
+++ databases/ruby-amalgalite/Makefile  20 Dec 2012 17:31:50 -
@@ -6,7 +6,7 @@ COMMENT =   ruby SQLite3 embedded database library
 
 DISTNAME = amalgalite-1.1.2
 CATEGORIES =   databases
-REVISION = 1
+REVISION = 2
 
 HOMEPAGE = http://copiousfreetime.rubyforge.org/amalgalite/
 
Index: databases/ruby-do_mysql/Makefile
===
RCS file: /cvs/ports/databases/ruby-do_mysql/Makefile,v
retrieving revision 1.8
diff -N -u -p databases/ruby-do_mysql/Makefile
--- databases/ruby-do_mysql/Makefile23 Sep 2012 16:57:33 -  1.8
+++ databases/ruby-do_mysql/Makefile20 Dec 2012 17:31:50 -
@@ -3,7 +3,7 @@
 COMMENT=   ruby-data_objects driver for MySQL
 
 DISTNAME=  do_mysql-0.10.8
-REVISION = 0
+REVISION = 1
 CATEGORIES=databases
 
 # MIT
Index: databases/ruby-do_postgres/Makefile
===
RCS file: /cvs/ports/databases/ruby-do_postgres/Makefile,v
retrieving revision 1.9
diff -N -u -p databases/ruby-do_postgres/Makefile
--- databases/ruby-do_postgres/Makefile 23 Sep 2012 16:57:33 -  1.9
+++ databases/ruby-do_postgres/Makefile 20 Dec 2012 17:31:50 -
@@ -3,7 +3,7 @@
 COMMENT=   DataObjects driver for PostgreSQL
 
 DISTNAME=  do_postgres-0.10.8
-REVISION = 0
+REVISION = 1
 CATEGORIES=databases
 
 # MIT
Index: databases/ruby-do_sqlite3/Makefile
===

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Edd Barrett 
On Thu, Dec 20, 2012 at 07:17:00PM +0100, Marc Espie wrote:
 same as naddy. Specifically because -O2 is the only optimization level
 that's really tested...

Yup.

It's a shame that we can't trust gcc's optimiser. That said, since the
gcc4 update, the optimiser may be (more) correct; I just don't know.

What would proper testing of -O3 for gcc4 arches entail? Would this be
building the whole ports tree -O3 and trying the packages. Is there a
more systematic approach, like a test suite or benchmark of correctness?

Cheers

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: FIX: texlive_base on big endian

2012-12-20 Thread Markus Lude 
On Thu, Dec 20, 2012 at 01:21:15PM +, Edd Barrett wrote:
 Hi,
 
 Looks like the big endian fix for texlive base got lost somewhere along
 the line.  My sparc64 has fallen over, so I can't test this, but I
 believe this is the fix. Markus Lude is currently running a build but he
 tells me his machine is slow. How slow I don't know...

texlive_base build fine with this diff on sparc64.

Just SUN Blades 100 here.

Regards,
Markus

 Index: Makefile
 ===
 RCS file: /cvs/ports/print/texlive/base/Makefile,v
 retrieving revision 1.62
 diff -u -p -r1.62 Makefile
 --- Makefile  17 Dec 2012 20:28:04 -  1.62
 +++ Makefile  19 Dec 2012 10:21:34 -
 @@ -55,8 +55,14 @@ CPPFLAGS +=-DU_PLATFORM=U_PF_BSD
  
  # Big endian ICU bug
  # http://tug.org/pipermail/tlbuild/2012q2/002266.html
 +.include bsd.port.arch.mk
 +.if ${PROPERTIES:Mbe}
 +CPPFLAGS +=  -DU_IS_BIG_ENDIAN=1
 +.endif
 +
  CONFIGURE_ENV += TL_MAKE=${GMAKE} \
   CPPFLAGS=${CPPFLAGS}
 +
  # Can't build in same dir
  WRKBUILD =  ${WRKSRC}/Work
  CONFIGURE_SCRIPT =  ../configure

Re: FIX: texlive_base on big endian

2012-12-20 Thread Edd Barrett 
Great. So OK anyone?
On 20 Dec 2012 20:29, Markus Lude markus.l...@gmx.de wrote:

 On Thu, Dec 20, 2012 at 01:21:15PM +, Edd Barrett wrote:
  Hi,
 
  Looks like the big endian fix for texlive base got lost somewhere along
  the line.  My sparc64 has fallen over, so I can't test this, but I
  believe this is the fix. Markus Lude is currently running a build but he
  tells me his machine is slow. How slow I don't know...

 texlive_base build fine with this diff on sparc64.

 Just SUN Blades 100 here.

 Regards,
 Markus

  Index: Makefile
  ===
  RCS file: /cvs/ports/print/texlive/base/Makefile,v
  retrieving revision 1.62
  diff -u -p -r1.62 Makefile
  --- Makefile  17 Dec 2012 20:28:04 -  1.62
  +++ Makefile  19 Dec 2012 10:21:34 -
  @@ -55,8 +55,14 @@ CPPFLAGS +=-DU_PLATFORM=U_PF_BSD
 
   # Big endian ICU bug
   # http://tug.org/pipermail/tlbuild/2012q2/002266.html
  +.include bsd.port.arch.mk
  +.if ${PROPERTIES:Mbe}
  +CPPFLAGS +=  -DU_IS_BIG_ENDIAN=1
  +.endif
  +
   CONFIGURE_ENV += TL_MAKE=${GMAKE} \
CPPFLAGS=${CPPFLAGS}
  +
   # Can't build in same dir
   WRKBUILD =  ${WRKSRC}/Work
   CONFIGURE_SCRIPT =  ../configure

arduino 1.0.2, small nit.

2012-12-20 Thread Janne Johansson 
While actually testing Ethernet shields, I found this issue:
Index: BSDmakefile
===
RCS file: /home/cvsync/cvs/ports/devel/arduino/files/BSDmakefile,v
retrieving revision 1.5
diff -u -r1.5 BSDmakefile
--- BSDmakefile 13 Oct 2012 12:13:37 -  1.5
+++ BSDmakefile 20 Dec 2012 21:04:33 -
@@ -59,7 +59,7 @@
 # Or if you want to use the Ethernet library, use:
 # LIBRARIES=SPI Ethernet IPAddress Dhcp Dns EthernetClient EthernetServer \
 #  EthernetUdp utility/w5100 utility/socket new
-# and run 'mkdir utilities'
+# and run 'mkdir utility'
 LIBRARIES=

 # Arduino variant, one of: eightanaloginputs, leonardo, mega,

It will place object files for w5100 and socket in that dir.

-- 
 To our sweethearts and wives.  May they never meet. -- 19th century toast

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread joshua stein 
On Thu, 20 Dec 2012 at 17:46:33 +, Christian Weisgerber wrote:
 Optimizer levels other than -O2 are essentially untested.
[..]
  I spoke to Jasper on icb about the possibility of making exceptions.
 
 I'm afraid this will lead to people asking for exceptions for more
 and more ports.

If the specific exceptions only come after people like Edd are
actually using the software and finding that it is much more usable
with the optimization bump, what's the harm?

I think per-architecture tweaks to specific ports are okay, as long
as they've been thoroughly tested on that architecture, are needed
to make the software more usable or better performing, and don't
make it less stable.

Re: FIX: texlive_base on big endian

2012-12-20 Thread Stuart Henderson 
On 2012/12/20 21:02, Edd Barrett wrote:
 Great. So OK anyone?

Did this totally fail to build on BE machines (in which case that's ok)
or did it build but fail at runtime (in which case it needs a bump)?

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Jasper Lievisse Adriaanse 
On Thu, Dec 20, 2012 at 02:20:22PM +, Stuart Henderson wrote:
 On 2012/12/20 13:54, Edd Barrett wrote:
  We could:
   * Turn on -O3 unconditionally for selected ports.
   * Turn on -O3 for selected ports on a subset of architectures.
   * Make -O3 package flavours for selected ports.
   * Any other suggestions?
  
  I prefer one of the first two options.
 
 I prefer 2.
 
 On i386 you might also want to experiment with -fomit-frame-pointer which
 frees up another register (of which i386 does not have many in the first
 place) and avoids a couple of instructions per function call, at the
 expense of debuggers not working with the produced object code.
I concur; it makes most sense for emulators and stuff like that on arches that
can really benefit from the extra (and safe) optimizations. 

-- 
Cheers,
Jasper

Stay Hungry. Stay Foolish

Re: FIX: texlive_base on big endian

2012-12-20 Thread Edd Barrett 
It is a build failure. See the URL in the comment in the makefile.

Cheers
On 20 Dec 2012 21:29, Stuart Henderson s...@spacehopper.org wrote:

 On 2012/12/20 21:02, Edd Barrett wrote:
  Great. So OK anyone?

 Did this totally fail to build on BE machines (in which case that's ok)
 or did it build but fail at runtime (in which case it needs a bump)?

Re: FIX: texlive_base on big endian

2012-12-20 Thread Markus Lude 
On Thu, Dec 20, 2012 at 09:29:19PM +, Stuart Henderson wrote:
 On 2012/12/20 21:02, Edd Barrett wrote:
  Great. So OK anyone?
 
 Did this totally fail to build on BE machines (in which case that's ok)
 or did it build but fail at runtime (in which case it needs a bump)?

It failed to build:

gmake[7]: Entering directory 
`/usr/ports/pobj/texlive_base-2012/texlive-20120701-source/Work/libs/icu/icu-build/data'
rm -rf icupkg.inc
gmake[7]: Leaving directory 
`/usr/ports/pobj/texlive_base-2012/texlive-20120701-source/Work/libs/icu/icu-build/data'
LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH 
../bin/icupkg -tb 
/usr/ports/pobj/texlive_base-2012/texlive-20120701-source/Work/libs/icu/../.././../libs/icu/icu-49.1/data/in/icudt49l.dat
 ./out/icudt49b.dat
udata_swapDataHeader(): header size mismatch - headerSize 32768 infoSize 5120 
length 1024
gmake[6]: *** [out/icudt49b.dat] Error 8
gmake[6]: Leaving directory 
`/usr/ports/pobj/texlive_base-2012/texlive-20120701-source/Work/libs/icu/icu-build/data'

Regards,
Markus

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Stefan Sperling 
On Thu, Dec 20, 2012 at 03:08:45PM -0600, joshua stein wrote:
 If the specific exceptions only come after people like Edd are
 actually using the software and finding that it is much more usable
 with the optimization bump, what's the harm?

Yes, I agree. Especially WRT games/emulators. If bugs in compilers are
uncovered because of this, all the better. If we don't turn it on blindly
for stuff that hasn't been tested I don't see a problem.

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Edd Barrett 
On Thu, Dec 20, 2012 at 10:49:40PM +0100, Stefan Sperling wrote:
 On Thu, Dec 20, 2012 at 03:08:45PM -0600, joshua stein wrote:
  If the specific exceptions only come after people like Edd are
  actually using the software and finding that it is much more usable
  with the optimization bump, what's the harm?
 
 Yes, I agree. Especially WRT games/emulators. If bugs in compilers are
 uncovered because of this, all the better. If we don't turn it on blindly
 for stuff that hasn't been tested I don't see a problem.

Well, Espie has made it pretty clear that he will not allow -O3. If you
want better performance from emulators etc, then you will have to do a
custom package setting CFLAGS and CXXFLAGS. Don't forget to rebuild and
reinstall after every pkg_add -u.

The following diff atleast makes fs-uae listen to CFLAGS and CXXFLAGS.
ok?

Index: Makefile
===
RCS file: /cvs/ports/emulators/fs-uae/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile7 Dec 2012 08:43:06 -   1.5
+++ Makefile20 Dec 2012 22:00:48 -
@@ -6,7 +6,7 @@ COMMENT =   modern Amiga emulator
 V =2.0.1
 DISTNAME = fs-uae-$V
 CATEGORIES =   emulators
-REVISION = 1
+REVISION = 2
 
 HOMEPAGE = http://fengestad.no/fs-uae/
 MAINTAINER =   Edd Barrett e...@openbsd.org
@@ -34,7 +34,8 @@ RUN_DEPENDS = devel/desktop-file-utils 
x11/py-wxPython
 
 USE_GMAKE =Yes
-MAKE_FLAGS +=  prefix=${PREFIX}
+
+MAKE_FLAGS +=  prefix=${PREFIX} CXXFLAGS=${CXXFLAGS} 
CFLAGS=${CFLAGS}
 
 NO_REGRESS =   Yes
 
Index: patches/patch-libfsemu_Makefile
===
RCS file: /cvs/ports/emulators/fs-uae/patches/patch-libfsemu_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-libfsemu_Makefile
--- patches/patch-libfsemu_Makefile 22 Nov 2012 23:45:20 -  1.1.1.1
+++ patches/patch-libfsemu_Makefile 20 Dec 2012 22:00:48 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-libfsemu_Makefile,v 1.1.1.1 2012/11/22 23:45:20 edd Exp $
 
-Missing libpng flags
+Missing libpng flags. Strip hardcoded CFLAGS
 
 libfsemu/Makefile.orig Tue Nov 20 00:28:32 2012
-+++ libfsemu/Makefile  Tue Nov 20 00:28:44 2012
+--- libfsemu/Makefile.orig Fri Oct 26 17:28:39 2012
 libfsemu/Makefile  Tue Dec 18 21:28:36 2012
 @@ -36,7 +36,7 @@ warnings = -Wall
  errors = -Werror=implicit-function-declaration
  cppflags = $(CXXFLAGS)
@@ -13,3 +13,16 @@ Missing libpng flags
$(CFLAGS) -D_FILE_OFFSET_BITS=64
  objects = obj/emu_emu.o obj/emu_video.o obj/emu_audio.o obj/emu_input.o \
obj/emu_menu.o obj/emu_texture.o obj/emu_font.o \
+@@ -53,12 +53,6 @@ objects = obj/emu_emu.o obj/emu_video.o obj/emu_audio.
+ 
+ ldflags = $(LDFLAGS)
+ libs =
+-
+-ifeq ($(debug), 1)
+-  cflags += -g -O0 -fno-inline
+-else ifneq ($(noflags), 1)
+-  cflags += -g -O2
+-endif
+ 
+ ifeq ($(os), windows)
+ 

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: Cranking the optimiser on selected ports?

2012-12-20 Thread Stuart Henderson 
On 2012/12/20 19:41, Edd Barrett wrote:
 What would proper testing of -O3 for gcc4 arches entail? Would this be
 building the whole ports tree -O3 and trying the packages.

While I think there are (a very few) cases where it makes sense to
test/enable higher O levels on an arch by arch basis doing this
for the whole tree would be insane.

 Is there a more systematic approach, like a test suite or benchmark
 of correctness?

Bugs notwithstanding, optimisers assume things about code and change
results of undefined behaviour and corner cases in ways people
don't expect. Test suites and benchmarks of the compiler/optimiser
aren't going to help predict what it will do with some unknown code.

If (and only if) a particular very performance-sensitive program
has regularly been built on other OS on a certain arch with a certain
optimisation level with a similar compiler I think we might consider
that. Otherwise stick with the OS default.

Re: emulators/mupen64plus extra plugins + meta port

2012-12-20 Thread Anthony J. Bentley 
Anthony J. Bentley writes:
 Hi,
 
 Attached are two tarballs. One contains more plugins for
 emulators/mupen64plus.
 cd /usr/ports/emulators  tar xzf mupen64plus-plugins.tar.gz
 
 The other contains a meta port with  two packages, one containing the
 default plugins and the other with all plugins.
 cd /usr/ports/meta  tar xzf mupen64plus.tar.gz
 
 All plugins tested and working on i386/amd64 (mupen64plus is marked ONLY_FOR
 these architectures).

Any oks?

If there are no objections I would like to commit these and
http://marc.info/?l=openbsd-portsm=135288072515947w=2
next week.

--
Anthony J. Bentley


mupen64plus-plugins.tar.gz
Description: mupen64plus-plugins.tar.gz


mupen64plus.tar.gz
Description: mupen64plus.tar.gz

Re: NEW: games/renpy

2012-12-20 Thread Anthony J. Bentley 
Anthony J. Bentley writes:
 Ren'Py is a free and cross platform engine for digital storytelling. It
 makes it easy to combine words, images, and sounds to create visual
 novels and life simulation games.
 
 Visual novels are computer-based stories that are told through words,
 images, sounds, and music. Many visual novels also present the player
 with menu choices that allow the player to control how the story is
 told.
 
 Ren'Py's script language makes it easy to write visual novels, and other
 writing-heavy games. It's easy to learn, and scales well to the largest
 projects. Even without customization, Ren'Py provides the features
 players have come to expect from their visual novels.
 
 
 Tested on amd64. Everything seems to work except generating executables
 for Win/Mac/Linux. (To test, run /usr/local/share/renpy/renpy.py.)

I've since tested on powerpc and i386 as well, with no problems.

Anyone willing to ok?


renpy.tar.gz
Description: renpy.tar.gz

UPDATE: games/openttd

2012-12-20 Thread Anthony J. Bentley 
Hi,

Here is an update to openttd-1.2.3.

Tested on i386 and extensively on amd64.

ok?


Index: Makefile
===
RCS file: /cvs/ports/games/openttd/Makefile,v
retrieving revision 1.26
diff -N -u -p Makefile
--- Makefile21 Aug 2012 18:01:42 -  1.26
+++ Makefile21 Dec 2012 03:47:26 -
@@ -2,11 +2,10 @@
 
 COMMENT=   open source clone of the game Transport Tycoon Deluxe
 
-V= 1.1.5
-DISTNAME=  openttd-${V}
+V =1.2.3
+DISTNAME = openttd-${V}
 EXTRACT_SUFX=  -source.tar.gz
-REVISION=  1
-GFX_V= 0.3.5
+GFX_V= 0.4.4
 SFX_V= 0.2.3
 MSX_V= 0.3.1
 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -72,6 +71,8 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${EXAMPLESDIR}
${INSTALL_DATA_DIR} ${DOCSDIR}
cd ${WRKSRC}/docs/  umask 022  pax -rw . ${DOCSDIR}
+   ${INSTALL_DATA_DIR} ${GAMEDIR}/data
+   ${INSTALL_DATA_DIR} ${GAMEDIR}/gm
${INSTALL_DATA} ${WRKDIR}/opengfx-${GFX_V}/*.{grf,obg} ${GAMEDIR}/data
${INSTALL_DATA} ${WRKDIR}/opensfx-${SFX_V}/*.{cat,obs} ${GAMEDIR}/data
${INSTALL_DATA} ${WRKDIR}/openmsx-${MSX_V}/*.{mid,obm} ${GAMEDIR}/gm
Index: distinfo
===
RCS file: /cvs/ports/games/openttd/distinfo,v
retrieving revision 1.12
diff -N -u -p distinfo
--- distinfo22 Jan 2012 21:41:49 -  1.12
+++ distinfo21 Dec 2012 03:47:26 -
@@ -1,20 +1,8 @@
-MD5 (opengfx-0.3.5.zip) = CACE83W5Zi5cSpGizsPLcw==
-MD5 (openmsx-0.3.1.zip) = hYt51ErqbeXhXZ0UOehsww==
-MD5 (opensfx-0.2.3.zip) = bjpc+X/mnjo1HD4GFaFLBA==
-MD5 (openttd-1.1.5-source.tar.gz) = a61HUMCXguBKmHoybXmNig==
-RMD160 (opengfx-0.3.5.zip) = dx2C+5I56i0KHo/hYMrTrDwfxkY=
-RMD160 (openmsx-0.3.1.zip) = jv8kbonkT2PKSA6azvlKHaX6gdI=
-RMD160 (opensfx-0.2.3.zip) = f/fMp9oumCkx0pHXJ0OMmYrNN4c=
-RMD160 (openttd-1.1.5-source.tar.gz) = kT6/sENnmAUo9fEVhhv/ZJprDI0=
-SHA1 (opengfx-0.3.5.zip) = g7iJ3UgH95KixGpeUK67OlyWn/0=
-SHA1 (openmsx-0.3.1.zip) = 6cQgOSO7nJdKxniGvQC3CQZYuWE=
-SHA1 (opensfx-0.2.3.zip) = v7/t25H/MqWKaEiDgmNvOBJcSPQ=
-SHA1 (openttd-1.1.5-source.tar.gz) = SXGhfSVUr/jzZM/Pbg/42b8gE18=
-SHA256 (opengfx-0.3.5.zip) = U4KjI9gK0uvNmcMIZMKxrfUQoS1HuqapwIB65lNBWks=
+SHA256 (opengfx-0.4.4.zip) = 5KuUTFsuF3JrKWYHbHeoWbaB1DJa05T1F+eP/xMZ5JQ=
 SHA256 (openmsx-0.3.1.zip) = kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU=
 SHA256 (opensfx-0.2.3.zip) = NXR0WsDBOLrlO1aXJZHbjXeK2fr/1R3q43pIpWPnFmI=
-SHA256 (openttd-1.1.5-source.tar.gz) = 
sA100S3RI/wnHPhP1aENm6B2tNmon2VOUOULVDUiUVM=
-SIZE (opengfx-0.3.5.zip) = 3402778
+SHA256 (openttd-1.2.3-source.tar.gz) = 
6/MGuxkR+WEYJDkhBV/+opbXrVqjn6INO8HyeiLYcvw=
+SIZE (opengfx-0.4.4.zip) = 3470306
 SIZE (openmsx-0.3.1.zip) = 136981
 SIZE (opensfx-0.2.3.zip) = 11144025
-SIZE (openttd-1.1.5-source.tar.gz) = 7938668
+SIZE (openttd-1.2.3-source.tar.gz) = 8722028
Index: patches/patch-Makefile_bundle_in
===
RCS file: /cvs/ports/games/openttd/patches/patch-Makefile_bundle_in,v
retrieving revision 1.4
diff -N -u -p patches/patch-Makefile_bundle_in
--- patches/patch-Makefile_bundle_in13 Jan 2012 07:54:43 -  1.4
+++ patches/patch-Makefile_bundle_in21 Dec 2012 03:47:26 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-Makefile_bundle_in,v 1.4 2012/01/13 07
 
 Don't gzip(1) the manual page.
 
 Makefile.bundle.in.origSun Dec  4 20:40:50 2011
-+++ Makefile.bundle.in Fri Jan 13 08:36:07 2012
-@@ -81,7 +81,6 @@ endif
+--- Makefile.bundle.in.origWed Oct 31 15:39:05 2012
 Makefile.bundle.in Sun Nov 18 01:08:13 2012
+@@ -73,7 +73,6 @@ endif
  ifdef MAN_DIR
$(Q)mkdir -p $(BUNDLE_DIR)/man/
$(Q)cp $(ROOT_DIR)/docs/openttd.6   $(BUNDLE_DIR)/man/
@@ -12,7 +12,7 @@ Don't gzip(1) the manual page.
  endif
$(Q)cp $(ROOT_DIR)/media/openttd.32.xpm $(BUNDLE_DIR)/media/
$(Q)cp $(ROOT_DIR)/media/openttd.*.png  $(BUNDLE_DIR)/media/
-@@ -224,7 +223,7 @@ endif
+@@ -213,7 +212,7 @@ endif
  ifdef MAN_DIR
  ifndef DO_NOT_INSTALL_MAN
$(Q)install -d $(INSTALL_MAN_DIR)
Index: patches/patch-src_fileio_cpp
===
RCS file: /cvs/ports/games/openttd/patches/patch-src_fileio_cpp,v
retrieving revision 1.3
diff -N -u -p patches/patch-src_fileio_cpp
--- patches/patch-src_fileio_cpp26 Sep 2011 10:12:46 -  1.3
+++ patches/patch-src_fileio_cpp21 Dec 2012 03:47:26 -
@@ -1,11 +1,11 @@
 $OpenBSD: patch-src_fileio_cpp,v 1.3 2011/09/26 10:12:46 sthen Exp $
 src/fileio.cpp.origThu Sep 15 16:06:59 2011
-+++ src/fileio.cpp Sat Sep 17 22:50:41 2011
-@@ -26,6 +26,7 @@
+--- src/fileio.cpp.origWed Oct 31 15:39:00 2012
 src/fileio.cpp Sun Nov 18 01:08:13 2012
+@@ -27,6 +27,7 @@
  #endif
  #include sys/stat.h
  #include algorithm
 +#include unistd.h
  
-