CVS: cvs.openbsd.org: ports

2011-12-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/12/14 01:01:10

Removed files:
net/pidgin/patches: patch-finch_libgnt_gntwm_c 
patch-libpurple_protocols_silc_ops_c 

Log message:
be gone! evil patches!



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/12/14 01:25:22

Modified files:
net/telepathy/folks: Makefile distinfo 
net/telepathy/folks/pkg: PLIST 

Log message:
- update to 0.6.6



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Todd C. Miller
CVSROOT:/cvs
Module name:ports
Changes by: mill...@cvs.openbsd.org 2011/12/14 07:14:25

Log message:
p5-PostScript-MailLabels port

Status:

Vendor Tag: millert
Release Tags:   millert_2011_Dec_14

N ports/print/p5-PostScript-MailLabels/Makefile
N ports/print/p5-PostScript-MailLabels/distinfo
N ports/print/p5-PostScript-MailLabels/pkg/DESCR
N ports/print/p5-PostScript-MailLabels/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/12/14 07:17:14

ports/print/p5-PostScript-MailLabels/patches

Update of /cvs/ports/print/p5-PostScript-MailLabels/patches
In directory cvs.openbsd.org:/tmp/cvs-serv13659/patches

Log Message:
Directory /cvs/ports/print/p5-PostScript-MailLabels/patches added to the 
repository



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/12/14 07:23:53

Modified files:
print  : Makefile 
print/p5-PostScript-MailLabels: Makefile 
print/p5-PostScript-MailLabels/pkg: DESCR PLIST 
Added files:
print/p5-PostScript-MailLabels/patches: patch-Makefile_PL 

Log message:
- don't install demo script which needs additional files to be installed, there
is enough example data in the manual already
- reformat DESCR
- no REVISION bump since it was just imported
- hook it up while here.

ok millert@



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 07:58:36

ports/net/p5-Net-SMTP-TLS/patches

Update of /cvs/ports/net/p5-Net-SMTP-TLS/patches
In directory cvs.openbsd.org:/tmp/cvs-serv9215/patches

Log Message:
Directory /cvs/ports/net/p5-Net-SMTP-TLS/patches added to the repository



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 07:58:57

Modified files:
net/p5-Net-SMTP-TLS: Makefile 
Added files:
net/p5-Net-SMTP-TLS/patches: patch-lib_Net_SMTP_TLS_pm 

Log message:
add some fixes to Net::SMTP::TLS taken from Net::SMTP::TLS::ButMaintained



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 08:00:01

Modified files:
net/nagios/check_email_delivery: Makefile distinfo 

Log message:
update to check_email_delivery 0.7.1a



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 08:24:45

Modified files:
mail/roundcubemail: Makefile distinfo 
mail/roundcubemail/patches: patch-config_main_inc_php_dist 
mail/roundcubemail/pkg: PLIST 

Log message:
update to Roundcube 0.7

- lots of bugfixes and improvements including rewritten message caching



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2011/12/14 09:58:19

Modified files:
www/chromium   : Makefile distinfo 
www/chromium/patches: patch-base_base_gyp patch-base_base_gypi 
  patch-base_debug_debugger_posix_cc 
  patch-base_file_util_posix_cc 
  patch-base_process_util_h 
  patch-base_process_util_openbsd_cc 
  patch-base_sys_info_openbsd_cc 
  patch-base_threading_worker_pool_posix_cc 
  patch-build_common_gypi 
  patch-build_linux_system_gyp 
  patch-chrome_browser_about_flags_cc 
  patch-chrome_browser_browser_about_handler_cc 
  
patch-chrome_browser_chrome_content_browser_client_cc 
  patch-chrome_browser_net_connection_tester_cc 
  
patch-chrome_browser_policy_browser_policy_connector_cc 
  patch-chrome_chrome_browser_gypi 
  patch-chrome_chrome_gyp 
  patch-chrome_common_child_process_logging_h 
  patch-chrome_common_url_constants_cc 
  patch-chrome_common_url_constants_h 
  patch-chrome_renderer_chrome_ppb_pdf_impl_cc 
  patch-chrome_test_automation_proxy_launcher_cc 
  patch-content_app_content_main_cc 
  patch-content_browser_gpu_gpu_blacklist_cc 
  
patch-content_browser_gpu_gpu_blacklist_unittest_cc 
  patch-content_browser_plugin_service_cc 
  patch-content_browser_plugin_service_h 
  
patch-content_browser_renderer_host_pepper_message_filter_cc 
  
patch-content_browser_tab_contents_tab_contents_cc 
  patch-content_browser_zygote_host_linux_cc 
  patch-content_browser_zygote_main_linux_cc 
  patch-content_common_seccomp_sandbox_h 
  patch-content_common_set_process_title_cc 
  patch-content_content_browser_gypi 
  patch-content_content_plugin_gypi 
  
patch-content_renderer_pepper_plugin_delegate_impl_cc 
  patch-content_renderer_render_process_impl_cc 
  patch-crypto_nss_util_cc 
  patch-ipc_ipc_channel_posix_cc 
  
patch-media_audio_openbsd_audio_manager_openbsd_cc 
  patch-media_audio_openbsd_audio_manager_openbsd_h 
  patch-media_media_gyp 
  patch-net_base_dnsrr_resolver_cc 
  patch-net_base_net_util_cc 
  patch-net_base_network_change_notifier_cc 
  patch-net_dns_dns_config_service_posix_cc 
  patch-net_net_gyp 
  patch-printing_printing_gyp 
  patch-skia_ext_vector_platform_device_skia_cc 
  patch-skia_ext_vector_platform_device_skia_h 
  
patch-third_party_WebKit_Source_WebCore_WebCore_gyp_WebCore_gyp 
  patch-third_party_leveldatabase_env_chromium_cc 
  patch-third_party_skia_include_core_SkPreConfig_h 
  patch-third_party_yasm_yasm_compile_gypi 
  patch-tools_gyp_pylib_gyp_generator_make_py 
  patch-ui_gfx_blit_cc 
  patch-ui_gfx_gl_gl_implementation_linux_cc 
  patch-ui_ui_gyp patch-v8_src_heap_cc 
  patch-v8_src_platform_h 
  
patch-webkit_plugins_ppapi_ppapi_plugin_instance_cc 
www/chromium/pkg: PLIST 
Added files:
www/chromium/patches: 
  patch-chrome_browser_chrome_browser_main_posix_cc 
  
patch-chrome_browser_component_updater_component_updater_configurator_cc 
  patch-content_browser_browser_main_cc 
  
patch-content_shell_shell_content_browser_client_cc 
  patch-third_party_openssl_openssl_gyp 
Removed files:
www/chromium/patches: patch-base_basictypes_h 
  patch-base_logging_cc 
  

CVS: cvs.openbsd.org: ports

2011-12-14 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2011/12/14 11:16:51

Modified files:
lang/gcc/4.6   : gcc4.port.mk 

Log message:
missing endif



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2011/12/14 11:20:12

Modified files:
infrastructure/mk: gcc4.port.mk 

Log message:
Add support for MODGCC4_VERSION which can be used to define which gcc
version to use with the gcc4 module.
It defaults to 4.2, so there is no functional change.



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Remi Pointel
CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2011/12/14 13:25:11

Modified files:
devel/py-setuptools: Makefile 
devel/py-setuptools/pkg: PLIST 

Log message:
add a conflict with py-distribute-*.
ok fgsch@.



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Remi Pointel
CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2011/12/14 13:29:45

Log message:
import py-distribute, I'm removing py3-distribute.
ok fgsch@.

Status:

Vendor Tag: rpointel
Release Tags:   rpointel_20111214

N ports/devel/py-distribute/Makefile
N ports/devel/py-distribute/distinfo
N ports/devel/py-distribute/pkg/DESCR
N ports/devel/py-distribute/pkg/PLIST
N ports/devel/py-distribute/pkg/PFRAG.no-python3

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Remi Pointel
CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2011/12/14 13:31:28

Modified files:
lang/python: python.port.mk 

Log message:
Permit to build Python 2 and Python 3 ports.
ok fgsch@.



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Remi Pointel
CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2011/12/14 13:35:42

Removed files:
devel/py3-distribute: Makefile distinfo 
devel/py3-distribute/pkg: DESCR PLIST 

Log message:
remove py3-distribute, replaced by py-distribute.
ok fgsch@.



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Remi Pointel
CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2011/12/14 13:37:03

Modified files:
devel  : Makefile 

Log message:
-py3-distribute
+py-distribute,python3



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 14:28:30

Modified files:
mail/roundcubemail/patches: patch-config_main_inc_php_dist 

Log message:
regen patch



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 14:30:14

Modified files:
mail/roundcubemail: Makefile 
Added files:
mail/roundcubemail/patches: patch-SQL_sqlite_initial_sql 

Log message:
fix sqlite db creation script



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 14:44:10

Modified files:
mail/roundcubemail: Makefile 
Added files:
mail/roundcubemail/patches: patch-SQL_sqlite_update_sql 

Log message:
bleh, sqlite.update.sql has the same bug as I just fixed in sqlite.initial.sql



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2011/12/14 14:52:42

Modified files:
devel/pcre : Makefile distinfo 

