CVS: cvs.openbsd.org: ports

2012-05-23 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2012/05/23 00:44:50

Modified files:
sysutils/syslog-ng: Makefile 
sysutils/syslog-ng/pkg: syslog_ng.rc 

Log message:
If syslog-ng is started early during boot-up (that is if one replaces
the syslogd rc.d(8) script with the syslog_ng one), it will fail to
launch because ldconfig(8) hasn't had a chance to run yet. Add an
rc_pre() that will take care of that.

ok sthen@ steven@ (maintainer)



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/05/23 01:31:46

Modified files:
net/scli   : Makefile distinfo 

Log message:
- update to 0.4.0



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2012/05/23 01:51:00

Modified files:
multimedia/devede: Makefile distinfo 
Added files:
multimedia/devede/patches: patch-devede 
Removed files:
multimedia/devede/patches: patch-devede_py 

Log message:
Update to devede-3.22.0.



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2012/05/23 03:16:19

Modified files:
net/dnsmasq: Makefile 
net/dnsmasq/patches: patch-src_dnsmasq_c 
Added files:
net/dnsmasq/patches: patch-src_util_c 

Log message:
Several fixes from upstream:
- Fix non-response to router-solicitations when router-advertisement
configured, but DHCPv6 not configured.
- Fix a bug which broke DHCPv6/RA with prefix lengths which are not
divisible by 8.

from Brad



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/05/23 09:02:52

Log message:
import java/jBCrypt, ok okan@

jBCrypt is a Java implementation of OpenBSD's Blowfish password
hashing code, compatible with the canonical C implementation of the
bcrypt algorithm.

This system hashes passwords using a version of Bruce Schneier's
Blowfish block cipher with modifications designed to raise the cost
of off-line password cracking and frustrate fast hardware implementation.
The computation cost of the algorithm is parametised, so it can be
increased as computers get faster. The intent is to make a compromise
of a password database less likely to result in an attacker gaining
knowledge of the plaintext passwords (e.g. using John the Ripper).

Status:

Vendor Tag: sthen
Release Tags:   sthen_20120523

N ports/java/jBCrypt/Makefile
N ports/java/jBCrypt/distinfo
N ports/java/jBCrypt/.nfs09CC55E70DB3B18C
N ports/java/jBCrypt/files/build.xml
N ports/java/jBCrypt/pkg/PLIST
N ports/java/jBCrypt/pkg/DESCR

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/05/23 09:03:58

Removed files:
java/jBCrypt   : .nfs09CC55E70DB3B18C 

Log message:
die.



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/05/23 09:04:30

Modified files:
java   : Makefile 

Log message:
+jBCrypt



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/05/23 09:12:12

Modified files:
lang   : Makefile 

Log message:
sync



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/05/23 09:11:44

Log message:
re-import node into lang, www was poorly chosen at the time of import

from aaron bieber (MAINTAINER), with cluestick hitting by espie@
as discussed with and ok sthen@

Status:

Vendor Tag: jasper
Release Tags:   jasper_20122305

N ports/lang/node/Makefile
N ports/lang/node/distinfo
N ports/lang/node/node.port.mk
N ports/lang/node/patches/patch-deps_v8_SConstruct
N ports/lang/node/patches/patch-deps_v8_src_atomicops_h
N ports/lang/node/patches/patch-deps_v8_src_heap_cc
N ports/lang/node/patches/patch-deps_v8_src_platform_h
N ports/lang/node/patches/patch-lib_module_js
N ports/lang/node/patches/patch-src_platform_openbsd_cc
N ports/lang/node/patches/patch-tools_wafadmin_Tools_python_py
N ports/lang/node/patches/patch-wscript
N ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_build_js
N 
ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_configure_js
N 
ports/lang/node/patches/patch-deps_npm_node_modules_node-gyp_lib_install_js
N ports/lang/node/pkg/PLIST
N ports/lang/node/pkg/DESCR

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/05/23 09:12:44

Modified files:
www: Makefile 

Log message:
unhook www/node, it moved to lang/node



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/05/23 09:13:20

Modified files:
databases/node-pg: Makefile 
databases/node-sqlite3: Makefile 
devel/node-expresso: Makefile 
devel/node-fibers: Makefile 
devel/node-generic-pool: Makefile 
devel/node-mnm : Makefile 
lang/coffeescript: Makefile 
security/node-bcrypt: Makefile 
sysutils/node-syslog: Makefile 
graphics/node-canvas: Makefile 

Log message:
adjust for node.port.mk location change



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/05/23 09:13:41

