CVS: cvs.openbsd.org: ports

2013-08-12 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2013/08/12 00:32:20

Modified files:
textproc/redland: Makefile distinfo 
textproc/redland/pkg: PLIST-main 

Log message:
update to 1.0.16; in preparation for a libreoffice update



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Vadim Zhukov
CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2013/08/12 00:52:56

Modified files:
graphics/libkdcraw: Makefile 
graphics/libkdcraw/pkg: PLIST-icons 
graphics/libkipi: Makefile 
graphics/libkipi/pkg: PLIST-icons 

Log message:
Missing conflicts, spotted by ajacoutot@.



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Vadim Zhukov
CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2013/08/12 00:53:57

Modified files:
graphics/digikam: Makefile 
graphics/gwenview: Makefile 
graphics/kimdaba: Makefile 
graphics/kipi-plugins: Makefile 

Log message:
Bump revisions after recent @pkgpath change in dependencies (libkdcraw and
libkipi).



Re: CVS: cvs.openbsd.org: ports

2013-08-12 Thread Vadim Zhukov
2013/8/12 Vadim Zhukov z...@cvs.openbsd.org:
 CVSROOT:/cvs
 Module name:ports
 Changes by: z...@cvs.openbsd.org2013/08/12 00:53:57

 Modified files:
 graphics/digikam: Makefile
 graphics/gwenview: Makefile
 graphics/kimdaba: Makefile
 graphics/kipi-plugins: Makefile

 Log message:
 Bump revisions after recent @pkgpath change in dependencies (libkdcraw and
 libkipi).

This was after input from ajacoutot@, too - typed ZZ too early.

--
  WBR,
  Vadim Zhukov



CVS: cvs.openbsd.org: ports

2013-08-12 Thread David Coppa
CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2013/08/12 02:03:18

Modified files:
net/hpodder: Makefile 
Added files:
net/hpodder/patches: patch-DownloadQueue_hs patch-Download_hs 
 patch-Utils_hs 

Log message:
Unbreak build with ghc-7.6.

Patch stolen from the gentoo-haskell repository @ github.

OK kili@



Re: CVS: cvs.openbsd.org: ports

2013-08-12 Thread Stuart Henderson
On 2013/08/11 12:41, Vadim Zhukov wrote:
 CVSROOT:  /cvs
 Module name:  ports
 Changes by:   z...@cvs.openbsd.org2013/08/11 12:41:15
 
 Modified files:
   graphics/ImageMagick: Makefile 
   graphics/ImageMagick/pkg: PLIST 
   graphics/geomview: Makefile 
   graphics/geomview/pkg: PLIST 
 
 Log message:
 Mark explicit conflict between ImageMagick and geomview on man/man1/animate.1
 
 okay landry@
 

it's just a manpage, doesn't it make more sense to rename it?

ImageMagick is a fairly common dependency, so this blocks a lot of
people from installing geomview.


Index: ImageMagick/Makefile
===
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.129
diff -u -p -r1.129 Makefile
--- ImageMagick/Makefile11 Aug 2013 18:41:15 -  1.129
+++ ImageMagick/Makefile12 Aug 2013 09:46:19 -
@@ -6,7 +6,7 @@ COMMENT=image processing tools
 
 VER=   6.7.7
 DASHVER=   7
-REVISION=  3
+REVISION=  4
 DISTNAME=  ImageMagick-${VER}-${DASHVER}
 PKGNAME=   ImageMagick-${VER}.${DASHVER}
 
Index: ImageMagick/pkg/PLIST
===
RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.43
diff -u -p -r1.43 PLIST
--- ImageMagick/pkg/PLIST   11 Aug 2013 18:41:15 -  1.43
+++ ImageMagick/pkg/PLIST   12 Aug 2013 09:46:19 -
@@ -1,5 +1,4 @@
 @comment $OpenBSD: PLIST,v 1.43 2013/08/11 18:41:15 zhuk Exp $
-@conflict geomview-*
 @conflict p5-PerlMagick-*
 @pkgpath graphics/ImageMagick,no_x11
 bin/Magick++-config
Index: geomview/Makefile
===
RCS file: /cvs/ports/graphics/geomview/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- geomview/Makefile   11 Aug 2013 18:41:15 -  1.8
+++ geomview/Makefile   12 Aug 2013 09:46:19 -
@@ -4,7 +4,7 @@ COMMENT =   geometry viewer for OOGL file
 
 V =1.9.4
 DISTNAME = geomview-$V
-REVISION=  2
+REVISION = 3
 CATEGORIES =   graphics
 
 HOMEPAGE = http://www.geomview.org
@@ -53,5 +53,6 @@ post-install:
mv ${PREFIX}/man/man5/${i}gv ${PREFIX}/man/man5/${i}
 .endfor
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/geomview/html/
+   mv ${PREFIX}/man/man1/animate.1 ${PREFIX}/man/man1/geomview-animate.1
 
 .include bsd.port.mk
Index: geomview/pkg/PLIST
===
RCS file: /cvs/ports/graphics/geomview/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- geomview/pkg/PLIST  11 Aug 2013 18:41:15 -  1.2
+++ geomview/pkg/PLIST  12 Aug 2013 09:46:19 -
@@ -1,5 +1,4 @@
 @comment $OpenBSD: PLIST,v 1.2 2013/08/11 18:41:15 zhuk Exp $
-@conflict ImageMagick-*
 %%SHARED%%
 @bin bin/anytooff
 @bin bin/anytoucd
@@ -192,7 +191,7 @@ libexec/geomview/drawbdy
 libexec/geomview/gvclock
 @bin libexec/geomview/gvx
 @bin libexec/geomview/nose
-@man man/man1/animate.1
+@man man/man1/geomview-animate.1
 @man man/man1/anytooff.1
 @man man/man1/anytoucd.1
 @man man/man1/bdy.1



Re: CVS: cvs.openbsd.org: ports

2013-08-12 Thread Antoine Jacoutot
On Mon, Aug 12, 2013 at 10:47:46AM +0100, Stuart Henderson wrote:
 On 2013/08/11 12:41, Vadim Zhukov wrote:
  CVSROOT:/cvs
  Module name:ports
  Changes by: z...@cvs.openbsd.org2013/08/11 12:41:15
  
  Modified files:
  graphics/ImageMagick: Makefile 
  graphics/ImageMagick/pkg: PLIST 
  graphics/geomview: Makefile 
  graphics/geomview/pkg: PLIST 
  
  Log message:
  Mark explicit conflict between ImageMagick and geomview on 
  man/man1/animate.1
  
  okay landry@
  
 
 it's just a manpage, doesn't it make more sense to rename it?
 
 ImageMagick is a fairly common dependency, so this blocks a lot of
 people from installing geomview.

Yes I already asked him to do that.
OK with me but please document the renaming in the Makefile.

 Index: ImageMagick/Makefile
 ===
 RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
 retrieving revision 1.129
 diff -u -p -r1.129 Makefile
 --- ImageMagick/Makefile  11 Aug 2013 18:41:15 -  1.129
 +++ ImageMagick/Makefile  12 Aug 2013 09:46:19 -
 @@ -6,7 +6,7 @@ COMMENT=  image processing tools
  
  VER= 6.7.7
  DASHVER= 7
 -REVISION=3
 +REVISION=4
  DISTNAME=ImageMagick-${VER}-${DASHVER}
  PKGNAME= ImageMagick-${VER}.${DASHVER}
  
 Index: ImageMagick/pkg/PLIST
 ===
 RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v
 retrieving revision 1.43
 diff -u -p -r1.43 PLIST
 --- ImageMagick/pkg/PLIST 11 Aug 2013 18:41:15 -  1.43
 +++ ImageMagick/pkg/PLIST 12 Aug 2013 09:46:19 -
 @@ -1,5 +1,4 @@
  @comment $OpenBSD: PLIST,v 1.43 2013/08/11 18:41:15 zhuk Exp $
 -@conflict geomview-*
  @conflict p5-PerlMagick-*
  @pkgpath graphics/ImageMagick,no_x11
  bin/Magick++-config
 Index: geomview/Makefile
 ===
 RCS file: /cvs/ports/graphics/geomview/Makefile,v
 retrieving revision 1.8
 diff -u -p -r1.8 Makefile
 --- geomview/Makefile 11 Aug 2013 18:41:15 -  1.8
 +++ geomview/Makefile 12 Aug 2013 09:46:19 -
 @@ -4,7 +4,7 @@ COMMENT = geometry viewer for OOGL file
  
  V =  1.9.4
  DISTNAME =   geomview-$V
 -REVISION=2
 +REVISION =   3
  CATEGORIES = graphics
  
  HOMEPAGE =   http://www.geomview.org
 @@ -53,5 +53,6 @@ post-install:
   mv ${PREFIX}/man/man5/${i}gv ${PREFIX}/man/man5/${i}
  .endfor
   chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/geomview/html/
 + mv ${PREFIX}/man/man1/animate.1 ${PREFIX}/man/man1/geomview-animate.1
  
  .include bsd.port.mk
 Index: geomview/pkg/PLIST
 ===
 RCS file: /cvs/ports/graphics/geomview/pkg/PLIST,v
 retrieving revision 1.2
 diff -u -p -r1.2 PLIST
 --- geomview/pkg/PLIST11 Aug 2013 18:41:15 -  1.2
 +++ geomview/pkg/PLIST12 Aug 2013 09:46:19 -
 @@ -1,5 +1,4 @@
  @comment $OpenBSD: PLIST,v 1.2 2013/08/11 18:41:15 zhuk Exp $
 -@conflict ImageMagick-*
  %%SHARED%%
  @bin bin/anytooff
  @bin bin/anytoucd
 @@ -192,7 +191,7 @@ libexec/geomview/drawbdy
  libexec/geomview/gvclock
  @bin libexec/geomview/gvx
  @bin libexec/geomview/nose
 -@man man/man1/animate.1
 +@man man/man1/geomview-animate.1
  @man man/man1/anytooff.1
  @man man/man1/anytoucd.1
  @man man/man1/bdy.1
 

