gmane.os.openbsd.ports

Hoje - Combinado 43 Peças Sushi Express / Hidratação Caviar+Escova / Cristalização / Higienização+Peeling+Esfolia =?utf-8?B?w6fDo28gRmFjaWFsIC8gQ2xhcmVhb

Incriveis Ofertas - Campo Grande — 2012-05-26T18:30:38

www.incriveisofertas.com

[IMAGE] ltima Chance!! Combo Sushi com 43 Peas no Sushi Express - 3
Lojas em Campo Grande por apenas R$29,90? Garanta o seu!

de R$ 62,00 por R$ R$ 29,90


[IMAGE] Deliciosa mania: 18 Cupcakes de 3 Sabores, de R$90 por R$27 na
Que Delcia de Cupcakes

de R$ 90,00 por R$ R$ 27,00


[IMAGE] 1 Hidratao de Caviar + 1 Escova com 70% OFF ( De R$ 70,00 Por
R$ 19,90 )

de R$ 70,00 por R$ R$ 19,90


[IMAGE] Oferta Destaque, Luzes + Tonalizao + Hidratao + Escova - De
R$ 220,00 Por R$ 39,90

de R$ 220,00 por R$ R$ 39,90


[IMAGE] Clareamento de Pele de R$40,00 por R$14,90 - Compre o seu
Voucher/Cupom!

de R$ 40,00 por R$ R$ 14,90


[IMAGE] Que Delcia..Pastel frito na hora  na Feira Central! Pastel de
Carne com Queijo ou Frango com Catupiry por apenas R$ 2,40.

de R$ 4,00 por R$ R$ 2,40


[IMAGE] Cristalizao + Design de Sobrancelha - Aproveite esta oferta
pague R$39 ao invs de R$100

de R$ 100,00 por R$ R$ 39,00


[IMAGE] Renove sua pele com 1 Higienizao Facial + 1 Esfoliao + 1
Peeling de Diamante + 1 Mscara de Morango - Tudo por s R$19,90!

de R$ 140,00 por R$ R$ 19,90


[IMAGE] 91% OFF em 5 Drenagens + 5 Ultrassons + 5 Argiloterapia + 5
Bandagens Quentes - S R$49,90

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


[IMAGE] ltima Chance de Garantir a festa! Aluguel de 1 Cama Elastica + 1
Piscina de Bolinha + 1 Gangorra Upa Upa + 1 Escorregador e tem at o
final de 2012 para usar ( De R$450 Por R$99,90 )

de R$ 450,00 por R$ R$ 100,00


[IMAGE] Manicure e Pedicure + Depilao  Perna, Axila e Buo com 50% de
desconto!

de R$ 54,00 por R$ R$ 27,00


[IMAGE] 80% OFF em Cristalizao Agimax no Salo Lcia Hair! De R$150,00
por apenas R$29,90! Compre e Use

de R$ 150,00 por R$ R$ 29,90


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