Removed files:
www/node   : Makefile distinfo node.port.mk 
www/node/patches: 
  patch-deps_npm_node_modules_node-gyp_lib_build_js 
  patch-deps_npm_node_modules_node-gyp_lib_configure_js 
  patch-deps_npm_node_modules_node-gyp_lib_install_js 
  patch-deps_v8_SConstruct 
  patch-deps_v8_src_atomicops_h 
  patch-deps_v8_src_heap_cc 
  patch-deps_v8_src_platform_h 
  patch-lib_module_js 
  patch-src_platform_openbsd_cc 
  patch-tools_wafadmin_Tools_python_py 
  patch-wscript 
www/node/pkg   : DESCR PLIST 

Log message:
be gone, you belong in lang/ now.



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2012/05/23 11:01:56

Modified files:
x11/gnome/eog/patches: patch-src_eog-exif-util_c 

Log message:
Committed uptream.



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/05/23 12:02:09

Modified files:
productivity/radicale: Makefile distinfo 
productivity/radicale/patches: patch-config 
   patch-radicale_config_py 
productivity/radicale/pkg: PLIST 

Log message:
update to radicale 0.7, from maintainer Sergey Bronnikov



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/05/23 15:33:04

Modified files:
databases/mysql: Makefile 
databases/mysql/pkg: README-server 

Log message:
Stop recommending that people use mysqld_safe(1) directly, the rc script
is preferred. Adjust some wording in the paragraph about login classes while
there. From Brad.



CVS: cvs.openbsd.org: ports

2012-05-23 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2012/05/23 18:49:55

Modified files:
mail/dovecot-pigeonhole: Tag: OPENBSD_5_1 Makefile 
Added files:
mail/dovecot-pigeonhole/patches: Tag: OPENBSD_5_1 
 
patch-src_managesieve-login_managesieve-proxy_c 

Log message:
Add patch to -stable needed to build Pigeonhole 0.2.5 against Dovecot 2.0.20;
from form@, thanks!



NEW: java/jBCrypt

2012-05-23 Thread Stuart Henderson
OK to import?  I'm using this with tomcat+railo (tomcat has its own
special lib path, adding the path to the .jar to common.loader in
catalina.properties is working well enough for me).

...

jBCrypt is a Java implementation of OpenBSD's Blowfish password
hashing code, compatible with the canonical C implementation of the
bcrypt algorithm.

This system hashes passwords using a version of Bruce Schneier's
Blowfish block cipher with modifications designed to raise the cost
of off-line password cracking and frustrate fast hardware implementation.
The computation cost of the algorithm is parametised, so it can be
increased as computers get faster. The intent is to make a compromise
of a password database less likely to result in an attacker gaining
knowledge of the plaintext passwords (e.g. using John the Ripper).

http://www.mindrot.org/projects/jBCrypt/

...



jBCrypt.tgz
Description: application/tar-gz


[update] p5-Image-ExifTool

2012-05-23 Thread patrick keshishian



p5-Image-ExifTool.diff
Description: Binary data


Re: [Move] ww/node - lang/node

2012-05-23 Thread Marc Espie
On Tue, May 22, 2012 at 06:26:32PM -0600, Aaron Bieber wrote:
 On Wed, May 23, 2012 at 01:39:47AM +0200, Marc Espie wrote:
  On Tue, May 22, 2012 at 12:21:22PM -0600, Aaron Bieber wrote:
   Hola,
   
   This tarball / diff move node from www to lang, and patch all ports that
   depend on node.
  
  No go.
  
  you obviously didn't think about updates.
 Obviously!
  
  And I'm going to be a prick about it and not explain it.
  
  You can go RFTM pkg_add(1), pkg_create(1) and pkgpath(7).
 
 New patch/tarball... Now with 100% more anti-prick!
 

Not yet okay. node itself won't update. You have to tell it you changed
@pkgpath...



Re: NEW: net/nagios/check_postgres

2012-05-23 Thread C. Bensend

 after forgetting to add postgresql to pkg_scripts in rc.conf.local on
 a machine I thought this might be useful. it has basic connection checks,
 as well as a huge range of other checks for more serious installations.
 it's usable for Nagios and Icinga as a monitoring plugin, but also has
 modes aimed at producing output for MRTG graphing etc.

 OK?

Builds and installs fine on i386 here...  Just getting into testing
its modes now.

Benny


-- 
The problem with quotes on the internet is that it's very hard to
verify their authenticity.   -- Abraham Lincoln




Re: [update] p5-Image-ExifTool

2012-05-23 Thread Okan Demirmen
On Tue 2012.05.22 at 15:05 -0700, patrick keshishian wrote:
 

Thanks; no issues in my use-cases.  Other OK's?

Patch inline.

