update: productivity/radicale 0.9 -> 0.10

2015-09-07 Thread Samir SAADA 
Hi all,
here is a patch for radicale 0.10

- version bump,
- change defaults in radicale/config.py and make it reflect
/etc/radicale/config content
- move right management file from /etc/config/radicale/ to /etc/radicale/
- I also took the liberty to change logging level so we can have a readable
log file by default.

caveats:
- default htpasswd_encryption is set to bcrypt, unfortunately
security/py-bcrypt doesn't seem to handle $2b ( $2a is ok)
-  it was mentioned, in ports@, a SIGHUP support but radicale doesn't
reload its configuration file.

tested on loogson.
hope it helps, and maybe fits.

Samir Saada
Index: Makefile
===
RCS file: /cvs/ports/productivity/radicale/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile2 Apr 2015 14:21:16 -   1.24
+++ Makefile7 Sep 2015 21:42:06 -
@@ -2,7 +2,7 @@
 
 COMMENT =  simple CalDAV calendar server
 
-MODPY_EGG_VERSION = 0.9
+MODPY_EGG_VERSION = 0.10
 DISTNAME = Radicale-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   productivity net
Index: distinfo
===
RCS file: /cvs/ports/productivity/radicale/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo15 Dec 2014 13:27:13 -  1.10
+++ distinfo7 Sep 2015 21:42:06 -
@@ -1,2 +1,2 @@
-SHA256 (Radicale-0.9.tar.gz) = d7+BP9JvDTWcGnt7zOm4QrRQPFUWmJpKCk9kjimeQfc=
-SIZE (Radicale-0.9.tar.gz) = 42100
+SHA256 (Radicale-0.10.tar.gz) = DGUi9XUWhfwVlSTtes7oEcy5pYLbKttru02pnOAQPWQ=
+SIZE (Radicale-0.10.tar.gz) = 43051
Index: patches/patch-config
===
RCS file: /cvs/ports/productivity/radicale/patches/patch-config,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config
--- patches/patch-config15 Dec 2014 13:27:13 -  1.8
+++ patches/patch-config7 Sep 2015 21:42:06 -
@@ -1,56 +1,67 @@
 $OpenBSD: patch-config,v 1.8 2014/12/15 13:27:13 ian Exp $
 config.origWed Aug  6 13:29:21 2014
-+++ config Sun Nov 16 18:55:14 2014
-@@ -23,9 +23,9 @@ pid =
- # SSL flag, enable HTTPS protocol
- ssl = False
+--- config.origMon Nov 10 10:38:46 2014
 config Mon Sep  7 22:48:56 2015
+@@ -3,7 +3,7 @@
+ 
+ # Config file for Radicale - A simple calendar server
+ #
+-# Place it into /etc/radicale/config (global)
++# Place it into ${SYSCONFDIR}/radicale/config (global)
+ # or ~/.config/radicale/config (user)
+ #
+ # The current values are the default ones
+@@ -28,10 +28,10 @@
+ #ssl = False
+ 
  # SSL certificate path
--certificate = /etc/apache2/ssl/server.crt
-+certificate = ${SYSCONFDIR}/radicale/server.crt
+-#certificate = /etc/apache2/ssl/server.crt
++#certificate = ${SYSCONFDIR}/radicale/server.crt
+ 
  # SSL private key
--key = /etc/apache2/ssl/server.key
-+key = ${SYSCONFDIR}/radicale/private/server.key
+-#key = /etc/apache2/ssl/server.key
++#key = ${SYSCONFDIR}/radicale/private/server.key
+ 
  # SSL Protocol used. See python's ssl module for available values
- protocol = PROTOCOL_SSLv23
- # Ciphers available. See python's ssl module for available ciphers
-@@ -56,10 +56,10 @@ type = None
- custom_handler =
+ #protocol = PROTOCOL_SSLv23
+@@ -80,11 +80,11 @@
+ #custom_handler =
  
  # Htpasswd filename
--htpasswd_filename = /etc/radicale/users
-+htpasswd_filename = ${SYSCONFDIR}/radicale/users
+-#htpasswd_filename = /etc/radicale/users
++#htpasswd_filename = ${SYSCONFDIR}/radicale/users
+ 
  # Htpasswd encryption method
--# Value: plain | sha1 | crypt
--htpasswd_encryption = crypt
-+# Value: plain | sha1 | crypt | bcrypt
-+htpasswd_encryption = bcrypt
+-# Value: plain | sha1 | ssha | crypt
+-#htpasswd_encryption = crypt
++# Value: plain | sha1 | ssha | bcrypt
++#htpasswd_encryption = bcrypt
  
  # LDAP server URL, with protocol and port
- ldap_url = ldap://localhost:389/
-@@ -113,7 +113,7 @@ type = None
- custom_handler =
+ #ldap_url = ldap://localhost:389/
+@@ -146,7 +146,7 @@
+ #custom_handler =
  
  # File for rights management from_file
--file = ~/.config/radicale/rights
-+file = ${SYSCONFDIR}/config/radicale/rights
+-#file = ~/.config/radicale/rights
++#file = ${SYSCONFDIR}/radicale/rights
  
  
  [storage]
-@@ -125,7 +125,7 @@ type = filesystem
- custom_handler =
+@@ -163,7 +163,7 @@
+ #custom_handler =
  
  # Folder for storing local collections, created if not present
--filesystem_folder = ~/.config/radicale/collections
-+filesystem_folder = /var/db/radicale/calendars
+-#filesystem_folder = ~/.config/radicale/collections
++#filesystem_folder = /var/db/radicale/collections
  
  # Database URL for SQLAlchemy
  # dialect+driver://user:password@host/dbname[?key=value..]
-@@ -139,7 +139,7 @@ database_url =
+@@ -178,7 +178,7 @@
  # If no config is given, simple information is printed on the standard output
  # For more information about the syntax of the configuration file, see:
  # http

Update: mercurial-2.6.1

2013-05-15 Thread Samir SAADA 
Hi,
an update to mercurial 2.6.1, released yesterday.
patch file is now obsolete.

regress tests for i386 and loongson on the way.



Index: devel/mercurial/Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- devel/mercurial/Makefile11 Mar 2013 10:50:11 -  1.52
+++ devel/mercurial/Makefile15 May 2013 07:38:18 -
@@ -2,7 +2,7 @@
 
 COMMENT =  fast, lightweight source control management
 
-MODPY_EGG_VERSION =2.4.2
+MODPY_EGG_VERSION =2.6.1
 DISTNAME = mercurial-${MODPY_EGG_VERSION}
 CATEGORIES =   devel
 
Index: devel/mercurial/distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.35
diff -u -r1.35 distinfo
--- devel/mercurial/distinfo9 Jan 2013 11:54:38 -   1.35
+++ devel/mercurial/distinfo15 May 2013 07:38:18 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.4.2.tar.gz) = zCEIPX6rTKqBWblB42xyKay7bUGianvtIadxs/Y97fM=
-SIZE (mercurial-2.4.2.tar.gz) = 3613392
+SHA256 (mercurial-2.6.1.tar.gz) = tkE6ozn9kahiiN989Pnbm/NEOx/1XoEYUw/bnox4jmQ=
+SIZE (mercurial-2.6.1.tar.gz) = 3728067
Index: devel/mercurial/patches/patch-tests_run-tests_py
===
RCS file: devel/mercurial/patches/patch-tests_run-tests_py
diff -N devel/mercurial/patches/patch-tests_run-tests_py
--- devel/mercurial/patches/patch-tests_run-tests_py9 Jan 2013 11:54:38 
-   1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-tests_run-tests_py,v 1.5 2013/01/09 11:54:38 rpointel Exp $
 tests/run-tests.py.origWed Jan  2 07:07:38 2013
