update Sat Jun 19 18:37:00 PDT 2010

diff --git a/doc/TODO b/doc/TODO
index bdc34bb..db42def 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9423 2010/06/19 14:48:14 wiz Exp $
+$NetBSD: TODO,v 1.9424 2010/06/19 23:05:58 tron Exp $
 
 Suggested new packages
 ======================
@@ -929,6 +929,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o matchbox-panel-0.9.3
        o mathomatic-15.1.3
        o mc-4.7.0.5
+       o mediatomb-0.12.1
        o memconf-2.9 [pkg/40201]
        o merb-1.0.8.1
        o merb-action-args-1.0.8.1

diff --git a/wip/ar7/distinfo b/wip/ar7/distinfo
index 3565c31..0f330f2 100644 (file)
--- a/wip/ar7/distinfo
+++ b/wip/ar7/distinfo
@@ -3,5 +3,5 @@ $NetBSD$
 SHA1 (ar7-0.1.tar.gz) = 76c2373f5890e7a511ac78c90c05f03ff60a644d
 RMD160 (ar7-0.1.tar.gz) = 482696b197fdbefd6cad69a8f4ed50025c2c2258
 Size (ar7-0.1.tar.gz) = 79230 bytes
-SHA1 (patch-aa) = 8601b28856197e172423cd02db32171ed9b46ff6
-SHA1 (patch-ab) = 04484effa7edfaa6081eb840d4eac87ea7ab2f85
+SHA1 (patch-aa) = 4886219149eca3fe67b4f76f8be24d51b3adace5
+SHA1 (patch-ab) = 55757452a59a3584f7617c5874548a369bb32ea6

diff --git a/wip/ar7/patches/patch-aa b/wip/ar7/patches/patch-aa
index 460b684..946e0fa 100644 (file)
--- a/wip/ar7/patches/patch-aa
+++ b/wip/ar7/patches/patch-aa
@@ -1,10 +1,16 @@
 $NetBSD$
 
---- src/net.h.orig     Sat Nov  8 23:02:14 2008
-+++ src/net.h  Sat Nov  8 23:02:43 2008
-@@ -1,4 +1,5 @@
+--- src/net.h.orig     2006-05-20 19:53:42.000000000 +0200
++++ src/net.h  2010-06-20 00:23:07.000000000 +0200
+@@ -1,7 +1,11 @@
  #if !defined(__WIN32__)
 +    #include <sys/types.h>
      #include <sys/socket.h> 
      #include <netinet/in.h> 
      #include <netdb.h>
++    #ifdef HAVE_UNISTD_H
++        #include <unistd.h>
++    #endif
+ #else
+     #include <winsock2.h>
+ #endif

diff --git a/wip/ar7/patches/patch-ab b/wip/ar7/patches/patch-ab
index ca1b8f0..14e6cb9 100644 (file)
--- a/wip/ar7/patches/patch-ab
+++ b/wip/ar7/patches/patch-ab
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- src/logic.c.orig   2009-11-08 10:49:06.920001000 +0100
-+++ src/logic.c        2009-11-08 10:51:26.039999000 +0100
-@@ -2,7 +2,13 @@
+--- src/logic.c.orig   2006-05-24 14:05:53.000000000 +0200
++++ src/logic.c        2010-06-20 00:36:47.000000000 +0200
+@@ -2,9 +2,17 @@
  #include "err.h"
  #include <stdio.h>
  #include <string.h>
@@ -15,4 +15,8 @@ $NetBSD$
 +#endif
  
  #include "defaults.h"
++#include "net.h" /* needed for get_sock() */
++
  int ar7_login(int fd, const char *user, const char *pass)