Log message:
update to pcre-8.21 and take maintainership;
ok jasper@



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 14:56:56

Modified files:
mail/roundcubemail: Makefile 
mail/roundcubemail/patches: patch-SQL_sqlite_initial_sql 
patch-SQL_sqlite_update_sql 
Added files:
mail/roundcubemail/patches: patch-installer_rcube_install_php 

Log message:
- fix dropdown list in install.php for updates, from upstream
- upstream has the sql fixes too; mention the commit in a comment



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/12/14 15:58:24

Modified files:
devel/llvm : Makefile distinfo 
devel/llvm/patches: patch-Makefile_config_in 
patch-tools_clang_lib_Sema_AttributeList_cpp 
patch-tools_clang_tools_scan-build_scan-build 
devel/llvm/pkg : DESCR PLIST 
Added files:
devel/llvm/patches: patch-tools_clang_lib_Basic_Targets_cpp 
patch-tools_clang_lib_Driver_Tools_cpp 
Removed files:
devel/llvm/patches: patch-tools_clang_lib_Lex_Lexer_cpp 

Log message:
update to LLVM/CLang 3.0, thanks sebastia@ for testing.

- switch to cmake build
- add profiling support from jsg@



Re: CVS: cvs.openbsd.org: ports

2011-12-14 Thread Amit Kulkarni
On Wed, Dec 14, 2011 at 4:58 PM, Stuart Henderson st...@cvs.openbsd.org
wrote:
 CVSROOT:/cvs
 Module name:ports
 Changes by: st...@cvs.openbsd.org   2011/12/14 15:58:24

 Modified files:
devel/llvm : Makefile distinfo
devel/llvm/patches: patch-Makefile_config_in
patch-tools_clang_lib_Sema_AttributeList_cpp
patch-tools_clang_tools_scan-build_scan-build
devel/llvm/pkg : DESCR PLIST
 Added files:
devel/llvm/patches: patch-tools_clang_lib_Basic_Targets_cpp
patch-tools_clang_lib_Driver_Tools_cpp
 Removed files:
devel/llvm/patches: patch-tools_clang_lib_Lex_Lexer_cpp

 Log message:
 update to LLVM/CLang 3.0, thanks sebastia@ for testing.

 - switch to cmake build
 - add profiling support from jsg@


patch-tools_clang_lib_Sema_AttributeList_cpp can be removed... it is
already incorporated in the file about 7 lines up where patch applies
and has a OpenBSD comment...

+.Case(bounded, IgnoredAttribute)



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Federico G. Schwindt
CVSROOT:/cvs
Module name:ports
Changes by: fg...@cvs.openbsd.org   2011/12/14 16:38:20

Modified files:
x11/freerdp: Makefile 
Removed files:
x11/freerdp/patches: patch-libfreerdp_tcp_c 

Log message:
MSG_NOSIGNAL is supported now. kill unneeded patch.
maintainer (merdely@) ok.



Segue em anexo a planilha para orcamento !

2011-12-14 Thread Ricardo F. Prado.
Anexo : Planilha-Documento.doc (149,1 KB) Segue em anexo conforme
solicitado o relatorio e a
cotagco de pregos e produtos listados a seguir.

Tenha um bom dia!



CVS: cvs.openbsd.org: ports

2011-12-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2011/12/15 00:59:08

Modified files:
games/freedroidrpg: Makefile distinfo 

Log message:
Bugfix update to freedroidrpg-0.15rc2.



Hoje até 90% desconto em Bronzeamento Natural no Spa Urbano Oficina do Corpo 80% OFF / Cristalização de Fios 90% OFF =?utf-8?B?IC8gUGFjb3RlIEx1emVzK0hpZC4rR

2011-12-14 Thread Incriveis Ofertas - Campo Grande
www.incriveisofertas.com

[IMAGE] SHOW! 80% OFF Bronzeado Natural + Banho de Seda com Ducha
Arom�tica + Esfolia��o + Hidrata��o + Peeling Corporal ( De R$ 200 Por R$
39,99 )

de R$ 200,00 por R$ R$ 39,99


[IMAGE] Delicioso Panetone 500gr de Chocolate ou Frutas de R$14,00 Por
Apenas R$7,00

de R$ 14,00 por R$ R$ 7,00


[IMAGE] PRESENTE DE NATAL � NA ROSA PRATA MODA �NTIMA - SHOPPING 26 DE
AGOSTO COM 50% OFF! 01 CUECA BOX, DE R$12,00 POR R$6,00.

de R$ 12,00 por R$ R$ 6,00


[IMAGE] Espetinho de carne (alcatra) + Acompanhamentos (arroz, vinagrete,
mandioca, farofa) para 1 PESSOAS (de R$13 por R$5,99)

de R$ 13,00 por R$ R$ 5,99


[IMAGE] Cristaliza��o Para Tratamento de Fios! 90% OFF Essa N�o da Pra
Perder! De R$ 120,00 Por R$ 15,00

de R$ 120,00 por R$ R$ 15,00


[IMAGE] 75% OFF em Pacote de Colora��o ou Luzes + Selagem T�rmica ou
Reconstru��o T�rmica + 1 P� e M�o ( De R$ 310,00 por R$ 79,90 )

de R$ 310,00 por R$ R$ 79,90


[IMAGE] Fa�a a festa pela metade do pre�o! Kit Cama Elastica+Casinha de
Bolinhas+Maquina de Algod�o Doce+100 Saquinhos de Pipoca+2 Monitores ( De
R$290,00 Por R$ 145,00 )

de R$ 290,00 por R$ R$ 145,00


[IMAGE] Prepare-se para o Ver�o e tenha uma barriguinha perfeita! 5
Sess�es de Vinho Terapia com Bandagem + Manta T�rmica de R$ 450,00 por
apenas R$ 49,90. (88% de desconto).

de R$ 450,00 por R$ R$ 49,90


[IMAGE] Esta de Volta! 75% desconto em Pacote com Luzes + Hidrata��o +
Escova + P� e M�o de R$ 210,00 por R$ 49,90

de R$ 210,00 por R$ R$ 49,90



[IMAGE]

Não desejo mais receber estes e-mails.


van Etten's CLIPPINGs - 14 Dec. - Tough Year Ahead for Ad Industry 2012

2011-12-14 Thread CLIPPINGs Central
Circulation: 38,849  14/12/2011  Sent to:ports@openbsd.org 



[IMAGE]



[IMAGE]



[IMAGE]



[IMAGE]



[IMAGE]



[IMAGE]



[IMAGE]

Your AD here?

contact me

l...@talktalk.net

[IMAGE]



[IMAGE]



[IMAGE]



Boxcar Down: The Albanian Incident by Charles L. Lunsford

[IMAGE]

[IMAGE]





[IMAGE]

Publisher

CLIPPINGs

57 Nutbourne Str
London W10 4HW
England   





Subscriptions  Comments to:  

email: l...@talktalk.net



Weniger aber Besser, Rams



Published Daily and Weekly

In Affiliation with:

[IMAGE]



DAILY EDITION
=







Primary Sponsor

[IMAGE]



For QUICK REMOVAL send e-mail to l...@talktalk.net - If you received this
e-mail from a friend and would like to subscribe to our e-mail list,
click here. To update your e-mail address, click here.  The newsletter is
paid for by advertisement and sent to Specials Subscribers on behalf of 
Leadresearch.co.uk.
If you wish to unsubscribe to future e-mails from CLIPPINGs, please click
here. Or send a request to: Clippings - 57 Nutbourne Str. London W10 4HW
- England

[IMAGE]



[IMAGE]

Most Popular Link - Yesterday

[IMAGE]



GENERAL NEWS

The Latest Alcorn McBride Gear Brings St. Augustine’s Oldest Store Museum
Experience to Life

Tough Year Ahead for Ad Industry 2012

UK: JCDecaux Creates Christmas Idents for E-Motion Screens at Euston

France : Sony dote le stade Mayol de Toulon d’écrans LED

Lovefilm choose Digiadvans.com for Christmas Campaign

Four Winds Interactive ranks among Top 20 on Forbes America's Most
Promising Companies list

Aloft Hotel tests holographic QR codes to enhance guest experience

NEXCOM Recognized as Windows Embedded Partner

The Custom Hotel Implements Flyte Systems’ Airline Arrival and Departure
Displays

Avalon Sign Solutions Provides Faith Based Organizations With a New Means
of Communication

Christmas spending 'will send a third of shoppers into debt'

[IMAGE]



[IMAGE]




New Stuff

Interesting read: Kinetic’s a Global Digital Out of Home Handbook.

In-Stat’s new report, DVI and HDMI: DVI Declines While HDMI Soars

NPD DisplaySearch Quarterly Large-Area Production Strategy Report, global
TFT LCD glass input peaked in Q2’11, achieving a record 42.1 million
square meters, but then fell to 36.5 million square meters in Q3’11, and
is expected to reach 37.8 million square meters in Q4’11.

Vizrt Gives Worldwide Broadcasters On-Demand Access to DigitalGlobe
High-Resolution Earth Imagery

Christie Now Shipping LHD700 and LX1200 LCD Projectors

Study - OOH works: Studie: Out of Home-Medien wirken in Shopping Malls