-+++ tests/run-tests.py Tue Jan  8 11:09:30 2013
-@@ -93,7 +93,8 @@ IMPL_PATH = 'PYTHONPATH'
- if 'java' in sys.platform:
- IMPL_PATH = 'JYTHONPATH'
- 
--requiredtools = [python, diff, grep, unzip, gunzip, bunzip2, 
sed]
-+requiredtools = [diff, grep, unzip, gunzip, bunzip2, sed]
-+requiredtools.insert(0, os.path.basename(PYTHON))
- 
- defaults = {
- 'jobs': ('HGTEST_JOBS', 1),
Index: devel/mercurial/pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.26
diff -u -r1.26 PLIST
--- devel/mercurial/pkg/PLIST   12 Dec 2012 06:07:14 -  1.26
+++ devel/mercurial/pkg/PLIST   15 May 2013 07:38:18 -
@@ -1,10 +1,12 @@
-@comment $OpenBSD: PLIST,v 1.26 2012/12/12 06:07:14 rpointel Exp $
+@comment $OpenBSD$
 bin/hg
 lib/python${MODPY_VERSION}/site-packages/hgext/
 lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py
 lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/acl.py
 lib/python${MODPY_VERSION}/site-packages/hgext/acl.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/blackbox.py
+lib/python${MODPY_VERSION}/site-packages/hgext/blackbox.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
 lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/children.py
@@ -141,6 +143,8 @@
 lib/python${MODPY_VERSION}/site-packages/mercurial/bdiff.so
 lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/branchmap.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/branchmap.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/byterange.py
@@ -167,6 +171,8 @@
 lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/dicthelpers.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/dicthelpers.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelpers.so
 lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.pyc
@@ -339,12 +345,18 @@
 lib/python${MODPY_VERSION}/site-packages/mercurial/py3kcompat.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/repair.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/repair.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/repoview.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/repoview.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/revlog.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revlog.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/revset.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revset.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/scmposix.py

Re: Update: mercurial-2.6.1

2013-05-15 Thread Samir SAADA 
regress on i386 and loongson, with two known to fail tests:

Failed test-convert-cvs-synthetic.t: output changed
Failed test-convert-cvsnt-mergepoints.t: output changed


On Wed, May 15, 2013 at 09:47:39AM +0200, Samir SAADA wrote:
 Hi,
 an update to mercurial 2.6.1, released yesterday.
 patch file is now obsolete.
 
 regress tests for i386 and loongson on the way.
 
 
 
 Index: devel/mercurial/Makefile
 ===
 RCS file: /cvs/ports/devel/mercurial/Makefile,v
 retrieving revision 1.52
 diff -u -r1.52 Makefile
 --- devel/mercurial/Makefile  11 Mar 2013 10:50:11 -  1.52
 +++ devel/mercurial/Makefile  15 May 2013 07:38:18 -
 @@ -2,7 +2,7 @@
  
  COMMENT =fast, lightweight source control management
  
 -MODPY_EGG_VERSION =  2.4.2
 +MODPY_EGG_VERSION =  2.6.1
  DISTNAME =   mercurial-${MODPY_EGG_VERSION}
  CATEGORIES = devel
  
 Index: devel/mercurial/distinfo
 ===
 RCS file: /cvs/ports/devel/mercurial/distinfo,v
 retrieving revision 1.35
 diff -u -r1.35 distinfo
 --- devel/mercurial/distinfo  9 Jan 2013 11:54:38 -   1.35
 +++ devel/mercurial/distinfo  15 May 2013 07:38:18 -
 @@ -1,2 +1,2 @@
 -SHA256 (mercurial-2.4.2.tar.gz) = 
 zCEIPX6rTKqBWblB42xyKay7bUGianvtIadxs/Y97fM=
 -SIZE (mercurial-2.4.2.tar.gz) = 3613392
 +SHA256 (mercurial-2.6.1.tar.gz) = 
 tkE6ozn9kahiiN989Pnbm/NEOx/1XoEYUw/bnox4jmQ=
 +SIZE (mercurial-2.6.1.tar.gz) = 3728067
 Index: devel/mercurial/patches/patch-tests_run-tests_py
 ===
 RCS file: devel/mercurial/patches/patch-tests_run-tests_py
 diff -N devel/mercurial/patches/patch-tests_run-tests_py
 --- devel/mercurial/patches/patch-tests_run-tests_py  9 Jan 2013 11:54:38 
 -   1.5
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -1,13 +0,0 @@
 -$OpenBSD: patch-tests_run-tests_py,v 1.5 2013/01/09 11:54:38 rpointel Exp $
  tests/run-tests.py.orig  Wed Jan  2 07:07:38 2013
 -+++ tests/run-tests.py   Tue Jan  8 11:09:30 2013
 -@@ -93,7 +93,8 @@ IMPL_PATH = 'PYTHONPATH'
 - if 'java' in sys.platform:
 - IMPL_PATH = 'JYTHONPATH'
 - 
 --requiredtools = [python, diff, grep, unzip, gunzip, bunzip2, 
 sed]
 -+requiredtools = [diff, grep, unzip, gunzip, bunzip2, sed]
 -+requiredtools.insert(0, os.path.basename(PYTHON))
 - 
 - defaults = {
 - 'jobs': ('HGTEST_JOBS', 1),
 Index: devel/mercurial/pkg/PLIST
 ===
 RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
 retrieving revision 1.26
 diff -u -r1.26 PLIST
 --- devel/mercurial/pkg/PLIST 12 Dec 2012 06:07:14 -  1.26
 +++ devel/mercurial/pkg/PLIST 15 May 2013 07:38:18 -
 @@ -1,10 +1,12 @@
 -@comment $OpenBSD: PLIST,v 1.26 2012/12/12 06:07:14 rpointel Exp $
 +@comment $OpenBSD$
  bin/hg
  lib/python${MODPY_VERSION}/site-packages/hgext/
  lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py
  lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
  lib/python${MODPY_VERSION}/site-packages/hgext/acl.py
  lib/python${MODPY_VERSION}/site-packages/hgext/acl.pyc
 +lib/python${MODPY_VERSION}/site-packages/hgext/blackbox.py
 +lib/python${MODPY_VERSION}/site-packages/hgext/blackbox.pyc
  lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
  lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
  lib/python${MODPY_VERSION}/site-packages/hgext/children.py
 @@ -141,6 +143,8 @@
  lib/python${MODPY_VERSION}/site-packages/mercurial/bdiff.so
  lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.py
  lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.pyc
 +lib/python${MODPY_VERSION}/site-packages/mercurial/branchmap.py
 +lib/python${MODPY_VERSION}/site-packages/mercurial/branchmap.pyc
  lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.py
  lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.pyc
  lib/python${MODPY_VERSION}/site-packages/mercurial/byterange.py
 @@ -167,6 +171,8 @@
  lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.pyc
  lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.py
  lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.pyc
 +lib/python${MODPY_VERSION}/site-packages/mercurial/dicthelpers.py
 +lib/python${MODPY_VERSION}/site-packages/mercurial/dicthelpers.pyc
  lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelpers.so
  lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
  lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.pyc
 @@ -339,12 +345,18 @@
  lib/python${MODPY_VERSION}/site-packages/mercurial/py3kcompat.pyc
  lib/python${MODPY_VERSION}/site-packages/mercurial/repair.py
  lib/python${MODPY_VERSION}/site-packages/mercurial/repair.pyc
 +lib/python${MODPY_VERSION}/site-packages/mercurial/repoview.py
 +lib/python${MODPY_VERSION}/site-packages/mercurial/repoview.pyc
  lib/python${MODPY_VERSION

Re: Update: mercurial-2.6.1

2013-05-15 Thread Samir SAADA 
On Wed, May 15, 2013 at 06:12:06PM +0200, Remi Pointel wrote:
 On Wed, 15 May 2013 16:30:16 +0200
 Samir SAADA zep...@gmail.com wrote:
  regress on i386 and loongson, with two known to fail tests:
  
  Failed test-convert-cvs-synthetic.t: output changed
  Failed test-convert-cvsnt-mergepoints.t: output changed
  
  
  On Wed, May 15, 2013 at 09:47:39AM +0200, Samir SAADA wrote:
   Hi,
   an update to mercurial 2.6.1, released yesterday.
   patch file is now obsolete.
   
   regress tests for i386 and loongson on the way.
 
 Hi,
 
 sounds good for me, please test this diff of tortoisehg too, and if it's ok I 
 will commit this 2 updates.
 
 Thanks.
 
 Remi.



can't tell for the headless loongson, but works okay on i386.




 Index: Makefile
 ===
 RCS file: /cvs/ports/devel/tortoisehg/Makefile,v
 retrieving revision 1.8
 diff -u -p -r1.8 Makefile
 --- Makefile  11 Mar 2013 10:50:31 -  1.8
 +++ Makefile  15 May 2013 16:09:31 -
 @@ -2,7 +2,7 @@
  
  COMMENT =series of applications for Mercurial
  
 -MODPY_EGG_VERSION =  2.6.2
 +MODPY_EGG_VERSION =  2.8
  DISTNAME =   tortoisehg-${MODPY_EGG_VERSION}
  
  CATEGORIES = devel
 @@ -23,7 +23,7 @@ BUILD_DEPENDS = x11/py-qt4 \
  
  RUN_DEPENDS =${BUILD_DEPENDS} \
   editors/py-qscintilla \
 - devel/mercurial=2.4.2 \
 + devel/mercurial=2.6.1 \
   devel/py-iniparse
  
  NO_TEST =Yes
 Index: distinfo
 ===
 RCS file: /cvs/ports/devel/tortoisehg/distinfo,v
 retrieving revision 1.7
 diff -u -p -r1.7 distinfo
 --- distinfo  9 Jan 2013 11:55:13 -   1.7
 +++ distinfo  15 May 2013 16:09:31 -
 @@ -1,2 +1,2 @@
 -SHA256 (tortoisehg-2.6.2.tar.gz) = 
 8HlIj+oAi7T3Ol27m4DlI8hzVdC56jTjjnj71XJN1gk=
 -SIZE (tortoisehg-2.6.2.tar.gz) = 9105928
 +SHA256 (tortoisehg-2.8.tar.gz) = Rzq6bZJfkahGEWa8/V4hoo0FzoEPls77QYS9LLs4j94=
 +SIZE (tortoisehg-2.8.tar.gz) = 8978628
 Index: pkg/PLIST
 ===
 RCS file: /cvs/ports/devel/tortoisehg/pkg/PLIST,v
 retrieving revision 1.6
 diff -u -p -r1.6 PLIST
 --- pkg/PLIST 12 Dec 2012 06:07:53 -  1.6
 +++ pkg/PLIST 15 May 2013 16:09:31 -
 @@ -114,6 +114,8 @@ lib/python${MODPY_VERSION}/site-packages
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mqutil.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/p4pending.py
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/p4pending.pyc
 +lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/partialcommit.py
 +lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/partialcommit.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pathedit.py
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pathedit.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pbranch.py
 @@ -227,6 +229,8 @@ lib/python${MODPY_VERSION}/site-packages
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/config.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/debugthg.py
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/debugthg.pyc
 +lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/editor.py
 +lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/editor.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hglib.py
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hglib.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hgversion.py
 @@ -239,10 +243,10 @@ lib/python${MODPY_VERSION}/site-packages
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/patchctx.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/paths.py
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/paths.pyc
 -lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/settings.py
 -lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/settings.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/shlib.py
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/shlib.pyc
 +lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/terminal.py
 +lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/terminal.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/thgstatus.py
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/thgstatus.pyc
  lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/thread2.py
 @@ -334,7 +338,6 @@ share/pixmaps/tortoisehg/icons/menuimpor
  share/pixmaps/tortoisehg/icons/menulog.ico
  share/pixmaps/tortoisehg/icons/menumerge.ico
  share/pixmaps/tortoisehg/icons/menupatch.ico
 -share/pixmaps/tortoisehg/icons/menurelocate.ico
  share/pixmaps/tortoisehg/icons/menurepobrowse.ico
  share/pixmaps/tortoisehg/icons/menurevert.ico
  share/pixmaps/tortoisehg/icons/menurevisiongraph.ico
 @@ -367,6 +370,7

PORTS framework: plist with FULLPKGNAME\- problem

2013-05-14 Thread Samir SAADA 
Hi,
with some ports, make plist generates bad file paths with FULLPKGNAME\-

this patch restricts the substitution pattern that finds
the subpackage name in paths.

tested on some ports only.


Samir.



Index: infrastructure/bin/make-plist
===
RCS file: /cvs/ports/infrastructure/bin/make-plist,v
retrieving revision 1.5
diff -u -r1.5 make-plist
--- infrastructure/bin/make-plist   28 Jan 2013 21:27:59 -  1.5
+++ infrastructure/bin/make-plist   14 May 2013 11:03:29 -
@@ -453,9 +453,9 @@
 sub bugfix
 {
my ($self, $subpackage, $reverse) = @_;
-   if ($self-{name} =~ m/\$\{(.*)\\$subpackage\}/) {
+   if ($self-{name} =~ m/\$\{([^\}]*)\\$subpackage\}/) {
if ($reverse-{h}-{$1.$subpackage}) {
-   $self-{name} =~ s/(\$\{.*)\\$subpackage\}/$1\}/;
+   $self-{name} =~ s/(\$\{[^\}]*)\\$subpackage/$1/;
}
}
 }

Re: PORTS framework: plist with FULLPKGNAME\- problem

2013-05-14 Thread Samir SAADA 
On Tue, May 14, 2013 at 01:01:41PM +0100, Stuart Henderson wrote:
 On 2013/05/14 13:50, Samir SAADA wrote:
  Hi,
  with some ports, make plist generates bad file paths with FULLPKGNAME\-
  
  this patch restricts the substitution pattern that finds
  the subpackage name in paths.
  
  tested on some ports only.
 
 This doesn't seem to make things any worse for multi-package ports with
 READMEs (which is the only reason for subst'ing FULLPKGNAME-subpackage
 in the first please).
 
 Can you show examples of some ports which are helped by this?
 

devel/ipython suffers like this:

--- pkg/PLIST.orig  Tue May 14 14:35:27 2013
+++ pkg/PLIST   Tue May 14 14:35:38 2013
@@ -724,7 +724,7 @@
 lib/python${MODPY_VERSION}/site-packages/IPython/zmq/session.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/zmq/zmqshell.py
 lib/python${MODPY_VERSION}/site-packages/IPython/zmq/zmqshell.pyc
-lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/${FULLPKGNAME\-}-py${MODPY_VERSION}.egg-info
 @man man/man1/ipcluster.1
 @man man/man1/ipcontroller.1
 @man man/man1/ipengine.1
@@ -1291,7 +1291,7 @@
 share/doc/ipython/parallel/parallel_transition.html
 share/doc/ipython/parallel/parallel_winhpc.html
 share/doc/ipython/parallel/winhpc_index.html
-share/doc/ipython/py-modindex.html
+share/doc/ipython/${MODPY_PY_PREFIX}modindex.html
 share/doc/ipython/search.html
 share/doc/ipython/searchindex.js
 share/doc/ipython/whatsnew/


packages like devel/mercurial, devel/bzr
and other python packages would have 'foobar-${MODPY_EGG_VERSION}'
automatically replaced by ${FULLPKGNAME} instead of ${FULLPKGNAME\-} 

unless it is forbidden to use FULLPKGNAME for anything else than readme files...

  
  
  Index: infrastructure/bin/make-plist
  ===
  RCS file: /cvs/ports/infrastructure/bin/make-plist,v
  retrieving revision 1.5
  diff -u -r1.5 make-plist
  --- infrastructure/bin/make-plist   28 Jan 2013 21:27:59 -  1.5
  +++ infrastructure/bin/make-plist   14 May 2013 11:03:29 -
  @@ -453,9 +453,9 @@
   sub bugfix
   {
  my ($self, $subpackage, $reverse) = @_;
  -   if ($self-{name} =~ m/\$\{(.*)\\$subpackage\}/) {
  +   if ($self-{name} =~ m/\$\{([^\}]*)\\$subpackage\}/) {
  if ($reverse-{h}-{$1.$subpackage}) {
  -   $self-{name} =~ s/(\$\{.*)\\$subpackage\}/$1\}/;
  +   $self-{name} =~ s/(\$\{[^\}]*)\\$subpackage/$1/;
  }
  }
   }

Gentium fonts

2012-12-21 Thread Samir SAADA 
Hi,
here is a Gentium Basic and Gentium Plus fonts port
that I have used for some home design stuff.
hope it helps some people.



Samir.
Index: fonts/gentium-basic/Makefile
===
RCS file: fonts/gentium-basic/Makefile
diff -N fonts/gentium-basic/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ fonts/gentium-basic/Makefile21 Dec 2012 21:38:58 -
@@ -0,0 +1,39 @@
+# $OpenBSD: $
+
+COMMENT =  Gentium Basic fonts
+
+DISTNAME = GentiumBasic_110
+PKGNAME =  gentium-basic-fonts-${V}
+V  =   1.1
+REVISION =  0
+
+CATEGORIES =   fonts
+
+HOMEPAGE = 
http://scripts.sil.org/cms/scripts/page.php?item_id=Gentium_basic
+
+MAINTAINER =   ports@openbsd.org   
+
+# OFL http://scripts.sil.org/OFL
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM =   Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MASTER_SITES = 
http://scripts.sil.org/cms/scripts/render_download.php?format=filemedia_id=${DISTNAME}filename=/
+EXTRACT_SUFX = .zip
+
+NO_BUILD = Yes
+NO_REGRESS =   Yes
+
+PKG_ARCH = *
+
+FONTDIR =  ${PREFIX}/lib/X11/fonts/gentium-basic-fonts
+DOCDIR =${PREFIX}/share/doc/gentium-basic-fonts
+
+WRKSRC =   ${WRKDIR}/Gentium\ Basic\ ${V}
+do-install:
+   ${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR}
+   ${INSTALL_DATA} ${WRKSRC}/*ttf ${FONTDIR}
+   ${INSTALL_DATA} ${WRKSRC}/*txt ${DOCDIR}
+
+.include bsd.port.mk
Index: fonts/gentium-basic/distinfo
===
RCS file: fonts/gentium-basic/distinfo
diff -N fonts/gentium-basic/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ fonts/gentium-basic/distinfo21 Dec 2012 21:38:58 -
@@ -0,0 +1,2 @@
+SHA256 (GentiumBasic_110.zip) = fwOraDSSU+Ugo+cWBpvY1ig4H3uAAbPZhOhaxNp1oDU=
+SIZE (GentiumBasic_110.zip) = 868259
Index: fonts/gentium-basic/pkg/DESCR
===
RCS file: fonts/gentium-basic/pkg/DESCR
diff -N fonts/gentium-basic/pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ fonts/gentium-basic/pkg/DESCR   21 Dec 2012 21:38:58 -
@@ -0,0 +1,5 @@
+Gentium Basic and Gentium Book Basic are font families based on the original
+Gentium design, but with additional weights.
+The Book family is slightly heavier. Both families come with a complete
+regular, bold, italic and bold italic set of fonts.
+
Index: fonts/gentium-basic/pkg/PLIST
===
RCS file: fonts/gentium-basic/pkg/PLIST
diff -N fonts/gentium-basic/pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -
+++ fonts/gentium-basic/pkg/PLIST   21 Dec 2012 21:38:58 -
@@ -0,0 +1,16 @@
+@comment $OpenBSD$
+lib/X11/fonts/
+lib/X11/fonts/gentium-basic-fonts/
+lib/X11/fonts/gentium-basic-fonts/GenBasB.ttf
+lib/X11/fonts/gentium-basic-fonts/GenBasBI.ttf
+lib/X11/fonts/gentium-basic-fonts/GenBasI.ttf
+lib/X11/fonts/gentium-basic-fonts/GenBasR.ttf
+lib/X11/fonts/gentium-basic-fonts/GenBkBasB.ttf
+lib/X11/fonts/gentium-basic-fonts/GenBkBasBI.ttf
+lib/X11/fonts/gentium-basic-fonts/GenBkBasI.ttf
+lib/X11/fonts/gentium-basic-fonts/GenBkBasR.ttf
+share/doc/gentium-basic-fonts/
+share/doc/gentium-basic-fonts/FONTLOG.txt
+share/doc/gentium-basic-fonts/GENTIUM-FAQ.txt
+share/doc/gentium-basic-fonts/OFL-FAQ.txt
+share/doc/gentium-basic-fonts/OFL.txt
Index: fonts/gentium-plus/Makefile
===
RCS file: fonts/gentium-plus/Makefile
diff -N fonts/gentium-plus/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ fonts/gentium-plus/Makefile 21 Dec 2012 21:38:58 -
@@ -0,0 +1,40 @@
+# $OpenBSD: $
+
+COMMENT =  Gentium Plus fonts
+
+DISTNAME = GentiumPlus-${V}
+PKGNAME =  gentium-plus-fonts-${V}
+V  =   1.510
+REVSION =  0
+
+CATEGORIES =   fonts
+
+HOMEPAGE = 
http://scripts.sil.org/cms/scripts/page.php?item_id=Gentium
+
+MAINTAINER =   ports@openbsd.org   
+
+# OFL http://scripts.sil.org/OFL
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM =   Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MASTER_SITES = 
http://scripts.sil.org/cms/scripts/render_download.php?format=filemedia_id=${DISTNAME}.zipfilename=/
+EXTRACT_SUFX = .zip
+
+NO_BUILD = Yes
+NO_REGRESS =   Yes
+
+PKG_ARCH = *
+
+FONTDIR =  ${PREFIX}/lib/X11/fonts/gentium-plus-fonts
+DOCDIR =${PREFIX}/share/doc/gentium-plus-fonts
+
+
+do-install:
+   ${INSTALL_DATA_DIR} ${FONTDIR} ${DOCDIR}
+   ${INSTALL_DATA} ${WRKSRC}/*ttf ${FONTDIR}
+   ${INSTALL_DATA} ${WRKSRC}/*txt ${DOCDIR}
+   ${INSTALL_DATA} ${WRKSRC}/documentation/* ${DOCDIR}
+
+.include bsd.port.mk

Re: [UPDATE] devel/mercurial

2012-11-29 Thread Samir SAADA 
Hey Remi,

regress on i386:

Failed test-backwards-remove.t: output changed
Failed test-clone.t: output changed
Failed test-command-template.t: output changed
Failed test-convert-cvs-synthetic.t: output changed
Failed test-convert-cvsnt-mergepoints.t: output changed
Failed test-convert.t: output changed
Failed test-fetch.t: output changed
Failed test-journal-exists.t: output changed
Failed test-largefiles.t: timed out
Failed test-lock-badness.t: output changed
Failed test-permissions.t: output changed
Failed test-pull-permission.t: output changed
Failed test-purge.t: output changed
Failed test-repair-strip.t: output changed
Failed test-revert-unknown.t: output changed
Failed test-revert.t: output changed
Failed test-serve.t: output changed
Failed test-subrepo-git.t: output changed
Failed test-subrepo-missing.t: output changed
Failed test-update-reverse.t: output changed
# Ran 415 tests, 0 skipped, 20 failed.


couldn't test on loogson my cc is broken.

Samir.


On Thu, Nov 29, 2012 at 06:50:37AM +0100, Remi Pointel wrote:
 Hi,
 
 this is the diff to update Mercurial to 2.4.
 Changelog: 
 http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.4_.282012-11-1.29
 
 Is it ok?
 
 Cheers,
 
 Remi.

 Index: Makefile
 ===
 RCS file: /cvs/ports/devel/mercurial/Makefile,v
 retrieving revision 1.49
 diff -u -p -r1.49 Makefile
 --- Makefile  8 Sep 2012 08:00:45 -   1.49
 +++ Makefile  27 Nov 2012 08:20:17 -
 @@ -2,7 +2,7 @@
  
  COMMENT =fast, lightweight source control management
  
 -MODPY_EGG_VERSION =  2.3.1
 +MODPY_EGG_VERSION =  2.4
  DISTNAME =   mercurial-${MODPY_EGG_VERSION}
  CATEGORIES = devel
  
 Index: distinfo
 ===
 RCS file: /cvs/ports/devel/mercurial/distinfo,v
 retrieving revision 1.33
 diff -u -p -r1.33 distinfo
 --- distinfo  8 Sep 2012 08:00:45 -   1.33
 +++ distinfo  27 Nov 2012 08:20:17 -
 @@ -1,2 +1,2 @@
 -SHA256 (mercurial-2.3.1.tar.gz) = 
 71h/3TsGLgjrQBLnhw9NCgD9g08RV4v7qAMTsQ+AhUE=
 -SIZE (mercurial-2.3.1.tar.gz) = 3558058
 +SHA256 (mercurial-2.4.tar.gz) = OIeFNYiBzrRAm6obgYDCyE1fNU6ozvGJI91JEAzVIQM=
 +SIZE (mercurial-2.4.tar.gz) = 3607276
 Index: pkg/PLIST
 ===
 RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
 retrieving revision 1.25
 diff -u -p -r1.25 PLIST
 --- pkg/PLIST 8 Sep 2012 08:00:45 -   1.25
 +++ pkg/PLIST 27 Nov 2012 08:20:17 -
 @@ -527,7 +527,6 @@ lib/python${MODPY_VERSION}/site-packages
  
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-monoblue.css
  
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-paper.css
  lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style.css
 -lib/python${MODPY_VERSION}/site-packages/mercurial/templates/template-vars.txt
  lib/python${MODPY_VERSION}/site-packages/mercurial/transaction.py
  lib/python${MODPY_VERSION}/site-packages/mercurial/transaction.pyc
  lib/python${MODPY_VERSION}/site-packages/mercurial/treediscovery.py

Re: Possible issue with leiningen-1.6.2

2012-11-27 Thread Samir SAADA 
On Wed, Dec 28, 2011 at 03:24:49PM -0500, Scott Scites wrote:
 Is anyone else have the following issue with leiningen on OpenBSD-current:
 $ lein
 
 Exception in thread main java.io.FileNotFoundException: Could not locate
 leiningen/main__init.class or leiningen/main.clj on classpath:
 at clojure.lang.RT.load(RT.java:430)
 at clojure.lang.RT.load(RT.java:398)
 at clojure.core$load$fn__4610.invoke(core.clj:5386)

is the leiningen-xxx.jar is installed anyway?

Re: Possible issue with leiningen-1.6.2

2012-11-27 Thread Samir SAADA 

 Any advice on what I am doing wrong?
 

use the upstream's bin/lein script if you're stuck,
not much effot to make it work.

Re: [wip] Python 3.2.1: make regress

2011-07-27 Thread Samir SAADA 
Hi,
here's for mips64el (loogson)
5.0 GENERIC#11 loongson

Samir.




No soap, honkie-lips.
===  Regression check for Python-3.2.1
ldd: /usr/lib/libreadline.a: not an ELF executable
building dbm using ndbm

Python build finished, but the necessary bits to build these modules were not 
found:
ossaudiodevspwd   
To find the necessary bits, look in setup.py in detect_modules() for the 
module's name.

find ./Lib -name '*.py[co]' -print | xargs rm -f
LD_LIBRARY_PATH=/usr/obj/pobj/Python-3.2.1/Python-3.2.1: ./python -Wd -E -bb  
./Lib/test/regrtest.py -l -w
== CPython 3.2.1 (default, Jul 26 2011, 22:55:25) [GCC 4.2.1 20070719 ]
==   OpenBSD-5.0-loongson-Loongson_2F-64bit-ELF little-endian
==   /usr/obj/pobj/Python-3.2.1/Python-3.2.1/build/test_python_19983
Testing with flags: sys.flags(debug=0, division_warning=0, inspect=0, 
interactive=0, optimize=0, dont_write_bytecode=0, no_user_site=0, no_site=0, 
ignore_environment=1, verbose=0, bytes_warning=2, quiet=0)
[  1/352] test_grammar
[  2/352] test_opcodes
[  3/352] test_dict
[  4/352] test_builtin
[  5/352] test_exceptions
[  6/352] test_types
[  7/352] test_unittest
[  8/352] test_doctest
[  9/352] test_doctest2
[ 10/352] test___all__
[ 11/352] test___future__
[ 12/352] test__locale
[ 13/352] test_abc
[ 14/352] test_abstract_numbers
[ 15/352] test_aifc
[ 16/352] test_argparse
test test_argparse failed -- multiple errors occurred; run in verbose mode for 
details
[ 17/352/1] test_array
[ 18/352/1] test_ast
[ 19/352/1] test_asynchat
[ 20/352/1] test_asyncore
[ 21/352/1] test_atexit
[ 22/352/1] test_audioop
[ 23/352/1] test_augassign
[ 24/352/1] test_base64
[ 25/352/1] test_bigaddrspace
[ 26/352/1] test_bigmem
[ 27/352/1] test_binascii
[ 28/352/1] test_binhex
[ 29/352/1] test_binop
[ 30/352/1] test_bisect
[ 31/352/1] test_bool
[ 32/352/1] test_bufio
[ 33/352/1] test_bytes
[ 34/352/1] test_bz2
[ 35/352/1] test_calendar
[ 36/352/1] test_call
[ 37/352/1] test_capi
[ 38/352/1] test_cfgparser
[ 39/352/1] test_cgi
[ 40/352/1] test_charmapcodec
[ 41/352/1] test_class
[ 42/352/1] test_cmath
test test_cmath failed -- Traceback (most recent call last):
  File /usr/obj/pobj/Python-3.2.1/Python-3.2.1/Lib/test/test_cmath.py, line 
380, in test_specific_values
msg=error_message)
  File /usr/obj/pobj/Python-3.2.1/Python-3.2.1/Lib/test/test_cmath.py, line 
146, in rAssertAlmostEqual
'{!r} and {!r} are not sufficiently close'.format(a, b))
AssertionError: log0010: log(complex(-1e-323, 0.0))
Expected: complex(-743.7469247408213, 3.141592653589793)
Received: complex(inf, 3.141592653589793)
Received value insufficiently close to expected value.

[ 43/352/2] test_cmd
[ 44/352/2] test_cmd_line
[ 45/352/2] test_cmd_line_script
[ 46/352/2] test_code
[ 47/352/2] test_codeccallbacks
[ 48/352/2] test_codecencodings_cn
[ 49/352/2] test_codecencodings_hk
[ 50/352/2] test_codecencodings_iso2022
[ 51/352/2] test_codecencodings_jp
[ 52/352/2] test_codecencodings_kr
[ 53/352/2] test_codecencodings_tw
[ 54/352/2] test_codecmaps_cn
test_codecmaps_cn skipped -- Use of the `urlfetch' resource not enabled
[ 55/352/2] test_codecmaps_hk
test_codecmaps_hk skipped -- Use of the `urlfetch' resource not enabled
[ 56/352/2] test_codecmaps_jp
test_codecmaps_jp skipped -- Use of the `urlfetch' resource not enabled
[ 57/352/2] test_codecmaps_kr
test_codecmaps_kr skipped -- Use of the `urlfetch' resource not enabled
[ 58/352/2] test_codecmaps_tw
test_codecmaps_tw skipped -- Use of the `urlfetch' resource not enabled
[ 59/352/2] test_codecs
[ 60/352/2] test_codeop
[ 61/352/2] test_coding
[ 62/352/2] test_collections
[ 63/352/2] test_colorsys
[ 64/352/2] test_compare
[ 65/352/2] test_compile
[ 66/352/2] test_compileall
[ 67/352/2] test_complex
[ 68/352/2] test_concurrent_futures
test_concurrent_futures skipped -- This platform lacks a functioning sem_open 
implementation, therefore, the required synchronization primitives needed will 
not function, see issue 3770.
[ 69/352/2] test_contains
[ 70/352/2] test_contextlib
[ 71/352/2] test_copy
[ 72/352/2] test_copyreg
[ 73/352/2] test_cprofile
[ 74/352/2] test_crypt
[ 75/352/2] test_csv
[ 76/352/2] test_ctypes
Bus error (core dumped) 
*** Error code 138 (ignored)
LD_LIBRARY_PATH=/usr/obj/pobj/Python-3.2.1/Python-3.2.1: ./python -Wd -E -bb  
./Lib/test/regrtest.py -l -w
== CPython 3.2.1 (default, Jul 26 2011, 22:55:25) [GCC 4.2.1 20070719 ]
==   OpenBSD-5.0-loongson-Loongson_2F-64bit-ELF little-endian
==   /usr/obj/pobj/Python-3.2.1/Python-3.2.1/build/test_python_411
Testing with flags: sys.flags(debug=0, division_warning=0, inspect=0, 
interactive=0, optimize=0, dont_write_bytecode=0, no_user_site=0, no_site=0, 
ignore_environment=1, verbose=0, bytes_warning=2, quiet=0)
[  1/352] test_grammar
[  2/352] test_opcodes
[  3/352] test_dict
[  4/352] test_builtin
[  5/352] test_exceptions
[  6/352] test_types
[  7/352] test_unittest
[  8/352] test_doctest
[  9/352] test_doctest2
[ 10/352] test___all__
[ 11/352] test___future__
[

Re: WIP: net/weechat

2011-06-25 Thread Samir SAADA 
On Sun, Jun 12, 2011 at 07:49:51PM +0200, Jona Joachim wrote:
 This is my preliminary port for weechat 0.3.5.
 I tested it on i386 and amd64.
 
 
 WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat
 environment for many operating systems. Everything can be done with a
 keyboard. It is customizable and extensible with scripts.
 
 Please test  comment.
 

works ok on loognson,
I think python would be better in FLAVORS though.

Samir.

Re: HEADS UP: system python changed to 2.7

2011-06-13 Thread Samir SAADA 
Hi,
with this patch I can compile pyhton 2.7 on loongson,
the same modifications are used in devel/libffi,
I don't know if there are side effects on ctypes though.

Samir.


regress test ok:
test_ctypes
/usr/obj/pobj/Python-2.7.1/Python-2.7.1/Lib/ctypes/util.py:180: 
DeprecationWarning: the cmp argument is not supported in 3.x
  res.sort(cmp= lambda x,y: cmp(_num_version(x), _num_version(y)))
*** Signal 10


Index: lang/python/2.7/patches/patch-Modules__ctypes_libffi_src_mips_ffitarget_h
===
RCS file: 
lang/python/2.7/patches/patch-Modules__ctypes_libffi_src_mips_ffitarget_h
diff -N 
lang/python/2.7/patches/patch-Modules__ctypes_libffi_src_mips_ffitarget_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ lang/python/2.7/patches/patch-Modules__ctypes_libffi_src_mips_ffitarget_h   
13 Jun 2011 16:58:06 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- Modules/_ctypes/libffi/src/mips/ffitarget.h.orig   Mon Jun 13 14:31:24 2011
 Modules/_ctypes/libffi/src/mips/ffitarget.hMon Jun 13 14:36:33 2011
+@@ -27,10 +27,12 @@
+ #ifndef LIBFFI_TARGET_H
+ #define LIBFFI_TARGET_H
+ 
+-#ifdef linux
+-# include asm/sgidefs.h
+-#else
+-# include sgidefs.h
++#if !defined(__OpenBSD__)
++#  ifdef linux
++#include asm/sgidefs.h
++#  else
++#include sgidefs.h
++#  endif
+ #endif
+ #  ifndef _ABIN32
+ #define _ABIN32 _MIPS_SIM_NABI32

Re: HEADS UP: system python changed to 2.7

2011-06-13 Thread Samir SAADA 
On Mon, Jun 13, 2011 at 07:27:07PM +0200, Samir SAADA wrote:
 Hi,
 with this patch I can compile pyhton 2.7 on loongson,
 the same modifications are used in devel/libffi,
 I don't know if there are side effects on ctypes though.
 
 regress test ok:
 test_ctypes
 /usr/obj/pobj/Python-2.7.1/Python-2.7.1/Lib/ctypes/util.py:180: 
 DeprecationWarning: the cmp argument is not supported in 3.x
   res.sort(cmp= lambda x,y: cmp(_num_version(x), _num_version(y)))
 *** Signal 10

woops I missed this one regress test:

test test_cmath failed -- Traceback (most recent call last):
  File /usr/obj/pobj/Python-2.7.1/Python-2.7.1/Lib/test/test_cmath.py, line 
350, in test_specific_values
msg=error_message)
  File /usr/obj/pobj/Python-2.7.1/Python-2.7.1/Lib/test/test_cmath.py, line 
112, in rAssertAlmostEqual
'{!r} and {!r} are not sufficiently close'.format(a, b))
AssertionError: log0010: log(complex(-1e-323, 0.0))
Expected: complex(-743.7469247408213, 3.141592653589793)
Received: complex(inf, 3.141592653589793)
Received value insufficiently close to expected value.

www/privoxy patch, don't modify --user's value

2011-04-25 Thread Samir SAADA 
Hi,

here I avoid changing the --user option's value.
this way pkill will be happy in rc.subr

+ result of update-patches on old patches

Samir.


Index: www/privoxy/Makefile
===
RCS file: /cvs/ports/www/privoxy/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- www/privoxy/Makefile25 Mar 2011 07:01:14 -  1.23
+++ www/privoxy/Makefile25 Apr 2011 19:38:47 -
@@ -7,7 +7,7 @@
 PKGNAME=   privoxy-${V}
 CATEGORIES=www
 
-REVISION=  0
+REVISION=  1
 
 HOMEPAGE=  http://www.privoxy.org/
 
Index: www/privoxy/patches/patch-GNUmakefile_in
===
RCS file: /cvs/ports/www/privoxy/patches/patch-GNUmakefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-GNUmakefile_in
--- www/privoxy/patches/patch-GNUmakefile_in26 Mar 2009 18:58:03 -  
1.5
+++ www/privoxy/patches/patch-GNUmakefile_in25 Apr 2011 19:38:47 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-GNUmakefile_in,v 1.5 2009/03/26 18:58:03 merdely Exp $
 GNUmakefile.in.origFri Jul 18 13:50:47 2008
-+++ GNUmakefile.in Thu Mar 26 14:23:35 2009
-@@ -225,7 +225,7 @@ PTHREAD_LIB  = @PTHREAD_ONLY@@PTHREAD_LIB@
+--- GNUmakefile.in.origSat Feb 20 13:53:30 2010
 GNUmakefile.in Mon Apr 25 20:28:04 2011
+@@ -223,7 +223,7 @@ PTHREAD_LIB  = @PTHREAD_ONLY@@PTHREAD_LIB@
  SRCS = $(C_SRC)  $(W32_SRC)  $(PCRS_SRC)  $(PCRE_SRC)  $(REGEX_SRC)
  OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS)
  HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS)
Index: www/privoxy/patches/patch-configure_in
===
RCS file: /cvs/ports/www/privoxy/patches/patch-configure_in,v
retrieving revision 1.4
diff -u -r1.4 patch-configure_in
--- www/privoxy/patches/patch-configure_in  26 Mar 2009 18:58:03 -  
1.4
+++ www/privoxy/patches/patch-configure_in  25 Apr 2011 19:38:47 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure_in,v 1.4 2009/03/26 18:58:03 merdely Exp $
 configure.in.orig  Wed Aug 13 12:53:50 2008
-+++ configure.in   Thu Mar 26 14:29:02 2009
-@@ -842,24 +842,6 @@ fi
+--- configure.in.orig  Sat Oct 30 17:57:50 2010
 configure.in   Mon Apr 25 20:28:10 2011
+@@ -331,24 +331,6 @@ fi
  AC_SUBST(WDUMP)
  AC_SUBST(DB2HTML)
  
@@ -26,7 +26,7 @@
  dnl Set doc status flag for conditional content inclusions
  DOC_STATUS=p-not-stable
  if  test $CODE_STATUS = stable; then
-@@ -1399,7 +1381,7 @@ if test $have_pcre = yes; then
+@@ -942,7 +924,7 @@ if test $have_pcre = yes; then
echo using libpcre
pcre_dyn=yes
STATIC_PCRE_ONLY=#
Index: www/privoxy/patches/patch-jcc_c
===
RCS file: www/privoxy/patches/patch-jcc_c
diff -N www/privoxy/patches/patch-jcc_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ www/privoxy/patches/patch-jcc_c 25 Apr 2011 19:38:47 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- jcc.c.orig Sat Nov  6 12:48:32 2010
 jcc.c  Mon Apr 25 20:14:13 2011
+@@ -2845,7 +2845,6 @@ int main(int argc, char **argv)
+ #ifdef unix
+struct passwd *pw = NULL;
+struct group *grp = NULL;
+-   char *p;
+int do_chroot = 0;
+char *pre_chroot_nslookup_to_load_resolver = NULL;
+ #endif
+@@ -2932,6 +2931,7 @@ int main(int argc, char **argv)
+   {
+  if (++argc_pos == argc) usage(argv[argc_pos]);
+ 
++ char *p = NULL;
+  if ((NULL != (p = strchr(argv[argc_pos], '.')))  *(p + 1) != '0')
+  {
+ *p++ = '\0';
+@@ -2946,7 +2946,7 @@ int main(int argc, char **argv)
+ log_error(LOG_LEVEL_FATAL, User %s not found., argv[argc_pos]);
+  }
+ 
+- if (p != NULL) *--p = '\0';
++ if (p != NULL) *--p = '.';
+   }
+ 
+   else if (strcmp(argv[argc_pos], --pre-chroot-nslookup ) == 0)

Update devel/mercurial 1.7.3 - 1.8.1

2011-03-25 Thread Samir SAADA 
Hello.

bump version number.
stripped post-build script for man pages.

man pages are well formatted in this release (compared to 1.7.3)

Samir.


Index: devel/mercurial/Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- devel/mercurial/Makefile10 Jan 2011 21:46:11 -  1.35
+++ devel/mercurial/Makefile25 Mar 2011 20:46:25 -
@@ -2,7 +2,7 @@
 
 COMMENT =  fast, lightweight source control management
 
-MODPY_EGG_VERSION =1.7.3
+MODPY_EGG_VERSION =1.8.1
 DISTNAME = mercurial-${MODPY_EGG_VERSION}
 CATEGORIES =   devel
 
@@ -35,14 +35,6 @@
 SCRIPTS =  convert-repo hg-ssh hgk \
tcsh_completion_build.sh dumprevlog \
undumprevlog simplemerge
-
-# Zap rst2man gunk that confuses nroff/mandoc.
-post-build:
-.  for file in hg.1 hgignore.5 hgrc.5
-   @cd ${WRKSRC}/doc  \
-   mv ${file} ${file}.orig  \
-   sed -e '/rst2man-indent-level/,/^\.SH/d'  ${file}.orig  
${file}
-.  endfor
 
 post-install:
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
Index: devel/mercurial/distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- devel/mercurial/distinfo5 Jan 2011 17:20:13 -   1.23
+++ devel/mercurial/distinfo25 Mar 2011 20:46:25 -
@@ -1,5 +1,5 @@
-MD5 (mercurial-1.7.3.tar.gz) = HWNa0wf6IKXpxq+6YUWnOw==
-RMD160 (mercurial-1.7.3.tar.gz) = SQQH0Hi5JXP6DOgJvswUq+FAd2M=
-SHA1 (mercurial-1.7.3.tar.gz) = MrUT4ZTxaHkQyq5bC7Kgc2q7mjo=
-SHA256 (mercurial-1.7.3.tar.gz) = GKWAgthYDIjHZFOkyb7Cd7oJe6nRMxyrRUu/RvwXRe4=
-SIZE (mercurial-1.7.3.tar.gz) = 2482093
+MD5 (mercurial-1.8.1.tar.gz) = 4KjPymmqQAPqMYeu1gnV4A==
+RMD160 (mercurial-1.8.1.tar.gz) = XhGuBAp4Kt0XGc9ddc4iM4vQk9U=
+SHA1 (mercurial-1.8.1.tar.gz) = FSwZ7tTigJ7ArKHDpi6OVh4YT8M=
+SHA256 (mercurial-1.8.1.tar.gz) = +t6gQ2QbADEyJJ/UQDKcQvqfA1NL3VGsmEBLXbyIqjE=
+SIZE (mercurial-1.8.1.tar.gz) = 2529579
Index: devel/mercurial/patches/patch-tests_run-tests_py
===
RCS file: /cvs/ports/devel/mercurial/patches/patch-tests_run-tests_py,v
retrieving revision 1.2
diff -u -r1.2 patch-tests_run-tests_py
--- devel/mercurial/patches/patch-tests_run-tests_py1 Aug 2009 03:21:46 
-   1.2
+++ devel/mercurial/patches/patch-tests_run-tests_py25 Mar 2011 20:46:25 
-
@@ -1,9 +1,9 @@
 $OpenBSD: patch-tests_run-tests_py,v 1.2 2009/08/01 03:21:46 fgsch Exp $
 tests/run-tests.py.origThu Jul 23 18:58:07 2009
-+++ tests/run-tests.py Mon Jul 27 02:01:17 2009
-@@ -67,7 +67,8 @@ SKIPPED_PREFIX = 'skipped: '
- FAILED_PREFIX  = 'hghave check failed: '
- PYTHON = sys.executable
+--- tests/run-tests.py.origThu Mar 10 18:30:31 2011
 tests/run-tests.py Mon Mar 21 22:36:06 2011
+@@ -74,7 +74,8 @@ IMPL_PATH = 'PYTHONPATH'
+ if 'java' in sys.platform:
+ IMPL_PATH = 'JYTHONPATH'
  
 -requiredtools = [python, diff, grep, unzip, gunzip, bunzip2, 
sed]
 +requiredtools = [diff, grep, unzip, gunzip, bunzip2, sed]
Index: devel/mercurial/pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.17
diff -u -r1.17 PLIST
--- devel/mercurial/pkg/PLIST   22 Nov 2010 00:19:37 -  1.17
+++ devel/mercurial/pkg/PLIST   25 Mar 2011 20:46:25 -
@@ -6,8 +6,6 @@
 lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/acl.py
 lib/python${MODPY_VERSION}/site-packages/hgext/acl.pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/bookmarks.py
-lib/python${MODPY_VERSION}/site-packages/hgext/bookmarks.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
 lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
 lib/python${MODPY_VERSION}/site-packages/hgext/children.py
@@ -115,6 +113,8 @@
 lib/python${MODPY_VERSION}/site-packages/mercurial/ancestor.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/archival.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/archival.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/byterange.py

Re: lang/ghc -- segfaults during build on i386

2010-04-28 Thread Samir SAADA 
On Wed, Apr 28, 2010 at 03:41:00PM +0200, David Coppa wrote:
 On Mon, 26 Apr 2010, Matthias Kilian wrote:
 
  It looks like ghc segfaults quite often during the build on i386 (I got
  reports from at least two people), especially when building haddock with
  the stage-2 ghc.
[snip]
 I'm trying to reproduce the problem running this trivial script many 
 times, but the bastard doesn't want to segfault anymore :(

same here, it builds ok.


Samir.

[NEW] hs-x11-xft

2010-04-14 Thread Samir SAADA 
here a try for haskell's X11-xft.
I am not sure about the namings though.
is USE_X11 enough?

Samir.

Index: Makefile
===
RCS file: Makefile
diff -N Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ Makefile14 Apr 2010 19:12:02 -
@@ -0,0 +1,24 @@
+# $OpenBSD$
+
+COMMENT =  Xft bindings, Xft interface library, and some Xrender 
parts
+
+V =0.3
+DISTNAME = X11-xft-${V}
+PKGNAME =  hs-x11-xft-${V}
+CATEGORIES =   x11
+HOMEPAGE = 
http://hackage.haskell.org/cgi-bin/hackage-scripts/package/${DISTNAME}
+
+
+# LGPLv2.1
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MODULES =  lang/ghc
+MODGHC_BUILD = cabal hackage haddock register
+
+BUILD_DEPENDS =:hs-X11-=1.2.1:x11/hs-X11
+USE_X11 =  Yes
+
+.include bsd.port.mk
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ distinfo14 Apr 2010 19:12:02 -
@@ -0,0 +1,5 @@
+MD5 (X11-xft-0.3.tar.gz) = G0pSiipP5enecV9nWP+QFQ==
+RMD160 (X11-xft-0.3.tar.gz) = 2KFeEolHzsFDcb1IR+abLyXyR70=
+SHA1 (X11-xft-0.3.tar.gz) = XSUE7J6JpXOD1DY9xR4JS1P1WZY=
+SHA256 (X11-xft-0.3.tar.gz) = SIktDQqQ1bR2WId/rKvyd7+EZrc4jq9s4WO4Q0MqVn0=
+SIZE (X11-xft-0.3.tar.gz) = 13684
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR   14 Apr 2010 19:12:02 -
@@ -0,0 +1 @@
+Bindings to the Xft, X Free Type interface library, and some Xrender parts
Index: pkg/PLIST
===
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/PLIST   14 Apr 2010 19:12:02 -
@@ -0,0 +1,30 @@
+...@comment $OpenBSD$
+lib/${DISTNAME}/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Graphics/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Graphics/X11/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Graphics/X11/Xft.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Graphics/X11/Xrender.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HS${DISTNAME}.o
+lib/${DISTNAME}/ghc-${MODGHC_VER}/libHS${DISTNAME}.a
+lib/${DISTNAME}/register.sh
+...@exec /usr/bin/env HOME=/nonexistent %D/lib/${DISTNAME}/register.sh
+...@unexec-delete /usr/bin/env HOME=/nonexistent 
%D/lib/${DISTNAME}/unregister.sh
+lib/${DISTNAME}/unregister.sh
+share/doc/${DISTNAME}/
+share/doc/${DISTNAME}/LICENSE
+share/doc/${DISTNAME}/html/
+share/doc/${DISTNAME}/html/Graphics-X11-Xft.html
+share/doc/${DISTNAME}/html/Graphics-X11-Xrender.html
+share/doc/${DISTNAME}/html/X11-xft.haddock
+share/doc/${DISTNAME}/html/doc-index.html
+share/doc/${DISTNAME}/html/frames.html
+share/doc/${DISTNAME}/html/haddock-util.js
+share/doc/${DISTNAME}/html/haddock.css
+share/doc/${DISTNAME}/html/haskell_icon.gif
+share/doc/${DISTNAME}/html/index-frames.html
+share/doc/${DISTNAME}/html/index.html
+share/doc/${DISTNAME}/html/mini_Graphics-X11-Xft.html
+share/doc/${DISTNAME}/html/mini_Graphics-X11-Xrender.html
+share/doc/${DISTNAME}/html/minus.gif
+share/doc/${DISTNAME}/html/plus.gif

[NEW] xmonad-contrib

2010-04-14 Thread Samir SAADA 
usefull stuff for xmonad,
I didn't take the scripts directory, they seems to be common,
tests are broken... they are old and not used I think.
maybe in the next release.
and links to xmonad modules' html documentation is broken.

it depends on hs-x11-xft, posted before.


Index: Makefile
===
RCS file: Makefile
diff -N Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ Makefile14 Apr 2010 21:30:47 -
@@ -0,0 +1,27 @@
+# $OpenBSD$
+
+COMMENT =  Third party extensions for xmonad
+
+V =0.9.1
+DISTNAME = xmonad-contrib-${V}
+PKGNAME =  ${DISTNAME}
+CATEGORIES =   x11
+HOMEPAGE = http://www.xmonad.org/
+
+
+# BSD3
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
+
+MODULES =  lang/ghc
+MODGHC_BUILD = cabal hackage haddock register
+
+BUILD_DEPENDS =:hs-X11-=1.5.0.0:x11/hs-X11 \
+   :xmonad-=0.9.1,0.10:x11/xmonad \
+   ::x11/hs-x11-xft
+
+USE_X11 =  Yes
+
+.include bsd.port.mk
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ distinfo14 Apr 2010 21:30:47 -
@@ -0,0 +1,5 @@
+MD5 (xmonad-contrib-0.9.1.tar.gz) = CablFzh41DufPd0Ts+yVWw==
+RMD160 (xmonad-contrib-0.9.1.tar.gz) = oOLb6kmsM9/CMbGa1JDoLz8VbbM=
+SHA1 (xmonad-contrib-0.9.1.tar.gz) = tuGIZCCzI0fLID8neiGbF3LyqV0=
+SHA256 (xmonad-contrib-0.9.1.tar.gz) = 
tModcdEpA752GHzliJhpcIbnrz73NGiYfLfvA7B27Ec=
+SIZE (xmonad-contrib-0.9.1.tar.gz) = 291348
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/DESCR   14 Apr 2010 21:30:47 -
@@ -0,0 +1,2 @@
+Third party tiling algorithms, configurations and scripts to xmonad,
+a tiling window manager for X.
Index: pkg/PLIST
===
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/PLIST   14 Apr 2010 21:30:48 -
@@ -0,0 +1,607 @@
+...@comment $OpenBSD$
+lib/${DISTNAME}/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HS${DISTNAME}.o
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/Commands.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/ConstrainedResize.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/CopyWindow.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/CycleRecentWS.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/CycleSelectedLayouts.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/CycleWS.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/CycleWindows.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/DeManage.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/DwmPromote.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/DynamicWorkspaces.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/FindEmptyWorkspace.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/FlexibleManipulate.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/FlexibleResize.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/FloatKeys.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/FloatSnap.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/FocusNth.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/GridSelect.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/MessageFeedback.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/MouseGestures.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/MouseResize.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/NoBorders.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/OnScreen.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/PerWorkspaceKeys.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/PhysicalScreens.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/Plane.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/Promote.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/RandomBackground.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/RotSlaves.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/Search.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/SimpleDate.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/SinkAll.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/SpawnOn.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/Submap.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/SwapWorkspaces.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/TagWindows.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/TopicSpace.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/UpdateFocus.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/XMonad/Actions/UpdatePointer.hi

Re: [UPDATE] devel/hs-parsec 3.1.0

2010-04-11 Thread Samir SAADA 
On Sun, Apr 11, 2010 at 06:17:09PM +0200, Matthias Kilian wrote:
 Hi,
 
 On Sat, Apr 10, 2010 at 02:43:25PM +0200, Samir SAADA wrote:
  a small update to hs-parsec 3.0.1
  installed whith kili's ghc-6.12 patch
 
 Thanks, but the .cabal file from `The Haskell Platform' (see
 http://hackage.haskell.org/platform/2010.1.0.0/haskell-platform-2010.1.0.0.tar.gz)
 explicitely wants parsec-2.1.0.1; there's even a comment `-- NOTE,
 not using parsec 3'.
 
 I'm not sure wether parsec-3.0.1 would break anything, but I'd
 prefer to keep it at parsec-2.1.0.1 for now. Once I've committed
 the GHC updated (which still needs a little bit more work), and
 snapshot packages are available, you should probably resubmit this
 diff so it gets the chance of more testing.

you're right,
and after some readings it seems that this version is subject
of some controversies, so I will look at it before maybe re-submit it.

Samir.

[UPDATE] devel/hs-parsec 3.1.0

2010-04-10 Thread Samir SAADA 
hi all.
a small update to hs-parsec 3.0.1
installed whith kili's ghc-6.12 patch

Samir.



Index: Makefile
===
RCS file: /cvs/ports/devel/hs-parsec/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile6 Apr 2010 15:10:56 -   1.1.1.1
+++ Makefile10 Apr 2010 12:26:12 -
@@ -2,7 +2,7 @@
 
 COMMENT =  Monadic parser combinators
 
-DISTNAME = parsec-2.1.0.1
+DISTNAME = parsec-3.1.0
 CATEGORIES =   devel
 HOMEPAGE = http://www.cs.uu.nl/~daan/parsec.html
 
Index: distinfo
===
RCS file: /cvs/ports/devel/hs-parsec/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo6 Apr 2010 15:10:56 -   1.1.1.1
+++ distinfo10 Apr 2010 12:26:12 -
@@ -1,5 +1,5 @@
-MD5 (parsec-2.1.0.1.tar.gz) = VX2TUBnsTZZvIQP98ajFWQ==
-RMD160 (parsec-2.1.0.1.tar.gz) = ld3JGZ8dpeB3PbL2U9OU2+B5dO4=
-SHA1 (parsec-2.1.0.1.tar.gz) = 8Jx/y/ZsOcxN4qUNuxN0uoIWi1I=
-SHA256 (parsec-2.1.0.1.tar.gz) = LYXltciysfNBA3zmfh23+kezHAgxNnls/vnluUXGVt8=
-SIZE (parsec-2.1.0.1.tar.gz) = 15430
+MD5 (parsec-3.1.0.tar.gz) = MQvyM9z47GeMQnsRmHALUw==
+RMD160 (parsec-3.1.0.tar.gz) = w+/tC27xO2UaxSGmDGn7bywZihI=
+SHA1 (parsec-3.1.0.tar.gz) = C1DiJuZh4fph5LrWwrnaiqnqOdE=
+SHA256 (parsec-3.1.0.tar.gz) = li05lEuuGLD+pglhx3UT9FX5XA9nrksQqxVISie2+5g=
+SIZE (parsec-3.1.0.tar.gz) = 26941
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/hs-parsec/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   6 Apr 2010 15:10:56 -   1.1.1.1
+++ pkg/PLIST   10 Apr 2010 12:26:12 -
@@ -3,6 +3,21 @@
 lib/${DISTNAME}/ghc-${MODGHC_VER}/
 lib/${DISTNAME}/ghc-${MODGHC_VER}/HS${DISTNAME}.o
 lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/ByteString/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/ByteString.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/ByteString/Lazy.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Char.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Combinator.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Error.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Expr.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Language.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Perm.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Pos.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Prim.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/String.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/Parsec/Token.hi
 lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/ParserCombinators/
 lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/ParserCombinators/Parsec/
 lib/${DISTNAME}/ghc-${MODGHC_VER}/Text/ParserCombinators/Parsec.hi
@@ -23,6 +38,19 @@
 share/doc/${DISTNAME}/
 share/doc/${DISTNAME}/LICENSE
 share/doc/${DISTNAME}/html/
+share/doc/${DISTNAME}/html/Text-Parsec-ByteString-Lazy.html
+share/doc/${DISTNAME}/html/Text-Parsec-ByteString.html
+share/doc/${DISTNAME}/html/Text-Parsec-Char.html
+share/doc/${DISTNAME}/html/Text-Parsec-Combinator.html
+share/doc/${DISTNAME}/html/Text-Parsec-Error.html
+share/doc/${DISTNAME}/html/Text-Parsec-Expr.html
+share/doc/${DISTNAME}/html/Text-Parsec-Language.html
+share/doc/${DISTNAME}/html/Text-Parsec-Perm.html
+share/doc/${DISTNAME}/html/Text-Parsec-Pos.html
+share/doc/${DISTNAME}/html/Text-Parsec-Prim.html
+share/doc/${DISTNAME}/html/Text-Parsec-String.html
+share/doc/${DISTNAME}/html/Text-Parsec-Token.html
+share/doc/${DISTNAME}/html/Text-Parsec.html
 share/doc/${DISTNAME}/html/Text-ParserCombinators-Parsec-Char.html
 share/doc/${DISTNAME}/html/Text-ParserCombinators-Parsec-Combinator.html
 share/doc/${DISTNAME}/html/Text-ParserCombinators-Parsec-Error.html
@@ -61,6 +89,19 @@
 share/doc/${DISTNAME}/html/haskell_icon.gif
 share/doc/${DISTNAME}/html/index-frames.html
 share/doc/${DISTNAME}/html/index.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-ByteString-Lazy.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-ByteString.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Char.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Combinator.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Error.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Expr.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Language.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Perm.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Pos.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Prim.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-String.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec-Token.html
+share/doc/${DISTNAME}/html/mini_Text-Parsec.html
 share/doc/${DISTNAME}/html/mini_Text-ParserCombinators-Parsec-Char.html

Re: update: x11/xmonad

2010-04-09 Thread Samir SAADA 
On Fri, Apr 09, 2010 at 10:52:55PM +0200, Matthias Kilian wrote:
 Update to xmonad-0.9.1.
 
 Needs a current portstree and the ghc update.
 
 Ciao,
   Kili
 

Works fine here (i386),  thanks'

Samir.

Re: [UPDATE] mercurial 1.5

2010-03-30 Thread Samir SAADA 
On Tue, Mar 30, 2010 at 08:22:27AM -0500, Will Maier wrote:
   COMMENT =  fast, lightweight source control management
   
  -MODPY_EGG_VERSION =1.4.2
  +MODPY_EGG_VERSION =1.5
 
 1.5.1 is due tomorrow, so I don't plan to update until it's released.
 

of course, with bug fixes it would be better.

[PATCH] devel/mercurial broken man pages

2010-03-28 Thread Samir SAADA 
I managed mercurial man pages to be readable this way.
the .ftr can be put in troffrc and reformatting the title is optional.
hope can be usefull.

Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile12 Jan 2010 14:04:29 -  1.23
+++ Makefile28 Mar 2010 13:48:46 -
@@ -34,6 +34,9 @@
undumprevlog rewrite-log simplemerge
 
 post-install:
+   @perl -pi -e 's|^(\.TH HG 1 )  (Mercurial Manual.*)|\.ftr C 
R\n\1\2|; \
+   s|\\:||g; \
+   s|^(\.de)1|\1|' ${WRKSRC}/doc/hg*.?
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgignore.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/hgrc.5 ${PREFIX}/man/man5

[PATCH] devel/mercurial broken man pages

2010-03-28 Thread Samir SAADA 

this one should be better.

Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile12 Jan 2010 14:04:29 -  1.23
+++ Makefile28 Mar 2010 13:48:46 -
@@ -34,6 +34,9 @@
undumprevlog rewrite-log simplemerge
 
 post-install:
+   @perl -pi -e 's|^(\.TH HG.* )  (Mercurial Manual.*)|\.ftr C 
R\n\1\2|; \
+   s|\\:||g; \
+   s|^(\.de)1|\1|' ${WRKSRC}/doc/hg*.?
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgignore.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/hgrc.5 ${PREFIX}/man/man5

Re: pdfimport in openoffice

2009-11-28 Thread Samir SAADA 
On Sun, Nov 22, 2009 at 01:16:36PM +0100, Matthias Kilian wrote:
 On Sat, Nov 21, 2009 at 11:22:29PM +0100, Matthias Kilian wrote:
   the import features was through the sun extension before,
   I think it is still that way.
  
  So the OOo port is building the included xpdf and doesn't use it?
  
  (Sorry if I sound stupid -- I *am* stupid, especially if it comes to
  programs like OOo)
 
 Great fun: you have to enable the pdfimport extension using something
 like
 
 /usr/local/openoffice.org3/program/unopkg add 
 /usr/local/openoffice.org3/share/extension/install/pdfimport.oxt
 
 then you get the contents of pdfimport.oxt (which is a zip file)
 unpacked somewhere under ~/.openoffice.org
 
Or open in tools menu the extension manager.
point it to the extension (*.oxt) you need.
done.
well looks like Firefox's plugin manager and others'

Re: NEW: weechat

2009-09-23 Thread Samir SAADA 
On Sat, Sep 05, 2009 at 08:18:40PM +0800, Zak B. Elep wrote:
 On Sat, 2009-09-05 at 13:44 +0200, Simon Bertrang wrote:
 
 Also, I've prepared in advance a port for the development version of
 WeeChat, which now builds using CMake, but still shares the same
 organization.  I'll adapt the MULTI_PACKAGES work you did for it.
 
played with it a while ago. It had a problem setting the encoding on current
at that time.
then ended with an ugly workaround: 
https://savannah.nongnu.org/patch/?6871