Index: Makefile
===
RCS file: /cvs/ports/graphics/p5-Image-ExifTool/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile2 Apr 2012 16:32:53 -   1.25
+++ Makefile22 May 2012 21:42:06 -
@@ -2,7 +2,7 @@
 
 COMMENT=   read and write meta information in image/audio/video files
 
-DISTNAME=  Image-ExifTool-8.85
+DISTNAME=  Image-ExifTool-8.90
 CATEGORIES=graphics
 
 HOMEPAGE=  http://owl.phy.queensu.ca/~phil/exiftool/
Index: distinfo
===
RCS file: /cvs/ports/graphics/p5-Image-ExifTool/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo2 Apr 2012 16:32:53 -   1.20
+++ distinfo22 May 2012 21:42:06 -
@@ -1,5 +1,5 @@
-MD5 (Image-ExifTool-8.85.tar.gz) = O7G1lUc6kdpXV8qNX1cDrw==
-RMD160 (Image-ExifTool-8.85.tar.gz) = 6HR4Pirg4GkNXMfGa2QcTR8BXzA=
-SHA1 (Image-ExifTool-8.85.tar.gz) = PU4iHWOgVlOAMPdZKU9hGt1T/YA=
-SHA256 (Image-ExifTool-8.85.tar.gz) = 
IrZOBTbPZBqHDV5Q8WzVIM3PWpMbIyZ6eUtDqxECmNc=
-SIZE (Image-ExifTool-8.85.tar.gz) = 3361671
+MD5 (Image-ExifTool-8.90.tar.gz) = w08hOK8U56t1vdsS2ejnJg==
+RMD160 (Image-ExifTool-8.90.tar.gz) = gGJ5fDYECXL2FL798C0LTLczsJc=
+SHA1 (Image-ExifTool-8.90.tar.gz) = dTRPzRJc9TaQ9x6e0vNrAYenbzA=
+SHA256 (Image-ExifTool-8.90.tar.gz) = 
zUEziSi18H0+Yyw9TiRq4glbUN33Y+0fV4krhxUjIq4=
+SIZE (Image-ExifTool-8.90.tar.gz) = 3380284



[MAINTAINER] radicale port update to 0.7

2012-05-23 Thread Sergey Bronnikov
Port of Radicale updated to version 0.7
Changes are following:
Repeating events
Collection deletion
Courier and PAM authentication methods
CardDAV support
Custom LDAP filters supported

Plese review patch, test and commit.


Sergey B.
diff -uprN /usr/ports/productivity/radicale/Makefile 
/usr/ports/mystuff/productivity/radicale/Makefile
--- /usr/ports/productivity/radicale/Makefile   Mon May 14 18:19:40 2012
+++ /usr/ports/mystuff/productivity/radicale/Makefile   Wed May 23 16:52:08 2012
@@ -2,7 +2,7 @@
 
 COMMENT =  simple CalDAV calendar server
 
-MODPY_EGG_VERSION = 0.6.4
+MODPY_EGG_VERSION = 0.7
 DISTNAME = Radicale-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   productivity net
diff -uprN /usr/ports/productivity/radicale/distinfo 
/usr/ports/mystuff/productivity/radicale/distinfo
--- /usr/ports/productivity/radicale/distinfo   Mon May 14 18:19:40 2012
+++ /usr/ports/mystuff/productivity/radicale/distinfo   Wed May 23 16:52:19 2012
@@ -1,5 +1,5 @@
-MD5 (Radicale-0.6.4.tar.gz) = vpxdjfmFBZ3dZSUpVl+unw==
-RMD160 (Radicale-0.6.4.tar.gz) = naeu3o7Ej6lyWoWYXNPm470ndok=
-SHA1 (Radicale-0.6.4.tar.gz) = FYVN06cHDvhDhXO0qf75KitGuKs=
-SHA256 (Radicale-0.6.4.tar.gz) = g/1tG5WM0urn+o13PbUI4aT4cmbkg0YBbQPissfrgOo=
-SIZE (Radicale-0.6.4.tar.gz) = 30994
+MD5 (Radicale-0.7.tar.gz) = lIGDhsGrO8PiczAUnrEGfw==
+RMD160 (Radicale-0.7.tar.gz) = as9TxZH9m11CXSJuLAc3roCraJ4=
+SHA1 (Radicale-0.7.tar.gz) = LySOYZV8ucmbQE1zsX26xyh1+mg=
+SHA256 (Radicale-0.7.tar.gz) = 89F9FrrEy+7cXmaotxHynVEwnpJkqe+TC11GZQN5TAk=
+SIZE (Radicale-0.7.tar.gz) = 34061
diff -uprN /usr/ports/productivity/radicale/patches/CVS/patch-config 
/usr/ports/mystuff/productivity/radicale/patches/CVS/patch-config
--- /usr/ports/productivity/radicale/patches/CVS/patch-config   Thu Jan  1 
03:00:00 1970
+++ /usr/ports/mystuff/productivity/radicale/patches/CVS/patch-config   Wed May 
23 17:09:42 2012
@@ -0,0 +1,32 @@
+--- config.origWed May 23 17:07:02 2012
 config Wed May 23 17:08:52 2012