+ {
+ 

diff --git a/wip/othman/Makefile b/wip/othman/Makefile
index f12170c..d85dedd 100644 (file)
--- a/wip/othman/Makefile
+++ b/wip/othman/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD$
 #
 
-VERS=  0.2.0
-DISTNAME=      othman-master
-PKGNAME=       ${DISTNAME:S/-master//}-${VERS}
+VERS=  0.2.5
+DISTNAME=      othman-${VERS}
 PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://git.ojuba.org/cgit/othman/snapshot/
@@ -12,9 +11,6 @@ EXTRACT_SUFX= .tar.bz2
 MAINTAINER=    kamelderouiche@yahoo.com
 HOMEPAGE=      http://othman.ojuba.org/
 COMMENT=       Electronic Quran browser
-#LICENSE=      # TODO: (see mk/license.mk)
-
-DEPENDS+=      ${PYPKGPREFIX}-sqlite-[0-9]*:../../databases/py-sqlite3
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 

diff --git a/wip/othman/PLIST b/wip/othman/PLIST
index 9cdf764..d381b28 100644 (file)
--- a/wip/othman/PLIST
+++ b/wip/othman/PLIST
@@ -9,6 +9,7 @@ ${PYSITELIB}/othman/core.pyo
 ${PYSITELIB}/othman/gtkUi.py
 ${PYSITELIB}/othman/gtkUi.pyc
 ${PYSITELIB}/othman/gtkUi.pyo
+share/applications/Othman.desktop.in
 share/othman/quran-kareem.png
 share/othman/quran-kareem.svg
 share/othman/quran.db

diff --git a/wip/othman/distinfo b/wip/othman/distinfo
index a07061f..9d9b2da 100644 (file)
--- a/wip/othman/distinfo
+++ b/wip/othman/distinfo
@@ -1,5 +1,6 @@
 $NetBSD$
 
-SHA1 (othman-master.tar.bz2) = 8f2373c276aaab5852bf5e742d2f6e28411a7ee1
-RMD160 (othman-master.tar.bz2) = b5364fc7c32ecbf761b948effde0c2a80e8b143f
-Size (othman-master.tar.bz2) = 533659 bytes
+SHA1 (othman-0.2.5.tar.bz2) = ddb201154eaae2adf632b624197af8261281d967
+RMD160 (othman-0.2.5.tar.bz2) = 935b5ec8a7323253301f787798e070bd60abaa5b
+Size (othman-0.2.5.tar.bz2) = 533269 bytes
+SHA1 (patch-aa) = 0cc41d21d734a7a6c8600039513b888cc4b10202

diff --git a/wip/othman/patches/patch-aa b/wip/othman/patches/patch-aa
new file mode 100644 (file)
index 0000000..f49356b
--- /dev/null
+++ b/wip/othman/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- setup.py.orig      2010-06-12 18:50:52.000000000 +0000
++++ setup.py   2010-06-20 01:14:17.000000000 +0000
+@@ -6,8 +6,10 @@
+ # to install type: 
+ # python setup.py install --root=/
+ 
++data_files = [ ]
+ locales=map(lambda i: ('share/'+i,[''+i+'/othman.mo',]),glob('locale/*/LC_MESSAGES'))
+-data_files=[('share/othman/',glob('othman-data/*'))]
++data_files.append(('share/othman/',glob('othman-data/*')))
++data_files.append(('/usr/pkg/share/applications',['./Othman.desktop.in']))
+ data_files.extend(locales)
+ setup (name='Othman', version='0.2.2',
+       description='Othman Quran Browser',

diff --git a/wip/py-gevent/Makefile b/wip/py-gevent/Makefile
index c077b5f..b2ca692 100644 (file)
--- a/wip/py-gevent/Makefile
+++ b/wip/py-gevent/Makefile
@@ -19,6 +19,10 @@ USE_LANGUAGES=       c c++
 
 PYDISTUTILSPKG= yes
 
+do-test:
+       ${RUN} cd ${WRKSRC}/greentest; ${SETENV} ${TEST_ENV} ${PYTHONBIN} testrunner.py
+       
+
 BUILDLINK_API_DEPENDS.libevent+=libevent>=0.6
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../lang/python/extension.mk"

diff --git a/wip/py-setupdocs/DESCR b/wip/py-setupdocs/DESCR
new file mode 100644 (file)
index 0000000..5a0c5ca
--- /dev/null
+++ b/wip/py-setupdocs/DESCR
@@ -0,0 +1 @@
+setuptools plugin that automates building of docs from ReST source

diff --git a/wip/py-setupdocs/Makefile b/wip/py-setupdocs/Makefile
new file mode 100644 (file)
index 0000000..0bf7bd7
--- /dev/null
+++ b/wip/py-setupdocs/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD$
+#
+
+DISTNAME=      SetupDocs-1.0.4.tar
+EGG_NAME=      SetupDocs-1.0.4
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/S/s/:S/D/d/:S/.tar//}
+CATEGORIES=    devel
+MASTER_SITES=  http://pypi.python.org/packages/source/S/SetupDocs/
+EXTRACT_SUFX=  .gz#md5=824bcf896b7e4e7c610d65544e28bdd1
+
+MAINTAINER=    kamelderouiche@yahoo.com
+HOMEPAGE=      http://pypi.python.org/pypi/setupdocs
+COMMENT=       Setuptools plugin that automates building of docs from reST source
+
+DEPENDS+=      ${PYPKGPREFIX}-sphinx>=0.6.6:../../textproc/py-sphinx
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+WRKSRC=                ${WRKDIR}/SetupDocs-1.0.4
+USE_LANGUAGES= # none
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"

diff --git a/wip/py-setupdocs/PLIST b/wip/py-setupdocs/PLIST
new file mode 100644 (file)
index 0000000..abf6295
--- /dev/null
+++ b/wip/py-setupdocs/PLIST
@@ -0,0 +1,13 @@
+@comment $NetBSD$
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/setupdocs/__init__.py
+${PYSITELIB}/setupdocs/__init__.pyc
+${PYSITELIB}/setupdocs/__init__.pyo
+${PYSITELIB}/setupdocs/setupdocs.py
+${PYSITELIB}/setupdocs/setupdocs.pyc
+${PYSITELIB}/setupdocs/setupdocs.pyo

diff --git a/wip/py-setupdocs/distinfo b/wip/py-setupdocs/distinfo
new file mode 100644 (file)
index 0000000..8204385
--- /dev/null
+++ b/wip/py-setupdocs/distinfo
@@ -0,0 +1,5 @@
+$NetBSD$
+
+SHA1 (SetupDocs-1.0.4.tar.gz) = e80c622cc30e348e0513746d094a4c41d77d31c9
+RMD160 (SetupDocs-1.0.4.tar.gz) = b127187fbc0b10e4729ee9585f9a380a23bd147c
+Size (SetupDocs-1.0.4.tar.gz) = 7821 bytes

diff --git a/wip/py-texml/Makefile b/wip/py-texml/Makefile
index 0af7b14..ac471ef 100644 (file)
--- a/wip/py-texml/Makefile
+++ b/wip/py-texml/Makefile
@@ -1,7 +1,8 @@
 # $NetBSD$
 #
 
-DISTNAME=      texml-2.0.1
+TEXML_VERSION=         2.0.1
+DISTNAME=      texml-${TEXML_VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    print python
 MASTER_SITES=  http://garr.dl.sourceforge.net/project/getfo/texml/texml-2.0.1/
@@ -19,7 +20,7 @@ PYDISTUTILSPKG=       yes
 
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
-SUBST_SED.paths+=      -e 's,share/man/man1,${PREFIX}/${PKGNAMDIR}/man1,g'
+SUBST_SED.paths+=      -e 's,share/man/man1,${PREFIX}/man/man1,g'
 SUBST_FILES.paths+=    setup.py
 SUBST_MESSAGE.paths=   Fixing header search paths.
 

diff --git a/wip/py-texml/PLIST b/wip/py-texml/PLIST
index 7a4d4d5..9f444f9 100644 (file)
--- a/wip/py-texml/PLIST
+++ b/wip/py-texml/PLIST
@@ -19,7 +19,7 @@ ${PYSITELIB}/Texml/texmlwr.pyo
 ${PYSITELIB}/Texml/unimap.py
 ${PYSITELIB}/Texml/unimap.pyc
 ${PYSITELIB}/Texml/unimap.pyo
-man1/texml.1
+man/man1/texml.1
 share/doc/texml-${PKGVERSION}/graph1.png
 share/doc/texml-${PKGVERSION}/graph2.png
 share/doc/texml-${PKGVERSION}/graph3.png

diff --git a/www/mini_httpd/distinfo b/www/mini_httpd/distinfo
index 087e965..f4b688b 100644 (file)
--- a/www/mini_httpd/distinfo
+++ b/www/mini_httpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/07/07 19:05:23 joerg Exp $
+$NetBSD: distinfo,v 1.8 2010/06/19 21:09:10 asau Exp $
 
 SHA1 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = b156a5e0b9b6e2169ed772a5890fc63d8ed60514
 RMD160 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 4e8ec41bd9238d49481354bcf9404fb11519a667
@@ -6,3 +6,4 @@ Size (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 42063 bytes
 SHA1 (patch-aa) = 1bf0a30eae6303e7692f768227daf1751c73c389
 SHA1 (patch-ab) = bf74dd6f6a921024e0dde08eeff39fdf64706414
 SHA1 (patch-ac) = ccbd255aa5b3580426276e8f2fe211deea3feae5
+SHA1 (patch-ad) = 17fea4bef22eb4f89d442b86378b3b567afa7300

diff --git a/www/mini_httpd/patches/patch-ad b/www/mini_httpd/patches/patch-ad
new file mode 100644 (file)
index 0000000..6739ced
--- /dev/null
+++ b/www/mini_httpd/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2010/06/19 21:09:11 asau Exp $
+
+Avoid clash: getline exists in NetBSD already.
+
+--- htpasswd.c.orig    2001-12-19 03:08:10.000000000 +0300
++++ htpasswd.c 2010-06-20 01:02:53.000000000 +0400
+@@ -49,7 +49,7 @@
+     while((line[y++] = line[x++]));
+ }
+ 
+-static int getline(char *s, int n, FILE *f) {
++static int get_line(char *s, int n, FILE *f) {
+     register int i=0;
+ 
+     while(1) {
+@@ -189,7 +189,7 @@
+     strcpy(user,argv[2]);
+ 
+     found = 0;
+-    while(!(getline(line,MAX_STRING_LEN,f))) {
++    while(!(get_line(line,MAX_STRING_LEN,f))) {
+         if(found || (line[0] == '#') || (!line[0])) {
+             putline(tfp,line);
+             continue;