[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 permiso para
contat-lo. Pra que futuras ofertas da Oferta Delas sejam entregues na
sua caixa de entrada e no sejam tratados como spam, por favor adicione
boletim< at >querohost.com.br  sua lista de contatos ou lista de remetentes
aprovados.

[IMAGE]

Poltica de Privacidade
Ns queremos que voc se sinta confiante sobre a privacidade de suas
informaes pessoais, assim como todas as informaes que temos sobre
voc esto protegidas.


[IMAGE]

Não desejo mais receber estes e-mails.

update: audio/xmms2

Pascal Stumpf — 2012-05-26T17:52:43

Update to latest version (0.8); no feedback from maintainer yet.

Working fine here on amd64, but some more testing is never wrong.


Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile30 Apr 2012 06:05:17 -00001.27
+++ Makefile26 May 2012 17:51:07 -0000
< at >< at > -3,15 +3,14 < at >< at >
 COMMENT =audio player daemon with library management
 BROKEN-sparc64 =waf build goes into an infinite loop
 
-V =0.7
-DISTNAME =xmms2-${V}DrNo
+V =0.8
+DISTNAME =xmms2-${V}DrO_o
 PKGNAME =xmms2-${V}
-REVISION =14
 
-SHARED_LIBS +=xmmsclient++1.0 # 4.0.0
-SHARED_LIBS +=xmmsclient++-glib0.0 # 1.0.0
-SHARED_LIBS +=xmmsclient-glib0.0 # 1.0.0
-SHARED_LIBS +=xmmsclient1.0 # 6.0.0
+SHARED_LIBS +=xmmsclient++2.0 # 4.0.0
+SHARED_LIBS +=xmmsclient++-glib1.0 # 1.0.0
+SHARED_LIBS +=xmmsclient-glib1.0 # 1.0.0
+SHARED_LIBS +=xmmsclient2.0 # 6.0.0
 
 CATEGORIES =audio
 
< at >< at > -28,9 +27,9 < at >< at > PERMIT_DISTFILES_FTP =Yes
 WANTLIB += FLAC ao avahi-client avahi-common avahi-glib avcodec
 WANTLIB += avutil c curl gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gsm gthread-2.0 jack m mad mp3lame ncurses ogg orc-0.4
-WANTLIB += pthread readline schroedinger-1.0 speex sqlite3 stdc++
-WANTLIB += theoradec theoraenc util vorbis vorbisenc vorbisfile
-WANTLIB += vorbisidec vpx x264 xml2 z ${MODPY_WANTLIB}
+WANTLIB += pcre pthread readline schroedinger-1.0 sndfile speex
+WANTLIB += sqlite3 stdc++ theoradec theoraenc vorbis vorbisenc
+WANTLIB += vorbisfile vpx x264 xml2 xvidcore z
 
 MASTER_SITES =${MASTER_SITE_SOURCEFORGE:=xmms2/}
 
< at >< at > -46,8 +45,7 < at >< at > NO_REGRESS =Yes
 BUILD_DEPENDS =devel/pyrex \
 devel/boost
 
-LIB_DEPENDS =${MODPY_LIB_DEPENDS} \
-devel/glib2 \
+LIB_DEPENDS =devel/glib2 \
 graphics/ffmpeg>=20080620p10 \
 audio/libao \
 audio/jack \
< at >< at > -55,8 +53,7 < at >< at > LIB_DEPENDS =${MODPY_LIB_DEPENDS} \
 audio/flac \
 net/curl \
 audio/libmad \
-net/avahi \
-audio/tremor
+net/avahi
 
 WSCRIPT_PATCHES =src/clients/lib/xmmsclient++/wscript \
 src/clients/lib/xmmsclient++-glib/wscript \
< at >< at > -65,28 +62,33 < at >< at > WSCRIPT_PATCHES =src/clients/lib/xmmscl
 pre-configure:
 cd ${WRKSRC} && ${SUBST_CMD} ${WSCRIPT_PATCHES}
 
-# Xmms2 uses it's own modified Waf, so we cannot use devel/waf.
+# Xmms2 uses its own modified Waf, so we cannot use devel/waf.
 # Disable speex and sun because they are broken
 # Disable shared memory support for visualization because it requires semtimedop()
 do-configure:
-cd ${WRKSRC} && PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf configure --prefix=${PREFIX} \
+cd ${WRKSRC} && PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf configure \
+--prefix=${PREFIX} \
 --mandir=${PREFIX}/man \
 --conf-prefix=${PREFIX} \
 --with-default-output-plugin=ao \
 --disable-shmvis-server \
---without-optionals=dns_sd,medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
+--without-optionals=medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
 --without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mms,modplug,mpg123,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,vocoder,waveout,wavpack
 
+post-configure:
+# avoid linking to bogus libraries
+perl -pi -e "s/SONAME_ST.*/SONAME_ST=''/" ${WRKSRC}/_build_/c4che/_cache.py
+
 do-build:
 cd ${WRKSRC} && ${MODPY_BIN} ./waf build
 
 do-install:
-cd ${WRKSRC} && ${MODPY_BIN} ./waf install
-# These directories are empty after the fake
-rmdir ${WRKSRC}/_build_/default/src/clients/lib/perl/pm/XMMSClient
-rmdir ${WRKSRC}/_build_/default/src/clients/lib/perl/pm
-/usr/bin/pod2man ${WRKSRC}/src/clients/lib/perl/pm/XMMSClient.pm > ${WRKDIR}/Audio::XMMSClient.3p
-/usr/bin/pod2man ${WRKSRC}/src/clients/lib/perl/pm/XMMSClient/Glib.pm > ${WRKDIR}/Audio::XMMSClient::Glib.3p
+cd ${WRKSRC} && ${MODPY_BIN} ./waf install --without-ldconfig
+/usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient.pod > ${WRKDIR}/Audio::XMMSClient.3p
+/usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient/Glib.pm > ${WRKDIR}/Audio::XMMSClient::Glib.3p
+/usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient/Collection.pod > ${WRKDIR}/Audio::XMMSClient::Collection.3p
+/usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient/Playlist.pod > ${WRKDIR}/Audio::XMMSClient::Playlist.3p
+/usr/bin/pod2man ${PREFIX}/${P5ARCH}/Audio/XMMSClient/Result.pod > ${WRKDIR}/Audio::XMMSClient::Result.3p
 ${INSTALL_MAN} ${WRKDIR}/*.3p ${PREFIX}/man/man3p/
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/xmms2/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo24 Apr 2010 17:37:54 -00001.2
+++ distinfo26 May 2012 17:51:07 -0000
< at >< at > -1,5 +1,5 < at >< at >
-MD5 (xmms2-0.7DrNo.tar.bz2) = YOULWRB4rLaoXNg94PKwdw==
-RMD160 (xmms2-0.7DrNo.tar.bz2) = OlJt+foe1RA7aiUsNMA5S/Dk8VY=
-SHA1 (xmms2-0.7DrNo.tar.bz2) = SZlWhlSg0quoS9pLIhRQWLvT/LI=
-SHA256 (xmms2-0.7DrNo.tar.bz2) = WcWNk4DmsAKSCo3HXw/UYpqxdbgvKbZjf3gW/cmDKyw=
-SIZE (xmms2-0.7DrNo.tar.bz2) = 1519973
+MD5 (xmms2-0.8DrO_o.tar.bz2) = hNXAWnC/0x7TkqTj9wHqow==
+RMD160 (xmms2-0.8DrO_o.tar.bz2) = NVE9ft3V95FGy4qlxsC7NTaWGew=
+SHA1 (xmms2-0.8DrO_o.tar.bz2) = n3WFVx2VrNmN9Iw3lI6GOPrnzDo=
+SHA256 (xmms2-0.8DrO_o.tar.bz2) = x35B571XiIidWi94Mxyox0i4chvS5Z82w2rUx8roaUo=
+SIZE (xmms2-0.8DrO_o.tar.bz2) = 1670726
Index: patches/patch-src_clients_lib_xmmsclient++-glib_wscript
===================================================================
RCS file: /cvs/ports/audio/xmms2/patches/patch-src_clients_lib_xmmsclient++-glib_wscript,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_clients_lib_xmmsclient++-glib_wscript
--- patches/patch-src_clients_lib_xmmsclient++-glib_wscript12 Jul 2009 20:25:00 -00001.2
+++ patches/patch-src_clients_lib_xmmsclient++-glib_wscript26 May 2012 17:51:07 -0000
< at >< at > -1,12 +1,12 < at >< at >
 $OpenBSD: patch-src_clients_lib_xmmsclient++-glib_wscript,v 1.2 2009/07/12 20:25:00 ajacoutot Exp $
---- src/clients/lib/xmmsclient++-glib/wscript.origSat May 16 17:19:44 2009
-+++ src/clients/lib/xmmsclient++-glib/wscriptSat May 16 17:35:49 2009
+--- src/clients/lib/xmmsclient++-glib/wscript.origThu Oct 20 21:26:08 2011
++++ src/clients/lib/xmmsclient++-glib/wscriptTue May  8 01:10:14 2012
 < at >< at > -6,7 +6,7 < at >< at > def build(bld):
-     lib.uselib = 'glib2'
-     lib.uselib_local = 'xmmsclient xmmsclient-glib'
-     lib.includes = '../../../.. ../../../include ../../../includepriv'

UPDATE: Smplayer-0.8.0

Gonzalo L. R. — 2012-05-26T17:24:13

Hi,

Update for Smplayer to 0.8.0 whit this features:

* A toolbar editor has been added. Now it's possible to select the
buttons and controls that want to appear in the toolbars.
* New video filters: gradfun, blur and sharpen.
* Now it's possible to change the GUI (default, mini, mpc) at
runtime, no restart required.
* Sub files from opensubtitles should work again.
* Better support for chapters in video files.
* Bug fix: remote m3u files work from the favorites menu or command line.
* Internal changes in the single instance option (switch to
QtSingleApplication).


While here, GROFF is not needed and disable debug from edd< at >.

Tested on i386.

Ok? Comments?


Cheers.

[update] x11/ratpoison

Jérémie Courrèges-Anglas — 2012-05-26T17:10:27

Hi.

This diff updates ratpoison to version 1.4.5 (published since 2009),
removing a patch applied upstream.
I use it since several months without noticeable problem.

Maintainer timeout.

[Update]www/pecl-geoip

wen heping — 2012-05-26T13:54:05

Hi,

   Here is an update of www/pecl-geoip to 1.0.8.

   It build well on i386.

   OK? Comments?

wen
? pecl-geoip.0.8.diff.txt
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/pecl-geoip/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile19 Apr 2012 21:30:38 -00001.7
+++ Makefile26 May 2012 13:50:25 -0000
< at >< at > -2,8 +2,7 < at >< at >
 
 COMMENT=PHP support for geocoding IPv4 addresses
 
-DISTNAME=geoip-1.0.7
-REVISION=3
+DISTNAME=geoip-1.0.8
 
 # PHP
 PERMIT_PACKAGE_CDROM=Yes
< at >< at > -14,7 +13,7 < at >< at >
 WANTLIB += GeoIP
 
 MODULES=lang/php/pecl
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE=gnu
 
 LIB_DEPENDS=net/GeoIP
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/pecl-geoip/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo30 Apr 2009 23:44:13 -00001.1.1.1
+++ distinfo26 May 2012 13:50:25 -0000
< at >< at > -1,5 +1,5 < at >< at >
-MD5 (geoip-1.0.7.tgz) = ylOXodrLYq/UJsIGX8HhBg==
-RMD160 (geoip-1.0.7.tgz) = qb3Q1xpLL8gRHP6wi9LSFh8CkXQ=
-SHA1 (geoip-1.0.7.tgz) = 00RfVZgTpuwJcjIM9kCbiU+ENkI=
-SHA256 (geoip-1.0.7.tgz) = tO8+agwLI5/tP6mJl6wH0lMIxGljUxa0wIxsXyKOfgI=
-SIZE (geoip-1.0.7.tgz) = 9416
+MD5 (geoip-1.0.8.tgz) = ZSY6xtHDNfIs6BizJTkSpQ==
+RMD160 (geoip-1.0.8.tgz) = zqXVVrLVAvQMwZfLis7AnYSCqsA=
+SHA1 (geoip-1.0.8.tgz) = +NF9o+GSACMyq1S5tKsPXe6vnxU=
+SHA256 (geoip-1.0.8.tgz) = CL7rLL6atynQawJnlfW5CErq1qF2JJOwvlPEOT1o0Io=
+SIZE (geoip-1.0.8.tgz) = 10061

new: net/bitcoin

Pascal Stumpf — 2012-05-26T13:44:31

Bitcoin is an experimental new digital currency that enables instant
payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer
technology to operate with no central authority: managing transactions
and issuing money are carried out collectively by the network.
Bitcoin is also the name of the open source software which enables
the use of this currency.


Of course, mining is not very efficient on OpenBSD, but it is still
useful to manage your wallet, make transactions etc.

new: editors/ged

Pascal Stumpf — 2012-05-26T13:31:25

GNU ed is a line-oriented text editor. It is used to create, display,
modify and otherwise manipulate text files, both interactively and
via shell scripts. A restricted version of ed, red, can only edit
files in the current directory and cannot execute shell commands.
Ed is the "standard" text editor in the sense that it is the original
editor for Unix, and thus widely available. For most purposes,
however, it is superseded by full-screen editors such as GNU Emacs
or GNU Moe.

new: shells/osh

Pascal Stumpf — 2012-05-26T13:15:28

Osh(1) is an enhanced, backward-compatible port of the Sixth Edition
Thompson shell. Sh6(1) is an unenhanced port of the shell, and
glob6(1) is a port of its global command. Together, sh6 and glob6
provide a user interface which is backward compatible with that
provided by the Sixth Edition Thompson shell and global command,
but without the obvious enhancements found in osh.

The original Thompson shell was principally written by Ken Thompson
of Bell Labs.

plan9/plan9port

Pascal Stumpf — 2012-05-26T12:57:48

Plan 9 is a distributed computing environment built at Bell Labs
starting in the late 1980s. The system can be obtained from Bell
Labs at http://plan9.bell-labs.com/plan9 and runs on PCs and a
variety of other platforms. Plan 9 became a convenient platform for
experimenting with new ideas, applications, and services.

Plan 9 from User Space provides many of the ideas, applications,
and services from Plan 9 on Unix-like systems. It runs on FreeBSD
(x86), Linux (x86 and PowerPC), Mac OS X (PowerPC), OpenBSD (x86),
and SunOS (Sparc).



This has been in openbsd-wip for a while.  With the exception of 9pfuse,
it is mostly functional (needs rthreads), but it still needs testing on
powerpc.  It installs into its own hierarchy in ${PREFIX}/plan9, with
the '9' command symlinked to ${PREFIX}/bin.  If you want to use the
Plan9 tools, you can either just use '9 [cmd]' or set PLAN9 in your
environment to point to the root of the plan9port tree and put
$PLAN9/bin into your PATH (in that case, be aware of the consequences
though ...).

patch: switch readmes.html to new sqlports-based system

Marc Espie — 2012-05-26T12:29:59

Okay ?

Index: Makefile
===================================================================
RCS file: /cvs/ports/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile9 Mar 2012 10:57:54 -00001.68
+++ Makefile26 May 2012 12:28:49 -0000
< at >< at > -4,7 +4,6 < at >< at >
 
 PKGPATH =
 MIRROR_MK ?= ${.CURDIR}/distfiles/Makefile
-PORTSTOP ?= yes
 DISTFILES_DB ?= ${.CURDIR}/infrastructure/db/locate.database
 
 .if defined(SUBDIR)
Index: databases/Makefile
===================================================================
RCS file: /cvs/ports/databases/Makefile,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile
--- databases/Makefile10 May 2012 10:46:54 -00001.212
+++ databases/Makefile26 May 2012 12:28:49 -0000
< at >< at > -136,6 +136,7 < at >< at >
      SUBDIR += pgworksheet
      SUBDIR += pkglocatedb
      SUBDIR += pkglocatedb,src
+     SUBDIR += ports-readmes
      SUBDIR += postgresql
      SUBDIR += postgresql-jdbc
      SUBDIR += postgresql-odbc
Index: infrastructure/mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1169
diff -u -p -r1.1169 bsd.port.mk
--- infrastructure/mk/bsd.port.mk26 May 2012 12:04:35 -00001.1169
+++ infrastructure/mk/bsd.port.mk26 May 2012 12:28:49 -0000
< at >< at > -137,7 +137,6 < at >< at > X11BASE ?= /usr/X11R6
 DISTDIR ?= ${PORTSDIR}/distfiles
 BULK_COOKIES_DIR ?= ${PORTSDIR}/bulk/${MACHINE_ARCH}
 UPDATE_COOKIES_DIR ?= ${PORTSDIR}/update/${MACHINE_ARCH}
-TEMPLATES ?= ${PORTSDIR}/infrastructure/templates
 PLIST_DB ?= ${PORTSDIR}/plist/${MACHINE_ARCH}
 
 PACKAGE_REPOSITORY ?= ${PORTSDIR}/packages
< at >< at > -234,7 +233,7 < at >< at > _clean += -f
 .endif
 # check that clean is clean
 _okay_words = depends work fake -f flavors dist install sub packages package \
-readmes bulk force plist build all
+bulk force plist build all
 .for _w in ${_clean:L}
 .  if !${_okay_words:M${_w}}
 ERRORS += "Fatal: unknown clean command: ${_w}\n(not in ${_okay_words})"
< at >< at > -492,8 +491,6 < at >< at > FULLPKGNAME ?= ${PKGNAME}${FLAVOR_EXT}
 _MASTER ?=
 _SOLVING_DEP ?= No
 
-_READMES =
-
 .if ${MULTI_PACKAGES} == "-"
 # XXX "parse" FULLPKGNAME: is there a flavor after the version number
 .    if ${FULLPKGNAME:M*-[0-9]*-*}
< at >< at > -515,7 +512,6 < at >< at > FULLPKGNAME := ${FULLPKGNAME}v${EPOCH}
 PKGSPEC ?= ${FULLPKGNAME:C/-[0-9].*/-*/}
 PKGSPEC- = ${PKGSPEC}
 FULLPKGNAME- = ${FULLPKGNAME}
-_READMES += ${READMES_TOP}/${PKGPATH}/${FULLPKGNAME}.html
 .else
 .  for _s in ${MULTI_PACKAGES}
 .    if defined(FULLPKGNAME${_s})
