CVS: cvs.openbsd.org: ports

2011-03-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2011/03/15 00:22:53

Modified files:
textproc/gtkaml: Makefile distinfo 

Log message:
Minor update to gtkaml-0.4.2.



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2011/03/15 00:24:47

Modified files:
x11/gnome/media: Makefile 
Added files:
x11/gnome/media/pkg: DESCR-glade3 DESCR-main PFRAG.shared-glade3 
 PFRAG.shared-main PLIST-glade3 PLIST-main 
Removed files:
x11/gnome/media/pkg: DESCR PFRAG.shared PLIST 

Log message:
Subackage this port into gnome-media and glade3-gnome-media. There is no
reason to force glade3 dependency on users who do not want/need the
gnome-media profiles catalog.

ok jasper@



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2011/03/15 00:54:26

Modified files:
net/openmdns   : Makefile 
net/openmdns/pkg: PLIST 
Added files:
net/openmdns/pkg: mdnsd.rc 

Log message:
Remove NO_REGRESS.
Add rc script.



ARMAQ SA la empresa más surtida en armas y municiones del Perú. publicidad do pon

2011-03-15 Thread ARMAQ S.A.

[demime 1.01d removed an attachment of type image/jpeg which had a name of 
nmortifera.jpg]

[demime 1.01d removed an attachment of type image/jpeg which had a name of 
nnaturismo.jpg]

[demime 1.01d removed an attachment of type image/jpeg which had a name of 
ninmutativo.jpg]

[demime 1.01d removed an attachment of type image/jpeg which had a name of 
ballestazo.jpg]



Sélection d'annonces Grande couronne Ile de France - Le centre d'affaires : oui à la liberté

2011-03-15 Thread BureauxLocaux.com
Si vous ne lisez pas correctement ce message, cliquez-ici

BureauxLocaux.com

Votre lettre du 15 mars 2011

Alerte e-mail Envoyer ` un ami

[IMAGE]

[IMAGE]

[IMAGE]

Le centre d'affaires : oui ` la liberti

Signer un bail 3/6/9 impose de nombreuses contraintes. Il faut fournir
diverses garanties bancaires, financer une caution souvent importante,
s'engager pour au moins trois ans sur des locaux de mjme nature, de mjme
taille, engager de nombreux frais d'installation etc. Autant
d'obligations pas toujours faciles ` assumer. Certaines entreprises ont
ainsi recours ` une solution qui offre plus de souplesse : le centre
d'affaires.

Voir le dossier

[IMAGE] Comme ` l'httel [IMAGE] Une question d'image et de convivialiti
[IMAGE] 3 questions ` Olivier de Lavalette, Directeur Giniral Regus pour
la rigion Europe du Sud

[IMAGE]

OZ ALU, spicialiste de la cloison aluminiumFabricant de cloison aluminium
depuis plus de 35 ans, OZ Alu distribue une large gamme de produits, de
l'ossature aluminium ` toute l'offre complimentaire nicessaire au montage
de la cloison, auprhs de professionnels de l'agencement tertiaires et
industriels.en savoir plus...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

Location Bureaux MARNE LA VALLEE

Ce centre d'affaires est installi dans le nouveau parc d'entreprises Val
d'Europe qui s'itend sur 180 ha. Une fois termini, ce parc offrira 660
000 m2 de bureaux, de mjme qu'une panoplie de services d'assistance. Le
centre se situe ` 20/30 minutes du centre de Paris et ` proximiti de la
gare RER et de l'autoroute A4.

Voir l'annonce

Surface totale

:

1 m2

Surface minimale

:

8 m2

Disponibiliti

:

Immidiate

[IMAGE]

Ensemble, innovons et aminageons vos bureauxSpicialiste des travaux de
second =uvre, CloisonPlaf intervient depuis la conception du projet,
jusqu'` sa rialisation. Nous vous proposons toutes les solutions pour
l'agencement et le cloisonnement de vos locaux professionnels.en savoir
plus...

[IMAGE]

[IMAGE]

[IMAGE]

Bureaux MANTES-LA-JOLIE

Zone Franche Urbaine. Ce ptle dynamique situi ` seulement 35 minutes de
Paris et de Rouen, la ville de Mantes-la-Jolie offre tous les avantages
d'une ville de province en rigion parisienne sur les rives de la Seine...

Voir l'annonce

[IMAGE]

[IMAGE]

Location Bureaux Entreptts VILLEBON SUR YVETTE

Immeuble mixte (bureaux et activitis). Possibilitis de division
Bail : 3,6,9

Voir l'annonce

[IMAGE]

[IMAGE]

Location Bureaux PARIS

Regus Roissy est le centre d'affaires de l'airoport international Roissy
Charles de Gaulle. Il propose 2 itages entiers de bureaux iquipis et
salles de riunions (soit environ 1500 m2). Il est situi ` l'intirieur
d'un immeuble...

Voir l'annonce

[IMAGE]

[IMAGE]

[IMAGE]

CHAMPS SUR MARNE : ` louer/` vendre Bureaux
563m2 (` partir de 277m2), Au coeur de la Citi Descartes, agriable
ptle...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

MANTES-LA-JOLIE : ` louer Entreptts
2500m2 (` partir de 11m2), Zone Franche Urbaine. Un ptle dynamique en
Zone...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

COURCOURONNES : ` louer/` vendre Bureaux
170m2, Dans un immeuble de trhs bon standing

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

PONTOISE : ` louer Bureaux-Entreptts
450m2 (` partir de 15m2), SOMAG - Immeubles de bureaux dans un cadre de
verdure...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

COMBS LA VILLE : ` louer Bureaux
128m2, Situi dans parc d'activiti possidant un acchs et une sortie direct
avec...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

LE PECQ : ` louer Bureaux
529m2 (` partir de 81m2), Au sein du parc technologique du Pecq.
Bureaux...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

LE PLESSIS PATE : ` louer Entreptts
18813m2 (` partir de 9254m2), Deux cellules composie de 4 travies
identiques...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

ERAGNY SUR OISE : ` louer Bureaux
110m2 (` partir de 20m2), LE SUNSET - Immeuble de bureaux au coeur de la
zone...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

LOGNES : ` louer/` vendre Bureaux
171m2, Dans un environnement paysagi, bureaux lumineux de 171.20 m2
avec...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

VERSAILLES : ` louer Bureaux
589m2 (` partir de 175m2), Dans un immeuble de bon standing situi dans
un...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

GIF SUR YVETTE : ` louer Bureaux
1071m2 (` partir de 263m2), Cbblage Informatique R J 45 Cloisons
amovibles Faux...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