+@@ -22,9 +22,9 @@ pid =
+ # SSL flag, enable HTTPS protocol
+ ssl = False
+ # SSL certificate path
+-certificate = /etc/apache2/ssl/server.crt
++certificate = /etc/radicale/server.crt
+ # SSL private key
+-key = /etc/apache2/ssl/server.key
++key = /etc/radicale/private/server.key
+ # Reverse DNS to resolve client address in logs
+ dns_lookup = True
+ 
+@@ -50,7 +50,7 @@ private_users = private
+ htpasswd_filename = /etc/radicale/users
+ # Htpasswd encryption method
+ # Value: plain | sha1 | crypt
+-htpasswd_encryption = crypt
++htpasswd_encryption = sha1
+ 
+ # LDAP server URL, with protocol and port
+ ldap_url = ldap://localhost:389/
+@@ -83,7 +83,7 @@ courier_socket =
+ type = filesystem
+ 
+ # Folder for storing local collections, created if not present
+-filesystem_folder = ~/.config/radicale/collections
++filesystem_folder = /var/db/radicale/calendars
+ 
+ 
+ [logging]
diff -uprN /usr/ports/productivity/radicale/patches/patch-config 
/usr/ports/mystuff/productivity/radicale/patches/patch-config
--- /usr/ports/productivity/radicale/patches/patch-config   Mon May 14 
18:19:40 2012
+++ /usr/ports/mystuff/productivity/radicale/patches/patch-config   Thu Jan 
 1 03:00:00 1970
@@ -1,45 +0,0 @@
-$OpenBSD: patch-config,v 1.4 2011/08/19 20:35:34 sthen Exp $
 config.origWed Jun 15 20:03:33 2011
-+++ config Mon Aug  1 23:41:44 2011
-@@ -22,9 +22,9 @@ pid =
- # SSL flag, enable HTTPS protocol
- ssl = False
- # SSL certificate path
--certificate = /etc/apache2/ssl/server.crt
-+certificate = ${SYSCONFDIR}/radicale/server.crt
- # SSL private key
--key = /etc/apache2/ssl/server.key
-+key = ${SYSCONFDIR}/radicale/private/server.key
- 
- [encoding]
- # Encoding for responding requests
-@@ -41,10 +41,10 @@ public_users = public
- # Usernames used for private calendars, separated by a comma
- private_users = private
- # Htpasswd filename
--htpasswd_filename = /etc/radicale/users
-+htpasswd_filename = ${SYSCONFDIR}/radicale/users
- # Htpasswd encryption method
- # Value: plain | sha1 | crypt
--htpasswd_encryption = crypt
-+htpasswd_encryption = sha1
- # LDAP server URL, with protocol and port
- ldap_url = ldap://localhost:389/
- # LDAP base path
-@@ -59,14 +59,14 @@ ldap_password =
- 
- [storage]
- # Folder for storing local calendars, created if not present
--folder = ~/.config/radicale/calendars
-+folder = /var/db/radicale/calendars
- 
- [logging]
- # Logging configuration file
- # If no config is given, simple information is printed on the standard output
- # For more information about the syntax of the configuration file, see:
- # http://docs.python.org/library/logging.config.html
--config = /etc/radicale/logging
-+config = ${SYSCONFDIR}/radicale/logging
- # Set the default logging level to debug
- debug = False
- # Store all environment variables (including those set in the shell)
diff -uprN /usr/ports/productivity/radicale/patches/patch-radicale_config_py 

Re: [MAINTAINER] radicale port update to 0.7

2012-05-23 Thread Stuart Henderson
On 2012/05/23 18:12, Sergey Bronnikov wrote:
 Port of Radicale updated to version 0.7
 Changes are following:
   Repeating events
   Collection deletion
   Courier and PAM authentication methods
   CardDAV support
   Custom LDAP filters supported
 
 Plese review patch, test and commit.
 
 
 Sergey B.

 --- /usr/ports/productivity/radicale/patches/CVS/patch-config Thu Jan  1 
 03:00:00 1970
 +++ /usr/ports/mystuff/productivity/radicale/patches/CVS/patch-config Wed May 
 23 17:09:42 2012