-- 
Antoine



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2013/08/12 04:03:01

Modified files:
graphics/geomview: Makefile 
graphics/geomview/pkg: PLIST 
graphics/ImageMagick: Makefile 
graphics/ImageMagick/pkg: PLIST 

Log message:
de-conflict geomview/ImageMagick by renaming the affected manpage.
ok aja@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Pascal Stumpf
CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2013/08/12 05:58:18

Log message:
Import p5-Object-Event.

This module was mainly written for AnyEvent::XMPP, AnyEvent::IRC,
AnyEvent::HTTPD and BK to provide a consistent API for registering
and emitting events.

ok landry@

Status:

Vendor Tag: pascal
Release Tags:   pascal_20131208

N ports/devel/p5-Object-Event/Makefile
N ports/devel/p5-Object-Event/distinfo
N ports/devel/p5-Object-Event/pkg/PLIST
N ports/devel/p5-Object-Event/pkg/DESCR

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Pascal Stumpf
CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2013/08/12 05:59:11

Log message:
Import net/p5-AnyEvent-IRC.

The AnyEvent::IRC module consists of AnyEvent::IRC::Connection,
AnyEvent::IRC::Client and AnyEvent::IRC::Util.  AnyEvent::IRC is
just a module that holds this overview over the other modules.

AnyEvent::IRC can be viewed as toolbox for handling IRC connections
and communications.

AnyEvent::IRC::Client is a more highlevel IRC connection that already
processes some messages for you and will generated some events that
are maybe useful to you.

ok landry@

Status:

Vendor Tag: pascal
Release Tags:   pascal_20131208

N ports/net/p5-AnyEvent-IRC/Makefile
N ports/net/p5-AnyEvent-IRC/distinfo
N ports/net/p5-AnyEvent-IRC/pkg/DESCR
N ports/net/p5-AnyEvent-IRC/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Pascal Stumpf
CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2013/08/12 06:00:06

Log message:
Import net/p5-Net-Twitter-Lite.

This module provides a perl interface to the Twitter API v1.

It uses the same API definitions as Net::Twitter, but without the
extra bells and whistles and without the additional dependencies.
Same great taste, less filling.

ok landry@

Status:

Vendor Tag: pascal
Release Tags:   pascal_20131208

N ports/net/p5-Net-Twitter-Lite/Makefile
N ports/net/p5-Net-Twitter-Lite/distinfo
N ports/net/p5-Net-Twitter-Lite/pkg/PLIST
N ports/net/p5-Net-Twitter-Lite/pkg/DESCR

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Pascal Stumpf
CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2013/08/12 06:01:14

Modified files:
devel  : Makefile 

Log message:
sync



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Pascal Stumpf
CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2013/08/12 06:02:20

Modified files:
net: Makefile 

Log message:
sync



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Vadim Zhukov
CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2013/08/12 07:49:08

Modified files:
graphics/kipi-plugins: Makefile 

Log message:
Bump -cal too, noticed by nigel@. Tweak LIB_DEPENDS a bit while there
(zap extra x11/kde/libs3 item and use BUILD_PKGPATH).



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2013/08/12 09:04:59

Modified files:
sysutils/e2fsprogs: Makefile 
sysutils/e2fsprogs/pkg: PLIST 

Log message:
Reinstall com_err.h, but this time under include/ext2fs/ since some ext2fs
headers include it. Adjust those headers accordingly.
Fixes sysutils/testdisk detection of ext2fs..
ok sthen@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2013/08/12 09:05:27

Modified files:
sysutils/testdisk: Makefile distinfo 
sysutils/testdisk/pkg: PLIST 

Log message:
Bugfix update to testdisk 6.14.



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Vadim Zhukov
CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2013/08/12 10:09:50

Modified files:
devel/cmake: Makefile 
devel/cmake/patches: patch-Modules_FindJNI_cmake 
 patch-Modules_FindJava_cmake 

Log message:
Unbreak (bulk) builds of Java-based apps using CMake: we force using JDK 1.6
to build MODJAVA_VER=1.6+ ports, and CMake should do the same. Otherwise we
could, e.g., pick up co-installed JDK 1.7, start build using it, and while
build process goes, JDK 1.7 may disappear...

Discovered while working on OpenCV 2.4, which contains Java bindings.

okay dcoppa@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Pascal Stumpf
CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2013/08/12 10:43:39

Log message:
Import games/supertux.

SuperTux is a jump'n run like game, with strong inspiration from
the Super Mario Bros games for Nintendo.

Run and jump through multiple worlds, fighting off enemies by jumping
on them or bumping them from below.  Grabbing power-ups and other
stuff on the way.

tweaks and ok sthen@

Status:

Vendor Tag: pascal
Release Tags:   pascal_20130812

N ports/games/supertux/Makefile
N ports/games/supertux/distinfo
N ports/games/supertux/pkg/PLIST
N ports/games/supertux/pkg/DESCR
N ports/games/supertux/patches/patch-src_menu_h

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Pascal Stumpf
CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2013/08/12 10:44:24

Modified files:
games  : Makefile 

Log message:
sync



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2013/08/12 14:01:49

Modified files:
www/squidguard : Makefile 
www/squidguard/patches: patch-src_sg_h_in 

Log message:
Fix segfault on 64-bit platforms due to undeclared pointer-returning
function.

OK MAINTAINER Claudio Correa



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2013/08/12 14:22:44

Modified files:
mail/mailscanner: Makefile distinfo 
Removed files:
mail/mailscanner/patches: patch-lib_MailScanner_TNEF_pm 

Log message:
Update to MailScanner 4.84.6-1.

ok sthen@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2013/08/12 14:25:39

Modified files:
www: Makefile 

Log message:
Remove thttpd and add sthttpd.

ok sthen@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2013/08/12 14:26:36

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

Log message:
Bump thttpd users over to sthttpd.

ok sthen@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Robert Peichaer
CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2013/08/12 15:55:35

Modified files:
security/pwsafe: Makefile 
security/pwsafe/pkg: DESCR PLIST 

Log message:
- add no_x11 FLAVOR so it's usable on hosts with no X sets installed
- be a bit more verbose in updated DESCR
- bump REVISION

'Sure, why not' aja@, sthen@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Robert Peichaer
CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2013/08/12 16:24:01

Modified files:
security   : Makefile 

Log message:
add pwsafe,no_x11



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2013/08/12 17:29:45

Removed files:
www/thttpd : Makefile distinfo 
www/thttpd/patches: patch-Makefile_in patch-cgi-src_Makefile_in 
patch-extras_Makefile_in 
patch-extras_htpasswd_c 
www/thttpd/pkg : DESCR PLIST 

Log message:
Garbage collect thttpd. Has been unmaintained for almost a decade.
If you're using this switch to the maintained sthttpd fork.

ok sthen@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2013/08/12 18:29:58

Modified files:
mail/dovecot   : Makefile distinfo 
mail/dovecot/patches: patch-doc_example-config_Makefile_in 
  patch-doc_example-config_conf_d_10-auth_conf 
  patch-doc_example-config_conf_d_10-mail_conf 
  patch-doc_example-config_conf_d_20-imap_conf 
  patch-doc_example-config_conf_d_20-pop3_conf 
  patch-doc_example-config_conf_d_Makefile_in 
  patch-doc_example-config_dovecot_conf 
  patch-src_master_master-settings_c 
mail/dovecot/pkg: PLIST-server 
Removed files:
mail/dovecot/patches: patch-src_auth_passdb-bsdauth_c 

Log message:
Update to Dovecot 2.2.5.

ok sthen@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2013/08/12 18:31:02

Modified files:
mail/dovecot-pigeonhole: Makefile distinfo 
mail/dovecot-pigeonhole/patches: 
 
patch-src_managesieve-login_Makefile_in 
mail/dovecot-pigeonhole/pkg: PLIST 

Log message:
Update to Dovecot-pigeonhole 0.4.1.

ok sthen@



CVS: cvs.openbsd.org: ports

2013-08-12 Thread Brad Smith
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2013/08/12 18:33:18

