O Despertar do Tigre: Trauma e Recuperação

2010-04-23 Thread Almasoma


Experiência Somática-Portugal, em colaboração com a AlmaSoma,
apresenta, pela primeira vez em Portugal, o trabalho de Peter Levine
numa oficina intitulada

O Despertar do Tigre: Trauma e Recuperação 

Introdução à Somatic Experiencing (Experiência Somática)

Somatic Experiencing (SE) é a designação do trabalho com Trauma da
Foundation for Human Enrichment (FHE), já estabelecido em muitos
países e vários continentes como entidade formadora, e presente nos
cenários de catástrofe, como o Haiti, para intervenção directa.

Peter Levine, PhD, autor de O Despertar do Tigre entre outras
publicações científicas e de divulgação, desenvolveu um enfoque
particular sobre o adoecer e o curar num contexto traumatológico
baseado em décadas de experiência, observação do mundo animal e
investigação nas neurociências. Sistematizou assim uma abordagem
naturalista e efectiva, cientificamente embasada, e de múltiplas
aplicações, desde o trauma de nascimento ao trauma de violação,
passando pelo trauma de cirurgia, de acidente automóvel, etc.

Com Lida Ruiter, coordenadora SE na Holanda, assistente e supervisora
na Inglaterra, Dinamarca e Holanda, vamos conhecer os princípios que
subjazem ao trabalho da Somatic Experiencing e assistir à sua
aplicação prática entre os participantes, em dois dias
teórico-práticos que apresentam este trabalho em Portugal.

Para os interessados, a partir de Outubro de 2010, estará disponível
uma formação profissional certificada pela FHE – equivalente ao
grau de practionner que habilita ao trabalho terapêutico -, com a
duração de 3 anos leccionada pela professora Sónia Gomes,
actualmente docente SE em vários países europeus e líder deste
trabalho no Brasil. Veja www.seportugal.com

A Oficina e a Formação dará lugar a criação da Foundation for
Human Enrichment-Portugal que, com esta ou outra designação, será
responsável pela manutenção deste trabalho em Portugal. Actualmente
a Experiência Somática-Portugal é coordenada por Erica Poonam e
Mário Resende.

LIDA RUITER

Lida tem um grau de bacharel em educação e um grau de mestre em
trabalho social e aconselhamento. Ela é também supervisora e
professora nesses campos. Treinada em Core-energetics (trabalho
corporal), Naturopatia, Trabalho Energético (Snowlion Center School),
Reconnection Healing (Dr. Eric Pearl), e Experiência Somática (SE),
ela trabalha em clínica privada como terapeuta e curadora. Trabalhou
várias vezes em Tamil Nadu, na Índia, como membro do grupo
internacional de trabalho com trauma que ofereceu ajuda aos
sobreviventes do Tsunami com stress pós traumático e formação aos
profissionais locais no tratamento do trauma. Ela faz também parte de
um grupo internacional de terapeutas do trauma trabalhando com
vítimas de violência doméstica e com os seus terapeutas na Índia. 

Ela coordena as actividades do SE na Holanda, é membro da
Associação Europeia de Experiência Somática e é assistente
sénior e supervisora para as formações em SE na Inglaterra,
Dinamarca e Holanda. Ela está a integrar diferentes tipos de cura no
trabalho com choque e trauma.

Vagas disponíveis: 25

Data: 17 e 18 de Abril de 2010

Horário: das 9 às 18h, sábado e domingo.

Local: Quíron, Rua Vítor Cordón 5, Lisboa

Investimento: 120€ (sem iva) até 31 de Março, 150€ (sem iva)
até dia 16 de Abril, 160 (sem iva) para inscrições no próprio dia.

Inscrições e informações: responda a este email
(secretari...@almasoma.pt 
) e receberá de volta a ficha de inscrição.

Via telemóvel: 96 999 04 17 (Dra Lúcia Soares, Assistente
Experiencia Somática-Portugal)



  



Gossip

2010-04-23 Thread Jasper Lievisse Adriaanse
hi,

are there any users of the gossip jabber client for gnome? i'd like to
remove it, as it's been superseded by empathy and doesn't add any value
to the desktop. if there are users of gossip, could you migrate to
empathy?

unless there are objections, i'll zap in in a week or so.

cheers,
jasper

-- 
Stay Hungry. Stay Foolish.



You have one new message from Public Bank Berhad

2010-04-23 Thread Public Bank Berhad
 Dear valued customer,

Public Bank Berhad temporarily suspended your account.
Reason: AntiFraud Security System.

We must properly verify your Public Bank Berhad account again.

Tips to unlocking your account - It's Easy

Here's how you get started:

1. Log into https://www2.pbebank.com/main.html
2. Follow the steps to update your personal records and you will not run
into further problems with your online service.
3. Once you have completed these steps, we will send you an email
notifying that your account is active.
4. Please allow 24 hours (1 day) for processing.

Note: please do not reply to this email.
This mailbox is not monitored and you will not receive a response.


FIX: x11/e17/e

2010-04-23 Thread Christian Weisgerber
Now that MAXSENSORDEVICES is gone, x11/e17/e doesn't build any
longer.  The existing sensor code also doesn't look quite right to
me, because it doesn't handle the case where hw.sensors.cpu0 doesn't
exist.

Does the code below look reasonable?

Can any Enlightenment users who actually use this give it a try?


Index: Makefile
===
RCS file: /cvs/ports/x11/e17/e/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile24 Jan 2010 11:52:36 -  1.17
+++ Makefile23 Apr 2010 14:51:48 -
@@ -2,7 +2,7 @@
 
 COMMENT =  the enlightened window manager
 DISTNAME = enlightenment-0.16.999.061
-PKGNAME =  ${DISTNAME}p0v0
+PKGNAME =  ${DISTNAME}p1v0
 
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
Index: patches/patch-src_modules_temperature_tempget_c
===
RCS file: /cvs/ports/x11/e17/e/patches/patch-src_modules_temperature_tempget_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_modules_temperature_tempget_c
--- patches/patch-src_modules_temperature_tempget_c 11 Jan 2010 14:59:25 
-  1.1
+++ patches/patch-src_modules_temperature_tempget_c 23 Apr 2010 21:22:30 
-
@@ -1,6 +1,6 @@
 $OpenBSD: patch-src_modules_temperature_tempget_c,v 1.1 2010/01/11 14:59:25 
jasper Exp $
 --- src/modules/temperature/tempget.c.orig Thu Feb 26 04:13:48 2009
-+++ src/modules/temperature/tempget.c  Sun Jul 26 23:19:49 2009
 src/modules/temperature/tempget.c  Fri Apr 23 23:19:13 2010
 @@ -3,21 +3,35 @@
   */
  #include "e.h"
@@ -24,50 +24,47 @@ $OpenBSD: patch-src_modules_temperature_
  
  static char *sensor_path = NULL;
 -#ifdef __FreeBSD__
--static int mib[5];
 +
 +#if defined (__FreeBSD__) || defined (__OpenBSD__)
-+int mib[5];
+ static int mib[5];
  #endif
 +
 +#ifdef __OpenBSD__
-+int dev, numt;
-+struct sensordev snsrdev;
-+size_t sdlen = sizeof(snsrdev);
-+struct sensor snsr;
-+size_t slen = sizeof(snsr);
++static int dev, numt;
++static struct sensordev snsrdev;
++static size_t sdlen = sizeof(snsrdev);
++static struct sensor snsr;
++static size_t slen = sizeof(snsr);
 +#endif
  static Ecore_Poller *poller = NULL;
  static int ptemp = 0;
  