< at >< at > -546,7 +542,6 < at >< at > FULLPKGNAME${_s} := ${FULLPKGNAME${_s}}v
 .      endif
 .    endif
 PKGSPEC${_s} ?= ${FULLPKGNAME${_s}:C/-[0-9].*/-*/}
-_READMES += ${READMES_TOP}/${PKGPATH}/${FULLPKGNAME${_s}}.html
 .  endfor
 .endif
 
< at >< at > -1497,8 +1492,6 < at >< at > _BUILD_DEP = ${_BUILD_DEP2:C,^[^:/]*:,,}
 _RUN_DEP = ${_RUN_DEP2:C,^[^:/]*:,,}
 _REGRESS_DEP = ${_REGRESS_DEP2:C,^[^:/]*:,,}
 
-README_NAME ?= ${TEMPLATES}/README.port
-
 REORDER_DEPENDENCIES ?=
 ECHO_REORDER ?= :
 
< at >< at > -2741,9 +2734,6 < at >< at > _internal-clean:
 .elif ${_clean:L:Mpackage}
 rm -f ${_PACKAGE_COOKIES${SUBPACKAGE}} ${_UPDATE_COOKIE${SUBPACKAGE}}
 .endif
-.if ${_clean:L:Mreadmes}
-rm -f ${_READMES}
-.endif
 .if ${_clean:L:Mbulk}
 rm -f ${_BULK_COOKIE}
 .endif
< at >< at > -2814,63 +2804,6 < at >< at > describe:
 .  endif
 .endfor
 
-readme:
-< at >tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
-trap "rm -r $$tmpdir" 0; \
-trap 'exit 1' 1 2 3 13 15; \
-cd ${.CURDIR} && PKGPATH=${PKGPATH} ${MAKE} TMPDIR=$$tmpdir README_NAME=${README_NAME} \
-${READMES_TOP}/${PKGPATH}/${FULLPKGNAME${SUBPACKAGE}}.html
-
-readmes:
-< at >tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
-trap "rm -r $$tmpdir" 0; \
-trap 'exit 1' 1 2 3 13 15; \
-cd ${.CURDIR} && PKGPATH=${PKGPATH} ${MAKE} TMPDIR=$$tmpdir README_NAME=${README_NAME} \
-${_READMES}
-
-.for _S in ${MULTI_PACKAGES}
-${READMES_TOP}/${PKGPATH}/${FULLPKGNAME${_S}}.html:
-< at >mkdir -p ${< at >D}
-< at >echo ${_COMMENT${_S}:Q} | ${HTMLIFY} >${TMPDIR}/comment${_S}
-< at >echo ${FULLPKGNAME${_S}} | ${HTMLIFY} > ${TMPDIR}/pkgname${_S}
-.  if defined(HOMEPAGE)
-< at >echo 'See <a href="${HOMEPAGE}">${HOMEPAGE}</a> for details.' >${TMPDIR}/home${_S}
-.  else
-< at >echo "" >${TMPDIR}/home${_S}
-.  endif
-.  if ${MULTI_PACKAGES} != "-"
-< at >echo "<h2>Part of a Multi-Package set</h2>" >${TMPDIR}/subpackages${_S}
-< at >echo "<ul>" >>${TMPDIR}/subpackages${_S}
-.    for _T in ${MULTI_PACKAGES}
-< at >echo "<li><a href=\"${FULLPKGNAME${_T}}.html\">${FULLPKGNAME${_T}}</a>" >>${TMPDIR}/subpackages${_S}
-.    endfor
-< at >echo "</ul>" >>${TMPDIR}/subpackages${_S}
-.  else
-< at >>${TMPDIR}/subpackages${_S}
-.  endif
-.  for _I in build run
-.    if !empty(_${_I:U}_DEP)
-< at >cd ${.CURDIR} && SUBPACKAGE=${_S} PKGPATH=${PKGPATH} ${MAKE} full-${_I}-depends _FULL_PACKAGE_NAME=Yes| \
-while read n; do \
-j=`dirname $$n|${HTMLIFY}`; k=`basename $$n|${HTMLIFY}`; \
-echo "<li><a href=\"${PKGDEPTH}$$j/$$k.html\">$$k</a>"; \
- done  >${TMPDIR}/${_I}${_S}
-.    else
-< at >echo "<li>none" >${TMPDIR}/${_I}${_S}
-.    endif
-.  endfor
-< at >sed -e 's|%%PORT%%|'"`echo ${FULLPKGPATH${_S}}  | ${HTMLIFY}`"'|g' \
--e '/%%PKG%%/r${TMPDIR}/pkgname${_S}' -e '//d' \
--e '/%%COMMENT%%/r${TMPDIR}/comment${_S}' -e '//d' \
--e '/%%DESCR%%/r${DESCR${_S}}' -e '//d' \
--e '/%%HOMEPAGE%%/r${TMPDIR}/home${_S}' -e '//d' \
--e '/%%BUILD_DEPENDS%%/r${TMPDIR}/build${_S}' -e '//d' \
--e '/%%RUN_DEPENDS%%/r${TMPDIR}/run${_S}' -e '//d' \
--e '/%%SUBPACKAGES%%/r${TMPDIR}/subpackages${_S}' -e '//d' \
-${README_NAME} > $< at >
-< at >rm -f ${TMPDIR}/*${_S}
-.endfor
-
 print-build-depends:
 .if !empty(_BUILD_DEP)
 < at >echo -n 'This port requires package(s) "'
< at >< at > -3329,7 +3262,7 < at >< at > _all_phony = ${_recursive_depends_target
 post-distpatch post-extract post-install \
 post-patch post-regress pre-build pre-configure pre-extract pre-fake \
 pre-install pre-patch pre-regress prepare \
-print-build-depends print-run-depends readme readmes rebuild \
+print-build-depends print-run-depends rebuild \
 regress-depends regress-depends-list run-depends run-depends-list \
     show-required-by subpackage uninstall _print-metadata \
 lock unlock \
Index: infrastructure/mk/bsd.port.subdir.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.subdir.mk,v
retrieving revision 1.107
diff -u -p -r1.107 bsd.port.subdir.mk
--- infrastructure/mk/bsd.port.subdir.mk7 May 2012 21:11:44 -00001.107
+++ infrastructure/mk/bsd.port.subdir.mk26 May 2012 12:28:49 -0000
< at >< at > -25,12 +25,9 < at >< at >
 #
 # +++ targets +++
 #
-#README.html:
-#Creating README.html for package.
-#
 #afterinstall, all, beforeinstall, build, checksum, clean,
 #configure, depend, describe, extract, fetch, fetch-list,
-#install, package, readmes, deinstall, reinstall,
+#install, package, deinstall, reinstall,
 #tags
 #
 
< at >< at > -104,12 +101,6 < at >< at > _SKIP_STUFF+= ; case "$${subdir}" in \
 ${MATCHDIR}) ;; \
 *) continue ;; esac
 .endif
-TEMPLATES ?= ${PORTSDIR}/infrastructure/templates
-.if defined(PORTSTOP)
-README = ${TEMPLATES}/README.top
-.else
-README = ${TEMPLATES}/README.category
-.endif
 
 _subdir_fragment = \
 : $${echo_msg:=${ECHO_MSG:Q}}; \
< at >< at > -186,37 +177,6 < at >< at > clean:
 .else
 < at >${_subdir_fragment}
 .endif
-.if defined(clean) && ${clean:L:Mreadmes}
-rm -f ${READMES_TOP}/${PKGPATH}/README.html
-.endif
-
-readmes:
-< at >${_subdir_fragment}
-< at >tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
-trap 'rm -r $$tmpdir' 0; \
-trap 'exit 1' 1 2 3 13 15; \
-cd ${.CURDIR} && ${MAKE} TMPDIR=$$tmpdir \
-${READMES_TOP}/${PKGPATH}/README.html
-
-${READMES_TOP}/${PKGPATH}/README.html:
-< at >mkdir -p ${< at >D}
-< at >>${TMPDIR}/subdirs
-.for d in ${_FULLSUBDIR}
-< at >subdir=$d; \
-${_flavor_fragment}; \
-if name=`eval $$toset ${MAKE} _print-packagename`; then \
-comment=`eval $$toset ${MAKE} show=_COMMENT|sed -e 's,^",,' -e 's,"$$,,' |${HTMLIFY}`; \
-else \
-comment=''; \
-fi; \
-cd ${.CURDIR}; \
-echo "<dt><a href=\"${PKGDEPTH}$$dir/$$name.html\">$d</a><dd>$$comment" >>${TMPDIR}/subdirs
-.endfor
-< at >sed -e 's%%CATEGORY%%'`echo ${.CURDIR} | sed -e 's.*/\([^/]*\)$$\1'`'g' \
--e '/%%DESCR%%/r${.CURDIR}/pkg/DESCR' -e '//d' \
--e '/%%SUBDIR%%/r${TMPDIR}/subdirs' -e '//d' \
-${README} > $< at >
-< at >rm ${TMPDIR}/subdirs
 
 .if defined(ERRORS)
 .BEGIN:
Index: infrastructure/mk/pkgpath.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/pkgpath.mk,v
retrieving revision 1.46
diff -u -p -r1.46 pkgpath.mk
--- infrastructure/mk/pkgpath.mk15 May 2012 11:48:07 -00001.46
+++ infrastructure/mk/pkgpath.mk26 May 2012 12:28:49 -0000
< at >< at > -21,11 +21,6 < at >< at > ERRORS += "Fatal: can't figure out PKGPA
 PKGPATH =${.CURDIR}
 .  endif
 .endif
-.if empty(PKGPATH)
-PKGDEPTH =
-.else
-PKGDEPTH = ${PKGPATH:C|[^./][^/]*|..|g}/
-.endif
 
 # Code to invoke to split dir,-multi,flavor
 