The Green Thing: Neuer Media Player: IPC2U rüstet stromsparend auf

Toshiba Japan Announces 10.1-Inch, Windows 7-Powered Tablet

Samsung demos flexible, see-through displayVIDEO

Microsoft Releases New All-In-One Tag, QR And NFC Reader

[IMAGE]



[IMAGE]



Heard on The Street

Not All DOOH Networks Are Good Ideas

Tough Year Ahead for Ad Industry 2012

Forecast 2012: Financial institutions will invest heavily in mobile
banking

Reminder: Webinar: Digital drive-thru menu boards maximize messaging

DOOH and mobile couponing (Video) incl. video

Digital Signage: A Fresh Take - Part 1

Tech Data, 

Re: UPDATE: www/node 0.6.3 to 0.6.5

2011-12-14 Thread Aaron Bieber
On Sat, Dec 10, 2011 at 02:04:44PM +0100, Ingo Schwarze wrote:
 Hi,
 
 Aaron Bieber wrote on Fri, Dec 09, 2011 at 08:01:38AM -0700:
  On Fri, Dec 09, 2011 at 01:54:12PM +0100, Jasper Lievisse Adriaanse wrote:
  On Wed, Dec 07, 2011 at 09:00:26AM -0700, Aaron wrote:
 
  This patch updates nodejs from 0.6.3 to 0.6.5.  Tested on i386/amd64
 
  Shouldn't the manpages be installed to a more generic path?
 
  I assume you are talking about the pages in
  /usr/local/lib/node_modules/npm/man/man3/ .  
  
  They are specific to npm, which was just recently added to node, and 
  are generally accessed from the npm command ( npm help json for 
  example ).
  
  Moving them will likely cause problems as npm expects them to be in its
  node_module directory.
 
 Well, that could probably be fixed, no?
 
 But the names of these pages are too generic.
 
 So they either have to stay well well out of the way, in some
 non-generic path, as you proposed.  Of course, then they are
 of rather limited usefulness, because man(1) and apropos(1)
 will not find them.  Given the bad naming scheme, telling people
 to add that path to man.conf(5) would be a bad idea.
 
 Or alternatively, to make it possible to put them into /usr/local/man/,
 they have to be renamed to something sensible, like npm-init(1),
 npm-link(1), and so on, and npm has to be changed to cope.  But
 probably that's beyond the scope of a port and should be fixed
 upstream instead.
 
 Yours,
   Ingo

It's for sure harder than just passing a flag to configure.

I will look into how feasible it is.



devel/jdk: add JAVA_HOME to MAKE_ENV for MODJAVA_BUILD=ant

2011-12-14 Thread Matthias Kilian
If jdk-1.7 is already installed when apache-ant gets installed,
javaPathHelper -c apache-ant will use jdk-1.7, which is quite
confusing. For example, naddy reported a problem with postgresql-jdbc
which failed to build because the JDBC interfaces got some new
declarations since jdk-1.7. Yet, postgresql-jdbc ports-wise build
depends on jdk-1.6.

The diff below passes JAVA_HOME via MAKE_ENV whenever MODJAVA_BUILD=ant
is set.

It would be nice if someone could test this in a bulk build before
I commit it.

comments?

Ciao,
Kili

Index: java.port.mk
===
RCS file: /cvs/ports/devel/jdk/java.port.mk,v
retrieving revision 1.29
diff -u -p -r1.29 java.port.mk
--- java.port.mk7 Oct 2011 13:54:31 -   1.29
+++ java.port.mk14 Dec 2011 19:16:59 -
@@ -93,6 +93,7 @@ CATEGORIES+=  java
 # respectively.
 .if defined(MODJAVA_BUILD)  ${MODJAVA_BUILD:L} == ant
 BUILD_DEPENDS += devel/apache-ant
+MAKE_ENV += JAVA_HOME=${JAVA_HOME}
 MODJAVA_BUILD_TARGET ?=
 MODJAVA_BUILD_FILE ?= build.xml
 MODJAVA_BUILD_DIR ?= ${WRKSRC}



Re: Allow clang++ to work on OpenBSD

2011-12-14 Thread Pascal Stumpf
On Mon, 12 Dec 2011 17:06:19 +0100, Pascal Stumpf wrote:
 On Mon, 12 Dec 2011 16:55:04 +0100 (CET), Mark Kettenis wrote:
   Date: Mon, 12 Dec 2011 16:51:48 +0100
   From: Pascal Stumpf  pascal.stu...@cubes.de
   
   On Mon, 12 Dec 2011 16:26:42 +0100, Marc Espie wrote:
On Mon, Dec 12, 2011 at 04:00:44PM +0100, Pascal Stumpf wrote:
 On Mon, 12 Dec 2011 14:41:45 +0100 (CET), Mark Kettenis wrote:
  
  The s/restrict/__restrict/g in cstdio shouldn't be necessary.
 
 Apparently, clang++ interprets restrict as parameter name, i.e.:
 
 attr.cc:1:50: error: redefinition of parameter 'restrict'
 extern C int foo(const char * restrict, char * restrict, ...) 
  ^
 attr.cc:1:33: note: previous declaration is here
 extern C int foo(const char * restrict, char * restrict, ...) 
 ^
 
 This might indeed be a bug, but I'd have to read the C++ standard to 
 be
 sure.  In pure C, clang doesn't complain.

I'm not that surprised. restrict is C99.  It's not part of C++98.

Googling for restrict and C++ show various bug-reports explicitly stati
 ng
   tha
t
library headers should probably adapt.

I don't have access to C++ 2011 yet, but from n3242, it seems that it d
 oe
  s
now refer to C99 instead of C89, so restrict is probably leggit in C++2
 01
  1.

So it looks to me like clang in C++98 mode is totally right to not reco
 gn
  ize
restrict as a keyword!
   
   Yes, you're right.  And clang++ -std=c++0x does recognise restrict as a
   keyword.  cstdio should be adapted (and gcc 4.6 does indeed have
   __restrict over restrict).
  
  Still worth checking if only removing the XXX_CHECK defines and
  leaving the XXX_DYNAMIC defines helps.
 
 Yes, it does. :)  Thanks!

So ...  Any oks for this diff?


Index: os_defines.h
===
RCS file: /cvs/src/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/os_defines.h,v
retrieving revision 1.2
diff -u -p -r1.2 os_defines.h
--- os_defines.h26 May 2010 11:23:06 -  1.2
+++ os_defines.h14 Dec 2011 19:53:49 -
@@ -35,11 +35,8 @@
 // file will come before all others.
 
 #define _GLIBCXX_USE_C99 1
-#define _GLIBCXX_USE_C99_CHECK 1
 #define _GLIBCXX_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE = 1999))
-#define _GLIBCXX_USE_C99_LONG_LONG_CHECK 1
 #define _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC (_GLIBCXX_USE_C99_DYNAMIC || 
!defined __LONG_LONG_SUPPORTED)
-#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_CHECK 1
 #define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC defined _XOPEN_SOURCE
 typedef __builtin_va_list __gnuc_va_list;
 



Update: databases/ruby-pg 0.11.0 - 0.12.0

2011-12-14 Thread Jeremy Evans
Fairly simple update, here are the relevant changes:

- PGconn#wait_for_notify
  * send nil as the payload argument if the NOTIFY didn't have one.
  * accept a nil argument for no timeout (Sequel support)
  * Fixed API docs
  * Taint and encode event name and payload
- Handle errors while rb_thread_select()ing in PGconn#block. 
  (Brian Weaver).
- Fixed a typo in PGconn#error_message's documentation
- fixing unused variable warnings for ruby 1.9.3 (Aaron Patterson)

Tested on i386 and amd64.  I'll be commiting next week unless I hear
objections.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/databases/ruby-pg/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile9 Nov 2011 00:17:38 -   1.15
+++ Makefile14 Dec 2011 19:12:25 -
@@ -2,9 +2,8 @@
 
 COMMENT =  PostgreSQL database interface for ruby
 
-DISTNAME = pg-0.11.0
+DISTNAME = pg-0.12.0
 CATEGORIES =   databases
-REVISION = 1
 
 MAINTAINER =   Jeremy Evans jer...@openbsd.org
 
Index: distinfo
===
RCS file: /cvs/ports/databases/ruby-pg/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo25 Apr 2011 18:11:06 -  1.7
+++ distinfo14 Dec 2011 19:12:31 -
@@ -1,5 +1,5 @@
-MD5 (pg-0.11.0.gem) = a0nr2hfwMTqiurGbnw9zXQ==
-RMD160 (pg-0.11.0.gem) = F84rdrPPg0FvvHz7Mnw4SKzFcWs=
-SHA1 (pg-0.11.0.gem) = 1auic5Lb/A3STsOc4Ai1ydrvMJE=
-SHA256 (pg-0.11.0.gem) = DBuRySVDm+658Dz7WnGZjcfUtzdUxjT3IZo/NiQNZc0=
-SIZE (pg-0.11.0.gem) = 115200
+MD5 (pg-0.12.0.gem) = oTJvfnCp9mEzlPeLW1Qv8g==
+RMD160 (pg-0.12.0.gem) = PVCXe6vyMEO+reM3n1CrrKDFacc=
+SHA1 (pg-0.12.0.gem) = KN8LRDLaqQaDIT4ESaHul1tyQKQ=
+SHA256 (pg-0.12.0.gem) = l8tjhgiYYfJZ0DvQkucXqAlEaiMzoX2sT1wtTZOEtAA=
+SIZE (pg-0.12.0.gem) = 107008
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/ruby-pg/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST   9 Nov 2011 00:17:38 -   1.6
+++ pkg/PLIST   14 Dec 2011 19:14:55 -
@@ -1,17 +1,20 @@
 @comment $OpenBSD: PLIST,v 1.6 2011/11/09 00:17:38 jeremy Exp $
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
+${GEM_LIB}/gems/${DISTNAME}/.gemtest
 ${GEM_LIB}/gems/${DISTNAME}/BSD
 ${GEM_LIB}/gems/${DISTNAME}/ChangeLog
