[update] check_esxi_hardware

2014-09-05 Thread Mike Erdely
Diff below.  Works for me on a Dell server and two SuperMicros.

Can someone OK and commit for me?  Thanks.

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile24 Apr 2013 13:37:22 -  1.7
+++ Makefile5 Sep 2014 17:26:03 -
@@ -4,7 +4,7 @@ PKG_ARCH =  *
 
 COMMENT =  Nagios plugin to the status of ESX/i hardware
 
-V =20130424
+V =20140319
 DISTNAME = check_esxi_hardware.py.$V
 PKGNAME =  check_esxi_hardware-$V
 CATEGORIES =   net
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo24 Apr 2013 13:37:22 -  1.5
+++ distinfo5 Sep 2014 18:14:50 -
@@ -1,2 +1,2 @@
-SHA256 (check_esxi_hardware.py.20130424) = 
+cwh2ayrctLEAzaNIupVq64XtOM1mT5Zvj5y9bf19VE=
-SIZE (check_esxi_hardware.py.20130424) = 31654
+SHA256 (check_esxi_hardware.py.20140319) = 
7atMI0LmEkdGQo1XX6ii51oweskeyXCF6huxQ2wk/7g=
+SIZE (check_esxi_hardware.py.20140319) = 32684



Re: [update] check_esxi_hardware

2014-09-05 Thread Mike Erdely
On Fri, Sep 05, 2014 at 03:07:29PM -0400, Brad Smith wrote:
 On 05/09/14 2:35 PM, Mike Erdely wrote:
 Diff below.  Works for me on a Dell server and two SuperMicros.
 
 Can someone OK and commit for me?  Thanks.
 
 That COMMENT sounds like it is missing a word. Looking at the
 other plugins it should probably be changed to..
 
 Nagios plugin to monitor the status of ESX/i hardware

New diff below.  Thanks.

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile24 Apr 2013 13:37:22 -  1.7
+++ Makefile5 Sep 2014 19:09:32 -
@@ -2,9 +2,9 @@
 
 PKG_ARCH = *
 
-COMMENT =  Nagios plugin to the status of ESX/i hardware
+COMMENT =  Nagios plugin to monitor the status of ESX/i hardware
 
-V =20130424
+V =20140319
 DISTNAME = check_esxi_hardware.py.$V
 PKGNAME =  check_esxi_hardware-$V
 CATEGORIES =   net
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo24 Apr 2013 13:37:22 -  1.5
+++ distinfo5 Sep 2014 18:14:50 -
@@ -1,2 +1,2 @@
-SHA256 (check_esxi_hardware.py.20130424) = 
+cwh2ayrctLEAzaNIupVq64XtOM1mT5Zvj5y9bf19VE=
-SIZE (check_esxi_hardware.py.20130424) = 31654
+SHA256 (check_esxi_hardware.py.20140319) = 
7atMI0LmEkdGQo1XX6ii51oweskeyXCF6huxQ2wk/7g=
+SIZE (check_esxi_hardware.py.20140319) = 32684



mail/p5-GetLive

2014-05-02 Thread Mike Erdely
Does anyone still use mail/p5-GetLive?

It's end of life has just been announced:
http://sourceforge.net/p/getlive/news/2014/05/the-end-of-getlive---stay-tuned/

If nobody uses it, anyone care to tedu it?

Thanks.

-ME

Index: Makefile
===
RCS file: /cvs/ports/mail/Makefile,v
retrieving revision 1.304
diff -u -p -r1.304 Makefile
--- Makefile21 Apr 2014 11:47:08 -  1.304
+++ Makefile2 May 2014 14:13:19 -
@@ -125,7 +125,6 @@
  SUBDIR += p5-Email-Valid-Loose
  SUBDIR += p5-FuzzyOcr
  SUBDIR += p5-GMail-IMAPD
- SUBDIR += p5-GetLive
  SUBDIR += p5-Log-Procmail
  SUBDIR += p5-MIME-Base32
  SUBDIR += p5-MIME-Charset
Index: p5-GetLive/Makefile
===
RCS file: p5-GetLive/Makefile
diff -N p5-GetLive/Makefile
--- p5-GetLive/Makefile 19 Nov 2013 15:47:32 -  1.15
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-# $OpenBSD: Makefile,v 1.15 2013/11/19 15:47:32 merdely Exp $
-
-COMMENT=   automatically fetch outlook.com email
-
-DISTNAME=  GetLive_3_0
-PKGNAME=   p5-GetLive-3.0
-PKG_ARCH=  *
-CATEGORIES=mail perl5
-EXTRACT_SUFX=  .tgz
-
-MAINTAINER=Michael Erdely merd...@openbsd.org
-
-# GPLv2+
-PERMIT_PACKAGE_CDROM=  Yes
-
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=getlive/}
-
-RUN_DEPENDS=   devel/p5-Net-Server \
-   net/curl=7.15.5 \
-   mail/procmail \
-   www/p5-HTML-Parser \
-   www/p5-URI \
-   www/p5-WWW-Mechanize-GZip \
-   www/p5-libwww
-
-NO_BUILD=  Yes
-NO_TEST=   Yes
-
-post-patch:
-   @${SUBST_CMD} ${WRKSRC}/{GetLive.pl,Manual}
-
-do-install:
-   ${INSTALL_SCRIPT} ${WRKSRC}/GetLive.pl ${PREFIX}/bin/GetLive
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/GetLive
-   ${INSTALL_SCRIPT} ${WRKSRC}/{SmtpAuthForward,SmtpForward}.pl \
-   ${PREFIX}/share/examples/GetLive/
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/GetLive
-   ${INSTALL_DATA} ${WRKSRC}/{License,Manual} ${PREFIX}/share/doc/GetLive
-
-.include bsd.port.mk
Index: p5-GetLive/distinfo
===
RCS file: p5-GetLive/distinfo
diff -N p5-GetLive/distinfo
--- p5-GetLive/distinfo 19 Nov 2013 15:47:32 -  1.8
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (GetLive_3_0.tgz) = 2DPZamX49O8gkXyyheUBijY29MXvdYVk3yS4HEVwGTA=
-SIZE (GetLive_3_0.tgz) = 27311
Index: p5-GetLive/patches/patch-GetLive_pl
===
RCS file: p5-GetLive/patches/patch-GetLive_pl
diff -N p5-GetLive/patches/patch-GetLive_pl
--- p5-GetLive/patches/patch-GetLive_pl 19 Nov 2013 15:47:33 -  1.8
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,45 +0,0 @@
-Diff from GetLive CVS to incorporate Outlook.com site changes.
-
-$OpenBSD: patch-GetLive_pl,v 1.8 2013/11/19 15:47:33 merdely Exp $
 GetLive.pl.origTue Apr  2 17:10:46 2013