Not sure how you ended up with this, but copy the changed files over
/usr/ports/productivity/radicale and just send a 'cvs diff -u'.

 +-certificate = /etc/apache2/ssl/server.crt
 ++certificate = /etc/radicale/server.crt

Put this back to ${SYSCONFDIR}.

 --certificate: /etc/apache2/ssl/server.crt,
 --key: /etc/apache2/ssl/server.key},
 -+certificate: ${SYSCONFDIR}/radicale/server.crt,
 -+key: ${SYSCONFDIR}/radicale/private/server.key},

Looks like you lost this patch completely.



Re: [Move] ww/node - lang/node

2012-05-23 Thread Aaron Bieber
On Wed, May 23, 2012 at 02:40:16PM +0200, Marc Espie wrote:
 On Tue, May 22, 2012 at 06:26:32PM -0600, Aaron Bieber wrote:
  On Wed, May 23, 2012 at 01:39:47AM +0200, Marc Espie wrote:
   On Tue, May 22, 2012 at 12:21:22PM -0600, Aaron Bieber wrote:
Hola,

This tarball / diff move node from www to lang, and patch all ports that
depend on node.
   
   No go.
   
   you obviously didn't think about updates.
  Obviously!
   
   And I'm going to be a prick about it and not explain it.
   
   You can go RFTM pkg_add(1), pkg_create(1) and pkgpath(7).
  
  New patch/tarball... Now with 100% more anti-prick!
  
 
 Not yet okay. node itself won't update. You have to tell it you changed
 @pkgpath...

@pkgpath added.


node.tar.gz
Description: application/tar-gz


Re: [MAINTAINER] radicale port update to 0.7

2012-05-23 Thread Sergey Bronnikov
patch with fixes attached

On 15:27 Wed 23 May , Stuart Henderson wrote:
 On 2012/05/23 18:12, Sergey Bronnikov wrote:
  Port of Radicale updated to version 0.7
  Changes are following:
  Repeating events
  Collection deletion
  Courier and PAM authentication methods
  CardDAV support
  Custom LDAP filters supported
  
  Plese review patch, test and commit.
  
  
  Sergey B.
 
  --- /usr/ports/productivity/radicale/patches/CVS/patch-config   Thu Jan 
   1 03:00:00 1970
  +++ /usr/ports/mystuff/productivity/radicale/patches/CVS/patch-config   
  Wed May 23 17:09:42 2012
 
 Not sure how you ended up with this, but copy the changed files over
 /usr/ports/productivity/radicale and just send a 'cvs diff -u'.
 
  +-certificate = /etc/apache2/ssl/server.crt
  ++certificate = /etc/radicale/server.crt
 
 Put this back to ${SYSCONFDIR}.
 
  --certificate: /etc/apache2/ssl/server.crt,
  --key: /etc/apache2/ssl/server.key},
  -+certificate: ${SYSCONFDIR}/radicale/server.crt,
  -+key: ${SYSCONFDIR}/radicale/private/server.key},
 
 Looks like you lost this patch completely.
 
Index: Makefile
===
RCS file: /cvs/ports/productivity/radicale/Makefile,v
retrieving revision 1.16
diff -u -p -u Makefile
--- Makefile12 Jan 2012 00:19:54 -  1.16
+++ Makefile23 May 2012 15:49:07 -
@@ -2,7 +2,7 @@
 
 COMMENT =  simple CalDAV calendar server
 
-MODPY_EGG_VERSION = 0.6.4
+MODPY_EGG_VERSION = 0.7
 DISTNAME = Radicale-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   productivity net
Index: distinfo
===
RCS file: /cvs/ports/productivity/radicale/distinfo,v
retrieving revision 1.6
diff -u -p -u distinfo
--- distinfo12 Jan 2012 00:19:54 -  1.6
+++ distinfo23 May 2012 15:49:07 -
@@ -1,5 +1,5 @@
-MD5 (Radicale-0.6.4.tar.gz) = vpxdjfmFBZ3dZSUpVl+unw==
-RMD160 (Radicale-0.6.4.tar.gz) = naeu3o7Ej6lyWoWYXNPm470ndok=
-SHA1 (Radicale-0.6.4.tar.gz) = FYVN06cHDvhDhXO0qf75KitGuKs=
-SHA256 (Radicale-0.6.4.tar.gz) = g/1tG5WM0urn+o13PbUI4aT4cmbkg0YBbQPissfrgOo=
-SIZE (Radicale-0.6.4.tar.gz) = 30994
+MD5 (Radicale-0.7.tar.gz) = lIGDhsGrO8PiczAUnrEGfw==
+RMD160 (Radicale-0.7.tar.gz) = as9TxZH9m11CXSJuLAc3roCraJ4=
+SHA1 (Radicale-0.7.tar.gz) = LySOYZV8ucmbQE1zsX26xyh1+mg=
+SHA256 (Radicale-0.7.tar.gz) = 89F9FrrEy+7cXmaotxHynVEwnpJkqe+TC11GZQN5TAk=
+SIZE (Radicale-0.7.tar.gz) = 34061
Index: patches/patch-config
===
RCS file: /cvs/ports/productivity/radicale/patches/patch-config,v
retrieving revision 1.4
diff -u -p -u patches/patch-config
--- patches/patch-config19 Aug 2011 20:35:34 -  1.4
+++ patches/patch-config23 May 2012 15:49:07 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-config,v 1.4 2011/08/19 20:35:34 sthen Exp $
 config.origWed Jun 15 20:03:33 2011