Index: infrastructure/templates/README.category
===================================================================
RCS file: infrastructure/templates/README.category
diff -N infrastructure/templates/README.category
--- infrastructure/templates/README.category13 Dec 2001 15:40:27 -00001.2
+++ /dev/null1 Jan 1970 00:00:00 -0000
< at >< at > -1,16 +0,0 < at >< at >
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head><title>Ports in Category %%CATEGORY%%</title></head>
-<body>
-
-<h1>Ports in Category %%CATEGORY%%</h1>
-
-<h2>Description</h2>
-%%DESCR%%
-
-<h2>Sub directories</h2>
-<dl>
-%%SUBDIR%%
-</dl>
-
-</body></html>
Index: infrastructure/templates/README.port
===================================================================
RCS file: infrastructure/templates/README.port
diff -N infrastructure/templates/README.port
--- infrastructure/templates/README.port2 Aug 2003 09:53:28 -00001.4
+++ /dev/null1 Jan 1970 00:00:00 -0000
< at >< at > -1,33 +0,0 < at >< at >
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html><head><title>The %%PORT%% port</title></head>
-<body>
-
-<h1>The %%PORT%% port</h1>
-
-<H2>
-%%PKG%%
---
-%%COMMENT%%
-</H2>
-
-%%SUBPACKAGES%%
-<H2>Description</H2>
-
-<pre>
-%%DESCR%%
-</pre>
-<p>
-%%HOMEPAGE%%
-</p>
-
-<H2>Build dependencies</H2>
-<ul>
-%%BUILD_DEPENDS%%
-</ul>
-
-<H2>Run dependencies</H2>
-<ul>
-%%RUN_DEPENDS%%
-</ul>
-
-</body></html>
Index: infrastructure/templates/README.top
===================================================================
RCS file: infrastructure/templates/README.top
diff -N infrastructure/templates/README.top
--- infrastructure/templates/README.top13 Dec 2001 15:40:27 -00001.2
+++ /dev/null1 Jan 1970 00:00:00 -0000
< at >< at > -1,16 +0,0 < at >< at >
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head><title>OpenBSD ports collection</title></head>
-<body>
-
-<h1>OpenBSD ports collection</h1>
-
-<h2>Description</h2>
-%%DESCR%%
-
-<h2>Sub directories</h2>
-<dl COMPACT>
-%%SUBDIR%%
-</dl>
-
-</body></html>

UPDATE: tcsh

Jasper Lievisse Adriaanse — 2012-05-26T11:09:36

Hi,

Here's an update of tcsh to the latest version. If users could please give it
a try on their favorite arch with their favorite .cshrc.

It was tested on amd64/sparc64/macppc.

[fix homepage/master_site] net/totd + www/www6to4

Matthieu Herrb — 2012-05-26T10:30:07

Hi

Univ's Tromso sites pasta.cs.uit.no and www.vermicelli.pasta.cs.uit.no
don't seem to exist anymore. Update the 2 ports that refer to them.

www.dillema.net isn't currently reachable over IPv6 but I hope this is
transient.

Ok?

Index: net/totd/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/net/totd/Makefile,v
retrieving revision 1.23
diff -u -p -u -r1.23 Makefile
--- net/totd/Makefile3 Mar 2012 15:56:18 -00001.23
+++ net/totd/Makefile26 May 2012 10:28:50 -0000
< at >< at > -3,11 +3,11 < at >< at >
 COMMENT=DNS proxy that supports IPv6 <==> IPv4 record translation
 
 DISTNAME=totd-1.5.1
-REVISION=0
+REVISION=1
 CATEGORIES=net
-MASTER_SITES=ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/
+MASTER_SITES=http://www.dillema.net/software/totd/
 
-HOMEPAGE=http://www.vermicelli.pasta.cs.uit.no/software/totd.html
+HOMEPAGE=http://www.dillema.net/software/totd.html
 
 # BSD/ISC (built-in webserver is LGPL but we don't compile it in)
 PERMIT_PACKAGE_CDROM=Yes
Index: net/totd/pkg/DESCR
===================================================================
RCS file: /cvs/OpenBSD/ports/net/totd/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -u -r1.3 DESCR
--- net/totd/pkg/DESCR15 Dec 2003 21:55:12 -00001.3
+++ net/totd/pkg/DESCR26 May 2012 10:28:50 -0000
< at >< at > -11,14 +11,6 < at >< at > Examples of such translation mechanisms 
      the KAME project (http://www.kame.net). See faithd(8) on
      *BSD/Kame.
 
-For an example setup you may checkout our WWW-site: 
-
-   http://www.vermicelli.pasta.cs.uit.no
-
-and the following clickable image in particular:
-
-http://www.vermicelli.pasta.cs.uit.no/ipv6/UiTo-ipv6.html
-
 *** Contacting the Author ***
 
-You can contact me (Feico Dillema) at feico at pasta.cs.uit.no (s/ at /< at >).
+You can contact me (Feico Dillema) at feico at dillema.net (s/ at /< at >).
Index: www/www6to4/Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/www/www6to4/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- www/www6to4/Makefile14 Jan 2011 22:50:56 -00001.5
+++ www/www6to4/Makefile26 May 2012 10:28:50 -0000
< at >< at > -3,9 +3,9 < at >< at >
 COMMENT=IPv6 to IPv4 web proxy
 
 DISTNAME=www6to4-1.5
-REVISION=0
+REVISION=1
 CATEGORIES=www
-HOMEPAGE=http://www.vermicelli.pasta.cs.uit.no/ipv6/software.html
+HOMEPAGE=http://www.dillema.net/software/www6to4.html
 
 # GPL
 PERMIT_PACKAGE_CDROM=Yes
< at >< at > -14,7 +14,7 < at >< at > PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=Yes
 WANTLIB=c
 
-MASTER_SITES=ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/
+MASTER_SITES=http://www.dillema.net/software/www6to4/
 
 ALL_TARGET=www6to4
 CFLAGS+=-DSYSCONFDIR=\"${SYSCONFDIR}\"

[PATCH] add -zip extension for php

wen heping — 2012-05-26T08:30:16

Hi,

   Here is an patch to add -zip extension to lang/php port. php5-zip is
required by the update of www/moodle which I am working.

   It build well on i386.

   OK? Comments?

wen
? php-zip-ext.diff.txt
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.28
diff -u -r1.28 Makefile.inc
--- Makefile.inc28 Apr 2012 08:34:56 -00001.28
+++ Makefile.inc26 May 2012 08:26:27 -0000
< at >< at > -300,6 +300,12 < at >< at >
 LIB_DEPENDS-xsl=textproc/libxslt
 WANTLIB-xsl=${MODLIBICONV_WANTLIB} m xml2 z xslt>=3 exslt
 
+# zip
+MULTI_PACKAGES+=-zip
+COMMENT-zip=zip functions for php5
+CONFIGURE_ARGS+=--enable-zip=shared,${LOCALBASE}
+WANTLIB-zip=m z
+
 # some variables to substitute
 SUBST_VARS=MODPHP_CONFIG_PATH PV ^MODULE_NAME
 PHP_VERSION=${V}
Index: 5.2/pkg/PLIST-zip
===================================================================
RCS file: 5.2/pkg/PLIST-zip
diff -N 5.2/pkg/PLIST-zip
--- /dev/null1 Jan 1970 00:00:00 -0000
+++ 5.2/pkg/PLIST-zip26 May 2012 08:26:29 -0000
< at >< at > -0,0 +1,8 < at >< at >
+< at >comment$
+< at >option no-default-conflict
+< at >conflict php-zip->=5.2,<5.3
+< at >conflict php5-zip->=5.2
+< at >pkgpath www/php5/extensions,-zip
+lib/php-${PV}/modules/zip.so
+share/examples/php-${PV}/zip.ini
+< at >sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini
Index: 5.3/pkg/PLIST-zip
===================================================================
RCS file: 5.3/pkg/PLIST-zip
diff -N 5.3/pkg/PLIST-zip
--- /dev/null1 Jan 1970 00:00:00 -0000
+++ 5.3/pkg/PLIST-zip26 May 2012 08:26:29 -0000
< at >< at > -0,0 +1,7 < at >< at >
+< at >comment $OpenBSD$
+< at >option no-default-conflict
+< at >conflict php-zip->=5.3,<5.4
+< at >conflict php5-zip->=5.2
+lib/php-${PV}/modules/zip.so
+share/examples/php-${PV}/zip.ini
+< at >sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini
Index: files/DESCR-zip
===================================================================
RCS file: files/DESCR-zip
diff -N files/DESCR-zip
--- /dev/null1 Jan 1970 00:00:00 -0000
+++ files/DESCR-zip26 May 2012 08:26:29 -0000
< at >< at > -0,0 +1,7 < at >< at >
+Zip is a file format used for data compression and archiving.
+A zip file contains one or more files that have been compressed,
+to reduce file size, or stored as is. The zip file format permits
+a number of compression algorithms.
+
+This PHP extension provides a processor independent API to Zip
+transformations.

Automobilismo?

Adalberto Calixto — 2012-05-26T05:21:50

d358020e-bb4b-4200-9f14-524b845b0dd61d981040-dbd7-4226-85bf-27cfe1a0da5c15
Todo conteúdo

new: www/haserl

James Turner — 2012-05-25T21:41:55

Attached is a new port for haserl-0.9.29. Tested on amd64. Thanks.

Information for inst:haserl-0.9.29

Comment:
cgi scripting program for embedded environments

Description:
Haserl is a small cgi wrapper that allows "PHP" style cgi programming,
but uses a UNIX sh-like shell or Lua as the programming language. It is
very small, so it can be used in embedded environments, or where
something like PHP is too big.

Maintainer: James Turner <james< at >calminferno.net>

WWW: http://haserl.sourceforge.net

Até 90% OFF em X-Salada Especial + Batata Frita | Banho e Tosa | Pintado a Urucum | Tarot | 2 Sobás | Combo Sushi | Re =?utf-8?B?dmlzw6NvIE1vdG8gZSBtYWlzIQ==?

Liga Ofertas - Campo Grande — 2012-05-25T18:26:11

[IMAGE]

474 Ofertas em Campo Grande  / MS

[IMAGE] 65% OFF ...Quer transformar seus cabelos por completo? Ent

Bulk build test for mbsnrtowcs() and wcsnrtombs()?

Matthew Dempsky — 2012-05-25T17:59:25

Diff below adds mbsnrtowcs() and wcsnrtombs(), which are new POSIX
2008 functions.  I'd appreciate if someone could run this through a
bulk build and let me know if anything breaks or misbehaves.

Thanks!


Index: include/wchar.h
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/src/include/wchar.h,v
retrieving revision 1.22
diff -u -p -r1.22 wchar.h
--- include/wchar.h5 Jan 2012 20:37:50 -00001.22
+++ include/wchar.h25 May 2012 06:01:50 -0000
< at >< at > -158,6 +158,11 < at >< at > unsigned long int wcstoul(const wchar_t 
 wchar_t*wcsdup(const wchar_t *);
 int wcscasecmp(const wchar_t *, const wchar_t *);
 int wcsncasecmp(const wchar_t *, const wchar_t *, size_t);
+
+size_t mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
+    size_t, mbstate_t * __restrict);
+size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
+    size_t, mbstate_t * __restrict);
 #endif
 
 #if __ISO_C_VISIBLE >= 1999
Index: lib/libc/locale/multibyte_citrus.c
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/src/lib/libc/locale/multibyte_citrus.c,v
retrieving revision 1.1
diff -u -p -r1.1 multibyte_citrus.c
--- lib/libc/locale/multibyte_citrus.c27 Jul 2010 16:59:04 -00001.1
+++ lib/libc/locale/multibyte_citrus.c25 May 2012 16:45:00 -0000
< at >< at > -30,6 +30,7 < at >< at >
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <errno.h>
+#include <limits.h>
 #include <wchar.h>
 
 #include "citrus_ctype.h"