-+++ GetLive.pl Sat Nov 16 22:27:39 2013
-@@ -92,7 +92,7 @@ sub new {
-   $Self-{'Login'} = ;
-   $Self-{'Domain'}= hotmail.com;
-   $Self-{'Password'}  = ;
--  $Self-{'MailProcessor'} = '/usr/bin/procmail'; # Any program taking 
mbox formatted at stdin will do.
-+  $Self-{'MailProcessor'} = '${LOCALBASE}/bin/procmail'; # Any program 
taking mbox formatted at stdin will do.
-   $Self-{'DownloadedIdsFile'} = ;  # Local file with Ids 
of already downloaded messages.
-   $Self-{'MarkRead'}  = No;# No,Yes : But never 
when downloaded before !
-   $Self-{'Delete'}= No;# No,Yes : But never 
when downloaded before !
-@@ -398,6 +398,8 @@ sub GetPage {
-  
-   $Self-Log(Response headers : \n . $Response-headers_as_string(), 
MinVerbosity = 100);
- 
-+  $Self-Log(Response content : \n . $Response-content(), MinVerbosity = 
100);
-+
-   return ($Response-content(),uri_unescape($Response-request-uri));
- }
- 
-@@ -457,16 +459,15 @@ sub Login {
-   my $Domain = $Self-{'Domain'};
-   my ($LoginUrl) = $LoginPageAsString =~ 
m{'(https://login.live.com/ppsecure/post.srf.*?)'};
- 
--  if ($LoginPageAsString !~ m/F:'(P.*?)'/s) {
-- $Self-Log(Page doesn't contain PPSX in the expected place.\n,stderr 
= 1);
-- return 0;
-+  if ($LoginPageAsString !~ m/[F|AP]:'(P.*?)'/s) {
-+$PostData{PPSX} = Pass;
-+  } else {
-+$Self-Log(PPSX detected as '$1'.\n, MinVerbosity = 10 );
-+$PostData{PPSX} = $1;
-   }
-   
-   # End of Michael Kelly patch.
- 
--  $Self-Log(PPSX detected as '$1'.\n, MinVerbosity = 10 );
--  $PostData{PPSX} = $1;
--  
-   # PPFT is a normal (ie non JS) hidden input type.
-   if( $LoginPageAsString !~ 
m/\s*input\s+.*name=\PPFT\(\s+id=\S+)?\s+value=\(\S*)\/ ) {
- Self-Log(Page doesn't contain input field PPFT as expected.\n,stderr 
= 1);
Index: p5-GetLive/patches/patch-Manual

Re: NEW: benchmarks/speedtest-cli

2013-11-19 Thread Mike Erdely
OK.  I tested with 2.7 on amd64.  Worked well.

Thanks.

On Tue, Nov 19, 2013 at 12:27 PM, Stuart Henderson s...@spacehopper.org wrote:
 This is a simple command-line client for the speedtest.net bandwidth tester,
 which has a couple of thousand test locations around the world and is normally
 accessed by a Flash-based website.

 OK to import?




Re: [Update] mail/p5-GetLive

2013-11-18 Thread Mike Erdely
On Sat, Nov 16, 2013 at 10:55:50PM -0500, Mike Erdely wrote:
 It updates GetLive to 3.0 and supports Outlook.com.
 It includes two changes checked into the project CVS but aren't in the 
 release to fix login page changes on Outlook.com.
 
 ok?

And now a diff that doesn't remove ${LOCALBASE} from its patches.

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-GetLive/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile11 Mar 2013 11:23:52 -  1.14
+++ Makefile18 Nov 2013 16:53:20 -
@@ -2,8 +2,8 @@
 
 COMMENT=   automatically fetch hotmail.com email
 
-DISTNAME=  GetLive_2_4
-PKGNAME=   p5-GetLive-2.4
+DISTNAME=  GetLive_3_0
+PKGNAME=   p5-GetLive-3.0
 PKG_ARCH=  *
 CATEGORIES=mail perl5
 EXTRACT_SUFX=  .tgz
@@ -18,7 +18,10 @@ MASTER_SITES=${MASTER_SITE_SOURCEFORGE:
 RUN_DEPENDS=   devel/p5-Net-Server \
net/curl=7.15.5 \
mail/procmail \
-   www/p5-URI
+   www/p5-HTML-Parser \
+   www/p5-URI \
+   www/p5-WWW-Mechanize-GZip \
+   www/p5-libwww
 
 NO_BUILD=  Yes
 NO_TEST=   Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-GetLive/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo20 Sep 2011 13:43:37 -  1.7
+++ distinfo18 Nov 2013 16:53:20 -
@@ -1,5 +1,2 @@
-MD5 (GetLive_2_4.tgz) = Ek4sX0pLHXsYi2BXr7hpfg==
-RMD160 (GetLive_2_4.tgz) = uLNSaPrhFmNZWNDR4nfHgJC0Rg4=
-SHA1 (GetLive_2_4.tgz) = wQC3zHR4mbNMFu3N6fabhNmsbkI=
-SHA256 (GetLive_2_4.tgz) = Wk43+E8d9tmo8iGfU5Y2b6T9i8lYGruCtLUtxUSRYtI=
-SIZE (GetLive_2_4.tgz) = 29524
+SHA256 (GetLive_3_0.tgz) = 2DPZamX49O8gkXyyheUBijY29MXvdYVk3yS4HEVwGTA=
+SIZE (GetLive_3_0.tgz) = 27311
Index: patches/patch-GetLive_pl
===
RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-GetLive_pl,v
retrieving revision 1.7
diff -u -p -r1.7 patch-GetLive_pl
--- patches/patch-GetLive_pl5 May 2011 13:37:04 -   1.7
+++ patches/patch-GetLive_pl18 Nov 2013 16:53:20 -
@@ -1,9 +1,9 @@
-Diff from GetLive CVS to incorporate Hotmail site changes.
+Diff from GetLive CVS to incorporate Outlook.com site changes.
 
 $OpenBSD: patch-GetLive_pl,v 1.7 2011/05/05 13:37:04 gsoares Exp $
 GetLive.pl.origMon May  2 14:49:46 2011
-+++ GetLive.pl Mon May  2 15:02:56 2011
-@@ -91,7 +91,7 @@ sub new {
+--- GetLive.pl.origTue Apr  2 17:10:46 2013
 GetLive.pl Sat Nov 16 22:27:39 2013
+@@ -92,7 +92,7 @@ sub new {
$Self-{'Login'} = ;
$Self-{'Domain'}= hotmail.com;
$Self-{'Password'}  = ;
@@ -12,3 +12,34 @@ $OpenBSD: patch-GetLive_pl,v 1.7 2011/05
$Self-{'DownloadedIdsFile'} = ;  # Local file with Ids 
of already downloaded messages.
$Self-{'MarkRead'}  = No;# No,Yes : But never 
when downloaded before !
$Self-{'Delete'}= No;# No,Yes : But never 
when downloaded before !
+@@ -398,6 +398,8 @@ sub GetPage {
+  
+   $Self-Log(Response headers : \n . $Response-headers_as_string(), 
MinVerbosity = 100);
+ 
++  $Self-Log(Response content : \n . $Response-content(), MinVerbosity = 
100);
++
+   return ($Response-content(),uri_unescape($Response-request-uri));
+ }
+ 
+@@ -457,16 +459,15 @@ sub Login {
+   my $Domain = $Self-{'Domain'};
+   my ($LoginUrl) = $LoginPageAsString =~ 
m{'(https://login.live.com/ppsecure/post.srf.*?)'};
+ 
+-  if ($LoginPageAsString !~ m/F:'(P.*?)'/s) {
+- $Self-Log(Page doesn't contain PPSX in the expected place.\n,stderr 
= 1);
+- return 0;
++  if ($LoginPageAsString !~ m/[F|AP]:'(P.*?)'/s) {
++$PostData{PPSX} = Pass;
++  } else {
++$Self-Log(PPSX detected as '$1'.\n, MinVerbosity = 10 );
++$PostData{PPSX} = $1;
+   }
+   
+   # End of Michael Kelly patch.
+ 
+-  $Self-Log(PPSX detected as '$1'.\n, MinVerbosity = 10 );
+-  $PostData{PPSX} = $1;
+-  
+   # PPFT is a normal (ie non JS) hidden input type.
+   if( $LoginPageAsString !~ 
m/\s*input\s+.*name=\PPFT\(\s+id=\S+)?\s+value=\(\S*)\/ ) {
+ Self-Log(Page doesn't contain input field PPFT as expected.\n,stderr 
= 1);
Index: patches/patch-Manual
===
RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-Manual,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Manual
--- patches/patch-Manual21 Jul 2010 02:21:52 -  1.4
+++ patches/patch-Manual18 Nov 2013 16:53:20 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Manual,v 1.4 2010/07/21 02:21:52 merdely Exp $
 Manual.origTue Jul 20 22:15:44 2010
-+++ Manual Tue Jul 20 22:16:11 2010
-@@ -51,7 +51,7 @@ Following are the possible options :
+--- Manual.origTue Apr  2 17:10:46 2013
 Manual Sat Nov 16 22:22:20 2013

[New] p5-WWW-Mechanize-GZip

2013-11-16 Thread Mike Erdely
This port is required for my next mail/p5-GetLive update.

DESCR:
The WWW::Mechanize::GZip module tries to fetch a URL by requesting
gzip-compression from the webserver.

If the response contains a header with 'Content-Encoding: gzip', it
decompresses the response in order to get the original (uncompressed)
content.

This module will help to reduce bandwith fetching webpages, if supported
by the webeserver. If the webserver does not support gzip-compression,
no decompression will be made.

This modules is a direct subclass of WWW::Mechanize and will therefore
support any methods provided by WWW::Mechanize.

The decompression is handled by Compress::Zlib::memGunzip.

There is a small webform, you can instantly test, whether a webserver
supports gzip-compression on a particular URL:
http://www.computerhandlung.de/www-mechanize-gzip.htm

ok?



p5-WWW-Mechanize-GZip.tgz
Description: application/tar-gz


[Update] mail/p5-GetLive

2013-11-16 Thread Mike Erdely
This diff requires www/p5-WWW-Mechanize-GZip (emailed to ports@).

It updates GetLive to 3.0 and supports Outlook.com.
It includes two changes checked into the project CVS but aren't in the release 
to fix login page changes on Outlook.com.

ok?

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-GetLive/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile11 Mar 2013 11:23:52 -  1.14
+++ Makefile17 Nov 2013 03:31:19 -
@@ -2,8 +2,8 @@
 
 COMMENT=   automatically fetch hotmail.com email
 
-DISTNAME=  GetLive_2_4
-PKGNAME=   p5-GetLive-2.4
+DISTNAME=  GetLive_3_0
+PKGNAME=   p5-GetLive-3.0
 PKG_ARCH=  *
 CATEGORIES=mail perl5
 EXTRACT_SUFX=  .tgz
@@ -18,7 +18,10 @@ MASTER_SITES=${MASTER_SITE_SOURCEFORGE:
 RUN_DEPENDS=   devel/p5-Net-Server \
net/curl=7.15.5 \
mail/procmail \
-   www/p5-URI
+   www/p5-HTML-Parser \
+   www/p5-URI \
+   www/p5-WWW-Mechanize-GZip \
+   www/p5-libwww
 
 NO_BUILD=  Yes
 NO_TEST=   Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-GetLive/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo20 Sep 2011 13:43:37 -  1.7
+++ distinfo17 Nov 2013 03:31:19 -
@@ -1,5 +1,2 @@
-MD5 (GetLive_2_4.tgz) = Ek4sX0pLHXsYi2BXr7hpfg==
-RMD160 (GetLive_2_4.tgz) = uLNSaPrhFmNZWNDR4nfHgJC0Rg4=
-SHA1 (GetLive_2_4.tgz) = wQC3zHR4mbNMFu3N6fabhNmsbkI=
-SHA256 (GetLive_2_4.tgz) = Wk43+E8d9tmo8iGfU5Y2b6T9i8lYGruCtLUtxUSRYtI=
-SIZE (GetLive_2_4.tgz) = 29524
+SHA256 (GetLive_3_0.tgz) = 2DPZamX49O8gkXyyheUBijY29MXvdYVk3yS4HEVwGTA=
+SIZE (GetLive_3_0.tgz) = 27311
Index: patches/patch-GetLive_pl
===
RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-GetLive_pl,v
retrieving revision 1.7
diff -u -p -r1.7 patch-GetLive_pl
--- patches/patch-GetLive_pl5 May 2011 13:37:04 -   1.7
+++ patches/patch-GetLive_pl17 Nov 2013 03:31:19 -
@@ -1,14 +1,45 @@
-Diff from GetLive CVS to incorporate Hotmail site changes.
+Diff from GetLive CVS to incorporate Outlook.com site changes.
 
 $OpenBSD: patch-GetLive_pl,v 1.7 2011/05/05 13:37:04 gsoares Exp $
 GetLive.pl.origMon May  2 14:49:46 2011
-+++ GetLive.pl Mon May  2 15:02:56 2011
-@@ -91,7 +91,7 @@ sub new {
+--- GetLive.pl.origTue Apr  2 17:10:46 2013
 GetLive.pl Sat Nov 16 22:27:39 2013
+@@ -92,7 +92,7 @@ sub new {
$Self-{'Login'} = ;
$Self-{'Domain'}= hotmail.com;
$Self-{'Password'}  = ;
 -  $Self-{'MailProcessor'} = '/usr/bin/procmail'; # Any program taking 
mbox formatted at stdin will do.
-+  $Self-{'MailProcessor'} = '${LOCALBASE}/bin/procmail'; # Any program 
taking mbox formatted at stdin will do.
++  $Self-{'MailProcessor'} = '/usr/local/bin/procmail'; # Any program 
taking mbox formatted at stdin will do.
$Self-{'DownloadedIdsFile'} = ;  # Local file with Ids 
of already downloaded messages.
$Self-{'MarkRead'}  = No;# No,Yes : But never 
when downloaded before !
$Self-{'Delete'}= No;# No,Yes : But never 
when downloaded before !
+@@ -398,6 +398,8 @@ sub GetPage {
+  
+   $Self-Log(Response headers : \n . $Response-headers_as_string(), 
MinVerbosity = 100);
+ 
++  $Self-Log(Response content : \n . $Response-content(), MinVerbosity = 
100);
++
+   return ($Response-content(),uri_unescape($Response-request-uri));
+ }
+ 
+@@ -457,16 +459,15 @@ sub Login {
+   my $Domain = $Self-{'Domain'};
+   my ($LoginUrl) = $LoginPageAsString =~ 
m{'(https://login.live.com/ppsecure/post.srf.*?)'};
+ 
+-  if ($LoginPageAsString !~ m/F:'(P.*?)'/s) {
+- $Self-Log(Page doesn't contain PPSX in the expected place.\n,stderr 
= 1);
+- return 0;
++  if ($LoginPageAsString !~ m/[F|AP]:'(P.*?)'/s) {
++$PostData{PPSX} = Pass;
++  } else {
++$Self-Log(PPSX detected as '$1'.\n, MinVerbosity = 10 );
++$PostData{PPSX} = $1;
+   }
+   
+   # End of Michael Kelly patch.
+ 
+-  $Self-Log(PPSX detected as '$1'.\n, MinVerbosity = 10 );
+-  $PostData{PPSX} = $1;
+-  
+   # PPFT is a normal (ie non JS) hidden input type.
+   if( $LoginPageAsString !~ 
m/\s*input\s+.*name=\PPFT\(\s+id=\S+)?\s+value=\(\S*)\/ ) {
+ Self-Log(Page doesn't contain input field PPFT as expected.\n,stderr 
= 1);
Index: patches/patch-Manual
===
RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-Manual,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Manual
--- patches/patch-Manual21 Jul 2010 02:21:52 -  1.4
+++ patches/patch-Manual17 Nov 2013 03:31:19 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-Manual,v 1.4 2010/07/21 02:21:52 merdely Exp $
 

[Update] mail/p5-GetLive

2013-11-16 Thread Mike Erdely
[Resending... I didn't see it hit the list]

This diff requires www/p5-WWW-Mechanize-GZip (emailed to ports@).

It updates GetLive to 3.0 and supports Outlook.com.
It includes two changes checked into the project CVS but aren't in the release 
to fix login page changes on Outlook.com.

ok?

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-GetLive/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile11 Mar 2013 11:23:52 -  1.14
+++ Makefile17 Nov 2013 03:31:19 -
@@ -2,8 +2,8 @@
 
 COMMENT=   automatically fetch hotmail.com email
 
-DISTNAME=  GetLive_2_4
-PKGNAME=   p5-GetLive-2.4
+DISTNAME=  GetLive_3_0
+PKGNAME=   p5-GetLive-3.0
 PKG_ARCH=  *
 CATEGORIES=mail perl5
 EXTRACT_SUFX=  .tgz
@@ -18,7 +18,10 @@ MASTER_SITES=${MASTER_SITE_SOURCEFORGE:
 RUN_DEPENDS=   devel/p5-Net-Server \
net/curl=7.15.5 \
mail/procmail \
-   www/p5-URI
+   www/p5-HTML-Parser \
+   www/p5-URI \
+   www/p5-WWW-Mechanize-GZip \
+   www/p5-libwww
 
 NO_BUILD=  Yes
 NO_TEST=   Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-GetLive/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo20 Sep 2011 13:43:37 -  1.7
+++ distinfo17 Nov 2013 03:31:19 -
@@ -1,5 +1,2 @@
-MD5 (GetLive_2_4.tgz) = Ek4sX0pLHXsYi2BXr7hpfg==
-RMD160 (GetLive_2_4.tgz) = uLNSaPrhFmNZWNDR4nfHgJC0Rg4=
-SHA1 (GetLive_2_4.tgz) = wQC3zHR4mbNMFu3N6fabhNmsbkI=
-SHA256 (GetLive_2_4.tgz) = Wk43+E8d9tmo8iGfU5Y2b6T9i8lYGruCtLUtxUSRYtI=
-SIZE (GetLive_2_4.tgz) = 29524
+SHA256 (GetLive_3_0.tgz) = 2DPZamX49O8gkXyyheUBijY29MXvdYVk3yS4HEVwGTA=
+SIZE (GetLive_3_0.tgz) = 27311
Index: patches/patch-GetLive_pl
===
RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-GetLive_pl,v
retrieving revision 1.7
diff -u -p -r1.7 patch-GetLive_pl
--- patches/patch-GetLive_pl5 May 2011 13:37:04 -   1.7
+++ patches/patch-GetLive_pl17 Nov 2013 03:31:19 -
@@ -1,14 +1,45 @@
-Diff from GetLive CVS to incorporate Hotmail site changes.
+Diff from GetLive CVS to incorporate Outlook.com site changes.
 
 $OpenBSD: patch-GetLive_pl,v 1.7 2011/05/05 13:37:04 gsoares Exp $
 GetLive.pl.origMon May  2 14:49:46 2011
-+++ GetLive.pl Mon May  2 15:02:56 2011
-@@ -91,7 +91,7 @@ sub new {
+--- GetLive.pl.origTue Apr  2 17:10:46 2013
 GetLive.pl Sat Nov 16 22:27:39 2013
+@@ -92,7 +92,7 @@ sub new {
$Self-{'Login'} = ;
$Self-{'Domain'}= hotmail.com;
$Self-{'Password'}  = ;
 -  $Self-{'MailProcessor'} = '/usr/bin/procmail'; # Any program taking 
mbox formatted at stdin will do.
-+  $Self-{'MailProcessor'} = '${LOCALBASE}/bin/procmail'; # Any program 
taking mbox formatted at stdin will do.
++  $Self-{'MailProcessor'} = '/usr/local/bin/procmail'; # Any program 
taking mbox formatted at stdin will do.
$Self-{'DownloadedIdsFile'} = ;  # Local file with Ids 
of already downloaded messages.
$Self-{'MarkRead'}  = No;# No,Yes : But never 
when downloaded before !
$Self-{'Delete'}= No;# No,Yes : But never 
when downloaded before !
+@@ -398,6 +398,8 @@ sub GetPage {
+  
+   $Self-Log(Response headers : \n . $Response-headers_as_string(), 
MinVerbosity = 100);
+ 
++  $Self-Log(Response content : \n . $Response-content(), MinVerbosity = 
100);
++
+   return ($Response-content(),uri_unescape($Response-request-uri));
+ }
+ 
+@@ -457,16 +459,15 @@ sub Login {
+   my $Domain = $Self-{'Domain'};
+   my ($LoginUrl) = $LoginPageAsString =~ 
m{'(https://login.live.com/ppsecure/post.srf.*?)'};
+ 
+-  if ($LoginPageAsString !~ m/F:'(P.*?)'/s) {
+- $Self-Log(Page doesn't contain PPSX in the expected place.\n,stderr 
= 1);
+- return 0;
++  if ($LoginPageAsString !~ m/[F|AP]:'(P.*?)'/s) {
++$PostData{PPSX} = Pass;
++  } else {
++$Self-Log(PPSX detected as '$1'.\n, MinVerbosity = 10 );
++$PostData{PPSX} = $1;
+   }
+   
+   # End of Michael Kelly patch.
+ 
+-  $Self-Log(PPSX detected as '$1'.\n, MinVerbosity = 10 );
+-  $PostData{PPSX} = $1;
+-  
+   # PPFT is a normal (ie non JS) hidden input type.
+   if( $LoginPageAsString !~ 
m/\s*input\s+.*name=\PPFT\(\s+id=\S+)?\s+value=\(\S*)\/ ) {
+ Self-Log(Page doesn't contain input field PPFT as expected.\n,stderr 
= 1);
Index: patches/patch-Manual
===
RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-Manual,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Manual
--- patches/patch-Manual21 Jul 2010 02:21:52 -  1.4
+++ patches/patch-Manual17 Nov 2013 03:31:19 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-Manual,v 1.4 

[New] Mac::iTunes::Library

2013-11-15 Thread Mike Erdely
This port allows you to read an iTunes Library file and do things with it.
I'm using it to dump my playlists to m3u files.

from DESCR:
This modules provides a data structure for representing a item (song,
URL, video) within an iTunes library and a collection of items to make a
library. It provides methods for parsing an iTunes XML formatted
library.

ok?



p5-Mac-iTunes-Library.tgz
Description: application/tar-gz


Re: [New] Mac::iTunes::Library

2013-11-15 Thread Mike Erdely
On Fri, Nov 15, 2013 at 11:36:36PM -0500, Mike Erdely wrote:
 
 ok?
 

And now with p5-XML-Parser as a RUN_DEPENDS.

ok?



p5-Mac-iTunes-Library.tgz
Description: application/tar-gz


Re: [was tech@] Re: httpd and nginx in base

2013-11-13 Thread Mike Erdely
On Wed, Nov 13, 2013 at 3:15 AM, Jiri B ji...@devio.us wrote:
 (I have never understand why Drupal is installed into /var/www/drupal IIRC but
 wordpress directly into /var/www/html/wordpress. Shouldn't it be unified?)

FWIW: Wordpress is installed in /var/www/wordpress and you symlink it.

-ME



Re: [Update] FreeRDP 1.0.2

2013-11-04 Thread Mike Erdely
On Mon, Aug 19, 2013 at 10:32:54AM -0400, Mike Erdely wrote:
 On Mon, Aug 19, 2013 at 10:24 AM, Stuart Henderson st...@openbsd.org wrote:
  DISTFILES=  freerdp-$V.tar.gz{$V.tar.gz}
 
 Thanks.  I'll test it out and come back with a new diff.

I finally got around to this.

ok?

Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile11 Mar 2013 11:46:09 -  1.13
+++ Makefile2 Nov 2013 13:38:06 -
@@ -2,10 +2,12 @@
 
 SHARED_ONLY =  Yes
 
+V =1.0.2
 COMMENT =  open source client for Windows Terminal Server
-DISTNAME = freerdp-1.0.1
+DISTNAME = freerdp-$V
+DISTFILES =${DISTNAME}.tar.gz{$V.tar.gz}
+WRKDIST =  ${WRKDIR}/FreeRDP-$V
 CATEGORIES =   x11 net
-REVISION = 0
 
 SHARED_LIBS +=  freerdp-cache 0.0 # 1.0
 SHARED_LIBS +=  freerdp-channels  0.0 # 1.0
@@ -24,9 +26,9 @@ MAINTAINER =  Michael Erdely merdely@op
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += X11 Xcursor Xext Xinerama Xv avcodec avutil c crypto
-WANTLIB += pthread ssl xkbfile z cups
+WANTLIB += pcsclite pthread ssl xkbfile z cups
 
-MASTER_SITES = https://github.com/downloads/FreeRDP/FreeRDP/ \
+MASTER_SITES = https://github.com/FreeRDP/FreeRDP/archive/ \
http://spacehopper.org/mirrors/
 
 MODULES =  devel/cmake
@@ -35,9 +37,11 @@ BUILD_DEPENDS =  textproc/docbook \
textproc/xmlto
 
 LIB_DEPENDS =  graphics/ffmpeg \
-   print/cups,-libs
+   print/cups,-libs \
+   security/pcsc-lite
 
-CONFIGURE_ARGS +=  -DWITH_ALSA=Off
+CONFIGURE_ARGS +=  -DWITH_ALSA=Off \
+   -DWITH_PCSC=On
 
 post-patch:
perl -pi -e 's,/usr/local,${LOCALBASE},g; s,/usr/X11R6,${X11BASE},g;' \
Index: distinfo
===
RCS file: /cvs/ports/x11/freerdp/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo24 Mar 2012 18:53:27 -  1.4
+++ distinfo3 Nov 2013 02:19:10 -
@@ -1,5 +1,2 @@
-MD5 (freerdp-1.0.1.tar.gz) = yEMYXg/yLOhAmVRlFxjzOA==
-RMD160 (freerdp-1.0.1.tar.gz) = QdrL1XjT5GU1u6NtopnFmqBo6ts=
-SHA1 (freerdp-1.0.1.tar.gz) = wTmJcF6Ydvz0jXIB8QCPSBmmFUw=
-SHA256 (freerdp-1.0.1.tar.gz) = FEF15Gpr0B7qbx9Pj8nzP4AnM7sGwfBbUIPVixHfeeA=
-SIZE (freerdp-1.0.1.tar.gz) = 3502100
+SHA256 (freerdp-1.0.2.tar.gz) = wPE333q2+3bX59MWrk4MpsrzVuW8C12tvfrepduZLfE=
+SIZE (freerdp-1.0.2.tar.gz) = 3506618
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/freerdp/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   4 Aug 2012 14:47:00 -   1.4
+++ pkg/PLIST   2 Nov 2013 13:34:58 -
@@ -106,6 +106,7 @@ lib/freerdp/rail.so
 lib/freerdp/rdpdbg.so
 lib/freerdp/rdpdr.so
 lib/freerdp/rdpsnd.so
+lib/freerdp/scard.so
 lib/freerdp/serial.so
 lib/freerdp/tsmf.so
 lib/freerdp/tsmf_ffmpeg.so



Re: [update] Wordpress 3.7.1

2013-11-02 Thread Mike Erdely
On Sat, Nov 2, 2013 at 8:50 AM, Mike Erdely m...@erdelynet.com wrote:
 The below diff updates Wordpress from 3.6.1 to 3.7.1.
   snip
 I tested this on a 3.6.1 blog and it was a smooth upgrade that didn't
 require any special attention.

I forgot to add... OK?



[Update] FreeRDP 1.0.2

2013-08-19 Thread Mike Erdely
Below is a diff for FreeRDP to 1.0.2.
Unfortunately, it seems like I have to do some dancing around the way they're 
hosting the distfiles at github.  Using the URL from the website, I get a file 
named 1.0.2.tgz.  Which, of course, extracts to FreeRDP-1.0.2 for package 
called freerdp-1.0.2.

Per request of (and with a diff from) Sergey Bronnikov estetus - at - gee-mail 
- dot - com, I enabled SmartCard support, but have no way to test it.

This works fine for me connecting to a Windows 8 system with the following 
command line:
xfreerdp --sec rdp --ignore-certificate -g 1598x883 --plugin cliprdr -u mike 
mercury

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile11 Mar 2013 11:46:09 -  1.13
+++ Makefile19 Aug 2013 13:22:45 -
@@ -2,10 +2,13 @@
 
 SHARED_ONLY =  Yes
 
+V =1.0.2
 COMMENT =  open source client for Windows Terminal Server
-DISTNAME = freerdp-1.0.1
+DISTNAME = $V
+PKGNAME =  freerdp-$V
+WRKDIST =  ${WRKDIR}/FreeRDP-$V
+DIST_SUBDIR =  freerdp
 CATEGORIES =   x11 net
-REVISION = 0
 
 SHARED_LIBS +=  freerdp-cache 0.0 # 1.0
 SHARED_LIBS +=  freerdp-channels  0.0 # 1.0
@@ -24,9 +27,9 @@ MAINTAINER =  Michael Erdely merdely@op
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += X11 Xcursor Xext Xinerama Xv avcodec avutil c crypto
-WANTLIB += pthread ssl xkbfile z cups
+WANTLIB += pcsclite pthread ssl xkbfile z cups
 
-MASTER_SITES = https://github.com/downloads/FreeRDP/FreeRDP/ \
+MASTER_SITES = https://github.com/FreeRDP/FreeRDP/archive/ \
http://spacehopper.org/mirrors/
 
 MODULES =  devel/cmake
@@ -35,9 +38,11 @@ BUILD_DEPENDS =  textproc/docbook \
textproc/xmlto
 
 LIB_DEPENDS =  graphics/ffmpeg \
-   print/cups,-libs
+   print/cups,-libs \
+   security/pcsc-lite
 
-CONFIGURE_ARGS +=  -DWITH_ALSA=Off
+CONFIGURE_ARGS +=  -DWITH_ALSA=Off \
+   -DWITH_PCSC=On
 
 post-patch:
perl -pi -e 's,/usr/local,${LOCALBASE},g; s,/usr/X11R6,${X11BASE},g;' \
Index: distinfo
===
RCS file: /cvs/ports/x11/freerdp/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo24 Mar 2012 18:53:27 -  1.4
+++ distinfo19 Aug 2013 13:22:45 -
@@ -1,5 +1,2 @@
-MD5 (freerdp-1.0.1.tar.gz) = yEMYXg/yLOhAmVRlFxjzOA==
-RMD160 (freerdp-1.0.1.tar.gz) = QdrL1XjT5GU1u6NtopnFmqBo6ts=
-SHA1 (freerdp-1.0.1.tar.gz) = wTmJcF6Ydvz0jXIB8QCPSBmmFUw=
-SHA256 (freerdp-1.0.1.tar.gz) = FEF15Gpr0B7qbx9Pj8nzP4AnM7sGwfBbUIPVixHfeeA=
-SIZE (freerdp-1.0.1.tar.gz) = 3502100
+SHA256 (freerdp/1.0.2.tar.gz) = wPE333q2+3bX59MWrk4MpsrzVuW8C12tvfrepduZLfE=
+SIZE (freerdp/1.0.2.tar.gz) = 3506618
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/freerdp/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   4 Aug 2012 14:47:00 -   1.4
+++ pkg/PLIST   19 Aug 2013 13:22:45 -
@@ -106,6 +106,7 @@ lib/freerdp/rail.so
 lib/freerdp/rdpdbg.so
 lib/freerdp/rdpdr.so
 lib/freerdp/rdpsnd.so
+lib/freerdp/scard.so
 lib/freerdp/serial.so
 lib/freerdp/tsmf.so
 lib/freerdp/tsmf_ffmpeg.so



Re: [Update] FreeRDP 1.0.2

2013-08-19 Thread Mike Erdely
On Mon, Aug 19, 2013 at 10:24 AM, Stuart Henderson st...@openbsd.org wrote:
 DISTFILES=  freerdp-$V.tar.gz{$V.tar.gz}

Thanks.  I'll test it out and come back with a new diff.

-ME



Re: security update www/worstpress

2013-06-27 Thread Mike Erdely
I already OK'd a diff from Kyrill.  I'm surprised he hasn't committed it
yet.

Thanks, Kili.


On Wed, Jun 26, 2013 at 5:13 PM, Matthias Kilian k...@outback.escape.dewrote:

 [sending again, i fatfingered ports@openbsd.org]

 Security update to presswurst-3.5.2.
 See http://codex.wordpress.org/Version_3.5.2 for details.

 ok? (i'd also like to apply this to -stable)

 Index: Makefile
 ===
 RCS file: /cvs/ports/www/wordpress/Makefile,v
 retrieving revision 1.45
 diff -u -p -r1.45 Makefile
 --- Makefile11 Mar 2013 11:44:50 -  1.45
 +++ Makefile26 Jun 2013 20:57:58 -
 @@ -2,7 +2,7 @@

  COMMENT =  standard compliant weblog

 -DISTNAME = wordpress-3.5.1
 +DISTNAME = wordpress-3.5.2
  CATEGORIES =   www

  HOMEPAGE = http://wordpress.org/
 Index: distinfo
 ===
 RCS file: /cvs/ports/www/wordpress/distinfo,v
 retrieving revision 1.36
 diff -u -p -r1.36 distinfo
 --- distinfo28 Jan 2013 21:14:09 -  1.36
 +++ distinfo26 Jun 2013 20:57:58 -
 @@ -1,2 +1,2 @@
 -SHA256 (wordpress-3.5.1.tar.gz) =
 99YnvIhurHWq4i5Sas296iRKEqkvAuYIS6UZPUsNepc=
 -SIZE (wordpress-3.5.1.tar.gz) = 5012722
 +SHA256 (wordpress-3.5.2.tar.gz) =
 TM6Zw/skXbjrv9Hx93cqGxMqMqvdFIOism+sxX7mUrE=
 +SIZE (wordpress-3.5.2.tar.gz) = 4988077
 Index: pkg/PLIST
 ===
 RCS file: /cvs/ports/www/wordpress/pkg/PLIST,v
 retrieving revision 1.22
 diff -u -p -r1.22 PLIST
 --- pkg/PLIST   28 Jan 2013 21:14:09 -  1.22
 +++ pkg/PLIST   26 Jun 2013 20:57:59 -
 @@ -842,7 +842,6 @@ wordpress/wp-includes/js/swfupload/plugi
  wordpress/wp-includes/js/swfupload/plugins/swfupload.queue.js
  wordpress/wp-includes/js/swfupload/plugins/swfupload.speed.js
  wordpress/wp-includes/js/swfupload/plugins/swfupload.swfobject.js
 -wordpress/wp-includes/js/swfupload/swfupload-all.js
  wordpress/wp-includes/js/swfupload/swfupload.js
  wordpress/wp-includes/js/swfupload/swfupload.swf
  wordpress/wp-includes/js/thickbox/



Re: security update www/worstpress

2013-06-27 Thread Mike Erdely
He has.  Sorry I butchered your name, Kirill.


On Thu, Jun 27, 2013 at 5:00 PM, Mike Erdely merd...@openbsd.org wrote:

 I already OK'd a diff from Kyrill.  I'm surprised he hasn't committed it
 yet.

 Thanks, Kili.


 On Wed, Jun 26, 2013 at 5:13 PM, Matthias Kilian 
 k...@outback.escape.dewrote:

 [sending again, i fatfingered ports@openbsd.org]

 Security update to presswurst-3.5.2.
 See http://codex.wordpress.org/Version_3.5.2 for details.

 ok? (i'd also like to apply this to -stable)

 Index: Makefile
 ===
 RCS file: /cvs/ports/www/wordpress/Makefile,v
 retrieving revision 1.45
 diff -u -p -r1.45 Makefile
 --- Makefile11 Mar 2013 11:44:50 -  1.45
 +++ Makefile26 Jun 2013 20:57:58 -
 @@ -2,7 +2,7 @@

  COMMENT =  standard compliant weblog

 -DISTNAME = wordpress-3.5.1
 +DISTNAME = wordpress-3.5.2
  CATEGORIES =   www

  HOMEPAGE = http://wordpress.org/
 Index: distinfo
 ===
 RCS file: /cvs/ports/www/wordpress/distinfo,v
 retrieving revision 1.36
 diff -u -p -r1.36 distinfo
 --- distinfo28 Jan 2013 21:14:09 -  1.36
 +++ distinfo26 Jun 2013 20:57:58 -
 @@ -1,2 +1,2 @@
 -SHA256 (wordpress-3.5.1.tar.gz) =
 99YnvIhurHWq4i5Sas296iRKEqkvAuYIS6UZPUsNepc=
 -SIZE (wordpress-3.5.1.tar.gz) = 5012722
 +SHA256 (wordpress-3.5.2.tar.gz) =
 TM6Zw/skXbjrv9Hx93cqGxMqMqvdFIOism+sxX7mUrE=
 +SIZE (wordpress-3.5.2.tar.gz) = 4988077
 Index: pkg/PLIST
 ===
 RCS file: /cvs/ports/www/wordpress/pkg/PLIST,v
 retrieving revision 1.22
 diff -u -p -r1.22 PLIST
 --- pkg/PLIST   28 Jan 2013 21:14:09 -  1.22
 +++ pkg/PLIST   26 Jun 2013 20:57:59 -
 @@ -842,7 +842,6 @@ wordpress/wp-includes/js/swfupload/plugi
  wordpress/wp-includes/js/swfupload/plugins/swfupload.queue.js
  wordpress/wp-includes/js/swfupload/plugins/swfupload.speed.js
  wordpress/wp-includes/js/swfupload/plugins/swfupload.swfobject.js
 -wordpress/wp-includes/js/swfupload/swfupload-all.js
  wordpress/wp-includes/js/swfupload/swfupload.js
  wordpress/wp-includes/js/swfupload/swfupload.swf
  wordpress/wp-includes/js/thickbox/





Re: New: mail/minimalist

2013-06-18 Thread Mike Erdely
If only there were some project with a release cycle you could emulate... :)


On Tue, Jun 18, 2013 at 11:44 AM, Christopher Zimmermann 
madro...@gmerlin.de wrote:

 On Tue, 18 Jun 2013 18:04:22 +0100
 Stuart Henderson st...@openbsd.org wrote:

  On 2013/06/18 18:46, Peter Hessler wrote:
   On 2013 Jun 18 (Tue) at 17:40:06 +0200 (+0200), Christopher
   Zimmermann wrote: :Hi,
   :
   :this has been rotting in openbsd-wip for quite some time now. But
   since :some people seem to be actually using it I updated it and
   propose it :for inclusion in the official ports tree.
   :I adopted this project from Vladimir Litovka who has abandoned it
   and :improved it security wise.
   :Because I don't plan to add new features, only to fix bugs I have
   no :real scheme for releases and versioning numbers, so I figured
   it would :probably be best to version it by date. Is this sensible?
   OK for commit? :
  
  
   Please use PKGNAME = minimalist-0.0.${DATE} so if they ever do
   real releases, we don't need EPOCH.
 
  Better still Christopher, since you're upstream anyway, how about
  rolling a real release :-)

 I did a release 3.0 and 3.1, but since I will only do bugfixes, what
 sense is there in doing a release for every bug I fix?
 This is no rhetorical question. I really am looking for input on this
 matter. If I do releases how do I decide when...



[update] check_esxi_hardware - minor update

2013-04-24 Thread Mike Erdely
This diff updates check_esxi_hardware to the latest version.
It adds System Board 1 LCD Cable Pres 0: Connected to the list of
things that fall under:
As long as Dell doesnt correct these CIM elements return code we have
to ignore it

ok?

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile11 Mar 2013 11:35:49 -  1.6
+++ Makefile24 Apr 2013 13:09:00 -
@@ -4,7 +4,7 @@ PKG_ARCH =  *
 
 COMMENT =  Nagios plugin to the status of ESX/i hardware
 
-V =20121027
+V =20130424
 DISTNAME = check_esxi_hardware.py.$V
 PKGNAME =  check_esxi_hardware-$V
 CATEGORIES =   net
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo4 Nov 2012 21:44:43 -   1.4
+++ distinfo24 Apr 2013 13:09:00 -
@@ -1,2 +1,2 @@
-SHA256 (check_esxi_hardware.py.20121027) = 
nvJ3Z71rkLVUF8Q4qnNIdLEyXFOcBsIEl4hjnt9gPo4=
-SIZE (check_esxi_hardware.py.20121027) = 31364
+SHA256 (check_esxi_hardware.py.20130424) = 
+cwh2ayrctLEAzaNIupVq64XtOM1mT5Zvj5y9bf19VE=
+SIZE (check_esxi_hardware.py.20130424) = 31654



Re: UPDATE: net/ngircd

2013-01-19 Thread Mike Erdely
On Sat, Jan 19, 2013 at 11:07 AM, Federico G. Schwindt fg...@lodoss.net wrote:
 Update to ngircd 20.1. Tested on i386.
 OK?

Tested on amd64.  ok merdely.



[update] wordpress 3.5

2012-12-13 Thread Mike Erdely
This diff updates Wordpress to 3.5.  Tested an upgrade from the previous
version on amd64 with no issues.

Testers? oks?

-ME

Index: Makefile
===
RCS file: /cvs/ports/www/wordpress/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile1 Oct 2012 12:03:42 -   1.42
+++ Makefile13 Dec 2012 16:25:41 -
@@ -2,7 +2,7 @@
 
 COMMENT =  standard compliant weblog
 
-DISTNAME = wordpress-3.4.2
+DISTNAME = wordpress-3.5
 CATEGORIES =   www
 
 HOMEPAGE = http://wordpress.org/
Index: distinfo
===
RCS file: /cvs/ports/www/wordpress/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo1 Oct 2012 12:03:42 -   1.34
+++ distinfo13 Dec 2012 16:33:24 -
@@ -1,2 +1,2 @@
-SHA256 (wordpress-3.4.2.tar.gz) = 5prMa2/b/8Fm/ZbyJk1Xi0lE7z5FHrllDoynlbZl7rA=
-SIZE (wordpress-3.4.2.tar.gz) = 4538716
+SHA256 (wordpress-3.5.tar.gz) = 3vHQlNvT/MUiCNTmOuTDGQHf2X6bTNYZt9AX/TQpcqs=
+SIZE (wordpress-3.5.tar.gz) = 5009441
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/wordpress/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST   10 Sep 2012 09:16:34 -  1.20
+++ pkg/PLIST   13 Dec 2012 16:37:01 -
@@ -17,29 +17,33 @@ wordpress/wp-admin/async-upload.php
 wordpress/wp-admin/comment.php
 wordpress/wp-admin/credits.php
 wordpress/wp-admin/css/
+wordpress/wp-admin/css/color-picker-rtl.css
+wordpress/wp-admin/css/color-picker-rtl.min.css
+wordpress/wp-admin/css/color-picker.css
+wordpress/wp-admin/css/color-picker.min.css
 wordpress/wp-admin/css/colors-classic.css
-wordpress/wp-admin/css/colors-classic.dev.css
+wordpress/wp-admin/css/colors-classic.min.css
 wordpress/wp-admin/css/colors-fresh.css
-wordpress/wp-admin/css/colors-fresh.dev.css
+wordpress/wp-admin/css/colors-fresh.min.css
 wordpress/wp-admin/css/customize-controls-rtl.css
-wordpress/wp-admin/css/customize-controls-rtl.dev.css
+wordpress/wp-admin/css/customize-controls-rtl.min.css
 wordpress/wp-admin/css/customize-controls.css
-wordpress/wp-admin/css/customize-controls.dev.css
+wordpress/wp-admin/css/customize-controls.min.css
 wordpress/wp-admin/css/farbtastic.css
 wordpress/wp-admin/css/ie-rtl.css
-wordpress/wp-admin/css/ie-rtl.dev.css
+wordpress/wp-admin/css/ie-rtl.min.css
 wordpress/wp-admin/css/ie.css
-wordpress/wp-admin/css/ie.dev.css
+wordpress/wp-admin/css/ie.min.css
 wordpress/wp-admin/css/install.css
-wordpress/wp-admin/css/install.dev.css
+wordpress/wp-admin/css/install.min.css
 wordpress/wp-admin/css/media-rtl.css
-wordpress/wp-admin/css/media-rtl.dev.css
+wordpress/wp-admin/css/media-rtl.min.css
 wordpress/wp-admin/css/media.css
-wordpress/wp-admin/css/media.dev.css
+wordpress/wp-admin/css/media.min.css
 wordpress/wp-admin/css/wp-admin-rtl.css
-wordpress/wp-admin/css/wp-admin-rtl.dev.css
+wordpress/wp-admin/css/wp-admin-rtl.min.css
 wordpress/wp-admin/css/wp-admin.css
-wordpress/wp-admin/css/wp-admin.dev.css
+wordpress/wp-admin/css/wp-admin.min.css
 wordpress/wp-admin/custom-background.php
 wordpress/wp-admin/custom-header.php
 wordpress/wp-admin/customize.php
@@ -52,104 +56,88 @@ wordpress/wp-admin/edit-tags.php
 wordpress/wp-admin/edit.php
 wordpress/wp-admin/export.php
 wordpress/wp-admin/freedoms.php
-wordpress/wp-admin/gears-manifest.php
 wordpress/wp-admin/images/
+wordpress/wp-admin/images/align-center-2x.png
 wordpress/wp-admin/images/align-center.png
+wordpress/wp-admin/images/align-left-2x.png
 wordpress/wp-admin/images/align-left.png
+wordpress/wp-admin/images/align-none-2x.png
 wordpress/wp-admin/images/align-none.png
+wordpress/wp-admin/images/align-right-2x.png
 wordpress/wp-admin/images/align-right.png
-wordpress/wp-admin/images/archive-link.png
+wordpress/wp-admin/images/arrows-2x.png
+wordpress/wp-admin/images/arrows-dark-2x.png
+wordpress/wp-admin/images/arrows-dark-vs-2x.png
 wordpress/wp-admin/images/arrows-dark-vs.png
 wordpress/wp-admin/images/arrows-dark.png
+wordpress/wp-admin/images/arrows-vs-2x.png
 wordpress/wp-admin/images/arrows-vs.png
 wordpress/wp-admin/images/arrows.png
-wordpress/wp-admin/images/blue-grad.png
+wordpress/wp-admin/images/bubble_bg-2x.gif
+wordpress/wp-admin/images/bubble_bg-rtl-2x.gif
 wordpress/wp-admin/images/bubble_bg-rtl.gif
 wordpress/wp-admin/images/bubble_bg.gif
-wordpress/wp-admin/images/button-grad-active.png
-wordpress/wp-admin/images/button-grad.png
+wordpress/wp-admin/images/comment-grey-bubble-2x.png
 wordpress/wp-admin/images/comment-grey-bubble.png
+wordpress/wp-admin/images/date-button-2x.gif
 wordpress/wp-admin/images/date-button.gif
-wordpress/wp-admin/images/ed-bg-vs.gif
-wordpress/wp-admin/images/ed-bg.gif
-wordpress/wp-admin/images/fade-butt.png
-wordpress/wp-admin/images/fav-arrow-rtl.gif
-wordpress/wp-admin/images/fav-arrow.gif
-wordpress/wp-admin/images/fav-vs.png

Re: Update: check_esxi_hardware 20121027

2012-11-03 Thread Mike Erdely
Anyone use this?

On Wed, Oct 31, 2012 at 12:53:57PM -0400, Mike Erdely wrote:
 This diff works for me on ESXi 5.0 on my PE 840.
 
 While I don't have the hardware mentioned here:
 http://www.claudiokuenzler.com/blog/299/check_esxi_hardware_dell-pe-620-workaround-riser-config-err-connected
 it doesn't introduce regressions for me on my hardware.
 
 OK?

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile5 Jul 2012 14:39:10 -   1.4
+++ Makefile31 Oct 2012 16:51:24 -
@@ -4,8 +4,7 @@ PKG_ARCH =  *
 
 COMMENT =  Nagios plugin to the status of ESX/i hardware
 
-V =20120501
-REVISION = 0
+V =20121027
 DISTNAME = check_esxi_hardware.py.$V
 PKGNAME =  check_esxi_hardware-$V
 CATEGORIES =   net
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo1 May 2012 15:32:20 -   1.3
+++ distinfo31 Oct 2012 16:51:24 -
@@ -1,5 +1,2 @@
-MD5 (check_esxi_hardware.py.20120501) = qdw9TyODPMmxwSUgG5QlMw==
-RMD160 (check_esxi_hardware.py.20120501) = mCdVWmX6bTl0J50QSiRcLCdj658=
-SHA1 (check_esxi_hardware.py.20120501) = BdZMgOBObDfj7A0viTQLj+Nc//Q=
-SHA256 (check_esxi_hardware.py.20120501) = 
hB0WMKngjg8f18SGYvuIGLP9KhdZx3OHQjEibg7+xTw=
-SIZE (check_esxi_hardware.py.20120501) = 30735
+SHA256 (check_esxi_hardware.py.20121027) = 
nvJ3Z71rkLVUF8Q4qnNIdLEyXFOcBsIEl4hjnt9gPo4=
+SIZE (check_esxi_hardware.py.20121027) = 31364



Update: check_esxi_hardware 20121027

2012-10-31 Thread Mike Erdely
This diff works for me on ESXi 5.0 on my PE 840.

While I don't have the hardware mentioned here:
http://www.claudiokuenzler.com/blog/299/check_esxi_hardware_dell-pe-620-workaround-riser-config-err-connected
it doesn't introduce regressions for me on my hardware.

OK?

Index: Makefile
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile5 Jul 2012 14:39:10 -   1.4
+++ Makefile31 Oct 2012 16:51:24 -
@@ -4,8 +4,7 @@ PKG_ARCH =  *
 
 COMMENT =  Nagios plugin to the status of ESX/i hardware
 
-V =20120501
-REVISION = 0
+V =20121027
 DISTNAME = check_esxi_hardware.py.$V
 PKGNAME =  check_esxi_hardware-$V
 CATEGORIES =   net
Index: distinfo
===
RCS file: /cvs/ports/net/nagios/check_esxi_hardware/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo1 May 2012 15:32:20 -   1.3
+++ distinfo31 Oct 2012 16:51:24 -
@@ -1,5 +1,2 @@
-MD5 (check_esxi_hardware.py.20120501) = qdw9TyODPMmxwSUgG5QlMw==
-RMD160 (check_esxi_hardware.py.20120501) = mCdVWmX6bTl0J50QSiRcLCdj658=
-SHA1 (check_esxi_hardware.py.20120501) = BdZMgOBObDfj7A0viTQLj+Nc//Q=
-SHA256 (check_esxi_hardware.py.20120501) = 
hB0WMKngjg8f18SGYvuIGLP9KhdZx3OHQjEibg7+xTw=
-SIZE (check_esxi_hardware.py.20120501) = 30735
+SHA256 (check_esxi_hardware.py.20121027) = 
nvJ3Z71rkLVUF8Q4qnNIdLEyXFOcBsIEl4hjnt9gPo4=
+SIZE (check_esxi_hardware.py.20121027) = 31364



Re: CVS: cvs.openbsd.org: ports

2012-10-01 Thread Mike Erdely
On Mon, Oct 1, 2012 at 8:03 AM, Gonzalo L. Rodriguez
gonz...@cvs.openbsd.org wrote:
 CVSROOT:/cvs
 Module name:ports
 Changes by: gonz...@cvs.openbsd.org 2012/10/01 06:03:42

 Modified files:
 www/wordpress  : Makefile distinfo

 Log message:
 Update for Wordpress to 3.4.2
 Tested on i386.

And amd64.



Re: FULLPKGNAME incorrectly expanded for bacula-client

2012-07-16 Thread Mike Erdely
On Mon, Jul 16, 2012 at 7:25 AM, Stuart Henderson s...@spacehopper.org wrote:
 FULLPKGNAME *is* expanded correctly, but it's not what we want here.
 OK with you Mike?

OK with me.



Re: NEW: devel/p5-Proc-PID-File

2012-07-13 Thread Mike Erdely
On Fri, Jul 13, 2012 at 7:32 AM, Sebastian Reitenbach
sebas...@l00-bugdead-prods.de wrote:
 This module is useful for writers of daemons and other processes that
 need to tell whether they are already running, in order to prevent
 multiple process instances. The module accomplishes this via *nix-style
 pidfiles, which are files that store a process identifier.

 tested on i386 and macppc.

 I'd need it as dependency of the ocsinventory-agent which will follow in a 
 separate mail.

 OK?

Light testing on amd64.  OK merdely.



Re: graphics/ImageMagick: pthread linking problem

2012-07-05 Thread Mike Erdely
On Wed, Jul 4, 2012 at 2:39 AM, Benjamin Marsili mlspira...@gmail.com wrote:
 On 03/07/2012 21:00, Stuart Henderson wrote:
 ruby18 isn't linked with -pthread, your LD_PRELOAD workaround is ok,
 or you could use ruby19 if this works with all the modules you need
 as this is linked with -pthread.

 Alright, thanks. I will stick with LD_PRELOAD for the time being. I don't
 know how it will work with apache or lighttpd though, I had to use this
 workaround when launching the standalone webrick http server shipped with
 redmine.

FWIW: I ran into this problem with a snapshot.  So, I thought it was
related to packages not being in sync.  I then built a 5.1 system to
run Redmine.  I found the same problem with 5.1.  Then, I upgraded to
ruby19, ran the bundle19 command to install Redmine's gems.  I don't
have the problem any more and 1.9 works with Redmine.

Also, I'm running Redmine on Passenger on Nginx.

-ME



Re: CVS: cvs.openbsd.org: ports

2012-06-28 Thread Mike Erdely
On Thu, Jun 28, 2012 at 3:24 PM, Antoine Jacoutot
ajacou...@cvs.openbsd.org wrote:
 Why do all chio(1) behave differently!!!???

The main problem I saw (and had started trying to work on a couple
years ago) is that FreeBSD's chio and mtx on Linux remember which slot
the tape should go back to when it's in the drive.  And the
{mtx,chio}-changer scripts rely on that in some cases.

At least I think.  It's been a few years since I had that itch to scratch.

-ME



Re: php-pgsql is where in the ports tree?

2012-06-27 Thread Mike Erdely
On Wed, Jun 27, 2012 at 2:48 PM, Fred Snurd fredsn...@yahoo.com wrote:
 MediaWiki's Website now mentions PostgreSQL support more prominently on their 
 requirements page than in the past:
snip
 ...mentions php-pgsql as being the necessary connector to PostgreSQL, but I'm 
 not finding it in the ports tree.  Where is it?

$ pkg_info -Q php-pgsql
php-pgsql-5.2.17p5
php-pgsql-5.3.13



Re: php-pgsql is where in the ports tree?

2012-06-27 Thread Mike Erdely
On Wed, Jun 27, 2012 at 3:06 PM, Fred Snurd fredsn...@yahoo.com wrote:
 On Wed, Jun 27, 2012 at 11:57 AM, Mike Erdely m...@erdelynet.com wrote:


 $ pkg_info -Q php-pgsql
 php-pgsql-5.2.17p5
 php-pgsql-5.3.13

 Thank you for pointing out the packages, but I'm wanting to know where this 
 is in the ports tree so I can build it myself.  What is it?

/usr/ports/lang/php



p5-Test-Reporter-1.58

2012-04-14 Thread Mike Erdely
Attached diff updated p5-Test-Reporter to 1.58 and removes USE_GROFF.

ok?

Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Test-Reporter/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile3 Dec 2010 11:44:37 -   1.6
+++ Makefile14 Apr 2012 19:15:24 -
@@ -3,10 +3,8 @@
 COMMENT=   sends test results to cpan-test...@perl.org
 
 MODULES=   cpan
-DISTNAME=  Test-Reporter-1.5201
-REVISION=  0
+DISTNAME=  Test-Reporter-1.58
 CATEGORIES=devel
-USE_GROFF =Yes
 
 # perl
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Test-Reporter/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo8 Oct 2008 22:27:06 -   1.4
+++ distinfo14 Apr 2012 19:15:37 -
@@ -1,5 +1,5 @@
-MD5 (Test-Reporter-1.5201.tar.gz) = SRG5pTWoYSvYhQ15ecz8zg==
-RMD160 (Test-Reporter-1.5201.tar.gz) = nHneY/Radr5dHuHfstFOSWSj5y4=
-SHA1 (Test-Reporter-1.5201.tar.gz) = GZd/HS9mlziQEaii+6hYKSsTbco=
-SHA256 (Test-Reporter-1.5201.tar.gz) = 
AxF0xxBD7HRsR3vosGZMB6VD51gILBF3yDliDQ8EPgo=
-SIZE (Test-Reporter-1.5201.tar.gz) = 40650
+MD5 (Test-Reporter-1.58.tar.gz) = Uu9UceKOpEHAI5YGsbuT5g==
+RMD160 (Test-Reporter-1.58.tar.gz) = uGhwI6FSv8HF/mzNqmPssi/I7o8=
+SHA1 (Test-Reporter-1.58.tar.gz) = CPlQlDcaG5LNOnrFmXLiqj3BQLA=
+SHA256 (Test-Reporter-1.58.tar.gz) = 
xbQg9YoLjehgS3Aw0DXRSwgxB1pDYb/X2yPssZcGQS8=
+SIZE (Test-Reporter-1.58.tar.gz) = 41477
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-Test-Reporter/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   8 Oct 2008 22:27:06 -   1.3
+++ pkg/PLIST   14 Apr 2012 19:16:46 -
@@ -1,23 +1,12 @@
 @comment $OpenBSD: PLIST,v 1.3 2008/10/08 22:27:06 simon Exp $
-bin/cpantest
 ${P5SITE}/Test/
 ${P5SITE}/Test/Reporter/
 ${P5SITE}/Test/Reporter.pm
 ${P5SITE}/Test/Reporter/Transport/
 ${P5SITE}/Test/Reporter/Transport.pm
 ${P5SITE}/Test/Reporter/Transport/File.pm
-${P5SITE}/Test/Reporter/Transport/HTTPGateway.pm
-${P5SITE}/Test/Reporter/Transport/Mail/
-${P5SITE}/Test/Reporter/Transport/Mail/Send.pm
-${P5SITE}/Test/Reporter/Transport/Net/
-${P5SITE}/Test/Reporter/Transport/Net/SMTP/
-${P5SITE}/Test/Reporter/Transport/Net/SMTP.pm
-${P5SITE}/Test/Reporter/Transport/Net/SMTP/TLS.pm
-@man man/man1/cpantest.1
+${P5SITE}/Test/Reporter/Transport/Null.pm
 @man man/man3p/Test::Reporter.3p
 @man man/man3p/Test::Reporter::Transport.3p
 @man man/man3p/Test::Reporter::Transport::File.3p
-@man man/man3p/Test::Reporter::Transport::HTTPGateway.3p
-@man man/man3p/Test::Reporter::Transport::Mail::Send.3p
-@man man/man3p/Test::Reporter::Transport::Net::SMTP.3p
-@man man/man3p/Test::Reporter::Transport::Net::SMTP::TLS.3p
+@man man/man3p/Test::Reporter::Transport::Null.3p



[update] svnbook-1.7

2012-04-05 Thread Mike Erdely
The attached diff updates books/svnbook to 1.7.
The only changes to the Makefile before adding the space before each
= looked like this:

--- Makefile15 Nov 2010 12:47:38 -  1.5
+++ Makefile6 Apr 2012 04:18:13 -
@@ -2,10 +2,9 @@

 COMMENT=   Version Control with Subversion

-V= 1.5
+V= 1.7
 DISTNAME=  svn-book-html-chunk
 PKGNAME=   svnbook-${V}
-REVISION=  0
 CATEGORIES=books devel

 HOMEPAGE=  http://svnbook.red-bean.com/

ok?

-ME


svnbook.diff
Description: Binary data


[update] Kermit 9

2012-04-05 Thread Mike Erdely
Attached is a diff to update to Kermit 9.
Some links are updated from columbia.edu to kermitproject.org.

No need for USE_GROFF.
License is now a 3-clause BSD license.

ok?

I included adding a space before = in the Makefile.  But here's the
diff for Makefile before those changes:

Index: Makefile
===
RCS file: /cvs/ports/comms/kermit/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile18 Oct 2010 16:57:48 -  1.28
+++ Makefile6 Apr 2012 05:08:38 -
@@ -2,19 +2,20 @@

 COMMENT=   serial and network communications package

-PKGNAME=   kermit-8.0.211
-DISTNAME=  cku211
+PKGNAME=   kermit-9.0.302
+DISTNAME=  cku302
 CATEGORIES=comms
-HOMEPAGE=  http://www.kermit-project.org/
+HOMEPAGE=  http://www.kermitproject.org/

-PERMIT_PACKAGE_CDROM=  discriminatory license
+# THE C-KERMIT 9.0 LICENSE (Revised 3-Clause BSD License)
+PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=discriminatory license
+PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
+
 WANTLIB=   c curses m util

-MASTER_SITES=  ftp://kermit.columbia.edu/kermit/archives/ \
-   ftp://ftp.icm.edu.pl/pub/kermit/archives/
+MASTER_SITES=  ftp://ftp.kermitproject.org/kermit/archives/

 WRKDIST=   ${WRKDIR}

@@ -26,12 +27,12 @@ MAKE_FLAGS= KTARGET=openbsd CC=${CC} C
-DCKHTTP \
LIBS=-lcurses -lutil -lm

-USE_GROFF =Yes
 NO_REGRESS=Yes

 DOCDIR=${PREFIX}/share/doc/kermit
-DOCS=  COPYING.TXT ck.txt ckcbwr.txt ckccfg.txt ckcplm.txt \
-   ckermit70.txt ckermit80.txt ckubwr.txt ckuins.txt ckututor.txt
+DOCS=  COPYING.TXT ck.txt ckcbwr.txt ckc302.txt ckccfg.txt \
+   ckcplm.txt ckermit70.txt ckermit80.txt ckermit90.txt \
+   ckubwr.txt ckuins.txt ckututor.txt
 EXAMPLEDIR=${PREFIX}/share/examples/kermit

 do-install:
@@ -42,7 +43,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/$$file ${DOCDIR}; \
done
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-   ${INSTALL_DATA} ${WRKSRC}/ckermit.ini ${EXAMPLEDIR}/dot.kermrc
-   ${INSTALL_DATA} ${WRKSRC}/ckermod.ini ${EXAMPLEDIR}/dot.mykermrc
+   ${INSTALL_DATA} ${WRKSRC}/ockermit.ini ${EXAMPLEDIR}/dot.kermrc
+   ${INSTALL_DATA} ${WRKSRC}/ockermod.ini ${EXAMPLEDIR}/dot.mykermrc

 .include bsd.port.mk


kermit9.diff
Description: Binary data


Re: [NEW] devel/py-wbem

2012-03-30 Thread Mike Erdely
On Fri, Mar 30, 2012 at 5:37 PM, Stuart Henderson st...@openbsd.org wrote:
 On 2012/03/30 00:42, Mike Erdely wrote:
 Stu: This is OK with me.  Please commit.  This works with the port I'm
 about to forward to the list for OK (check_esxi_hardware).

 This leaves root-owned files around so that make clean doesn't work,
 I forgot the way to fix this, anyone remember?

So far I've only found this:
http://marc.info/?l=openbsd-portsm=97000358227988w=2

marc@ found this problem a while ago, but I haven't seen any answer
yet.  Still looking.

 (And for some unknown reason python wants to rebuild
 /usr/local/lib/python2.7/email/mime/__init__.pyc which systrace
 prevents; looks unrelated to py-wbem but does anyone have a clue
 about this?)



Re: [NEW] devel/py-wbem

2012-03-29 Thread Mike Erdely
On Mon, Jan 2, 2012 at 11:23 PM, Mark Peoples ma...@azbsd.org wrote:
 On Sun, Dec 18, 2011 at 08:04:40PM -0500, Mark Peoples wrote:
 PyWBEM is a Python library for making CIM operations over HTTP using the 
 WBEM CIM-XML protocol

 (speaking CIM through this is a first step to pulling vsphere 5 data into 
 nagios. helpful if you don't want to drop $495 just to be able to do snmp 
 gets)

 patch to setup.py forces setuptools over distutils (ala x11/py-kiwi)

 re-rolled with sthen's Makefile tweaks

Stu: This is OK with me.  Please commit.  This works with the port I'm
about to forward to the list for OK (check_esxi_hardware).

-ME



[new] check_esxi_hardware

2012-03-29 Thread Mike Erdely
Attached is a port to check the general health of of an ESX/i server.
Tested on a Dell PE 840 running ESXi 5 with the py-wbem port submitted
by Mark Peoples.

I've also attached the distfile as a tarball since the author releases
the script as an unversioned Python script on his website.  I'm hoping
Stu (or someone) can host the distfile.

check_esxi_hardware.tgz = port
check_esxi_hardware-20111003.tar.gz = distfile

OK?

-ME


check_esxi_hardware.tgz
Description: GNU Zip compressed data


check_esxi_hardware-20111003.tar.gz
Description: GNU Zip compressed data


Wordpress 3.3.1

2012-01-24 Thread Mike Erdely
This updates Wordpress to 3.3.1.  I've been running it for a few weeks
with no issue.

ok?

-ME


wp331.diff
Description: Binary data


Re: Update: Firefox 9.0 and Firefox 3.6.25

2011-12-20 Thread Mike Erdely
2011/12/20 Nigel Taylor njtay...@asterisk.demon.co.uk:
 Required are the databases/sqlite3 update to 3.7.9,
 and the www/mozilla update to mozilla.port.mk. Also attached.

 For details for Firefox 9.0
 http://www.mozilla.org/en-US/firefox/9.0/releasenotes/

Working OK for me on amd64 so far.



[Update] Wordpress 3.2.1

2011-10-14 Thread Mike Erdely
Diff attached.
Updates to 3.2.1.  I tested on amd64 and tested an update from 3.1.2
with no problems.

ok?

-ME
Index: Makefile
===
RCS file: /cvs/ports/www/wordpress/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile	16 Sep 2011 12:00:09 -	1.35
+++ Makefile	14 Oct 2011 09:59:55 -
@@ -2,8 +2,7 @@
 
 COMMENT =	standard compliant weblog
 
-DISTNAME =	wordpress-3.1.2
-REVISION =	2
+DISTNAME =	wordpress-3.2.1
 CATEGORIES =	www
 
 HOMEPAGE =	http://wordpress.org/
Index: distinfo
===
RCS file: /cvs/ports/www/wordpress/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo	2 May 2011 19:15:44 -	1.29
+++ distinfo	14 Oct 2011 10:00:20 -
@@ -1,5 +1,5 @@
-MD5 (wordpress-3.1.2.tar.gz) = ot7k3xz14VOf+6LaSabPpw==
-RMD160 (wordpress-3.1.2.tar.gz) = pvitxRnuc5nPPwqjo3lLeJq2mf0=
-SHA1 (wordpress-3.1.2.tar.gz) = NaURy+4wwbrM7LBlBXO2sFj0Yzk=
-SHA256 (wordpress-3.1.2.tar.gz) = nK0BrEZhHYhf+l1VY2wkDNoXRi5bpMMdebAF8101ryc=
-SIZE (wordpress-3.1.2.tar.gz) = 2764136
+MD5 (wordpress-3.2.1.tar.gz) = fcJjgYY3liuC3uwEuG26xg==
+RMD160 (wordpress-3.2.1.tar.gz) = p48a7A0ULh3jLyFP1lrCrvJWl50=
+SHA1 (wordpress-3.2.1.tar.gz) = Z0vPCr6AdwrAjftMXyHfMwO/dxo=
+SHA256 (wordpress-3.2.1.tar.gz) = IePOvQKAj57jmpedIubhC85TVt33BorvGChHsSyblak=
+SIZE (wordpress-3.2.1.tar.gz) = 3607522
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/wordpress/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST	25 Mar 2011 03:20:42 -	1.16
+++ pkg/PLIST	14 Oct 2011 10:13:28 -
@@ -14,6 +14,7 @@ wordpress/wp-admin/admin-post.php
 wordpress/wp-admin/admin.php
 wordpress/wp-admin/async-upload.php
 wordpress/wp-admin/comment.php
+wordpress/wp-admin/credits.php
 wordpress/wp-admin/css/
 wordpress/wp-admin/css/colors-classic-rtl.css
 wordpress/wp-admin/css/colors-classic-rtl.dev.css
@@ -89,6 +90,7 @@ wordpress/wp-admin/edit-tag-form.php
 wordpress/wp-admin/edit-tags.php
 wordpress/wp-admin/edit.php
 wordpress/wp-admin/export.php
+wordpress/wp-admin/freedoms.php
 wordpress/wp-admin/gears-manifest.php
 wordpress/wp-admin/images/
 wordpress/wp-admin/images/align-center.png
@@ -96,6 +98,10 @@ wordpress/wp-admin/images/align-left.png
 wordpress/wp-admin/images/align-none.png
 wordpress/wp-admin/images/align-right.png
 wordpress/wp-admin/images/archive-link.png
+wordpress/wp-admin/images/arrows-dark-vs.png
+wordpress/wp-admin/images/arrows-dark.png
+wordpress/wp-admin/images/arrows-vs.png
+wordpress/wp-admin/images/arrows.png
 wordpress/wp-admin/images/blue-grad.png
 wordpress/wp-admin/images/bubble_bg-rtl.gif
 wordpress/wp-admin/images/bubble_bg.gif
@@ -112,6 +118,7 @@ wordpress/wp-admin/images/fav-vs.png
 wordpress/wp-admin/images/fav.png
 wordpress/wp-admin/images/generic.png
 wordpress/wp-admin/images/gray-grad.png
+wordpress/wp-admin/images/gray-star.png
 wordpress/wp-admin/images/icons32-vs.png
 wordpress/wp-admin/images/icons32.png
 wordpress/wp-admin/images/imgedit-icons.png
@@ -119,7 +126,7 @@ wordpress/wp-admin/images/list.png
 wordpress/wp-admin/images/loading-publish.gif
 wordpress/wp-admin/images/loading.gif
 wordpress/wp-admin/images/logo-ghost.png
-wordpress/wp-admin/images/logo-login.gif
+wordpress/wp-admin/images/logo-login.png
 wordpress/wp-admin/images/logo.gif
 wordpress/wp-admin/images/marker.png
 wordpress/wp-admin/images/mask.png
@@ -127,6 +134,8 @@ wordpress/wp-admin/images/media-button-i
 wordpress/wp-admin/images/media-button-music.gif
 wordpress/wp-admin/images/media-button-other.gif
 wordpress/wp-admin/images/media-button-video.gif
+wordpress/wp-admin/images/menu-arrow-frame-rtl.png
+wordpress/wp-admin/images/menu-arrow-frame.png
 wordpress/wp-admin/images/menu-arrows.gif
 wordpress/wp-admin/images/menu-bits-rtl-vs.gif
 wordpress/wp-admin/images/menu-bits-rtl.gif
@@ -136,16 +145,20 @@ wordpress/wp-admin/images/menu-dark-rtl-
 wordpress/wp-admin/images/menu-dark-rtl.gif
 wordpress/wp-admin/images/menu-dark-vs.gif
 wordpress/wp-admin/images/menu-dark.gif
+wordpress/wp-admin/images/menu-shadow-rtl.png
+wordpress/wp-admin/images/menu-shadow.png
 wordpress/wp-admin/images/menu-vs.png
 wordpress/wp-admin/images/menu.png
 wordpress/wp-admin/images/no.png
+wordpress/wp-admin/images/press-this.png
 wordpress/wp-admin/images/required.gif
+wordpress/wp-admin/images/resize-rtl.gif
 wordpress/wp-admin/images/resize.gif
 wordpress/wp-admin/images/screen-options-toggle-vs.gif
 wordpress/wp-admin/images/screen-options-toggle.gif
 wordpress/wp-admin/images/se.png
 wordpress/wp-admin/images/sort.gif
-wordpress/wp-admin/images/star.gif
+wordpress/wp-admin/images/star.png
 wordpress/wp-admin/images/toggle-arrow-rtl.gif
 wordpress/wp-admin/images/toggle-arrow.gif
 wordpress/wp-admin/images/upload-classic.png
@@ -257,8 +270,6 @@ wordpress/wp-admin/js/inline-edit-tax.de
 

Re: update privoxy to 3.0.17 + rc script

2011-03-24 Thread Mike Erdely
On Fri, Mar 18, 2011 at 4:07 PM, Pascal Stumpf pascal.stu...@cubes.de wrote:
 Hi ports@,

 this is a small update of privoxy to 3.0.17, plus an rc script making
 use of the built-in chroot functionality. For this to work, you need to
 change the home of _privoxy to /var/privoxy, the rc script will copy all
 necessary files into the chroot.

 Also, some additional files and scripts will be installed.

 Already discussed with ajacoutot@. :)

I tested this on macppc.  I like it.  Can I get an OK to commit?

Thanks.



[update] p5-Net-Server

2010-10-26 Thread Mike Erdely
Updates Net::Server to 0.99

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/devel/p5-Net-Server/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile18 Oct 2010 17:48:04 -  1.13
+++ Makefile26 Oct 2010 07:01:20 -
@@ -3,11 +3,11 @@
 COMMENT=   extensible framework for Perl server engines
 
 MODULES=   cpan
-DISTNAME=  Net-Server-0.97
+DISTNAME=  Net-Server-0.99
 CATEGORIES=devel net
 USE_GROFF =Yes
 
-HOMEPAGE=  http://seamons.com/net_server.html
+HOMEPAGE=  http://seamons.com/projects/
 
 MAINTAINER=Michael Erdely merd...@openbsd.org
 
Index: distinfo
===
RCS file: /cvs/ports/devel/p5-Net-Server/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo4 Nov 2007 16:27:53 -   1.9
+++ distinfo26 Oct 2010 07:01:32 -
@@ -1,5 +1,5 @@
-MD5 (Net-Server-0.97.tar.gz) = +IS2xbHSaYqCu8e6ZZaQoQ==
-RMD160 (Net-Server-0.97.tar.gz) = RtdyNfTvXTFm7782xKv8QCa5VUg=
-SHA1 (Net-Server-0.97.tar.gz) = PBrd3E5msVwpcxdu9mysNkALIjc=
-SHA256 (Net-Server-0.97.tar.gz) = Trzn6SuPz8wSdYOx3uSdQHJoYMCAkI6jgeYZwEfYcI8=
-SIZE (Net-Server-0.97.tar.gz) = 92158
+MD5 (Net-Server-0.99.tar.gz) = GuA9/4sQCSFqLl2PTJpHsQ==
+RMD160 (Net-Server-0.99.tar.gz) = n9MnI2j38zr5tS99V+bxah7X86s=
+SHA1 (Net-Server-0.99.tar.gz) = +HlL4H65Y8Cd7T0ZlARxyZuOf3E=
+SHA256 (Net-Server-0.99.tar.gz) = wRqwKULhhI+8vcMhweVmf0+j5V6wcj5+y51dOrcTrl0=
+SIZE (Net-Server-0.99.tar.gz) = 101559
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/p5-Net-Server/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   4 Nov 2007 16:27:53 -   1.7
+++ pkg/PLIST   26 Oct 2010 07:43:27 -
@@ -5,6 +5,7 @@ ${P5SITE}/Net/Server.pm
 ${P5SITE}/Net/Server.pod
 ${P5SITE}/Net/Server/Daemonize.pm
 ${P5SITE}/Net/Server/Fork.pm
+${P5SITE}/Net/Server/HTTP.pm
 ${P5SITE}/Net/Server/INET.pm
 ${P5SITE}/Net/Server/MultiType.pm
 ${P5SITE}/Net/Server/Multiplex.pm
@@ -13,6 +14,7 @@ ${P5SITE}/Net/Server/PreForkSimple.pm
 ${P5SITE}/Net/Server/Proto/
 ${P5SITE}/Net/Server/Proto.pm
 ${P5SITE}/Net/Server/Proto/SSL.pm
+${P5SITE}/Net/Server/Proto/SSLEAY.pm
 ${P5SITE}/Net/Server/Proto/TCP.pm
 ${P5SITE}/Net/Server/Proto/UDP.pm
 ${P5SITE}/Net/Server/Proto/UNIX.pm
@@ -21,6 +23,7 @@ ${P5SITE}/Net/Server/Single.pm
 @man man/man3p/Net::Server.3p
 @man man/man3p/Net::Server::Daemonize.3p
 @man man/man3p/Net::Server::Fork.3p
+...@man man/man3p/Net::Server::HTTP.3p
 @man man/man3p/Net::Server::INET.3p
 @man man/man3p/Net::Server::MultiType.3p
 @man man/man3p/Net::Server::Multiplex.3p
@@ -28,6 +31,7 @@ ${P5SITE}/Net/Server/Single.pm
 @man man/man3p/Net::Server::PreForkSimple.3p
 @man man/man3p/Net::Server::Proto.3p
 @man man/man3p/Net::Server::Proto::SSL.3p
+...@man man/man3p/Net::Server::Proto::SSLEAY.3p
 @man man/man3p/Net::Server::Proto::TCP.3p
 @man man/man3p/Net::Server::Proto::UDP.3p
 @man man/man3p/Net::Server::Proto::UNIX.3p



Re: [NEW] www/aria2

2010-10-26 Thread Mike Erdely
On Mon, Oct 25, 2010 at 08:02:50PM +0200, Remi Pointel wrote:
 Hi,
 
 this is the port of aria2, a lightweight multi-protocol  multi-source 
 download utility.
 
 Tested on amd64.
 
 Critical positive or negative would be appreciated ;-).

`make regress` fails:
Making check in test
make  aria2c
c++ -DHAVE_CONFIG_H -I. -I..   -Wall  -I ../src -I../lib -I../intl -I../intl 
-I/usr/local/include  -I/usr/include -I/usr/include -I/usr/include  
-I/usr/local/include -DLOCALEDIR=\/usr/local/share/locale\ -DHAVE_CONFIG_H 
-I/usr/local/include  -O2 -pipe -MT AllTest.o -MD -MP -MF .deps/AllTest.Tpo -c 
-o AllTest.o AllTest.cc
AllTest.cc:5:39: error: cppunit/CompilerOutputter.h: No such file or directory
AllTest.cc:6:52: error: cppunit/extensions/TestFactoryRegistry.h: No such file 
or directory
AllTest.cc:7:40: error: cppunit/ui/text/TestRunner.h: No such file or directory
AllTest.cc: In function 'int main(int, char**)':
AllTest.cc:31: error: 'CppUnit' has not been declared
AllTest.cc:31: error: 'suite' was not declared in this scope
AllTest.cc:31: error: 'CppUnit' has not been declared
AllTest.cc:32: error: 'CppUnit' has not been declared
AllTest.cc:32: error: expected `;' before 'runner'
AllTest.cc:33: error: 'runner' was not declared in this scope
AllTest.cc:35: error: expected type-specifier before 'CppUnit'
AllTest.cc:35: error: expected `)' before 'CppUnit'
*** Error code 1

I didn't look into it.

-ME



Re: Rdesktop replacement

2010-07-27 Thread Mike Erdely
I have.  Care to test?

-ME

On Tue, Jul 27, 2010 at 04:12:17AM -0700, Steve wrote:
 Hi,
 
 Does anyone have a port for this ?
 
 http://freerdp.sourceforge.net/
 
 It seems to fix a lot of 2008 rdesktop problems.
 
 Thanks,
 
 Steve
 
 
 
   


freerdp.tgz
Description: application/tar-gz


Update bacula to 5.0.2

2010-07-19 Thread Mike Erdely
The following diff updates Bacula to 5.0.2.

I think it fixes the weird install issues with the bat binary (landry,
naddy, care to test?).

New features can be found here:
http://www.bacula.org/5.0.x-manuals/en/main/main/New_Features_in_5_0_0.html

Thanks to sthen for help with the new wantlib/lib_depends stuff,
removing the sqlite flavor, ...

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile28 Mar 2010 16:05:25 -  1.20
+++ Makefile19 Jul 2010 21:29:25 -
@@ -4,20 +4,20 @@ COMMENT-main= network backup solution (
 COMMENT-server=network backup solution (server)
 COMMENT-bat=   network backup solution (gui-client)
 
-V= 3.0.3
+V= 5.0.2
 DISTNAME=  bacula-$V
-FULLPKGNAME-main=  bacula-client-$Vp0
+FULLPKGNAME-main=  bacula-client-$V
 FULLPKGPATH-main=  ${PKGPATH},-main
 PKGNAME-server=bacula-server-$V
-FULLPKGNAME-bat=   bacula-bat-$Vp1
+FULLPKGNAME-bat=   bacula-bat-$V
 FULLPKGPATH-bat=   ${PKGPATH},-bat
 CATEGORIES=sysutils
 
-SHARED_LIBS += bac 0.0 # .1.0
-SHARED_LIBS += baccfg  0.0 # .1.0
-SHARED_LIBS += bacpy   0.0 # .1.0
-SHARED_LIBS += bacfind 0.0 # .1.0
-SHARED_LIBS += bacsql  0.0 # .1.0
+SHARED_LIBS += bac 1.0 # .1.0
+SHARED_LIBS += baccfg  1.0 # .1.0
+SHARED_LIBS += bacpy   1.0 # .1.0
+SHARED_LIBS += bacfind 1.0 # .1.0
+SHARED_LIBS += bacsql  1.0 # .1.0
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
 HOMEPAGE=  http://www.bacula.org/
@@ -47,7 +47,7 @@ USE_LIBTOOL=  yes
 NO_REGRESS=yes
 
 PSEUDO_FLAVORS=no_bat no_server
-FLAVORS=   pgsql mysql sqlite3 sqlite
+FLAVORS=   pgsql mysql sqlite3
 FLAVOR?=   sqlite3
 
 CONFIGURE_ARGS=--enable-smartalloc \
@@ -89,7 +89,8 @@ CONFIGURE_ENV+=   CPPFLAGS=-I/usr/includ
MTX=/bin/chio \
TAPEDRIVE=/dev/rst0 \
CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site \
-   QMAKEQT4=${LOCALBASE}/bin/qmake4 \
+   QMAKEBIN4=qmake4 \
+   QMAKE=${LOCALBASE}/bin/${QMAKEBIN4} \

PKG_CONFIG_LIBDIR=${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4
 
 .if ${FLAVOR:L:Mno_server}
@@ -98,8 +99,8 @@ CONFIGURE_ARGS+=  --enable-client-only \
--disable-build-stored
 .else
 MULTI_PACKAGES+=   -server
-WANTLIB-server=${WANTLIB} readline termcap
-LIB_DEPENDS-server=bac,baccfg,bacfind,bacpy::sysutils/bacula,-main
+WANTLIB-server=${WANTLIB} bac baccfg bacfind bacpy readline 
termcap
+LIB_DEPENDS-server=::sysutils/bacula,-main
 CONFIGURE_ARGS+=   --with-dir-user=_bacula \
--with-dir-group=_bacula \
--with-sd-user=${SD_USER} \
@@ -108,10 +109,11 @@ CONFIGURE_ARGS+=  --with-dir-user=_bacula
 BACKEND=
 .if ${FLAVOR:L:Mpgsql}
 .if !empty(BACKEND)
-ERRORS+=   Fatal: choose either pgsql or mysql or sqlite or 
sqlite3
+ERRORS+=   Fatal: choose either pgsql or mysql or sqlite3
 .endif
 CONFIGURE_ARGS+=   --with-postgresql
-LIB_DEPENDS-server+=   pq.=2:postgresql-client-*:databases/postgresql
+WANTLIB-server+=   pq.=2
+LIB_DEPENDS-server+=   :postgresql-client-*:databases/postgresql
 BACKEND=   postgresql
 .else
 CONFIGURE_ARGS+=   --without-postgresql
@@ -119,11 +121,12 @@ CONFIGURE_ARGS+=  --without-postgresql
 
 .if ${FLAVOR:L:Mmysql}
 .if !empty(BACKEND)
-ERRORS+=   Fatal: choose either pgsql or mysql or sqlite or 
sqlite3
+ERRORS+=   Fatal: choose either pgsql or mysql or sqlite3
 .endif
 CONFIGURE_ARGS+=   --with-mysql \
--enable-batch-insert
-LIB_DEPENDS-server+=   mysqlclient_r.=18::databases/mysql
+WANTLIB-server+=   mysqlclient_r.=18
+LIB_DEPENDS-server+=   ::databases/mysql
 BACKEND=   mysql
 .else
 CONFIGURE_ARGS+=   --without-mysql
@@ -131,29 +134,19 @@ CONFIGURE_ARGS+=  --without-mysql
 
 .if ${FLAVOR:L:Msqlite3}
 .if !empty(BACKEND)
-ERRORS+=   Fatal: choose either pgsql or mysql or sqlite or 
sqlite3
+ERRORS+=   Fatal: choose either pgsql or mysql or sqlite3
 .endif
 CONFIGURE_ARGS+=   --with-sqlite3
-LIB_DEPENDS-server+=   sqlite3.=8::databases/sqlite3
+WANTLIB-server+=   sqlite3.=8
+LIB_DEPENDS-server+=   ::databases/sqlite3
 BACKEND=   sqlite3
 .else
 CONFIGURE_ARGS+=   --without-sqlite3
 .endif
 
-.if ${FLAVOR:L:Msqlite}
-.if !empty(BACKEND)

FuzzyOCR Update (Works with SA 3.3.1)

2010-07-14 Thread Mike Erdely
This diff brings FuzzyOCR to 2.6.0 which works with SA 3.3.1.

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-FuzzyOcr/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Oct 2007 19:53:49 -   1.1.1.1
+++ Makefile14 Jul 2010 17:00:23 -
@@ -2,15 +2,13 @@
 
 COMMENT=   detect image spam with SpamAssassin
 
-V= svn133
-DISTNAME=  fuzzyocr-${V}
-PKGNAME=   p5-FuzzyOcr-3.5.1-${V}
+V= 3.6.0
+DISTNAME=  fuzzyocr-$V
+PKGNAME=   p5-FuzzyOcr-$V
 CATEGORIES=mail perl5
 
 HOMEPAGE=  http://fuzzyocr.own-hero.net/
-MASTER_SITES=  http://openbsd.rutgers.edu/ \
-   http://meta-planets.net/~openbsd/ \
-   http://www.phxbsd.com/OpenBSD/
+MASTER_SITES=  http://users.own-hero.net/~decoder/fuzzyocr/
 
 MAINTAINER=Michael Erdely merd...@openbsd.org
 
@@ -26,7 +24,7 @@ RUN_DEPENDS=  ::devel/p5-MLDBM-Sync \
 
 REGRESS_DEPENDS=   ::mail/p5-FuzzyOcr
 
-# MIT
+# Apache 2.0
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
@@ -35,7 +33,7 @@ PERMIT_DISTFILES_FTP= Yes
 NO_BUILD=  Yes
 MODULES=   perl
 
-WRKDIST=   ${WRKDIR}/devel
+WRKDIST=   ${WRKDIR}/FuzzyOcr-$V
 CONFDIR=   ${SYSCONFDIR}/mail/spamassassin
 SUBST_VARS=CONFDIR
 PKG_ARCH=  *
Index: distinfo
===
RCS file: /cvs/ports/mail/p5-FuzzyOcr/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo4 Oct 2007 19:53:49 -   1.1.1.1
+++ distinfo14 Jul 2010 15:20:10 -
@@ -1,5 +1,5 @@
-MD5 (fuzzyocr-svn133.tar.gz) = s0wT6CsJ2HgF90kFqLl5JA==
-RMD160 (fuzzyocr-svn133.tar.gz) = 5+XHJpjqst8N1JVdF7pg9Yj42a8=
-SHA1 (fuzzyocr-svn133.tar.gz) = 5rC+U0qZzdgbMaSWv3SPwrZ5Ja0=
-SHA256 (fuzzyocr-svn133.tar.gz) = X3wAz2dlkCgPBX9EyfQdLUQuqs8URpJ2SPL3aCsEyts=
-SIZE (fuzzyocr-svn133.tar.gz) = 258112
+MD5 (fuzzyocr-3.6.0.tar.gz) = 1DSjOfsLtcyRIHcjJZCN9Q==
+RMD160 (fuzzyocr-3.6.0.tar.gz) = OqHuY//gmW3uOxyYii6WvC7bvow=
+SHA1 (fuzzyocr-3.6.0.tar.gz) = xUp5eJlAG5ki5dY3GmB3gJIxkt4=
+SHA256 (fuzzyocr-3.6.0.tar.gz) = 3TRclQDDw83DNQOGP+I0vzwnIMVLMD5svJTb6Krzohg=
+SIZE (fuzzyocr-3.6.0.tar.gz) = 127103
Index: patches/patch-FuzzyOcr_Config_pm
===
RCS file: patches/patch-FuzzyOcr_Config_pm
diff -N patches/patch-FuzzyOcr_Config_pm
--- patches/patch-FuzzyOcr_Config_pm4 Oct 2007 19:53:49 -   1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-FuzzyOcr_Config_pm,v 1.1.1.1 2007/10/04 19:53:49 merdely Exp $
 FuzzyOcr/Config.pm.origTue Oct  2 14:16:29 2007
-+++ FuzzyOcr/Config.pm Tue Oct  2 14:17:24 2007
-@@ -51,8 +51,10 @@ our @EXPORT_OK = qw/
- read_words 
- /;
- 
--use constant HAS_DBI = eval { require DBI; };
--use constant HAS_DBD_MYSQL = eval { require DBD::mysql; };
-+eval { require DBI; };
-+my $HAS_DBI = ($@) ? undef : 1;
-+eval { require DBD::mysql; };
-+my $HAS_DBD_MYSQL = ($@) ? undef : 1;
- use constant HAS_MLDBM = eval { require MLDBM; require MLDBM::Sync;};
- use constant HAS_DB_FILE = eval { require DB_File; };
- use constant HAS_STORABLE = eval { require Storable; };
-@@ -179,7 +181,7 @@ sub get_db_ref {
- }
- 
- sub get_mysql_ddb {
--return undef unless (HAS_DBI and HAS_DBD_MYSQL);
-+return undef unless ($HAS_DBI and $HAS_DBD_MYSQL);
- 
- my $conf = get_config();
- my %dopts = ( AutoCommit = 1 );
-@@ -685,11 +687,11 @@ sub finish_parsing_end {
- }
- 
- if ($conf-{focr_enable_image_hashing} == 3) {
--unless (HAS_DBI and HAS_DBD_MYSQL) {
-+unless ($HAS_DBI and $HAS_DBD_MYSQL) {
- $conf-{focr_enable_image_hashing} = 0;
- errorlog(Disable Image Hashing);
--errorlog(Missing DBI) unless HAS_DBI;
--errorlog(Missing DBD::mysql) unless HAS_DBD_MYSQL;
-+errorlog(Missing DBI) unless $HAS_DBI;
-+errorlog(Missing DBD::mysql) unless $HAS_DBD_MYSQL;
- }
- 
- # Warn if MLDBM databases are present, but can't be imported
Index: patches/patch-FuzzyOcr_cf
===
RCS file: /cvs/ports/mail/p5-FuzzyOcr/patches/patch-FuzzyOcr_cf,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-FuzzyOcr_cf
--- patches/patch-FuzzyOcr_cf   4 Oct 2007 19:53:49 -   1.1.1.1
+++ patches/patch-FuzzyOcr_cf   14 Jul 2010 17:18:31 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-FuzzyOcr_cf,v 1.1.1.1 2007/10/04 19:53:49 merdely Exp $
 FuzzyOcr.cf.orig   Tue Sep  4 13:31:13 2007
-+++ FuzzyOcr.cfTue Oct  2 12:25:00 2007
+$OpenBSD$
+--- FuzzyOcr.cf.orig   Wed May 27 18:16:00 2009

Re: [UPDATE] www/wordpress to version 3.0

2010-07-13 Thread Mike Erdely
On Sun, Jul 11, 2010 at 11:11:39AM +0200, Matthias Kilian wrote:
 On Thu, Jul 08, 2010 at 10:59:38AM -0400, Mike Erdely wrote:
  Here's an updated diff including removal of wordpress-mu, addition of
  quirk and other advice from Kili.
  
  ok?
 
 This part was probably against www/wordpress/Makefile:

I don't understand this comment.

 
  Index: Makefile
  ===
  RCS file: /cvs/ports/www/wordpress/Makefile,v
  retrieving revision 1.26
  diff -u -p -r1.26 Makefile
  --- Makefile15 Apr 2010 14:29:18 -  1.26
  +++ Makefile8 Jul 2010 14:57:36 -
  @@ -2,8 +2,7 @@
   
   COMMENT =  standard compliant weblog
   
  -DISTNAME = wordpress-2.9.2
  -PKGNAME =  ${DISTNAME}p0
  +DISTNAME = wordpress-3.0
   CATEGORIES =   www
   
   HOMEPAGE = http://wordpress.org/
 
 Otherwise ok, but note that I'm not using wordpress nor wordpress-mu
 for real on OpenBSD (or anywhere else); we just have some customers
 using it, and they did use *recent* versions of wordpress-mu.

So no objections to removing wordpress-mu?

 Ciao,
   Kili

I'll commit the diff tomorrow if there are no objections.
-ME



Re: Alpha Ports Breakage

2009-11-08 Thread Mike Erdely
On Sun, Nov 08, 2009 at 01:54:02PM +0100, Jasper Lievisse Adriaanse wrote:
 On Sat, Nov 07, 2009 at 09:21:08PM -0500, Mike Erdely wrote:
  I think all of the gnome.h missing problems are related to the gnome
  update that was done during p2k9 (this build was launched during p2k9).
 they have been fixed since :)

  x11/gnome/seahorse (package)
  seahorse-gpgme-data.c: In function `handle_gio_error':
  seahorse-gpgme-data.c:89: error: `ENOTSUP' undeclared (first use in 
  this function)
  seahorse-gpgme-data.c:89: error: (Each undeclared identifier is 
  reported only once
  seahorse-gpgme-data.c:89: error: for each function it appears in.)
  gmake[2]: *** [seahorse-gpgme-data.lo] Error 1
 this has been taken care of as well.

Thanks, Jasper.  I figured and that's why I didn't spend *any* time
working on them. :)

-ME



Alpha Ports Breakage

2009-11-07 Thread Mike Erdely
Below is a list of ports that failed during the last bulk build (some
fail for every bulk build).

I think the emacs22 issue is easily fixed, but there is another bug that
is revealed when the unelf bug.  eric@ is aware.

I think all of the gnome.h missing problems are related to the gnome
update that was done during p2k9 (this build was launched during p2k9).

Full build log files are available upon request.

-ME

archivers/unrar (package)
c++  -O2 -pipe  -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE  -DUNRAR -c 
recvol.cpp
recvol.cpp: In member function `bool RecVolumes::Restore(RAROptions*, 
const
char*, const wchar*, bool)':
recvol.cpp:372: error: could not split insn
(insn:TI 3057 6643 3058 0x160bd5188 (set (reg/f:DI 9 $9 [714])
(plus:DI (reg/f:DI 30 $30)
(const_int 65536 [0x1]))) 14 {*adddi_fp_hack} (insn_list 
6642 (nil))
(expr_list:REG_EQUIV (plus:DI (reg/f:DI 30 $30)
(const_int 65536 [0x1]))
(nil)))
recvol.cpp:372: internal compiler error: in final_scan_insn, at 
final.c:2793

lang/gcc/4.2,-c++ (/usr/obj/ports/webkit-1.1.15.2v0/.dep-lang-gcc-4.2,-c++)
checking for alpha-unknown-openbsd4.6-gcc...  
/usr/obj/ports/gcc-4.2.4/build-alpha-c++-fortran-objc/./prev-gcc/xgcc -
B/usr/obj/ports/gcc-4.2.4/build-alpha-c++-fortran-objc/./prev-gcc/ 
-B/usr/local/alpha-unknown-openbsd4.6/bin/
checking for C compiler default output file name... configure: error: C 
compiler cannot create executables
See `config.log' for more details.
gmake[2]: *** [configure-stage2-intl] Error 77

lang/ocaml 
(/usr/obj/ports/ocaml-postgresql-1.4.6p4/.depocaml--3.11.1-lang-ocaml)
+ ./boot/ocamlrun boot/myocamlbuild byte_stdlib_mixed_mode ocamlc 
lex/ocamllex ocamlbuild/ocamlbuildlib.cma ocamlbuild/ocamlbuildlightlib.cma 
ocamlbuild/ocamlbuild.byte ocamlbuild/ocamlbuildlight.byte
Segmentation fault (core dumped)
gmake[1]: *** [ocamlbuild.byte] Error 139

devel/gobject-introspection (package)
pid 8073 (g-ir-compiler): unaligned access: va=0x16b01b1b4 
pc=0x1200090b4 ra=0x1200090a0 op=stt
gmake[2]: *** [GLib-2.0.typelib] Bus error (core dumped)

editors/emacs22 (package)
editors/emacs22,no_x11 (package)
editors/emacs22,gtk (package)
unexelf.c:543:1: warning: ELFSIZE redefined
In file included from unexelf.c:529:
/usr/include/sys/exec_elf.h:591:1: warning: this is the location of the 
previous definition
unexelf.c: In function `unexec':
unexelf.c:1087: error: syntax error before symhdr
unexelf.c:1089: error: `symhdr' undeclared (first use in this function)
unexelf.c:1089: error: (Each undeclared identifier is reported only once
unexelf.c:1089: error: for each function it appears in.)
gmake[1]: *** [unexelf.o] Error 1

emulators/fuse (package)
cc1: out of memory allocating 160451200 bytes after a total of 0 bytes

geo/qgis (package)

/usr/obj/ports/qgis-1.2.0/qgis-1.2.0/src/core/raster/qgsrasterlayer.cpp: In
member function `virtual bool QgsRasterLayer::draw(QgsRenderContext)':

/usr/obj/ports/qgis-1.2.0/qgis-1.2.0/src/core/raster/qgsrasterlayer.cpp:1512: 
warning: passing
`double' for converting 1 of `void QgsRasterDataProvider::setDpi(int)'

/usr/obj/ports/qgis-1.2.0/qgis-1.2.0/src/core/raster/qgsrasterlayer.cpp:1571: 
warning: converting
to `int' from `double'

/usr/obj/ports/qgis-1.2.0/qgis-1.2.0/src/core/raster/qgsrasterlayer.cpp: In
member function `QPixmap QgsRasterLayer::legendAsPixmap(int)':

/usr/obj/ports/qgis-1.2.0/qgis-1.2.0/src/core/raster/qgsrasterlayer.cpp:2458: 
internal compiler error: in
output_constant_pool, at varasm.c:3465
Please submit a full bug report,
with preprocessed source if appropriate.
See URL:http://gcc.gnu.org/bugs.html for instructions.

graphics/enblend-enfuse (package)
path.h: In function `std::vectorvigra::Point2D, 
std::allocatorvigra::Point2D
   * enblend::minCostPath(CostImageIterator, CostImageIterator, 
CostAccessor,
   vigra::Point2D, vigra::Point2D) [with CostImageIterator =
   vigra::ConstBasicImageIteratorUInt8, UInt8**, CostAccessor =
   vigra::StandardConstValueAccessorunsigned char]':
path.h:163: error: push_frame_in_operand
(insn 8 6 9 0 0x0 (set (reg:DI 73)
(mem/s:DI (and:DI (reg/f:DI 63 FP)
(const_int -8 [0xfff8])) [0 S8 A64])) 238 
{*movdi_er_nofix} (nil)
(nil))
path.h:163: internal compiler error: in push_frame_in_operand, at 
protector.c:
   2564

inputmethods/uim (package)
toolbar-applet-gnome.c:41:19: gnome.h: No such file or directory
toolbar-applet-gnome.c:86: warning: string length `970' is greater than 
the length `509' ISO C89 compilers are required 

new - p5-IP-Country

2009-07-15 Thread Mike Erdely
This includes IP::Country::Fast which SpamAssassin can use to add a
header indicating which country the relay servers are possibly in.

DESCR:
Finding the home country of a client using only the IP address can be
difficult. Looking up the domain name associated with that address can
provide some help, but many IP address are not reverse mapped to any
useful domain, and the most common domain (.com) offers no help when
looking for country.

This module comes bundled with a database of countries where various IP
addresses have been assigned. Although the country of assignment will
probably be the country associated with a large ISP rather than the
client herself, this is probably good enough for most log analysis
applications, and under test has proved to be as accurate as reverse-DNS
and WHOIS lookup.

I've been using this on i386 with -current SpamAssassin for several days
and it's helped reducing the spam I get from China, Russia, etc.

ok?

-ME



p5-IP-Country.tgz
Description: application/tar-gz


Re: trac - 0.11.4

2009-06-09 Thread Mike Erdely
On Tue, Jun 09, 2009 at 04:27:02PM +0100, Stuart Henderson wrote:
 is anybody in a position to test trac-ldapplugin?
 
 trac 0.10 is dead; no more releases. this is one of the things we need
 to update before we moving python to 2.6, and the old trac-ldapplugin
 doesn't work with new trac.

Unfortunately, I'm not in an environment where I can test that anymore.
I can try to set up an LDAP system to test, but it won't be until at
least this weekend.

-ME



Re: CVS: cvs.openbsd.org: ports

2009-06-01 Thread Mike Erdely
I support this as well.

Why meta-*.  gnome or kde would be even more obvious.

# pkg_add gnome
# pkg_add kde

-ME

On Tue, Jun 02, 2009 at 02:21:57AM +0200, Peter Hessler wrote:
 Antoine asked me to make this public.  Totally in support of having a
 small number of meta packages *only when it makes sense*. Gnome is one
 of these cases.
 
 - Forwarded message from Peter Hessler phess...@theapt.org -
 
 Date: Tue, 2 Jun 2009 01:36:16 +0200
 From: Peter Hessler phess...@theapt.org
 To: Antoine Jacoutot ajacou...@cvs.openbsd.org
 Subject: Re: CVS: cvs.openbsd.org: ports
 
 On 2009 Jun 01 (Mon) at 16:28:34 -0600 (-0600), Antoine Jacoutot wrote:
 :CVSROOT: /cvs
 :Module name: ports
 :Changes by:  ajacou...@cvs.openbsd.org   2009/06/01 16:28:34
 :
 :Modified files:
 : x11/gnome/session: Makefile 
 : x11/gnome/session/files: README.OpenBSD 
 :
 :Log message:
 :- mention nautilus-open-terminal...
 :(what about a GNOME meta-package?)
 :
 
 so `pkg_add meta-gnome` installs everything that provides the gnome
 environment?  Hell Yes!
 
 
 -- 
 Nothing takes the taste out of peanut butter quite like unrequited
 love.
   -- Charlie Brown
 
 - End forwarded message -
 



GetLive Update

2009-03-06 Thread Mike Erdely
Hotmail keeps making changes.

This diff (from GetLive CVS) allows p5-GetLive to work again.
Note, you have to update Mode=200902 in your configuration file.
You also have to clear out the Hi, Jerk, We've made changes.  Click
here not to see this stupid message again. message.

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-GetLive/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile10 Nov 2008 20:23:50 -  1.5
+++ Makefile7 Mar 2009 05:19:52 -
@@ -3,7 +3,7 @@
 COMMENT=   automatically fetch hotmail.com email
 
 DISTNAME=  GetLive_0_57
-PKGNAME=   p5-GetLive-0.57p0
+PKGNAME=   p5-GetLive-0.57p1
 CATEGORIES=mail perl5
 EXTRACT_SUFX=  .tgz
 
Index: patches/patch-GetLive_pl
===
RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-GetLive_pl,v
retrieving revision 1.4
diff -u -p -r1.4 patch-GetLive_pl
--- patches/patch-GetLive_pl11 Nov 2008 22:03:59 -  1.4
+++ patches/patch-GetLive_pl7 Mar 2009 05:19:52 -
@@ -1,6 +1,8 @@
+Diff from GetLive CVS to incorporate Hotmail site changes.
+
 $OpenBSD: patch-GetLive_pl,v 1.4 2008/11/11 22:03:59 merdely Exp $
 GetLive.pl.origMon Nov 10 14:39:12 2008
-+++ GetLive.pl Mon Nov 10 14:41:25 2008
+--- GetLive.pl.origSat Jul  5 16:27:36 2008
 GetLive.pl Fri Mar  6 23:56:19 2009
 @@ -65,11 +65,12 @@ my $Password= ;
  my $Domain  = 'hotmail.com';
  my $CurlCommand = 'curl -k';
@@ -57,8 +59,8 @@ $OpenBSD: patch-GetLive_pl,v 1.4 2008/11
  Display(Delete must be 'No' when MoveToFolder is also specified in the 
configuration file.\n,stderr=1);
  DisplayUsageAndExit(); 
}
-+  if ($Mode !~ m/^(200809|200810)$/i) {
-+Display(Mode must be oneof 200809 or 200810 as argument in the 
configuration file.\n,stderr=1);
++  if ($Mode !~ m/^(200809|200810|200902)$/i) {
++Display(Mode must be oneof 200809,200810,200902 as argument in the 
configuration file.\n,stderr=1);
 +DisplayUsageAndExit(); 
 +  }
  }
@@ -73,7 +75,38 @@ $OpenBSD: patch-GetLive_pl,v 1.4 2008/11
  
# We expect here a number of functions now (aug 2007) to be hidden in a 
javascript
# that is loaded separately. Let's load and append.
-@@ -960,7 +973,7 @@ sub GetMessagesFromFolder($) {
+@@ -690,7 +703,9 @@ REENTRY_DARREN_QUIRK:
+ 
+   Display(LoginUrl 2 : '$LoginUrl'.\n,MinVerbosity = 10);
+   # Following the redirect : Third step of login.
+-  Display(Following redirect.\n,MinVerbosity = 2);
++  Display(Following redirect.\n,MinVerbosity = 2);
++
++LABEL_20090214:
+   ($LoginPageAsString,$GetPageUrl) = GetPage(Url = $LoginUrl,FollowForward 
= 1);
+ 
+   $LoginUrl = $GetPageUrl;
+@@ -716,6 +731,19 @@ REENTRY_DARREN_QUIRK:
+   } elsif ($LoginPageAsString =~ m/MSNPlatform\/browsercompat.js/) {
+ $LoggedIn = 1;
+   }
++
++  # Since 14/2/2009 we are not logged in anymore now ...
++
++  my $Tried20090214 = 0;
++  if (!$LoggedIn  !$Tried20090214) {
++if ($LoginPageAsString !~ m/src=\([^\]*)\/) {
++  die Could not log in. Maybe structure has changed or was not 
foreseen.;
++}
++$LoginUrl = HtmlUnescape($1);
++Display(Following link '$LoginUrl'.\n,MinVerbosity=2);
++$Tried20090214 = 1;
++goto LABEL_20090214
++  }
+  
+   die Could not log in. Maybe structure has changes or was not foreseen. 
unless $LoggedIn;
+ 
+@@ -960,7 +988,7 @@ sub GetMessagesFromFolder($) {
  au=$AuthUser.
  ptid=0;
my $PostData = ;
@@ -82,7 +115,7 @@ $OpenBSD: patch-GetLive_pl,v 1.4 2008/11
  $PostData = cn=Microsoft.Msn.Hotmail.Ui.Fpp.MailBox.
  .
  mn=GetInboxData.
-@@ -971,7 +984,7 @@ sub GetMessagesFromFolder($) {
+@@ -971,7 +999,7 @@ sub GetMessagesFromFolder($) {
  v=1.
  .
  mt=$MT;
@@ -91,7 +124,7 @@ $OpenBSD: patch-GetLive_pl,v 1.4 2008/11
  $PostData = cn=Microsoft.Msn.Hotmail.Ui.Fpp.MailBox.
  .
  mn=GetInboxData.
-@@ -979,11 +992,37 @@ sub GetMessagesFromFolder($) {
+@@ -979,11 +1007,37 @@ sub GetMessagesFromFolder($) {
  
d=true,true,{.uri_escape(\$FolderId\).,25,NextPage,0,Date,false,.
uri_escape(\$pnAm\) . , .
uri_escape(\$pnAd\) . , .
@@ -101,7 +134,7 @@ $OpenBSD: patch-GetLive_pl,v 1.4 2008/11
  v=1.
  .
  mt=$MT;
-+  } elsif ($Mode =~ m/200810/  $Page == 1) {
++  } elsif ($Mode =~ m/(200810|200902)/  $Page == 1) {
 +$PostData = cn=Microsoft.Msn.Hotmail.Ui.Fpp.MailBox.
 +.
 +mn=GetInboxData.
@@ -114,7 +147,7 @@ $OpenBSD: patch-GetLive_pl,v 1.4 2008/11
 +  v=1.
 +  .
 +  

[update] privoxy 3.0.10

2009-01-20 Thread Mike Erdely
This diff updates privoxy to 3.0.10 and implements SUBST_CMD.
Tested on i386, macppc, alpha, sparc64, and landisk.

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/www/privoxy/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile14 Nov 2008 17:35:00 -  1.14
+++ Makefile21 Jan 2009 03:22:25 -
@@ -2,9 +2,9 @@
 
 COMMENT=   web proxy with advanced filtering capabilities
 
-V= 3.0.8
+V= 3.0.10
 DISTNAME=  privoxy-${V}-stable
-PKGNAME=   privoxy-${V}p0
+PKGNAME=   privoxy-${V}
 CATEGORIES=www
 
 HOMEPAGE=  http://www.privoxy.org/
@@ -37,9 +37,7 @@ pre-configure:
 
 # make install is broken
 do-install:
-   @perl -pi \
-   -e 's|%%SYSCONFDIR%%|${SYSCONFDIR}|g;' \
-   ${WRKSRC}/config
+   @${SUBST_CMD} ${WRKSRC}/config
${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin
${INSTALL_MAN} ${WRKSRC}/privoxy.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/privoxy
Index: distinfo
===
RCS file: /cvs/ports/www/privoxy/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo4 Apr 2008 02:21:29 -   1.6
+++ distinfo21 Jan 2009 03:23:23 -
@@ -1,5 +1,5 @@
-MD5 (privoxy-3.0.8-stable-src.tar.gz) = JSwOCFIY+5MMS8dWPpzt2Q==
-RMD160 (privoxy-3.0.8-stable-src.tar.gz) = YE3WGiLcdNBtStqks8h+TV2lFJs=
-SHA1 (privoxy-3.0.8-stable-src.tar.gz) = f+K3r95AZu8fFw9fEYUM+dpCikI=
-SHA256 (privoxy-3.0.8-stable-src.tar.gz) = 
7NUcsnhWkfTpDgfRR/XsiaFRsuV49xr7Jr3ZAZVHhJk=
-SIZE (privoxy-3.0.8-stable-src.tar.gz) = 2007961
+MD5 (privoxy-3.0.10-stable-src.tar.gz) = ASgQF/KL4scTMSTRdo2jZA==
+RMD160 (privoxy-3.0.10-stable-src.tar.gz) = kcjVa3GlxgZVS/UJgnGX1onY/BA=
+SHA1 (privoxy-3.0.10-stable-src.tar.gz) = DOUajck4/mQS2qf27fFZuY/WbVQ=
+SHA256 (privoxy-3.0.10-stable-src.tar.gz) = 
PZ+fVkggEt2rOWyvc/TEAXRqTu69bHY7BPYQjkipCU8=
+SIZE (privoxy-3.0.10-stable-src.tar.gz) = 1957465
Index: patches/patch-config
===
RCS file: /cvs/ports/www/privoxy/patches/patch-config,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config
--- patches/patch-config4 Apr 2008 02:21:29 -   1.3
+++ patches/patch-config21 Jan 2009 03:26:49 -
@@ -17,7 +17,7 @@ $OpenBSD: patch-config,v 1.3 2008/04/04 
  #  No trailing /, please.
  #
 -confdir .
-+confdir %%SYSCONFDIR%%/privoxy
++confdir ${SYSCONFDIR}/privoxy
  #
  #
  #  2.2. templdir
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/privoxy/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   4 Apr 2008 02:21:29 -   1.5
+++ pkg/PLIST   21 Jan 2009 03:27:20 -
@@ -2,7 +2,7 @@
 @newgroup _privoxy:516
 @newuser _privoxy:516:_privoxy:daemon:Privoxy 
Account:/nonexistent:/sbin/nologin
 @man man/man1/privoxy.1
-sbin/privoxy
+...@bin sbin/privoxy
 share/doc/privoxy/
 share/doc/privoxy/README
 share/examples/privoxy/
@@ -247,6 +247,7 @@ share/examples/privoxy/templates/untrust
 @sample ${SYSCONFDIR}/privoxy/templates/untrusted
 @owner
 @group
+share/examples/privoxy/templates/url-info-osd.xml
 share/examples/privoxy/user.action
 @owner _privoxy
 @group _privoxy



p5-GetLive update

2008-11-10 Thread Mike Erdely
The current GetLive release does not work with Hotmail any more.  The
code in the GetLive CVS repository has been updated, but a new version
has not been released.

Below is a diff that incorporates the changes in the
patches/patch-GetLive.pl file and adds instructions to the MESSAGE file
to be able to get GetLive working again.

Tested on i386.

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/mail/p5-GetLive/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile10 Jul 2008 14:37:31 -  1.4
+++ Makefile10 Nov 2008 19:42:59 -
@@ -3,7 +3,7 @@
 COMMENT=   automatically fetch hotmail.com email
 
 DISTNAME=  GetLive_0_57
-PKGNAME=   p5-GetLive-0.57
+PKGNAME=   p5-GetLive-0.57p0
 CATEGORIES=mail perl5
 EXTRACT_SUFX=  .tgz
 
Index: patches/patch-GetLive_pl
===
RCS file: /cvs/ports/mail/p5-GetLive/patches/patch-GetLive_pl,v
retrieving revision 1.2
diff -u -p -r1.2 patch-GetLive_pl
--- patches/patch-GetLive_pl10 Jul 2008 14:37:31 -  1.2
+++ patches/patch-GetLive_pl10 Nov 2008 19:42:23 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-GetLive_pl,v 1.2 2008/07/10 14:37:31 merdely Exp $
 GetLive.pl.origSat Sep  8 14:23:33 2007
-+++ GetLive.pl Wed Oct 10 07:59:06 2007
-@@ -53,7 +53,7 @@ my $Password= ;
+--- GetLive.pl.origMon Nov 10 14:39:12 2008
 GetLive.pl Mon Nov 10 14:41:25 2008
+@@ -65,11 +65,12 @@ my $Password= ;
  my $Domain  = 'hotmail.com';
  my $CurlCommand = 'curl -k';
  my $Verbosity   = 1;  
  # 0:Silent; 1:Normal; 2:Verbose; 10:debug; 100:heavy 
debug 
@@ -10,3 +10,274 @@ $OpenBSD: patch-GetLive_pl,v 1.2 2008/07
  my $DownloadedIdsFile   = ;   # Local file with Ids of 
already downloaded messages.
  my $RetryLimit  = 2;
  my $MarkRead= No; # No,Yes : But never when 
downloaded before !
+ my $Delete  = No; # No,Yes : But never when 
downloaded before !
++my $SkipTrash   = No; # No,Yes : Do not handle 
the Trash folder
+ my $FetchOnlyUnread = No; # If Yes, only messages 
marked unread are downloaded.
+ # Unlike gotmail, this is 
completely orthogonal to the
+ # DownloadedIdsFile, i.e. 
it is the one or the other.
+@@ -78,6 +79,8 @@ my $MoveToFolder= ;   # 
+ # contains the folder to 
move to. This is a hook for 
+ # autoclassifying the 
mail on the server, including spam filtering.
+ 
++my $Mode= 200809;
++
+ # Quirk. MS generates unended pre tags. Hope this is a temporary weakness 
in their mind.
+ # (Hope makes living, we say in Dutch ...)
+ # If we want to allow it set this to one. Currently as of 8/9/2007 it must be 
accepted or the
+@@ -275,7 +278,7 @@ sub ParseConfig {
+ } elsif ($Option =~ m/^Password$/i) {
+   $Password = $OptionValue;
+ } elsif ($Option =~ m/^Mode$/i) {
+-  warn \n'Mode = ...' in the config file is ignored.\nThis version works 
only for 'Live' mailboxes !\n; 
++  $Mode = $OptionValue;
+ } elsif ($Option =~ m/^Domain$/i) {
+   $Domain = $OptionValue;
+ } elsif ($Option =~ m/^Proxy$/i) {
+@@ -298,6 +301,8 @@ sub ParseConfig {
+   $MarkRead = $OptionValue;
+ } elsif ($Option =~ m/^Delete$/i) {
+   $Delete = $OptionValue;
++} elsif ($Option =~ m/^SkipTrash$/i) {
++  $SkipTrash = $OptionValue;
+ } elsif ($Option =~ m/^MoveToFolder$/i) {
+   $MoveToFolder = $OptionValue;
+ } else {
+@@ -332,6 +337,10 @@ sub ParseConfig {
+ Display(MarkRead should take No or Yes as argument in the configuration 
file.\n,stderr=1);
+ DisplayUsageAndExit(); 
+   }
++  if ($SkipTrash !~ m/^(No|Yes)$/i) {
++Display(SkipTrash should take No or Yes as argument in the configuration 
file.\n,stderr=1);
++DisplayUsageAndExit(); 
++  }
+   if ($Delete !~ m/^(No|Yes)$/i) {
+ Display(Delete should take No or Yes as argument in the configuration 
file.\n,stderr=1);
+ DisplayUsageAndExit(); 
+@@ -340,6 +349,10 @@ sub ParseConfig {
+ Display(Delete must be 'No' when MoveToFolder is also specified in the 
configuration file.\n,stderr=1);
+ DisplayUsageAndExit(); 
+   }
++  if ($Mode !~ m/^(200809|200810)$/i) {
++Display(Mode must be oneof 200809 or 200810 as argument in the 
configuration file.\n,stderr=1);
++DisplayUsageAndExit(); 
++  }
+ }
+ 
+ 

+@@ -535,7 

Re: Razor-agents update

2008-10-25 Thread Mike Erdely
Nobody uses Razor-agents?

-ME

On Thu, Oct 23, 2008 at 05:18:51PM -0400, Mike Erdely wrote:
 This diff updates razor-agents to 2.85.  Tested on i386.
 
 ok?
 
 -ME
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/mail/razor-agents/Makefile,v
 retrieving revision 1.22
 diff -u -p -r1.22 Makefile
 --- Makefile  2 Oct 2008 20:32:19 -   1.22
 +++ Makefile  23 Oct 2008 21:01:45 -
 @@ -4,8 +4,7 @@ SHARED_ONLY=  Yes
  
  COMMENT= agent for Razor spam filtering networks
  
 -DISTNAME=razor-agents-2.84
 -PKGNAME= ${DISTNAME}p1
 +DISTNAME=razor-agents-2.85
  CATEGORIES=  mail
  HOMEPAGE=http://razor.sourceforge.net/
  MAINTAINER=  Michael Erdely [EMAIL PROTECTED]
 Index: distinfo
 ===
 RCS file: /cvs/ports/mail/razor-agents/distinfo,v
 retrieving revision 1.10
 diff -u -p -r1.10 distinfo
 --- distinfo  17 Mar 2008 15:19:29 -  1.10
 +++ distinfo  23 Oct 2008 21:01:50 -
 @@ -1,5 +1,5 @@
 -MD5 (razor-agents-2.84.tar.bz2) = i5oRps4CA4PDLEXRUw13wg==
 -RMD160 (razor-agents-2.84.tar.bz2) = IE/Ctoym8BMpZ2pis2yoe+ZZVl0=
 -SHA1 (razor-agents-2.84.tar.bz2) = U7z3i+7qNtjiBEGlBsKF/w70t1o=
 -SHA256 (razor-agents-2.84.tar.bz2) = 
 Hp645NVi3nnwHgWaeIXl4qh/R2iPFGMQoEAIk+3zB3w=
 -SIZE (razor-agents-2.84.tar.bz2) = 79196
 +MD5 (razor-agents-2.85.tar.bz2) = AU0I20AYfLExZIIZFWawEg==
 +RMD160 (razor-agents-2.85.tar.bz2) = yYCW2hT/T7dy9tdQHp0UxbS05Y8=
 +SHA1 (razor-agents-2.85.tar.bz2) = v1eXrp+vIPfjY1iDdnqVzfBzm6k=
 +SHA256 (razor-agents-2.85.tar.bz2) = 
 f+Cv5z5bOXlETdhuKtJeqZvAWyPVZI01dUT3jwtuttc=
 +SIZE (razor-agents-2.85.tar.bz2) = 81691
 



Razor-agents update

2008-10-23 Thread Mike Erdely
This diff updates razor-agents to 2.85.  Tested on i386.

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/mail/razor-agents/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile2 Oct 2008 20:32:19 -   1.22
+++ Makefile23 Oct 2008 21:01:45 -
@@ -4,8 +4,7 @@ SHARED_ONLY=Yes
 
 COMMENT=   agent for Razor spam filtering networks
 
-DISTNAME=  razor-agents-2.84
-PKGNAME=   ${DISTNAME}p1
+DISTNAME=  razor-agents-2.85
 CATEGORIES=mail
 HOMEPAGE=  http://razor.sourceforge.net/
 MAINTAINER=Michael Erdely [EMAIL PROTECTED]
Index: distinfo
===
RCS file: /cvs/ports/mail/razor-agents/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo17 Mar 2008 15:19:29 -  1.10
+++ distinfo23 Oct 2008 21:01:50 -
@@ -1,5 +1,5 @@
-MD5 (razor-agents-2.84.tar.bz2) = i5oRps4CA4PDLEXRUw13wg==
-RMD160 (razor-agents-2.84.tar.bz2) = IE/Ctoym8BMpZ2pis2yoe+ZZVl0=
-SHA1 (razor-agents-2.84.tar.bz2) = U7z3i+7qNtjiBEGlBsKF/w70t1o=
-SHA256 (razor-agents-2.84.tar.bz2) = 
Hp645NVi3nnwHgWaeIXl4qh/R2iPFGMQoEAIk+3zB3w=
-SIZE (razor-agents-2.84.tar.bz2) = 79196
+MD5 (razor-agents-2.85.tar.bz2) = AU0I20AYfLExZIIZFWawEg==
+RMD160 (razor-agents-2.85.tar.bz2) = yYCW2hT/T7dy9tdQHp0UxbS05Y8=
+SHA1 (razor-agents-2.85.tar.bz2) = v1eXrp+vIPfjY1iDdnqVzfBzm6k=
+SHA256 (razor-agents-2.85.tar.bz2) = 
f+Cv5z5bOXlETdhuKtJeqZvAWyPVZI01dUT3jwtuttc=
+SIZE (razor-agents-2.85.tar.bz2) = 81691



Re: approved practice question

2008-10-11 Thread Mike Erdely
On Sat, Oct 11, 2008 at 12:28:57PM -0600, Jack Woehr wrote:
 Let's say a port has to start a daemon to work. To have that happen at  
 startup I would
 assume that means an rc.local phrase ... Is it approved practice to have  
 a port edit rc.local?
 Or is there a safer and saner practice for this sort of thing?

Put something in pkg/MESSAGE or create a README.OpenBSD file.

-ME



Re: Perl 5.10 fallout

2008-10-01 Thread Mike Erdely
On Wed, Oct 01, 2008 at 09:09:34PM +0200, Christian Weisgerber wrote:
 textproc/p5-SWISH-API

Attached diff ok?  (From upstream)
Regress tests pass on macppc.

-ME

Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-SWISH-API/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile11 Sep 2007 20:55:21 -  1.1.1.1
+++ Makefile1 Oct 2008 20:48:06 -
@@ -4,7 +4,7 @@ COMMENT=Perl interface to the swish-e C
 SHARED_ONLY=   Yes
 
 DISTNAME=  swish-e-2.4.5
-PKGNAME=   p5-SWISH-API-0.04
+PKGNAME=   p5-SWISH-API-0.04p0
 CATEGORIES=textproc
 MODULES=   cpan
 
Index: patches/patch-perl_Makefile_PL
===
RCS file: patches/patch-perl_Makefile_PL
diff -N patches/patch-perl_Makefile_PL
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-perl_Makefile_PL  1 Oct 2008 20:49:50 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fixes build after perl 5.10 update.
+
+--- perl/Makefile.PL.orig  Wed Oct  1 16:48:37 2008
 perl/Makefile.PL   Wed Oct  1 16:49:18 2008
+@@ -80,10 +80,8 @@ Can be either environment variables or passed on comma
+ 
+ EOF
+ 
+-$SIG{__DIE__} = sub {
+-print STDERR \n  ** ERROR: , @_;
+-print STDERR   Run perl Makefile.PL SWISHHELP for options\n\n;
+-exit 1;
++END {
++print STDERR Run perl Makefile.PL SWISHHELP for options\n\n if $?;
+ };
+ 
+ 
#--



Re: Perl 5.10 fallout

2008-10-01 Thread Mike Erdely
On Wed, Oct 01, 2008 at 11:37:21PM +0200, Simon Bertrang wrote:
 On Wed, Oct 01, 2008 at 09:09:34PM +0200, Christian Weisgerber wrote:
  Here's a list of ports that fail to build after the Perl 5.10 update:
  
 ...
  devel/p5-Class-MethodMaker
 ...
 
 The following update fixes it.  So far tested including dependencies on
 amd64, oks?
 
 Regards,
 Simon

ok here on macppc.



Re: UPDATE: net/unworkable 0.5

2008-09-22 Thread Mike Erdely
On Mon, Sep 22, 2008 at 12:16:46PM -0700, Niall O'Higgins wrote:
 Martynas pointed out that 0.5  20080108 therefore pkgtools would
 think this change is a downgrade.  Updated diff to address this:

Works for me on macppc.  ok



alpha bulk build breakage

2008-09-02 Thread Mike Erdely
The first set are ports whose build fails.  I haven't looked into why or
contacted maintainers.
The second set are ports that don't build because they depend on
something 'not for alpha' or is marked as broken.

Build problems:
---
editors/emacs22 = unexelf.c:1087: error: syntax error before symhdr
editors/emacs22,no_x11  = unexelf.c:1087: error: syntax error before symhdr
editors/emacs22,gtk = unexelf.c:1087: error: syntax error before symhdr
graphics/inkscape   = main.o(.text+0x2c): In function `main':
   : undefined reference to `fpgetmask()'
lang/gcc/4.2= /tmp//ccu14009.s: Assembler messages:
   /tmp//ccu14009.s:210: Error: unknown pseudo-op: 
`.rdata'
lang/squeak/vm  = gmake[1]: /decgcc: Command not found
lang/unicon = ../unicon/unicon -c qsort.icn
   *** Signal 10
net/mldonkey/stable = /tmp/camlstartupd5a503.o(.text+0x3d9c): In function 
`caml_curry2':
   : relocation truncated to fit: BRADDR caml_call_gc
www/amaya/browser   = ../../amaya/HTMLform.c: In function 
`SelectOneOption':
   ../../amaya/HTMLform.c:1502: error: could not split 
insn
www/firefox3= ../../../dist/include/xpcom/nsTHashtable.h:368: 
warning: cast from `const
   PLDHashEntryHdr*' to `const nsCookieEntry*' 
increases required alignment of
   target type
x11/xdrawchem   = memory exhausted (even as root)

Broken or 'not for alpha' dependencies:
---
audio/aqualung  = audio/mac [not for alpha]
audio/workman   = x11/xview/config [not for alpha]
devel/hmake = lang/nhc98 [not for alpha]
devel/cpphs = devel/hmake [lang/nhc98]
devel/idoc  = lang/nhc98 [not for alpha]
editors/textedit= x11/xview/config [not for alpha]
math/maxima = lang/clisp [not for alpha]
misc/calentool  = x11/xview/config [not for alpha]
sysutils/contool= x11/xview/config [not for alpha]
x11/olvwm   = x11/xview/config [not for alpha]
plan9/9libs = marked as broken
plan9/wily  = plan9/9libs [marked as broken]



Re: alpha bulk build breakage

2008-09-02 Thread Mike Erdely
On Tue, Sep 02, 2008 at 07:15:44PM +0200, Antoine Jacoutot wrote:
  x11/xdrawchem   = memory exhausted (even as root)
 
 Could you try the included patch and see if that helps.
 Thanks.

Yes.  That fixes it.  It even builds as me. :)

-ME



Bacula 2.4.2

2008-08-21 Thread Mike Erdely
This diff updates bacula to 2.4.2 and adds a no_server pseudo flavor.

So, you can build just the client with:
env FLAVOR=no_bat no_server make package

It also fixes the incorrect package path in the packing list for -client
and -bat.

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile16 Feb 2008 21:22:41 -  1.10
+++ Makefile5 Aug 2008 19:01:49 -
@@ -2,11 +2,15 @@
 
 COMMENT-main=  network backup solution (client)
 COMMENT-server=network backup solution (server)
+COMMENT-bat=   network backup solution (gui-client)
 
-V= 2.2.8
+V= 2.4.2
 DISTNAME=  bacula-$V
-FULLPKGNAME-main=  bacula-client-$Vp0
-PKGNAME-server=bacula-server-$Vp0
+FULLPKGNAME-main=  bacula-client-$V
+FULLPKGPATH-main=  ${PKGPATH},-main
+PKGNAME-server=bacula-server-$V
+FULLPKGNAME-bat=   bacula-bat-$V
+FULLPKGPATH-bat=   ${PKGPATH},-bat
 CATEGORIES=sysutils
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -15,9 +19,8 @@ HOMEPAGE= http://www.bacula.org/
 MAINTAINER=Michael Erdely [EMAIL PROTECTED]
 
 WANTLIB=   c pthread crypto ssl z m stdc++
-WANTLIB-server=${WANTLIB} readline termcap
 
-MULTI_PACKAGES=-main -server
+MULTI_PACKAGES=-main
 
 # GPL (majority), LGPL (some libraries) and PD
 # http://bacula.org/en/dev-manual/Bacula_Copyri_Tradem_Licens.html
@@ -29,12 +32,13 @@ PERMIT_DISTFILES_FTP=   Yes
 SD_USER=   _bacula-sd
 BACULACONF=/etc/bacula
 BACULASTATE=   /var/bacula
-SUBST_VARS=SD_USER BACULACONF BACULASTATE
+SUBST_VARS=SD_USER BACULACONF BACULASTATE TRUEPREFIX
 
 CONFIGURE_STYLE=   simple
 USE_GMAKE= yes
 NO_REGRESS=yes
 
+PSEUDO_FLAVORS=no_bat no_server
 FLAVORS=   pgsql mysql sqlite3 sqlite
 FLAVOR?=   sqlite3
 
@@ -48,16 +52,14 @@ CONFIGURE_ARGS= --enable-smartalloc \
--with-pid-dir=/var/run \
--with-subsys-dir=${BACULASTATE} \
--with-working-dir=${BACULASTATE} \
-   --with-dir-user=_bacula \
-   --with-dir-group=_bacula \
-   --with-sd-user=${SD_USER} \
-   --with-sd-group=_bacula \
+   --with-archivedir=/tmp \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
--without-smtp-host \
--without-job-email \
--without-dump-email \
+   --without-qwt \
--disable-gnome \
--disable-bwx-console \
--disable-tray-monitor \
@@ -77,6 +79,16 @@ CONFIGURE_ENV+=  CPPFLAGS=-I/usr/includ
QMAKEQT4=${LOCALBASE}/bin/qmake4 \

PKG_CONFIG_LIBDIR=${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4
 
+.if ${FLAVOR:L:Mno_server}
+CONFIGURE_ARGS+=   --enable-client-only
+.else
+MULTI_PACKAGES+=   -server
+WANTLIB-server=${WANTLIB} readline termcap
+CONFIGURE_ARGS+=   --with-dir-user=_bacula \
+   --with-dir-group=_bacula \
+   --with-sd-user=${SD_USER} \
+   --with-sd-group=_bacula
+
 BACKEND=
 .if ${FLAVOR:L:Mpgsql}
 .if !empty(BACKEND)
@@ -101,7 +113,7 @@ CONFIGURE_ARGS+=--without-postgresql \
--without-sqlite \
--without-sqlite3 \
--enable-batch-insert
-LIB_DEPENDS+=  lib/mysql/mysqlclient.=10::databases/mysql
+LIB_DEPENDS+=  mysqlclient_r.=18::databases/mysql
 BACKEND=   mysql
 .else
 CONFIGURE_ARGS+=   --without-mysql
@@ -139,28 +151,28 @@ SUBST_VARS+=  BACKEND
 .if empty(BACKEND)
 ERRORS+=   Fatal: choose either pgsql or mysql or sqlite or 
sqlite3
 .endif
+.endif # if no_server
 
 LIB_DEPENDS-main=
 
-PSEUDO_FLAVORS+=   no_bat
 .if ${FLAVOR:L:Mno_bat}
-CONFIGURE_ARGS+=   --disable-bat \
-   --without-qwt
+CONFIGURE_ARGS+=   --disable-bat
 .else
-CONFIGURE_ARGS+=   --enable-bat \
-   --with-qwt=${LOCALBASE}
-FULLPKGNAME-bat=   bacula-bat-$Vp0
-WANTLIB-bat=   ${WANTLIB} ICE QtCore QtGui SM X11 Xcursor Xext Xfixes
-WANTLIB-bat+=  Xi Xinerama Xrandr Xrender fontconfig freetype glib-2.0
-WANTLIB-bat+=  gthread-2.0 iconv intl png
+CONFIGURE_ARGS+=   --enable-bat
+WANTLIB-bat=   ${WANTLIB} ICE SM X11 Xcursor Xext 

Re: Bacula 2.4.2

2008-08-21 Thread Mike Erdely
On Thu, Aug 21, 2008 at 06:27:51PM +0200, Marc Balmer wrote:
 * Mike Erdely wrote:
  This diff updates bacula to 2.4.2 and adds a no_server pseudo flavor.
  
  So, you can build just the client with:
  env FLAVOR=no_bat no_server make package
 
 couldn't make the client and server parts subpackages?

They are.  But what if you only want to build the client?

-ME



Re: UPDATE: mozilla-firefox-3.0

2008-07-15 Thread Mike Erdely
On Tue, Jul 15, 2008 at 04:37:13PM +0100, Edd wrote:
 Whats the status of firefox 3 on OpenBSD?
 
 I have been using a package (given to me from viq, which i assume is
 made from this patch), which has crashed once in about 3 days. Thats
 about normal for firefox in my experience.
 
 I do notice a fair speedup.

Like others, I see a fair speed up and I have only seen crashes with
self-signed certificates.

-ME



[update] Backup 2.4.1

2008-07-10 Thread Mike Erdely
The following diff updates bacula to 2.4.1.

Port Changes:
 - Stop using qwt
 - Use SUBST_CMD
 - Fix PKGPATH for -main (thanks, naddy@)
 - Fix PKGPATH for -bat, too
 - Fix WANTLIB-mysql (thanks, sthen@)
 - Regen patches (add @bin)
 - Remove unnecessary patches/patch-scripts_bacula_in

Bacula Changes:
 - Many bugfixes
 - Major SD reservation rewrite
 - Major autochanger code rewrite

Please test.  ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile16 Feb 2008 21:22:41 -  1.10
+++ Makefile10 Jul 2008 20:44:02 -
@@ -3,10 +3,11 @@
 COMMENT-main=  network backup solution (client)
 COMMENT-server=network backup solution (server)
 
-V= 2.2.8
+V= 2.4.1
 DISTNAME=  bacula-$V
-FULLPKGNAME-main=  bacula-client-$Vp0
-PKGNAME-server=bacula-server-$Vp0
+FULLPKGNAME-main=  bacula-client-$V
+FULLPKGPATH-main=  ${PKGPATH},-main
+PKGNAME-server=bacula-server-$V
 CATEGORIES=sysutils
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -52,12 +53,14 @@ CONFIGURE_ARGS= --enable-smartalloc \
--with-dir-group=_bacula \
--with-sd-user=${SD_USER} \
--with-sd-group=_bacula \
+   --with-archivedir=/tmp \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
--without-smtp-host \
--without-job-email \
--without-dump-email \
+   --without-qwt \
--disable-gnome \
--disable-bwx-console \
--disable-tray-monitor \
@@ -101,7 +104,7 @@ CONFIGURE_ARGS+=--without-postgresql \
--without-sqlite \
--without-sqlite3 \
--enable-batch-insert
-LIB_DEPENDS+=  lib/mysql/mysqlclient.=10::databases/mysql
+LIB_DEPENDS+=  mysqlclient_r.=18::databases/mysql
 BACKEND=   mysql
 .else
 CONFIGURE_ARGS+=   --without-mysql
@@ -144,23 +147,26 @@ LIB_DEPENDS-main=
 
 PSEUDO_FLAVORS+=   no_bat
 .if ${FLAVOR:L:Mno_bat}
-CONFIGURE_ARGS+=   --disable-bat \
-   --without-qwt
+CONFIGURE_ARGS+=   --disable-bat
 .else
-CONFIGURE_ARGS+=   --enable-bat \
-   --with-qwt=${LOCALBASE}
-FULLPKGNAME-bat=   bacula-bat-$Vp0
-WANTLIB-bat=   ${WANTLIB} ICE QtCore QtGui SM X11 Xcursor Xext Xfixes
-WANTLIB-bat+=  Xi Xinerama Xrandr Xrender fontconfig freetype glib-2.0
-WANTLIB-bat+=  gthread-2.0 iconv intl png
+CONFIGURE_ARGS+=   --enable-bat
+FULLPKGNAME-bat=   bacula-bat-$V
+FULLPKGPATH-bat=   ${PKGPATH},-bat
+WANTLIB-bat=   ${WANTLIB} ICE SM X11 Xcursor Xext Xfixes
+WANTLIB-bat+=  Xi Xinerama Xrandr Xrender fontconfig freetype
+WANTLIB-bat+=  glib-2.0 gthread-2.0 iconv intl png
 MULTI_PACKAGES+=   -bat
-LIB_DEPENDS-bat=   qwt.=5::x11/qwt
+LIB_DEPENDS-bat=   QtCore,QtGui::x11/qt4
 COMMENT-bat=   network backup solution (gui-client)
 .endif
 
+post-extract:
+   @cp ${FILESDIR}/README-{client,server}.OpenBSD ${WRKDIR}
+
 pre-configure:
-   perl -pi -e s%!!BACULACONF!!%${BACULACONF}% \
-   ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp
+   ${SUBST_CMD} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp 
\
+   ${WRKDIR}/README-client.OpenBSD \
+   ${WRKDIR}/README-server.OpenBSD
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
@@ -170,12 +176,8 @@ post-install:
${WRKINST}/etc/bacula/bconsole.conf \
${PREFIX}/share/examples/bacula/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bacula
-   perl -pe 
s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g \
-   ${FILESDIR}/README-client.OpenBSD  \
-   ${PREFIX}/share/doc/bacula/README-client.OpenBSD
-   perl -pe 
s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g,s%!!SD_USER!!%${SD_USER}%g
 \
-   ${FILESDIR}/README-server.OpenBSD  \
-   ${PREFIX}/share/doc/bacula/README-server.OpenBSD
+   ${INSTALL_DATA} ${WRKDIR}/README-{client,server}.OpenBSD \
+   ${PREFIX}/share/doc/bacula/
 .if !${FLAVOR:L:Mno_bat}
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/bacula/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- 

Re: [update] Bacula 2.4.1 (not Backup)

2008-07-10 Thread Mike Erdely
On Thu, Jul 10, 2008 at 04:49:22PM -0400, Mike Erdely wrote:
 The following diff updates bacula to 2.4.1.

As ajacoutot pointed out, I should be using ${PREFIX}, not ${LOCALBASE}
in files/README-*.OpenBSD.

-ME

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile16 Feb 2008 21:22:41 -  1.10
+++ Makefile10 Jul 2008 20:44:02 -
@@ -3,10 +3,11 @@
 COMMENT-main=  network backup solution (client)
 COMMENT-server=network backup solution (server)
 
-V= 2.2.8
+V= 2.4.1
 DISTNAME=  bacula-$V
-FULLPKGNAME-main=  bacula-client-$Vp0
-PKGNAME-server=bacula-server-$Vp0
+FULLPKGNAME-main=  bacula-client-$V
+FULLPKGPATH-main=  ${PKGPATH},-main
+PKGNAME-server=bacula-server-$V
 CATEGORIES=sysutils
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -52,12 +53,14 @@ CONFIGURE_ARGS= --enable-smartalloc \
--with-dir-group=_bacula \
--with-sd-user=${SD_USER} \
--with-sd-group=_bacula \
+   --with-archivedir=/tmp \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
--without-smtp-host \
--without-job-email \
--without-dump-email \
+   --without-qwt \
--disable-gnome \
--disable-bwx-console \
--disable-tray-monitor \
@@ -101,7 +104,7 @@ CONFIGURE_ARGS+=--without-postgresql \
--without-sqlite \
--without-sqlite3 \
--enable-batch-insert
-LIB_DEPENDS+=  lib/mysql/mysqlclient.=10::databases/mysql
+LIB_DEPENDS+=  mysqlclient_r.=18::databases/mysql
 BACKEND=   mysql
 .else
 CONFIGURE_ARGS+=   --without-mysql
@@ -144,23 +147,26 @@ LIB_DEPENDS-main=
 
 PSEUDO_FLAVORS+=   no_bat
 .if ${FLAVOR:L:Mno_bat}
-CONFIGURE_ARGS+=   --disable-bat \
-   --without-qwt
+CONFIGURE_ARGS+=   --disable-bat
 .else
-CONFIGURE_ARGS+=   --enable-bat \
-   --with-qwt=${LOCALBASE}
-FULLPKGNAME-bat=   bacula-bat-$Vp0
-WANTLIB-bat=   ${WANTLIB} ICE QtCore QtGui SM X11 Xcursor Xext Xfixes
-WANTLIB-bat+=  Xi Xinerama Xrandr Xrender fontconfig freetype glib-2.0
-WANTLIB-bat+=  gthread-2.0 iconv intl png
+CONFIGURE_ARGS+=   --enable-bat
+FULLPKGNAME-bat=   bacula-bat-$V
+FULLPKGPATH-bat=   ${PKGPATH},-bat
+WANTLIB-bat=   ${WANTLIB} ICE SM X11 Xcursor Xext Xfixes
+WANTLIB-bat+=  Xi Xinerama Xrandr Xrender fontconfig freetype
+WANTLIB-bat+=  glib-2.0 gthread-2.0 iconv intl png
 MULTI_PACKAGES+=   -bat
-LIB_DEPENDS-bat=   qwt.=5::x11/qwt
+LIB_DEPENDS-bat=   QtCore,QtGui::x11/qt4
 COMMENT-bat=   network backup solution (gui-client)
 .endif
 
+post-extract:
+   @cp ${FILESDIR}/README-{client,server}.OpenBSD ${WRKDIR}
+
 pre-configure:
-   perl -pi -e s%!!BACULACONF!!%${BACULACONF}% \
-   ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp
+   ${SUBST_CMD} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp 
\
+   ${WRKDIR}/README-client.OpenBSD \
+   ${WRKDIR}/README-server.OpenBSD
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
@@ -170,12 +176,8 @@ post-install:
${WRKINST}/etc/bacula/bconsole.conf \
${PREFIX}/share/examples/bacula/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bacula
-   perl -pe 
s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g \
-   ${FILESDIR}/README-client.OpenBSD  \
-   ${PREFIX}/share/doc/bacula/README-client.OpenBSD
-   perl -pe 
s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g,s%!!SD_USER!!%${SD_USER}%g
 \
-   ${FILESDIR}/README-server.OpenBSD  \
-   ${PREFIX}/share/doc/bacula/README-server.OpenBSD
+   ${INSTALL_DATA} ${WRKDIR}/README-{client,server}.OpenBSD \
+   ${PREFIX}/share/doc/bacula/
 .if !${FLAVOR:L:Mno_bat}
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/bacula/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo7 Feb 2008 02:53:35 -   1.3
+++ distinfo9 Jul 2008 20:20:36 -
@@ -1,5 +1,5 @@
-MD5 (bacula-2.2.8.tar.gz) = RUfQv5+XbV2epfIae9B47g==
-RMD160 (bacula-2.2.8.tar.gz

Re: UPDATE: cln-1.2.2

2008-06-17 Thread Mike Erdely
On Mon, Jun 16, 2008 at 11:51:12PM -0400, Mike Erdely wrote:
 Alpha is... still... building...

No regressions on alpha.



Re: UPDATE: cln-1.2.2

2008-06-16 Thread Mike Erdely
On Mon, Jun 16, 2008 at 07:37:55PM +0200, Steven Mestdagh wrote:
 Paul Irofti [2008-06-16, 01:34:57]:
  Tested on i386. My amd64 is broken at the moment and until I'll have the
  time and the cash to fix the hardware it will remain that way. So
  please test.
 
 tests passed on amd64 here. can't test sparc64 any time soon, maybe someone
 else could?

I've been building on alpha and sparc64 for a few hours now...  Still 
building...
I'll write back when done.

Builds and passes regression tests on macppc.

-ME



Re: UPDATE: cln-1.2.2

2008-06-16 Thread Mike Erdely
On Mon, Jun 16, 2008 at 11:01:11PM -0400, Mike Erdely wrote:
 On Mon, Jun 16, 2008 at 07:37:55PM +0200, Steven Mestdagh wrote:
  tests passed on amd64 here. can't test sparc64 any time soon, maybe someone
  else could?
 
 I've been building on alpha and sparc64 for a few hours now...  Still 
 building...
 I'll write back when done.

Sparc64 fails regression tests.  I did not look into it at all.
Log: http://erdelynet.com/downloads/cln_regress_sparc64.log

Alpha is... still... building...

-ME



Re: NEW: misc/tmux

2008-05-30 Thread Mike Erdely
NO_REGRESS = Yes
And, it's missing MAINTAINER.

-ME

On Fri, May 30, 2008 at 10:27:35PM +0100, Nicholas Marriott wrote:
 Window splitting is on the todo list but it won't be any time soon.
 
 Port looks good to me aside from a couple of things. You can do:
 
 FAKE_FLAGS= PREFIX=${PREFIX}
 
 And lose the Makefile patch. Also, PKGNAME doesn't need to be defined if it
 is the same as DISTNAME.
 
 Port works for me on i386.
 
 -- Nicholas
 
 
 On Fri, May 30, 2008 at 09:58:33AM +0200, Guillaume Sellier wrote:
  Brynet wrote:
 
  No problem, thanks for testing.. attaching a fixed copy.
 
  tested on amd64, working well.
  Do you know if horizontal splitting feature is planned (as in screen-cvs) ?
 
  -- 
  Guillaume
 
 



Re: UPDATE: mail/mutt

2008-05-19 Thread Mike Erdely
On Mon, May 19, 2008 at 10:48:07AM +0100, Stuart Henderson wrote:
 This includes a fixed sidebar diff, and fixes double-WANTLIB from
 a bad merge.

I tested FLAVOR=sasl on i386 and FLAVOR=sidebar sasl on macppc
connecting to an IMAP server.  Looks ok to me.

-ME



Re: UPDATE: www/nginx-0.6.30 - 0.6.31

2008-05-12 Thread Mike Erdely
On Mon, May 12, 2008 at 12:19:32PM -0700, Darrin Chandler wrote:
 Bugfix update to latest version. Fixes include:
 
 *) Bugfix: nginx did not process FastCGI response if header was at
the end of FastCGI record; bug appeared in 0.6.2.  Thanks to
Sergey Serov.
   
  
 *) bugfix: a segmentation fault might occur in worker process if a
file was deleted and the open_file_cache_errors directive was
off.
 
 Basic tests by me on i386/amd64/sparc64.
 
 Please review, test and commit. Thanks!

Basic tests pass on macppc for me.
ok?

-ME



Re: MAINTAINER UPDATE: nginx-0.5.35 - nginx 0.6.30

2008-05-07 Thread Mike Erdely
On Wed, May 07, 2008 at 12:36:36PM -0700, Darrin Chandler wrote:
 On Wed, May 07, 2008 at 12:13:45PM -0700, Darrin Chandler wrote:
  Nginx has recently made 0.6.x the -stable branch, and 0.5.x will no
  longer be updated. Too many new features, fixes, and changes to include
  here. I have tested basic functionality (a couple of my own sites) on
  sparc64 and amd64.
  
  Anyone using nginx with more advanced features or on other platforms
  please test the attached diff! Feedback and/or bitching welcome.
 
 New diff attached without PKGNAME=${DISTNAME} (thanks, merdely!). Also
 did basic test on i386.

Very basic tests on macppc and alpha.
Looks good to me.  ok?

-ME



Re: request for privoxy 3.0.8

2008-05-02 Thread Mike Erdely
On Fri, May 02, 2008 at 09:35:26PM +0200, [EMAIL PROTECTED] wrote:
 Want to know if somebody is working on a privoxy 3.0.8 package/port. It 
 seems that the privoxy development is active again. The new version include 
 a function called accept-intercepted-requests which is helpful to create 
 a transparent http proxy.

The in-tree port was updated to 3.0.8 after 4.3.

 At the moment I download the ports tree and hopefully create my first 
 OpenBSD port/package. But it would be much easer to just type dpg_add -i 
 privoxy ;-)

If you're using -current/snapshots, it's already there.
If you're using 4.3, it's not that difficult to backport it.

 Best Regards
 Milli

-ME



Re: current or stable?

2008-05-01 Thread Mike Erdely
On Thu, May 01, 2008 at 05:52:02PM -0700, Daniel Thomas Nevistic wrote:
 I am working on learning how to port, c. and am trying to figure out which 
 flavor of OpenBSD that I need to run.  Does it need to be current if I want 
 to help with porting?

You should run -current for working on ports.

-ME



Re: UPDATE: print/foo2zjs

2008-04-09 Thread Mike Erdely
On Wed, Apr 09, 2008 at 06:52:06PM +0200, Giovanni Bechis wrote:
 Foo2zjs updated to latest version,
 some patches has been included upstream, bugs fixed and some other printers 
 are supported.
 Full changelog available at:
 http://foo2zjs.rkkda.com/ChangeLog
  Cheers
   Giovanni

Tested with my HP LaserJet 2600n w/ CUPS on alpha.

ok?

-ME



Re: update: x11/dmenu

2008-04-08 Thread Mike Erdely
On Tue, Apr 08, 2008 at 05:29:43AM +0200, Tobias Ulmer wrote:
 I really need some sleep, so here are the facts:
 
 - Original diff by Jim Razmus (thx!) + regen patch while i'm at it.
 - Tested on i386, worksforme(tm)
 - The upcoming dwm update depends on this.
 - Remember that dmenu is now case sensitive.

Tested on i386 and amd64.  Builds on macppc, alpha and sparc64, too.

ok to commit?

-ME



Re: UPDATE: x11/dwm

2008-04-08 Thread Mike Erdely
On Tue, Apr 08, 2008 at 09:40:06AM -0400, Jim Razmus wrote:
 Uplift dwm to 4.9.  Fixes several bugs.  This update is dependent on
 Tobias update to dmenu.
 
 I've been using it daily since 4.9 was tagged.  Please test.

Jim,

How about the diff below?  It honors our CFLAGS and drops the $V
variable (as you don't use the version more than once now).

Works for me on i386 and amd64.
Builds on macppc, alpha, sparc64.

-ME

Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile25 Nov 2007 12:07:06 -  1.6
+++ Makefile8 Apr 2008 15:54:35 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-V= 4.7
-DISTNAME=  dwm-$V
+DISTNAME=  dwm-4.9
 
 CATEGORIES=x11
 
@@ -24,11 +23,7 @@ MASTER_SITES=http://www.suckless.org/d
 RUN_DEPENDS=   ::x11/dmenu \
::x11/terminus-font
 
-CFLAGS+=   -I. -I${X11BASE}/include -DVERSION=\\\$V\\\
-LDFLAGS+=  -L${X11BASE}/lib -lX11
-MAKE_FLAGS=CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS}
-FAKE_FLAGS=MANPREFIX=${PREFIX}/man \
-   PREFIX=${PREFIX}
+FAKE_FLAGS=DESTDIR=
 
 USE_X11=   Yes
 
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo25 Nov 2007 12:07:06 -  1.6
+++ distinfo8 Apr 2008 15:50:42 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.9.tar.gz) = z3LGpy5sNcEytdtPrz+zWA==
+RMD160 (dwm-4.9.tar.gz) = jNgvEPCsWFLiw6tRd033EKKb2LI=
+SHA1 (dwm-4.9.tar.gz) = yOz5MghPYmoi78AgdkpiquvUjbU=
+SHA256 (dwm-4.9.tar.gz) = P09ZXnhFztzhaWZorfCoreL8inLUwy1T3jWnxdkAeQ0=
+SIZE (dwm-4.9.tar.gz) = 18132
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  27 Oct 2007 12:41:48 -  1.2
+++ patches/patch-Makefile  8 Apr 2008 15:50:42 -
@@ -1,21 +1,22 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
 Makefile.orig  Thu Oct 25 14:24:37 2007
-+++ Makefile   Thu Oct 25 16:24:41 2007
-@@ -15,8 +15,7 @@ options:
-   @echo CC   = ${CC}
+$OpenBSD$
+--- Makefile.orig  Fri Apr  4 16:03:22 2008
 Makefile   Fri Apr  4 16:04:30 2008
+@@ -16,9 +16,9 @@ options:
  
  .c.o:
--  @echo CC $
+   @echo CC $
 -  @${CC} -c ${CFLAGS} $
 +  ${CC} -c ${CFLAGS} $
  
- ${OBJ}: config.h config.mk
+-${OBJ}: config.h config.mk
++#${OBJ}: config.h config.mk
  
-@@ -25,8 +24,7 @@ config.h:
-   @cp config.def.h $@
+ config.h:
+   @echo creating $@ from config.def.h
+@@ -26,7 +26,7 @@ config.h:
  
  dwm: ${OBJ}
--  @echo CC -o $@
+   @echo CC -o $@
 -  @${CC} -o $@ ${OBJ} ${LDFLAGS}
 +  ${CC} -o $@ ${OBJ} ${LDFLAGS}
  
Index: patches/patch-config_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config_h
--- patches/patch-config_h  25 Nov 2007 12:07:06 -  1.3
+++ patches/patch-config_h  8 Apr 2008 15:50:42 -
@@ -1,15 +1,18 @@
 config.h.orig  Sat Nov 24 23:23:08 2007
-+++ config.h   Sat Nov 24 23:23:09 2007
-@@ -4,12 +4,12 @@
- #define BARPOSBarTop /* BarBot, BarOff */
+$OpenBSD$
+--- config.h.orig  Sat Apr  5 09:30:54 2008
 config.h   Sat Apr  5 09:35:44 2008
+@@ -2,19 +2,20 @@
+ 
+ /* appearance */
  #define BORDERPX  1
- #define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
+-#define FONT  -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
 -#define NORMBORDERCOLOR   #cc
 -#define NORMBGCOLOR   #cc
 -#define NORMFGCOLOR   #00
 -#define SELBORDERCOLOR#0066ff
 -#define SELBGCOLOR#0066ff
 -#define SELFGCOLOR#ff
++#define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
 +#define NORMBORDERCOLOR   #404040
 +#define NORMBGCOLOR   #202020
 +#define NORMFGCOLOR   #c0c0c0
@@ -18,13 +21,20 @@
 +#define SELFGCOLOR#f0f0f0
  
  /* tagging */
- const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 
www };
-@@ -39,7 +39,7 @@ Key keys[] = {
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 
};
+ 
+ Rule rules[] = {
+   /* classinstancetitle  

Re: UPDATE: x11/dwm

2008-04-08 Thread Mike Erdely
On Tue, Apr 08, 2008 at 12:15:23PM -0400, Mike Erdely wrote:
 How about the diff below?  It honors our CFLAGS and drops the $V
 variable (as you don't use the version more than once now).

As jasper@ pointed out to me, the dwm diff does not require the updated
dmenu diff:

Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile25 Nov 2007 12:07:06 -  1.6
+++ Makefile8 Apr 2008 16:31:28 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-V= 4.7
-DISTNAME=  dwm-$V
+DISTNAME=  dwm-4.9
 
 CATEGORIES=x11
 
@@ -21,14 +20,10 @@ WANTLIB=X11 c
 
 MASTER_SITES=  http://www.suckless.org/download/
 
-RUN_DEPENDS=   ::x11/dmenu \
+RUN_DEPENDS=   :dmenu-=3.6:x11/dmenu \
::x11/terminus-font
 
-CFLAGS+=   -I. -I${X11BASE}/include -DVERSION=\\\$V\\\
-LDFLAGS+=  -L${X11BASE}/lib -lX11
-MAKE_FLAGS=CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS}
-FAKE_FLAGS=MANPREFIX=${PREFIX}/man \
-   PREFIX=${PREFIX}
+FAKE_FLAGS=DESTDIR=
 
 USE_X11=   Yes
 
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo25 Nov 2007 12:07:06 -  1.6
+++ distinfo8 Apr 2008 15:50:42 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.9.tar.gz) = z3LGpy5sNcEytdtPrz+zWA==
+RMD160 (dwm-4.9.tar.gz) = jNgvEPCsWFLiw6tRd033EKKb2LI=
+SHA1 (dwm-4.9.tar.gz) = yOz5MghPYmoi78AgdkpiquvUjbU=
+SHA256 (dwm-4.9.tar.gz) = P09ZXnhFztzhaWZorfCoreL8inLUwy1T3jWnxdkAeQ0=
+SIZE (dwm-4.9.tar.gz) = 18132
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  27 Oct 2007 12:41:48 -  1.2
+++ patches/patch-Makefile  8 Apr 2008 15:50:42 -
@@ -1,21 +1,22 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
 Makefile.orig  Thu Oct 25 14:24:37 2007
-+++ Makefile   Thu Oct 25 16:24:41 2007
-@@ -15,8 +15,7 @@ options:
-   @echo CC   = ${CC}
+$OpenBSD$
+--- Makefile.orig  Fri Apr  4 16:03:22 2008
 Makefile   Fri Apr  4 16:04:30 2008
+@@ -16,9 +16,9 @@ options:
  
  .c.o:
--  @echo CC $
+   @echo CC $
 -  @${CC} -c ${CFLAGS} $
 +  ${CC} -c ${CFLAGS} $
  
- ${OBJ}: config.h config.mk
+-${OBJ}: config.h config.mk
++#${OBJ}: config.h config.mk
  
-@@ -25,8 +24,7 @@ config.h:
-   @cp config.def.h $@
+ config.h:
+   @echo creating $@ from config.def.h
+@@ -26,7 +26,7 @@ config.h:
  
  dwm: ${OBJ}
--  @echo CC -o $@
+   @echo CC -o $@
 -  @${CC} -o $@ ${OBJ} ${LDFLAGS}
 +  ${CC} -o $@ ${OBJ} ${LDFLAGS}
  
Index: patches/patch-config_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config_h
--- patches/patch-config_h  25 Nov 2007 12:07:06 -  1.3
+++ patches/patch-config_h  8 Apr 2008 15:50:42 -
@@ -1,15 +1,18 @@
 config.h.orig  Sat Nov 24 23:23:08 2007
-+++ config.h   Sat Nov 24 23:23:09 2007
-@@ -4,12 +4,12 @@
- #define BARPOSBarTop /* BarBot, BarOff */
+$OpenBSD$
+--- config.h.orig  Sat Apr  5 09:30:54 2008
 config.h   Sat Apr  5 09:35:44 2008
+@@ -2,19 +2,20 @@
+ 
+ /* appearance */
  #define BORDERPX  1
- #define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
+-#define FONT  -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
 -#define NORMBORDERCOLOR   #cc
 -#define NORMBGCOLOR   #cc
 -#define NORMFGCOLOR   #00
 -#define SELBORDERCOLOR#0066ff
 -#define SELBGCOLOR#0066ff
 -#define SELFGCOLOR#ff
++#define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
 +#define NORMBORDERCOLOR   #404040
 +#define NORMBGCOLOR   #202020
 +#define NORMFGCOLOR   #c0c0c0
@@ -18,13 +21,20 @@
 +#define SELFGCOLOR#f0f0f0
  
  /* tagging */
- const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 
www };
-@@ -39,7 +39,7 @@ Key keys[] = {
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 
};
+ 
+ Rule rules[] = {
+   /* classinstancetitle   tags ref
isfloating */
++  { Firefox,NULL

Re: UPDATE: x11/dwm

2008-04-08 Thread Mike Erdely
On Tue, Apr 08, 2008 at 07:37:50PM +0200, Tobias Ulmer wrote:
 On Tue, Apr 08, 2008 at 12:34:07PM -0400, Mike Erdely wrote:
  As jasper@ pointed out to me, the dwm diff does not require the updated
  dmenu diff:
 
 It does, dmenu_run is new. We could replace it with the old
 dmenu_path | dmenu construct, but that would be silly.

Ugh.  I had a misplaced not in my sentence.

 My 2 cents:
 - remove pre-patch target
 - remove patch-Makefile, doesn't do anything except eye candy
 - patch config.def.h directly, also use tags[8] instead of 9, like the
   the rest of the config.
 - remove patch-config_h
 - for config.mk, don't += LDFLAGS, they're  not supposed to be
   configurable like CFLAGS in a port.

I don't know how that slipped in there.  That was a mistake.

 - Don't hardcode CC

This diff looks good and works for me.  ok?

-ME



Re: UPDATE: x11/dwm

2008-04-08 Thread Mike Erdely
On Wed, Apr 09, 2008 at 02:37:05AM +0200, Matthias Kilian wrote:
 On Tue, Apr 08, 2008 at 07:37:50PM +0200, Tobias Ulmer wrote:
  - remove patch-Makefile, doesn't do anything except eye candy
 
 Well, this (and probably other dwm stuff) is initially from me, and
 I don't think it's eye candy. I prefer to see every single command
 run from make, with all arguments, and not just some
 
   CC foo.c

Taking this into account.. new diff attached.

-ME

Index: Makefile
===
RCS file: /cvs/ports/x11/dwm/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile25 Nov 2007 12:07:06 -  1.6
+++ Makefile9 Apr 2008 01:18:15 -
@@ -2,8 +2,7 @@
 
 COMMENT=   dynamic window manager
 
-V= 4.7
-DISTNAME=  dwm-$V
+DISTNAME=  dwm-4.9
 
 CATEGORIES=x11
 
@@ -21,20 +20,13 @@ WANTLIB=X11 c
 
 MASTER_SITES=  http://www.suckless.org/download/
 
-RUN_DEPENDS=   ::x11/dmenu \
+RUN_DEPENDS=   :dmenu-=3.6:x11/dmenu \
::x11/terminus-font
 
-CFLAGS+=   -I. -I${X11BASE}/include -DVERSION=\\\$V\\\
-LDFLAGS+=  -L${X11BASE}/lib -lX11
-MAKE_FLAGS=CC=${CC} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS}
-FAKE_FLAGS=MANPREFIX=${PREFIX}/man \
-   PREFIX=${PREFIX}
+FAKE_FLAGS=DESTDIR=
 
 USE_X11=   Yes
 
 NO_REGRESS=Yes
-
-pre-patch:
-   @cp ${WRKSRC}/config.def.h ${WRKSRC}/config.h
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/x11/dwm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo25 Nov 2007 12:07:06 -  1.6
+++ distinfo9 Apr 2008 01:18:15 -
@@ -1,5 +1,5 @@
-MD5 (dwm-4.7.tar.gz) = gnsShRSj7bh+II6E/uDrPw==
-RMD160 (dwm-4.7.tar.gz) = KkZM67ykMcC7GZ/Arp/axIEFwiY=
-SHA1 (dwm-4.7.tar.gz) = 23CkLts4PmU5zOT5qO4fy+Watz0=
-SHA256 (dwm-4.7.tar.gz) = N0gZV/wkf2hgullCdI+PibUmv1uLIQQgAdOE6INgxao=
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.9.tar.gz) = z3LGpy5sNcEytdtPrz+zWA==
+RMD160 (dwm-4.9.tar.gz) = jNgvEPCsWFLiw6tRd033EKKb2LI=
+SHA1 (dwm-4.9.tar.gz) = yOz5MghPYmoi78AgdkpiquvUjbU=
+SHA256 (dwm-4.9.tar.gz) = P09ZXnhFztzhaWZorfCoreL8inLUwy1T3jWnxdkAeQ0=
+SIZE (dwm-4.9.tar.gz) = 18132
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/dwm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  27 Oct 2007 12:41:48 -  1.2
+++ patches/patch-Makefile  9 Apr 2008 01:19:33 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/10/27 12:41:48 merdely Exp $
 Makefile.orig  Thu Oct 25 14:24:37 2007
-+++ Makefile   Thu Oct 25 16:24:41 2007
+$OpenBSD$
+--- Makefile.orig  Tue Apr  8 21:19:10 2008
 Makefile   Tue Apr  8 21:19:28 2008
 @@ -15,8 +15,7 @@ options:
@echo CC   = ${CC}
  
Index: patches/patch-config_def_h
===
RCS file: patches/patch-config_def_h
diff -N patches/patch-config_def_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-config_def_h  9 Apr 2008 01:18:15 -
@@ -0,0 +1,40 @@
+$OpenBSD$
+--- config.def.h.orig  Thu Apr  3 22:57:01 2008
 config.def.h   Tue Apr  8 19:02:10 2008
+@@ -2,19 +2,20 @@
+ 
+ /* appearance */
+ #define BORDERPX  1
+-#define FONT  -*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*
+-#define NORMBORDERCOLOR   #cc
+-#define NORMBGCOLOR   #cc
+-#define NORMFGCOLOR   #00
+-#define SELBORDERCOLOR#0066ff
+-#define SELBGCOLOR#0066ff
+-#define SELFGCOLOR#ff
++#define FONT  -*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*
++#define NORMBORDERCOLOR   #404040
++#define NORMBGCOLOR   #202020
++#define NORMFGCOLOR   #c0c0c0
++#define SELBORDERCOLOR#ff
++#define SELBGCOLOR#404040
++#define SELFGCOLOR#f0f0f0
+ 
+ /* tagging */
+ const char tags[][MAXTAGLEN] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 
};
+ 
+ Rule rules[] = {
+   /* classinstancetitle   tags ref
isfloating */
++  { Firefox,NULL,   NULL,   tags[8],False },
+   { Gimp,   NULL,   NULL,   NULL,   True },
+ };
+ 
+@@ -46,7 +47,7 @@ Key keys[] = {
+   /* modifier key function
argument */
+   { MODKEY,   XK_p,   spawn,
+   exec dmenu_run -fn 'FONT' -nb 'NORMBGCOLOR' -nf 
'NORMFGCOLOR' -sb 'SELBGCOLOR' -sf 'SELFGCOLOR' },
+-  { MODKEY|ShiftMask, XK_Return,  spawn,  exec 
uxterm },
++  { 

Re: Privoxy stable release is 3.0.8

2008-04-02 Thread Mike Erdely
On Sat, Mar 15, 2008 at 05:57:37PM +0100, you wrote:
 But ports still have 3.0.3. Any chances of getting this updated? There's
 atleast one security update in there...

This updates privoxy to 3.0.8.
Some patches were removed because they're included upstream.
Works for me on i386 and builds  packages on alpha, sparc64  macppc.
Discussed with old MAINTAINER (ckuethe), I'll take maintainership.

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/www/privoxy/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile15 Sep 2007 20:38:25 -  1.12
+++ Makefile2 Apr 2008 21:10:03 -
@@ -2,13 +2,13 @@
 
 COMMENT=   web proxy with advanced filtering capabilities
 
-DISTNAME=  privoxy-3.0.3-2-stable
-PKGNAME=   ${DISTNAME:S/-2-stable//}p0
+DISTNAME=  privoxy-3.0.8-stable
+PKGNAME=   ${DISTNAME:S/-stable//}
 CATEGORIES=www
 
 HOMEPAGE=  http://www.privoxy.org/
 
-MAINTAINER=Chris Kuethe [EMAIL PROTECTED]
+MAINTAINER=Michael Erdely [EMAIL PROTECTED]
 
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
@@ -18,9 +18,7 @@ PERMIT_DISTFILES_FTP= Yes
 WANTLIB=   c pthread
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ijbswa/}
-EXTRACT_SUFX=  .src.tar.gz
-
-WRKDIST=   ${WRKDIR}/${DISTNAME:S/-2//}
+EXTRACT_SUFX=  -src.tar.gz
 
 NO_REGRESS=Yes
 
Index: distinfo
===
RCS file: /cvs/ports/www/privoxy/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo5 Apr 2007 17:26:25 -   1.5
+++ distinfo2 Apr 2008 19:25:29 -
@@ -1,5 +1,5 @@
-MD5 (privoxy-3.0.3-2-stable.src.tar.gz) = 1/bC/Lkm5hEGWd5uhmsh5A==
-RMD160 (privoxy-3.0.3-2-stable.src.tar.gz) = FFcCPTxzv74RLnJiZkepGlDQorc=
-SHA1 (privoxy-3.0.3-2-stable.src.tar.gz) = y0QWvzjMVSsmWM9O1AX7OgL96bs=
-SHA256 (privoxy-3.0.3-2-stable.src.tar.gz) = 
fkiP0Q6kGKY8i9z3F4WauH8kQFSBtxc6QUhSnbs9SOc=
-SIZE (privoxy-3.0.3-2-stable.src.tar.gz) = 1512489
+MD5 (privoxy-3.0.8-stable-src.tar.gz) = JSwOCFIY+5MMS8dWPpzt2Q==
+RMD160 (privoxy-3.0.8-stable-src.tar.gz) = YE3WGiLcdNBtStqks8h+TV2lFJs=
+SHA1 (privoxy-3.0.8-stable-src.tar.gz) = f+K3r95AZu8fFw9fEYUM+dpCikI=
+SHA256 (privoxy-3.0.8-stable-src.tar.gz) = 
7NUcsnhWkfTpDgfRR/XsiaFRsuV49xr7Jr3ZAZVHhJk=
+SIZE (privoxy-3.0.8-stable-src.tar.gz) = 2007961
Index: patches/patch-GNUmakefile_in
===
RCS file: /cvs/ports/www/privoxy/patches/patch-GNUmakefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-GNUmakefile_in
--- patches/patch-GNUmakefile_in23 May 2004 21:38:11 -  1.3
+++ patches/patch-GNUmakefile_in2 Apr 2008 19:41:34 -
@@ -1,15 +1,7 @@
 $OpenBSD: patch-GNUmakefile_in,v 1.3 2004/05/23 21:38:11 pvalchev Exp $
 GNUmakefile.in.orig2002-11-04 00:04:03.0 -0700
-+++ GNUmakefile.in 2004-05-23 15:31:25.0 -0600
-@@ -154,7 +154,6 @@ DOC_STATUS = @DOC_STATUS@
- #DOSFILTER  = gawk -v ORS='\r\n' '{print $0;}'
- DOSFILTER  = $(PERL) -p -e 's/\n/\r\n/'
- CVSROOT= :pserver:[EMAIL PROTECTED]:/cvsroot/ijbswa
--TMPDIR := $(shell mktemp -d /tmp/$(PROGRAM).XX)
- 
- #
- # Setup for make distribution rh and suse for now 
-@@ -226,7 +225,7 @@ PTHREAD_LIB  = @PTHREAD_ONLY@@PTHREAD_LI
+--- GNUmakefile.in.origWed Apr  2 15:27:11 2008
 GNUmakefile.in Wed Apr  2 15:27:48 2008
+@@ -226,7 +226,7 @@ PTHREAD_LIB  = @PTHREAD_ONLY@@PTHREAD_LIB@
  SRCS = $(C_SRC)  $(W32_SRC)  $(PCRS_SRC)  $(PCRE_SRC)  $(REGEX_SRC)
  OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS)
  HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS)
@@ -18,11 +10,3 @@ $OpenBSD: patch-GNUmakefile_in,v 1.3 200
  
  
  #
-@@ -333,6 +332,7 @@ dist-check:
- # This creates a tar.gz and spec-file for a Red Hat 6.x version.
- #
- create-snapshot:
-+  TMPDIR = $(shell mktemp -d /tmp/$(PROGRAM).XX)
-   @tag=`cvs -d $(CVSROOT) status Makefile | awk ' /Sticky Tag/ { print 
$$3 } '` 2 /dev/null; \
-   [ x$$tag = x(none) ]  tag=HEAD; \
-   echo *** Creating package from $$tag!; \
Index: patches/patch-actions_c
===
RCS file: patches/patch-actions_c
diff -N patches/patch-actions_c
--- patches/patch-actions_c 1 Apr 2003 20:52:59 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-actions_c,v 1.2 2003/04/01 20:52:59 sturm Exp $
 actions.c.orig Fri Feb 28 07:52:10 2003
-+++ actions.c  Sat Mar 29 18:17:02 2003
-@@ -1206,7 +1206,7 @@ static int load_one_actions_file(struct 
- init_action(cur_action);
- 
- /* 

Re: Privoxy stable release is 3.0.8

2008-04-02 Thread Mike Erdely
On Wed, Apr 02, 2008 at 03:54:52PM -0700, Matthew Dempsky wrote:
 On Wed, Apr 2, 2008 at 2:48 PM, Mike Erdely [EMAIL PROTECTED] wrote:
   -@@ -344,7 +344,7 @@ char *strdup( const char *s )
   -
   -if (result != NULL)
   -{
   --  strcpy( result, s );
   -+  strlcpy( result, s, sizeof(result) );
   -}
   -
   -return( result );
 
 It seems worth pointing out that this patch is an example of
 carelessly replacing strcpy with strlcpy.  result here is a pointer,
 not a fixed size array, so sizeof(result) just returns 4 or 8 instead
 of the buffer size.  (Of course, OpenBSD provides strdup in libc, so
 this code isn't used, patched or not.)

For what it's worth, that section of code was wrapped in:
#ifdef __MINGW32__
char *strdup...
#endif /* def __MINGW32__ */

-ME



Re: UPDATE: x11/dmenu

2008-03-28 Thread Mike Erdely
On Fri, Mar 28, 2008 at 05:14:01PM -0300, Gleydson Soares wrote:
 3.4 - 3.5

Gleydson,

Did you run this by Jim?  Both dwm and dmenu are maintained by a pretty
responsive guy.  Please forward updates like this to the MAINTAINER.

Jim: I've tested both on i386 and amd64.  Seems ok to me.  How about
you?

Also builds fine on macppc, alpha and sparc64.

-ME



Re: UPDATE: x11/dmenu

2008-03-28 Thread Mike Erdely
On Fri, Mar 28, 2008 at 05:35:44PM -0400, Mike Erdely wrote:
 Did you run this by Jim?  Both dwm and dmenu are maintained by a pretty
 responsive guy.  Please forward updates like this to the MAINTAINER.
 
 Jim: I've tested both on i386 and amd64.  Seems ok to me.  How about
 you?

As Tobias pointed out, Jim is not the maintainer for dmenu (dwm,
though).  I just assumed ...

-ME



Re: UPDATE: net/pidgin

2008-03-22 Thread Mike Erdely
On Sat, Mar 22, 2008 at 12:26:09PM +0100, Steven Mestdagh wrote:
 please give this a try. seems to work ok on amd64 here.

I tested it pretty thoroughly on i386 (msn, yahoo, jabber, gtalk, aim,
irc, silc, icb) and a couple file transfers.

It also builds on my macppc, alpha and sparc64.

It's ok by me.

-ME



Re: audio/sonata update

2008-03-19 Thread Mike Erdely
On Wed, Mar 19, 2008 at 04:14:15PM +0100, Marc Winiger wrote:
 - update to 1.4.2 (request and diff by Simon Kuhnle)
 - remove py-ElementTree dependency
 - remove MAINTAINER (no MX record)
 
 ok?

Works for me on i386.  Builds and packages on macppc.
It's too bad MAINTAINER's host is not resolving.  I emailed him in
January about a sonata update and he responded quickly.

If Dmitri comes back and is interested, we can always add him back
later.

This is ok by me.

-ME



Re: UPDATE: graphics/gimp

2008-03-18 Thread Mike Erdely
On Mon, Mar 17, 2008 at 07:42:59PM +0100, Giovanni Bechis wrote:
 Trivial update to latest version (2.4.5).
 Tested @i386
  Cheers
   Giovanni

I'll look into this one.

-ME



Re: editors/abiword diff

2008-02-19 Thread Mike Erdely
On Thu, Feb 14, 2008 at 05:55:48PM +0100, Tim van der Molen wrote:
 This diff unbreaks editors/abiword since x11/gnome/libgnomeprint no
 longer depends on devel/popt. It also adds gailutil to WANTLIB.

Thanks for the diff.  Committed.

-ME



Re: [UPDATE] lame-3.97

2008-02-18 Thread Mike Erdely
On Mon, Feb 18, 2008 at 04:08:58PM +0100, Antoine Jacoutot wrote:
 Long overdue (minor) update to lame-3.97.
 I'm taking over maintainership with jakob@'s agreement.

 As a side note, this update fixes a bug with the soon to come avidemux 
 2.4.1 port update.

 Comments/OK?

Tested on i386, alpha and sparc64 (the unflavored version).
ok by me.
-ME



Re: UPDATE: sonata version 1.4.1

2008-02-14 Thread Mike Erdely
On Fri, Feb 08, 2008 at 12:57:34AM +0100, markus ploner wrote:
 Hello ports@,

 well this is my first submitted patch, so please
 look twice, it might be error-prone.

 tested and working on amd64

 Markus

I have an updated diff below.  It removes the unecessary
PKGNAME=${DISTNAME}p0.  It also fixes PLIST (removes the files that
are not installed through the patch.  And fixes setup.py to install the
man page in the right place.

I tested this on i386.
It also builds and packages on alpha, sparc64 and macppc.

ok?

-ME

Index: Makefile
===
RCS file: /cvs/ports/audio/sonata/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile13 Nov 2007 12:44:23 -  1.6
+++ Makefile13 Feb 2008 22:43:03 -
@@ -4,8 +4,7 @@ SHARED_ONLY=Yes
 
 COMMENT=   elegant music player for MPD
 
-DISTNAME=  sonata-1.2.3
-PKGNAME=   ${DISTNAME}p1
+DISTNAME=  sonata-1.4.1
 CATEGORIES=audio
 
 HOMEPAGE=  http://sonata.berlios.de/
Index: distinfo
===
RCS file: /cvs/ports/audio/sonata/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo2 Sep 2007 15:18:03 -   1.4
+++ distinfo13 Feb 2008 22:43:03 -
@@ -1,5 +1,5 @@
-MD5 (sonata-1.2.3.tar.gz) = at5VuOOqvySXXsCduDuyGw==
-RMD160 (sonata-1.2.3.tar.gz) = aClU5yhXcours+PPxF2bX5Ayjsk=
-SHA1 (sonata-1.2.3.tar.gz) = 14AChSMhewxeHkKrlVTgMvKqGrA=
-SHA256 (sonata-1.2.3.tar.gz) = Fvi/ycoA8G2hdyMTCDW9At+b8iKB2+l2bMG0UrPAtww=
-SIZE (sonata-1.2.3.tar.gz) = 296806
+MD5 (sonata-1.4.1.tar.gz) = vM5KhnbPXWjJbI2Y/m4kCw==
+RMD160 (sonata-1.4.1.tar.gz) = fBIfz5p43przXJ++kfAqPkw+sFU=
+SHA1 (sonata-1.4.1.tar.gz) = nKym3xgqs+cfIEd67xFAbwYSN/s=
+SHA256 (sonata-1.4.1.tar.gz) = iHTOOgy2EaCEhHVy9UtSTvyEbjqvSkvOJbmL+xOtpuA=
+SIZE (sonata-1.4.1.tar.gz) = 398976
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/audio/sonata/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py  19 Jul 2007 16:21:44 -  1.2
+++ patches/patch-setup_py  13 Feb 2008 22:43:03 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-setup_py,v 1.2 2007/07/19 16:21:44 jasper Exp $
 setup.py.orig  Tue Jul 17 05:07:01 2007
-+++ setup.py   Tue Jul 17 12:20:19 2007
-@@ -65,8 +65,7 @@ setup(name='Sonata',
+--- setup.py.orig  Sat Feb  2 23:31:14 2008
 setup.py   Wed Feb 13 17:41:10 2008
+@@ -65,10 +65,9 @@ setup(name='Sonata',
  extra_link_args=capture(pkg-config --libs gtk+-2.0 
pygtk-2.0).split()
   ),],
  scripts = ['sonata'],
@@ -9,5 +9,8 @@ $OpenBSD: patch-setup_py,v 1.2 2007/07/1
 -('share/applications', ['sonata.desktop']),
 +data_files=[('share/applications', ['sonata.desktop']),
  ('share/pixmaps', ['pixmaps/sonata.png', 
'pixmaps/sonata_large.png', 'pixmaps/sonatacd.png', 
'pixmaps/sonatacd_large.png', 'pixmaps/sonata-artist.png', 
'pixmaps/sonata-album.png', 'pixmaps/sonata-stock_volume-mute.png', 
'pixmaps/sonata-stock_volume-min.png', 'pixmaps/sonata-stock_volume-med.png', 
'pixmaps/sonata-stock_volume-max.png', 'pixmaps/sonata_pause.png', 
'pixmaps/sonata_play.png', 'pixmaps/sonata_disconnect.png']),
+-('share/man/man1', ['sonata.1']),
++('man/man1', ['sonata.1']),
  ('share/locale/de/LC_MESSAGES', ['mo/de/sonata.mo']),
  ('share/locale/pl/LC_MESSAGES', ['mo/pl/sonata.mo']),
+ ('share/locale/ru/LC_MESSAGES', ['mo/ru/sonata.mo']),
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/sonata/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   2 Sep 2007 15:18:04 -   1.3
+++ pkg/PLIST   13 Feb 2008 22:43:03 -
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.3 2007/09/02 15:18:04 jasper Exp $
 bin/sonata
+lib/python${MODPY_VERSION}/site-packages/Sonata-1.4.1-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/audioscrobbler.py
 lib/python${MODPY_VERSION}/site-packages/audioscrobbler.pyc
 lib/python${MODPY_VERSION}/site-packages/mmkeys.so
@@ -7,11 +8,11 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/mpdclient3.pyc
 lib/python${MODPY_VERSION}/site-packages/sonata.py
 lib/python${MODPY_VERSION}/site-packages/sonata.pyc
-share/applications/
[EMAIL PROTECTED] man/man1/sonata.1
 share/applications/sonata.desktop
-share/locale/cz/
-share/locale/cz/LC_MESSAGES/
-share/locale/cz/LC_MESSAGES/sonata.mo
+share/locale/[EMAIL PROTECTED]/LC_MESSAGES/sonata.mo
+share/locale/cs/LC_MESSAGES/sonata.mo
+share/locale/da/LC_MESSAGES/sonata.mo
 share/locale/de/LC_MESSAGES/sonata.mo
 share/locale/es/LC_MESSAGES/sonata.mo
 share/locale/fi/LC_MESSAGES/sonata.mo
@@ -19,6 +20,7 @@ 

Re: [Update] Port databases/p5-DBD-Pg

2008-02-12 Thread Mike Erdely
On Wed, Feb 13, 2008 at 11:37:32AM +0900, Mathieu Sauve-Frankel wrote:
 On Tue, Feb 12, 2008 at 11:46:28AM +0900, Mathieu Sauve-Frankel wrote:
  Hi, is the leak you talk about fixed in p5-DBD-Pg-2.00 ? 
  2.00 was released today and I would much rather update to that instead.
  
  please test the attached diff
 
 so far I have reports of this working on i386 and amd64, would someone
 with access to a sparc64 please test this ?

Passes regress on sparc64, macppc and alpha.

-ME
To: [EMAIL PROTECTED]
From: [EMAIL PROTECTED]
Subject: PASS DBD-Pg-2.0.0 alpha-openbsd 4.2
Report: This distribution has been tested as part of the cpan-testers
effort to test as many new uploads to CPAN as possible.  See
http://testers.cpan.org/

Please cc any replies to [EMAIL PROTECTED] to keep other
test volunteers informed and to prevent any duplicate effort.


--

Summary of my perl5 (revision 5 version 8 subversion 8) configuration:
  Platform:
osname=openbsd, osvers=4.2, archname=alpha-openbsd
uname='openbsd'
config_args='-dsE -Dopenbsd_distribution=defined'
hint=recommended, useposix=true, d_sigaction=define
usethreads=undef use5005threads=undef useithreads=undef 
usemultiplicity=undef
useperlio=define d_sfio=undef uselargefiles=define usesocks=undef
use64bitint=define use64bitall=define uselongdouble=undef
usemymalloc=n, bincompat5005=undef
  Compiler:
cc='cc', ccflags ='-fno-strict-aliasing -fno-delete-null-pointer-checks 
-pipe -I/usr/local/include',
optimize='-O2',
cppflags='-fno-strict-aliasing -fno-delete-null-pointer-checks -pipe 
-I/usr/local/include'
ccversion='', gccversion='3.3.5 (propolice)', gccosandvers='openbsd4.2'
intsize=4, longsize=8, ptrsize=8, doublesize=8, byteorder=12345678
d_longlong=define, longlongsize=8, d_longdbl=define, longdblsize=8
ivtype='long', ivsize=8, nvtype='double', nvsize=8, Off_t='off_t', 
lseeksize=8
alignbytes=8, prototype=define
  Linker and Libraries:
ld='cc', ldflags ='-Wl,-E '
libpth=/usr/lib
libs=-lm -lutil -lc
perllibs=-lm -lutil -lc
libc=/usr/lib/libc.so.43.0, so=so, useshrplib=true, libperl=libperl.so.10.1
gnulibc_version=''
  Dynamic Linking:
dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, 
ccdlflags='-Wl,-R/usr/libdata/perl5/alpha-openbsd/5.8.8/CORE'
cccdlflags='-DPIC -fPIC ', lddlflags='-shared -fPIC 'To: [EMAIL PROTECTED]
From: [EMAIL PROTECTED]
Subject: PASS DBD-Pg-2.0.0 sparc64-openbsd 4.2
Report: This distribution has been tested as part of the cpan-testers
effort to test as many new uploads to CPAN as possible.  See
http://testers.cpan.org/

Please cc any replies to [EMAIL PROTECTED] to keep other
test volunteers informed and to prevent any duplicate effort.


--

Summary of my perl5 (revision 5 version 8 subversion 8) configuration:
  Platform:
osname=openbsd, osvers=4.2, archname=sparc64-openbsd
uname='openbsd'
config_args='-dsE -Dopenbsd_distribution=defined'
hint=recommended, useposix=true, d_sigaction=define
usethreads=undef use5005threads=undef useithreads=undef 
usemultiplicity=undef
useperlio=define d_sfio=undef uselargefiles=define usesocks=undef
use64bitint=define use64bitall=define uselongdouble=undef
usemymalloc=n, bincompat5005=undef
  Compiler:
cc='cc', ccflags ='-fno-strict-aliasing -fno-delete-null-pointer-checks 
-pipe -I/usr/local/include',
optimize='-O2',
cppflags='-fno-strict-aliasing -fno-delete-null-pointer-checks -pipe 
-I/usr/local/include'
ccversion='', gccversion='3.3.5 (propolice)', gccosandvers='openbsd4.2'
intsize=4, longsize=8, ptrsize=8, doublesize=8, byteorder=87654321
d_longlong=define, longlongsize=8, d_longdbl=define, longdblsize=16
ivtype='long', ivsize=8, nvtype='double', nvsize=8, Off_t='off_t', 
lseeksize=8
alignbytes=8, prototype=define
  Linker and Libraries:
ld='cc', ldflags ='-Wl,-E '
libpth=/usr/lib
libs=-lm -lutil -lc
perllibs=-lm -lutil -lc
libc=/usr/lib/libc.so.43.0, so=so, useshrplib=true, libperl=libperl.so.10.1
gnulibc_version=''
  Dynamic Linking:
dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, 
ccdlflags='-Wl,-R/usr/libdata/perl5/sparc64-openbsd/5.8.8/CORE'
cccdlflags='-DPIC -fPIC ', lddlflags='-shared -fPIC 'To: [EMAIL PROTECTED]
From: [EMAIL PROTECTED]
Subject: PASS DBD-Pg-2.0.0 powerpc-openbsd 4.2
Report: This distribution has been tested as part of the cpan-testers
effort to test as many new uploads to CPAN as possible.  See
http://testers.cpan.org/

Please cc any replies to [EMAIL PROTECTED] to keep other
test volunteers informed and to prevent any duplicate effort.


--

Summary of my perl5 (revision 5 version 8 subversion 8) configuration:
  Platform:
osname=openbsd, osvers=4.2, archname=powerpc-openbsd
uname='openbsd'
config_args='-dsE -Dopenbsd_distribution=defined'
hint=recommended, useposix=true, d_sigaction=define
usethreads=undef use5005threads=undef useithreads=undef 
usemultiplicity=undef

Re: [update] login_ldap 3.51

2008-02-10 Thread Mike Erdely
On Thu, Feb 07, 2008 at 01:10:29PM -0500, Mike Erdely wrote:
 Below is a diff to update login_ldap.
 I've taken over the login_ldap project, started hosting it at
 sourceforge, imported Peter's updates (to 3.4), fixed the build and
 packaging for OpenBSD.  I had problems with the 3.3 version of the port
 and Active Directory, but I have been using this version in production
 for quite a while.
 
 Comments?  ok?
 
 -ME

Anyone test this?  It'd be nice to get this in before the freeze.

-ME



Re: mutt rename mailbox

2008-02-05 Thread Mike Erdely
On Tue, Feb 05, 2008 at 05:40:13PM -0500, Okan Demirmen wrote:
 On Tue 2008.02.05 at 14:27 -0500, Okan Demirmen wrote:
  On Sun 2008.01.13 at 12:49 -0600, Marco Peereboom wrote:
   When one tries to rename an IMAP mailbox in -current mutt the suggestion
   is a bunch of garbled characters.  I have seen this for a while but keep
   forgetting to report it.
  
  could mutt (snapshot) users try this?
 
 sorry, sthen pointed out a bogus var that snuck in...the following is
 without that...

Problem is fixed on alpha and i386 for me.

-ME



Re: UPDATE: sysutils/monit

2008-02-01 Thread Mike Erdely
On Fri, Feb 01, 2008 at 01:37:54PM -0800, Ben Lovett wrote:
 my only question is why the update to PLIST? I get no such changes on my 
 somewhat current machine (with current ports, however).

Genadijus needs to update his mtree:
http://marc.info/?l=openbsd-portsm=118900677500696w=2



[update] bacula 2.2.8 (was bacula 2.2.7)

2008-01-31 Thread Mike Erdely
On Wed, Jan 23, 2008 at 05:49:11PM -0500, Mike Erdely wrote:
 Comments?  Anyone testing this?  Anyone using bacula on OpenBSD?

Bacula 2.2.8 is out.
Changes in this diff:
  - update to 2.2.8
  - enable large file support
  - create a DIST_SUBDIR for bacula's files

Please test and comment.  I'd like to get this in before the freeze.

Thanks,
-ME

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile9 Oct 2007 15:39:17 -   1.8
+++ Makefile31 Jan 2008 15:00:54 -
@@ -1,20 +1,23 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/09 15:39:17 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2007/09/05 07:57:33 merdely Exp $
 
-COMMENT-main=  network backup solution
-COMMENT-client=network backup solution (client)
+COMMENT-main=  network backup solution (client)
+COMMENT-doc=   network backup solution (doc)
 COMMENT-server=network backup solution (server)
 
-VERSION=   2.0.3
-DISTNAME=  bacula-${VERSION}
-PKGNAME-main=  ${DISTNAME}p3
-FULLPKGNAME-client=bacula-client-${VERSION}p3
-PKGNAME-server=bacula-server-${VERSION}p4
+V= 2.2.8
+DISTNAME=  bacula-$V
+FULLPKGNAME-main=  bacula-client-$V
+FULLPKGNAME-doc=   bacula-doc-$V
+PKGNAME-server=bacula-server-$V
 CATEGORIES=sysutils
-DIST_SUBDIR=   bacula
-PATCHFILES=${VERSION}-restore.patch
-PATCH_DIST_ARGS=   -d ${WRKSRC}/src/stored --quiet
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
+MASTER_SITES0= ${HOMEPAGE}
+
+DIST_SUBDIR=   bacula
+EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=rel-bacula.pdf:0
 
 HOMEPAGE=  http://www.bacula.org/
 
@@ -22,20 +25,20 @@ MAINTAINER= Michael Erdely [EMAIL PROTECTED]
 
 WANTLIB=   c pthread crypto ssl z m stdc++
 WANTLIB-server=${WANTLIB} readline termcap
-WANTLIB-main=  ${WANTLIB} readline termcap
 
-MULTI_PACKAGES=-main -client -server
+MULTI_PACKAGES=-main -doc -server
 
-# Modified GPLv2
+# FDL (for docs), GPL (majority), LGPL (some libraries) and PD
 # http://bacula.org/dev-manual/Bacula_Copyri_Tradem_Licens.html
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
+SD_USER=   _bacula-sd
 BACULACONF=/etc/bacula
 BACULASTATE=   /var/bacula
-SUBST_VARS=BACULACONF BACULASTATE
+SUBST_VARS=SD_USER BACULACONF BACULASTATE
 
 CONFIGURE_STYLE=   simple
 USE_GMAKE= yes
@@ -56,8 +59,8 @@ CONFIGURE_ARGS=   --enable-smartalloc \
--with-working-dir=${BACULASTATE} \
--with-dir-user=_bacula \
--with-dir-group=_bacula \
-   --with-sd-user=root \
-   --with-sd-group=wheel \
+   --with-sd-user=${SD_USER} \
+   --with-sd-group=_bacula \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
@@ -65,7 +68,7 @@ CONFIGURE_ARGS=   --enable-smartalloc \
--without-job-email \
--without-dump-email \
--disable-gnome \
-   --disable-wx-console \
+   --disable-bwx-console \
--disable-tray-monitor \
--disable-nls \
--disable-conio \
@@ -79,7 +82,9 @@ CONFIGURE_ENV+=   CPPFLAGS=-I/usr/includ
PTHREAD_LIBS=${PTHREAD_LIBS} \
MTX=/bin/chio \
TAPEDRIVE=/dev/rst0 \
-   CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site
+   CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site \
+   QMAKEQT4=${LOCALBASE}/bin/qmake4 \
+   
PKG_CONFIG_LIBDIR=${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4
 
 BACKEND=
 .if ${FLAVOR:L:Mpgsql}
@@ -103,7 +108,8 @@ ERRORS+=Fatal: choose either pgsql or
 CONFIGURE_ARGS+=   --without-postgresql \
--with-mysql \
--without-sqlite \
-   --without-sqlite3
+   --without-sqlite3 \
+   --enable-batch-insert
 LIB_DEPENDS+=  lib/mysql/mysqlclient.=10::databases/mysql
 BACKEND=   mysql
 .else
@@ -143,7 +149,27 @@ SUBST_VARS+=   BACKEND
 ERRORS+=   Fatal: choose either pgsql or mysql or sqlite or 
sqlite3
 .endif

Re: [update] bacula 2.2.8 (was bacula 2.2.7)

2008-01-31 Thread Mike Erdely
On Thu, Jan 31, 2008 at 10:09:50AM -0500, Mike Erdely wrote:
 On Wed, Jan 23, 2008 at 05:49:11PM -0500, Mike Erdely wrote:
  Comments?  Anyone testing this?  Anyone using bacula on OpenBSD?
 
 Bacula 2.2.8 is out.
 Changes in this diff:
   - update to 2.2.8
   - enable large file support
   - create a DIST_SUBDIR for bacula's files
 
 Please test and comment.  I'd like to get this in before the freeze.

Sheesh.  They changed the location of the PDF file.  As suggested by
okan@, I've killed the -doc subpackage and just linked to the docs in
pkg/MESSAGE-{client,server}.  And, since there's only one dist file, I
killed the DIST_SUBDIR variable too.

-ME

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile9 Oct 2007 15:39:17 -   1.8
+++ Makefile31 Jan 2008 15:55:57 -
@@ -1,41 +1,35 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/09 15:39:17 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2007/09/05 07:57:33 merdely Exp $
 
-COMMENT-main=  network backup solution
-COMMENT-client=network backup solution (client)
+COMMENT-main=  network backup solution (client)
 COMMENT-server=network backup solution (server)
 
-VERSION=   2.0.3
-DISTNAME=  bacula-${VERSION}
-PKGNAME-main=  ${DISTNAME}p3
-FULLPKGNAME-client=bacula-client-${VERSION}p3
-PKGNAME-server=bacula-server-${VERSION}p4
+V= 2.2.8
+DISTNAME=  bacula-$V
+FULLPKGNAME-main=  bacula-client-$V
+PKGNAME-server=bacula-server-$V
 CATEGORIES=sysutils
-DIST_SUBDIR=   bacula
-PATCHFILES=${VERSION}-restore.patch
-PATCH_DIST_ARGS=   -d ${WRKSRC}/src/stored --quiet
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
-
 HOMEPAGE=  http://www.bacula.org/
 
 MAINTAINER=Michael Erdely [EMAIL PROTECTED]
 
 WANTLIB=   c pthread crypto ssl z m stdc++
 WANTLIB-server=${WANTLIB} readline termcap
-WANTLIB-main=  ${WANTLIB} readline termcap
 
-MULTI_PACKAGES=-main -client -server
+MULTI_PACKAGES=-main -server
 
-# Modified GPLv2
+# GPL (majority), LGPL (some libraries) and PD
 # http://bacula.org/dev-manual/Bacula_Copyri_Tradem_Licens.html
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
+SD_USER=   _bacula-sd
 BACULACONF=/etc/bacula
 BACULASTATE=   /var/bacula
-SUBST_VARS=BACULACONF BACULASTATE
+SUBST_VARS=SD_USER BACULACONF BACULASTATE
 
 CONFIGURE_STYLE=   simple
 USE_GMAKE= yes
@@ -56,8 +50,8 @@ CONFIGURE_ARGS=   --enable-smartalloc \
--with-working-dir=${BACULASTATE} \
--with-dir-user=_bacula \
--with-dir-group=_bacula \
-   --with-sd-user=root \
-   --with-sd-group=wheel \
+   --with-sd-user=${SD_USER} \
+   --with-sd-group=_bacula \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
@@ -65,7 +59,7 @@ CONFIGURE_ARGS=   --enable-smartalloc \
--without-job-email \
--without-dump-email \
--disable-gnome \
-   --disable-wx-console \
+   --disable-bwx-console \
--disable-tray-monitor \
--disable-nls \
--disable-conio \
@@ -79,7 +73,9 @@ CONFIGURE_ENV+=   CPPFLAGS=-I/usr/includ
PTHREAD_LIBS=${PTHREAD_LIBS} \
MTX=/bin/chio \
TAPEDRIVE=/dev/rst0 \
-   CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site
+   CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site \
+   QMAKEQT4=${LOCALBASE}/bin/qmake4 \
+   
PKG_CONFIG_LIBDIR=${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4
 
 BACKEND=
 .if ${FLAVOR:L:Mpgsql}
@@ -103,7 +99,8 @@ ERRORS+= Fatal: choose either pgsql or
 CONFIGURE_ARGS+=   --without-postgresql \
--with-mysql \
--without-sqlite \
-   --without-sqlite3
+   --without-sqlite3 \
+   --enable-batch-insert
 LIB_DEPENDS+=  lib/mysql/mysqlclient.=10::databases/mysql
 BACKEND=   mysql
 .else
@@ -143,7 +140,27 @@ SUBST_VARS+=   BACKEND
 ERRORS+=   Fatal: choose either pgsql or mysql or sqlite or 
sqlite3
 .endif
 
-LIB_DEPENDS-client=
+LIB_DEPENDS

Re: [update] bacula 2.2.7

2008-01-23 Thread Mike Erdely
On Fri, Jan 11, 2008 at 05:34:08PM -0500, Mike Erdely wrote:
 On Fri, Jan 11, 2008 at 05:16:52PM -0500, Mike Erdely wrote:
  On Fri, Jan 11, 2008 at 09:34:32PM +, Stuart Henderson wrote:
   On 2008/01/11 15:18, Mike Erdely wrote:
[EMAIL PROTECTED] _bacula-sd:596:_bacula:daemon:Bacula Storage 
Daemon:/var/bacula:/sbin/nologin
   
   597 now (unless something else is committed in the meantime).
 
 As Stu reminded me, _bacula-sd's uid needs to be updated in other
 PLIST-* files.  I had also missed some patch files and two README files
 from the previous diffs.

Updated diff with minor tweaks (VERSION - V, PREFIX - LOCALBASE).
Comments?  Anyone testing this?  Anyone using bacula on OpenBSD?

Thanks.
-ME

Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile9 Oct 2007 15:39:17 -   1.8
+++ Makefile11 Jan 2008 22:43:35 -
@@ -1,20 +1,22 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/09 15:39:17 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2007/09/05 07:57:33 merdely Exp $
 
-COMMENT-main=  network backup solution
-COMMENT-client=network backup solution (client)
+COMMENT-main=  network backup solution (client)
+COMMENT-doc=   network backup solution (doc)
 COMMENT-server=network backup solution (server)
 
-VERSION=   2.0.3
-DISTNAME=  bacula-${VERSION}
-PKGNAME-main=  ${DISTNAME}p3
-FULLPKGNAME-client=bacula-client-${VERSION}p3
-PKGNAME-server=bacula-server-${VERSION}p4
+V= 2.2.7
+DISTNAME=  bacula-$V
+FULLPKGNAME-main=  bacula-client-$V
+FULLPKGNAME-doc=   bacula-doc-$V
+PKGNAME-server=bacula-server-$V
 CATEGORIES=sysutils
-DIST_SUBDIR=   bacula
-PATCHFILES=${VERSION}-restore.patch
-PATCH_DIST_ARGS=   -d ${WRKSRC}/src/stored --quiet
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bacula/}
+MASTER_SITES0= ${HOMEPAGE}
+
+EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=rel-bacula.pdf:0
 
 HOMEPAGE=  http://www.bacula.org/
 
@@ -22,20 +24,20 @@ MAINTAINER= Michael Erdely [EMAIL PROTECTED]
 
 WANTLIB=   c pthread crypto ssl z m stdc++
 WANTLIB-server=${WANTLIB} readline termcap
-WANTLIB-main=  ${WANTLIB} readline termcap
 
-MULTI_PACKAGES=-main -client -server
+MULTI_PACKAGES=-main -doc -server
 
-# Modified GPLv2
+# FDL (for docs), GPL (majority), LGPL (some libraries) and PD
 # http://bacula.org/dev-manual/Bacula_Copyri_Tradem_Licens.html
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
+SD_USER=   _bacula-sd
 BACULACONF=/etc/bacula
 BACULASTATE=   /var/bacula
-SUBST_VARS=BACULACONF BACULASTATE
+SUBST_VARS=SD_USER BACULACONF BACULASTATE
 
 CONFIGURE_STYLE=   simple
 USE_GMAKE= yes
@@ -56,8 +58,8 @@ CONFIGURE_ARGS=   --enable-smartalloc \
--with-working-dir=${BACULASTATE} \
--with-dir-user=_bacula \
--with-dir-group=_bacula \
-   --with-sd-user=root \
-   --with-sd-group=wheel \
+   --with-sd-user=${SD_USER} \
+   --with-sd-group=_bacula \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
@@ -65,7 +67,7 @@ CONFIGURE_ARGS=   --enable-smartalloc \
--without-job-email \
--without-dump-email \
--disable-gnome \
-   --disable-wx-console \
+   --disable-bwx-console \
--disable-tray-monitor \
--disable-nls \
--disable-conio \
@@ -79,7 +81,9 @@ CONFIGURE_ENV+=   CPPFLAGS=-I/usr/includ
PTHREAD_LIBS=${PTHREAD_LIBS} \
MTX=/bin/chio \
TAPEDRIVE=/dev/rst0 \
-   CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site
+   CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site \
+   QMAKEQT4=${LOCALBASE}/bin/qmake4 \
+   
PKG_CONFIG_LIBDIR=${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4
 
 BACKEND=
 .if ${FLAVOR:L:Mpgsql}
@@ -103,7 +107,8 @@ ERRORS+=Fatal: choose either pgsql or
 CONFIGURE_ARGS+=   --without-postgresql \
--with-mysql \
--without-sqlite \
-   --without-sqlite3

Re: UPDATE: roxterm version 1.9.1

2008-01-12 Thread Mike Erdely
On Sun, Jan 13, 2008 at 12:55:12AM +0100, Pierre-Emmanuel Andr? wrote:
 Hi ports@,
 
 Little diff to update roxterm to version 1.9.1.
 Ok from maintainer Jona Joachim ( jaj at hcl-club dot lu).
 
 Regards,
 
 Pea

Works for me on i386 and macppc.  Builds and packages on alpha.
ok?

-ME



  1   2   3   >