-+++ config Mon Aug  1 23:41:44 2011
+$OpenBSD$
+--- config.origTue Mar 13 13:45:35 2012
 config Wed May 23 19:20:15 2012
 @@ -22,9 +22,9 @@ pid =
  # SSL flag, enable HTTPS protocol
  ssl = False
@@ -10,12 +10,12 @@ $OpenBSD: patch-config,v 1.4 2011/08/19 20:35:34 sthen
  # SSL private key
 -key = /etc/apache2/ssl/server.key
 +key = ${SYSCONFDIR}/radicale/private/server.key
+ # Reverse DNS to resolve client address in logs
+ dns_lookup = True
  
- [encoding]
- # Encoding for responding requests
-@@ -41,10 +41,10 @@ public_users = public
- # Usernames used for private calendars, separated by a comma
+@@ -47,10 +47,10 @@ public_users = public
  private_users = private
+ 
  # Htpasswd filename
 -htpasswd_filename = /etc/radicale/users
 +htpasswd_filename = ${SYSCONFDIR}/radicale/users
@@ -23,16 +23,17 @@ $OpenBSD: patch-config,v 1.4 2011/08/19 20:35:34 sthen
  # Value: plain | sha1 | crypt
 -htpasswd_encryption = crypt
 +htpasswd_encryption = sha1
+ 
  # LDAP server URL, with protocol and port
  ldap_url = ldap://localhost:389/
- # LDAP base path
-@@ -59,14 +59,14 @@ ldap_password =
+@@ -83,15 +83,14 @@ courier_socket =
+ type = filesystem
  
- [storage]
- # Folder for storing local calendars, created if not present
--folder = ~/.config/radicale/calendars
-+folder = /var/db/radicale/calendars
+ # Folder for storing local collections, created if not present
+-filesystem_folder = ~/.config/radicale/collections
++filesystem_folder = /var/db/radicale/calendars
  
+-
  [logging]
  # Logging configuration file
  # If no config is given, simple information is printed on the standard output
Index: patches/patch-radicale_config_py
===
RCS file: /cvs/ports/productivity/radicale/patches/patch-radicale_config_py,v
retrieving revision 1.4
diff -u -p -u patches/patch-radicale_config_py
--- patches/patch-radicale_config_py19 Aug 2011 20:35:34 -  1.4
+++ 

rubinius, don't assume llvm-config is perl

2012-05-23 Thread Stuart Henderson
this is needed if llvm is updated to 3.1, ok?

Index: patches/patch-configure
===
RCS file: /cvs/ports/lang/rubinius/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure 19 Jul 2011 17:09:56 -  1.1
+++ patches/patch-configure 23 May 2012 19:15:43 -
@@ -3,8 +3,8 @@ $OpenBSD: patch-configure,v 1.1 2011/07/
 Override the os setting to remove OpenBSD version from it,
 so ports don't have to be bumped when OpenBSD version changes.
 
 configure.orig Mon Jul 18 16:42:20 2011
-+++ configure  Mon Jul 18 16:42:55 2011
+--- configure.orig Wed Jul  6 02:33:08 2011
 configure  Wed May 23 20:13:42 2012
 @@ -24,7 +24,7 @@ class Configure
  # TODO: conditionalize for Windows
  @host = `./rakelib/config.guess`.chomp
@@ -14,3 +14,16 @@ so ports don't have to be bumped when Op
  @little_endian = false
  @sizeof_long = 0
  