-@@ -77,6 +91,7 @@ init(void)
-int len;
- #endif
- 
-+
-if ((!sensor_type) || ((!sensor_name) || (sensor_name[0] == 0)))
-  {
-   if (sensor_name) free(sensor_name);
-@@ -86,6 +101,18 @@ init(void)
+@@ -86,6 +100,24 @@ init(void)
/* TODO: FreeBSD can also have more temperature sensors! */
sensor_type = SENSOR_TYPE_FREEBSD;
sensor_name = strdup("tz0");
 +#elif __OpenBSD__
-+  sensor_type = SENSOR_TYPE_OPENBSD;
-+  sensor_name = strdup("cpu0");
-+
 +  mib[0] = CTL_HW;
 +  mib[1] = HW_SENSORS;
 +
-+  for (dev = 0; dev < MAXSENSORDEVICES && (strcmp(snsrdev.xname, "cpu0") 
!= 0); dev++) {
++  for (dev = 0; ; dev++) {
 +  mib[2] = dev;
-+  if (sysctl(mib, 3, &snsrdev, &sdlen, NULL, 0) == -1)
-+  continue;
++  if (sysctl(mib, 3, &snsrdev, &sdlen, NULL, 0) == -1) {
++  if (errno == ENOENT)/* no further sensors */
++  break;
++  else
++  continue;
++  }
++  if (strcmp(snsrdev.xname, "cpu0") == 0) {
++  sensor_type = SENSOR_TYPE_OPENBSD;
++  sensor_name = strdup("cpu0");
++  break;
++  }
 +  }
  #else
therms = ecore_file_ls("/proc/acpi/thermal_zone");
if (therms)
-@@ -201,6 +228,21 @@ init(void)
+@@ -201,6 +233,21 @@ init(void)
 sysctlnametomib(sensor_path, mib, &len);
  #endif
 break;
@@ -89,7 +86,7 @@ $OpenBSD: patch-src_modules_temperature_
   case SENSOR_TYPE_OMNIBOOK:
 sensor_path = strdup("/proc/omnibook/temperature");
 break;
-@@ -290,6 +332,16 @@ check(void)
+@@ -290,6 +337,16 @@ check(void)
  goto error;
  #endif
break;
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



Re: UPDATE: VLC 1.0.5

2010-04-23 Thread Brad
On Friday 23 April 2010 06:53:47 Edd Barrett wrote:
> On Fri, Apr 23, 2010 at 10:47 AM, Peter Hessler  wrote:
> > If you're seeing crashes when trying to view videos, try changing the
> > output device to SDL or XVideo.  Looks like X11 output is broken.
>
> Shouldnt we default to xv?

It does. Keep in mind not all X video drives have XVideo support, for example
systems using wsfb(4), vmware(4), or vesa(4).

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



Re: devel/eclipse problem

2010-04-23 Thread Ian Darwin
> Just updated to -current from 10/22/09, amd64. Updated all packages to
> what's latest in the mirrors, dated Oct 23rd.
> Some dialogs in Eclipse started to misbehave. For example, open Eclipse,
> File -> New -> Project, select "Java Project", click 'Next' and nothing
> happens. Perhaps it's not eclipse problem, but that's the only place
> I've noticed it. I also tried without ~/.gtkrc-2.0, but nothing changes.

Some other GTK apps exhibit this behaviour, and it seems to come and go
randomly. You can work around it by pressing Enter instead of
clicking Next (or click-then-enter if needed). A better fix is
needed, though.



Re: devel/eclipse problem

2010-04-23 Thread Aaron Stellman
On Mon, Oct 26, 2009 at 09:26:02PM -0700, Aaron Stellman wrote:
> Hello ports@,
> 
> Just updated to -current from 10/22/09, amd64. Updated all packages to
> what's latest in the mirrors, dated Oct 23rd.
> Some dialogs in Eclipse started to misbehave. For example, open Eclipse,
> File -> New -> Project, select "Java Project", click 'Next' and nothing
> happens. Perhaps it's not eclipse problem, but that's the only place
> I've noticed it. I also tried without ~/.gtkrc-2.0, but nothing changes.
> 
> Eclipse package from the mirror from previous month worked okay. I have
> no idea how to debug it. 
> I've also updated my other amd64 box, ended up with exactly same
> behavior. 
> 
> Any thoughts?

Don't know if anyone experiences this problem, but the solution is to
start eclipse like that:
GDK_NATIVE_WINDOWS=1 /usr/local/bin/eclipse



Re: cvsweb annotate tab alignment

2010-04-23 Thread Christian Weisgerber
Alexander Hall  wrote:

> @@ -12,11 +12,11 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
>   # == EDIT this ==
>   # Locations to search for user configuration, in order:
>  -for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
> -+for ("$mydir/cvsweb.conf", '%%CONFDIR%%/cvsweb/cvsweb.conf') {
> ++for ("$mydir/cvsweb.conf", '/var/www/conf/cvsweb/cvsweb.conf') {

That's wrong.  This is one of those ports that first change something
with a patch, then run a substitution over it.  You need to update
the patch with the unsubstituted files.

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



Mother's Day Flowers starting at `$19.99

2010-04-23 Thread FTD.Flowers
 FTD Flowers Starting at $19.99 -- DO IT NOW, WHILE YOU REMEMBER!

If you can't read or see this email, Reload Images

MOTHER'S DAY is Sunday, May 9th - Show Mom she's Special with FTD Flowers
- Starting at $19.99





















Some generalizations of the physics can be drawn, neglecting perceptual
effects for now:

To summarize, the color of an object is a complex result of its surface
properties, its transmission properties, and its emission properties, all
of which factors contribute to the mix of wavelengths in the light
leaving the surface of the object.

Opaque objects that specularly reflect light of different wavelengths
with different efficiencies look like mirrors tinted with colors
determined by those differences.

The color of an object depends on both the physics of the object in its
environment and the characteristics of the perceiving eye and brain.

Light arriving at an opaque surface is either reflected ",specularly",
(that is, in the manner of a mirror), scattered (that is, reflected with
diffuse scattering), or absorbed – or some combination of these.

Physically, objects can be said to have the color of the light leaving
their surfaces, which normally depends on the spectrum of the incident
illumination and the reflectance properties of the surface, as well as
potentially on the angles of illumination and viewing.

The upper disk and the lower disk have exactly the same objective color,
and are in identical gray surrounds, based on context differences, humans
perceive the squares as having different reflectances, and may interpret
the colors as different color categories, see same color illusion.

The perceived color is then further conditioned by the nature of the
ambient illumination, and by the color properties of other objects
nearby, via the effect known as color constancy and via other
characteristics of the perceiving eye and brain.

They are then called fluorescent (if light is emitted only while light is
absorbed) or phosphorescent (if light is emitted even after light ceases
to be absorbed, this term is also sometimes loosely applied to light
emitted because of chemical reactions).

An object that reflects some fraction of impinging light and absorbs the
rest may look black but also be faintly reflective, examples are black
objects coated with layers of enamel or lacquer.

Opaque objects that do not reflect specularly (which tend to have rough
surfaces) have their color determined by which wavelengths of light they
scatter more and which they scatter less (with the light that is not
scattered being absorbed).

Objects that transmit light are either translucent (scattering the
transmitted light) or transparent (not scattering the transmitted light).

If objects scatter all wavelengths, they appear white. If they absorb all
wavelengths, they appear black. Objects may emit light that they generate
themselves, rather than merely reflecting or transmitting light.

Some objects not only reflect light, but also transmit light or emit
light themselves (see below), which contribute to the color also.For
further treatment of the color of objects, see structural color, below.

Objects may absorb light and then as a consequence emit light that has
different properties.

They may do so because of their elevated temperature (they are then said
to be incandescent), as a result of certain chemical reactions (a
phenomenon called chemoluminescence), or for other reasons (see the
articles Phosphorescence and List of light sources).

And a viewer's perception of the object's color depends not only on the
spectrum of the light leaving its surface, but also on a host of
contextual cues, so that the color tends to be perceived as relatively
constant: that is, relatively independent of the lighting spectrum,
viewing angle, etc. This effect is known as color constancy.

If they also absorb (or reflect) light of varying wavelengths
differentially, they appear tinted with a color determined by the nature
of that absorption (or that reflectance).







































[IMAGE]


Re: cvsweb annotate tab alignment

2010-04-23 Thread Christian Weisgerber
Alexander Hall  wrote:

> This fixes tabs in cvsweb annotate; e.g.:
>[...]
> Is there any active upstream to pass this on to?

The cvsweb version in our tree is very old.  Upstream cvsweb 3 is
quite different.  Back when I was the MAINTAINER for devel/cvsweb,
people urged me to upgrade the port to cvsweb3, but I resisted
because it brings in a lot of dependencies.  Now that I have stepped
out of the way, nobody seems to be interested in cvsweb3 any longer.
*shrug*

Which reminds me that my cvsweb installation stopped working and I
should investigate why.  Probably the instructions in the port are
still/again incomplete...

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



Re: cvsweb annotate tab alignment

2010-04-23 Thread Christian Weisgerber
Alexander Hall  wrote:

> I'd like to point out that I normally do not run this myself, but since
> I use the one at openbsd.org, I'd like it to work properly :)

Bob uses his own hacked-up private version, not the one in the ports
tree.

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



[Update] pgfouine 1.2

2010-04-23 Thread Pierre-Emmanuel André
Hi (again),

Bugfixeq update for pgfouine.
Tested on @amd64.

Regards,

-- 
Pierre-Emmanuel André 
GPG key: 0x7AE329DC
Index: Makefile
===
RCS file: /cvs/ports/databases/pgfouine/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile24 Jul 2009 11:47:01 -  1.3
+++ Makefile23 Apr 2010 13:15:36 -
@@ -2,7 +2,7 @@
 
 COMMENT =  PostgreSQL log analyzer
 
-DISTNAME = pgfouine-1.1
+DISTNAME = pgfouine-1.2
 CATEGORIES =   databases
 
 HOMEPAGE = http://pgfouine.projects.postgresql.org/
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM =Yes
 PERMIT_DISTFILES_FTP = Yes
 PERMIT_DISTFILES_CDROM =Yes
 
-MASTER_SITES = http://pgfoundry.org/frs/download.php/2178/ \
+MASTER_SITES = http://pgfoundry.org/frs/download.php/2575/ \
http://pgfouine.projects.postgresql.org/releases/
 
 NO_BUILD = Yes
@@ -29,6 +29,7 @@ pre-configure:
@perl -pi -e 's,/usr/bin/php,${LOCALBASE}/bin/php,g;' \
-e 's,!!PREFIX!!,${PREFIX},g' \
 ${WRKSRC}/pgfouine.php ${WRKSRC}/pgfouine_vacuum.php
+   @find ${WRKSRC} -type d -name CVS | xargs rm -fr
 
 do-install:
${INSTALL_SCRIPT} ${WRKSRC}/pgfouine.php ${PREFIX}/bin/pgfouine
Index: distinfo
===
RCS file: /cvs/ports/databases/pgfouine/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo24 Jul 2009 11:47:02 -  1.2
+++ distinfo23 Apr 2010 13:15:36 -
@@ -1,5 +1,5 @@
-MD5 (pgfouine-1.1.tar.gz) = bL2tTdxRHwoj23YU+9ZoZw==
-RMD160 (pgfouine-1.1.tar.gz) = VGjZo5uKqhyVQH0wAI2pZ4Qjaxs=
-SHA1 (pgfouine-1.1.tar.gz) = HaMe9OIPGOYlSwC6YfSMU8OF0J4=
-SHA256 (pgfouine-1.1.tar.gz) = e5cN8i0FFMkv3hSn2zwkSphuDQxr+Qy2CR72lReKaXg=
-SIZE (pgfouine-1.1.tar.gz) = 776081
+MD5 (pgfouine-1.2.tar.gz) = nRUFY2XNPmRHiHzHZQCPBw==
+RMD160 (pgfouine-1.2.tar.gz) = EmyKwdZeMuCT25+bUQ89alpmMjc=
+SHA1 (pgfouine-1.2.tar.gz) = rKVLNNk6ax+qLFWzgrnwdC/OCB0=
+SHA256 (pgfouine-1.2.tar.gz) = bFt1PXwUdEzSMCHTJwFgQM2G4U0pwFW6v1Vu4hYKF/0=
+SIZE (pgfouine-1.2.tar.gz) = 793004
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/pgfouine/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   24 Jul 2009 11:47:02 -  1.2
+++ pkg/PLIST   23 Apr 2010 13:15:36 -
@@ -205,6 +205,7 @@ share/pgfouine/include/reporting/geshi/g
 share/pgfouine/include/reporting/geshi/geshi/sql.php
 share/pgfouine/include/reporting/reports/
 share/pgfouine/include/reporting/reports.lib.php
+share/pgfouine/include/reporting/reports/CsvQueriesHistoryReport.class.php
 share/pgfouine/include/reporting/reports/HourlyStatsReport.class.php
 
share/pgfouine/include/reporting/reports/NormalizedErrorsMostFrequentReport.class.php
 share/pgfouine/include/reporting/reports/NormalizedErrorsReport.class.php


[Update] Skytools 2.1.11

2010-04-23 Thread Pierre-Emmanuel André
Hi,

Upgrade skytool to 2.1.11.
Tested on @amd64 with py-psycopg2 2.0.14 and PostgreSQL 8.4.3.

Regards,

-- 
Pierre-Emmanuel André 
GPG key: 0x7AE329DC
Index: Makefile
===
RCS file: /cvs/ports/databases/skytools/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile17 Sep 2009 13:43:47 -  1.8
+++ Makefile23 Apr 2010 14:39:32 -
@@ -2,7 +2,7 @@
 
 COMMENT=   PostgreSQL tools from Skype
 
-MODPY_EGG_VERSION= 2.1.10
+MODPY_EGG_VERSION= 2.1.11
 DISTNAME=  skytools-${MODPY_EGG_VERSION}
 
 CATEGORIES=databases
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM=   Yes
 
 WANTLIB=   c
 
-MASTER_SITES=  http://pgfoundry.org/frs/download.php/2370/
+MASTER_SITES=  http://pgfoundry.org/frs/download.php/2561/
 
 MODULES=   lang/python
 
Index: distinfo
===
RCS file: /cvs/ports/databases/skytools/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo17 Sep 2009 13:43:47 -  1.5
+++ distinfo23 Apr 2010 14:39:32 -
@@ -1,5 +1,5 @@
-MD5 (skytools-2.1.10.tar.gz) = H+c19VmfR5ugpSsiLzEAsg==
-RMD160 (skytools-2.1.10.tar.gz) = WaEnmYOP5MiKiYlshB2VF6N4XKE=
-SHA1 (skytools-2.1.10.tar.gz) = rA44QCcuCyWBdCAGc+OxQhnpqVw=
-SHA256 (skytools-2.1.10.tar.gz) = HmGZPKa2LdHTa7xrt63Z0IlR72NkqHFMCYXH3pH4EeA=
-SIZE (skytools-2.1.10.tar.gz) = 257629
+MD5 (skytools-2.1.11.tar.gz) = FFGl/Ee/migzn33/KNixGg==
+RMD160 (skytools-2.1.11.tar.gz) = VeXt5WnRCVWRXTaeV7ZKlAaZMkQ=
+SHA1 (skytools-2.1.11.tar.gz) = ZabzhdfpQcaoQtNAvgSve1pWSUo=
+SHA256 (skytools-2.1.11.tar.gz) = /fu0KNQaXxbDz3t6Og3MXlAOECyJgxGCUxCjCImoLHE=
+SIZE (skytools-2.1.11.tar.gz) = 249019


[Update] Psycopg2 2.0.14

2010-04-23 Thread Pierre-Emmanuel André
Hi,

Little diff to update py-psycopg2 to 2.0.14.
Tested on @amd64 with PostgreSQL 8.4.3.

Regards,

-- 
Pierre-Emmanuel André 
GPG key: 0x7AE329DC
Index: Makefile
===
RCS file: /cvs/ports/databases/py-psycopg2/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile11 Apr 2009 13:45:06 -  1.9
+++ Makefile23 Apr 2010 12:14:39 -
@@ -4,7 +4,7 @@ SHARED_ONLY =   Yes
 
 COMMENT =  PostgreSQL database adapter for Python
 
-MODPY_EGG_VERSION =2.0.9
+MODPY_EGG_VERSION =2.0.14
 DISTNAME = psycopg2-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   databases
Index: distinfo
===
RCS file: /cvs/ports/databases/py-psycopg2/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo11 Apr 2009 13:45:06 -  1.4
+++ distinfo23 Apr 2010 12:14:39 -
@@ -1,5 +1,5 @@
-MD5 (psycopg2-2.0.9.tar.gz) = iF5b03Kvr9FM/ZFLAARi5w==
-RMD160 (psycopg2-2.0.9.tar.gz) = MZT7rhxpo3NOTbkeIdtLaI3h1jA=
-SHA1 (psycopg2-2.0.9.tar.gz) = 1qykuWtpIHp5WTRiPeYOnJzjI3g=
-SHA256 (psycopg2-2.0.9.tar.gz) = O3FVEZgTBjkfBxw5Bp/A70jTF4idk2sK1sfHLWNw2XM=
-SIZE (psycopg2-2.0.9.tar.gz) = 253729
+MD5 (psycopg2-2.0.14.tar.gz) = MBNsd1OsycvcNsxcJEj97g==
+RMD160 (psycopg2-2.0.14.tar.gz) = /bTeK01zz/xJ924Nmvqc+0ECIBI=
+SHA1 (psycopg2-2.0.14.tar.gz) = lMMCW+wQbe5A3Gr94q1dpSJVxJ0=
+SHA256 (psycopg2-2.0.14.tar.gz) = kCYHzb4RlaAGlNK0d+7YQp7aQzyqoOtv9/gIg+HBesc=
+SIZE (psycopg2-2.0.14.tar.gz) = 491362
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-psycopg2/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   11 Apr 2009 13:45:06 -  1.4
+++ pkg/PLIST   23 Apr 2010 12:14:39 -
@@ -17,13 +17,80 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/psycopg2/tz.py
 lib/python${MODPY_VERSION}/site-packages/psycopg2/tz.pyc
 share/doc/py-psycopg2/
+share/doc/py-psycopg2/COPYING
+share/doc/py-psycopg2/COPYING.LESSER
 share/doc/py-psycopg2/ChangeLog-1.x
 share/doc/py-psycopg2/HACKING
+share/doc/py-psycopg2/Makefile
+share/doc/py-psycopg2/README
 share/doc/py-psycopg2/SUCCESS
-share/doc/py-psycopg2/TODO
-share/doc/py-psycopg2/api-screen.css
-share/doc/py-psycopg2/async.txt
-share/doc/py-psycopg2/extensions.rst
+share/doc/py-psycopg2/html/
+share/doc/py-psycopg2/html/.buildinfo
+share/doc/py-psycopg2/html/_sources/
+share/doc/py-psycopg2/html/_sources/advanced.txt
+share/doc/py-psycopg2/html/_sources/connection.txt
+share/doc/py-psycopg2/html/_sources/cursor.txt
+share/doc/py-psycopg2/html/_sources/errorcodes.txt
+share/doc/py-psycopg2/html/_sources/extensions.txt
+share/doc/py-psycopg2/html/_sources/extras.txt
+share/doc/py-psycopg2/html/_sources/faq.txt
+share/doc/py-psycopg2/html/_sources/index.txt
+share/doc/py-psycopg2/html/_sources/module.txt
+share/doc/py-psycopg2/html/_sources/pool.txt
+share/doc/py-psycopg2/html/_sources/tz.txt
+share/doc/py-psycopg2/html/_sources/usage.txt
+share/doc/py-psycopg2/html/_static/
+share/doc/py-psycopg2/html/_static/basic.css
+share/doc/py-psycopg2/html/_static/default.css
+share/doc/py-psycopg2/html/_static/doctools.js
+share/doc/py-psycopg2/html/_static/file.png
+share/doc/py-psycopg2/html/_static/jquery.js
+share/doc/py-psycopg2/html/_static/minus.png
+share/doc/py-psycopg2/html/_static/plus.png
+share/doc/py-psycopg2/html/_static/psycopg.css
+share/doc/py-psycopg2/html/_static/pygments.css
+share/doc/py-psycopg2/html/_static/searchtools.js
+share/doc/py-psycopg2/html/advanced.html
+share/doc/py-psycopg2/html/connection.html
+share/doc/py-psycopg2/html/cursor.html
+share/doc/py-psycopg2/html/errorcodes.html
+share/doc/py-psycopg2/html/extensions.html
+share/doc/py-psycopg2/html/extras.html
+share/doc/py-psycopg2/html/faq.html
+share/doc/py-psycopg2/html/genindex.html
+share/doc/py-psycopg2/html/index.html
+share/doc/py-psycopg2/html/modindex.html
+share/doc/py-psycopg2/html/module.html
+share/doc/py-psycopg2/html/objects.inv
+share/doc/py-psycopg2/html/pool.html
+share/doc/py-psycopg2/html/search.html
+share/doc/py-psycopg2/html/searchindex.js
+share/doc/py-psycopg2/html/tz.html
+share/doc/py-psycopg2/html/usage.html
+share/doc/py-psycopg2/pep-0249.txt
+share/doc/py-psycopg2/psycopg2.txt
+share/doc/py-psycopg2/src/
+share/doc/py-psycopg2/src/Makefile
+share/doc/py-psycopg2/src/_static/
+share/doc/py-psycopg2/src/_static/psycopg.css
+share/doc/py-psycopg2/src/advanced.rst
+share/doc/py-psycopg2/src/conf.py
+share/doc/py-psycopg2/src/connection.rst
+share/doc/py-psycopg2/src/cursor.rst
+share/doc/py-psycopg2/src/errorcodes.rst
+share/doc/py-psycopg2/src/extensions.rst
+share/doc/py-psycopg2/src/extras.rst
+share/doc/py-psycopg2/src/faq.rst
+share/doc/py-psycopg2/src/index.rst
+share/doc/py-psycopg2/src/module.rst
+share/doc/py-psycopg2/src/poo

Newsletter Suzuki | São as pequenas coisas que fazem a d iferença.

2010-04-23 Thread Suzuki
Não lê correctamente esta mensagem? www.suzuki.pt/automoveis
<http://www.suzuki.pt/automoveis/newsletter/20100423/index.html?newslett
er=20100423> 
 <http://www.suzuki.pt/automoveis/index.asp?newsletter=20100423>
São as pequenas coisas que fazem a diferença
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>
Em muitas situações da nossa vida, são as pequenas coisas que fazem a
diferença.
Um abraço, um beijo, um pequeno gesto pode fazer toda a diferença para
nós ou para os que nos rodeiam. 

Por isso, e porque a Suzuki é especialista em automóveis compactos,
resolvemos reunir aqui um conjunto de ideias que podem mudar a sua vida.
Porque são as pequenas coisas que fazem a diferença, partilhe estas
ideias com os seus amigos.

São as pequenas coisas que fazem a diferença
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>

Descubra mais ideias que podem mudar a sua vida
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>

 Está a receber esta edição da nossa newsletter porque nos autorizou a
enviá-la para o seu endereço de e-mail.
 Para ser retirado da Newsletter Suzuki, por favor clique aqui
<http://www.suzuki.pt/automoveis/newsletter/open_remover.html?newsletter
=20100423> .
Cebolas fazem chorar?
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>  Vá pelas escadas
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>Não recicle
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>  Um pequeno saco
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>Hitchcock e o melão
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>  

Melodia na estrada
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>  O cão mais pequeno do mundo
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423>Pequeno gigante
<http://www.suzuki.pt/automoveis/aspequenascoisas/index.asp?newsletter=2
0100423> 



[Update] Pgloader 2.3.2

2010-04-23 Thread Pierre-Emmanuel André
Hi,

This diff upgrades pgloader to 2.3.2.
Tested with psycopg2 2.0.14 and postgresql 8.4.3 on @amd64.

Regards,


-- 
Pierre-Emmanuel André 
GPG key: 0x7AE329DC
Index: Makefile
===
RCS file: /cvs/ports/databases/pgloader/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile14 Mar 2009 12:24:48 -  1.4
+++ Makefile23 Apr 2010 13:39:45 -
@@ -2,13 +2,12 @@
 
 COMMENT=   import CSV data and Large Object to PostgreSQL
 
-DISTNAME=  pgloader-2.3.1
-PKGNAME=   ${DISTNAME}p0
+DISTNAME=  pgloader-2.3.2
 CATEGORIES=databases
 
 HOMEPAGE=  http://pgfoundry.org/projects/pgloader/
 
-MAINTAINER=Pierre-Emmanuel Andre 
+MAINTAINER=Pierre-Emmanuel Andre 
 
 # BSD
 PERMIT_PACKAGE_FTP=Yes
@@ -16,7 +15,7 @@ PERMIT_PACKAGE_CDROM= Yes
 PERMIT_DISTFILES_FTP=  Yes
 PERMIT_DISTFILES_CDROM=Yes
 
-MASTER_SITES=  http://pgfoundry.org/frs/download.php/1814/
+MASTER_SITES=  http://pgfoundry.org/frs/download.php/2294/
 
 MODULES=   lang/python
 
Index: distinfo
===
RCS file: /cvs/ports/databases/pgloader/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo5 Jun 2008 09:45:31 -   1.2
+++ distinfo23 Apr 2010 13:39:45 -
@@ -1,5 +1,5 @@
-MD5 (pgloader-2.3.1.tar.gz) = EPk6IXO5RuNXTXufJ02lYg==
-RMD160 (pgloader-2.3.1.tar.gz) = y8y7AqZNNGpdiBJm1A64Pq+qyL8=
-SHA1 (pgloader-2.3.1.tar.gz) = u/x3GbBD0eZJMlcVxLe2v8HzniY=
-SHA256 (pgloader-2.3.1.tar.gz) = s9mhQpxhCDqgAwIxv5OKuXwijOkKkFIzBGHReiBY9z0=
-SIZE (pgloader-2.3.1.tar.gz) = 83071
+MD5 (pgloader-2.3.2.tar.gz) = y8VJ2O0riK0N3BwM/z78Pg==
+RMD160 (pgloader-2.3.2.tar.gz) = 9jgUKlQYqXvW44Lll33pYjGTXj4=
+SHA1 (pgloader-2.3.2.tar.gz) = BrZjBwlQ+spVnXkgu/NCVqLCnCo=
+SHA256 (pgloader-2.3.2.tar.gz) = Q9/W+UugIde/oGaJlZUkNaPxUNL6sHNVKnd5u0X3aYA=
+SIZE (pgloader-2.3.2.tar.gz) = 86200
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/pgloader/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   5 Jun 2008 09:45:31 -   1.2
+++ pkg/PLIST   23 Apr 2010 13:39:45 -
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.2 2008/06/05 09:45:31 ajacoutot Exp $
 bin/pgloader
 lib/python${MODPY_VERSION}/pgloader/
+lib/python${MODPY_VERSION}/pgloader/RRRtools.py
 lib/python${MODPY_VERSION}/pgloader/__init__.py
 lib/python${MODPY_VERSION}/pgloader/csvreader.py
 lib/python${MODPY_VERSION}/pgloader/db.py


[Update] p5-DBD-Pg 2.17.1

2010-04-23 Thread Pierre-Emmanuel André
Hi,

Small diff to update p5-DBD-Pg to 2.17.1.
Tested on @amd64 and @macppc with PostgreSQL 8.4.3.

Regards,

-- 
Pierre-Emmanuel André 
GPG key: 0x7AE329DC
Index: Makefile
===
RCS file: /cvs/ports/databases/p5-DBD-Pg/Makefile,v
retrieving revision 1.53
diff -u -p -r1.53 Makefile
--- Makefile23 Mar 2010 23:16:31 -  1.53
+++ Makefile23 Apr 2010 11:25:40 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
 COMMENT=   access to PostgreSQL databases through the DBI
 
 MODULES=   cpan
-DISTNAME=  DBD-Pg-2.16.1
+DISTNAME=  DBD-Pg-2.17.1
 CATEGORIES=databases
 
 LIB_DEPENDS=   pq.>=2:postgresql-client-*:databases/postgresql
Index: distinfo
===
RCS file: /cvs/ports/databases/p5-DBD-Pg/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo23 Mar 2010 23:16:31 -  1.16
+++ distinfo23 Apr 2010 11:25:40 -
@@ -1,5 +1,5 @@
-MD5 (DBD-Pg-2.16.1.tar.gz) = En+IqyS5caj143IKSWI1pQ==
-RMD160 (DBD-Pg-2.16.1.tar.gz) = CielbkhrEpF5Kj0VWWR+e6smZdo=
-SHA1 (DBD-Pg-2.16.1.tar.gz) = iXYlrUCrcxIh3wdEI/96rkbvoVQ=
-SHA256 (DBD-Pg-2.16.1.tar.gz) = jFUYdE+0jo3ePgdp6H39weQKuXWjH4PYcsCzuCMSfHI=
-SIZE (DBD-Pg-2.16.1.tar.gz) = 230375
+MD5 (DBD-Pg-2.17.1.tar.gz) = lrJLKdh2u7zHwZQRWRei8A==
+RMD160 (DBD-Pg-2.17.1.tar.gz) = MxUFd3ksWeIUlx27fnUXmN5gSY4=
+SHA1 (DBD-Pg-2.17.1.tar.gz) = k0bmk3odzCfX2m+K6z+Je9izkzI=
+SHA256 (DBD-Pg-2.17.1.tar.gz) = M9vMoSR6B4TZvLTqryQYNWdeUx7Et5hPHxt4AWrCg/0=
+SIZE (DBD-Pg-2.17.1.tar.gz) = 231523


Re: UPDATE: VLC 1.0.5

2010-04-23 Thread Edd Barrett
On Fri, Apr 23, 2010 at 10:47 AM, Peter Hessler  wrote:
> If you're seeing crashes when trying to view videos, try changing the
> output device to SDL or XVideo.  Looks like X11 output is broken.

Shouldnt we default to xv?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: UPDATE: VLC 1.0.5

2010-04-23 Thread Peter Hessler
If you're seeing crashes when trying to view videos, try changing the
output device to SDL or XVideo.  Looks like X11 output is broken.



On 2010 Apr 21 (Wed) at 11:29:44 +0100 (+0100), Edd Barrett wrote:
:On Wed, Apr 21, 2010 at 11:12:43AM +0100, Edd Barrett wrote:
:> Updated diff with the sparc64 hack in follows:
:
:Sorry guys, this is the correct diff:
:
:

-- 
To be sure of hitting the target, shoot first and, whatever you hit,
call it the target.



Re: update preview: lang/ghc

2010-04-23 Thread Matthias Kilian
> I get this error with current ports tree:
[...]
> haddock: out of memory (requested 1048576 bytes)

There's a reason the ports has VMEM_WARNING = Yes.

You need at least 800 MB of virtual memory to build ghc, better use 1G.



Re: cvsweb annotate tab alignment

2010-04-23 Thread Alexander Hall
On 04/23/10 09:59, Alexander Hall wrote:
> Oh, forgot to bump. hold on.

New diff below.

I'd like to point out that I normally do not run this myself, but since
I use the one at openbsd.org, I'd like it to work properly :)

> 
> On 04/23/10 09:55, Alexander Hall wrote:
>> This fixes tabs in cvsweb annotate; e.g.:
>>
>> PRE:
>>
>> 1.39  deraadt 7: mrouted_flags=NO   # for normal use: "", if 
>> activated
>> 1.35  niklas  8:# be sure to enable 
>> multicast_router below.
>> 1.114 norby   9: dvmrpd_flags=NO# for normal use: ""
>> 1.105 henning10: ospfd_flags=NO # for normal use: ""
>> 1.125 norby  11: ospf6d_flags=NO# for normal use: ""
>> 1.95  henning12: bgpd_flags=NO  # for normal use: ""
>>
>> POST:
>>
>> 1.39  deraadt 7: mrouted_flags=NO# for normal use: "", if 
>> activated
>> 1.35  niklas  8: # be sure to enable 
>> multicast_router below.
>> 1.114 norby   9: dvmrpd_flags=NO # for normal use: ""
>> 1.105 henning10: ospfd_flags=NO  # for normal use: ""
>> 1.125 norby  11: ospf6d_flags=NO # for normal use: ""
>> 1.95  henning12: bgpd_flags=NO   # for normal use: ""
>>
>>
>> Is there any active upstream to pass this on to?
>>
>> /Alexander

Index: Makefile
===
RCS file: /cvs/ports/devel/cvsweb/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile25 Nov 2009 19:54:19 -  1.38
+++ Makefile23 Apr 2010 07:59:34 -
@@ -4,7 +4,7 @@
 COMMENT=   WWW CGI script to browse CVS repository trees
 
 DISTNAME=  cvsweb-2.0.6
-PKGNAME=   ${DISTNAME}p7
+PKGNAME=   ${DISTNAME}p8
 CATEGORIES=devel www
 HOMEPAGE=  http://www.freebsd.org/projects/cvsweb.html
 
Index: patches/patch-cvsweb_cgi
===
RCS file: /cvs/ports/devel/cvsweb/patches/patch-cvsweb_cgi,v
retrieving revision 1.12
diff -u -p -r1.12 patch-cvsweb_cgi
--- patches/patch-cvsweb_cgi4 Feb 2006 17:01:36 -   1.12
+++ patches/patch-cvsweb_cgi23 Apr 2010 07:59:34 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/02/04 17:01:36 naddy Exp $
 --- cvsweb.cgi.origThu Sep 26 22:56:05 2002
-+++ cvsweb.cgi Sat Feb  4 17:33:35 2006
 cvsweb.cgi Fri Apr 23 09:42:23 2010
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -wT
 +#!/usr/bin/perl -w
@@ -12,11 +12,11 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
  # == EDIT this ==
  # Locations to search for user configuration, in order:
 -for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
-+for ("$mydir/cvsweb.conf", '%%CONFDIR%%/cvsweb/cvsweb.conf') {
++for ("$mydir/cvsweb.conf", '/var/www/conf/cvsweb/cvsweb.conf') {
if (defined($_) && -r $_) {
$config = $_;
last;
-@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{T
+@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var
  $LOG_FILESEPARATOR = q/^={77}$/;
  $LOG_REVSEPARATOR  = q/^-{28}$/;
  
@@ -37,6 +37,24 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
  );
  
  @LOGSORTKEYS = qw(cvs date rev);
+@@ -1723,7 +1718,7 @@ sub doAnnotate($$) {
+   $lineNr++;
+   (my $lrev = substr($_, 2,  13)) =~ y/ //d;
+   (my $lusr = substr($_, 16, 9))  =~ y/ //d;
+-  my $line = substr($_, 36);
++  my $line = substr($_, 37);
+   my $isCurrentRev = ($rev eq $lrev);
+ 
+   # we should parse the date here ..
+@@ -1752,7 +1747,7 @@ sub doAnnotate($$) {
+ 
+   printf "%s%s %-8s %4d:", $revprint,
+   $isCurrentRev ? '!' : ' ', $usrprint, $lineNr;
+-  print spacedHtmlText($line, $d{'tabstop'});
++  print " ", spacedHtmlText($line, $d{'tabstop'});
+ 
+   print "" if ($isCurrentRev && $is_textbased);
+   } elsif ($words[0] eq "ok") {
 @@ -2013,20 +2008,6 @@ sub doDiff($$) {
  
my @difftype   = @{$difftype->{'opts'}};



Re: cvsweb annotate tab alignment

2010-04-23 Thread Alexander Hall
Oh, forgot to bump. hold on.

On 04/23/10 09:55, Alexander Hall wrote:
> This fixes tabs in cvsweb annotate; e.g.:
> 
> PRE:
> 
> 1.39  deraadt 7: mrouted_flags=NO   # for normal use: "", if 
> activated
> 1.35  niklas  8:# be sure to enable 
> multicast_router below.
> 1.114 norby   9: dvmrpd_flags=NO# for normal use: ""
> 1.105 henning10: ospfd_flags=NO # for normal use: ""
> 1.125 norby  11: ospf6d_flags=NO# for normal use: ""
> 1.95  henning12: bgpd_flags=NO  # for normal use: ""
> 
> POST:
> 
> 1.39  deraadt 7: mrouted_flags=NO# for normal use: "", if 
> activated
> 1.35  niklas  8: # be sure to enable 
> multicast_router below.
> 1.114 norby   9: dvmrpd_flags=NO # for normal use: ""
> 1.105 henning10: ospfd_flags=NO  # for normal use: ""
> 1.125 norby  11: ospf6d_flags=NO # for normal use: ""
> 1.95  henning12: bgpd_flags=NO   # for normal use: ""
> 
> 
> Is there any active upstream to pass this on to?
> 
> /Alexander
> 
> Index: patches/patch-cvsweb_cgi
> ===
> RCS file: /cvs/ports/devel/cvsweb/patches/patch-cvsweb_cgi,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-cvsweb_cgi
> --- patches/patch-cvsweb_cgi  4 Feb 2006 17:01:36 -   1.12
> +++ patches/patch-cvsweb_cgi  23 Apr 2010 07:46:24 -
> @@ -1,6 +1,6 @@
>  $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/02/04 17:01:36 naddy Exp $
>  --- cvsweb.cgi.orig  Thu Sep 26 22:56:05 2002
> -+++ cvsweb.cgi   Sat Feb  4 17:33:35 2006
>  cvsweb.cgi   Fri Apr 23 09:42:23 2010
>  @@ -1,4 +1,4 @@
>  -#!/usr/bin/perl -wT
>  +#!/usr/bin/perl -w
> @@ -12,11 +12,11 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
>   # == EDIT this ==
>   # Locations to search for user configuration, in order:
>  -for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
> -+for ("$mydir/cvsweb.conf", '%%CONFDIR%%/cvsweb/cvsweb.conf') {
> ++for ("$mydir/cvsweb.conf", '/var/www/conf/cvsweb/cvsweb.conf') {
>   if (defined($_) && -r $_) {
>   $config = $_;
>   last;
> -@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{T
> +@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var
>   $LOG_FILESEPARATOR = q/^={77}$/;
>   $LOG_REVSEPARATOR  = q/^-{28}$/;
>   
> @@ -37,6 +37,24 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
>   );
>   
>   @LOGSORTKEYS = qw(cvs date rev);
> +@@ -1723,7 +1718,7 @@ sub doAnnotate($$) {
> + $lineNr++;
> + (my $lrev = substr($_, 2,  13)) =~ y/ //d;
> + (my $lusr = substr($_, 16, 9))  =~ y/ //d;
> +-my $line = substr($_, 36);
> ++my $line = substr($_, 37);
> + my $isCurrentRev = ($rev eq $lrev);
> + 
> + # we should parse the date here ..
> +@@ -1752,7 +1747,7 @@ sub doAnnotate($$) {
> + 
> + printf "%s%s %-8s %4d:", $revprint,
> + $isCurrentRev ? '!' : ' ', $usrprint, $lineNr;
> +-print spacedHtmlText($line, $d{'tabstop'});
> ++print " ", spacedHtmlText($line, $d{'tabstop'});
> + 
> + print "" if ($isCurrentRev && $is_textbased);
> + } elsif ($words[0] eq "ok") {
>  @@ -2013,20 +2008,6 @@ sub doDiff($$) {
>   
>   my @difftype   = @{$difftype->{'opts'}};



Re: make emacs optional on inputmethods/anthy

2010-04-23 Thread Federico G. Schwindt
On Fri, Apr 23, 2010 at 12:26:24AM +0100, Federico G. Schwindt wrote:
> Hi,
> 
>   While it might be good for emacs users, for the rest is a bit painful, so
> any objections to add a no_emacs pseudo flavour to exclude it?
> 
>   f.-
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/inputmethods/anthy/Makefile,v
> retrieving revision 1.9
> diff -N -u -p Makefile
> --- Makefile  16 Feb 2009 15:29:43 -  1.9
> +++ Makefile  22 Apr 2010 23:23:47 -
> @@ -1,20 +1,18 @@
>  # $OpenBSD: Makefile,v 1.9 2009/02/16 15:29:43 sthen Exp $
> +
>  COMMENT-main=japanese input method
>  COMMENT-emacs=   emacs files for anthy
>  
>  CATEGORIES=  japanese inputmethods
>  
> -V=   8300
> -MULTI_PACKAGES=  -main -emacs
> -DISTNAME=anthy-$V
> -PKGNAME-main=anthy-$V
> -PKGNAME-emacs=   emacs-anthy-$V
> +DISTNAME=anthy-8300
> +PKGNAME-main=${DISTNAME}
> +PKGNAME-emacs=   emacs-${DISTNAME}
>  
>  HOMEPAGE=http://anthy.sourceforge.jp/
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE_JP:=anthy/22565/}
>  
>  # GPL, part LGPL
> -
>  PERMIT_PACKAGE_CDROM=Yes
>  PERMIT_DISTFILES_CDROM=  Yes
>  PERMIT_PACKAGE_FTP=  Yes
> @@ -27,8 +25,6 @@ SHARED_LIBS +=  anthydic 0.0  # .1.0
>  SHARED_LIBS +=   anthy0.0  # .1.0
>  SHARED_LIBS +=   anthyinput   0.0  # .0.0
>  
> -BUILD_DEPENDS=   ::editors/emacs21
> -
>  CONFIGURE_ENV=   CPPFLAGS='-I${LOCALBASE}/include'
>  CONFIGURE_ENV+=  LDFLAGS='-L${LOCALBASE}/lib'
>  CONFIGURE_ENV+=  SWIG=no
> @@ -36,6 +32,16 @@ CONFIGURE_ENV+=SWIG=no
>  FAKE_FLAGS=  sysconfdir=$(PREFIX)/share/examples/anthy
>  
>  WANTLIB-main=c m
> +
> +MULTI_PACKAGES = -main
> +PSEUDO_FLAVORS = no_emacs
> +FLAVOR ?=
> +
> +.if !${FLAVOR:L:Mno_emacs}
> +MULTI_PACKAGES += -emacs
> +.endif
> +
> +BUILD_DEPENDS-emacs =::editors/emacs21
  
  Ignore this bit, it should be BUILD_DEPENDS.
  Anyhow, any OKs on the idea?
 
  f.-



cvsweb annotate tab alignment

2010-04-23 Thread Alexander Hall
This fixes tabs in cvsweb annotate; e.g.:

PRE:

1.39  deraadt 7: mrouted_flags=NO   # for normal use: "", if 
activated
1.35  niklas  8:# be sure to enable 
multicast_router below.
1.114 norby   9: dvmrpd_flags=NO# for normal use: ""
1.105 henning10: ospfd_flags=NO # for normal use: ""
1.125 norby  11: ospf6d_flags=NO# for normal use: ""
1.95  henning12: bgpd_flags=NO  # for normal use: ""

POST:

1.39  deraadt 7: mrouted_flags=NO# for normal use: "", if 
activated
1.35  niklas  8: # be sure to enable 
multicast_router below.
1.114 norby   9: dvmrpd_flags=NO # for normal use: ""
1.105 henning10: ospfd_flags=NO  # for normal use: ""
1.125 norby  11: ospf6d_flags=NO # for normal use: ""
1.95  henning12: bgpd_flags=NO   # for normal use: ""


Is there any active upstream to pass this on to?

/Alexander

Index: patches/patch-cvsweb_cgi
===
RCS file: /cvs/ports/devel/cvsweb/patches/patch-cvsweb_cgi,v
retrieving revision 1.12
diff -u -p -r1.12 patch-cvsweb_cgi
--- patches/patch-cvsweb_cgi4 Feb 2006 17:01:36 -   1.12
+++ patches/patch-cvsweb_cgi23 Apr 2010 07:46:24 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/02/04 17:01:36 naddy Exp $
 --- cvsweb.cgi.origThu Sep 26 22:56:05 2002
-+++ cvsweb.cgi Sat Feb  4 17:33:35 2006
 cvsweb.cgi Fri Apr 23 09:42:23 2010
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -wT
 +#!/usr/bin/perl -w
@@ -12,11 +12,11 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
  # == EDIT this ==
  # Locations to search for user configuration, in order:
 -for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
-+for ("$mydir/cvsweb.conf", '%%CONFDIR%%/cvsweb/cvsweb.conf') {
++for ("$mydir/cvsweb.conf", '/var/www/conf/cvsweb/cvsweb.conf') {
if (defined($_) && -r $_) {
$config = $_;
last;
-@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{T
+@@ -193,7 +193,7 @@ $tmpdir = defined($ENV{TMPDIR}) ? $ENV{TMPDIR} : "/var
  $LOG_FILESEPARATOR = q/^={77}$/;
  $LOG_REVSEPARATOR  = q/^-{28}$/;
  
@@ -37,6 +37,24 @@ $OpenBSD: patch-cvsweb_cgi,v 1.12 2006/0
  );
  
  @LOGSORTKEYS = qw(cvs date rev);
+@@ -1723,7 +1718,7 @@ sub doAnnotate($$) {
+   $lineNr++;
+   (my $lrev = substr($_, 2,  13)) =~ y/ //d;
+   (my $lusr = substr($_, 16, 9))  =~ y/ //d;
+-  my $line = substr($_, 36);
++  my $line = substr($_, 37);
+   my $isCurrentRev = ($rev eq $lrev);
+ 
+   # we should parse the date here ..
+@@ -1752,7 +1747,7 @@ sub doAnnotate($$) {
+ 
+   printf "%s%s %-8s %4d:", $revprint,
+   $isCurrentRev ? '!' : ' ', $usrprint, $lineNr;
+-  print spacedHtmlText($line, $d{'tabstop'});
++  print " ", spacedHtmlText($line, $d{'tabstop'});
+ 
+   print "" if ($isCurrentRev && $is_textbased);
+   } elsif ($words[0] eq "ok") {
 @@ -2013,20 +2008,6 @@ sub doDiff($$) {
  
my @difftype   = @{$difftype->{'opts'}};



Re: update preview: lang/ghc

2010-04-23 Thread Rafael Sadowski
On Thu Apr 22, 2010 at 11:28:08PM +0200, Matthias Kilian wrote:
> Hi,
> 
> On Thu, Apr 22, 2010 at 09:19:26PM +0200, Rafael Sadowski wrote:
> > today I found some time to test and build ghc with your ghc.diff but 
> > this diff can't find some distfiles:
> > 
> > ===>  Checking files for ghc-6.6.1
> 
> This should have been 6.12.1.20100330, not 6.6.1. Something went
> wrong applying the patch, at least for ghc.port.mk.
> 
> Anyway, ghc-6.12.2 has been finally released the other day, and
> I've all required updates in my tree and will them commit very soon
> (either now or tomorrow, depending on when earth should collapse).
> 
> Ciao,
>   Kili

Hello Kili,

I get this error with current ports tree:

"rm" -f compiler/stage2/build/libHSghc-6.12.2_p.a.contents
"inplace/bin/mkdirhier" compiler/stage2/doc/html/ghc/
"inplace/bin/ghc-cabal" haddock stage2 compiler 
--with-haddock=/usr/ports/pobj/ghc-6.12.2/ghc-6.12.2/inplace/bin/haddock 
--with-ghc=/usr/ports/pobj/ghc-6.12.2/ghc-6.12.2/inplace/bin/ghc-stage2  
--haddock-option=--optghc=-DSTAGE=2
Running Haddock for ghc-6.12.2...
Preprocessing library ghc-6.12.2...
Warning: The documentation for the following packages are not installed. No
links will be generated to these packages: ffi-1.0, rts-1.0
Warning: CmmExpr: foldRegsDefd is exported separately but will be documented 
under DefinerOfLocalRegs. Consider exporting it together with its parent(s) for 
code clarity.
Warning: CmmExpr: foldRegsUsed is exported separately but will be documented 
under UserOfLocalRegs. Consider exporting it together with its parent(s) for 
code clarity.
Warning: CmmExpr: foldSlotsDefd is exported separately but will be documented 
under DefinerOfSlots. Consider exporting it together with its parent(s) for 
code clarity.
Warning: CmmExpr: foldSlotsUsed is exported separately but will be documented 
under UserOfSlots. Consider exporting it together with its parent(s) for code 
clarity.
Warning: ZipCfg: succs is exported separately but will be documented under 
HavingSuccessors. Consider exporting it together with its parent(s) for code 
clarity.
Warning: ZipCfg: fold_succs is exported separately but will be documented under 
HavingSuccessors. Consider exporting it together with its parent(s) for code 
clarity.
Warning: ZipCfg: mkBranchNode is exported separately but will be documented 
under LastNode. Consider exporting it together with its parent(s) for code 
clarity.
Warning: ZipCfg: isBranchNode is exported separately but will be documented 
under LastNode. Consider exporting it together with its parent(s) for code 
clarity.
Warning: ZipCfg: branchNodeTarget is exported separately but will be documented 
under LastNode. Consider exporting it together with its parent(s) for code 
clarity.
Warning: OptimizationFuel: lastFuelPass is exported separately but will be 
documented under FuelUsingMonad. Consider exporting it together with its 
parent(s) for code clarity.
Warning: OptimizationFuel: fuelExhausted is exported separately but will be 
documented under FuelUsingMonad. Consider exporting it together with its 
parent(s) for code clarity.
Warning: OptimizationFuel: fuelRemaining is exported separately but will be 
documented under FuelUsingMonad. Consider exporting it together with its 
parent(s) for code clarity.
Warning: OptimizationFuel: fuelDecrement is exported separately but will be 
documented under FuelUsingMonad. Consider exporting it together with its 
parent(s) for code clarity.
Warning: OptimizationFuel: fuelDec1 is exported separately but will be 
documented under FuelUsingMonad. Consider exporting it together with its 
parent(s) for code clarity.
Warning: DFMonad: markFactsUnchanged is exported separately but will be 
documented under DataflowAnalysis. Consider exporting it together with its 
parent(s) for code clarity.
Warning: DFMonad: factsStatus is exported separately but will be documented 
under DataflowAnalysis. Consider exporting it together with its parent(s) for 
code clarity.
Warning: DFMonad: getFact is exported separately but will be documented under 
DataflowAnalysis. Consider exporting it together with its parent(s) for code 
clarity.
Warning: DFMonad: setFact is exported separately but will be documented under 
DataflowAnalysis. Consider exporting it together with its parent(s) for code 
clarity.
Warning: DFMonad: getExitFact is exported separately but will be documented 
under DataflowAnalysis. Consider exporting it together with its parent(s) for 
code clarity.
Warning: DFMonad: setExitFact is exported separately but will be documented 
under DataflowAnalysis. Consider exporting it together with its parent(s) for 
code clarity.
Warning: DFMonad: forgetFact is exported separately but will be documented 
under DataflowAnalysis. Consider exporting it together with its parent(s) for 
code clarity.
Warning: DFMonad: botFact is exported separately but will be documented under 
DataflowAnalysis. Consider exporting it together with its parent(s) for code 

Re: sndio for emulators/snes9x

2010-04-23 Thread Federico G. Schwindt
On Thu, Apr 22, 2010 at 12:55:54AM +0200, Antoine Jacoutot wrote:
> On Wed, 21 Apr 2010, Federico G. Schwindt wrote:
> 
> > On Mon, Apr 19, 2010 at 06:31:26PM +0100, Federico G. Schwindt wrote:
> > > On Mon, Apr 19, 2010 at 06:36:45AM +, Jacob Meuser wrote:
> > > > I enabled using a separate thread for sounds by default.  it's
> > > > possible that the audio block size would be large enough that X
> > > > events would be blocked for too long and timeout, returning an
> > > > error.  but having the sound handled in a different thread this
> > > > does not happen.
> > > > 
> > > > imo, seems to overall work better than when it was using audio(4).
> > > > 
> > > > please test.
> > > 
> > >   Instead of this, please try the update to 1.52 below that includes SDL
> > > for audio.  Slightly tested with a Super Turrican, Aero Fighters and
> > > Addams Family values.
> > 
> >   Unless I heard any objections I will commit this on Saturday, so if you
> > care please test now.
> 
> Can you please regen PLIST and add the gtk-update-icon-cache goo.
> Thank you.

  Updated below:

Index: emulators/snes9x/Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p emulators/snes9x/Makefile
--- emulators/snes9x/Makefile   10 Aug 2009 06:31:09 -  1.10
+++ emulators/snes9x/Makefile   23 Apr 2010 07:23:41 -
@@ -1,48 +1,67 @@
 # $OpenBSD: Makefile,v 1.10 2009/08/10 06:31:09 kili Exp $
 
-COMMENT=   emulates the Super Nintendo Entertainment System
+COMMENT =  emulates the Super Nintendo Entertainment System
 
-DISTNAME=  snes9x-1.51-src
-PKGNAME=   ${DISTNAME:S/-src//}p0
-CATEGORIES=emulators games
+DISTNAME = snes9x-1.52-src
+PKGNAME =  ${DISTNAME:S/-src//}
+CATEGORIES =   emulators games
 
-HOMEPAGE=  http://www.snes9x.com/
+HOMEPAGE = http://www.snes9x.com/
 
 # non-commercial
-PERMIT_PACKAGE_CDROM=  No
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=No
-PERMIT_DISTFILES_FTP=  Yes
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM = No
+PERMIT_DISTFILES_FTP = Yes
 
-WANTLIB+=  X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB =  X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+   Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo expat \
+   fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
+   gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
+   pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \
+   xcb xcb-render xcb-render-util z
 
-MASTER_SITES=  http://vincent.grigorieff.free.fr/snes9x/ \
-   http://files.ipherswipsite.com/snes9x/
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES = http://sites.google.com/site/bearoso/snes9x/
+EXTRACT_SUFX = .tar.bz2
 
-LIB_DEPENDS=   png::graphics/png
+BUILD_DEPENDS =::textproc/intltool
+RUN_DEPENDS =  :desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS =  glade-2.0::devel/libglade2 \
+   SDL::devel/sdl \
+   png::graphics/png \
+   xml2::textproc/libxml \
+   gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 
 
 .if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS=  ::devel/nasm 
+BUILD_DEPENDS =  ::devel/nasm 
 .endif
 
-AUTOCONF_VERSION=  2.59
+MODULES =  devel/gettext
 
-USE_X11=   Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS="${CXXFLAGS} -I${LOCALBASE}/include/libpng" \
-   LIBS="-L${LOCALBASE}/lib"
+USE_X11 =  Yes
+USE_GMAKE =Yes
 
-NO_REGRESS=Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-silent-rules \
+--without-portaudio \
+--without-oss \
+--without-alsa \
+--without-pulseaudio \
+--without-opengl 
+CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+   LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
-post-configure:
-   @perl -pi -e 's|\b_C\b|__C|g' ${WRKSRC}/cheats.cpp
+NO_REGRESS =   Yes
 
-do-install:
+WRKSRC =   ${WRKDIST}/gtk
+
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
-   ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${WRKSRC}/unix/docs/*.txt \
- ${PREFIX}/share/doc/snes9x
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snes9x
+   cd ${WRKDIST}/docs && ${INSTALL_DATA} \
+   control-inputs.txt controls.txt snapshots.txt snes9x-license.txt \
+   ${PREFIX}/share/doc/snes9x
+   cd ${WRKDIST}/docs && ${INSTALL_DATA} snes9x.conf.default \
+   ${PREFIX}/share/examples/snes9x
 
 .include 
Index: emulators/snes9x/distinfo
===
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.4
diff -N -u -p emulators/snes9x/distinfo
--- emula