Modified files:
mail/dovecot-antispam: Makefile distinfo 

Log message:
Update to a Dovecot-antispam snapshot compatible with Dovecot 2.2.

ok sthen@



Re: Not only buffer cache, or portimport gets its own enlargement

2013-08-12 Thread Juan Francisco Cantero Hurtado
On Mon, Aug 12, 2013 at 06:10:00AM +0400, Vadim Zhukov wrote:
 2013/8/12 Juan Francisco Cantero Hurtado i...@juanfra.info:
  On Mon, Aug 12, 2013 at 12:44:08AM +0400, Vadim Zhukov wrote:
  This patch adds the following functionality to portimport(1):
 
* More checks to catch some common cases: UPDATE and TODO files,
  *.core files, REVISIONs being set, SHARED_LIBS containing
  non-0.0 items, Mercurial repo directories.
  [...]
   find . -name .git  -print|read i  err You git!
  Can you change to .git*? It won't ignore files like .gitignore and
  other git related.
  +find . -name .hg   -print|read i  err You hog!
  Same here. .hg*
 
  I'd add also .fslckout. This is used by fossil.
 
 Nice idea. Maybe we should use harder fixed port layout? Like:
 
 Makefile
 distinfo
 files/{anything but empty dir}
 patches/{patch-* files only, or no dir at all}
 pkg/{files only}
 
 And then just refuse anything not matching it. I've just found quiet a
 few leftovers scattered over the whole ports tree, including ~
 subdirectory created by stupid IDEA under the directory of one of the
 ports I didn't ever remember existing of.
 

Yes, good idea. Otherwise the list would be huge.

-- 
Juan Francisco Cantero Hurtado http://juanfra.info



unbreak www/sogo for 5.4

2013-08-12 Thread Sebastian Reitenbach
Hi,