-${GEM_LIB}/gems/${DISTNAME}/Contributors
+${GEM_LIB}/gems/${DISTNAME}/Contributors.rdoc
 ${GEM_LIB}/gems/${DISTNAME}/GPL
+${GEM_LIB}/gems/${DISTNAME}/History.rdoc
 ${GEM_LIB}/gems/${DISTNAME}/LICENSE
-${GEM_LIB}/gems/${DISTNAME}/README
-${GEM_LIB}/gems/${DISTNAME}/README.OS_X
-${GEM_LIB}/gems/${DISTNAME}/README.ja
-${GEM_LIB}/gems/${DISTNAME}/README.windows
+${GEM_LIB}/gems/${DISTNAME}/Manifest.txt
+${GEM_LIB}/gems/${DISTNAME}/README.OS_X.rdoc
+${GEM_LIB}/gems/${DISTNAME}/README.ja.rdoc
+${GEM_LIB}/gems/${DISTNAME}/README.rdoc
+${GEM_LIB}/gems/${DISTNAME}/README.windows.rdoc
 ${GEM_LIB}/gems/${DISTNAME}/Rakefile
-${GEM_LIB}/gems/${DISTNAME}/Rakefile.local
+${GEM_LIB}/gems/${DISTNAME}/Rakefile.cross
 ${GEM_LIB}/gems/${DISTNAME}/ext/
 ${GEM_LIB}/gems/${DISTNAME}/ext/Makefile
 ${GEM_LIB}/gems/${DISTNAME}/ext/compat.c
@@ -24,22 +27,31 @@ ${GEM_LIB}/gems/${DISTNAME}/ext/pg.c
 ${GEM_LIB}/gems/${DISTNAME}/ext/pg.h
 ${GEM_LIB}/gems/${DISTNAME}/ext/pg.o
 ${GEM_LIB}/gems/${DISTNAME}/ext/pg_ext.so
+${GEM_LIB}/gems/${DISTNAME}/ext/vc/
+${GEM_LIB}/gems/${DISTNAME}/ext/vc/pg.sln
+${GEM_LIB}/gems/${DISTNAME}/ext/vc/pg_18/
+${GEM_LIB}/gems/${DISTNAME}/ext/vc/pg_18/pg.vcproj
+${GEM_LIB}/gems/${DISTNAME}/ext/vc/pg_19/
+${GEM_LIB}/gems/${DISTNAME}/ext/vc/pg_19/pg_19.vcproj
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/pg_ext.so
-${GEM_LIB}/gems/${DISTNAME}/rake/
-${GEM_LIB}/gems/${DISTNAME}/rake/191_compat.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/dependencies.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/documentation.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/helpers.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/hg.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/manual.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/packaging.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/publishing.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/style.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/svn.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/testing.rb
-${GEM_LIB}/gems/${DISTNAME}/rake/verifytask.rb
+${GEM_LIB}/gems/${DISTNAME}/misc/
+${GEM_LIB}/gems/${DISTNAME}/misc/openssl-pg-segfault.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/
+${GEM_LIB}/gems/${DISTNAME}/sample/async_api.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/async_copyto.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/copyfrom.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/copyto.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/cursor.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/losample.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/notify_wait.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/psql.rb
+${GEM_LIB}/gems/${DISTNAME}/sample/psqlHelp.rb

Re: Allow clang++ to work on OpenBSD

2011-12-14 Thread Mark Kettenis
 Date: Wed, 14 Dec 2011 20:54:05 +0100
 From: Pascal Stumpf  pascal.stu...@cubes.de
 
 On Mon, 12 Dec 2011 17:06:19 +0100, Pascal Stumpf wrote:
  On Mon, 12 Dec 2011 16:55:04 +0100 (CET), Mark Kettenis wrote:
Date: Mon, 12 Dec 2011 16:51:48 +0100
From: Pascal Stumpf  pascal.stu...@cubes.de

On Mon, 12 Dec 2011 16:26:42 +0100, Marc Espie wrote:
 On Mon, Dec 12, 2011 at 04:00:44PM +0100, Pascal Stumpf wrote:
  On Mon, 12 Dec 2011 14:41:45 +0100 (CET), Mark Kettenis wrote:
   
   The s/restrict/__restrict/g in cstdio shouldn't be necessary.
  
  Apparently, clang++ interprets restrict as parameter name, i.e.:
  
  attr.cc:1:50: error: redefinition of parameter 'restrict'
  extern C int foo(const char * restrict, char * restrict, ...) 
   ^
  attr.cc:1:33: note: previous declaration is here
  extern C int foo(const char * restrict, char * restrict, ...) 
  ^
  
  This might indeed be a bug, but I'd have to read the C++ standard 
  to 
  be
  sure.  In pure C, clang doesn't complain.
 
 I'm not that surprised. restrict is C99.  It's not part of C++98.
 
 Googling for restrict and C++ show various bug-reports explicitly 
 stati
  ng
tha
 t
 library headers should probably adapt.
 
 I don't have access to C++ 2011 yet, but from n3242, it seems that it 
 d
  oe
   s
 now refer to C99 instead of C89, so restrict is probably leggit in 
 C++2
  01
   1.
 
 So it looks to me like clang in C++98 mode is totally right to not 
 reco
  gn
   ize
 restrict as a keyword!

Yes, you're right.  And clang++ -std=c++0x does recognise restrict as a
keyword.  cstdio should be adapted (and gcc 4.6 does indeed have
__restrict over restrict).
   
   Still worth checking if only removing the XXX_CHECK defines and
   leaving the XXX_DYNAMIC defines helps.
  
  Yes, it does. :)  Thanks!
 
 So ...  Any oks for this diff?

ok kettenis@

 Index: os_defines.h
 ===
 RCS file: /cvs/src/gnu/gcc/libstdc++-v3/config/os/bsd/openbsd/os_defines.h,v
 retrieving revision 1.2
 diff -u -p -r1.2 os_defines.h
 --- os_defines.h  26 May 2010 11:23:06 -  1.2
 +++ os_defines.h  14 Dec 2011 19:53:49 -
 @@ -35,11 +35,8 @@
  // file will come before all others.
  
  #define _GLIBCXX_USE_C99 1
 -#define _GLIBCXX_USE_C99_CHECK 1
  #define _GLIBCXX_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE = 1999))
 -#define _GLIBCXX_USE_C99_LONG_LONG_CHECK 1
  #define _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC (_GLIBCXX_USE_C99_DYNAMIC || 
 !defined __LONG_LONG_SUPPORTED)
 -#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_CHECK 1
  #define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC defined _XOPEN_SOURCE
  typedef __builtin_va_list __gnuc_va_list;
  
 



update databases/postgresql-jdbc

2011-12-14 Thread Matthias Kilian
Update to postgresql-jdbc-9.1.901.

Buildable with both jdk-1.6 and jdk-1.7 (but in the normal case,
it should be always built with jdk-1.6; see the diff to java.port.mk
I sent earlier). Tested on amd64 with make regress.

If someone plans to give it some real testing, please let me know.

Ciao,
Kili

Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql-jdbc/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile7 Oct 2011 13:54:30 -   1.16
+++ Makefile14 Dec 2011 20:11:46 -
@@ -3,7 +3,7 @@
 COMMENT-main=  JDBC Driver for PostgreSQL
 COMMENT-docs=  API docs for PostgreSQL JDBC Driver
 
-V= 9.0-801
+V= 9.1-901
 DISTNAME=  postgresql-jdbc-$V
 PKGNAME-main=  postgresql-jdbc-${V:S/-/./}
 PKGNAME-docs=  postgresql-jdbc-docs-${V:S/-/./}