+@@ -549,10 +549,10 @@ class Configure
+ 
+ if which
+   config = File.join(which, llvm-config)
+-  version = `#{@perl} #{config} --version`.strip
++  version = `#{config} --version`.strip
+   parts = version.sub(/svn$/, ).split(.).map { |i| i.to_i }
+   api_version = (%d%02d % parts[0..1]).to_i
+-  if `#{@perl} #{config} --cxxflags`.index(-fno-rtti)
++  if `#{config} --cxxflags`.index(-fno-rtti)
+ @log.write incorrectly configured llvm (rtti is off)
+   elsif api_version != 208 and api_version != 209
+ @log.write only LLVM 2.8 and 2.9 are supported



llvm 3.1

2012-05-23 Thread Stuart Henderson
any comments, OK?

rubinius fails hard during configure if this is installed, as it assumes
llvm-config is a perl script, will send a diff for that next.


Index: Makefile
===
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile5 May 2012 19:24:01 -   1.41
+++ Makefile23 May 2012 19:07:16 -
@@ -4,9 +4,8 @@ SHARED_LIBS +=  libclang
 
 COMMENT =  modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =   3.0
-REVISION = 2
-DISTNAME = llvm-${LLVM_V}
+LLVM_V =   3.1
+DISTNAME = llvm-${LLVM_V}.src
 
 CATEGORIES =   devel
 
@@ -28,7 +27,7 @@ WANTLIB = c m pthread stdc++
 
 MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
 
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} clang-${LLVM_V}${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} clang-${LLVM_V}.src${EXTRACT_SUFX}
 WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
 
 post-extract:
Index: distinfo
===
RCS file: /cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo14 Dec 2011 22:58:23 -  1.9
+++ distinfo23 May 2012 19:07:16 -
@@ -1,10 +1,10 @@
-MD5 (clang-3.0.tar.gz) = QzUHBq5s8F0AaIhXkuoFkQ==
-MD5 (llvm-3.0.tar.gz) = qOX18cGt6657SmVMN2pgBQ==
-RMD160 (clang-3.0.tar.gz) = ZAswkRbbQ1difAuB67pdq4JNnus=
-RMD160 (llvm-3.0.tar.gz) = hSEcr77Rxdg4rFRmkBe1KYYT+XU=
-SHA1 (clang-3.0.tar.gz) = H6EfB/lXvZyd4APRtaepuh4AVeQ=
-SHA1 (llvm-3.0.tar.gz) = toPnKU/PaYh8DXCQJdRkD13KdVs=
-SHA256 (clang-3.0.tar.gz) = tk5y2jVtfDQoz9esYg1J7AQshOruE8JgJIefVV9OEm0=
-SHA256 (llvm-3.0.tar.gz) = UZ6xHTSZzpnG/9uHGGUfyRQl7XaQ6skcjWhTR098BHc=
-SIZE (clang-3.0.tar.gz) = 7240578
-SIZE (llvm-3.0.tar.gz) = 10350539
+MD5 (clang-3.1.src.tar.gz) = Wb8tMSCjgF8nyv2jgjyq+A==
+MD5 (llvm-3.1.src.tar.gz) = FuqnZ5+EET9lsSdg/f5O4Q==
+RMD160 (clang-3.1.src.tar.gz) = WuCdPWnU8eUOB/a/NHTaluaoT+s=
+RMD160 (llvm-3.1.src.tar.gz) = zrDvNqthCdp6hWiwTedZdS2+5ac=
+SHA1 (clang-3.1.src.tar.gz) = GfM7GHpQ0i/aKm+e2Ylpmpqe/WI=
+SHA1 (llvm-3.1.src.tar.gz) = I0yW5z74GuyaVNqS/CqQJNZTsFk=
+SHA256 (clang-3.1.src.tar.gz) = /2PiFdzT4oOP/eo4UC+NNbqxfkh/PDeZV5lh5FLVp4Y=
+SHA256 (llvm-3.1.src.tar.gz) = HqBRNRl7VADB+I0A/ygNd1znePj56gQuJaHh5zSkuas=
+SIZE (clang-3.1.src.tar.gz) = 8158418
+SIZE (llvm-3.1.src.tar.gz) = 11077429
Index: patches/patch-Makefile_config_in
===
RCS file: /cvs/ports/devel/llvm/patches/patch-Makefile_config_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_config_in
--- patches/patch-Makefile_config_in14 Dec 2011 22:58:23 -  1.5
+++ patches/patch-Makefile_config_in23 May 2012 19:07:16 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_config_in,v 1.5 2011/12/14 22:58:23 sthen Exp $
 Makefile.config.in.origThu Oct 13 19:27:34 2011
-+++ Makefile.config.in Tue Oct 25 01:14:45 2011
-@@ -83,11 +83,11 @@ LLVMMAKE := $(LLVM_SRC_ROOT)/make
+--- Makefile.config.in.origTue May 15 23:06:08 2012
 Makefile.config.in Wed May 23 01:38:47 2012