long story:
Jean-Gérard Pailloncy reported to me that www/sogo package is broken on 5.4, or 
with the current snapshots. 
On startup, there are unresolved symbols seen. I checked and found that the 
security fix done after ports lock
did not caused it, the version before without the patch also has same problem. 
But that was in the ports tree for
a long time, when updating to the 2.0.5 version I'm sure the problem was not 
there, and also giovanni did not
saw it, otherwise he would have told me. Something else in between must have 
caused it, and the problem went
unnoticed. I recognized it when I sent the upgrade to 2.0.6 including a fix for 
it, but I thought its a problem only on 
the new version. That update was sent too late before the ports lock to get in 
:(

short story:
www/sope is unusable on 5.4. The fix below that should go in 5.4 branch. 
Works for me, initial reporter, and also works and OK giovanni@
Is it OK to apply it 5.4 branch?

For -current, I have an update to 2.0.7 in the queue which is ready soon.

cheers,
Sebastian

Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile
--- Makefile20 Jul 2013 17:39:17 -  1.31
+++ Makefile10 Aug 2013 13:15:16 -
@@ -3,7 +3,7 @@
 COMMENT =  web based groupware server
 
 VERSION =  2.0.5
-REVISION = 0
+REVISION = 1
 DISTNAME = SOGo-${VERSION}a
 PKGNAME =  sogo-${VERSION}.0
 
Index: patches/patch-UI_MailPartViewers_GNUmakefile
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile
diff -N patches/patch-UI_MailPartViewers_GNUmakefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile10 Aug 2013 13:15:16 
-
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.origThu Jun 27 17:50:25 2013
 UI/MailPartViewers/GNUmakefile Sat Jun 29 16:39:10 2013
+@@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \
+   UIxMailPartICalViewer.m \
+   \
+   UIxMailPartICalActions.m\
++  ../../SoObjects/Mailer/SOGoMailBodyPart.m \
++  ../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \
++  ../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \
++  ../../SoObjects/Mailer/SOGoMailAccounts.m \
++  ../../SoObjects/Mailer/SOGoMailBaseObject.m \
++  ../../SoObjects/Mailer/SOGoMailAccount.m \
++  ../../SoObjects/Mailer/SOGoMailNamespace.m \
++  ../../SoObjects/Mailer/SOGoDraftsFolder.m \
++  ../../SoObjects/Mailer/SOGoSentFolder.m \
++  ../../SoObjects/Mailer/SOGoTrashFolder.m \
++  ../../SoObjects/Mailer/SOGoMailFolder.m \
++  ../../SoObjects/Mailer/SOGoDraftObject.m \
++  ../../SoObjects/Mailer/SOGoMailObject.m \
++  ../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \
++  ../../SoObjects/Appointments/SOGoAppointmentObject.m \
++  ../../SoObjects/Appointments/SOGoComponentOccurence.m \
++  ../../SoObjects/Appointments/SOGoAppointmentOccurence.m \
++  ../../SoObjects/Appointments/SOGoCalendarComponent.m
+ 
+ MailPartViewers_RESOURCE_FILES += \
+   product.plist   \
Index: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
diff -N patches/patch-UI_MailPartViewers_GNUmakefile_preamble
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile_preamble   10 Aug 2013 
13:15:16 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.preamble.orig   Sat Aug 10 11:26:22 2013
 UI/MailPartViewers/GNUmakefile.preambleSat Aug 10 11:26:45 2013
+@@ -2,3 +2,9 @@ ifeq ($(HAS_LIBRARY_ssl),yes)
+ ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
+ BUNDLE_LIBS += -lcrypto
+ endif
++
++ADDITIONAL_CPPFLAGS += \
++-Wall -DCOMPILE_FOR_GSTEP_MAKE=1\
++-DUIX_MAILER_MAJOR_VERSION=@\$(MAJOR_VERSION)\   \
++-DUIX_MAILER_MINOR_VERSION=@\$(MINOR_VERSION)\   \
++-DUIX_MAILER_SUBMINOR_VERSION=@\$(SUBMINOR_VERSION)\




Re: Not only buffer cache, or portimport gets its own enlargement

2013-08-12 Thread Stuart Henderson
On 2013/08/12 06:10, Vadim Zhukov wrote:
 2013/8/12 Juan Francisco Cantero Hurtado i...@juanfra.info:
  On Mon, Aug 12, 2013 at 12:44:08AM +0400, Vadim Zhukov wrote:
  This patch adds the following functionality to portimport(1):
 
* More checks to catch some common cases: UPDATE and TODO files,
  *.core files, REVISIONs being set, SHARED_LIBS containing
  non-0.0 items, Mercurial repo directories.
  [...]
   find . -name .git  -print|read i  err You git!
  Can you change to .git*? It won't ignore files like .gitignore and
  other git related.
  +find . -name .hg   -print|read i  err You hog!
  Same here. .hg*
 
  I'd add also .fslckout. This is used by fossil.
 
 Nice idea. Maybe we should use harder fixed port layout? Like:

[...]
 And then just refuse anything not matching it. I've just found quiet a
 few leftovers scattered over the whole ports tree, including ~
 subdirectory created by stupid IDEA under the directory of one of the
 ports I didn't ever remember existing of.

nope, there are ports spread across multiple directories (look at things
like net/icinga). even without that, there are other things which are
totally ok which this would block e.g. *.mk and other files in patches/
(see PATCH_LIST).



Re: Not only buffer cache, or portimport gets its own enlargement

2013-08-12 Thread Stuart Henderson
On 2013/08/12 10:23, Juan Francisco Cantero Hurtado wrote:
 On Mon, Aug 12, 2013 at 06:10:00AM +0400, Vadim Zhukov wrote:
  2013/8/12 Juan Francisco Cantero Hurtado i...@juanfra.info:
   On Mon, Aug 12, 2013 at 12:44:08AM +0400, Vadim Zhukov wrote:
   This patch adds the following functionality to portimport(1):
  
 * More checks to catch some common cases: UPDATE and TODO files,
   *.core files, REVISIONs being set, SHARED_LIBS containing
   non-0.0 items, Mercurial repo directories.
   [...]
find . -name .git  -print|read i  err You git!
   Can you change to .git*? It won't ignore files like .gitignore and
   other git related.
   +find . -name .hg   -print|read i  err You hog!
   Same here. .hg*
  
   I'd add also .fslckout. This is used by fossil.
  
  Nice idea. Maybe we should use harder fixed port layout? Like:
  
  Makefile
  distinfo
  files/{anything but empty dir}
  patches/{patch-* files only, or no dir at all}
  pkg/{files only}
  
  And then just refuse anything not matching it. I've just found quiet a
  few leftovers scattered over the whole ports tree, including ~
  subdirectory created by stupid IDEA under the directory of one of the
  ports I didn't ever remember existing of.
  
 
 Yes, good idea. Otherwise the list would be huge.

It isn't meant to be perfect, just to catch the most common cases.



Re: unbreak www/sogo for 5.4

2013-08-12 Thread Landry Breuil
On Mon, Aug 12, 2013 at 11:32:46AM +0200, Sebastian Reitenbach wrote:
 Hi,
 
 long story:
 Jean-Gérard Pailloncy reported to me that www/sogo package is broken on 5.4, 
 or with the current snapshots. 
 On startup, there are unresolved symbols seen. I checked and found that the 
 security fix done after ports lock
 did not caused it, the version before without the patch also has same 
 problem. But that was in the ports tree for
 a long time, when updating to the 2.0.5 version I'm sure the problem was not 
 there, and also giovanni did not
 saw it, otherwise he would have told me. Something else in between must have 
 caused it, and the problem went
 unnoticed. I recognized it when I sent the upgrade to 2.0.6 including a fix 
 for it, but I thought its a problem only on 
 the new version. That update was sent too late before the ports lock to get 
 in :(
 
 short story:
 www/sope is unusable on 5.4. The fix below that should go in 5.4 branch. 
 Works for me, initial reporter, and also works and OK giovanni@
 Is it OK to apply it 5.4 branch?

I think the 5.4 branch is only open to commits once the actual release
has been made... but i might be mistaken.

Landry



Re: new: devel/p5-Object-Event, net/p5-AnyEvent-IRC, net/p5-Net-Twitter-Lite

2013-08-12 Thread Pascal Stumpf
ping?

On Sun, 14 Jul 2013 17:20:22 +0200, Pascal Stumpf wrote:
 Object::Event:
 
 This module was mainly written for AnyEvent::XMPP, AnyEvent::IRC,
 AnyEvent::HTTPD and BK to provide a consistent API for registering
 and emitting events.
 
 AnyEvent::IRC:
 
 The AnyEvent::IRC module consists of AnyEvent::IRC::Connection,
 AnyEvent::IRC::Client and AnyEvent::IRC::Util. AnyEvent::IRC is
 just a module that holds this overview over the other modules.
 
 AnyEvent::IRC can be viewed as toolbox for handling IRC connections
 and communications.
 
 AnyEvent::IRC::Clientis a more highlevel IRC connection that already
 processes some messages for you and will generated some events that
 are maybe useful to you.
 
 AnyEvent::IRC::Connectionis a lowlevel connection that only connects
 to the server and will let you send and receive IRC mess
 
 Net::Twitter::Lite:
 
 This module provides a perl interface to the Twitter API v1.
 
 It uses the same API definitions as Net::Twitter, but without the
 extra bells and whistles and without the additional dependencies.
 Same great taste, less filling.
 
 
 
 Looking for oks/comments for any of these.
 
 application/octet-stream attachment, name=p5-Object-Event.tgz
 application/octet-stream attachment, name=p5-AnyEvent-IRC.tgz
 application/octet-stream attachment, name=p5-Net-Twitter-Lite.tgz



new: games/supertux

2013-08-12 Thread Pascal Stumpf
SuperTux is a jump'n run like game, with strong inspiration from
the Super Mario Bros games for Nintendo.

Run and jump through multiple worlds, fighting off enemies by jumping
on them or bumping them from below.  Grabbing power-ups and other
stuff on the way.

ok?


supertux.tgz
Description: supertux.tgz


Re: new: graphics/opencolorio

2013-08-12 Thread Pascal Stumpf
ping?

On Sun, 07 Jul 2013 13:00:38 +0200, Pascal Stumpf wrote:
 OpenColorIO (OCIO) is a complete color management solution geared
 towards motion picture production with an emphasis on visual effects
 and computer animation.  OCIO provides a straightforward and
 consistent user experience across all supporting applications while
 allowing for sophisticated back-end configuration options suitable
 for high-end production usage. OCIO is compatible with the Academy
 Color Encoding Specification (ACES) and is LUT-format agnostic,
 supporting many popular formats.
 
 ok?
 
 application/octet-stream attachment, name=opencolorio.tgz



Re: new: graphics/openscenegraph

2013-08-12 Thread Pascal Stumpf
Any more comments/ok's for OSG, Simgear or Flightgear now that radeon
KMS is in?

On Fri, 05 Jul 2013 13:43:15 +0200, Pascal Stumpf wrote:
 The OpenSceneGraph is an open source high performance 3D graphics
 toolkit, used by application developers in fields such as visual
 simulation, games, virtual reality, scientific visualization and
 modelling. Written entirely in Standard C++ and OpenGL it runs on all
 Windows platforms, OSX, GNU/Linux, IRIX, Solaris, HP-Ux, AIX and FreeBSD
 operating systems. The OpenSceneGraph is now well established as the
 world leading scene graph technology, used widely in the vis-sim, space,
 scientific, oil-gas, games and virtual reality industries.
 
 This is a prerequisite for FlightGear.
 
 ok?
 
 application/octet-stream attachment, name=openscenegraph.tgz



Re: unbreak www/sogo for 5.4

2013-08-12 Thread Sebastian Reitenbach
 
On Monday, August 12, 2013 11:53 CEST, Landry Breuil lan...@rhaalovely.net 
wrote: 
 
 On Mon, Aug 12, 2013 at 11:32:46AM +0200, Sebastian Reitenbach wrote:
  Hi,
  
  long story:
  Jean-Gérard Pailloncy reported to me that www/sogo package is broken on 
  5.4, or with the current snapshots. 
  On startup, there are unresolved symbols seen. I checked and found that the 
  security fix done after ports lock
  did not caused it, the version before without the patch also has same 
  problem. But that was in the ports tree for
  a long time, when updating to the 2.0.5 version I'm sure the problem was 
  not there, and also giovanni did not
  saw it, otherwise he would have told me. Something else in between must 
  have caused it, and the problem went
  unnoticed. I recognized it when I sent the upgrade to 2.0.6 including a fix 
  for it, but I thought its a problem only on 
  the new version. That update was sent too late before the ports lock to get 
  in :(
  
  short story:
  www/sope is unusable on 5.4. The fix below that should go in 5.4 branch. 
  Works for me, initial reporter, and also works and OK giovanni@
  Is it OK to apply it 5.4 branch?
 
 I think the 5.4 branch is only open to commits once the actual release
 has been made... but i might be mistaken.

I was unsure about that, therefore asking before I get slapped because of doing 
something stupid ;)
If nobody tells me otherwise, I'll keep that patch and ask again in November, 
and for -current looking
into getting the 2.0.7 update patch ready.

thanks,
Sebastian

 
 Landry
 
 
 
 
 




[UPDATE] i3-4.6

2013-08-12 Thread David Coppa
Please test the attached patch.

Ciao!
David


i3-4.6.diff.gz
Description: GNU Zip compressed data


Re: new: games/supertux

2013-08-12 Thread Stuart Henderson
On 2013/08/12 12:11, Pascal Stumpf wrote:
 SuperTux is a jump'n run like game, with strong inspiration from
 the Super Mario Bros games for Nintendo.
 
 Run and jump through multiple worlds, fighting off enemies by jumping
 on them or bumping them from below.  Grabbing power-ups and other
 stuff on the way.
 
 ok?


I would drop index.html from the HOMEPAGE, http://supertux.lethargik.org/
works too and less likely to break if they change things.

Does it restore the correct screen mode when it exits for you? It leaves
me in 1024x768, there might be an added complication because I'm using
a laptop with an external screen though..

Apart from that it's fine with me.




Re: UPDATE: www/liferea 1.8.12 = 1.10.1a

2013-08-12 Thread Brian Callahan

On 8/8/2013 6:17 AM, Brian Callahan wrote:

Hi ports --

Attached is an update for liferea to its latest version. (MAINTAINER
timeout)
Would like a double check on the schemas changes to make sure I did it
the right way.

Works for me on amd64.

OK?

~Brian



Ping.



Re: UPDATE: textproc/py-feedparser 5.0.1 = 5.1.3

2013-08-12 Thread Brian Callahan

On 8/8/2013 9:08 PM, Brian Callahan wrote:

Hi ports --

Attached is an update to py-feedparser bringing it up to its latest
version. Feedparser is now required for www/rawdog (update patch for
that to be sent shortly).

Some tweaks: change the V variable to MODPY_EGG_VERSION because that is
convention, and to reduce future PLIST churn. Also, the feedparser.org
homepage appears to be gone so change HOMEPAGE to its googlecode page.

Works for me on amd64.

OK? (MAINTAINER timeout)

~Brian



Ping.



Re: UPDATE: www/rawdog 2.15 = 2.17

2013-08-12 Thread Brian Callahan

On 8/8/2013 9:13 PM, Brian Callahan wrote:

Hi ports --

Attached is an update to rawdog. As stated in my py-feedparser update
email, feedparser is now a RUN_DEP, so please don't test this without
the updated feedparser.

Also, reformat the Makefile to add a space between VARIABLE and =. Since
I've taken over maintainership, a mix of VARIABLE= and VARIABLE = has
crept in and I prefer having the space there.

Works for me on amd64.

OK?

~Brian



Ping.



Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Christian Weisgerber
Vadim Zhukov persg...@gmail.com wrote:

  This minor release, under the guise of adding support for Qt5, now
  casually requires Qt5 as the minimum version.  Since we don't have
  a Qt5 port, this means dropping the Qt client.  If somebody has a
  strong opinion to the contrary and a better suggestion, speak up.
 
 This is an improved version of your patch, that allows to build with
 Qt4.  Actual Qt4 support needed only two small patches.

Great!

 I fixed WANTLIB handling and RUN_DEPENDS handling while there, too.

What are you trying to fix here?  The extra libs reported by
lib-depends-check for the -qt subpackage?  I can assure you that
transmission-qt pulls in these libraries.  It's just that they are
reached indirectly, e.g., transmission-qt links against libcurl,
which links against libidn.  If you want to fix the extras, I'd
rather link the libraries explicitly in qtr.pro.

 -MODULES= devel/gettext textproc/intltool
 +MODULES= devel/gettext textproc/intltool x11/qt4

No, we don't want a build dependency on Qt4 despite FLAVOR=no_qt.

 -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
 +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \

No, we don't want the PSEUDO_FLAVORS to make their way into the
dependency.

New try:

Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile12 Aug 2013 14:22:08 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -44,7 +44,7 @@ WANTLIB-gtk=  ${WANTLIB} ICE SM X11 Xcomp
xcb-render xcb-shm
 WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+   fontconfig freetype stdc++
 
 MODULES=   devel/gettext textproc/intltool
 
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo9 Aug 2013 19:13:08 -   1.46
+++ distinfo12 Aug 2013 14:22:08 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.81.tar.xz) = 
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
-SIZE (transmission-2.81.tar.xz) = 3167816
+SHA256 (transmission-2.82.tar.xz) = 
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
+SIZE (transmission-2.82.tar.xz) = 3172024
Index: patches/patch-libtransmission_platform-quota_c
===
RCS file: patches/patch-libtransmission_platform-quota_c
diff -N patches/patch-libtransmission_platform-quota_c
--- patches/patch-libtransmission_platform-quota_c  9 Aug 2013 19:13:08 
-   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform-quota_c,v 1.1 2013/08/09 19:13:08 
naddy Exp $
 libtransmission/platform-quota.c.orig  Tue Jul 23 13:37:31 2013
-+++ libtransmission/platform-quota.c   Tue Jul 23 13:39:38 2013
-@@ -18,7 +18,7 @@
- 
- #ifndef WIN32
-  #include sys/types.h /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
-   #include ufs/ufs/quota.h /* quotactl() */
-  #elif defined (__sun)
-   #include sys/fs/ufs_quota.h /* quotactl */
-@@ -203,7 +203,7 @@ getquota (const char * device)
-   int64_t freespace;
-   int64_t spaceused;
- 
--#if defined(__FreeBSD__) || defined(SYS_DARWIN)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SYS_DARWIN)
-   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) dq) 
== 0)
- {
- #elif defined(__sun)
-@@ -235,7 +235,7 @@ getquota (const char * device)
-   /* No quota enabled for this user */
-   return -1;
- }
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-   spaceused = (int64_t) dq.dqb_curblocks  1;
- #elif defined(SYS_DARWIN)
-   spaceused = (int64_t) dq.dqb_curbytes;
Index: patches/patch-qt_favicon_cc
===
RCS file: patches/patch-qt_favicon_cc
diff -N patches/patch-qt_favicon_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-qt_favicon_cc 12 Aug 2013 14:22:08 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- qt/favicon.cc.orig Mon Aug 12 13:27:14 2013
 qt/favicon.cc  Mon Aug 12 13:28:49 2013