Index: distinfo
===
RCS file: /cvs/ports/databases/postgresql-jdbc/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo6 Sep 2011 19:28:36 -   1.3
+++ distinfo14 Dec 2011 20:11:46 -
@@ -1,5 +1,5 @@
-MD5 (postgresql-jdbc-9.0-801.src.tar.gz) = MhiBCSUfjaJ2bad7F0IyvA==
-RMD160 (postgresql-jdbc-9.0-801.src.tar.gz) = RSP9kbtuzbsv+NHwrrpGOlA2nDA=
-SHA1 (postgresql-jdbc-9.0-801.src.tar.gz) = yIayacPkIYfU9GTh8/VuqNZZVGU=
-SHA256 (postgresql-jdbc-9.0-801.src.tar.gz) = 
zHljFEXZd4IvZnDMQFWNw1trdK5izHAUvF6CbXEwbGM=
-SIZE (postgresql-jdbc-9.0-801.src.tar.gz) = 608457
+MD5 (postgresql-jdbc-9.1-901.src.tar.gz) = 6rIKXNU0SiHzOhdo3T9Plg==
+RMD160 (postgresql-jdbc-9.1-901.src.tar.gz) = e7tvkuLHzWrIFyudmVFGCH5Lejs=
+SHA1 (postgresql-jdbc-9.1-901.src.tar.gz) = Bl5c1FrOWU5enHDfXabkSwNh+4A=
+SHA256 (postgresql-jdbc-9.1-901.src.tar.gz) = 
DQjPfFyJnICL/QQ679M+seYo7wBo6acpm+bqzyRaAp8=
+SIZE (postgresql-jdbc-9.1-901.src.tar.gz) = 616248
Index: patches/patch-build_xml
===
RCS file: /cvs/ports/databases/postgresql-jdbc/patches/patch-build_xml,v
retrieving revision 1.2
diff -u -p -r1.2 patch-build_xml
--- patches/patch-build_xml 6 Sep 2011 19:28:36 -   1.2
+++ patches/patch-build_xml 14 Dec 2011 20:11:46 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-build_xml,v 1.2 2011/09/06 19:28:36 kili Exp $
 
 build.xml.orig Wed Jul  1 07:00:39 2009
-+++ build.xml  Mon Sep  5 20:28:14 2011
-@@ -362,7 +362,7 @@
+--- build.xml.orig Tue Aug  2 15:40:11 2011
 build.xml  Wed Dec 14 21:11:26 2011
+@@ -399,7 +399,7 @@
  property name=testResultsDir value=${builddir}/testresults /
  mkdir dir=${testResultsDir} /
   



Re: UPDATE: FFmpeg 20111126

2011-12-14 Thread Jan Stary
On Dec 13 04:31:26, Brad wrote:
 On 26/11/11 6:03 PM, Brad wrote:
 Here is an update to FFmpeg 2026 snapshot and updates for some
 of its dependencies.
 
 Tested on amd64.
 
 http://comstyle.com/ports/ffmpeg/
 
 Could someone who actually uses MPlayer please do some testing with
 mencoder and get back to me?

On current/i386, I upgraded ffmpeg and mplayer using your diffs,
then mencoded an mpeg4/aac movie into a x264/mp3 movie,
and it worked fine.

Jan



Re: devel/jdk: add JAVA_HOME to MAKE_ENV for MODJAVA_BUILD=ant

2011-12-14 Thread Matthias Kilian
On Wed, Dec 14, 2011 at 08:01:22PM +, Nigel Taylor wrote:
  The diff below passes JAVA_HOME via MAKE_ENV whenever MODJAVA_BUILD=ant
  is set.
 
 Hit this issue before in java/jna see below, the line added to java/jna 
 is the same your adding. jna could have it's MAKE_ENV line removed, as now 
 it's in java.port.mk.

Interesting. A search in the tree shows even more ports with that
workaround:

./geo/jeoip/Makefile:MAKE_ENV=  JAVA_HOME=${JAVA_HOME} \
./geo/josm/Makefile:MAKE_ENV+=  JAVA_HOME=${JAVA_HOME}
./java/jna/Makefile:MAKE_ENV += JAVA_HOME=${JAVA_HOME}
./net/openfire/Makefile:MAKE_ENV+=  JAVA_HOME=${JAVA_HOME}

kurt@ already gave an ok@, but i'll builld and install everything
related to java and look wether there's any failure with the diff.

Ciao,
Kili



Re: roundcubemail on openbsd 5.0

2011-12-14 Thread Stuart Henderson
I have just tested this method with roundcube 0.7 on OpenBSD with
a blank database and it works fine there, logging in with the full
email address as specified in the left-hand column of the
virtusertable file uses the username on the right-hand-side as
the imap login name, and in prefs/identities it shows up the
full list of sender addresses with a matching entry.

Have you tried it with a blank database?

Reply-to set to ports@, though you might do better with a roundcube
forum instead if you still have problems..



On 2011/12/14 10:33, Wesley M. wrote:
 Hi,
 
 I use sendmail 8.14.15 with virtusertable and procmail for multiple
 domains and
 dovecot 2.0; and Apache (chrooted in /var/www)
 MAILDIR : /var/mailserver/%u/
 IMAP/POP3/IMAPS/POP3S works.
 I just want :
 
 At the Roundcube login page, type user1@domain1 and 
 send emails from this email :user1@domain1 without @localhost
 
 Actually i can only log in with user1 and when i send email, i have
 user1@localhost
 
 I tried this :
 add these 2 lines
 in main.inc.php and cp /etc/mail/virtusertable in /var/www/roundcubemail/
 
 $rcmail_config['plugins'] = array('virtuser_file');
 $rcmail_config['virtuser_file'] = '/roundcubemail/virtusertable'; 
 add a new user, try to connect with
 user_new@domain1 : no success
 try to connect with user_new : OK but always
 send emails with @localhost 
 
 I read man pages, a lot of documents in
 Internet, it doesn't work for me.
 Any idea ? 
 
 Thank you very much for your
 replies, your helps. 
 
 Wesley. 
 
 www.mouedine.net
 
 On Tue, 13 Dec 2011 20:48:16 +, Stuart Henderson s...@spacehopper.org
 wrote:
  On 2011/12/13 15:28, Michael W. Lucas wrote:
  I have Roundcube elsewhere.  It basically runs like any other
  IMAP/pop3 client, e.g., communicates over port 110/995/whatever.  My
  roundcube install isn't actually on my mail server.
  
  This leads me to think that copying system files into the chroot isn't
  going to help.
  
  It has some special support for looking up usernames from a file
  in virtusertable format. Can't say I've used it myself though..
  
  Using a mail client other than roundcube, can you authenticate to the
  server using user@domain, and send mail from user@domain?
  
  Had Wesley followed the advice in my email about where to look
  in the config file etc. he would probably have it working by now.
  
See the config file, where it says This domain will be used to
form e-mail addresses of new users. Note that it says *new*;
existing users will need to be changed in the database.



unclusterfuck databases/jxplorer

2011-12-14 Thread Matthias Kilian
- Make it at least startable (it was unusable after the removal of
  jdk-1.5, and nobody noticed/complained).

- Remove MAINTAINER, because of inactivity.

We may as well just remove it from the tree. If there are real
users, please speak up!

Ciao,
Kili

Index: Makefile
===
RCS file: /cvs/ports/databases/jxplorer/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile7 Oct 2011 13:54:30 -   1.11
+++ Makefile14 Dec 2011 21:48:49 -
@@ -5,14 +5,12 @@ COMMENT=  standards compliant LDAP browse
 V= 3.2
 DISTNAME=  JXv${V}deploy
 PKGNAME=   jxplorer-${V}
-REVISION=  7
+REVISION=  8
 EXTRACT_SUFX=  .zip
 CATEGORIES=databases net
 
 HOMEPAGE=  http://www.pegacat.com/jxplorer/
 
-MAINTAINER=Alexandre Anriot aanr...@openbsd.org
-
 # CA Open Source Licence v1.0
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
@@ -24,14 +22,12 @@ WRKDIST=${WRKDIR}/jxplorer
 
 MODULES=   java
 MODJAVA_VER=   1.5+
-JAVA_HOME= ${LOCALBASE}/jdk-1.5.0
 
 NO_BUILD=  Yes
 NO_REGRESS=Yes
 
 do-configure:
@cp ${FILESDIR}/jxplorer ${WRKSRC}
-   @perl -pi -e s,%%JAVA_HOME%%,${JAVA_HOME}, ${WRKSRC}/jxplorer.sh
@perl -pi -e s,%%PREFIX%%,${PREFIX}, \
${WRKSRC}/jxplorer \
${WRKSRC}/jxplorer.sh
Index: patches/patch-jxplorer_sh
===
RCS file: /cvs/ports/databases/jxplorer/patches/patch-jxplorer_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-jxplorer_sh
--- patches/patch-jxplorer_sh   31 May 2007 18:13:15 -  1.1.1.1
+++ patches/patch-jxplorer_sh   14 Dec 2011 21:48:49 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 2007/05/31 18:13:15 aanriot Exp $
 --- jxplorer.sh.orig   Mon Feb 26 21:08:36 2007
-+++ jxplorer.shWed May 30 08:40:36 2007
-@@ -1,24 +1,19 @@
 jxplorer.shWed Dec 14 22:44:15 2011
+@@ -1,24 +1,18 @@
  #!/bin/sh
- # OpenDirectory  jxstart.sh $Revision: 1.1.1.1 $  $Date: 2007/05/31 18:13:15 $
+ # OpenDirectory  jxstart.sh $Revision: 1.13 $  $Date: 2006/04/18 04:12:12 $
  
 -if [ -x $JAVA_HOME/bin/java ]; then
 -   JAVA_LOC=$JAVA_HOME/bin/java