+@@ -96,11 +96,11 @@ endif
  PROJ_bindir := $(PROJ_prefix)/bin
  PROJ_libdir := $(PROJ_prefix)/lib
  PROJ_datadir:= $(PROJ_prefix)/share
Index: patches/patch-cmake_config-ix_cmake
===
RCS file: /cvs/ports/devel/llvm/patches/patch-cmake_config-ix_cmake,v
retrieving revision 1.1
diff -u -p -r1.1 patch-cmake_config-ix_cmake
--- patches/patch-cmake_config-ix_cmake 5 May 2012 19:24:01 -   1.1
+++ patches/patch-cmake_config-ix_cmake 23 May 2012 19:07:16 -
@@ -2,8 +2,8 @@ $OpenBSD: patch-cmake_config-ix_cmake,v 
 
 Fix CMake check for pthread_mutex_lock
 
 cmake/config-ix.cmake.orig Fri May  4 14:05:40 2012
-+++ cmake/config-ix.cmake  Fri May  4 14:07:10 2012
+--- cmake/config-ix.cmake.orig Mon Mar 26 22:56:56 2012
 cmake/config-ix.cmake  Wed May 23 01:38:47 2012
 @@ -87,6 +87,7 @@ if( NOT PURE_WINDOWS )
check_library_exists(pthread pthread_create  HAVE_LIBPTHREAD)
check_library_exists(pthread pthread_getspecific  
HAVE_PTHREAD_GETSPECIFIC)
@@ -12,7 +12,7 @@ Fix CMake check for pthread_mutex_lock
check_library_exists(dl dlopen  HAVE_LIBDL)
  endif()
  
-@@ -131,9 +132,6 @@ check_symbol_exists(strchr string.h HAVE_STRCHR)
+@@ -133,9 +134,6 @@ check_symbol_exists(strchr string.h HAVE_STRCHR)
  check_symbol_exists(strcmp string.h HAVE_STRCMP)
  check_symbol_exists(strdup string.h HAVE_STRDUP)
  check_symbol_exists(strrchr string.h HAVE_STRRCHR)
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure 23 May 2012 19:07:16 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- configure.orig Fri May 

Re: llvm 3.1

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

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

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



Re: WIP: Dovecot 2.1

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

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


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

Re: rubinius, don't assume llvm-config is perl

2012-05-23 Thread Jeremy Evans
On 05/23 08:16, Stuart Henderson wrote:
 this is needed if llvm is updated to 3.1, ok?

OK jeremy@

 
 Index: patches/patch-configure
 ===
 RCS file: /cvs/ports/lang/rubinius/patches/patch-configure,v
 retrieving revision 1.1
 diff -u -p -r1.1 patch-configure
 --- patches/patch-configure   19 Jul 2011 17:09:56 -  1.1
 +++ patches/patch-configure   23 May 2012 19:15:43 -
 @@ -3,8 +3,8 @@ $OpenBSD: patch-configure,v 1.1 2011/07/
  Override the os setting to remove OpenBSD version from it,
  so ports don't have to be bumped when OpenBSD version changes.
  
  configure.orig   Mon Jul 18 16:42:20 2011
 -+++ configureMon Jul 18 16:42:55 2011
 +--- configure.orig   Wed Jul  6 02:33:08 2011
  configureWed May 23 20:13:42 2012
  @@ -24,7 +24,7 @@ class Configure
   # TODO: conditionalize for Windows
   @host = `./rakelib/config.guess`.chomp
 @@ -14,3 +14,16 @@ so ports don't have to be bumped when Op
   @little_endian = false
   @sizeof_long = 0
   
 +@@ -549,10 +549,10 @@ class Configure
 + 
 + if which
 +   config = File.join(which, llvm-config)
 +-  version = `#{@perl} #{config} --version`.strip
 ++  version = `#{config} --version`.strip
 +   parts = version.sub(/svn$/, ).split(.).map { |i| i.to_i }
 +   api_version = (%d%02d % parts[0..1]).to_i
 +-  if `#{@perl} #{config} --cxxflags`.index(-fno-rtti)
 ++  if `#{config} --cxxflags`.index(-fno-rtti)
 + @log.write incorrectly configured llvm (rtti is off)
 +   elsif api_version != 208 and api_version != 209
 + @log.write only LLVM 2.8 and 2.9 are supported



Missing dependencies for pidgin

2012-05-23 Thread Lars Engblom
I tried installing pidgin-2.10.4-gtkspell from snapshots and it could 
not run because of missing dependencies. Installing amsn, gives all the 
dependencies missing... some examination of what is actually needed is 
needed.


Lasse