Re: Porting flashrom to OpenBSD

2010-06-19 Thread Roberto Fernandez
--- Begin Message ---
On Sat, Jun 19, 2010 at 01:42:08AM +0100, Stuart Henderson wrote:
> On 2010/06/19 02:33, Carl-Daniel Hailfinger wrote:
> > Hi,
> > 
> > I'm one of the lead developers of flashrom, a GPLv2 application to
> > read/write/erase flash chips on mainboards, network/storage/graphics
> > cards and external programmers. Some people use flashrom to update their
> > BIOS/EFI or to add netbooting functionality to their network cards, or
> > to recover misflashed mainboards. Having to boot DOS/Windows to perform
> > those tasks is something many people would like to avoid, and being able
> > to work with flash chips from your favourite OS is definitely easier
> > than navigating in unknown waters.
> > If you want to learn more about flashrom, please visit
> > http://www.flashrom.org/
> > 
> > flashrom works on
> > Linux/FreeBSD/NetBSD/DragonFlyBSD/OpenSolaris/MacOSX/DOS, and OpenBSD is
> > the last remaining major UNIX-like OS which wasn't supported until now.
> > 
> > I have two patches which get flashrom to compile on OpenBSD on i386, and
> > they should work on amd64 as well. Those patches will be merged into the
> > official flashrom source tree once I know that they work. The big
> > obstacle for me is that I don't own any OpenBSD machine, and all I have
> > is shell access to a public OpenBSD i386 shell server. flashrom is
> > pretty small, you can compile it in ~5 seconds on a reasonably fast
> > machine, so compile testing shouldn't need too much time.
> > 
> > How do I proceed? Ask for testers? Send the patches (or links to the
> > patch downloads) to this list?
> 
> If you send me the patches I'll write a port Makefile for it.
> Then it's easier for people to test. Compile testing is no problem
> but I don't have any machines that I can spare to test actual bios
> updates on though.
 
A way to reduce risks on these tests is here:
http://www.biosman.com/biosrecovery.html