< at >< at > -65,7 +66,19 < at >< at > mbrtowc(wchar_t *pwc, const char *s, siz
 }
 
 size_t
-mbsrtowcs(wchar_t *pwcs, const char **s, size_t n, mbstate_t *ps)
+mbsrtowcs(wchar_t *dst, const char **src, size_t len, mbstate_t *ps)
+{
+static mbstate_t mbs;
+struct _citrus_ctype_rec *cc;
+
+if (ps == NULL)
+ps = &mbs;
+return (mbsnrtowcs(dst, src, SIZE_MAX, len, ps));
+}
+
+size_t
+mbsnrtowcs(wchar_t *dst, const char **src, size_t nmc, size_t len,
+    mbstate_t *ps)
 {
 static mbstate_t mbs;
 struct _citrus_ctype_rec *cc;
< at >< at > -73,7 +86,8 < at >< at > mbsrtowcs(wchar_t *pwcs, const char **s,
 if (ps == NULL)
 ps = &mbs;
 cc = _CurrentRuneLocale->rl_citrus_ctype;
-return (*cc->cc_ops->co_mbsrtowcs)(pwcs, s, n, _ps_to_private(ps));
+return (*cc->cc_ops->co_mbsnrtowcs)(dst, src, nmc, len,
+    _ps_to_private(ps));
 }
 
 size_t
< at >< at > -89,7 +103,18 < at >< at > wcrtomb(char *s, wchar_t wc, mbstate_t *
 }
 
 size_t
-wcsrtombs(char *s, const wchar_t **ppwcs, size_t n, mbstate_t *ps)
+wcsrtombs(char *dst, const wchar_t **src, size_t len, mbstate_t *ps)
+{
+static mbstate_t mbs;
+
+if (ps == NULL)
+ps = &mbs;
+return (wcsnrtombs(dst, src, SIZE_MAX, len, ps));
+}
+
+size_t
+wcsnrtombs(char *dst, const wchar_t **src, size_t nwc, size_t len,
+    mbstate_t *ps)
 {
 static mbstate_t mbs;
 struct _citrus_ctype_rec *cc;
< at >< at > -97,5 +122,6 < at >< at > wcsrtombs(char *s, const wchar_t **ppwcs
 if (ps == NULL)
 ps = &mbs;
 cc = _CurrentRuneLocale->rl_citrus_ctype;
-return (*cc->cc_ops->co_wcsrtombs)(s, ppwcs, n, _ps_to_private(ps));
+return (*cc->cc_ops->co_wcsnrtombs)(dst, src, nwc, len,
+    _ps_to_private(ps));
 }
Index: lib/libc/citrus/citrus_ctype_local.h
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/src/lib/libc/citrus/citrus_ctype_local.h,v
retrieving revision 1.2
diff -u -p -r1.2 citrus_ctype_local.h
--- lib/libc/citrus/citrus_ctype_local.h27 Jul 2010 16:59:03 -00001.2
+++ lib/libc/citrus/citrus_ctype_local.h25 May 2012 01:36:32 -0000
< at >< at > -36,43 +36,45 < at >< at > size_t_citrus_##_e_##_ctype_mbrtowc(wch
       const char * __restrict, size_t,\
       void * __restrict);\
 int_citrus_##_e_##_ctype_mbsinit(const void * __restrict);\
-size_t_citrus_##_e_##_ctype_mbsrtowcs(wchar_t * __restrict,\
-const char ** __restrict,\
-size_t, void * __restrict);\
+size_t_citrus_##_e_##_ctype_mbsnrtowcs(wchar_t * __restrict,\
+ const char ** __restrict,\
+ size_t, size_t,\
+ void * __restrict);\
 size_t_citrus_##_e_##_ctype_wcrtomb(char * __restrict, wchar_t,\
       void * __restrict);\
-size_t_citrus_##_e_##_ctype_wcsrtombs(char * __restrict,\
-const wchar_t ** __restrict,\
-size_t, void * __restrict);\
+size_t_citrus_##_e_##_ctype_wcsnrtombs(char * __restrict,\
+ const wchar_t ** __restrict,\
+ size_t, size_t,\
+ void * __restrict);\
 
 #define _CITRUS_CTYPE_DEF_OPS(_e_)\
 struct _citrus_ctype_ops_rec _citrus_##_e_##_ctype_ops = {\
 /* co_mbrtowc */&_citrus_##_e_##_ctype_mbrtowc,\
 /* co_mbsinit */&_citrus_##_e_##_ctype_mbsinit,\
-/* co_mbsrtowcs */&_citrus_##_e_##_ctype_mbsrtowcs,\
+/* co_mbsnrtowcs */&_citrus_##_e_##_ctype_mbsnrtowcs,\
 /* co_wcrtomb */&_citrus_##_e_##_ctype_wcrtomb,\
-/* co_wcsrtombs */&_citrus_##_e_##_ctype_wcsrtombs,\
+/* co_wcsnrtombs */&_citrus_##_e_##_ctype_wcsnrtombs,\
 }
 
 typedef size_t(*_citrus_ctype_mbrtowc_t)
 (wchar_t * __restrict, const char * __restrict,
 size_t, void * __restrict);
 typedef int(*_citrus_ctype_mbsinit_t) (const void * __restrict);
-typedef size_t(*_citrus_ctype_mbsrtowcs_t)
+typedef size_t(*_citrus_ctype_mbsnrtowcs_t)
 (wchar_t * __restrict, const char ** __restrict,
- size_t, void * __restrict);
+ size_t, size_t, void * __restrict);
 typedef size_t(*_citrus_ctype_wcrtomb_t)
 (char * __restrict, wchar_t, void * __restrict);
-typedef size_t(*_citrus_ctype_wcsrtombs_t)
+typedef size_t(*_citrus_ctype_wcsnrtombs_t)
 (char * __restrict, const wchar_t ** __restrict,
- size_t, void * __restrict);
+ size_t, size_t, void * __restrict);
 
 struct _citrus_ctype_ops_rec {
 _citrus_ctype_mbrtowc_tco_mbrtowc;
 _citrus_ctype_mbsinit_tco_mbsinit;
-_citrus_ctype_mbsrtowcs_tco_mbsrtowcs;
+_citrus_ctype_mbsnrtowcs_tco_mbsnrtowcs;
 _citrus_ctype_wcrtomb_tco_wcrtomb;
-_citrus_ctype_wcsrtombs_tco_wcsrtombs;
+_citrus_ctype_wcsnrtombs_tco_wcsnrtombs;
 };
 
 #define _CITRUS_DEFAULT_CTYPE_NAME"NONE"
Index: lib/libc/citrus/citrus_none.c
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/src/lib/libc/citrus/citrus_none.c,v
retrieving revision 1.2
diff -u -p -r1.2 citrus_none.c
--- lib/libc/citrus/citrus_none.c3 Aug 2010 11:23:37 -00001.2
+++ lib/libc/citrus/citrus_none.c25 May 2012 16:37:39 -0000
< at >< at > -31,6 +31,7 < at >< at >
 #include <sys/types.h>
 
 #include <errno.h>
+#include <limits.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
< at >< at > -42,6 +43,19 < at >< at >
 
 _CITRUS_CTYPE_DEF_OPS(none);
 