BEZONS : ` louer/` vendre Bureaux
2428m2 (` partir de 607m2), Un immeuble ` forte image en front de Seine.

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

SAINT THIBAULT DES VIGNES : ` louer Bureaux
200m2, SAINT THIBAULT DES VIGNES. Bureau cloisonni de 200m2, situi dans
un site...

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

[IMAGE]

LE MESNIL-LE-ROI : ` louer Bureaux
368m2, Bureaux LE MESNIL LE ROI ` louer 368 m2 -sanitaires -parkings (7)
...

[IMAGE]

[IMAGE]

Offres de franchise sur l'Observatoire de la franchise

Trouvez la prochaine adresse de votre entreprise parmi plusieurs milliers
d'annonces de bureaux, 

CVS: cvs.openbsd.org: ports

2011-03-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2011/03/15 04:02:59

Modified files:
lang/mono  : Makefile 

Log message:
Use the converters/libiconv MODULE.



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 04:38:57

Modified files:
games/tornado  : Makefile distinfo 
games/tornado/patches: patch-Makefile 
games/tornado/pkg: PLIST 

Log message:
- update net/tornado to 1.4
- fix homepage
- specify license version
- regen plist

from gleydson soares



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2011/03/15 07:22:07

Modified files:
devel  : Makefile 

Log message:
+mm-common



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 07:30:39

Modified files:
x11/sawfish: Makefile distinfo 
x11/sawfish/pkg: MESSAGE PLIST 
Added files:
x11/sawfish/patches: patch-themes_Makefile_in 

Log message:
- update sawfish to 1.8.0

Please note that if you're upgrade from 1.7.1 you may need to migrate
your configuration if you're using Infinite-desktop or edge-flip.



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2011/03/15 07:44:10

Modified files:
devel/glib2mm  : Makefile distinfo 
devel/glib2mm/pkg: PLIST 

Log message:
Update to glib2mm-2.27.96.



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2011/03/15 07:49:44

Modified files:
net/samba  : Makefile distinfo 
net/samba/patches: patch-Makefile_in patch-configure_in 

Log message:
update to 3.5.8, ok aja@ giovanni@ Ian McWilliam (maintainer)



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2011/03/15 09:43:53

Modified files:
x11/gtk+3  : Makefile 

Log message:
Add x11/gtk+2 to build depends, fails otherwise because it can't find
gtk-update-icon-cache.



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2011/03/15 10:03:57

Added files:
graphics/shotwell/patches: patch-src_CheckerboardLayout_vala 

Log message:
Unbreak after vala 0.10.4 update.
cf http://trac.yorba.org/ticket/3337



CVS: cvs.openbsd.org: ports

2011-03-15 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2011/03/15 10:08:20

Modified files:
www/php-predis : Makefile distinfo 

Log message:
Update to predis-0.6.5



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:40:04

Modified files:
x11/e17/edje   : Makefile distinfo 
x11/e17/edje/patches: patch-src_lib_edje_edit_c 
x11/e17/edje/pkg: PLIST 
Removed files:
x11/e17/edje/patches: patch-src_bin_edje_cc_parse_c 

Log message:
update edje to 1.0.0

ok laurent@ (MAINTAINER)



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:41:31

Modified files:
x11/e17/evas   : Makefile distinfo 
x11/e17/evas/patches: patch-configure 

Log message:
- update evas to 1.0.0

ok laurent@ (MAINTAINER)



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:41:00

Modified files:
x11/e17/efreet : Makefile distinfo 
x11/e17/efreet/patches: patch-src_bin_Makefile_in 
x11/e17/efreet/pkg: PLIST 
Added files:
x11/e17/efreet/patches: patch-src_Makefile_in 

Log message:
- update efreet to 1.0.0

ok laurent@ (MAINTAINER)



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:42:04

Modified files:
x11/e17: Makefile.inc 

Log message:
- comment left over debug flavor bits

from brad
ok laurent@ (MAINTAINER)



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:47:10

Modified files:
www/p5-HTML-Tidy: Makefile distinfo 
Removed files:
www/p5-HTML-Tidy/patches: patch-Makefile_PL 

Log message:
- update p5-HTML-Tidy to 1.54
* switches to tidyp

maintainer timed-out
ok sthen@



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:49:42

Modified files:
graphics/enblend-enfuse: Makefile 
lang/php   : Makefile.inc 
www/php5/extensions: Makefile 
www/wml: Makefile 
Added files:
lang/php/5.2/patches: patch-ext_tidy_config_m4 
  patch-ext_tidy_tidy_c 
lang/php/5.3/patches: patch-ext_tidy_config_m4 
  patch-ext_tidy_tidy_c 
www/php5/extensions/patches: patch-ext_tidy_config_m4 
 patch-ext_tidy_tidy_c 

Log message:
- switch from www/tidy to www/tidyp which is API compatible

ok sthen@



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:50:11

Modified files:
infrastructure/plist: arm i386 powerpc sparc64 

Log message:
replace www/tidy with www/tidyp



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:50:53

Modified files:
www: Makefile 
Removed files:
www/tidy   : Makefile distinfo 
www/tidy/patches: patch-build_gmake_Makefile 
  patch-include_platform_h 
www/tidy/pkg   : DESCR PFRAG.shared PLIST 

Log message:
be gone...unmaintained tidy, superseded by tidyp!

ok sthen@



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 13:51:18

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
tidy - tidyp

ok sthen@



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2011/03/15 14:27:14

Added files:
sysutils/sleuthkit/patches: patch-tools_srchtools_sigfind_cpp 

Log message:
Fix build after daddr_t removal, use daddr64_t instead.
hints from thib@, thanks!



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2011/03/15 14:39:58

Modified files:
cad/fritzing   : Makefile 
cad/fritzing/patches: patch-phoenix_pro 
Added files:
cad/fritzing/patches: patch-pri_utils_pri 

Log message:
- don't use the internal boost copy

from fedora



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2011/03/15 14:51:26

Modified files:
sysutils/sleuthkit/patches: patch-tools_srchtools_sigfind_cpp 

Log message:



Re: CVS: cvs.openbsd.org: ports

2011-03-15 Thread Landry Breuil
On Tue, Mar 15, 2011 at 02:51:26PM -0600, Landry Breuil wrote:
 CVSROOT:  /cvs
 Module name:  ports
 Changes by:   lan...@cvs.openbsd.org  2011/03/15 14:51:26
 
 Modified files:
   sysutils/sleuthkit/patches: patch-tools_srchtools_sigfind_cpp 
 
 Log message:

Darn. This should have read 'add a reminder comment as to why we replace
daddr_t by daddr64_t, and that patch should be removed when daddr64_t
goes away'



CVS: cvs.openbsd.org: ports

2011-03-15 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2011/03/15 15:10:13

Modified files:
archivers/gtar : Makefile distinfo 
archivers/gtar/patches: patch-configure 
Added files:
archivers/gtar/patches: patch-tests_sparse04_at 
Removed files:
archivers/gtar/patches: patch-gnu_fdopendir_c patch-src_create_c 
patch-src_incremen_c patch-src_names_c 

Log message:
update to bugfix release 1.26



Re: [Update] archivers/p7zip 9.20

2011-03-15 Thread Giovanni Bechis
On 03/14/11 00:19, Josh Grosse wrote:
 On Sun, Mar 13, 2011 at 09:49:24PM +, Stuart Henderson wrote:
 
 What happened with rar?
  
 Good catch!  I hadn't noticed this.  
 
Diff to add unrar support and to remove USE_GROFF (just a couple of
warnings).
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile15 Nov 2010 00:22:45 -  1.14
+++ Makefile15 Mar 2011 07:52:43 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 9.13
+V= 9.20
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
@@ -24,7 +24,7 @@ PERMIT_DISTFILES_CDROM=   no fee
 PERMIT_DISTFILES_FTP=  Yes 
 
 WANTLIB-main=  c m pthread stdc++
-WANTLIB-rar=   pthread
+WANTLIB-rar=   m stdc++ pthread
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=  .tar.bz2
@@ -36,7 +36,6 @@ RUN_DEPENDS-rar= ${BASE_PKGPATH},-main
 WRKDIST=   ${WRKDIR}/p7zip_${V}
 
 USE_GMAKE= Yes
-USE_GROFF =Yes
 MAKE_FILE= makefile
 MAKE_FLAGS=MYCC=${CC} MYCXX=${CXX} \
MYCFLAGS=${CFLAGS} MYCXXFLAGS=${CXXFLAGS}
@@ -46,7 +45,6 @@ REGRESS_TARGET=   all_test
 
 do-configure:
cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
-   cp ${WRKSRC}/makefile.parallel_jobs ${WRKSRC}/makefile
 
 do-install:
@cd ${WRKBUILD}  ${SETENV} ${MAKE_ENV} PREFIX=${TRUEPREFIX} \
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo20 Jun 2010 15:54:35 -  1.11
+++ distinfo15 Mar 2011 07:52:43 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_9.13_src_all.tar.bz2) = jdtQU9s7HyaWQH0BvhRXeQ==
-RMD160 (p7zip_9.13_src_all.tar.bz2) = vrkYEzD036dapPRzxopGLHa3qxk=
-SHA1 (p7zip_9.13_src_all.tar.bz2) = gdoHKVYc4SPAqCZW7JagStW/pSI=
-SHA256 (p7zip_9.13_src_all.tar.bz2) = 
/JwPouq9Nn1q28PqB7swXb3B9ocX7qNiyMB0uRwD2SM=
-SIZE (p7zip_9.13_src_all.tar.bz2) = 3753579
+MD5 (p7zip_9.20_src_all.tar.bz2) = t7e8YAO4Hq8ClJJ4bhef2g==
+RMD160 (p7zip_9.20_src_all.tar.bz2) = q3Z1xMqHzoVazAWFUygIHBs2XRw=
+SHA1 (p7zip_9.20_src_all.tar.bz2) = yXbfRUPqlGplvD9ePU6bqkF+XxI=
+SHA256 (p7zip_9.20_src_all.tar.bz2) = 
Ysc78r2b6Cjhc8brEXIo0cnXxna893632ZAXGbyE6xM=
+SIZE (p7zip_9.20_src_all.tar.bz2) = 3836127
Index: patches/patch-install_sh
===
RCS file: /cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-install_sh
--- patches/patch-install_sh10 Jun 2008 03:24:38 -  1.2
+++ patches/patch-install_sh15 Mar 2011 07:52:43 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-install_sh,v 1.2 2008/06/10 03:24:38 sthen Exp $
 install.sh.origSun Mar  2 13:35:05 2008
-+++ install.sh Mon Jun  9 20:27:58 2008
-@@ -1,14 +1,14 @@
- #! /bin/sh
+--- install.sh.origWed Feb 23 21:00:34 2011
 install.sh Mon Mar 14 21:47:48 2011
+@@ -17,14 +17,14 @@ installShared()
+ }
  
  # global install
 -DEST_HOME=/usr/local
@@ -18,7 +18,21 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
  [ $1 ]  DEST_BIN=$1
  [ $2 ]  DEST_SHARE=$2
  [ $3 ]  DEST_MAN=$3
-@@ -163,10 +163,10 @@ fi
+@@ -103,6 +103,13 @@ then
+ chmod 555 ${DEST_DIR}${DEST_SHARE}/7z.so
+   fi
+ 
++  if [ -x bin/Codecs/Rar29.so ]
++  then
++mkdir ${DEST_DIR}${DEST_SHARE}/Codecs
++cp bin/Codecs/Rar29.so ${DEST_DIR}${DEST_SHARE}/Codecs/Rar29.so
++chmod 555 ${DEST_DIR}${DEST_SHARE}/Codecs/Rar29.so
++  fi
++
+ else
+   if [ -x bin/7za ]
+   then
+@@ -167,11 +174,11 @@ fi
  
  if [ -d DOCS ]
  then
@@ -33,3 +47,4 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
 +  find ${DEST_DIR}${DEST_SHARE_DOC} -type f -exec chmod 444 {} \;
  fi
  
+ use_lang=n
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main  30 Nov 2008 22:24:54 -  1.6
+++ pkg/PLIST-main  15 Mar 2011 07:52:43 -
@@ -40,6 +40,7 @@ share/doc/p7zip/MANUAL/switches/charset.
 share/doc/p7zip/MANUAL/switches/exclude.htm
 share/doc/p7zip/MANUAL/switches/include.htm
 share/doc/p7zip/MANUAL/switches/index.htm
+share/doc/p7zip/MANUAL/switches/large_pages.htm
 share/doc/p7zip/MANUAL/switches/list_tech.htm
 share/doc/p7zip/MANUAL/switches/method.htm
 share/doc/p7zip/MANUAL/switches/output_dir.htm


Re: NEW: textproc/groff-1.21

2011-03-15 Thread Christian Weisgerber
Ingo Schwarze schwa...@usta.de wrote:

 Note that groff-1.20 still built with standard make,
 but groff-1.21 wants gmake, or the build silently fails
 to build libgnu.a, which causes the troff and grotty binaries
 to be missing in the end.

It has come to accidentally depend on MAKEOVERRIDES, a GNU make
extension that prevents the recursive passing of command line
assignments to sub-makes.  Specifically, we must not pass overrides
like top_srcdir=... to the sub-makes called in src/libs/gnulib where
those variables have different values created by the sub-configure
there.

It took me forever to figure that one out.


diff -uNr groff.orig/Makefile groff/Makefile
--- groff.orig/Makefile Mon Mar 14 01:50:29 2011
+++ groff/Makefile  Tue Mar 15 01:08:25 2011
@@ -17,7 +17,6 @@
 
 MASTER_SITES = ${MASTER_SITE_GNU:=groff/}
 
-USE_GMAKE =Yes
 MAKE_FLAGS +=  docdir=${PREFIX}/share/doc/groff \
exampledir=${PREFIX}/share/examples/groff
 
diff -uNr groff.orig/patches/patch-Makefile_in groff/patches/patch-Makefile_in
--- groff.orig/patches/patch-Makefile_inThu Jan  1 01:00:00 1970
+++ groff/patches/patch-Makefile_in Tue Mar 15 01:21:14 2011
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig   Tue Mar 15 01:08:46 2011
 Makefile.inTue Mar 15 01:19:09 2011
+@@ -686,7 +686,7 @@ subdir=src/roff/troff
+ 
+ 
+ $(TARGETS):
+-  @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) do=$@ $(dodirs)
++  @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(dodirs)
+ 
+ dot: FORCE
+   @$(ENVSETUP); \
-- 
Christian naddy Weisgerber  na...@mips.inka.de



re emacs23 update

2011-03-15 Thread Mike Belopuhov
re,

it turns out that SIGIO handling in emacs incorporates too many
workarounds, especially when running under X and at this point
it's impossible (at least for me) to grasp through the code and
find why it fails to work with xcb or X in general.

but fortunately there's a tweak (DISABLE_SIGIO) that makes it
use poll exclusively and fixes everything!

and also, there's an emacs 23.3 released already.

cheers.

--- src/s/openbsd.h~Tue Mar 15 11:56:59 2011
+++ src/s/openbsd.h Tue Mar 15 11:57:25 2011
@@ -36,5 +36,7 @@
 
 #endif
 
+#define BROKEN_SIGIO
+
 /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
(do not change this comment) */



libvorbisfile.so.6.0 - undefined symbols

2011-03-15 Thread Dmitrij D. Czarkoff
Hello!

While trying to build a game I faced an issue with libvorbis.

The configure script of the game checks sdl-mixer by compiling and running
following test program:

#include SDL/SDL_mixer.h
#include stdio.h

int main()
{
if
(!Mix_LoadMUS(file.ogg))
return -1;
return 0;
}

The programs compiles OK, but fails to run. On compiling it manually and
running it manually I get the following output:

./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'vorbis_info_clear'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_wrote'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_reset'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'vorbis_synthesis_headerin'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'ogg_page_granulepos'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'vorbis_info_blocksize'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_stream_reset'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_pageseek'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'ogg_page_continued'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'ogg_stream_reset_serialno'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'vorbis_comment_clear'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'vorbis_synthesis_halfrate'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'vorbis_synthesis_restart'
./test./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'vorbis_synthesis_idheader'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_clear'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_page_bos'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'vorbis_dsp_clear'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_page_serialno'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'vorbis_block_init'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'vorbis_synthesis_blockin'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_buffer'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'vorbis_synthesis'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'vorbis_window'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
'vorbis_block_clear'

What does that mean and what can I do to sove issue?

Thanks in advance.

-- 
Dmitrij D. Czarkoff



Re: UPDATE: mplayer 20110303

2011-03-15 Thread David Coppa
On Mon, Mar 7, 2011 at 5:36 PM, Christian Weisgerber na...@mips.inka.de wrote:
 Edd Barrett vex...@gmail.com wrote:

 Tested on amd64 with smplayer and gnome-mplayer (not the version just 
 posted).
 Also tested basic functionality on sparc64.

 Yes, various audio formats (MP3, AAC, Vorbis, FLAC, Shorten) play
 fine on sparc64.  My Blade 100 is headless and really too slow to
 play video over the network, but Xvid is decoded correctly and works
 with generous frame dropping.

Btw, are there any other reasons to delay this update?

It's OK for me so far, with my usual mplayer usage cases...

cheers
David



Re: UPDATE: mplayer 20110303

2011-03-15 Thread David Coppa
On Sun, 06 Mar 2011, Edd Barrett wrote:

 On Sun, Mar 06, 2011 at 06:35:06PM +, Christian Weisgerber wrote:
  Edd Barrett vex...@gmail.com wrote:
  
   An update to mplayer.
 
 For the archives, this is what I have so far -- with README formatting done 
 and
 a small (hopefully to grow) paragraph on mencoder test cases.
 
 I think there is going to be an attempt to dynamically link ffmpeg, however it
 needs to be brought up to date first.

Hi, 

Since As a general rule, we prefer to use FFMPEG implementations, 
but only if they are good quality, I think we can safely drop 
LIVE555 support here, as ffmpeg supports more streams than 
live555.

This was also suggested by a mplayer dev here:
http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1715

I've tested it on my machine and it works fine...

$ mplayer ffmpeg://rtsp://64.202.98.91:554/gs.sdp
MPlayer SVN-r33017-snapshot-4.2.1 (C) 2000-2011 MPlayer Team

Playing ffmpeg://rtsp://64.202.98.91:554/gs.sdp.
Invalid seek to negative position!
libavformat file format detected.
[rtsp @ 0x805800c0] Estimating duration from bitrate, this may be inaccurate
[lavf] stream 0: audio (aac), -aid 0
Clip info:
 title: Groove Salad from SomaFM [aacPlus]
 comment: Downtempo Ambient Groove
==
Opening audio decoder: [ffmpeg] FFmpeg/libavcodec audio decoders
AUDIO: 44100 Hz, 2 ch, s16le, 0.0 kbit/0.00% (ratio: 0-176400)
Selected audio codec: [ffaac] afm: ffmpeg (FFmpeg AAC (MPEG-2/MPEG-4 Audio))
==
AO: [sndio] 44100Hz 2ch s16le (2 bytes per sample)
Video: no video
Starting playback...
A:   0.0 (00.0) of 0.0 (unknown) 93.4%


Here's a diff over your latest diff. Ok?

--- Makefile.orig
+++ Makefile
@@ -58,8 +58,7 @@
multimedia/x264=20101023 \
multimedia/libvpx
 
-BUILD_DEPENDS =net/livemedia \
-   audio/rtunes=0.8 \
+BUILD_DEPENDS =audio/rtunes=0.8 \
textproc/libxml \
textproc/libxslt \
textproc/docbook \
@@ -120,7 +119,8 @@
--disable-libopenjpeg \
--disable-mpg123 \
--disable-librtmp \
-   --disable-faad
+   --disable-faad \
+   --disable-live
 
 # internal tremor, external tremor, external libvorbis all conflict
 # we choose libvorbis to enable encoding to vorbis



Re: re emacs23 update

2011-03-15 Thread Manuel Giraud
Mike Belopuhov m...@crypt.org.ru writes:

 re,

 it turns out that SIGIO handling in emacs incorporates too many
 workarounds, especially when running under X and at this point
 it's impossible (at least for me) to grasp through the code and
 find why it fails to work with xcb or X in general.

 but fortunately there's a tweak (DISABLE_SIGIO) that makes it
 use poll exclusively and fixes everything!

 and also, there's an emacs 23.3 released already.

 cheers.

Thank you. I'll update the port with 23.3, your patch and others'
comments and repost ASAP.

Just out of curiousity, how did you trace such bug? I ended up lost in
uthread lib.

-- 
Manuel Giraud



Re: UPDATE: mplayer 20110303

2011-03-15 Thread Landry Breuil
On Tue, Mar 15, 2011 at 02:10:06PM +0100, David Coppa wrote:
 On Sun, 06 Mar 2011, Edd Barrett wrote:
 
  On Sun, Mar 06, 2011 at 06:35:06PM +, Christian Weisgerber wrote:
   Edd Barrett vex...@gmail.com wrote:
   
An update to mplayer.
  
  For the archives, this is what I have so far -- with README formatting done 
  and
  a small (hopefully to grow) paragraph on mencoder test cases.
  
  I think there is going to be an attempt to dynamically link ffmpeg, however 
  it
  needs to be brought up to date first.
 
 Hi, 
 
 Since As a general rule, we prefer to use FFMPEG implementations, 
 but only if they are good quality, I think we can safely drop 
 LIVE555 support here, as ffmpeg supports more streams than 
 live555.
 
 This was also suggested by a mplayer dev here:
 http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1715

Make sure that the tv-over-ip service provided by free isp in france
still works.. in the past i've found it picky as to live555 usage.
anyone can test that ?

Landry



Re: [Update] archivers/p7zip 9.20

2011-03-15 Thread Josh Grosse
On Tue, Mar 15, 2011 at 08:47:12AM +0100, Giovanni Bechis wrote:

 Diff to add unrar support and to remove USE_GROFF (just a couple of
 warnings).

Thank you, Giovanni.  Am waiting on upstream for an answer.  There's an
open problem report from a Linux user on this as well.  No response yet.



Re: re emacs23 update

2011-03-15 Thread David Coppa
On Tue, Mar 15, 2011 at 12:26 PM, Mike Belopuhov m...@crypt.org.ru wrote:
 re,

 it turns out that SIGIO handling in emacs incorporates too many
 workarounds, especially when running under X and at this point
 it's impossible (at least for me) to grasp through the code and
 find why it fails to work with xcb or X in general.

 but fortunately there's a tweak (DISABLE_SIGIO) that makes it
 use poll exclusively and fixes everything!

 and also, there's an emacs 23.3 released already.

 cheers.

 --- src/s/openbsd.h~    Tue Mar 15 11:56:59 2011
 +++ src/s/openbsd.h     Tue Mar 15 11:57:25 2011
 @@ -36,5 +36,7 @@

  #endif

 +#define BROKEN_SIGIO
 +
  /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
    (do not change this comment) */

Good catch!

thank you,
David



Re: UPDATE: mplayer 20110303

2011-03-15 Thread David Coppa
On Tue, Mar 15, 2011 at 3:24 PM, Landry Breuil lan...@rhaalovely.net wrote:

 Make sure that the tv-over-ip service provided by free isp in france
 still works.. in the past i've found it picky as to live555 usage.
 anyone can test that ?

Last time I've heard from Antoine about that, it was not working with
ffmpeg but it was even worse with live555 (segfault).

ciao
david



Re: re emacs23 update

2011-03-15 Thread Mike Belopuhov
On Tue, Mar 15, 2011 at 3:17 PM, Manuel Giraud
manuel.gir...@univ-nantes.fr wrote:
 Mike Belopuhov m...@crypt.org.ru writes:

 re,

 it turns out that SIGIO handling in emacs incorporates too many
 workarounds, especially when running under X and at this point
 it's impossible (at least for me) to grasp through the code and
 find why it fails to work with xcb or X in general.

 but fortunately there's a tweak (DISABLE_SIGIO) that makes it
 use poll exclusively and fixes everything!


it's BROKEN_SIGIO not DISABLE_SIGIO.  the diff is correct.

 and also, there's an emacs 23.3 released already.

 cheers.

 Thank you. I'll update the port with 23.3, your patch and others'
 comments and repost ASAP.

 Just out of curiousity, how did you trace such bug? I ended up lost in
 uthread lib.


i used gdb, ktrace, read some pthread, xcb and kernel code.
in fact i got a crash on emacs22 with erlang running in the inferior
mode and that provided a hint about SIGIO handling.

 --
 Manuel Giraud




Re: libvorbisfile.so.6.0 - undefined symbols

2011-03-15 Thread Jacob Meuser
On Tue, Mar 15, 2011 at 12:22:23PM +0100, Dmitrij D. Czarkoff wrote:
 Hello!
 
 While trying to build a game I faced an issue with libvorbis.
 
 The configure script of the game checks sdl-mixer by compiling and running
 following test program:
 
 #include SDL/SDL_mixer.h
 #include stdio.h
 
 int main()
 {
 if
 (!Mix_LoadMUS(file.ogg))
 return -1;
 return 0;
 }
 
 The programs compiles OK, but fails to run. On compiling it manually and
 running it manually I get the following output:
 
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_info_clear'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_wrote'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_reset'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_synthesis_headerin'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'ogg_page_granulepos'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_info_blocksize'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'ogg_stream_reset'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'ogg_sync_pageseek'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'ogg_page_continued'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'ogg_stream_reset_serialno'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_comment_clear'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_synthesis_halfrate'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_synthesis_restart'
 ./test./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_synthesis_idheader'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_clear'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_page_bos'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_dsp_clear'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'ogg_page_serialno'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_block_init'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_synthesis_blockin'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_buffer'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_synthesis'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'vorbis_window'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_block_clear'
 
 What does that mean and what can I do to sove issue?

it means you didn't specify the right libraries to be linked.

pkg-config --libs vorbisfile


 Thanks in advance.
 
 -- 
 Dmitrij D. Czarkoff

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org



Re: NEW: textproc/groff-1.21

2011-03-15 Thread Christian Weisgerber
Ingo Schwarze schwa...@usta.de wrote:

 Build, install, usage, uninstall, reinstall tested on i386.

It is also fine on alpha (gcc3).
Can somebody verify that it builds with gcc2?

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



Re: libvorbisfile.so.6.0 - undefined symbols

2011-03-15 Thread Christian Weisgerber
Dmitrij D. Czarkoff czark...@gmail.com wrote:

 The programs compiles OK, but fails to run. On compiling it manually and
 running it manually I get the following output:
 
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
 'vorbis_info_clear'
 ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_wrote'

You need to link with -lvorbisfile -lvorbis -logg -lm.

A simple -lvorbisfile is not enough.

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



Re: UPDATE: mplayer 20110303

2011-03-15 Thread Roberto Fernandez
On Tue, Mar 15, 2011 at 03:30:39PM +0100, David Coppa wrote:
 On Tue, Mar 15, 2011 at 3:24 PM, Landry Breuil lan...@rhaalovely.net wrote:
 
  Make sure that the tv-over-ip service provided by free isp in france
  still works.. in the past i've found it picky as to live555 usage.
  anyone can test that ?
 
 Last time I've heard from Antoine about that, it was not working with
 ffmpeg but it was even worse with live555 (segfault).

As I'm running -outdated, I'll not comment on mplayer-20110303
but mplayer-20101024p2 works fine for me on free.fr's tv-over-ip

$ cat ~/.mplayer/config
softvol-max=500
prefer-ipv4=yes
zoom=yes
fs=yes
vf=kerndeint
hardframedrop=yes
cache=8192

$ cat ~/bin/fplay
#!/bin/sh
# this script takes channel_number as single argument
mixerctl outputs.master=200
#url=`ftp -o - http://mafreebox.freebox.fr/freeboxtv/playlist.m3u 2/dev/null 
|grep -A 1 ,$1  |grep 'flavour=ld'`
url=`ftp -o - http://mafreebox.freebox.fr/freeboxtv/playlist.m3u 2/dev/null 
|grep -A 1 ,$1  |grep 'flavour=sd'`
#url=`ftp -o - http://mafreebox.freebox.fr/freeboxtv/playlist.m3u 2/dev/null 
|grep -A 1 ,$1  |grep 'flavour=hd'`
echo URL: $url
mplayer $url



ports no such

2011-03-15 Thread ЧИМ
Сразу после установки хотел перейти в папку usr/ports/ но её не 
оказалось и мне в ответ выдалась ошибка. Где найти ports? Их перенесли?




Re: re emacs23 update

2011-03-15 Thread Manuel Giraud

Here's the new version of emacs 23 port. Tested and ok on i386 GENERIC.MP



emacs.tgz
Description: Unix tar archive

-- 
Manuel Giraud


iodine-0.5.2p1 resubmit

2011-03-15 Thread William Orr
Comments ? Ok ?

Resubmitting for inclusion since ports tree is unlocked:
Index: Makefile
===
RCS file: /cvs/ports/net/iodine/Makefile,v
retrieving revision 1.11
diff -N -u Makefile
--- Makefile3 Dec 2010 07:47:44 -   1.11
+++ Makefile15 Mar 2011 16:43:19 -
@@ -3,7 +3,7 @@
 COMMENT=   tunnel IPv4 data through DNS

 DISTNAME=  iodine-0.5.2
-REVISION=  0
+REVISION=  1
 CATEGORIES=net

 HOMEPAGE=  http://code.kryo.se/iodine/
? diff
Index: patches/patch-man_iodine_8
===
RCS file: patches/patch-man_iodine_8
diff -N -u patches/patch-man_iodine_8
--- /dev/null   15 Mar 2011 10:43:19 -
+++ patches/patch-man_iodine_8  15 Mar 2011 16:43:19 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- man/iodine.8.orig  Tue Jan  4 21:00:27 2011
 man/iodine.8   Tue Jan  4 21:01:53 2011
+@@ -103,10 +103,10 @@ Print usage info and exit.
+ Keep running in foreground.
+ .TP
+ .B -u user
+-Drop privileges and run as user 'user' after setting up tunnel.
++Drop privileges and run as user 'user' after setting up tunnel.
Default is _iodine.
+ .TP
+ .B -t chrootdir
+-Chroot to 'chrootdir' after setting up tunnel.
++Chroot to 'chrootdir' after setting up tunnel. Default is /var/empty.
+ .TP
+ .B -d device
+ Use the TUN device 'device' instead of the normal one, which is dnsX on Linux
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/iodine/pkg/PLIST,v
retrieving revision 1.3
diff -N -u pkg/PLIST
--- pkg/PLIST   30 Mar 2009 09:17:45 -  1.3
+++ pkg/PLIST   15 Mar 2011 16:43:19 -
@@ -4,3 +4,4 @@
 @man man/man8/iodine.8
 @bin sbin/iodine
 @bin sbin/iodined
+@rcscript ${RCDIR}/iodined
Index: pkg/iodined.rc
===
RCS file: pkg/iodined.rc
diff -N -u pkg/iodined.rc
--- /dev/null   15 Mar 2011 10:43:19 -
+++ pkg/iodined.rc  15 Mar 2011 16:43:19 -
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+daemon=${TRUEPREFIX}/bin/iodined
+
+. /etc/rc.d/rc.subr
+
+pexp=${daemon}
+
+rc_cmd $1

-- 
-Will Orr



Re: libvorbisfile.so.6.0 - undefined symbols

2011-03-15 Thread Jasper Lievisse Adriaanse
On Tue, Mar 15, 2011 at 02:53:47PM +, Christian Weisgerber wrote:
 Dmitrij D. Czarkoff czark...@gmail.com wrote:
 
  The programs compiles OK, but fails to run. On compiling it manually and
  running it manually I get the following output:
  
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_info_clear'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_sync_wrote'
 
 You need to link with -lvorbisfile -lvorbis -logg -lm.
 
 A simple -lvorbisfile is not enough.
 
 -- 
 Christian naddy Weisgerber  na...@mips.inka.de

Use pkg-config --libs vorbisfile :)

-- 
Cheers,
Jasper

Capable, generous men do not create victims, they nurture them.



Re: re emacs23 update

2011-03-15 Thread Matthew Dempsky
On Tue, Mar 15, 2011 at 9:35 AM, Manuel Giraud
manuel.gir...@univ-nantes.fr wrote:
 Here's the new version of emacs 23 port. Tested and ok on i386 GENERIC.MP

In post-install, since bin/emacs and bin/emacs-${VERSION} are hard
linked to the same file, you only need to chmod -t one of them.

Shouldn't you get rid of the REVISION-{el,main} = 0 lines too, since
it's a version bump?

Building on amd64 fails because of not finding tsang-b5.el.gz.  You'll
need to do something like:

post-install:
chmod -t ${PREFIX}/bin/emacs
.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == mips64
gzip -f ${PREFIX}/share/emacs/${VERSION}/leim/quail/tsang-b5.el

post-extract:
touch ${WRKSRC}/leim/quail/tsang-b5.el
.endif



Re: ports no such

2011-03-15 Thread David Coppa
2011/3/15 ЧИМ chim...@list.ru:
 Сразу после установки хотел перейти в папку usr/ports/ но её не оказалось и
 мне в ответ выдалась ошибка. Где найти ports? Их перенесли?

English, please.


Re: ports no such

2011-03-15 Thread Remi Pointel
On Tue, 15 Mar 2011 19:00:51 +0100
David Coppa dco...@gmail.com wrote:
 2011/3/15 ЧИМ chim...@list.ru:
  Сразу после установки хотел перейти в папку usr/ports/ но её не оказалось и
  мне в ответ выдалась ошибка. Где найти ports? Их перенесли?
 
 English, please.

Hi,
If my translator is correct, you will find the answers in the FAQ : 
http://www.openbsd.org/faq/faq15.html#Ports.
Cheers,
Remi.



Re: libvorbisfile.so.6.0 - undefined symbols

2011-03-15 Thread Brad

On 15/03/11 1:04 PM, Jasper Lievisse Adriaanse wrote:

On Tue, Mar 15, 2011 at 02:53:47PM +, Christian Weisgerber wrote:

Dmitrij D. Czarkoffczark...@gmail.com  wrote:


The programs compiles OK, but fails to run. On compiling it manually and
running it manually I get the following output:

./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'vorbis_info_clear'
./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_sync_wrote'


You need to link with -lvorbisfile -lvorbis -logg -lm.

A simple -lvorbisfile is not enough.

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


Use pkg-config --libs vorbisfile :)


Doesn't do any good for a pre-existing autoconf script.


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



Re: [new] sysutils/tarsnap

2011-03-15 Thread Joachim Schipper
On Mon, Mar 14, 2011 at 10:53:09PM +, Stuart Henderson wrote:
 On 2011/03/14 21:58, Joachim Schipper wrote:
  # Redistribution and use in source and binary forms, without modification, 
  is
  # permitted for the sole purpose of using the tarsnap backup service 
  provided
  # by Colin Percival. Also contains quite a bit of BSD/public domain stuff 
  and
  # some (copyrighted) manuals.
 
 If this goes in I'd like to see this comment trimmed a bit so that
 it's very clear that PERMIT_* must be changed if we add any patches.
 Maybe something like:
 
 # May only be used with the author's tarsnap service.
 # May not be modified.
 
 Also please @sample the config file into ${SYSCONFDIR}/tarsnap.conf

I've tweaked the port to incorporate your suggestions.

Note that this port cannot really be patched at all - the license
forbids using it with anything except tarsnap.com, and the tarsnap.com
terms of service forbid patched clients.

Joachim


tarsnap.tgz
Description: application/tar-gz


Re: re emacs23 update

2011-03-15 Thread Mike Belopuhov
On Tue, Mar 15, 2011 at 15:17 +0100, Manuel Giraud wrote:
 Mike Belopuhov m...@crypt.org.ru writes:
 
  re,
 
  it turns out that SIGIO handling in emacs incorporates too many
  workarounds, especially when running under X and at this point
  it's impossible (at least for me) to grasp through the code and
  find why it fails to work with xcb or X in general.
 
  but fortunately there's a tweak (DISABLE_SIGIO) that makes it
  use poll exclusively and fixes everything!
 
  and also, there's an emacs 23.3 released already.
 
  cheers.
 
 Thank you. I'll update the port with 23.3, your patch and others'
 comments and repost ASAP.
 
 Just out of curiousity, how did you trace such bug? I ended up lost in
 uthread lib.
 
 -- 
 Manuel Giraud

looks like this email didn't hit the list for some reason.
sorry if its a dup.

here's a fix for a fallout from the BROKEN_SIGIO change:
'emacs --batch -f byte-compile-file' fails after inactivity timer
fires up.  the solution is to restart fgets upon receiving EINTR.
afaik, read_minibuf_noninteractive is called only in the batch
mode.


--- src/minibuf.c~  Tue Mar 15 18:43:21 2011
+++ src/minibuf.c   Tue Mar 15 18:43:28 2011
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see http://www.gnu.org
 
 
 #include config.h
+#include errno.h
 #include stdio.h
 #include setjmp.h
 
@@ -306,12 +307,21 @@ read_minibuf_noninteractive (map, initial, prompt, bac
   size = 100;
   len = 0;
   line = (char *) xmalloc (size * sizeof *line);
-  while ((s = fgets (line + len, size - len, stdin)) != NULL
- (len = strlen (line),
-len == size - 1  line[len - 1] != '\n'))
+
+again:
+  if ((s = fgets (line + len, size - len, stdin)) != NULL)
 {
-  size *= 2;
-  line = (char *) xrealloc (line, size);
+  len = strlen (line);
+  if (len  0  line[len - 1] != '\n')
+   {
+ size *= 2;
+ line = (char *) xrealloc (line, size);
+ goto again;
+   }
+}
+  else if (errno == EINTR)
+{
+  goto again;
 }
 
   if (s)



Re: libvorbisfile.so.6.0 - undefined symbols

2011-03-15 Thread Jacob Meuser
On Tue, Mar 15, 2011 at 03:33:58PM +, Jacob Meuser wrote:
 On Tue, Mar 15, 2011 at 12:22:23PM +0100, Dmitrij D. Czarkoff wrote:
  Hello!
  
  While trying to build a game I faced an issue with libvorbis.
  
  The configure script of the game checks sdl-mixer by compiling and running
  following test program:
  
  #include SDL/SDL_mixer.h
  #include stdio.h
  
  int main()
  {
  if
  (!Mix_LoadMUS(file.ogg))
  return -1;
  return 0;
  }
  
  The programs compiles OK, but fails to run. On compiling it manually and
  running it manually I get the following output:
  
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_info_clear'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_sync_wrote'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_sync_reset'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_synthesis_headerin'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_page_granulepos'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_info_blocksize'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_stream_reset'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_sync_pageseek'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_page_continued'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_stream_reset_serialno'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_comment_clear'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_synthesis_halfrate'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_synthesis_restart'
  ./test./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_synthesis_idheader'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_sync_clear'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'ogg_page_bos'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_dsp_clear'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_page_serialno'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_block_init'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_synthesis_blockin'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'ogg_sync_buffer'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_synthesis'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 'vorbis_window'
  ./test:/usr/local/lib/libvorbisfile.so.6.0: undefined symbol 
  'vorbis_block_clear'
  
  What does that mean and what can I do to sove issue?
 
 it means you didn't specify the right libraries to be linked.
 
 pkg-config --libs vorbisfile

or since this is really about SDL_mixer,

pkg-config --libs SDL_mixer

will give you the libraries needed for linking with SDL_mixer.

 
 
  Thanks in advance.
  
  -- 
  Dmitrij D. Czarkoff
 
 -- 
 jake...@sdf.lonestar.org
 SDF Public Access UNIX System - http://sdf.lonestar.org

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org



Re: re emacs23 update

2011-03-15 Thread Mike Belopuhov
On Tue, Mar 15, 2011 at 12:26 +0100, Mike Belopuhov wrote:
 re,
 
 it turns out that SIGIO handling in emacs incorporates too many
 workarounds, especially when running under X and at this point
 it's impossible (at least for me) to grasp through the code and
 find why it fails to work with xcb or X in general.
 
 but fortunately there's a tweak (DISABLE_SIGIO) that makes it
 use poll exclusively and fixes everything!
 
 and also, there's an emacs 23.3 released already.
 
 cheers.
 
 --- src/s/openbsd.h~  Tue Mar 15 11:56:59 2011
 +++ src/s/openbsd.h   Tue Mar 15 11:57:25 2011
 @@ -36,5 +36,7 @@
  
  #endif
  
 +#define BROKEN_SIGIO
 +
  /* arch-tag: 7e3f65ca-3f48-4237-933f-2b208b21e8e2
 (do not change this comment) */

and a fix for a fallout from this change.
'emacs --batch -f byte-compile-file' fails after inactivity timer
fires up.  the solution is to restart fgets upon receiving EINTR.
afaik, read_minibuf_noninteractive is called only in the batch
mode.

--- src/minibuf.c~  Tue Mar 15 18:43:21 2011
+++ src/minibuf.c   Tue Mar 15 18:43:28 2011
@@ -20,6 +20,7 @@ along with GNU Emacs.  If not, see http://www.gnu.org
 
 
 #include config.h
+#include errno.h
 #include stdio.h
 #include setjmp.h
 
@@ -306,12 +307,21 @@ read_minibuf_noninteractive (map, initial, prompt, bac
   size = 100;
   len = 0;
   line = (char *) xmalloc (size * sizeof *line);
-  while ((s = fgets (line + len, size - len, stdin)) != NULL
- (len = strlen (line),
-len == size - 1  line[len - 1] != '\n'))
+
+again:
+  if ((s = fgets (line + len, size - len, stdin)) != NULL)
 {
-  size *= 2;
-  line = (char *) xrealloc (line, size);
+  len = strlen (line);
+  if (len  0  line[len - 1] != '\n')
+   {
+ size *= 2;
+ line = (char *) xrealloc (line, size);
+ goto again;
+   }
+}
+  else if (errno == EINTR)
+{
+  goto again;
 }
 
   if (s)



Re: autoconf/m4 [was Re: New www/libmicrohttpd]

2011-03-15 Thread Nigel Taylor
On 03/10/11 16:28, Stuart Henderson wrote:
 good find.
 
 after reading posix 2008 on this it isn't clear to me what is
 specified, but GNU m4 is clear in the documentation that _they_
 apply it non-recursively.
 
 http://pubs.opengroup.org/onlinepubs/9699919799/utilities/m4.html
 http://www.gnu.org/software/m4/manual/html_node/Translit.html
 
 so imo we definitely want this for -g mode and need to consider
 carefully whether to do it always (in which case the comment above
 the start of map(), which explains why this is done, would also
 need adjusting).
 
 the following from MirOS may also be of interest:
 
 http://junkpile.org/14.patch fix trace lineno output for 'macro\n'
 http://junkpile.org/15.patch let 'errprint' in 'm4 -g' mode behave like GNU
 http://junkpile.org/16.patch fix another line number problem
 
 i'll try and have a play with this and hopefully Marc will
 have some time to look at it soon.
 
 

I had a look a MirOS m4, I tried using their version from cvs for a comparison.
This test case goes into infinate loop. translit(`abcdef', `aabdef', `bcged')

I had a look through the patches from MirOS, tried running the MirOS m4 vs GNU
m4 found the issue with trace lineno output are still there.

Attached includes previous fix, and also fixes lineno / filename issues. Tried
www/libmicrohttpd port with autoconf v2.64, v2.65, v2.67, v2.68 all worked.
Autoconf regression test failures have been reduced.

Regards

Nigel Taylor


Index: usr.bin/m4/eval.c
===
RCS file: /home/cvs/src/usr.bin/m4/eval.c,v
retrieving revision 1.68
diff -u -p -r1.68 eval.c
--- usr.bin/m4/eval.c   7 Sep 2010 19:58:09 -   1.68
+++ usr.bin/m4/eval.c   15 Mar 2011 13:44:47 -
@@ -63,13 +63,13 @@ static int  doincl(const char *);
 static int dopaste(const char *);
 static voiddochq(const char *[], int);
 static voiddochc(const char *[], int);
-static voiddom4wrap(const char *);
+static voiddom4wrap(const char *, unsigned long, const char *);
 static voiddodiv(int);
 static voiddoundiv(const char *[], int);
 static voiddosub(const char *[], int);
 static voidmap(char *, const char *, const char *, const char *);
 static const char *handledash(char *, char *, const char *);
-static voidexpand_builtin(const char *[], int, int);
+static voidexpand_builtin(const char *[], int, int, unsigned long, const 
char *);
 static voidexpand_macro(const char *[], int);
 static voiddump_one_def(const char *, struct macro_definition *);
 
@@ -95,7 +95,7 @@ unsigned long expansion_id;
  * argc is 3 for macro-or-builtin() and 2 for macro-or-builtin
  */
 void
-eval(const char *argv[], int argc, int td, int is_traced)
+eval(const char *argv[], int argc, int td, int is_traced, unsigned long 
trlineno, const char *curfname)
 {
size_t mark = SIZE_MAX;
 
@@ -103,11 +103,11 @@ eval(const char *argv[], int argc, int t
if (td  RECDEF)
m4errx(1, expanding recursive definition for %s., argv[1]);
if (is_traced)
-   mark = trace(argv, argc, infile+ilevel);
+   mark = trace(argv, argc, infile+ilevel, trlineno, curfname);
if (td == MACRTYPE)
expand_macro(argv, argc);
else
-   expand_builtin(argv, argc, td);
+   expand_builtin(argv, argc, td, trlineno, curfname);
if (mark != SIZE_MAX)
finish_trace(mark);
 }
@@ -116,7 +116,7 @@ eval(const char *argv[], int argc, int t
  * expand_builtin - evaluate built-in macros.
  */
 void
-expand_builtin(const char *argv[], int argc, int td)
+expand_builtin(const char *argv[], int argc, int td, unsigned long trlineno, 
const char *curfname)
 {
int c, n;
int ac;
@@ -424,8 +424,8 @@ expand_builtin(const char *argv[], int a
 */
if (argc  2) {
for (n = 2; n  argc; n++)
-   fprintf(stderr, %s , argv[n]);
-   fprintf(stderr, \n);
+   fprintf(stderr, %s%s, argv[n], mimic_gnu  
(n+1 = argc) ?  :  );
+   if (! mimic_gnu) fprintf(stderr, \n);
}
break;
 
@@ -444,7 +444,7 @@ expand_builtin(const char *argv[], int a
 * wrap-up/wind-down activity
 */
if (argc  2)
-   dom4wrap(argv[2]);
+   dom4wrap(argv[2], trlineno, curfname);
break;
 
case EXITTYPE:
@@ -463,12 +463,12 @@ expand_builtin(const char *argv[], int a
 
case INDIRTYPE: /* Indirect call */
if (argc  2)
-   doindir(argv, argc);
+   doindir(argv, argc, trlineno, curfname);
break;
 
case BUILTINTYPE: /* Builtins only */
if (argc  2)
-   dobuiltin(argv, argc);
+   dobuiltin(argv, argc, 

Re: [new] sysutils/tarsnap

2011-03-15 Thread Brynet
http://www.tarsnap.com/legal-why.html#NOCANADIANS

Does not want me.
Do. Not. Want.

-Bryan.



CVE and crash fix for korean/hanterm-xf

2011-03-15 Thread Todd Carson
This adds two patches.
One fixes a crash at runtime on amd64, sparc64, and possibly other 64-bit
machines.
The other is a fix for a two year-old xterm command injection bug, CVE
2008-2383.

I took the latter from a report on the upstream bug tracker. The project
appears to be dead, so they never committed the CVE fix.

I contacted MAINTAINER first and was told to send it to ports@.

Index: Makefile
===
RCS file: /cvs/ports/korean/hanterm-xf/Makefile,v
retrieving revision 1.17
diff -N -p -u Makefile
--- Makefile24 Oct 2010 21:23:04 -  1.17
+++ Makefile4 Mar 2011 01:20:02 -
@@ -6,7 +6,7 @@ V=  2.0.6-177
 DISTNAME=  hanterm-xf-$V
 CATEGORIES=korean
 PKGNAME=   hanterm-xf-${V:S/-/./}
-REVISION=  0
+REVISION=  1
 
 MASTER_SITES=  http://kldp.net/frs/download.php/3281/
 HOMEPAGE=  http://hanterm-xf.kldp.net
Index: patches/patch-charproc_c
===
RCS file: patches/patch-charproc_c
diff -N -p -u patches/patch-charproc_c
--- /dev/null   3 Mar 2011 18:20:02 -
+++ patches/patch-charproc_c4 Mar 2011 01:20:02 -
@@ -0,0 +1,50 @@
+$OpenBSD$
+--- charproc.c.origWed Mar  2 22:39:44 2011
 charproc.c Wed Mar  2 23:01:35 2011
+@@ -6979,12 +6979,12 @@ g_utf8_validate (const char  *str,
+ }
+ 
+ int
+-from_utf8(char *utf8, int len, char *ksc)
++from_utf8(char *utf8, size_t len, char *ksc)
+ {
+ char * tmp = alloca(len);
+ char *out = tmp;
+-int out_len = len;
+-int vlen;
++size_t out_len = len;
++size_t vlen;
+ char *vs, *end;
+ 
+ if (!from_utf8_cd) {
+@@ -7004,7 +7004,7 @@ from_utf8(char *utf8, int len, char *ksc)
+ 
+ do {
+   ICONV_CONST char *in_p = (ICONV_CONST char *) utf8;
+-  int iconv_len = iconv(from_utf8_cd, in_p, 
++  size_t iconv_len = iconv(from_utf8_cd, in_p, 
+ len, out, out_len);
+   if (iconv_len  0) {
+   int utf8_bytes;
+@@ -7037,10 +7037,10 @@ from_utf8(char *utf8, int len, char *ksc)
+ }
+ 
+ int
+-to_utf8(char *ksc, int len, char *utf8)
++to_utf8(char *ksc, size_t len, char *utf8)
+ {
+ char *out = utf8;
+-int out_len = len * 2;
++size_t out_len = len * 2;
+ ICONV_CONST char *in_p;
+ 
+ if (!to_utf8_cd) {
+@@ -7049,7 +7049,7 @@ to_utf8(char *ksc, int len, char *utf8)
+   to_utf8_cd = iconv_open(UTF-8, EUC-KR);
+ }
+ if (0) {
+-  int i;
++  size_t i;
+   for(i=0;ilen;i++) {
+   if (ksc[i]  0x80) {
+   char c = ksc[i+1];
Index: patches/patch-misc_c
===
RCS file: patches/patch-misc_c
diff -N -p -u patches/patch-misc_c
--- /dev/null   3 Mar 2011 18:20:02 -
+++ patches/patch-misc_c4 Mar 2011 01:20:02 -
@@ -0,0 +1,67 @@
+$OpenBSD$
+fix for CVE 2008-2383
+from http://soojung.kldp.net/projects/hanterm-xf/issue/305253
+--- misc.c.origThu Mar 30 00:10:51 2006
 misc.c Wed Mar  2 23:11:14 2011
+@@ -1443,10 +1443,6 @@ do_osc(Char * oscbuf, int len GCC_UNUSED, int final)
+ case 2:   /* new title only */
+   Changetitle(buf);
+   break;
+-
+-case 3:   /* change X property */
+-  ChangeXprop(buf);
+-  break;
+ #if OPT_ISO_COLORS
+ case 4:
+   ChangeAnsiColorRequest(term, buf, final);
+@@ -1492,6 +1488,7 @@ do_osc(Char * oscbuf, int len GCC_UNUSED, int final)
+ #endif /* ALLOWLOGGING */
+ 
+ case 50:
++#if 0
+   if (buf != 0  !strcmp(buf, ?)) {
+   int num = screen-menu_font_number;
+ 
+@@ -1544,6 +1541,7 @@ do_osc(Char * oscbuf, int len GCC_UNUSED, int final)
+   }
+   SetVTFont(fontMenu_fontescape, True, VT_FONTSET(buf, NULL, NULL, 
NULL));
+   }
++#endif
+   break;
+ case 51:
+   /* reserved for Emacs shell (Rob Myoff may...@dqd.com) */
+@@ -1706,14 +1704,17 @@ do_dcs(Char * dcsbuf, size_t dcslen)
+   } else
+   okay = False;
+ 
+-  unparseputc1(DCS, screen-respond);
+-  unparseputc(okay ? '1' : '0', screen-respond);
+-  unparseputc('$', screen-respond);
+-  unparseputc('r', screen-respond);
+-  if (okay)
++  if (okay) {
++  unparseputc1(DCS, screen-respond);
++  unparseputc(okay ? '1' : '0', screen-respond);
++  unparseputc('$', screen-respond);
++  unparseputc('r', screen-respond);
+   cp = reply;
+-  unparseputs(cp, screen-respond);
+-  unparseputc1(ST, screen-respond);
++  unparseputs(cp, screen-respond);
++  unparseputc1(ST, screen-respond);
++  } else {
++  unparseputc(CAN, screen-respond);
++  }
+   } else {
+   unparseputc(CAN, screen-respond);
+   }
+@@ -1763,7 +1764,8 @@ do_dcs(Char * dcsbuf, size_t dcslen)
+   break;
+ #endif
+ default:
+-  

update fossil-20110301190432

2011-03-15 Thread James Turner
Long awaited fossil update attached. Lots of new stuff in this version.
There is a test failure so I set NO_REGRESS again. Tested on amd64.
Index: Makefile
===
RCS file: /cvs/ports/devel/fossil/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jan 2011 10:08:13 -  1.20
+++ Makefile16 Mar 2011 02:07:03 -
@@ -2,7 +2,7 @@
 
 COMMENT =  simple distributed software configuration management 
 
-VERSION =  20110101030647
+VERSION =  20110301190432
 DISTNAME = fossil-src-${VERSION}
 PKGNAME =  fossil-${VERSION}
 CATEGORIES =   devel www
@@ -33,6 +33,7 @@ WANTLIB = c crypto ssl z
 MODULES =  lang/tcl
 RUN_DEPENDS =  security/gnupg
 
+NO_REGRESS =   Yes
 REGRESS_DEPENDS =  ${MODTCL_RUN_DEPENDS}
 
 MAKE_FLAGS +=  BCC=${CC}
Index: distinfo
===
RCS file: /cvs/ports/devel/fossil/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo12 Jan 2011 10:08:13 -  1.14
+++ distinfo16 Mar 2011 02:07:03 -
@@ -1,5 +1,5 @@
-MD5 (fossil-src-20110101030647.tar.gz) = 0XbWSKMbmE2fIwkFYlgj5w==
-RMD160 (fossil-src-20110101030647.tar.gz) = pUu1zmVIheWU3zDvq9gth5svZzw=
-SHA1 (fossil-src-20110101030647.tar.gz) = dGbiViDSt5DqQ4fd7vpbxO/mY+M=
-SHA256 (fossil-src-20110101030647.tar.gz) = 
ikmb9TPuzaqTauZqNdi1edWhoR30Zgl99ZqGHTZDe54=
-SIZE (fossil-src-20110101030647.tar.gz) = 2161700
+MD5 (fossil-src-20110301190432.tar.gz) = K85tmVCSs/KSkrSXeLAntA==
+RMD160 (fossil-src-20110301190432.tar.gz) = LaVe3aTeX0OdDJOyKtAhyvGsizI=
+SHA1 (fossil-src-20110301190432.tar.gz) = QzL2NpMy4RhjPJp/iWtc0/0nUhc=
+SHA256 (fossil-src-20110301190432.tar.gz) = 
aNyb/9xgf5WILrGlm6lFU6r8PJlNVHOG1DD27LFjbLc=
+SIZE (fossil-src-20110301190432.tar.gz) = 2245573
Index: patches/patch-src_main_mk
===
RCS file: /cvs/ports/devel/fossil/patches/patch-src_main_mk,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_main_mk
--- patches/patch-src_main_mk   3 Nov 2010 17:30:14 -   1.5
+++ patches/patch-src_main_mk   16 Mar 2011 02:07:03 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-src_main_mk,v 1.5 2010/11/03 17:30:14 jasper Exp $
 src/main.mk.orig   Mon Nov  1 13:16:44 2010
-+++ src/main.mkMon Nov  1 19:17:26 2010
-@@ -794,7 +794,7 @@ $(OBJDIR)/zip.o:   zip_.c zip.h  $(SRCDIR)/config.h
+--- src/main.mk.orig   Tue Mar 15 22:01:40 2011
 src/main.mkTue Mar 15 22:01:55 2011
+@@ -851,7 +851,7 @@ $(OBJDIR)/zip.o:   $(OBJDIR)/zip_.c $(OBJDIR)/zip.h  $(S
  
- zip.h:headers
+ $(OBJDIR)/zip.h:  $(OBJDIR)/headers
  $(OBJDIR)/sqlite3.o:  $(SRCDIR)/sqlite3.c
--  $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 
-DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime 
-DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
-+  $(XTCC) -DHAVE_STDINT_H=1 -DHAVE_INTTYPES_H=1 
-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 
-DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime 
-DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
+-  $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 
-DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 
-Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c 
$(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
++  $(XTCC) -DHAVE_STDINT_H=1 -DHAVE_INTTYPES_H=1 
-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 
-DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 
-Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c 
$(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
  
  $(OBJDIR)/shell.o:$(SRCDIR)/shell.c
$(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c 
$(SRCDIR)/shell.c -o $(OBJDIR)/shell.o