I never tested this myself, I have no floppy drive :(

> It would be great to have flashrom working on OpenBSD.
> 

--- End Message ---


[update] Geany 0.19

2010-06-19 Thread Jonathan Armani

Hi,

Update geany to 0.19 (and my email address while here), tested on amd64.

Index: Makefile
===
RCS file: /cvs/openbsd/ports/devel/geany/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile22 Dec 2009 15:31:27 -  1.23
+++ Makefile19 Jun 2010 10:52:53 -
@@ -4,14 +4,14 @@ SHARED_ONLY=  Yes
 
 COMMENT=   small and lightweight IDE
 
-DISTNAME=  geany-0.18
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  geany-0.19
+PKGNAME=   ${DISTNAME}
 
 CATEGORIES=devel
 
 HOMEPAGE=  http://www.geany.org
 
-MAINTAINER=Jonathan Armani 
+MAINTAINER=Jonathan Armani 
 
 # GPL + Scintilla License
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/openbsd/ports/devel/geany/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo4 Sep 2009 11:38:31 -   1.10
+++ distinfo19 Jun 2010 10:52:53 -
@@ -1,5 +1,5 @@
-MD5 (geany-0.18.tar.bz2) = 2OMB9pM8go4sNrOv2z9MNA==
-RMD160 (geany-0.18.tar.bz2) = ONBTu5lSllVgrhnPSFhKPW+I0wo=
-SHA1 (geany-0.18.tar.bz2) = UoTgadXaVYHPh0dLWks3rtAV134=
-SHA256 (geany-0.18.tar.bz2) = fLOH05S1i57hEZ3GdwtDfkpMnnK1kbC9Qx5UVY9RIS0=
-SIZE (geany-0.18.tar.bz2) = 2457351
+MD5 (geany-0.19.tar.bz2) = P5qw+upyscjiX+UBYsQvlQ==
+RMD160 (geany-0.19.tar.bz2) = t81Lc640AVnuC34wzh3MzUEDhpQ=
+SHA1 (geany-0.19.tar.bz2) = UB7rQ86pHIAW30sTRUmlRDCYHA0=
+SHA256 (geany-0.19.tar.bz2) = /EdCPPyqiaPayItJKUDuDk5GVm3kFjkgdVB9q7ZafgY=
+SIZE (geany-0.19.tar.bz2) = 2871302
Index: pkg/PLIST
===
RCS file: /cvs/openbsd/ports/devel/geany/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST   22 Dec 2009 15:31:27 -  1.14
+++ pkg/PLIST   19 Jun 2010 10:52:53 -
@@ -1,7 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.14 2009/12/22 15:31:27 ajacoutot Exp $
 @bin bin/geany
 include/geany/
-include/geany/dialogs.h
 include/geany/document.h
 include/geany/editor.h
 include/geany/encodings.h
@@ -11,11 +10,8 @@ include/geany/geanyfunctions.h
 include/geany/geanyplugin.h
 include/geany/highlighting.h
 include/geany/keybindings.h
-include/geany/main.h
 include/geany/msgwindow.h
 include/geany/plugindata.h
-include/geany/pluginmacros.h
-include/geany/plugins.h
 include/geany/prefs.h
 include/geany/project.h
 include/geany/scintilla/
@@ -23,8 +19,8 @@ include/geany/scintilla/SciLexer.h
 include/geany/scintilla/Scintilla.h
 include/geany/scintilla/Scintilla.iface
 include/geany/scintilla/ScintillaWidget.h
-include/geany/sciwrappers.h
 include/geany/search.h
+include/geany/stash.h
 include/geany/support.h
 include/geany/tagmanager/
 include/geany/tagmanager/tm_file_entry.h
@@ -66,8 +62,10 @@ share/doc/geany/README
 share/doc/geany/ScintillaLicense.txt
 share/doc/geany/html/
 share/doc/geany/html/images/
+share/doc/geany/html/images/build_menu_commands_dialog.png
 share/doc/geany/html/images/find_dialog.png
 share/doc/geany/html/images/find_in_files_dialog.png
+share/doc/geany/html/images/main_window.png
 share/doc/geany/html/images/pref_dialog_edit_completions.png
 share/doc/geany/html/images/pref_dialog_edit_display.png
 share/doc/geany/html/images/pref_dialog_edit_features.png
@@ -89,6 +87,8 @@ share/geany/
 share/geany/GPL-2
 share/geany/c99.tags
 share/geany/filetype_extensions.conf
+share/geany/filetypes.Genie.conf
+share/geany/filetypes.abc
 share/geany/filetypes.actionscript
 share/geany/filetypes.ada
 share/geany/filetypes.asm
@@ -116,6 +116,7 @@ share/geany/filetypes.javascript
 share/geany/filetypes.latex
 share/geany/filetypes.lua
 share/geany/filetypes.makefile
+share/geany/filetypes.markdown
 share/geany/filetypes.matlab
 share/geany/filetypes.nsis
 share/geany/filetypes.pascal
@@ -129,16 +130,29 @@ share/geany/filetypes.ruby
 share/geany/filetypes.sh
 share/geany/filetypes.sql
 share/geany/filetypes.tcl
+share/geany/filetypes.txt2tags
 share/geany/filetypes.vala
+share/geany/filetypes.verilog
 share/geany/filetypes.vhdl
 share/geany/filetypes.xml
 share/geany/filetypes.yaml
 share/geany/html_entities.tags
-share/geany/latex.tags
 share/geany/pascal.tags
 share/geany/php.tags
 share/geany/python.tags
 share/geany/snippets.conf
+share/geany/templates/
+share/geany/templates/files/
+share/geany/templates/files/file.html
+share/geany/templates/files/file.php
+share/geany/templates/files/file.rb
+share/geany/templates/files/file.tex
+share/geany/templates/files/main.c
+share/geany/templates/files/main.cxx
+share/geany/templates/files/main.d
+share/geany/templates/files/main.java
+share/geany/templates/files/main.py
+share/geany/templates/files/program.pas
 share/geany/ui_toolbar.xml
 share/icons/hicolor/16x16/apps/classviewer-class.png
 share/icons/hicolor/16x16/apps/classviewer-macro.png
@@ -151,6 +165,7 @@ share/icons/hicolor/16x16/apps/classview
 share/icons/hicolor/16x16/apps/geany.png
 share/icons/hicolor/48x48/

Re: Porting flashrom to OpenBSD

2010-06-19 Thread Stuart Henderson
On 2010/06/19 12:50, Roberto Fernandez wrote:
> On Sat, Jun 19, 2010 at 01:42:08AM +0100, Stuart Henderson wrote:
> > On 2010/06/19 02:33, Carl-Daniel Hailfinger wrote:
> > > Hi,
> > > 
> > > I'm one of the lead developers of flashrom, a GPLv2 application to
> > > read/write/erase flash chips on mainboards, network/storage/graphics
> > > cards and external programmers. Some people use flashrom to update their
> > > BIOS/EFI or to add netbooting functionality to their network cards, or
> > > to recover misflashed mainboards. Having to boot DOS/Windows to perform
> > > those tasks is something many people would like to avoid, and being able
> > > to work with flash chips from your favourite OS is definitely easier
> > > than navigating in unknown waters.
> > > If you want to learn more about flashrom, please visit
> > > http://www.flashrom.org/
> > > 
> > > flashrom works on
> > > Linux/FreeBSD/NetBSD/DragonFlyBSD/OpenSolaris/MacOSX/DOS, and OpenBSD is
> > > the last remaining major UNIX-like OS which wasn't supported until now.
> > > 
> > > I have two patches which get flashrom to compile on OpenBSD on i386, and
> > > they should work on amd64 as well. Those patches will be merged into the
> > > official flashrom source tree once I know that they work. The big
> > > obstacle for me is that I don't own any OpenBSD machine, and all I have
> > > is shell access to a public OpenBSD i386 shell server. flashrom is
> > > pretty small, you can compile it in ~5 seconds on a reasonably fast
> > > machine, so compile testing shouldn't need too much time.
> > > 
> > > How do I proceed? Ask for testers? Send the patches (or links to the
> > > patch downloads) to this list?
> > 
> > If you send me the patches I'll write a port Makefile for it.
> > Then it's easier for people to test. Compile testing is no problem
> > but I don't have any machines that I can spare to test actual bios
> > updates on though.
>  
> A way to reduce risks on these tests is here:
> http://www.biosman.com/biosrecovery.html
> 
> I never tested this myself, I have no floppy drive :(

This can sometimes work. But on many machines it only works
if the checksum is bad. If you flash a wrong BIOS but the
checksum is okay, you can't always recover from that.
And vendors, especially for whitebox PC components, *do*
sometimes fuck up and label download files incorrectly.

(you can also try a hotswap with another machine - been
there, done that, have no particular desire to do it again ;)



Re: UPDATE: mcabber-0.10.0

2010-06-19 Thread Markus Hennecke

Am 12.04.2010 17:17, schrieb Markus Hennecke:

Updates mcabber to version 0.10.0.

Did I do the LIB-DEPENDS / WANTLIB stuff right? lib-depends-check does 
not complain, so I guess it is right...


Kind regards,
  Markus Hennecke

Hm, I was a little off the world in the last two month...
Could anyone commit this one? Patch is still working, tested on amd64 
with gcc4.


Kind regards,
  Markus Hennecke



Re: UPDATE: mcabber-0.10.0

2010-06-19 Thread Robert
On Sat, 19 Jun 2010 14:20:47 +0200
Markus Hennecke  wrote:

> Am 12.04.2010 17:17, schrieb Markus Hennecke:
> > Updates mcabber to version 0.10.0.
> >
> > Did I do the LIB-DEPENDS / WANTLIB stuff right? lib-depends-check
> > does not complain, so I guess it is right...
> >
> > Kind regards,
> >   Markus Hennecke
> Hm, I was a little off the world in the last two month...
> Could anyone commit this one? Patch is still working, tested on amd64 
> with gcc4.
> 
> Kind regards,
>Markus Hennecke
> 

Using this without problems since your initial mail on amd64 and i386.
Can confirm that it is working with -current (system&ports) rebuilt
yesterday.

- Robert



update textproc/texi2html

2010-06-19 Thread Matthias Kilian
Update to 1.82.

Tested on amd64 (by comparing the generated documentation before
and after the texi2html update) against emulators/qemu, graphics/ffmpeg,
print/lilypond, textproc/source-highlight, x11/py-Xlib.

There *are* some differences for some ports (different doctype
declaration,  instead of unclosed  tags etc.), but the
generated HTML still looked fine in the browser.

One of the regression tests fails in weird ways, but I'm not sure
wether this should block the update.

comments? ok?

Ciao,
Kili

Index: Makefile
===
RCS file: /cvs/ports/textproc/texi2html/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile22 Mar 2010 13:54:21 -  1.19
+++ Makefile19 Jun 2010 11:15:04 -
@@ -2,20 +2,28 @@
 
 COMMENT=   texinfo to HTML converter
 
-DISTNAME=  texi2html-1.64
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  texi2html-1.82
 CATEGORIES=textproc
 
-HOMEPAGE=  http://www.mathematik.uni-kl.de/~obachman/Texi2html/
+HOMEPAGE=  http://www.nongnu.org/texi2html/
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=  ${HOMEPAGE}/Distrib/
+MASTER_SITES=  ${MASTER_SITE_SAVANNAH:=texi2html/}
 
 CONFIGURE_STYLE= gnu
+
+USE_GMAKE= Yes
+
+MAKE_FLAGS+=   texinfohtmldir=${PREFIX}/share/doc/texi2html
+
+REGRESS_DEPENDS=   ::textproc/gsed
+
+pre-regress:
+   @ln -s ${LOCALBASE}/bin/gsed ${WRKDIR}/bin/sed
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/texi2html/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo5 Apr 2007 17:26:19 -   1.3
+++ distinfo19 Jun 2010 11:15:04 -
@@ -1,5 +1,5 @@
-MD5 (texi2html-1.64.tar.gz) = 8Pow5Y7ZMEMcQ6B9kHWT9Q==
-RMD160 (texi2html-1.64.tar.gz) = gKKzkX8X/OYTG36rNsAtTFPKwUg=
-SHA1 (texi2html-1.64.tar.gz) = lzuV3MBvza5JKaSnpO5/UbVo+Ew=
-SHA256 (texi2html-1.64.tar.gz) = mSbcRx1y+A1LZVrk/ctK1067RDlT6F4zPyntizDVmy8=
-SIZE (texi2html-1.64.tar.gz) = 14
+MD5 (texi2html-1.82.tar.gz) = fqU3qMgf+/VCGznAMz6R3w==
+RMD160 (texi2html-1.82.tar.gz) = GUnR2FfLceG1Bw42IjomiWkQ1SM=
+SHA1 (texi2html-1.82.tar.gz) = 57vhGXFHVmJQq9XEVrlMjjfgqB8=
+SHA256 (texi2html-1.82.tar.gz) = bHyUotiP/iGKM+kRGMKwOTNsvj8vi046eOT9FQIHKTY=
+SIZE (texi2html-1.82.tar.gz) = 7350232
Index: patches/patch-Makefile.in
===
RCS file: patches/patch-Makefile.in
diff -N patches/patch-Makefile.in
--- patches/patch-Makefile.in   8 Sep 2001 06:29:57 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
 Makefile.in.orig   Thu Sep  6 13:31:52 2001
-+++ Makefile.inThu Sep  6 13:32:36 2001
-@@ -73,7 +73,7 @@
- 
- info_TEXINFOS = texi2html.texi
- 
--htmldir = $(prefix)/html
-+htmldir = $(prefix)/share/doc/texi2html
- html_DATA = texi2html.html
- 
- TEXI2HTML = texi2html
Index: patches/patch-texi2html.pl
===
RCS file: /cvs/ports/textproc/texi2html/patches/patch-texi2html.pl,v
retrieving revision 1.1
diff -u -p -r1.1 patch-texi2html.pl
--- patches/patch-texi2html.pl  8 Sep 2001 06:29:57 -   1.1
+++ patches/patch-texi2html.pl  19 Jun 2010 11:15:04 -
@@ -1,19 +1,19 @@
 texi2html.pl.orig  Thu Sep  6 13:36:51 2001
-+++ texi2html.pl   Thu Sep  6 13:38:08 2001
-@@ -1,6 +1,4 @@
- #...@bangperl@
+--- texi2html.pl.orig  Mon Jan  5 20:14:05 2009
 texi2html.pl   Sat Jun 19 12:19:54 2010
+@@ -1,7 +1,5 @@
+ #! @PERL@ --
+ # perl
 -'di ';
 -'ig 00 ';
  
#+##
  #
  # texi2html: Program to transform Texinfo documents to HTML
-@@ -57,9 +55,6 @@
- $THISVERSION = '@T2H_VERSION@';
- $THISPROG = "texi2html $THISVERSION"; # program name and version
-   
+@@ -27,8 +25,6 @@
+ #02110-1301  USA
+ #
+ 
#-##
 -# The man page for this program is included at the end of this file and can be
 -# viewed using the command 'nroff -man texi2html'.
--
- # Identity:
  
- $T2H_TODAY = &pretty_date;# like "20 September 1993"
+ # for POSIX::setlocale and File::Spec
+ require 5.00405;
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/texi2html/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   15 Sep 2004 18:44:08 -  1.6
+++ pkg/PLIST   19 Jun 2010 11:15:04 -
@@ -4,3 +4,103 @@ bin/texi2html
 @man man/man1/texi2html.1
 share/doc/texi2html/
 share/doc/texi2html/texi2html.html
+share/texi2html/
+share/texi2html/bib-example.texi
+share/texi2html/book.init
+share/texi2html/chm.init
+share/texi2html/docbook.init
+share/texi2html/enable_encoding.init
+share/texi2html/glossary.texi
+share

Re: [update] Geany 0.19

2010-06-19 Thread Landry Breuil
On Sat, Jun 19, 2010 at 12:56:30PM +0200, Jonathan Armani wrote:
> 
> Hi,
> 
> Update geany to 0.19 (and my email address while here), tested on amd64.
> 

> +PKGNAME= ${DISTNAME}

Not needed.
Landry



Re: [update] Geany 0.19

2010-06-19 Thread Jonathan Armani
On Sat, 19 Jun 2010 16:38:36 +0200
Landry Breuil  wrote:

> On Sat, Jun 19, 2010 at 12:56:30PM +0200, Jonathan Armani wrote:
> > 
> > Hi,
> > 
> > Update geany to 0.19 (and my email address while here), tested on amd64.
> > 
> 
> > +PKGNAME=   ${DISTNAME}
> 
> Not needed.
> Landry
> 
> 

Right, updated diff.

Index: Makefile
===
RCS file: /cvs/openbsd/ports/devel/geany/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile22 Dec 2009 15:31:27 -  1.23
+++ Makefile19 Jun 2010 14:55:20 -
@@ -4,14 +4,13 @@ SHARED_ONLY=  Yes
 
 COMMENT=   small and lightweight IDE
 
-DISTNAME=  geany-0.18
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  geany-0.19
 
 CATEGORIES=devel
 
 HOMEPAGE=  http://www.geany.org
 
-MAINTAINER=Jonathan Armani 
+MAINTAINER=Jonathan Armani 
 
 # GPL + Scintilla License
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/openbsd/ports/devel/geany/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo4 Sep 2009 11:38:31 -   1.10
+++ distinfo19 Jun 2010 14:55:20 -
@@ -1,5 +1,5 @@
-MD5 (geany-0.18.tar.bz2) = 2OMB9pM8go4sNrOv2z9MNA==
-RMD160 (geany-0.18.tar.bz2) = ONBTu5lSllVgrhnPSFhKPW+I0wo=
-SHA1 (geany-0.18.tar.bz2) = UoTgadXaVYHPh0dLWks3rtAV134=
-SHA256 (geany-0.18.tar.bz2) = fLOH05S1i57hEZ3GdwtDfkpMnnK1kbC9Qx5UVY9RIS0=
-SIZE (geany-0.18.tar.bz2) = 2457351
+MD5 (geany-0.19.tar.bz2) = P5qw+upyscjiX+UBYsQvlQ==
+RMD160 (geany-0.19.tar.bz2) = t81Lc640AVnuC34wzh3MzUEDhpQ=
+SHA1 (geany-0.19.tar.bz2) = UB7rQ86pHIAW30sTRUmlRDCYHA0=
+SHA256 (geany-0.19.tar.bz2) = /EdCPPyqiaPayItJKUDuDk5GVm3kFjkgdVB9q7ZafgY=
+SIZE (geany-0.19.tar.bz2) = 2871302
Index: pkg/PLIST
===
RCS file: /cvs/openbsd/ports/devel/geany/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST   22 Dec 2009 15:31:27 -  1.14
+++ pkg/PLIST   19 Jun 2010 14:55:20 -
@@ -1,7 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.14 2009/12/22 15:31:27 ajacoutot Exp $
 @bin bin/geany
 include/geany/
-include/geany/dialogs.h
 include/geany/document.h
 include/geany/editor.h
 include/geany/encodings.h
@@ -11,11 +10,8 @@ include/geany/geanyfunctions.h
 include/geany/geanyplugin.h
 include/geany/highlighting.h
 include/geany/keybindings.h
-include/geany/main.h
 include/geany/msgwindow.h
 include/geany/plugindata.h
-include/geany/pluginmacros.h
-include/geany/plugins.h
 include/geany/prefs.h
 include/geany/project.h
 include/geany/scintilla/
@@ -23,8 +19,8 @@ include/geany/scintilla/SciLexer.h
 include/geany/scintilla/Scintilla.h
 include/geany/scintilla/Scintilla.iface
 include/geany/scintilla/ScintillaWidget.h
-include/geany/sciwrappers.h
 include/geany/search.h
+include/geany/stash.h
 include/geany/support.h
 include/geany/tagmanager/
 include/geany/tagmanager/tm_file_entry.h
@@ -66,8 +62,10 @@ share/doc/geany/README
 share/doc/geany/ScintillaLicense.txt
 share/doc/geany/html/
 share/doc/geany/html/images/
+share/doc/geany/html/images/build_menu_commands_dialog.png
 share/doc/geany/html/images/find_dialog.png
 share/doc/geany/html/images/find_in_files_dialog.png
+share/doc/geany/html/images/main_window.png
 share/doc/geany/html/images/pref_dialog_edit_completions.png
 share/doc/geany/html/images/pref_dialog_edit_display.png
 share/doc/geany/html/images/pref_dialog_edit_features.png
@@ -89,6 +87,8 @@ share/geany/
 share/geany/GPL-2
 share/geany/c99.tags
 share/geany/filetype_extensions.conf
+share/geany/filetypes.Genie.conf
+share/geany/filetypes.abc
 share/geany/filetypes.actionscript
 share/geany/filetypes.ada
 share/geany/filetypes.asm
@@ -116,6 +116,7 @@ share/geany/filetypes.javascript
 share/geany/filetypes.latex
 share/geany/filetypes.lua
 share/geany/filetypes.makefile
+share/geany/filetypes.markdown
 share/geany/filetypes.matlab
 share/geany/filetypes.nsis
 share/geany/filetypes.pascal
@@ -129,16 +130,29 @@ share/geany/filetypes.ruby
 share/geany/filetypes.sh
 share/geany/filetypes.sql
 share/geany/filetypes.tcl
+share/geany/filetypes.txt2tags
 share/geany/filetypes.vala
+share/geany/filetypes.verilog
 share/geany/filetypes.vhdl
 share/geany/filetypes.xml
 share/geany/filetypes.yaml
 share/geany/html_entities.tags
-share/geany/latex.tags
 share/geany/pascal.tags
 share/geany/php.tags
 share/geany/python.tags
 share/geany/snippets.conf
+share/geany/templates/
+share/geany/templates/files/
+share/geany/templates/files/file.html
+share/geany/templates/files/file.php
+share/geany/templates/files/file.rb
+share/geany/templates/files/file.tex
+share/geany/templates/files/main.c
+share/geany/templates/files/main.cxx
+share/geany/templates/files/main.d
+share/geany/templates/files/main.java
+share/geany/templates/files/main.py
+share/geany/templates/files/program.pas
 share/geany/ui_toolbar.xml
 share/icons/hicolor/16x16/apps/cla

[new] sysutils/collectd

2010-06-19 Thread Landry Breuil
Hi,

it has been asked by some ppl, so here is it done right.. i only did
flavors for pgsql/mysql/snmp. Builds and seems to collect stats here,
didn't do much more testing nor graph creation here. So please test if
you have real environments using it. I might add some
--disable/--without configure args for the sake of sanity..

Landry


collectd-4.10.tgz
Description: application/tar-gz


kde4

2010-06-19 Thread Marc Espie
One major reason (for me) for gcc4 is kde4, which was a total nightmare
(read: impossible) to port with gcc3.

Between DCoppa's work on cmake, and the collective work on gcc4, I'm updating
the experimental ports under x11/kde4...

They're still totally experimental, some apps work, some stuff doesn't work
yet. Most importantly, it can't be  built (yet) alongside kde3.

Patches welcome, if you know what you're doing. Actual testers not yet wanted,
it's very much alpha-stage for now.



Re: python 2.5: time to go?

2010-06-19 Thread Pekka Niiranen

Marco Peereboom wrote:

I am talking about custom apps that you don't see.  There is a lot of
python code out there running on 2.5.  I am not making it up; I know of
several shops that do everything in 2.5.

I am all for making 2.6 the default but eliminating 2.5 from the tree
seems like a bad move to me.  Now you'll force people to maintain their
own port even though there is no real benefit for us to remove it.

Anyway, just my $0.02 and feel free to ignore me.

On Wed, Jun 16, 2010 at 05:37:01PM +0100, Federico G. Schwindt wrote:

On Wed, Jun 16, 2010 at 11:26:43AM -0500, Marco Peereboom wrote:

I would leave 2.5 alone too.  I am sure there are apps that require it
and it really doesn't hurt anything in the tree.

Unfortunate side effect of these types of "languages".

  if there is any app that needs 2.5, we can fix it to work with 2.6.
  i don't want to leave it just in case. the just in case wastes more time
than it currently helps.
  if we leave 2.5 around but we make 2.6 the default, we'll need to check
with 2.5 still and people might avoid fixing it just because 2.5 is there.
  if you have any specific app i'm mind i'm happy to take a look and fix it
but since no apps in the tree seems to depends on 2.5 (last one was py-dpkt
that was updated recently) moving to 2.6 makes sense.
 
  f.-




Python 2.7 will be released this year (July?).
That will be the last of 2.x series.
Either jump to 3.x or wait for 2.7, please...

-pekka-



update: print/fontforge

2010-06-19 Thread Matthias Kilian
Update to fontforge-20100501.

Tested with lilypond on amd64.


Index: Makefile
===
RCS file: /cvs/ports/print/fontforge/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile16 Jun 2010 10:13:40 -  1.16
+++ Makefile19 Jun 2010 19:52:30 -
@@ -4,8 +4,8 @@ SHARED_ONLY=Yes
 
 COMMENT=   vector font editor/converter
 
-DISTNAME=  fontforge_full-20090408
-PKGNAME=   ${DISTNAME:S,_full,,}p1
+DISTNAME=  fontforge_full-20100501
+PKGNAME=   ${DISTNAME:S,_full,,}
 EXTRACT_SUFX=  .tar.bz2
 SHARED_LIBS=   fontforge   2.0 \
gdraw   4.0 \
@@ -23,14 +23,15 @@ MAINTAINER= Matthias Kilian =1800,pangocairo-1.0.>=1800,pangoft2-1.0.>=1800,pangoxft-1.0.>=1800::devel/pango
 \
png.>=5::graphics/png   \
tiff.>=38::graphics/tiff\
-   ungif.>=5::graphics/libungif\
+   gif.>=5::graphics/libungif  \
xml2.>=9::textproc/libxml
 
 WRKDIST=   ${WRKDIR}/${DISTNAME:S,_full,,}
 
-AUTOCONF_VERSION=  2.59
-CONFIGURE_STYLE=   gnu autoconf no-autoheader
+CONFIGURE_STYLE=   gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include\
  -I${LOCALBASE}/include/libpng"\
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib\
Index: distinfo
===
RCS file: /cvs/ports/print/fontforge/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo22 Apr 2009 12:23:00 -  1.7
+++ distinfo19 Jun 2010 19:52:30 -
@@ -1,5 +1,5 @@
-MD5 (fontforge_full-20090408.tar.bz2) = WoWr0FuNzvy14h4k2ZKZ+Q==
-RMD160 (fontforge_full-20090408.tar.bz2) = 8PD8OHagEubdLpCdxjxmUV2644c=
-SHA1 (fontforge_full-20090408.tar.bz2) = C8ElWXBf8LIUo9aw2vh873mjeeg=
-SHA256 (fontforge_full-20090408.tar.bz2) = 
xCNvEYM82XkKVqFhnrJ8UBRt7thCtmy6LFuXvF4NKuk=
-SIZE (fontforge_full-20090408.tar.bz2) = 5240192
+MD5 (fontforge_full-20100501.tar.bz2) = Xz0g1kXsGqK3tIdjht+HFw==
+RMD160 (fontforge_full-20100501.tar.bz2) = Te4uzb0yvzhUEF8ZWYTZyr8Zj9g=
+SHA1 (fontforge_full-20100501.tar.bz2) = SDQlEWxq9q2Q43+a2gwo408lHsM=
+SHA256 (fontforge_full-20100501.tar.bz2) = 
7kkosN90gMMaQiZFhU2fP09nGN1CO2iFvTPoeopu3Xk=
+SIZE (fontforge_full-20100501.tar.bz2) = 386
Index: patches/patch-configure_in
===
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in  22 Apr 2009 12:23:00 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.5 2009/04/22 12:23:00 kili Exp $
 configure.in.orig  Wed Dec 24 22:04:17 2008
-+++ configure.in   Mon Mar  9 21:27:44 2009
-@@ -335,22 +335,15 @@ AC_CHECK_FILE(/usr/include/libxml2/libxml,[CFLAGS="$CF
-  AC_CHECK_FILE(/usr/local/include/libxml2/libxml,[CFLAGS="$CFLAGS 
-I/usr/local/include -I/usr/local/include/libxml2/"],
-   AC_DEFINE(_NO_LIBXML))])
- 
--dnl Some old versions of lib(un)gif don't work for us, they've got the
-+dnl Some old versions of libungif don't work for us, they've got the
- dnl Function argument in the wrong place. So check the header files.
--dnl check for both libgif and libungif, I think they use the same args.
- 
--AC_CHECK_LIB(gif, DGifOpenFileName, [
-+AC_CHECK_LIB(ungif, DGifOpenFileName, [
- echo -n checking for ExtensionBlock.Function in gif_lib.h...
- AC_TRY_COMPILE([#include ], [ ExtensionBlock foo; foo.Function=3; 
], echo " " yes , [echo " " no
- ac_cv_lib_ungif_DGifOpenFileName=no
- AC_DEFINE(_NO_LIBUNGIF)])
--] , [
--  AC_CHECK_LIB(ungif, DGifOpenFileName, [
--  echo -n checking for ExtensionBlock.Function in gif_lib.h...
--  AC_TRY_COMPILE([#include ], [ ExtensionBlock foo; 
foo.Function=3; ], echo " " yes , [echo " " no
--  ac_cv_lib_ungif_DGifOpenFileName=no
--  AC_DEFINE(_NO_LIBUNGIF)])
--  ] , AC_DEFINE(_NO_LIBUNGIF))])
-+] , AC_DEFINE(_NO_LIBUNGIF))
- 
- dnl some people have installed libraries without include files.
- dnl bloody useless thing to do, but check for both (don't need to check for
Index: pkg/PLIST
===
RCS file: /cvs/ports/print/fontforge/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   22 Apr 2009 12:23:00 -  1.6
+++ pkg/PLIST   19 Jun 2010 19:52:30 -
@@ -6,6 +6,7 @@ bin/sfddiff
 include/fontforge/
 include/fontforge/PfEd.h
 include/fontforge/autowidth.h
+include/fontforge/autowidth2.h
 include/fontforge/baseviews.h
 include/fontforge/basics.h
 include/fontforge/bezctx_ff.h
@@ -14,6 +15,7 @@ include/fontforge/chardata.h
 include/fontforge/charset.h
 include/fontforge/config.h
 in

Re: UPDATE: mcabber-0.10.0

2010-06-19 Thread Stuart Henderson
On 2010/06/19 14:20, Markus Hennecke wrote:
> Am 12.04.2010 17:17, schrieb Markus Hennecke:
> >Updates mcabber to version 0.10.0.
> >
> >Did I do the LIB-DEPENDS / WANTLIB stuff right? lib-depends-check
> >does not complain, so I guess it is right...
> >
> >Kind regards,
> >  Markus Hennecke
> Hm, I was a little off the world in the last two month...
> Could anyone commit this one? Patch is still working, tested on amd64
> with gcc4.

this uses dlopen modules so I've set it SHARED_ONLY and rolled
PFRAG.shared into PLIST, also since the glib2 update there's now
a WANTLIB on pthread.

ok?

Index: Makefile
===
RCS file: /cvs/ports/net/mcabber/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile22 Dec 2009 00:31:23 -  1.7
+++ Makefile19 Jun 2010 20:34:06 -
@@ -1,15 +1,16 @@
 # $OpenBSD: Makefile,v 1.7 2009/12/22 00:31:23 sthen Exp $
 
+SHARED_ONLY=   Yes
+
 COMMENT=   console jabber client
-DISTNAME=  mcabber-0.9.10
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  mcabber-0.10.0
 CATEGORIES=net
 
 HOMEPAGE=  http://www.lilotux.net/~mikael/mcabber/
 
 MAINTAINER=Markus Hennecke 
 
-# GPL
+# GPLv2+ with SSL exemption
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -20,10 +21,12 @@ EXTRACT_SUFX=   .tar.bz2
 
 MODULES=   devel/gettext
 
-WANTLIB=   c crypto gpg-error ncurses panel ssl
+WANTLIB=   c crypto gcrypt gpg-error ncurses panel pcre pthread ssl
 
-LIB_DEPENDS=   glib-2.0::devel/glib2 \
+LIB_DEPENDS=   glib-2.0,gmodule-2.0::devel/glib2 \
gpgme::security/gpgme \
+   loudmouth-1.>=3::net/loudmouth \
+   idn::devel/libidn \
otr::security/libotr
 RUN_DEPENDS=   ::devel/desktop-file-utils
 
@@ -31,7 +34,6 @@ USE_LIBTOOL=  Yes
 
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ARGS=--enable-gpgme \
-   --with-ssl \
--disable-aspell \
--disable-enchant \
--enable-otr \
Index: distinfo
===
RCS file: /cvs/ports/net/mcabber/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo23 Oct 2009 09:07:09 -  1.5
+++ distinfo19 Jun 2010 20:34:06 -
@@ -1,5 +1,5 @@
-MD5 (mcabber-0.9.10.tar.bz2) = iHQV0Wwyr1jqsuwtm7F/pg==
-RMD160 (mcabber-0.9.10.tar.bz2) = ZWgYswS5CICXrSoP5IXzjNDnBPw=
-SHA1 (mcabber-0.9.10.tar.bz2) = b/giLtiVbgeKPD1RkBOhJecV5Jk=
-SHA256 (mcabber-0.9.10.tar.bz2) = Qx5HujCVwcxsEZMbq5A0xCugkR363ME3unZYA+RGDLU=
-SIZE (mcabber-0.9.10.tar.bz2) = 579621
+MD5 (mcabber-0.10.0.tar.bz2) = l/qtIVSofakynVHblX+QJA==
+RMD160 (mcabber-0.10.0.tar.bz2) = PCXxO+qITpKcANaW35rNv4gR+oQ=
+SHA1 (mcabber-0.10.0.tar.bz2) = ir+YsFd9s7vIehVouPcnOMuThLc=
+SHA256 (mcabber-0.10.0.tar.bz2) = 7xu5UjijL4QcbnAyVQtAGXZDhDtuRZ9ErVPFWPXXXAM=
+SIZE (mcabber-0.10.0.tar.bz2) = 552111
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/mcabber/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   22 Dec 2009 00:31:23 -  1.4
+++ pkg/PLIST   19 Jun 2010 20:34:06 -
@@ -1,5 +1,45 @@
 @comment $OpenBSD: PLIST,v 1.4 2009/12/22 00:31:23 sthen Exp $
 @bin bin/mcabber
+include/mcabber/
+include/mcabber/api.h
+include/mcabber/caps.h
+include/mcabber/commands.h
+include/mcabber/compl.h
+include/mcabber/config.h
+include/mcabber/events.h
+include/mcabber/fifo.h
+include/mcabber/hbuf.h
+include/mcabber/help.h
+include/mcabber/hgcset.h
+include/mcabber/histolog.h
+include/mcabber/hooks.h
+include/mcabber/logprint.h
+include/mcabber/main.h
+include/mcabber/modules.h
+include/mcabber/nohtml.h
+include/mcabber/otr.h
+include/mcabber/pgp.h
+include/mcabber/roster.h
+include/mcabber/screen.h
+include/mcabber/settings.h
+include/mcabber/utf8.c
+include/mcabber/utf8.h
+include/mcabber/utils.h
+include/mcabber/xmpp.h
+include/mcabber/xmpp_defines.h
+include/mcabber/xmpp_helper.h
+include/mcabber/xmpp_iq.h
+include/mcabber/xmpp_iqrequest.h
+include/mcabber/xmpp_muc.h
+include/mcabber/xmpp_s10n.h
+lib/mcabber/
+lib/mcabber/libbeep.a
+lib/mcabber/libbeep.la
+lib/mcabber/libbeep.so
+lib/mcabber/libxttitle.a
+lib/mcabber/libxttitle.la
+lib/mcabber/libxttitle.so
+lib/pkgconfig/mcabber.pc
 @man man/man1/mcabber.1
 share/applications/mcabber.desktop
 share/examples/mcabber/
@@ -25,6 +65,7 @@ share/mcabber/help/cs/hlp_group.txt
 share/mcabber/help/cs/hlp_help.txt
 share/mcabber/help/cs/hlp_iline.txt
 share/mcabber/help/cs/hlp_info.txt
+share/mcabber/help/cs/hlp_module.txt
 share/mcabber/help/cs/hlp_move.txt
 share/mcabber/help/cs/hlp_msay.txt
 share/mcabber/help/cs/hlp_otr.txt
@@ -63,6 +104,7 @@ share/mcabber/help/de/h

UPDATE: Bochs 2.4.5

2010-06-19 Thread Brad
Here is an update to Bochs 2.4.5.


Index: Makefile
===
RCS file: /cvs/ports/emulators/bochs/Makefile,v
retrieving revision 1.46
diff -N -u -p Makefile
--- Makefile29 Mar 2010 07:37:12 -  1.46
+++ Makefile20 Jun 2010 01:21:06 -
@@ -2,7 +2,7 @@
 
 COMMENT=   x86 machine simulator
 
-DISTNAME=  bochs-2.4.2
+DISTNAME=  bochs-2.4.5
 CATEGORIES=emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bochs/}
 
Index: distinfo
===
RCS file: /cvs/ports/emulators/bochs/distinfo,v
retrieving revision 1.13
diff -N -u -p distinfo
--- distinfo29 Mar 2010 07:37:12 -  1.13
+++ distinfo20 Jun 2010 01:21:06 -
@@ -1,5 +1,5 @@
-MD5 (bochs-2.4.2.tar.gz) = /rB9qEsH7tR1NUlTMzC3Cw==
-RMD160 (bochs-2.4.2.tar.gz) = Q8oUDrJUj7IoUP4E7FBm/qzOVJ0=
-SHA1 (bochs-2.4.2.tar.gz) = PnyAOHKczisqm2oKpX35M8MSDdw=
-SHA256 (bochs-2.4.2.tar.gz) = XdNQyMsdKtm22QlitIwGu+nsGJvhUqB6bhdeBQvwNAY=
-SIZE (bochs-2.4.2.tar.gz) = 4035010
+MD5 (bochs-2.4.5.tar.gz) = /afq3NlZCTTSkB+EOWMUYw==
+RMD160 (bochs-2.4.5.tar.gz) = paUtj1i4rXsdVE1PiQQyRNmfokI=
+SHA1 (bochs-2.4.5.tar.gz) = 4zTTHv15yARUAYyc2vqg63XLAYo=
+SHA256 (bochs-2.4.5.tar.gz) = uUhiKjZMLn2kIhpqRkC6LvpoQi4UEaw3fGnTf0b2dhY=
+SIZE (bochs-2.4.5.tar.gz) = 4059598
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/emulators/bochs/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -N -u -p patches/patch-Makefile_in
--- patches/patch-Makefile_in   23 Jun 2009 16:03:58 -  1.3
+++ patches/patch-Makefile_in   20 Jun 2010 01:21:06 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.3 2009/06/23 16:03:58 pirofti Exp $
 Makefile.in.orig   Sun May 17 17:37:48 2009
-+++ Makefile.inSun May 17 17:42:46 2009
-@@ -391,8 +391,8 @@ install_docbook: build_docbook
+--- Makefile.in.orig   Fri Feb 26 09:18:18 2010
 Makefile.inFri Jun 18 18:49:22 2010
+@@ -385,8 +385,8 @@ install_docbook: build_docbook
  install_man::
-mkdir -p $(DESTDIR)$(man1dir)
-mkdir -p $(DESTDIR)$(man5dir)
Index: patches/patch-_bochsrc
===
RCS file: /cvs/ports/emulators/bochs/patches/patch-_bochsrc,v
retrieving revision 1.4
diff -N -u -p patches/patch-_bochsrc
--- patches/patch-_bochsrc  23 Jun 2009 16:03:58 -  1.4
+++ patches/patch-_bochsrc  20 Jun 2010 01:21:06 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-_bochsrc,v 1.4 2009/06/23 16:03:58 pirofti Exp $
 .bochsrc.orig  Thu Apr 30 15:04:42 2009
-+++ .bochsrc   Sun May 17 14:24:26 2009
-@@ -220,13 +220,13 @@ vga: extension=vbe
+--- .bochsrc.orig  Sat Apr 24 05:36:03 2010
 .bochsrc   Fri Jun 18 18:49:22 2010
+@@ -276,13 +276,13 @@ vga: extension=vbe
  # The parameter 'type' can be used to enable the floppy drive without media
  # and status specified. Usually the drive type is set up based on the media 
type.
  #===
@@ -17,7 +17,7 @@ $OpenBSD: patch-_bochsrc,v 1.4 2009/06/23 16:03:58 pir
  
  #===
  # FLOPPYB:
-@@ -364,7 +364,7 @@ boot: disk
+@@ -420,7 +420,7 @@ boot: disk
  # 
  # Default value are sync=none, time0=local
  #===
@@ -26,7 +26,7 @@ $OpenBSD: patch-_bochsrc,v 1.4 2009/06/23 16:03:58 pir
  
  
  #===
-@@ -388,8 +388,8 @@ floppy_bootsig_check: disabled=0
+@@ -444,8 +444,8 @@ floppy_bootsig_check: disabled=0
  #   log: ./bochs.out
  #   log: /dev/tty
  #===
Index: patches/patch-iodev_cdrom_cc
===
RCS file: /cvs/ports/emulators/bochs/patches/patch-iodev_cdrom_cc,v
retrieving revision 1.3
diff -N -u -p patches/patch-iodev_cdrom_cc
--- patches/patch-iodev_cdrom_cc20 May 2010 15:30:05 -  1.3
+++ patches/patch-iodev_cdrom_cc20 Jun 2010 01:21:06 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-iodev_cdrom_cc,v 1.3 2010/05/20 15:30:05 naddy Exp $
 iodev/cdrom.cc.origThu May 20 09:25:50 2010
-+++ iodev/cdrom.cc Thu May 20 09:26:46 2010
-@@ -97,6 +97,9 @@ extern "C" {
+--- iodev/cdrom.cc.origFri Dec  4 14:50:26 2009
 iodev/cdrom.cc Fri Jun 18 18:49:22 2010
+@@ -91,6 +91,9 @@ extern "C" {
  #include 
  #include 
  #include 

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