+/*
+ * Convert an unsigned char value into a char value without relying on
+ * signed overflow behavior.
+ */
+static inline char
+wrapv(unsigned char ch)
+{
+if (ch >= 0x80)
+return ((int)ch - 0x100);
+else
+return (ch);
+}
+
 size_t
 /*ARGSUSED*/
 _citrus_none_ctype_mbrtowc(wchar_t * __restrict pwc,
< at >< at > -70,30 +84,27 < at >< at > _citrus_none_ctype_mbsinit(const void * 
 
 size_t
 /*ARGSUSED*/
-_citrus_none_ctype_mbsrtowcs(wchar_t * __restrict pwcs,
-     const char ** __restrict s, size_t n,
-     void * __restrict pspriv)
+_citrus_none_ctype_mbsnrtowcs(wchar_t * __restrict dst,
+      const char ** __restrict src,
+      size_t nmc, size_t len,
+      void * __restrict pspriv)
 {
-int count = 0;
+size_t i;
 
-/* pwcs may be NULL */
-/* s may be NULL */
+/* dst may be NULL */
 /* pspriv appears to be unused */
 
-if (!s || !*s)
-return 0;
+if (dst == NULL)
+return strnlen(*src, nmc);
 
-if (pwcs == NULL)
-return strlen(*s);
+for (i = 0; i < nmc && i < len; i++)
+if ((dst[i] = (wchar_t)(unsigned char)(*src)[i]) == L'\0') {
+*src = NULL;
+return (i);
+}
 
-while (n > 0) {
-if ((*pwcs++ = (wchar_t)(unsigned char)*(*s)++) == 0)
-break;
-count++;
-n--;
-}
-
-return count;
+*src += i;
+return (i);
 }
 
 size_t
< at >< at > -105,40 +116,55 < at >< at > _citrus_none_ctype_wcrtomb(char * __rest
 /* ps appears to be unused */
 
 if (s == NULL)
-return 0;
+return (0);
+
+if (wc < 0 || wc > 0xff) {
+errno = EILSEQ;
+return (-1);
+}
 
-*s = (char) wc;
-return 1;
+*s = wrapv(wc);
+return (1);
 }
 
 size_t
 /*ARGSUSED*/
-_citrus_none_ctype_wcsrtombs(char * __restrict s,
-     const wchar_t ** __restrict pwcs, size_t n,
-     void * __restrict pspriv)
+_citrus_none_ctype_wcsnrtombs(char * __restrict dst,
+      const wchar_t ** __restrict src,
+      size_t nwc, size_t len,
+      void * __restrict pspriv)
 {
-int count = 0;
+size_t i;
 
-/* s may be NULL */
-/* pwcs may be NULL */
+/* dst may be NULL */
 /* pspriv appears to be unused */
 
-if (pwcs == NULL || *pwcs == NULL)
-return (0);
-
-if (s == NULL) {
-while (*(*pwcs)++ != 0)
-count++;
-return(count);
+if (dst == NULL) {
+for (i = 0; i < nwc; i++) {
+wchar_t wc = (*src)[i];
+if (wc < 0 || wc > 0xff) {
+errno = EILSEQ;
+return (-1);
+}
+if (wc == L'\0')
+return (i);
+}
+return (i);
 }
 
-if (n != 0) {
-do {
-if ((*s++ = (char) *(*pwcs)++) == 0)
-break;
-count++;
-} while (--n != 0);
+for (i = 0; i < nwc && i < len; i++) {
+wchar_t wc = (*src)[i];
+if (wc < 0 || wc > 0xff) {
+*src += i;
+errno = EILSEQ;
+return (-1);
+}
+dst[i] = wrapv(wc);
+if (wc == L'\0') {
+*src = NULL;
+return (i);
+}
 }
-
-return count;
+*src += i;
+return (i);
 }
Index: lib/libc/citrus/citrus_utf8.c
===================================================================
RCS file: /home/mdempsky/anoncvs/cvs/src/lib/libc/citrus/citrus_utf8.c,v
retrieving revision 1.4
diff -u -p -r1.4 citrus_utf8.c
--- lib/libc/citrus/citrus_utf8.c21 Apr 2011 00:16:06 -00001.4
+++ lib/libc/citrus/citrus_utf8.c25 May 2012 17:03:00 -0000
< at >< at > -186,53 +186,44 < at >< at > _citrus_utf8_ctype_mbsinit(const void * 
 
 size_t
 /*ARGSUSED*/
-_citrus_utf8_ctype_mbsrtowcs(wchar_t * __restrict pwcs,
-     const char ** __restrict s, size_t n,
-     void * __restrict pspriv)
+_citrus_utf8_ctype_mbsnrtowcs(wchar_t * __restrict dst,
+      const char ** __restrict src,
+      size_t nmc, size_t len,
+      void * __restrict pspriv)
 {
 struct _utf8_state *us;
-const char *src;
-size_t nchr;
-wchar_t wc;
-size_t nb;
+size_t i, o, r;
 
 us = (struct _utf8_state *)pspriv;
-src = *s;
-nchr = 0;
 
-if (pwcs == NULL) {
+if (dst == NULL) {
 /*
  * The fast path in the loop below is not safe if an ASCII
  * character appears as anything but the first byte of a
  * multibyte sequence. Check now to avoid doing it in the loop.
  */
-if (us->want > 0 && (signed char)*src > 0) {
+if (nmc > 0 && us->want > 0 && (unsigned char)(*src)[0] < 0x80) {
 errno = EILSEQ;
 return ((size_t)-1);
 }
-for (;;) {
-if ((signed char)*src > 0) {
-/*
- * Fast path for plain ASCII characters
- * excluding NUL.
- */
-nb = 1;
+for (i = o = 0; i < nmc; i += r, o++) {
+if ((unsigned char)(*src)[i] < 0x80) {
+/* Fast path for plain ASCII characters. */
+if ((*src)[i] == '\0')
+return (o);
+r = 1;
 } else {
-nb = _citrus_utf8_ctype_mbrtowc(&wc, src,
-    _CITRUS_UTF8_MB_CUR_MAX, us);
-if (nb == (size_t)-1) {
-/* Invalid sequence. */
-return (nb);
-}
-if (nb == 0 || nb == (size_t)-2) {
-return (nchr);
-}
+r = _citrus_utf8_ctype_mbrtowc(NULL, *src + i,
+    nmc - i, us);
+if (r == (size_t)-1)
+return (r);
+if (r == (size_t)-2)
+return (o);
+if (r == 0)
+return (o);
 }
-
-src += nb;
-nchr++;
 }
-/*NOTREACHED*/
+return (o);
 }
 
 /*
< at >< at > -240,40 +231,38 < at >< at > _citrus_utf8_ctype_mbsrtowcs(wchar_t * _
  * character appears as anything but the first byte of a
  * multibyte sequence. Check now to avoid doing it in the loop.
  */
-if (n > 0 && us->want > 0 && (signed char)*src > 0) {
+if (len > 0 && nmc > 0 && us->want > 0 && (unsigned char)(*src)[0] < 0x80) {
 errno = EILSEQ;
 return ((size_t)-1);
 }
-while (n-- > 0) {
-if ((signed char)*src > 0) {
-/*
- * Fast path for plain ASCII characters
- * excluding NUL.
- */
-*pwcs = (wchar_t)*src;
-nb = 1;
+for (i = o = 0; i < nmc && o < len; i += r, o++) {
+if ((unsigned char)(*src)[i] < 0x80) {
+/* Fast path for plain ASCII characters. */
+dst[o] = (wchar_t)(unsigned char)(*src)[i];
+if ((*src)[i] == '\0') {
+*src = NULL;
+return (o);
+}
+r = 1;
 } else {
-nb = _citrus_utf8_ctype_mbrtowc(pwcs, src,
-    _CITRUS_UTF8_MB_CUR_MAX, us);
-if (nb == (size_t)-1) {
-*s = src;
-return (nb);
-}
-if (nb == (size_t)-2) {
-*s = src;
-return (nchr);
-}
-if (nb == 0) {
-*s = NULL;
-return (nchr);
+r = _citrus_utf8_ctype_mbrtowc(dst + o, *src + i,
+    nmc - i, us);
+if (r == (size_t)-1) {
+*src += i;
+return (r);
+}
+if (r == (size_t)-2) {
+*src += nmc;
+return (o);
+}
+if (r == 0) {
+*src = NULL;
+return (o);
 }
 }
-src += nb;
-nchr++;
-pwcs++;
 }
-*s = src;
-return (nchr);
+*src += i;
+return (o);
 }
 
 size_t
< at >< at > -343,15 +332,14 < at >< at > _citrus_utf8_ctype_wcrtomb(char * __rest
 
 size_t
 /*ARGSUSED*/
-_citrus_utf8_ctype_wcsrtombs(char * __restrict s,
-     const wchar_t ** __restrict pwcs, size_t n,
-     void * __restrict pspriv)
+_citrus_utf8_ctype_wcsnrtombs(char * __restrict dst,
+      const wchar_t ** __restrict src,
+      size_t nwc, size_t len,
+      void * __restrict pspriv)
 {
 struct _utf8_state *us;
 char buf[_CITRUS_UTF8_MB_CUR_MAX];
-const wchar_t *src;
-size_t nbytes;
-size_t nb;
+size_t i, o, r;
 
 us = (struct _utf8_state *)pspriv;
 
< at >< at > -360,65 +348,52 < at >< at > _citrus_utf8_ctype_wcsrtombs(char * __re
 return ((size_t)-1);
 }
 
-src = *pwcs;
-nbytes = 0;
-
-if (s == NULL) {
-for (;;) {
-if (0 <= *src && *src < 0x80)
+if (dst == NULL) {
+for (i = o = 0; i < nwc; i++, o += r) {
+wchar_t wc = (*src)[i];
+if (wc >= 0 && wc < 0x80) {
 /* Fast path for plain ASCII characters. */
-nb = 1;
-else {
-nb = _citrus_utf8_ctype_wcrtomb(buf, *src, us);
-if (nb == (size_t)-1) {
-/* Invalid character */
-return (nb);
-}
-}
-if (*src == L'\0') {
-return (nbytes + nb - 1);
+if (wc == 0)
+return (o);
+r = 1;
+} else {
+r = _citrus_utf8_ctype_wcrtomb(buf, wc, us);
+if (r == (size_t)-1)
+return (r);
 }
-src++;
-nbytes += nb;
 }
-/*NOTREACHED*/
+return (o);
 }
 
-while (n > 0) {
-if (0 <= *src && *src < 0x80) {
+for (i = o = 0; i < nwc && o < len; i++, o += r) {
+wchar_t wc = (*src)[i];
+if (wc >= 0 && wc < 0x80) {
 /* Fast path for plain ASCII characters. */
-nb = 1;
-*s = *src;
-} else if (n > (size_t)_CITRUS_UTF8_MB_CUR_MAX) {
+dst[o] = (wchar_t)wc;
+if (wc == 0) {
+*src = NULL;
+return (o);
+}
+r = 1;
+} else if (len - o >= _CITRUS_UTF8_MB_CUR_MAX) {
 /* Enough space to translate in-place. */
-nb = _citrus_utf8_ctype_wcrtomb(s, *src, us);
-if (nb == (size_t)-1) {
-*pwcs = src;
-return (nb);
+r = _citrus_utf8_ctype_wcrtomb(dst + o, wc, us);
+if (r == (size_t)-1) {
+*src += i;
+return (r);
 }
 } else {
-/*
- * May not be enough space; use temp. buffer.
- */
-nb = _citrus_utf8_ctype_wcrtomb(buf, *src, us);
-if (nb == (size_t)-1) {
-*pwcs = src;
-return (nb);
+/* May not be enough space; use temp buffer. */
+r = _citrus_utf8_ctype_wcrtomb(buf, wc, us);
+if (r == (size_t)-1) {
+*src += i;
+return (r);
 }
-if (nb > n)
-/* MB sequence for character won't fit. */
+if (r > len - o)
 break;
-memcpy(s, buf, nb);
-}
-if (*src == L'\0') {
-*pwcs = NULL;
-return (nbytes + nb - 1);
+memcpy(dst + o, buf, r);
 }
-src++;
-s += nb;
-n -= nb;
-nbytes += nb;
 }
-*pwcs = src;
-return (nbytes);
+*src += i;
+return (o);
 }

----- End forwarded message -----

UPDATE: textproc/sphinx

Giovanni Bechis — 2012-05-25T16:38:55

Long overdue update to latest version, many improvements and bug fixes.
Comments ? Ok ?
 Cheers
  Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/sphinx/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile16 Nov 2011 15:56:37 -00001.9
+++ Makefile25 May 2012 16:35:58 -0000
< at >< at > -2,8 +2,9 < at >< at >
 
 COMMENT =free open-source SQL full-text search engine
 
-DISTNAME =sphinx-0.9.8.1
-REVISION =4
+VERSION =2.0.4
+DISTNAME =sphinx-${VERSION}-release
+PKGNAME =sphinx-${VERSION}
 CATEGORIES =textproc
 
 HOMEPAGE =http://www.sphinxsearch.com/
< at >< at > -16,14 +17,14 < at >< at > PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=Yes
 
-MASTER_SITES =${HOMEPAGE}/downloads/
+MASTER_SITES =${HOMEPAGE}/files/
 
 MODULES =converters/libiconv lang/php
 
 MODPHP_BUILDDEP=No
 MODPHP_RUNDEP=No
 
-WANTLIB =c expat m stdc++
+WANTLIB =c expat iodbc m pthread stdc++
 
 CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS = --with-mysql
< at >< at > -33,6 +34,8 < at >< at > CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}
 FLAVORS =pgsql
 FLAVOR ?=
 
+LIB_DEPENDS = databases/iodbc
+
 .if ${FLAVOR:L:Mpgsql}
 CONFIGURE_ARGS +=--with-pgsql \
 --without-mysql
< at >< at > -47,6 +50,7 < at >< at > WANTLIB +=crypto ssl z mysqlclient
 REGRESS_IS_INTERACTIVE=Yes
 REGRESS_DEPENDS=lang/php/${MODPHP_VERSION},-mysql \
 lang/php/${MODPHP_VERSION},-pdo_mysql
+MAKE_ENV=MODPHP_BIN=${MODPHP_BIN}
 
 post-install:
 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sphinx
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/sphinx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo22 Mar 2009 15:53:21 -00001.2
+++ distinfo25 May 2012 16:35:58 -0000
< at >< at > -1,5 +1,5 < at >< at >
-MD5 (sphinx-0.9.8.1.tar.gz) = QooU30H7Ql5mTZ4tYXjANw==
-RMD160 (sphinx-0.9.8.1.tar.gz) = qyv+5MrVUiF+EyRJx91rEHHtW8k=
-SHA1 (sphinx-0.9.8.1.tar.gz) = 7tTG9bMU+WXBnMqK69C22EfNNfk=
-SHA256 (sphinx-0.9.8.1.tar.gz) = 72mytSOBFz2pK/Lfed/IxSccSz8VbDVrtO+CygNdwBM=
-SIZE (sphinx-0.9.8.1.tar.gz) = 949660
+MD5 (sphinx-2.0.4-release.tar.gz) = faTfPfPeyyTYxvuPR94dPQ==
+RMD160 (sphinx-2.0.4-release.tar.gz) = kOtF9acDkR6pN51DJZwXI+RjZAI=
+SHA1 (sphinx-2.0.4-release.tar.gz) = FoeU3PtGRKwC3M6GPASzUTmbCGM=
+SHA256 (sphinx-2.0.4-release.tar.gz) = Q8S2KUnY+9K2upPiDLDzXBT0KL5QGvR+daPvcT76KIY=
+SIZE (sphinx-2.0.4-release.tar.gz) = 1938089
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/sphinx/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in22 Mar 2009 15:53:21 -00001.2
+++ patches/patch-Makefile_in25 May 2012 16:35:58 -0000
< at >< at > -1,27 +1,22 < at >< at >
 $OpenBSD: patch-Makefile_in,v 1.2 2009/03/22 15:53:21 jasper Exp $
---- Makefile.in.origSun Jun  8 10:57:36 2008
-+++ Makefile.inFri Mar 20 12:04:00 2009
-< at >< at > -239,12 +239,12 < at >< at > sphinx-min.conf.dist: $(top_builddir)/config.status $(
- uninstall-info-am:
+--- Makefile.in.origSat Jun 11 16:19:49 2011
++++ Makefile.inFri May 25 17:30:02 2012
+< at >< at > -288,15 +288,15 < at >< at > sphinx-min.conf.dist: $(top_builddir)/config.status $(
+ cd $(top_builddir) && $(SHELL) ./config.status $< at >
  install-sysconfDATA: $(sysconf_DATA)
  < at >$(NORMAL_INSTALL)
--test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-+test -z "$(datadir)/examples/sphinx" || $(mkdir_p) "$(DESTDIR)$(datadir)/examples/sphinx"
- < at >list='$(sysconf_DATA)'; for p in $$list; do \
+-test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++test -z "$(datadir)/examples/sphinx" || $(MKDIR_P) "$(DESTDIR)$(datadir)/examples/sphinx"
+ < at >list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+ for p in $$list; do \
    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-   f=$(am__strip_dir) \
--  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
--  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/sphinx/$$f'"; \
-+  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/sphinx/$$f"; \
+   echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+-  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+-  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
++  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)/examples/sphinx/'"; \
++  $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples/sphinx/" || exit $$?; \
  done
  
  uninstall-sysconfDATA:
-< at >< at > -619,7 +619,6 < at >< at > uninstall-info: uninstall-info-recursive
- 
- 
- install-data-hook:
--mkdir -p $(DESTDIR)$(localstatedir)/data && mkdir -p $(DESTDIR)$(localstatedir)/log
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/textproc/sphinx/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure22 Mar 2009 15:53:21 -00001.2
+++ patches/patch-configure25 May 2012 16:35:58 -0000
< at >< at > -1,20 +1,20 < at >< at >
---- configure.origWed Jul  9 16:29:17 2008
-+++ configureFri Mar 20 12:04:00 2009
-< at >< at > -7229,11 +7229,11 < at >< at > extern "C"
+--- configure.origThu Mar  1 10:04:19 2012
++++ configureFri May 25 17:30:14 2012
+< at >< at > -5992,11 +5992,11 < at >< at > cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ #ifdef __cplusplus
+ extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
 -char iconv ();
 +char libiconv ();
  int
  main ()
  {
--iconv ();
-+libiconv ();
+-return iconv ();
++return libiconv ();
    ;
    return 0;
  }
-< at >< at > -8219,7 +8219,7 < at >< at > main ()
+< at >< at > -7408,7 +7408,7 < at >< at > main ()
  {
  const char * inbuf;
  iconv_t cd;
Index: patches/patch-src_sphinxstd_cpp
===================================================================
RCS file: patches/patch-src_sphinxstd_cpp
diff -N patches/patch-src_sphinxstd_cpp
--- /dev/null1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_sphinxstd_cpp25 May 2012 16:35:58 -0000
< at >< at > -0,0 +1,16 < at >< at >
+$OpenBSD$
+--- src/sphinxstd.cpp.origFri May 25 17:44:37 2012
++++ src/sphinxstd.cppFri May 25 17:44:59 2012
+< at >< at > -742,12 +742,6 < at >< at > CSphProcessSharedMutex::CSphProcessSharedMutex ( int i
+ m_sError.SetSprintf ( "pthread_mutexattr_init, errno=%d", iRes );
+ return;
+ }
+-iRes = pthread_mutexattr_setpshared ( &tAttr, PTHREAD_PROCESS_SHARED );
+-if ( iRes )
+-{
+-m_sError.SetSprintf ( "pthread_mutexattr_setpshared, errno = %d", iRes );
+-return;
+-}
+ 
+ CSphString sError, sWarning;
+ if ( !m_pStorage.Alloc ( sizeof(pthread_mutex_t) + iExtraSize, sError, sWarning ) )
Index: patches/patch-test_Makefile
===================================================================
RCS file: patches/patch-test_Makefile
diff -N patches/patch-test_Makefile
--- /dev/null1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_Makefile25 May 2012 16:35:58 -0000
< at >< at > -0,0 +1,12 < at >< at >
+$OpenBSD$
+--- test/Makefile.origFri May 25 18:22:09 2012
++++ test/MakefileFri May 25 18:22:28 2012
+< at >< at > -7,7 +7,7 < at >< at > info:
+ dist:
+ 
+ check:
+-php ubertest.php t -u test
++${MODPHP_BIN} ubertest.php t -u test
+ 
+ clean:
+ sh clean.sh
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/sphinx/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST21 Jul 2008 12:42:21 -00001.1.1.1
+++ pkg/PLIST25 May 2012 16:35:58 -0000
< at >< at > -1,8 +1,14 < at >< at >
 < at >comment $OpenBSD: PLIST,v 1.1.1.1 2008/07/21 12:42:21 bernd Exp $
 < at >bin bin/indexer
+< at >bin bin/indextool
 < at >bin bin/search
 < at >bin bin/searchd
 < at >bin bin/spelldump
+< at >man man/man1/indexer.1
+< at >man man/man1/indextool.1
+< at >man man/man1/search.1
+< at >man man/man1/searchd.1
+< at >man man/man1/spelldump.1
 share/doc/sphinx/
 share/doc/sphinx/sphinx.txt
 share/examples/sphinx/

update x11/fltk

Pascal Stumpf — 2012-05-25T14:47:01

Update to latest version, eliminate groff, give more accurate license,
use SUBST_CMD instead of perl and fix version reported by fltk-config.

graphics/aqsis and x11/flwm need patches to build (attached).  Haven't
yet tested palm/pose though (i386 only).

Maintainer doesn't seem to be active any more.


Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile22 Nov 2010 08:36:56 -00001.41
+++ Makefile25 May 2012 10:30:40 -0000
< at >< at > -2,29 +2,28 < at >< at >
 
 COMMENT=Fast-Light Tool Kit
 
-VER=1.1.7
-DISTNAME=fltk-${VER}
-REVISION=2
+VER=1.3.0
+DISTNAME=fltk-${VER}-source
+PKGNAME=fltk-${VER}
 
 CATEGORIES=x11
-SHARED_LIBS=fltk6.0 \
-fltk_forms6.0 \
-fltk_gl6.0 \
-fltk_images6.0
+SHARED_LIBS=fltk7.0 \
+fltk_forms7.0 \
+fltk_gl7.0 \
+fltk_images7.0
 
 HOMEPAGE=http://www.fltk.org/
 
 MAINTAINER=Peter Stromberg <wilfried< at >openbsd.org>
 
-# LGPL
+# LGPLv2 with exceptions (see COPYING)
 PERMIT_PACKAGE_CDROM=Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=Yes
 
-WANTLIB += X11 Xau Xdmcp Xext c m stdc++ z jpeg png pthread
-
-DISTFILES=${DISTNAME}-source${EXTRACT_SUFX}
+WANTLIB += X11 Xau Xdmcp Xext Xft Xinerama c fontconfig jpeg m
+WANTLIB += png pthread stdc++ z
 
 MASTER_SITES=ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VER}/ \
 ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VER}/ \
< at >< at > -39,7 +38,6 < at >< at > LIB_DEPENDS=graphics/jpeg \
 graphics/png
 
 NO_REGRESS=Yes
-USE_GROFF =Yes
 CONFIGURE_STYLE=autoconf no-autoheader
 AUTOCONF_VERSION=2.59
 CONFIGURE_ARGS=${CONFIGURE_SHARED} \
< at >< at > -48,15 +46,14 < at >< at > CONFIGURE_ENV=CPPFLAGS="-I${LOCALBASE}/
 CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 LIBS="-L${LOCALBASE}/lib" \
-FL_MAJOR_VERSION=${LIBfltk_VERSION:R} \
-FL_MINOR_VERSION=${LIBfltk_VERSION:E} \
-FL_PATCH_VERSION=0
+LIBfltk_VERSION="${LIBfltk_VERSION}"
 .for n v in ${SHARED_LIBS}
 MAKE_ENV+=LIB$n_VERSION=${LIB$n_VERSION}
 .endfor
 
+WRKDIST=${WRKDIR}/fltk-${VER}
+
 pre-build:
-perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
-${WRKSRC}/src/Fl_Preferences.cxx
+${SUBST_CMD} ${WRKSRC}/src/Fl_Preferences.cxx
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fltk/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo5 Apr 2007 17:36:19 -00001.10
+++ distinfo25 May 2012 10:30:40 -0000
< at >< at > -1,5 +1,5 < at >< at >
-MD5 (fltk-1.1.7-source.tar.gz) = 7EjJb64FiVbm5cnBzaYVfQ==
-RMD160 (fltk-1.1.7-source.tar.gz) = 4mSPjQLTpnOcuUVZQKTOvpwBqnc=
-SHA1 (fltk-1.1.7-source.tar.gz) = P4pkyRrkZT4TAFZd1njrbbSAVbo=
-SHA256 (fltk-1.1.7-source.tar.gz) = jWCWJm8TPPQOmK7FLaFehJ1qytQjW2bagnmJ+oLGzC0=
-SIZE (fltk-1.1.7-source.tar.gz) = 2517351
+MD5 (fltk-1.3.0-source.tar.gz) = RNXXugav3TbqF9prS3A8ow==
+RMD160 (fltk-1.3.0-source.tar.gz) = 3qHrQq4bge+iKlQZiVYhE2filFo=
+SHA1 (fltk-1.3.0-source.tar.gz) = cg8oBL5hMuuumQnU503tzACznSU=
+SHA256 (fltk-1.3.0-source.tar.gz) = mQZ2gIKUzqTMo96DOtWl3ggHPBG2ZTVtTs810iU1shw=
+SIZE (fltk-1.3.0-source.tar.gz) = 4111004
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile19 Oct 2006 09:41:32 -00001.4
+++ patches/patch-Makefile25 May 2012 10:30:40 -0000
< at >< at > -1,12 +1,12 < at >< at >
 $OpenBSD: patch-Makefile,v 1.4 2006/10/19 09:41:32 wilfried Exp $
---- Makefile.origSun Jan 15 19:36:16 2006
-+++ MakefileThu Oct 19 10:43:24 2006
+--- Makefile.origTue Feb 15 16:29:03 2011
++++ MakefileFri May 25 01:03:08 2012
 < at >< at > -27,7 +27,7 < at >< at >
  
  include makeinclude
  
--DIRS=$(IMAGEDIRS) src fluid test documentation
-+DIRS=$(IMAGEDIRS) src fluid documentation
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
  
- all: makeinclude
+ all: makeinclude fltk-config
  for dir in $(DIRS); do\
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/x11/fltk/patches/patch-configure_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-configure_in
--- patches/patch-configure_in22 Sep 2010 12:47:45 -00001.12
+++ patches/patch-configure_in25 May 2012 10:30:40 -0000
< at >< at > -1,51 +1,34 < at >< at >
 $OpenBSD: patch-configure_in,v 1.12 2010/09/22 12:47:45 ajacoutot Exp $
---- configure.in.origSun Jan 15 19:36:16 2006
-+++ configure.inTue Sep 21 07:55:56 2010
-< at >< at > -34,9 +34,9 < at >< at > dnl Required file in package...
- AC_INIT(src/Fl.cxx)
- 
- dnl FLTK library versions...
--FL_MAJOR_VERSION=1
--FL_MINOR_VERSION=1
--FL_PATCH_VERSION=7
-+#FL_MAJOR_VERSION=1
-+#FL_MINOR_VERSION=1
-+#FL_PATCH_VERSION=7
- FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
+--- configure.in.origSun Mar  6 17:54:58 2011
++++ configure.inFri May 25 01:07:10 2012
+< at >< at > -48,7 +48,7 < at >< at > dnl FLTK library versions...
+ FL_MAJOR_VERSION=1
+ FL_MINOR_VERSION=3
+ FL_PATCH_VERSION=0
+-FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
++FL_API_VERSION=${LIBfltk_VERSION}
  
  AC_SUBST(FL_MAJOR_VERSION)
-< at >< at > -530,13 +530,6 < at >< at > dnl Check for pthreads for multi-threaded apps...
- have_pthread=no
- 
- if test "x$enable_threads" = xyes; then

Hoje tem Progressiva Agimax com 80% OFF / Cristalização+Hidratação Caviar / Limpeza de Pele Profunda+Peeling / Lava =?utf-8?B?SmF0byAvIFDDqSBlIE3Do28rSGlkc

OfertaDelas — 2012-05-25T10:25:06

Oferta Delas

As melhores ofertas de
Campo Grande

Lisos e perfeitos! 80% OFF em Escova Progressiva Agimax. De R$200,00 por
apenas R$39,90!

R$ 39,90
[IMAGE]

[IMAGE]


Faa a Cristalizao + e Ganhe de Brinde a Hidratao de Caviar Para
Fazer em Casa! De R$ 135,00 Por R$ 59,00. Essa no da Pra perder n?

R$ 59,00
[IMAGE]

[IMAGE]


Design de Sobrancelha + Desenho com Correo de Imperfeio + Pigmentao
com Henna Europeia de R$ 30 por R$ 9,90

R$ 9,90
[IMAGE]

[IMAGE]


Luzes e Tonalizao + Hidratao com Escova na Marly Cabeleireira.

R$ 39,90
[IMAGE]

[IMAGE]


Combo Sugesto com 43 Peas no Sushi Express por apenas R$29,90? Garanta
o seu!

R$ 29,90
[IMAGE]

[IMAGE]


Esfoliao Facial + Lifting Facial de 70,00 por 13,90

R$ 13,90
[IMAGE]

[IMAGE]


Renove sua Aparncia com Esfoliao + Hidratao Corporal de R$ 60,00 por
apenas R$ 11,90

R$ 11,90
[IMAGE]

[IMAGE]


Ms das Mes!!! Mini Day Spa com Massagem relaxante + Escalda para os ps
+ Spa para ps e mos + Reflexologia podal + Shiatsu crnio facial +
Gomagem + Hidratao corporal por S R$19,90!

R$ 19,90
[IMAGE]

[IMAGE]


Pacote de 12 sesses de Massagem Redutora + Modeladora + Lipoescultura
Manual + Gessoterapia + Banho de Lua + rgiloterapia na Desigual Moda &
Esttica ( De R780 Por R$199 )

R$ 199,00
[IMAGE]

[IMAGE]


DEPILAO VIRILHA COMPLETA + BUO E AXILAS DE R$ 26,00 POR 10,90!!!

R$ 10,90
[IMAGE]

[IMAGE]


1 Lavagem externa + Limpeza + Aspirao interna + Limpeza de tapetes e
pneus + Aplicao de Cera Liquida + Acabamento interno painel e portas De
R$ 25,00 Por R$14,99

R$ 14,99
[IMAGE]

[IMAGE]


1 Esfoliao Facial + 1 Limpeza de Pele Profunda + 1 Alta Frequncia + 1
Mascara de rgila e Extratos de Pepino, Hortel e Mel ( De R$ 198,00 Por
R$ 29,00 ) Sua Pele Linda e Macia

R$ 29,90
[IMAGE]

[IMAGE]


P e Mo + Hidratao Capilar ! De R$ 49,00 Por R$ 11,90

R$ 11,90
[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 permiso para
contat-lo. Pra que futuras ofertas da Oferta Delas sejam entregues na
sua caixa de entrada e no sejam tratados como spam, por favor adicione
boletim< at >ligaofertas.com  sua lista de contatos ou lista de remetentes
aprovados.

[IMAGE]

Poltica de Privacidade
Ns queremos que voc se sinta confiante sobre a privacidade de suas
informaes pessoais, assim como todas as informaes que temos sobre
voc esto protegidas.


[IMAGE]

Não desejo mais receber estes e-mails.

Hoje - Combinado 43 Peças Sushi Express / Hidratação Caviar+Escova / Cristalização / Higienização+Peeling+Esfolia =?utf-8?B?w6fDo28gRmFjaWFsIC8gQ2xhcmVhb

Incriveis Ofertas - Campo Grande — 2012-05-25T09:59:27

www.incriveisofertas.com

[IMAGE] Cristalizao + Design de Sobrancelha - Aproveite esta oferta
pague R$39 ao invs de R$100

de R$ 100,00 por R$ R$ 39,00


[IMAGE] 1 Hidratao de Caviar + 1 Escova com 70% OFF ( De R$ 70,00 Por
R$ 19,90 )

de R$ 70,00 por R$ R$ 19,90


[IMAGE] Renove sua pele com 1 Higienizao Facial + 1 Esfoliao + 1
Peeling de Diamante + 1 Mscara de Morango - Tudo por s R$19,90!

de R$ 140,00 por R$ R$ 19,90


[IMAGE] Oferta Destaque, Luzes + Tonalizao + Hidratao + Escova - De
R$ 220,00 Por R$ 39,90

de R$ 220,00 por R$ R$ 39,90


[IMAGE] Que Delcia..Pastel frito na hora  na Feira Central! Pastel de
Carne com Queijo ou Frango com Catupiry por apenas R$ 2,40.

de R$ 4,00 por R$ R$ 2,40


[IMAGE] 91% OFF em 5 Drenagens + 5 Ultrassons + 5 Argiloterapia + 5
Bandagens Quentes - S R$49,90

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


[IMAGE] Deliciosa mania: 18 Cupcakes de 3 Sabores, de R$90 por R$27 na
Que Delcia de Cupcakes

de R$ 90,00 por R$ R$ 27,00


[IMAGE] ltima Chance!! Combo Sushi com 43 Peas no Sushi Express - 3
Lojas em Campo Grande por apenas R$29,90? Garanta o seu!

de R$ 62,00 por R$ R$ 29,90


[IMAGE] Promoo na fer Consultrio, So 17 Procedimentos 10 Drenagem
Linftica + 5 Massagem Relaxante + Peeling Cristal + Mscara Facial
Revitalizante ( De R$625 Por R$189 )

de R$ 625,00 por R$ R$ 189,00


[IMAGE] 80% OFF em Cristalizao Agimax no Salo Lcia Hair! De R$150,00
por apenas R$29,90! Compre e Use

de R$ 150,00 por R$ R$ 29,90


[IMAGE] ltima Chance de Garantir a festa! Aluguel de 1 Cama Elastica + 1
Piscina de Bolinha + 1 Gangorra Upa Upa + 1 Escorregador e tem at o
final de 2012 para usar ( De R$450 Por R$99,90 )

de R$ 450,00 por R$ R$ 100,00


[IMAGE] Manicure e Pedicure + Depilao  Perna, Axila e Buo com 50% de
desconto!

de R$ 54,00 por R$ R$ 27,00


[IMAGE] Clareamento de Pele de R$40,00 por R$14,90 - Compre o seu
Voucher/Cupom!

de R$ 40,00 por R$ R$ 14,90


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

[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 permiso para
contat-lo. Pra que futuras ofertas da Oferta Delas sejam entregues na
sua caixa de entrada e no sejam tratados como spam, por favor adicione
boletim< at >ligaofertas.com sua lista de contatos ou lista de remetentes
aprovados.

[IMAGE]

Poltica de Privacidade
Ns queremos que voc se sinta confiante sobre a privacidade de suas
informaes pessoais, assim como todas as informaes que temos sobre
voc esto protegidas.


[IMAGE]

Não desejo mais receber estes e-mails.