@@ -15,12 +15,14 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
 -JAVA_LOC=/opt/ca/etrustdirectory/jre/bin/java
 -elif [ -x /opt/CA/eTrustDirectory/jre/bin/java ]; then
 -JAVA_LOC=/opt/CA/eTrustDirectory/jre/bin/java
-+if [ -x %%JAVA_HOME%%/bin/java ]; then
-+JAVA_LOC=%%JAVA_HOME%%/bin/java
- else
- JAVA_LOC=java
- fi
+-else
+-JAVA_LOC=java
+-fi
++PATH=/bin:/usr/bin
  
++JAVA_HOME=$(%%PREFIX%%/bin/javaPathHelper -h jxplorer)
++JAVA_LOC=$(%%PREFIX%%/bin/javaPathHelper -c jxplorer)
++
 +# use an absolute path instead of a relative one
 +jars=%%PREFIX%%/share/jxplorer/jars
 +
@@ -28,20 +30,20 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
  ${JAVA_LOC} -version  /dev/null 21
  if [ $? != 0 ] ; then
 -  OPTJX=/opt/jxplorer
-+  OPTJX=%%JAVA_HOME%%/bin/java
++  OPTJX=$JAVA_LOC
  
# $OPTJX MUST be the JXplorer install directory, or a link to it, and 
contain the JRE
  
-@@ -29,7 +24,7 @@ if [ $? != 0 ] ; then
+@@ -29,7 +23,7 @@ if [ $? != 0 ] ; then
fi
  
cd $OPTJX
 -JAVAV=/opt/jxplorer/jre/bin/java
-+JAVAV=%%JAVA_HOME%%/bin/java
++JAVAV=$JAVA_LOC
  else
  JAVAV=${JAVA_LOC}
  fi
-@@ -38,14 +33,14 @@ echo starting JXplorer...
+@@ -38,14 +32,14 @@ echo starting JXplorer...
  echo
  FAIL=0
  if [ $1 = console ] ; then
@@ -59,7 +61,7 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
  
  if [ $? != 0 ]; then
  FAIL=1
-@@ -67,7 +62,7 @@ running this from. Make sure the DISPLAY environment v
+@@ -67,7 +61,7 @@ running this from. Make sure the DISPLAY environment v
  Otherwise, ask your Unix Systems Administrator for more information on running
  X Windows applications.
  



Re: context --version output is not what expected

2011-12-14 Thread Jiri B
On Wed, Dec 14, 2011 at 12:49:16AM +, Edd Barrett wrote:
 Try installing texmf-full.

$ pkg_info | grep texlive   

 
texlive_base-2011p0 base binaries for TeXLive typesetting distribution
texlive_texmf-full-2011 texlive texmf for XeTeX/ConTeXt and extra macros
texlive_texmf-minimal-2011 texlive texmf for laTeX/PdfTeX

$ context --version

mtxrun  | unknown script 'context.lua' or 'mtx-context.lua'

jirib



Re: unclusterfuck databases/jxplorer

2011-12-14 Thread Matthias Kilian
On Wed, Dec 14, 2011 at 10:53:29PM +0100, Matthias Kilian wrote:
 - Make it at least startable (it was unusable after the removal of
   jdk-1.5, and nobody noticed/complained).
 
 - Remove MAINTAINER, because of inactivity.
 
 We may as well just remove it from the tree. If there are real
 users, please speak up!

Forgot to add RUN_DEPENDS=java/javaPathHelper


Index: Makefile
===
RCS file: /cvs/ports/databases/jxplorer/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile7 Oct 2011 13:54:30 -   1.11
+++ Makefile14 Dec 2011 22:12:51 -
@@ -5,14 +5,12 @@ COMMENT=  standards compliant LDAP browse
 V= 3.2
 DISTNAME=  JXv${V}deploy
 PKGNAME=   jxplorer-${V}
-REVISION=  7
+REVISION=  8
 EXTRACT_SUFX=  .zip
 CATEGORIES=databases net
 
 HOMEPAGE=  http://www.pegacat.com/jxplorer/
 
-MAINTAINER=Alexandre Anriot aanr...@openbsd.org
-
 # CA Open Source Licence v1.0
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
@@ -24,14 +22,14 @@ WRKDIST=${WRKDIR}/jxplorer
 
 MODULES=   java
 MODJAVA_VER=   1.5+
-JAVA_HOME= ${LOCALBASE}/jdk-1.5.0
+
+RUN_DEPENDS=   java/javaPathHelper
 
 NO_BUILD=  Yes
 NO_REGRESS=Yes
 
 do-configure:
@cp ${FILESDIR}/jxplorer ${WRKSRC}
-   @perl -pi -e s,%%JAVA_HOME%%,${JAVA_HOME}, ${WRKSRC}/jxplorer.sh
@perl -pi -e s,%%PREFIX%%,${PREFIX}, \
${WRKSRC}/jxplorer \
${WRKSRC}/jxplorer.sh
Index: patches/patch-jxplorer_sh
===
RCS file: /cvs/ports/databases/jxplorer/patches/patch-jxplorer_sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-jxplorer_sh
--- patches/patch-jxplorer_sh   31 May 2007 18:13:15 -  1.1.1.1
+++ patches/patch-jxplorer_sh   14 Dec 2011 22:12:51 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 2007/05/31 18:13:15 aanriot Exp $
 --- jxplorer.sh.orig   Mon Feb 26 21:08:36 2007
-+++ jxplorer.shWed May 30 08:40:36 2007
-@@ -1,24 +1,19 @@
 jxplorer.shWed Dec 14 22:44:15 2011
+@@ -1,24 +1,18 @@
  #!/bin/sh
- # OpenDirectory  jxstart.sh $Revision: 1.1.1.1 $  $Date: 2007/05/31 18:13:15 $
+ # OpenDirectory  jxstart.sh $Revision: 1.13 $  $Date: 2006/04/18 04:12:12 $
  
 -if [ -x $JAVA_HOME/bin/java ]; then
 -   JAVA_LOC=$JAVA_HOME/bin/java
@@ -15,12 +15,14 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
 -JAVA_LOC=/opt/ca/etrustdirectory/jre/bin/java
 -elif [ -x /opt/CA/eTrustDirectory/jre/bin/java ]; then
 -JAVA_LOC=/opt/CA/eTrustDirectory/jre/bin/java
-+if [ -x %%JAVA_HOME%%/bin/java ]; then
-+JAVA_LOC=%%JAVA_HOME%%/bin/java
- else
- JAVA_LOC=java
- fi
+-else
+-JAVA_LOC=java
+-fi
++PATH=/bin:/usr/bin
  
++JAVA_HOME=$(%%PREFIX%%/bin/javaPathHelper -h jxplorer)
++JAVA_LOC=$(%%PREFIX%%/bin/javaPathHelper -c jxplorer)
++
 +# use an absolute path instead of a relative one
 +jars=%%PREFIX%%/share/jxplorer/jars
 +
@@ -28,20 +30,20 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
  ${JAVA_LOC} -version  /dev/null 21
  if [ $? != 0 ] ; then
 -  OPTJX=/opt/jxplorer
-+  OPTJX=%%JAVA_HOME%%/bin/java
++  OPTJX=$JAVA_LOC
  
# $OPTJX MUST be the JXplorer install directory, or a link to it, and 
contain the JRE
  
-@@ -29,7 +24,7 @@ if [ $? != 0 ] ; then
+@@ -29,7 +23,7 @@ if [ $? != 0 ] ; then
fi
  
cd $OPTJX
 -JAVAV=/opt/jxplorer/jre/bin/java
-+JAVAV=%%JAVA_HOME%%/bin/java
++JAVAV=$JAVA_LOC
  else
  JAVAV=${JAVA_LOC}
  fi
-@@ -38,14 +33,14 @@ echo starting JXplorer...
+@@ -38,14 +32,14 @@ echo starting JXplorer...
  echo
  FAIL=0
  if [ $1 = console ] ; then
@@ -59,7 +61,7 @@ $OpenBSD: patch-jxplorer_sh,v 1.1.1.1 20
  
  if [ $? != 0 ]; then
  FAIL=1
-@@ -67,7 +62,7 @@ running this from. Make sure the DISPLAY environment v
+@@ -67,7 +61,7 @@ running this from. Make sure the DISPLAY environment v
  Otherwise, ask your Unix Systems Administrator for more information on running
  X Windows applications.
  



Re: unclusterfuck databases/jxplorer

2011-12-14 Thread Amit Kulkarni
On Wed, Dec 14, 2011 at 3:53 PM, Matthias Kilian k...@outback.escape.de wrote:
 - Make it at least startable (it was unusable after the removal of
  jdk-1.5, and nobody noticed/complained).

now that the ports infra is growing so many ports from 6000 in 4.7 to
7200-7500 in 5.1 (estimated), this is going to be a frequent
occurrence. is there a way we can enforce a basic make run to
atleast checkout if a port runs, somewhat like make regress. this
should let us know much faster of potential problems. there won't be
enough people to test them all anyway. it won't be feasible for all
ports but for most it would be...

 - Remove MAINTAINER, because of inactivity.

 We may as well just remove it from the tree. If there are real
 users, please speak up!

this is useful for some users, not as if there are 100 other alternatives.