+@@ -14,7 +14,12 @@
+ #include QNetworkAccessManager
+ #include QNetworkReply
+ #include QNetworkRequest
++
++#if QT_VERSION = 0x05
+ #include QStandardPaths
++#else
++#include QDesktopServices
++#endif
+ 
+ #include favicon.h
+ 
+@@ -40,7 +45,11 @@ 

Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Vadim Zhukov
2013/8/12 Christian Weisgerber na...@mips.inka.de:
 Vadim Zhukov persg...@gmail.com wrote:

  This minor release, under the guise of adding support for Qt5, now
  casually requires Qt5 as the minimum version.  Since we don't have
  a Qt5 port, this means dropping the Qt client.  If somebody has a
  strong opinion to the contrary and a better suggestion, speak up.

 This is an improved version of your patch, that allows to build with
 Qt4.  Actual Qt4 support needed only two small patches.

 Great!

 I fixed WANTLIB handling and RUN_DEPENDS handling while there, too.

 What are you trying to fix here?  The extra libs reported by
 lib-depends-check for the -qt subpackage?  I can assure you that
 transmission-qt pulls in these libraries.  It's just that they are
 reached indirectly, e.g., transmission-qt links against libcurl,
 which links against libidn.  If you want to fix the extras, I'd
 rather link the libraries explicitly in qtr.pro.

Primary goal was to fix Qt4 items in WANTLIB. Those ought to be
lib/qt4/QtFoo, not just QtFoo. I'm totally fine with trusting you and
keeping extra WANTLIB.

 -MODULES= devel/gettext textproc/intltool
 +MODULES= devel/gettext textproc/intltool x11/qt4

 No, we don't want a build dependency on Qt4 despite FLAVOR=no_qt.

There should be none: LIB_DEPENDS-qt does not inherit from LIB_DEPENDS,
but uses MODQT_LIB_DEPENDS directly. But I was wrong, I should add
x11/qt4 to MODULES only if BUILD_PACKAGES:M-qt. And the x11/qt4 MODULE
is preferred over simple LDEP because this module sets up some build
environment, too.

 -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
 +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \

 No, we don't want the PSEUDO_FLAVORS to make their way into the
 dependency.

Hm, but bsd.port.mk(5) encourages using BUILD_PKGPATH right for this
sort of situations:

BUILD_PKGPATH
   Full pkgpath(7) to the current port, taking flavors and
   pseudo-flavors into account.  See also BASE_PKGPATH, which
   doesn't include pseudo-flavors.  Mostly useful to write
   dependencies for subpackages like this:
   LIB_DEPENDS-foo=${BUILD_PKGPATH} and avoid starting to
   build a package with some other flavor combination.  See
   pkgpath(7) on the subject of `pkgpath normalisation'.
   Read-only.

And I do not see PSEUDO_FLAVORS landing in packing list.
This is with BUILD_PKGPATH being used:

$ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
@comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes

Here is updated patch with idn back to WANTLIB-common.

--
  WBR,
  Vadim Zhukov


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile12 Aug 2013 15:51:16 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -27,13 +27,16 @@ ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
 
+.include bsd.port.arch.mk
+
 # Reminder:
 # MODULES adds to WANTLIB and LIB_DEPENDS
 # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
 
-WANTLIB=   c crypto curl event_core event_extra idn m miniupnpc \
-   natpmp pthread ssl z
-WANTLIB-gtk=   ${WANTLIB} ICE SM X11 Xcomposite Xcursor Xdamage \
+WANTLIB-common=c crypto curl event_core event_extra idn m miniupnpc \
+   natpmp pthread ssl z ${MODGETTEXT_WANTLIB}
+WANTLIB-main=  ${WANTLIB-common}
+WANTLIB-gtk=   ${WANTLIB-common} ICE SM X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
dbus-1 expat ffi fontconfig freetype \
@@ -42,25 +45,31 @@ WANTLIB-gtk=${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
+   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype \
+   stdc++
 
 MODULES=   devel/gettext textproc/intltool
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt4
+.endif
 
-LIB_DEPENDS=   devel/libevent2 \
+LDEP-common=   ${MODGETTEXT_LIB_DEPENDS} \
+   devel/libevent2 \
net/curl \

Re: new: games/supertux

2013-08-12 Thread Pascal Stumpf
On Mon, 12 Aug 2013 14:01:37 +0100, Stuart Henderson wrote:
 On 2013/08/12 12:11, Pascal Stumpf wrote:
  SuperTux is a jump'n run like game, with strong inspiration from
  the Super Mario Bros games for Nintendo.
  
  Run and jump through multiple worlds, fighting off enemies by jumping
  on them or bumping them from below.  Grabbing power-ups and other
  stuff on the way.
  
  ok?
 
 
 I would drop index.html from the HOMEPAGE, http://supertux.lethargik.org/
 works too and less likely to break if they change things.

ok.

 Does it restore the correct screen mode when it exits for you? It leaves
 me in 1024x768, there might be an added complication because I'm using
 a laptop with an external screen though..

Yes, that works fine for me.

 Apart from that it's fine with me.
 
 
 



Fix www/squidguard segfault on 64-bit

2013-08-12 Thread Jeremy Evans
When running www/squidguard on amd64 (and I assume other 64-bit
platforms), it segfaults.   It fails in the call to the sgDbUpdate
function:

  sgDbUpdate(sp-userDb, user, (char *) setuserinfo(),
sizeof(struct UserInfo));

This code would be fine, except that setuserinfo is not actually
declared.  When you call an undeclared function in C, it assumes a
return type of int, which is 32-bit on amd64.  However, it should
be returning a 64-bit pointer.  So you end up losing the high bits
in the pointer, and it no longer references a valid address.

The only reason this doesn't fail on 32-bit platforms is that
sizeof(int) == sizeof(char *) on those platforms.

Found the hard way by me.  I tried to report it upstream, but their
bugtracker appears to be down.

OKs for the patch below?

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/www/squidguard/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile12 Jun 2013 20:36:34 -  1.18
+++ Makefile12 Aug 2013 17:09:29 -
@@ -3,7 +3,7 @@
 COMMENT =  filter, redirector and access controller for Squid
 
 DISTNAME = squidGuard-1.4
-REVISION = 6
+REVISION = 7
 CATEGORIES =   www
 
 HOMEPAGE = http://www.squidguard.org/
Index: patches/patch-src_sg_h_in
===
RCS file: /cvs/ports/www/squidguard/patches/patch-src_sg_h_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_sg_h_in
--- patches/patch-src_sg_h_in   9 Feb 2010 13:44:28 -   1.1
+++ patches/patch-src_sg_h_in   12 Aug 2013 16:58:14 -
@@ -2,8 +2,12 @@ $OpenBSD: patch-src_sg_h_in,v 1.1 2010/0
 
 squidGuard 1.4 patch 20091019; increase MAX_BUF above squid's MAX_URL value.
 
 src/sg.h.in.orig   Fri Nov 16 16:58:32 2007
-+++ src/sg.h.inWed Feb  3 12:26:15 2010
+Fix segfault on 64-bit due to calling an undeclared function.  The function
+is supposed to return a pointer (64-bit) but when undeclared returns an int
+(32-bit). 
+
+--- src/sg.h.in.orig   Fri Nov 16 08:58:32 2007
 src/sg.h.inMon Aug 12 02:40:28 2013
 @@ -73,7 +73,7 @@ int tolower();
  #define REQUEST_TYPE_REDIRECT   2
  #define REQUEST_TYPE_PASS   3
@@ -13,3 +17,11 @@ squidGuard 1.4 patch 20091019; increase 
  
  #define DEFAULT_LOGFILE squidGuard.log
  #define WARNING_LOGFILE squidGuard.log
+@@ -412,6 +412,7 @@ char   *niso __P((time_t));
+ struct UserQuotaInfo *setuserquota __P(());
+ void sgSourceUserQuota __P((char *, char *, char *));
+ 
++struct UserInfo *setuserinfo();
+ 
+ void   *sgMalloc __P((size_t));
+ void   *sgCalloc __P((size_t, size_t));



Re: [UPDATE] i3-4.6

2013-08-12 Thread Tobias Ulmer
On Mon, Aug 12, 2013 at 02:28:21PM +0200, David Coppa wrote:
 Please test the attached patch.

seems sparc64-proof; ok tobiasu@

 
 Ciao!
 David




Re: tpb's on-screen display broken?

2013-08-12 Thread André Stöbe
Florian Stinglmayr wrote:
 Just tested this on my Lenovo X60s and it works fine.

Ryan Freeman wrote:
 Hey, I've not usually ever used tbp for my thinkpad, but I installed
 on my T61 to see.  I am seeing that the volume and brightness are not
 showed...

Thanks to both of you, Florian and Ryan, for testing and reporting back!

Ryan Freeman wrote:
 I see this behavior, once mute causes the osd to display, quickly unmuting
 and using volume keys lets me see some slight updates to the osd volume
 bar.

That's exactly the behaviour I'm seeing, too.

After Florians response, I did a fresh install on a USB stick, booted
from it, and the problem was gone. Any clues what could be causing this?

I'm really interested in debugging this further, so I a) can learn
something new and b) don't have to install everything from scratch :-),
whereas point a takes precedence, of course. To any experienced
OpenBSD user: What would be your next steps to get this back to a
working state?

Thanks!

Regards
André



update: p5-LaTeX-Encode

2013-08-12 Thread Chris Bennett
Tested on i386.

? p5-LaTeX-Encode-0.08.diff
? patches
Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Encode/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile11 Mar 2013 11:42:43 -  1.2
+++ Makefile12 Aug 2013 18:40:48 -
@@ -2,14 +2,25 @@
 
 COMMENT=   encode characters for LaTeX formatting
 
-DISTNAME=  LaTeX-Encode-0.03
+DISTNAME=  LaTeX-Encode-0.08
 CATEGORIES=textproc
 
 MODULES=   cpan
 
-# MIT
+# Perl
 PERMIT_PACKAGE_CDROM=  Yes
 
-TEST_DEPENDS=  devel/p5-Test-Pod-Coverage=1.08p1
+RUN_DEPENDS=   devel/p5-Readonly
+
+BUILD_DEPENDS= ${RUN_DEPENDS} \
+   www/p5-HTML-Parser \
+   devel/p5-File-Slurp
+
+TEST_DEPENDS=  print/texlive/base
+
+post-install:
+# This script and man page are mistakenly installed
+   rm ${PREFIX}/bin/latex-encode
+   rm ${PREFIX}/man/man1/latex-encode.1
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Encode/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo27 Jun 2012 10:57:54 -  1.1.1.1
+++ distinfo12 Aug 2013 18:40:48 -
@@ -1,5 +1,2 @@
-MD5 (LaTeX-Encode-0.03.tar.gz) = o928fLb4RtfhTm+lMyxwaw==
-RMD160 (LaTeX-Encode-0.03.tar.gz) = 4d12bm4q35VrnJwOq+ZZwtyrBnE=
-SHA1 (LaTeX-Encode-0.03.tar.gz) = A9CVsSvEJSmPy1bO9fCiAHz8UVs=
-SHA256 (LaTeX-Encode-0.03.tar.gz) = 
jbvFjR13GJA304upQsxpkwKYA1bk8qP9kBy/Eg+W7K4=
-SIZE (LaTeX-Encode-0.03.tar.gz) = 22547
+SHA256 (LaTeX-Encode-0.08.tar.gz) = 
N8cLKNsXWQd6FROJazW+KrckdqswOBRNooRBu1Xow64=
+SIZE (LaTeX-Encode-0.08.tar.gz) = 46672
Index: pkg/DESCR
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Encode/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   27 Jun 2012 10:57:54 -  1.1.1.1
+++ pkg/DESCR   12 Aug 2013 18:40:48 -
@@ -1,18 +1,10 @@
-TeX::Encode exports the function 'latex_encode' which encodes
-characters in a string, that would be incorrectly interpreted by
-LaTeX.
+This module provides a function 'latex_encode' to encode text to be 
+formatted with LaTeX. The latex_encode function takes a text string and
+an optional reference to a hash of options. It encodes characters that
+are special to LaTeX or that are represented in LaTeX by LaTeX text-mode
+commands.
 
-The latex_encode function takes a text string and an optional
-reference to a hash of options.  The options currently supported
-are exclude to specify a list of characters that should not be
-encoded (often this is \\{} to allow LaTeX commands to be used
-in the text string), and iquotes to enable intelligent quotes,
-that is double quotes around a phrase will be converted to `` and
-'' and single quotes to ` and '.
-
-The scripts directory contains scripts to help build the character
-encoding tables used by the module and to create and format a
-document listing the characters that the module encodes with their
-Unicode character value, HTML entity representation, LaTeX encoding
-and visual representation.  These scripts are not installed by make
-install.
+The special characters are: \ (command character), { (open group),
+} (end group),  (table column separator), # (parameter
+specifier), % (comment character), _ (subscript), ^
+(superscript), ~ (non-breakable space), $ (mathematics mode).
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Encode/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   27 Jun 2012 10:57:54 -  1.1.1.1
+++ pkg/PLIST   12 Aug 2013 18:40:48 -
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/06/27 10:57:54 sthen Exp $
+@comment $OpenBSD$
 ${P5SITE}/LaTeX/
 ${P5SITE}/LaTeX/Encode/
 ${P5SITE}/LaTeX/Encode.pm
 ${P5SITE}/LaTeX/Encode/EncodingTable.pm
 @man man/man3p/LaTeX::Encode.3p
+@man man/man3p/LaTeX::Encode::EncodingTable.3p


--- /dev/null   Mon Aug 12 13:37:39 2013
+++ patches/patch-t_10-typeset-document_t   Mon Jul 22 17:36:36 2013
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- t/10-typeset-document.t.orig   Tue Jun  4 15:48:41 2013
 t/10-typeset-document.tTue Jun  4 15:49:33 2013