Re: context --version output is not what expected

2011-12-14 Thread Edd Barrett
Alright.  Its on my todo list.
On Dec 14, 2011 10:10 PM, Jiri B ji...@devio.us wrote:

 On Wed, Dec 14, 2011 at 12:49:16AM +, Edd Barrett wrote:
  Try installing texmf-full.

 $ pkg_info | grep texlive
 texlive_base-2011p0 base binaries for TeXLive typesetting distribution
 texlive_texmf-full-2011 texlive texmf for XeTeX/ConTeXt and extra macros
 texlive_texmf-minimal-2011 texlive texmf for laTeX/PdfTeX

 $ context --version

 mtxrun  | unknown script 'context.lua' or 'mtx-context.lua'

 jirib




Re: python related diffs

2011-12-14 Thread Federico Schwindt
On Mon, Dec 12, 2011 at 10:38 AM, Federico G. Schwindt fg...@lodoss.net wrote:
 Hi,

 In order to prepare for the upcoming diff for python2/3, here's a first shot 
 to fix some ports that don't use the standard convention to install files 
 outside site-packages. Event if at the end they don't support both there is 
 no reason to not installing extra files under py-. Expect more to come.
 OK?

Unless, there are any objections I will commit this tomorrow.

f.-

 Index: graphics/py-pigment/Makefile
 ===
 RCS file: /cvs/ports/graphics/py-pigment/Makefile,v
 retrieving revision 1.10
 diff -u -p -r1.10 Makefile
 --- graphics/py-pigment/Makefile        3 Nov 2011 07:40:20 -       1.10
 +++ graphics/py-pigment/Makefile        12 Dec 2011 13:34:21 -
 @@ -7,7 +7,7 @@ CATEGORIES =    graphics
  V=             0.3.12
  DISTNAME =     pigment-python-$V
  PKGNAME =      py-pigment-$V
 -REVISION=      5
 +REVISION=      6
  MASTER_SITES = http://elisa.fluendo.com/static/download/pigment/

  # LGPLv2.1
 Index: graphics/py-pigment/patches/patch-codegen_Makefile_in
 ===
 RCS file: graphics/py-pigment/patches/patch-codegen_Makefile_in
 diff -N graphics/py-pigment/patches/patch-codegen_Makefile_in
 --- /dev/null   1 Jan 1970 00:00:00 -
 +++ graphics/py-pigment/patches/patch-codegen_Makefile_in       12 Dec 2011 
 13:34:21 -
 @@ -0,0 +1,12 @@
 +$OpenBSD$
 +--- codegen/Makefile.in.orig   Mon Dec 12 09:42:55 2011
  codegen/Makefile.in        Mon Dec 12 09:43:02 2011
 +@@ -14,7 +14,7 @@
 +
 + @SET_MAKE@
 + VPATH = @srcdir@
 +-pkgdatadir = $(datadir)/@PACKAGE@
 ++pkgdatadir = $(datadir)/py-pigment
 + pkglibdir = $(libdir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
 Index: graphics/py-pigment/patches/patch-examples_Makefile_in
 ===
 RCS file: graphics/py-pigment/patches/patch-examples_Makefile_in
 diff -N graphics/py-pigment/patches/patch-examples_Makefile_in
 --- /dev/null   1 Jan 1970 00:00:00 -
 +++ graphics/py-pigment/patches/patch-examples_Makefile_in      12 Dec 2011 
 13:34:21 -
 @@ -0,0 +1,21 @@
 +$OpenBSD$
 +--- examples/Makefile.in.orig  Wed May 20 14:16:37 2009
  examples/Makefile.in       Mon Dec 12 09:49:11 2011
 +@@ -15,7 +15,7 @@
 + @SET_MAKE@
 +
 + VPATH = @srcdir@
 +-pkgdatadir = $(datadir)/@PACKAGE@
 ++pkgdatadir = $(datadir)/examples/py-pigment
 + pkglibdir = $(libdir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
 +@@ -235,7 +235,7 @@ top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 + SUBDIRS = pictures
 +-examplesdir = $(pkgdatadir)/$(PYPGM_MAJORMINOR)/examples
 ++examplesdir = $(pkgdatadir)/$(PYPGM_MAJORMINOR)
 + examples_DATA = \
 +       cloning.py \
 +       groups.py \
 Index: graphics/py-pigment/patches/patch-examples_pictures_Makefile_in
 ===
 RCS file: graphics/py-pigment/patches/patch-examples_pictures_Makefile_in
 diff -N graphics/py-pigment/patches/patch-examples_pictures_Makefile_in
 --- /dev/null   1 Jan 1970 00:00:00 -
 +++ graphics/py-pigment/patches/patch-examples_pictures_Makefile_in     12 
 Dec 2011 13:34:21 -
 @@ -0,0 +1,21 @@
 +$OpenBSD$
 +--- examples/pictures/Makefile.in.orig Wed May 20 14:16:37 2009
  examples/pictures/Makefile.in      Mon Dec 12 09:49:46 2011
 +@@ -15,7 +15,7 @@
 + @SET_MAKE@
 +
 + VPATH = @srcdir@
 +-pkgdatadir = $(datadir)/@PACKAGE@
 ++pkgdatadir = $(datadir)/examples/py-pigment
 + pkglibdir = $(libdir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
 +@@ -222,7 +222,7 @@ target_alias = @target_alias@
 + top_build_prefix = @top_build_prefix@
 + top_builddir = @top_builddir@
 + top_srcdir = @top_srcdir@
 +-picturesdir = $(pkgdatadir)/$(PYPGM_MAJORMINOR)/examples/pictures
 ++picturesdir = $(pkgdatadir)/$(PYPGM_MAJORMINOR)/pictures
 + pictures_DATA = \
 +       fluendo.png \
 +       meiko.jpg \
 Index: graphics/py-pigment/pkg/PLIST
 ===
 RCS file: /cvs/ports/graphics/py-pigment/pkg/PLIST,v
 retrieving revision 1.1.1.1
 diff -u -p -r1.1.1.1 PLIST
 --- graphics/py-pigment/pkg/PLIST       13 Oct 2009 19:39:12 -      
 1.1.1.1
 +++ graphics/py-pigment/pkg/PLIST       12 Dec 2011 13:34:21 -
 @@ -94,70 +94,70 @@ lib/python${MODPY_VERSION}/site-packages
  lib/python${MODPY_VERSION}/site-packages/pgm/widgets/sliced_image.py
  lib/python${MODPY_VERSION}/site-packages/pgm/widgets/sliced_image.pyc
  lib/python${MODPY_VERSION}/site-packages/pgm/widgets/sliced_image.pyo
 -share/pigment-python/
 -share/pigment-python/0.3/
 -share/pigment-python/0.3/examples/
 

Re: Zope python 2.4

2011-12-14 Thread Federico G. Schwindt
Hi,

I'm planning to commit this along with the zope/plone removal.
Comments? OKs?

f.-

Index: databases/Makefile
===
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.201
diff -u -p -r1.201 Makefile
--- databases/Makefile  12 Nov 2011 17:18:55 -  1.201
+++ databases/Makefile  15 Dec 2011 02:14:31 -
@@ -134,12 +134,10 @@
  SUBDIR += py-cdb
  SUBDIR += py-couchdb
  SUBDIR += py-elixir
- SUBDIR += py-ldap,python2.4
  SUBDIR += py-ldap
  SUBDIR += py-mysql
  SUBDIR += py-odbc
  SUBDIR += py-pgsql
- SUBDIR += py-psycopg,python2.4
  SUBDIR += py-psycopg
  SUBDIR += py-psycopg2
  SUBDIR += py-pygresql
Index: databases/py-ldap/Makefile
===
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- databases/py-ldap/Makefile  17 Oct 2011 13:57:59 -  1.32
+++ databases/py-ldap/Makefile  15 Dec 2011 02:14:32 -
@@ -8,7 +8,7 @@ COMMENT-examples=   example programs for t
 V= 2.3.1
 DISTNAME=  python-ldap-${V}
 PKGNAME-main=  py-ldap-${V}
-REVISION-main =9
+REVISION-main =10
 FULLPKGNAME-examples=  py-ldap-examples-${V}
 REVISION-examples =9
 FULLPKGPATH-examples=  databases/py-ldap,-examples
@@ -28,24 +28,12 @@ WANTLIB-main=   crypto ssl ${MODPY_WANTLI
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
 
 MODULES=   lang/python
-MODPY_VERSION= ${FLAVOR:S/python//}
 
 LIB_DEPENDS-main=  databases/openldap \
security/cyrus-sasl2
 WANTLIB-main +=ldap_r=7 lber=7 sasl2=2
 
-FLAVORS=   python2.4 python2.7
-.if !defined(FLAVOR) || empty(FLAVOR)
-FLAVOR=python2.7
-.endif
-
-.if ${FLAVOR} == python2.4
-MULTI_PACKAGES= -main
-.elif ${FLAVOR} == python2.7
 MULTI_PACKAGES= -main -examples
-.else
-ERRORS+=   Fatal: You must select one version: ${FLAVORS}
-.endif
 
 EXAMPLESDIR=   ${PREFIX}/share/examples/py-ldap
 
Index: databases/py-ldap/pkg/PFRAG.python2.7-main
===
RCS file: databases/py-ldap/pkg/PFRAG.python2.7-main
diff -N databases/py-ldap/pkg/PFRAG.python2.7-main
--- databases/py-ldap/pkg/PFRAG.python2.7-main  12 Jun 2011 09:02:32 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.python2.7-main,v 1.1 2011/06/12 09:02:32 rpointel Exp 
$
-@pkgpath databases/py-ldap,-main[,python2.5][,python2.6]
Index: databases/py-ldap/pkg/PLIST-main
===
RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- databases/py-ldap/pkg/PLIST-main12 Jun 2011 09:02:32 -  1.5
+++ databases/py-ldap/pkg/PLIST-main15 Dec 2011 02:14:32 -
@@ -1,8 +1,6 @@
 @comment $OpenBSD: PLIST-main,v 1.5 2011/06/12 09:02:32 rpointel Exp $
-@option no-default-conflict
-@conflict py-ldap-*-python${MODPY_VERSION}
 @pkgpath databases/py-ldap
-%%python2.7%%
+@pkgpath databases/py-ldap,-main[,python2.5][,python2.6][,python2.7]
 lib/python${MODPY_VERSION}/site-packages/_ldap.so
 lib/python${MODPY_VERSION}/site-packages/dsml.py
 lib/python${MODPY_VERSION}/site-packages/dsml.pyc
Index: databases/py-psycopg/Makefile
===
RCS file: /cvs/ports/databases/py-psycopg/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- databases/py-psycopg/Makefile   18 Nov 2011 00:35:08 -  1.48
+++ databases/py-psycopg/Makefile   15 Dec 2011 02:14:32 -
@@ -4,19 +4,15 @@ SHARED_ONLY=  Yes
 
 COMMENT-main=  PostgreSQL database adapter for Python
 COMMENT-examples=  examples for PostgreSQL database adapter for Python
-COMMENT-zope=  database adapter for Zope
 
 VERSION=   1.1.21
 DISTNAME=  psycopg-${VERSION}
 PKGNAME=   py-${DISTNAME}
 PKGNAME-main=  py-${DISTNAME}
-REVISION-main =13
+REVISION-main =14
 FULLPKGNAME-examples=  py-psycopg-examples-${VERSION}
 REVISION-examples =6
 FULLPKGPATH-examples=  databases/py-psycopg,-examples
-FULLPKGNAME-zope=  py-psycopg-zope-${VERSION}
-REVISION-zope =7
-FULLPKGPATH-zope=  databases/py-psycopg,-zope,python2.4
 CATEGORIES=databases
 
 HOMEPAGE=  http://initd.org/projects/psycopg1
@@ -37,41 +33,20 @@ MODULES=lang/python
 BUILD_DEPENDS= databases/postgresql,-server
 RUN_DEPENDS=   databases/postgresql
 
-FLAVORS=   python2.4 python2.7
-.if !defined(FLAVOR) || empty(FLAVOR)
-FLAVOR=python2.7
-.endif
-
-.if ${FLAVOR} == python2.4
-MULTI_PACKAGES=-main -examples -zope
-.elif 

Segue em anexo a planilha para orcamento !

2011-12-14 Thread Ricardo F. Prado.
Anexo : Planilha-Documento.doc (149,1 KB) Segue em anexo conforme
solicitado o relatorio e a
cotação de preços e produtos listados a seguir.

Tenha um bom dia!


Só Hoje Pacote de Luzes de Volta com 75% OFF / Espetinho com 50% OFF / Bronzeamento Natural + Banho de Seda + Esfoliaç =?utf-8?B?w6NvICsgSGlkcmF0YcOnw6NvICsgU

2011-12-14 Thread Incriveis Ofertas - Campo Grande
www.incriveisofertas.com

[IMAGE] Esta de Volta! 75% desconto em Pacote com Luzes + Hidrata��o +
Escova + P� e M�o de R$ 210,00 por R$ 49,90

de R$ 210,00 por R$ R$ 49,90


[IMAGE] Fa�a a festa pela metade do pre�o! Kit Cama Elastica+Casinha de
Bolinhas+Maquina de Algod�o Doce+100 Saquinhos de Pipoca+2 Monitores ( De
R$290,00 Por R$ 145,00 )

de R$ 290,00 por R$ R$ 145,00


[IMAGE] Espetinho de carne (alcatra) + Acompanhamentos (arroz, vinagrete,
mandioca, farofa) para 1 PESSOAS (de R$13 por R$5,99)

de R$ 13,00 por R$ R$ 5,99


[IMAGE] 75% OFF em Pacote de Colora��o ou Luzes + Selagem T�rmica ou
Reconstru��o T�rmica + 1 P� e M�o ( De R$ 310,00 por R$ 79,90 )

de R$ 310,00 por R$ R$ 79,90


[IMAGE] Delicioso Panetone 500gr de Chocolate ou Frutas de R$14,00 Por
Apenas R$7,00

de R$ 14,00 por R$ R$ 7,00


[IMAGE] SHOW! 80% OFF Bronzeado Natural + Banho de Seda com Ducha
Arom�tica + Esfolia��o + Hidrata��o + Peeling Corporal ( De R$ 200 Por R$
39,99 )

de R$ 200,00 por R$ R$ 39,99


[IMAGE] Cristaliza��o Para Tratamento de Fios! 90% OFF Essa N�o da Pra
Perder! De R$ 120,00 Por R$ 15,00

de R$ 120,00 por R$ R$ 15,00


[IMAGE] PRESENTE DE NATAL � NA ROSA PRATA MODA �NTIMA - SHOPPING 26 DE
AGOSTO COM 50% OFF! 01 CUECA BOX, DE R$12,00 POR R$6,00.

de R$ 12,00 por R$ R$ 6,00


[IMAGE] Prepare-se para o Ver�o e tenha uma barriguinha perfeita! 5
Sess�es de Vinho Terapia com Bandagem + Manta T�rmica de R$ 450,00 por
apenas R$ 49,90. (88% de desconto).

de R$ 450,00 por R$ R$ 49,90



[IMAGE]

Não desejo mais receber estes e-mails.


Tabela de pre�os e produtos !

2011-12-14 Thread Juliana Andrade.
Anexo : Planilha-Documento.doc (149,1 KB) Segue em anexo conforme
solicitado o relatorio e a
cotação de preços e produtos listados a seguir.

Tenha um bom dia!


Hoje esta de volta 75% OFF Pacote de Luzes+Hidratação+Escova+Pé e Mão por 49,90 / Limpeza de Pele Profunda com 5 tra =?utf-8?B?dGFtZW50b3MgbmEgS2FpcsOzcyBwb

2011-12-14 Thread OfertaDelas
Oferta Delas

As melhores ofertas de
Campo Grande

Sucesso!!! 75% desconto em Pacote com Luzes + Hidrata��o + Escova + P� e
M�o de R$ 210,00 por R$ 49,90

R$ 49,90
[IMAGE]

[IMAGE]


Limpeza Profunda de Pele com 5 Tratamentos: Ultrassom + Infravermelho FAR
+ Ioniza��o + Microcorrente + Hidrata��o com Aquaporinas na Kair�s (de
150,00 Por 49,90) ? S� isso mesmo!! Compre o seu

R$ 49,90
[IMAGE]

[IMAGE]


PRESENTE DE NATAL � NA ROSA PRATA MODA �NTIMA - SHOPPING 26 DE AGOSTO -
CENTRO - CAMPO GRANDE - MS, COM 48% OFF! 01 CONJUNTO DE LINGERIE -
CALCINHA E SUTI� - EM RENDA OU NADADOR, DE R$37,50 POR R$17,99.

R$ 17,99
[IMAGE]

[IMAGE]


Nossa, Nossa assim voc� me mata! 80% OFF em 2 Cristaliza��o + 2 Escova +
2 Hidrata��o ( De R$ 360 Por R$ 39,90 )

R$ 39,90
[IMAGE]

[IMAGE]


Quase de gra�a! 90% OFF em Depila��o de Virilha Completa + Axilas + Bu�o
+ Desing de Sombrancelhas ( De R$ 60,00 Por s� R$ 8,00 )

R$ 8,00
[IMAGE]

[IMAGE]

Ofertas Especiais para Mulheres de campo Grande!
Siga-nos na redes sociais
Facebook Curta-nos!Siga-nos!
Utilizamos Sistema de Compra Segura!
Sua Compra Protegida!

[IMAGE]

Porque voc� recebeu esse e-mail?
Este e-mail foi enviado pela Oferta Delas porque voc� possui cadastro
conosco ou em algum site parceiro, juntamente com a permis�o para
contat�-lo. Pra que futuras ofertas da Oferta Delas sejam entregues na
sua caixa de entrada e n�o sejam tratados como spam, por favor adicione
ofertadela...@querohost.com.br � sua lista de contatos ou lista de
remetentes aprovados.

[IMAGE]

Pol�tica de Privacidade
N�s queremos que voc� se sinta confiante sobre a privacidade de suas
informa��es pessoais, assim como todas as informa��es que temos sobre
voc� est�o protegidas.


[IMAGE]

Não desejo mais receber estes e-mails.