+@@ -74,7 +74,7 @@ foreach my $ext (qw(aux dvi log tex)) {
+ 
+ 
+ sub find_latex {
+-foreach my $dir (qw{ /usr/bin /bin }) {
++foreach my $dir (qw{ /usr/bin /bin /usr/local/bin }) {
+ my $prog = $dir/latex;
+ return $prog if -x $prog;
+ }


OK?



Re: new: devel/libextractor

2013-08-12 Thread Pascal Stumpf
ping? (slightly updated tarball attached)

On Sun, 30 Jun 2013 00:11:10 +0200, Pascal Stumpf wrote:
 GNU libextractor is a library used to extract meta data from files
 of arbitrary type. It is designed to use helper-libraries to perform
 the actual extraction, and to be trivially extendable by linking
 against external extractors for additional file types.
 
 The goal is to provide developers of file-sharing networks, browsers
 or WWW-indexing bots with a universal library to obtain simple
 keywords and meta data to match against queries and to show to users
 instead of only relying on filenames. libextractor contains a shell
 command extract that, similar to the well-known file command, can
 extract meta data from a file an print the results to stdout.
 
 This is a prerequisite for GNUnet.
 
 ok?
 
 application/octet-stream attachment, name=libextractor.tgz


libextractor.tgz
Description: libextractor.tgz


Re: update: p5-LaTeX-Encode

2013-08-12 Thread Stuart Henderson
On 2013/08/12 14:04, Chris Bennett wrote:
 +$OpenBSD$
 +--- t/10-typeset-document.t.orig Tue Jun  4 15:48:41 2013
  t/10-typeset-document.t  Tue Jun  4 15:49:33 2013
 +@@ -74,7 +74,7 @@ foreach my $ext (qw(aux dvi log tex)) {
 + 
 + 
 + sub find_latex {
 +-foreach my $dir (qw{ /usr/bin /bin }) {
 ++foreach my $dir (qw{ /usr/bin /bin /usr/local/bin }) {

This shouldn't use hardcoded /usr/local, instead use ${LOCALBASE} and
then run ${SUBST_CMD} on the file in a pre-test: target.

 + my $prog = $dir/latex;
 + return $prog if -x $prog;
 + }
 
 
 OK?
 



Re: Fix www/squidguard segfault on 64-bit

2013-08-12 Thread Stuart Henderson
On 2013/08/12 10:10, Jeremy Evans wrote:
 Found the hard way by me.  I tried to report it upstream, but their
 bugtracker appears to be down.

squidguard upstream is pretty much dead afaik.

if anyone is interested in this type of program, you might like to have
a play with the attached port of ufdbguard, it's still actively developed
and does a lot more than sg..:-

--
ufdbGuard is an extremely fast and free URL blacklist filter, originally
forked from squidGuard, but has diverged greatly. It includes a multi-
threaded daemon to maintain the database; the Squid redirector processes
are lightweight clients of this daemon.

It is able to detect various chat-over-SSL protocols and includes
some protection against security risks incurred by proxy tunnels, SSH
tunnels, unauthorised VPNs and other unauthorised tools that punch holes
in firewalls using the web proxy. It can also enforce safe-search type
features in a number of search engines and Edufilter in YouTube.

It works with the author's commercial URL database (URLfilterDB), or with
any free text-based URL database.
--

feedback welcome.



ufdbguard.tgz
Description: application/tar-gz


Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Christian Weisgerber
Vadim Zhukov persg...@gmail.com wrote:

 Primary goal was to fix Qt4 items in WANTLIB. Those ought to be
 lib/qt4/QtFoo, not just QtFoo. I'm totally fine with trusting you and
 keeping extra WANTLIB.

Hmm, but MODQT4_WANTLIB only contains lib/qt4/QtCore.

 x11/qt4 to MODULES only if BUILD_PACKAGES:M-qt. And the x11/qt4 MODULE
 is preferred over simple LDEP because this module sets up some build
 environment, too.

... which isn't passed on to post-build.  Well, MAKE_FLAGS happens to
make it through, but what for? It's not clear to me that MODULES+=x11/qt4
is a gain when we don't need most of its contents and then have to
to work around its WANTLIB and LIB_DEPENDS additions.

  -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
  +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \
 
  No, we don't want the PSEUDO_FLAVORS to make their way into the
  dependency.
 
 And I do not see PSEUDO_FLAVORS landing in packing list.
 This is with BUILD_PKGPATH being used:
 
 $ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
 @comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes

$ FLAVOR=no_gtk make show=BUILD_PKGPATH
net/transmission,no_gtk

And there was a reason I didn't use BASE_PKGPATH, too.  *Thinks*
Oh, right.  The -gtk and -qt subpackages should not depend on a
particular REVISION of -main.


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile12 Aug 2013 20:24:02 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -42,9 +42,9 @@ WANTLIB-gtk=  ${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+WANTLIB-qt=${WANTLIB} ICE SM lib/qt4/QtCore lib/qt4/QtDBus lib/qt4/QtGui \
+   lib/qt4/QtNetwork lib/qt4/QtXml X11 Xext Xi Xinerama Xrender \
+   fontconfig freetype stdc++
 
 MODULES=   devel/gettext textproc/intltool
 
Index: distinfo
===
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo9 Aug 2013 19:13:08 -   1.46
+++ distinfo12 Aug 2013 20:24:02 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.81.tar.xz) = 
u7Vx9YJUZqpF5u9K0oYXYTWhqcAjT/6jUn69gAHMVqs=
-SIZE (transmission-2.81.tar.xz) = 3167816
+SHA256 (transmission-2.82.tar.xz) = 
OZZlEIffZ6hfHhtKkrG1GN3v3YTGVLjfb7zLC5HwNSI=
+SIZE (transmission-2.82.tar.xz) = 3172024
Index: patches/patch-libtransmission_platform-quota_c
===
RCS file: patches/patch-libtransmission_platform-quota_c
diff -N patches/patch-libtransmission_platform-quota_c
--- patches/patch-libtransmission_platform-quota_c  9 Aug 2013 19:13:08 
-   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-libtransmission_platform-quota_c,v 1.1 2013/08/09 19:13:08 
naddy Exp $
 libtransmission/platform-quota.c.orig  Tue Jul 23 13:37:31 2013
-+++ libtransmission/platform-quota.c   Tue Jul 23 13:39:38 2013
-@@ -18,7 +18,7 @@
- 
- #ifndef WIN32
-  #include sys/types.h /* types needed by quota.h */
-- #ifdef __FreeBSD__
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__)
-   #include ufs/ufs/quota.h /* quotactl() */
-  #elif defined (__sun)
-   #include sys/fs/ufs_quota.h /* quotactl */
-@@ -203,7 +203,7 @@ getquota (const char * device)
-   int64_t freespace;
-   int64_t spaceused;
- 
--#if defined(__FreeBSD__) || defined(SYS_DARWIN)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(SYS_DARWIN)
-   if (quotactl(device, QCMD(Q_GETQUOTA, USRQUOTA), getuid(), (caddr_t) dq) 
== 0)
- {
- #elif defined(__sun)
-@@ -235,7 +235,7 @@ getquota (const char * device)
-   /* No quota enabled for this user */
-   return -1;
- }
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-   spaceused = (int64_t) dq.dqb_curblocks  1;
- #elif defined(SYS_DARWIN)
-   spaceused = (int64_t) dq.dqb_curbytes;
Index: patches/patch-qt_favicon_cc
===
RCS file: patches/patch-qt_favicon_cc
diff -N patches/patch-qt_favicon_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-qt_favicon_cc 12 Aug 2013 20:24:02 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- 

Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Vadim Zhukov
2013/8/13 Christian Weisgerber na...@mips.inka.de:
 Vadim Zhukov persg...@gmail.com wrote:

 Primary goal was to fix Qt4 items in WANTLIB. Those ought to be
 lib/qt4/QtFoo, not just QtFoo. I'm totally fine with trusting you and
 keeping extra WANTLIB.

 Hmm, but MODQT4_WANTLIB only contains lib/qt4/QtCore.

Yes, and what's wrong with that? The reasoning behind lib/qt4/QtFoo is
that you need to distinct, when doing actual packaging, between
libQtCore.so.X.Y from Qt3, Qt4 and, likely, Qt5. Same applies to other
cases (KDE3 and KDE4 stuff, for example).

 x11/qt4 to MODULES only if BUILD_PACKAGES:M-qt. And the x11/qt4 MODULE
 is preferred over simple LDEP because this module sets up some build
 environment, too.

 ... which isn't passed on to post-build.

Oops. It should be passed in that case, of course. New day, new
knowledge... Fixed, thanks.

 Well, MAKE_FLAGS happens to
 make it through, but what for? It's not clear to me that MODULES+=x11/qt4
 is a gain when we don't need most of its contents and then have to
 to work around its WANTLIB and LIB_DEPENDS additions.

My point is to always use the (x11/qt4) MODULE unless it breaks
things. Or we likely to have problems when Qt5 finally arrives in
ports, because many software could be build with both Qt4 and Qt5.
The situation be the same then to what we have in JDK land already.
qt4.port.mk forces using Qt4, and Qt4 version we have in ports. It
makes builds more reliable - not a need for now but a need for
future. Unless someone will step in and port all of the Qt4-based
software in ports to Qt5. :)

Regarding working around WANTLIB and LIB_DEPENDS:

  -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
  +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \
 
  No, we don't want the PSEUDO_FLAVORS to make their way into the
  dependency.

 And I do not see PSEUDO_FLAVORS landing in packing list.
 This is with BUILD_PKGPATH being used:

 $ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
 @comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes

 $ FLAVOR=no_gtk make show=BUILD_PKGPATH
 net/transmission,no_gtk

Yes. And what? PSEUDO_FLAVORS do not do their way to packaging list
(as I showed above), thus inter-package dependencies will be the
same. Where is the problem? And, if is there, should we change all
the (BUILD|BASE)_PKGPATH entries in the tree back to hardcoded
ones?

 And there was a reason I didn't use BASE_PKGPATH, too.  *Thinks*
 Oh, right.  The -gtk and -qt subpackages should not depend on a
 particular REVISION of -main.

Sorry, I got one point, but didn't get another:

1) Yep, I missed the version narrowing. My bad. Fixed.

2) What does REVISION makes with BUILD_PKGPATH/BASE_PKGPATH?

--
  WBR,
  Vadim Zhukov


Index: Makefile
===
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile9 Aug 2013 19:13:08 -   1.89
+++ Makefile12 Aug 2013 22:30:07 -
@@ -4,7 +4,7 @@ COMMENT-main=   BitTorrent command line an
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   2.81
+VER=   2.82
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -27,13 +27,16 @@ ONLY_FOR_ARCHS-qt=${GCC4_ARCHS}
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
 
+.include bsd.port.arch.mk
+
 # Reminder:
 # MODULES adds to WANTLIB and LIB_DEPENDS
 # WANTLIB-main and LIB_DEPENDS-main default to WANTLIB and LIB_DEPENDS
 
-WANTLIB=   c crypto curl event_core event_extra idn m miniupnpc \
-   natpmp pthread ssl z
-WANTLIB-gtk=   ${WANTLIB} ICE SM X11 Xcomposite Xcursor Xdamage \
+WANTLIB-common=c crypto curl event_core event_extra idn m miniupnpc \
+   natpmp pthread ssl z ${MODGETTEXT_WANTLIB}
+WANTLIB-main=  ${WANTLIB-common}
+WANTLIB-gtk=   ${WANTLIB-common} ICE SM X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
dbus-1 expat ffi fontconfig freetype \
@@ -42,25 +45,31 @@ WANTLIB-gtk=${WANTLIB} ICE SM X11 Xcomp
harfbuzz pango-1.0 pangoft2-1.0 \
pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
xcb-render xcb-shm
-WANTLIB-qt=${WANTLIB} ICE SM QtCore QtDBus QtGui QtNetwork QtXml \
-   X11 Xext Xi Xinerama Xrender \
-   expat fontconfig freetype stdc++
+WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
+   lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtXml \
+   ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype \
+   stdc++
 
 MODULES=   devel/gettext textproc/intltool
+.if ${BUILD_PACKAGES:M-qt}
+MODULES+=  x11/qt4
+.endif
 
-LIB_DEPENDS=   devel/libevent2 \
+LDEP-common=   ${MODGETTEXT_LIB_DEPENDS} \
+

Re: UPDATE: OpenCV 2.4.6.1

2013-08-12 Thread Stuart Henderson
On 2013/08/13 02:42, Vadim Zhukov wrote:
 +# nonfree means containing some patented algorithms, see
 +# http://docs.opencv.org/modules/nonfree/doc/nonfree.html
 +# Please always build and test this FLAVOR during version updates.
 +# As some source modules include this functionality, we couldn't
 +# just subpackage nonfree. Excluding this, here we have a usual
 +# BSDL
 +PERMIT_DISTFILES_FTP =   Yes
 +.if ${FLAVOR:Mnonfree}
 +PERMIT_PACKAGE_FTP = No
 +PERMIT_PACKAGE_CDROM =   No
 +PERMIT_PACKAGE_FTP-docs =Yes
 +PERMIT_PACKAGE_CDROM-docs =  Yes
 +.else
 +PERMIT_PACKAGE_CDROM =   Yes
 +.endif

Seems complicated, and we usually do put this type of thing on ftp (for
example, things which write mp3 files, etc). It should be blocked for CDs
of course. Second opinion wanted, but I think it would be acceptable to
skip the flavour maze and just do this:

PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes



new: net/retroshare

2013-08-12 Thread Stefan Sperling
A port of retroshare (http://retroshare.sourceforge.net/) is attached.

  RetroShare is a Open Source cross-platform, Friend-2-Friend and secure
  decentralised communication platform.  It lets you to securely chat and
  share files with your friends and family, using a web-of-trust to
  authenticate peers and OpenSSL to encrypt all communication.  RetroShare
  provides filesharing, chat, messages, forums and channels.

Quite a few patches to qmake project files are required to get it
to build. I'll try to push these changes upstream.

Also, recursive mutexes are assumed so I patched it to set the
appropriate pthread mutex option. Without that change it keeps
aborting in librthread.

Tested chat and file sharing between two machines on my network.

OK to import?


retroshare.tar.gz
Description: application/tar-gz


Re: Update: net/transmission 2.82 drops -qt

2013-08-12 Thread Stuart Henderson
On 2013/08/13 02:31, Vadim Zhukov wrote:
   -RUN_DEPENDS-gtk=${PKGNAME-main}:net/transmission,-main \
   +RUN_DEPENDS-gtk=${BUILD_PKGPATH} \
  
   No, we don't want the PSEUDO_FLAVORS to make their way into the
   dependency.
 
  And I do not see PSEUDO_FLAVORS landing in packing list.
  This is with BUILD_PKGPATH being used:
 
  $ FLAVOR=no_gtk SUBPACKAGE=-qt make print-plist | fgrep pkgpath
  @comment pkgpath=net/transmission,-qt cdrom=yes ftp=yes
 
  $ FLAVOR=no_gtk make show=BUILD_PKGPATH
  net/transmission,no_gtk
 
 Yes. And what? PSEUDO_FLAVORS do not do their way to packaging list
 (as I showed above), thus inter-package dependencies will be the
 same. Where is the problem? And, if is there, should we change all
 the (BUILD|BASE)_PKGPATH entries in the tree back to hardcoded
 ones?

A pseudo-flavour is only allowed to enable/disable certain subpackages.
but with this diff applied, setting the pseudo-flavour changes how
RUN_DEPENDS-gtk and RUN_DEPEND-qt are set. This isn't permitted and
PLIST_DB will complain if you rebuild with the various flavours..


$ FLAVOR=no_qt SUBPACKAGE=-gtk make show=RUN_DEPENDS-gtk
transmission-2.82:net/transmission,no_qt devel/desktop-file-utils 
x11/gtk+2,-guic

$ SUBPACKAGE=-gtk make show=RUN_DEPENDS-gtk
transmission-2.82:net/transmission, devel/desktop-file-utils x11/gtk+2,-guic



Re: UPDATE: Dovecot 2.2.5

2013-08-12 Thread Stuart Henderson
On 2013/08/10 00:54, Brad Smith wrote:
 Here is an update to Dovecot 2.2.5 and the associated ports.
 
 Looking for any testing and feedback.

I've been running various older 2.2 versions, including antispam and
pigeonhole, for months, and have now updated to this version. All looking
good with me, and I am happy that 2.2.x is mature enough to switch across.
OK with me.



Building bind with gssapi support

2013-08-12 Thread Jeff Powell
I've been trying and failing to build isc-bind with the -with-gssapi option.  I 
want to use nsupdate -g so I can use dynamic DNS with a Windows nameserver.
When I use -with-gssapi=/usr in the Makefile, it can't find the GSSAPI library 
or the gssapi.h file:

checking for GSSAPI library... looking in /usr/lib 
checking gssapi.h usability... no 
checking gssapi.h presence... no 
checking for gssapi.h... no 
checking gssapi/gssapi.h usability... no 
checking gssapi/gssapi.h presence... no 
checking for gssapi/gssapi.h... no
configure: error: gssapi.h not found

Am I doing something wrong?  I've tried adding gssapi to the WANTLIB line, 
adding symlinks in /usr/lib, making a subdirectory under /usr/include/kerberosV 
called lib, nothing works.
I noticed that the mail program nail also refuses to use GSSAPI, however 
dovecot seems to have no problem compiling it.
Why do these configure scripts (especially bind's) refuse to see the gssapi 
library?

Jeff



Re: new: devel/libextractor

2013-08-12 Thread Pascal Stumpf
On Tue, 13 Aug 2013 02:36:34 +0400, Vadim Zhukov wrote:
 2013/8/12 Pascal Stumpf pascal.stu...@cubes.de:
  ping? (slightly updated tarball attached)
 
  On Sun, 30 Jun 2013 00:11:10 +0200, Pascal Stumpf wrote:
  GNU libextractor is a library used to extract meta data from files
  of arbitrary type. It is designed to use helper-libraries to perform
  the actual extraction, and to be trivially extendable by linking
  against external extractors for additional file types.
 
  The goal is to provide developers of file-sharing networks, browsers
  or WWW-indexing bots with a universal library to obtain simple
  keywords and meta data to match against queries and to show to users
  instead of only relying on filenames. libextractor contains a shell
  command extract that, similar to the well-known file command, can
  extract meta data from a file an print the results to stdout.
 
  This is a prerequisite for GNUnet.
 
  ok?
 
  application/octet-stream attachment, name=libextractor.tgz
 
 Looks like archive is empty (20 bytes size).

Sorry, reattached.

 
 --
   WBR,
   Vadim Zhukov
 
 


libextractor.tgz
Description: libextractor.tgz