update Mon Jun 14 06:37:00 PDT 2010
authorCharlie <root@crater.dragonflybsd.org>
Mon, 14 Jun 2010 13:47:05 +0000 (06:47 -0700)
committerCharlie <root@crater.dragonflybsd.org>
Mon, 14 Jun 2010 13:47:05 +0000 (06:47 -0700)
32 files changed:
devel/py-dulwich/Makefile
devel/py-dulwich/PLIST
devel/py-dulwich/distinfo
doc/CHANGES-2010
doc/TODO
editors/emacs-snapshot/Makefile
editors/emacs/Makefile
editors/emacs21/Makefile
editors/emacs22/Makefile
editors/ted/Makefile
editors/ted/PLIST
editors/ted/distinfo
editors/ted/patches/patch-ag
editors/xemacs-current/Makefile
editors/xemacs/Makefile
pkgtools/rpm2pkg/Makefile
pkgtools/rpm2pkg/files/rpm2pkg.c
print/py-reportlab/Makefile
print/py-reportlab/PLIST
print/py-reportlab/distinfo
print/py-reportlab/patches/patch-aa [deleted file]
wip/grub2-current/distinfo
wip/grub2-current/patches/patch-ad
wip/py-asciidata/DESCR [new file with mode: 0644]
wip/py-asciidata/Makefile [new file with mode: 0644]
wip/py-asciidata/PLIST [new file with mode: 0644]
wip/py-asciidata/distinfo [new file with mode: 0644]
wip/py-astropysics/Makefile
wip/py-pyfits/DESCR [new file with mode: 0644]
wip/py-pyfits/Makefile [new file with mode: 0644]
wip/py-pyfits/PLIST [new file with mode: 0644]
wip/py-pyfits/distinfo [new file with mode: 0644]

index 473d22c..ccb59a6 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/02/11 15:04:25 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/14 10:15:15 joerg Exp $
 #
 
-DISTNAME=              dulwich-0.4.1
+DISTNAME=              dulwich-0.6.0
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
 EGG_NAME=              ${DISTNAME}
 CATEGORIES=            devel python
index a3ef5cc..3be8150 100644 (file)
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2010/02/11 15:04:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/06/14 10:15:15 joerg Exp $
 bin/dul-daemon
+bin/dul-web
 bin/dulwich
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -16,6 +17,12 @@ ${PYSITELIB}/dulwich/client.pyo
 ${PYSITELIB}/dulwich/errors.py
 ${PYSITELIB}/dulwich/errors.pyc
 ${PYSITELIB}/dulwich/errors.pyo
+${PYSITELIB}/dulwich/fastexport.py
+${PYSITELIB}/dulwich/fastexport.pyc
+${PYSITELIB}/dulwich/fastexport.pyo
+${PYSITELIB}/dulwich/file.py
+${PYSITELIB}/dulwich/file.pyc
+${PYSITELIB}/dulwich/file.pyo
 ${PYSITELIB}/dulwich/index.py
 ${PYSITELIB}/dulwich/index.pyc
 ${PYSITELIB}/dulwich/index.pyo
@@ -52,6 +59,12 @@ ${PYSITELIB}/dulwich/tests/__init__.pyo
 ${PYSITELIB}/dulwich/tests/test_client.py
 ${PYSITELIB}/dulwich/tests/test_client.pyc
 ${PYSITELIB}/dulwich/tests/test_client.pyo
+${PYSITELIB}/dulwich/tests/test_fastexport.py
+${PYSITELIB}/dulwich/tests/test_fastexport.pyc
+${PYSITELIB}/dulwich/tests/test_fastexport.pyo
+${PYSITELIB}/dulwich/tests/test_file.py
+${PYSITELIB}/dulwich/tests/test_file.pyc
+${PYSITELIB}/dulwich/tests/test_file.pyo
 ${PYSITELIB}/dulwich/tests/test_index.py
 ${PYSITELIB}/dulwich/tests/test_index.pyc
 ${PYSITELIB}/dulwich/tests/test_index.pyo
@@ -67,9 +80,24 @@ ${PYSITELIB}/dulwich/tests/test_objects.pyo
 ${PYSITELIB}/dulwich/tests/test_pack.py
 ${PYSITELIB}/dulwich/tests/test_pack.pyc
 ${PYSITELIB}/dulwich/tests/test_pack.pyo
+${PYSITELIB}/dulwich/tests/test_patch.py
+${PYSITELIB}/dulwich/tests/test_patch.pyc
+${PYSITELIB}/dulwich/tests/test_patch.pyo
 ${PYSITELIB}/dulwich/tests/test_protocol.py
 ${PYSITELIB}/dulwich/tests/test_protocol.pyc
 ${PYSITELIB}/dulwich/tests/test_protocol.pyo
 ${PYSITELIB}/dulwich/tests/test_repository.py
 ${PYSITELIB}/dulwich/tests/test_repository.pyc
 ${PYSITELIB}/dulwich/tests/test_repository.pyo
+${PYSITELIB}/dulwich/tests/test_server.py
+${PYSITELIB}/dulwich/tests/test_server.pyc
+${PYSITELIB}/dulwich/tests/test_server.pyo
+${PYSITELIB}/dulwich/tests/test_web.py
+${PYSITELIB}/dulwich/tests/test_web.pyc
+${PYSITELIB}/dulwich/tests/test_web.pyo
+${PYSITELIB}/dulwich/tests/utils.py
+${PYSITELIB}/dulwich/tests/utils.pyc
+${PYSITELIB}/dulwich/tests/utils.pyo
+${PYSITELIB}/dulwich/web.py
+${PYSITELIB}/dulwich/web.pyc
+${PYSITELIB}/dulwich/web.pyo
index e2539dd..acdceff 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2010/02/11 15:04:25 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/06/14 10:15:15 joerg Exp $
 
-SHA1 (dulwich-0.4.1.tar.gz) = 2c19314ff010579102d55d82326aa4e399ac6dfa
-RMD160 (dulwich-0.4.1.tar.gz) = f6a62acd0f7e91fbb03a115443975e3095f3854e
-Size (dulwich-0.4.1.tar.gz) = 75577 bytes
+SHA1 (dulwich-0.6.0.tar.gz) = 4ef7d920582372f4af690f5fcb1177f343caaf92
+RMD160 (dulwich-0.6.0.tar.gz) = ee8aadfe4661db79c89d4110f349b33f5da6108d
+Size (dulwich-0.6.0.tar.gz) = 127143 bytes
index e86ee92..10cc5b1 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.2210 2010/06/14 04:34:32 seb Exp $
+$NetBSD: CHANGES-2010,v 1.2214 2010/06/14 11:25:01 tron Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -2939,3 +2939,7 @@ Changes to the packages collection and infrastructure in 2010:
        Updated devel/p5-MooseX-Getopt to 0.28 [seb 2010-06-14]
        Updated www/p5-App-Nopaste to 0.22 [seb 2010-06-14]
        Added devel/p5-Parse-CPAN-Packages version 2.31 [seb 2010-06-14]
+       Updated editors/ted to 2.21 [wiz 2010-06-14]
+       Updated devel/py-dulwich to 0.6.0 [joerg 2010-06-14]
+       Updated print/py-reportlab to 2.4 [joerg 2010-06-14]
+       Updated pkgtools/rpm2pkg to 3.0.1 [tron 2010-06-14]
index 501e63a..57f4cd4 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9394 2010/06/14 02:26:11 obache Exp $
+$NetBSD: TODO,v 1.9395 2010/06/14 09:55:15 wiz Exp $
 
 Suggested new packages
 ======================
@@ -1328,7 +1328,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o tdir-1.67
        o tds-1.6.2
        o tea-27.1.0
-       o ted-2.17
        o ted-en-us-2.17
        o tetrinetx-1.40c
        o tex-musixtex-113 [pkg/34758]
index a31f8da..4fa119b 100644 (file)
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2010/06/07 22:44:01 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/14 10:32:24 dholland Exp $
+
+PKGREVISION=1
 
 CONFLICTS+=    emacs-nox11-[0-9]*
 
index 6bc2f5d..64815a2 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.129 2010/06/01 21:44:54 minskim Exp $
+# $NetBSD: Makefile,v 1.130 2010/06/14 09:51:42 dholland Exp $
 
-#PKGREVISION=
+PKGREVISION=1
 
 CONFLICTS+=    emacs-nox11-[0-9]*
 
index 78f0058..9bd9c63 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2010/05/05 14:26:36 roy Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/14 09:55:33 dholland Exp $
 
-PKGREVISION=   18
+PKGREVISION=   19
 CATEGORIES=    editors
 COMMENT=       GNU editing macros (editor)
 
index af6a3bb..ff7baa6 100644 (file)
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2010/02/19 19:46:45 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/14 09:54:42 dholland Exp $
 
 PKGNAME?=      ${DISTNAME}
 COMMENT?=      GNU editing macros (editor)
 
 DISTNAME=      emacs-22.3
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GNU:=emacs/}
 
index 5edc154..62c6fe4 100644 (file)
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2010/06/13 22:44:13 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/14 09:55:04 wiz Exp $
 
-DISTNAME=      ted-2.16.src
-PKGNAME=       ted-2.16
-PKGREVISION=   8
+DISTNAME=      ted-2.21.src
+PKGNAME=       ${DISTNAME:S/.src//}
 CATEGORIES=    editors
 MASTER_SITES=  ftp://ftp.nluug.nl/pub/editors/ted/
 
@@ -13,10 +12,11 @@ COMMENT=    X11 based WordPad-like word processor
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+USE_LANGUAGES= c c++
 USE_TOOLS+=    gtar
+MAKE_JOBS_SAFE=        no
 
-WRKSRC=                ${WRKDIR}/Ted-2.16
-USE_X11BASE=   YES
+WRKSRC=                ${WRKDIR}/Ted-2.21
 
 AFMDIR=                ${PREFIX}/share/Ted/afm
 INDDIR=                ${PREFIX}/share/Ted/ind
@@ -24,9 +24,8 @@ INFODIR=      ${PREFIX}/share/doc/Ted
 
 CONFIGURE_ENV+=        ac_jpeg_includes="${BUILDLINK_PREFIX.jpeg}/include"
 CONFIGURE_ENV+=        ac_jpeg_libraries="${BUILDLINK_PREFIX.jpeg}/lib"
-# disabled, has not been update since about libpng-0.90
-#CONFIGURE_ENV+=       ac_png_includes="${BUILDLINK_PREFIX.png}/include"
-#CONFIGURE_ENV+=       ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
+CONFIGURE_ENV+=        ac_png_includes="${BUILDLINK_PREFIX.png}/include"
+CONFIGURE_ENV+=        ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
 CONFIGURE_ENV+=        ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
 CONFIGURE_ENV+=        ac_tiff_libraries="${BUILDLINK_PREFIX.tiff}/lib"
 CONFIGURE_ENV+=        ac_xm_includes="${BUILDLINK_PREFIX.openmotif}/include"
@@ -47,7 +46,7 @@ MAKE_ENV+=    DEF_PKGDIR='-DPKGDIR=\"${PREFIX}\"' \
 BUILD_TARGET=  compile.shared
 INSTALL_TARGET=        install.shared
 
-INSTALLATION_DIRS=     bin lib/X11/app-defaults
+INSTALLATION_DIRS=     bin lib/X11/app-defaults ${AFMDIR} ${INDDIR} ${INFODIR}
 
 post-extract:
        @cd ${WRKSRC} ; ${GTAR} xf tedPackage/TedBindist.tar
@@ -61,32 +60,16 @@ post-patch:
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/Ted/Ted ${DESTDIR}${PREFIX}/bin/Ted
-       ${INSTALL_DATA_DIR} ${DESTDIR}${AFMDIR}
-       ${INSTALL_DATA} \
-               ${WRKSRC}/afm/Courier-Bold.afm \
-               ${WRKSRC}/afm/Courier-BoldOblique.afm \
-               ${WRKSRC}/afm/Courier-Oblique.afm \
-               ${WRKSRC}/afm/Courier.afm \
-               ${WRKSRC}/afm/Helvetica-Bold.afm \
-               ${WRKSRC}/afm/Helvetica-BoldOblique.afm \
-               ${WRKSRC}/afm/Helvetica-Oblique.afm \
-               ${WRKSRC}/afm/Helvetica.afm \
-               ${WRKSRC}/afm/Symbol.afm \
-               ${WRKSRC}/afm/Times-Bold.afm \
-               ${WRKSRC}/afm/Times-BoldItalic.afm \
-               ${WRKSRC}/afm/Times-Italic.afm \
-               ${WRKSRC}/afm/Times-Roman.afm \
-               ${DESTDIR}${AFMDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${INDDIR}
+       ${INSTALL_DATA} ${WRKSRC}/Ted/afm/*.afm ${DESTDIR}${AFMDIR}
        ${INSTALL_DATA} ${FILESDIR}/README.ind ${DESTDIR}${INDDIR}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${INFODIR}
        ${INSTALL_DATA} ${WRKSRC}/Ted/TedDocument-en_US.rtf ${DESTDIR}${INFODIR}
        ${INSTALL_DATA} ${WRKSRC}/Ted/Ted.ad \
                ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Ted
 
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-#.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
index 7315891..5f2a72e 100644 (file)
@@ -1,18 +1,40 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:50:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/06/14 09:55:04 wiz Exp $
 bin/Ted
+lib/X11/app-defaults/Ted
+share/Ted/afm/AvantGarde-Book.afm
+share/Ted/afm/AvantGarde-BookOblique.afm
+share/Ted/afm/AvantGarde-Demi.afm
+share/Ted/afm/AvantGarde-DemiOblique.afm
+share/Ted/afm/Bookman-Demi.afm
+share/Ted/afm/Bookman-DemiItalic.afm
+share/Ted/afm/Bookman-Light.afm
+share/Ted/afm/Bookman-LightItalic.afm
 share/Ted/afm/Courier-Bold.afm
 share/Ted/afm/Courier-BoldOblique.afm
 share/Ted/afm/Courier-Oblique.afm
 share/Ted/afm/Courier.afm
 share/Ted/afm/Helvetica-Bold.afm
 share/Ted/afm/Helvetica-BoldOblique.afm
+share/Ted/afm/Helvetica-Narrow-Bold.afm
+share/Ted/afm/Helvetica-Narrow-BoldOblique.afm
+share/Ted/afm/Helvetica-Narrow-Oblique.afm
+share/Ted/afm/Helvetica-Narrow.afm
 share/Ted/afm/Helvetica-Oblique.afm
 share/Ted/afm/Helvetica.afm
+share/Ted/afm/NewCenturySchlbk-Bold.afm
+share/Ted/afm/NewCenturySchlbk-BoldItalic.afm
+share/Ted/afm/NewCenturySchlbk-Italic.afm
+share/Ted/afm/NewCenturySchlbk-Roman.afm
+share/Ted/afm/Palatino-Bold.afm
+share/Ted/afm/Palatino-BoldItalic.afm
+share/Ted/afm/Palatino-Italic.afm
+share/Ted/afm/Palatino-Roman.afm
 share/Ted/afm/Symbol.afm
 share/Ted/afm/Times-Bold.afm
 share/Ted/afm/Times-BoldItalic.afm
 share/Ted/afm/Times-Italic.afm
 share/Ted/afm/Times-Roman.afm
-lib/X11/app-defaults/Ted
-share/doc/Ted/TedDocument-en_US.rtf
+share/Ted/afm/ZapfChancery-MediumItalic.afm
+share/Ted/afm/ZapfDingbats.afm
 share/Ted/ind/README.ind
+share/doc/Ted/TedDocument-en_US.rtf
index bb4e54f..0ce88f5 100644 (file)
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.10 2005/07/18 00:46:18 kristerw Exp $
+$NetBSD: distinfo,v 1.11 2010/06/14 09:55:04 wiz Exp $
 
-SHA1 (ted-2.16.src.tar.gz) = 4608e1cdcf0eeb8eb77032544b933d32bcd8e100
-RMD160 (ted-2.16.src.tar.gz) = 024f12c3e75a2d078071d82ec446a0002fd2ed4e
-Size (ted-2.16.src.tar.gz) = 2803601 bytes
+SHA1 (ted-2.21.src.tar.gz) = 303b15de1fe97e473c4b89a88b6e127ee81e07e9
+RMD160 (ted-2.21.src.tar.gz) = 68935d62d216708c7053910f1261353176cf5c72
+Size (ted-2.21.src.tar.gz) = 3956815 bytes
 SHA1 (patch-aa) = d8673fb67176c17beb90a87adebb9ab94a1e15ba
 SHA1 (patch-ab) = 16fa3f2a88a6b252148735f02541833b7ac56b8a
 SHA1 (patch-ac) = 3ad1300b213e925d50e0490587398e7574452aa8
 SHA1 (patch-ad) = a0761bd537cbef20bf80a74eb59c2352a97e4d99
 SHA1 (patch-ae) = 9cea02ede59d7f6a88a0c8ec1f93e5d814e6b994
 SHA1 (patch-af) = 369a2d0324538860c50653a140d660d50c2383b9
-SHA1 (patch-ag) = 1de6cec39070603d690ed6fc8e3e4dc7dc977b76
+SHA1 (patch-ag) = 83f75717fa0d5cf60ba719aeea67ea3d6ef32c7f
index 0aed856..c31c69d 100644 (file)
@@ -1,12 +1,14 @@
-$NetBSD: patch-ag,v 1.1 2005/07/18 00:46:18 kristerw Exp $
+$NetBSD: patch-ag,v 1.2 2010/06/14 09:55:04 wiz Exp $
 
---- appUtil/psTtf.c.orig       Mon Jul 18 02:43:21 2005
-+++ appUtil/psTtf.c    Mon Jul 18 02:43:28 2005
-@@ -1,7 +1,6 @@
- #   include   <stdio.h>
- #   include   <string.h>
- #   include   <stdlib.h>
--#   include   <malloc.h>
+Fix for png-1.4.2.
+
+--- bitmap/bmpng.c.orig        2009-10-16 15:20:57.000000000 +0000
++++ bitmap/bmpng.c
+@@ -284,7 +284,6 @@ static int bpPngiFromBitmap(       png_structp
+                               png_info *                      pngi,
+                               const BitmapDescription *       bd )
+     {
+-    png_info_init( pngi );
+     pngi->width= bd->bdPixelsWide;
+     pngi->height= bd->bdPixelsHigh;
  
- #   define    y0      math_y0
- #   define    y1      math_y1
index 6630081..8b127c8 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/08/26 19:58:43 sno Exp $
+# $NetBSD: Makefile,v 1.68 2010/06/14 10:34:39 dholland Exp $
 
 PKGNAME?=      ${DISTNAME}
 COMMENT?=      *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
@@ -6,7 +6,7 @@ COMMENT?=       *BETA* XEmacs text editor version ${PKGVERSION_NOREV}
 DISTNAME=      xemacs-21.5.27
 EMACSVERSION=  21.5-b27
 EMACS_DISTNAME=        xemacs-${EMACSVERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 
index 5ee474f..c03c783 100644 (file)
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.92 2010/01/24 00:17:56 dholland Exp $
+# $NetBSD: Makefile,v 1.93 2010/06/14 10:33:12 dholland Exp $
 
 PKGNAME?=      ${DISTNAME}
 COMMENT?=      XEmacs text editor version 21
 
 DISTNAME=      xemacs-21.4.17
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
 DISTFILES=     ${DISTNAME}.tar.gz ${DISTNAME}-elc.tar.gz \
index f7c2552..fb51839 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2010/06/13 13:08:51 tron Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/14 11:24:47 tron Exp $
 
-DISTNAME=      rpm2pkg-3.0
+DISTNAME=      rpm2pkg-3.0.1
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
index 7ad65e2..51d7105 100644 (file)
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpm2pkg.c,v 1.9 2010/06/13 13:08:52 tron Exp $ */
+/*     $NetBSD: rpm2pkg.c,v 1.10 2010/06/14 11:24:48 tron Exp $        */
 
 /*-
  * Copyright (c) 2004-2009 The NetBSD Foundation, Inc.
@@ -179,7 +179,7 @@ IsRPMFile(int fd)
 static FileHandle *
 Open(int fd)
 {
-       unsigned char   buffer[4096];
+       unsigned char   buffer[16384];
        size_t          bzMatch, gzMatch;
        int             archive_type;
        off_t           offset;
@@ -197,8 +197,12 @@ Open(int fd)
                        return NULL;
 
                for (i = 0; i < bytes; i++) {
+                       unsigned char cur_char;
+
+                       cur_char = buffer[i];
+
                        /* Look for bzip2 header. */
-                       if (buffer[i] == BZipMagic[bzMatch]) {
+                       if (cur_char == BZipMagic[bzMatch]) {
                                bzMatch++;
                                if (bzMatch == sizeof(BZipMagic)) {
                                        archive_type = 1;
@@ -207,11 +211,11 @@ Open(int fd)
                                        break;
                                }
                        } else {
-                               bzMatch = 0;
+                               bzMatch = (cur_char == BZipMagic[0]) ? 1 : 0;
                        }
 
                        /* Look for gzip header. */
-                       if (buffer[i] == GZipMagic[gzMatch]) {
+                       if (cur_char == GZipMagic[gzMatch]) {
                                gzMatch++;
                                if (gzMatch == sizeof(GZipMagic)) {
                                        archive_type = 2;
@@ -220,10 +224,8 @@ Open(int fd)
                                        break;
                                }
                        } else {
-                               gzMatch = 0;
+                               gzMatch = (cur_char == GZipMagic[0]) ? 1 : 0;
                        }
-
-                       offset++;
                }
        } while (archive_type == 0);
 
index d659c8b..c4272c9 100644 (file)
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:24 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/14 08:51:36 joerg Exp $
 #
 
-DISTNAME=      ReportLab_2_3
-PKGNAME=       ${PYPKGPREFIX}-reportlab-2.3
-PKGREVISION=   1
+DISTNAME=      ReportLab_2_4
+PKGNAME=       ${PYPKGPREFIX}-reportlab-2.4
 CATEGORIES=    print python
 MASTER_SITES=  http://www.reportlab.com/ftp/
 
index 454f390..fa7bdf1 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/10/19 11:17:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/06/14 08:51:36 joerg Exp $
 ${PYSITELIB}/_renderPM.so
 ${PYSITELIB}/_rl_accel.so
 ${PYSITELIB}/pyHnj.so
@@ -12,11 +12,27 @@ ${PYSITELIB}/reportlab/fonts/DarkGarden-readme.txt
 ${PYSITELIB}/reportlab/fonts/DarkGarden.sfd
 ${PYSITELIB}/reportlab/fonts/DarkGardenMK.afm
 ${PYSITELIB}/reportlab/fonts/DarkGardenMK.pfb
+${PYSITELIB}/reportlab/fonts/Sy______.pfb
 ${PYSITELIB}/reportlab/fonts/Vera.ttf
 ${PYSITELIB}/reportlab/fonts/VeraBI.ttf
 ${PYSITELIB}/reportlab/fonts/VeraBd.ttf
 ${PYSITELIB}/reportlab/fonts/VeraIt.ttf
+${PYSITELIB}/reportlab/fonts/Zd______.pfb
+${PYSITELIB}/reportlab/fonts/Zx______.pfb
+${PYSITELIB}/reportlab/fonts/Zy______.pfb
+${PYSITELIB}/reportlab/fonts/_a______.pfb
+${PYSITELIB}/reportlab/fonts/_ab_____.pfb
+${PYSITELIB}/reportlab/fonts/_abi____.pfb
+${PYSITELIB}/reportlab/fonts/_ai_____.pfb
+${PYSITELIB}/reportlab/fonts/_eb_____.pfb
+${PYSITELIB}/reportlab/fonts/_ebi____.pfb
+${PYSITELIB}/reportlab/fonts/_ei_____.pfb
+${PYSITELIB}/reportlab/fonts/_er_____.pfb
 ${PYSITELIB}/reportlab/fonts/bitstream-vera-license.txt
+${PYSITELIB}/reportlab/fonts/cob_____.pfb
+${PYSITELIB}/reportlab/fonts/cobo____.pfb
+${PYSITELIB}/reportlab/fonts/com_____.pfb
+${PYSITELIB}/reportlab/fonts/coo_____.pfb
 ${PYSITELIB}/reportlab/graphics/__init__.py
 ${PYSITELIB}/reportlab/graphics/__init__.pyc
 ${PYSITELIB}/reportlab/graphics/__init__.pyo
@@ -200,6 +216,9 @@ ${PYSITELIB}/reportlab/graphics/widgets/markers.pyo
 ${PYSITELIB}/reportlab/graphics/widgets/signsandsymbols.py
 ${PYSITELIB}/reportlab/graphics/widgets/signsandsymbols.pyc
 ${PYSITELIB}/reportlab/graphics/widgets/signsandsymbols.pyo
+${PYSITELIB}/reportlab/graphics/widgets/table.py
+${PYSITELIB}/reportlab/graphics/widgets/table.pyc
+${PYSITELIB}/reportlab/graphics/widgets/table.pyo
 ${PYSITELIB}/reportlab/lib/PyFontify.py
 ${PYSITELIB}/reportlab/lib/PyFontify.pyc
 ${PYSITELIB}/reportlab/lib/PyFontify.pyo
@@ -258,6 +277,9 @@ ${PYSITELIB}/reportlab/lib/pagesizes.pyo
 ${PYSITELIB}/reportlab/lib/pdfencrypt.py
 ${PYSITELIB}/reportlab/lib/pdfencrypt.pyc
 ${PYSITELIB}/reportlab/lib/pdfencrypt.pyo
+${PYSITELIB}/reportlab/lib/pygments2xpre.py
+${PYSITELIB}/reportlab/lib/pygments2xpre.pyc
+${PYSITELIB}/reportlab/lib/pygments2xpre.pyo
 ${PYSITELIB}/reportlab/lib/randomtext.py
 ${PYSITELIB}/reportlab/lib/randomtext.pyc
 ${PYSITELIB}/reportlab/lib/randomtext.pyo
index a3ec990..61d7092 100644 (file)
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.12 2009/10/19 11:17:16 joerg Exp $
+$NetBSD: distinfo,v 1.13 2010/06/14 08:51:36 joerg Exp $
 
-SHA1 (ReportLab_2_3.tar.gz) = cb5e27fef02eceaab79236d5a074cdfb92bff179
-RMD160 (ReportLab_2_3.tar.gz) = ebb347765d516e74b965ec89c7909ec7592e3f54
-Size (ReportLab_2_3.tar.gz) = 1857239 bytes
-SHA1 (patch-aa) = 67d9d7f3198bff2c47cf734b40e29ce8619e170a
+SHA1 (ReportLab_2_4.tar.gz) = 31ecc9ff0f55ce3c5fddaa909dd48b6e9e9a20ce
+RMD160 (ReportLab_2_4.tar.gz) = 7a7198b9934b1f993dbb49705d93cc4b78b45012
+Size (ReportLab_2_4.tar.gz) = 1884175 bytes
diff --git a/print/py-reportlab/patches/patch-aa b/print/py-reportlab/patches/patch-aa
deleted file mode 100644 (file)
index 6858045..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2009/01/28 14:42:28 joerg Exp $
-
---- setup.py.orig      2008-09-11 15:01:16.000000000 +0200
-+++ setup.py
-@@ -255,21 +255,9 @@ def main():
-         infoline( '################################################')
-         infoline( '#Attempting install of _renderPM')
-         infoline( '#extensions from %r'%RENDERPM)
--        LIBART_DIR=pjoin(RENDERPM,'libart_lgpl')
-         MACROS=[('ROBIN_DEBUG',None)]
-         MACROS=[]
--        def libart_version():
--            K = ('LIBART_MAJOR_VERSION','LIBART_MINOR_VERSION','LIBART_MICRO_VERSION')
--            D = {}
--            for l in open(pjoin(LIBART_DIR,'configure.in'),'r').readlines():
--                l = l.strip().split('=')
--                if len(l)>1 and l[0].strip() in K:
--                    D[l[0].strip()] = l[1].strip()
--                    if len(D)==3: break
--            return (sys.platform == 'win32' and '\\"%s\\"' or '"%s"') % '.'.join(map(lambda k,D=D: D.get(k,'?'),K))
--        LIBART_VERSION = libart_version()
-         SOURCES=[pjoin(RENDERPM,'_renderPM.c')]
--        LIBART_SRCS=glob.glob(pjoin(LIBART_DIR, 'art_*.c'))
-         GT1_DIR=pjoin(RENDERPM,'gt1')
-         LIBS = []       #assume empty libraries list
-@@ -314,14 +302,6 @@ def main():
-             infoline('# installing without freetype no ttf, sorry!')
-         LIBRARIES+= [
--                    ('_renderPM_libart',
--                    {
--                    'sources':  LIBART_SRCS,
--                    'include_dirs': [RENDERPM,LIBART_DIR,],
--                    'macros': [('LIBART_COMPILATION',None),]+BIGENDIAN('WORDS_BIGENDIAN')+MACROS,
--                    #'extra_compile_args':['/Z7'],
--                    }
--                    ),
-                     ('_renderPM_gt1',
-                     {
-                     'sources':  pfxJoin(GT1_DIR,'gt1-dict.c','gt1-namecontext.c','gt1-parset1.c','gt1-region.c','parseAFM.c'),
-@@ -334,13 +314,13 @@ def main():
-         EXT_MODULES +=  [Extension( '_renderPM',
-                                         SOURCES,
--                                        include_dirs=[RENDERPM,LIBART_DIR,GT1_DIR]+FT_INC_DIR,
--                                        define_macros=FT_MACROS+[('LIBART_COMPILATION',None)]+MACROS+[('LIBART_VERSION',LIBART_VERSION)],
-+                                        include_dirs=[RENDERPM,GT1_DIR]+FT_INC_DIR,
-+                                        define_macros=FT_MACROS+MACROS,
-                                         library_dirs=[]+FT_LIB_DIR,
-                                         # libraries to link against
--                                        libraries=LIBS+FT_LIB,
--                                        #extra_objects=['gt1.lib','libart.lib',],
-+                                        libraries=LIBS+FT_LIB+['art_lgpl_2'],
-+                                        #extra_objects=['gt1.lib'],
-                                         #extra_compile_args=['/Z7'],
-                                         extra_link_args=[]
-                                         ),
index f140a8c..4108b1f 100644 (file)
@@ -1,3 +1,3 @@
 $NetBSD$
 
-SHA1 (patch-ad) = 1228215bdf63cbe78e34abb8cefff5826c9eabf1
+SHA1 (patch-ad) = ca2a40b5512c32fbceda7385e3a7d781eb1a3282
index f685a66..d5d249f 100644 (file)
@@ -8,10 +8,10 @@ Description: forces installation of all configuration scripts.  These are
 
 --- conf/common.rmk.orig       2010-01-11 02:40:56.000000000 +0100
 +++ conf/common.rmk
-@@ -177,9 +177,9 @@ CLEANFILES += grub-gettext_lib
+@@ -202,9 +202,9 @@ CLEANFILES += grub-gettext_lib
        ./config.status --file=$@:$<
        chmod +x $@
- grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom
+ grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom 41_custom
 -ifneq (, $(host_kernel))
 -grub-mkconfig_SCRIPTS += 10_$(host_kernel)
 -endif
diff --git a/wip/py-asciidata/DESCR b/wip/py-asciidata/DESCR
new file mode 100644 (file)
index 0000000..5d938c6
--- /dev/null
@@ -0,0 +1,16 @@
+AstroAsciiData is a Python module to handle ASCII tables. Features:
+
+    * Imports all reasonably well-formed Ascii tables
+    * Column-first access
+    * Easy creation and manipulation of tables, columns, rows and
+       attached comments
+    * Retains formatting of data values
+    * Support for SExtractor style headers
+    * Column sorting
+    * Interchangeable comment character, column delimiter and null value
+    * Exports data to:
+          o Ascii
+          o Numpy/Numarray
+          o FITS table
+          o HTML table format
+          o LaTeX table format
diff --git a/wip/py-asciidata/Makefile b/wip/py-asciidata/Makefile
new file mode 100644 (file)
index 0000000..ff9506a
--- /dev/null
@@ -0,0 +1,25 @@
+# $NetBSD$
+#
+
+DISTNAME=      asciidata-1.1.1
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=    math
+MASTER_SITES=  http://www.stecf.org/software/PYTHONtools/astroasciidata/source/
+
+MAINTAINER=    jihbed.research@gmail.com
+HOMEPAGE=      http://www.stecf.org/software/PYTHONtools/astroasciidata/
+COMMENT=       Asciidata , to handle (read/modify/write) ASCII tables
+LICENSE=       gnu-lgpl-v3
+
+DEPENDS+=      ${PYPKGPREFIX}-pyfits>=2.3.1:../../wip/py-pyfits
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+USE_LANGUAGES= # none
+PYDISTUTILSPKG=        yes
+
+
+.include "../../lang/python/extension.mk"
+.include "../../math/py-numpy/buildlink3.mk"
+.include "../../math/py-numarray/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wip/py-asciidata/PLIST b/wip/py-asciidata/PLIST
new file mode 100644 (file)
index 0000000..12892fb
--- /dev/null
@@ -0,0 +1,40 @@
+@comment $NetBSD$
+${PYSITELIB}/asciidata/__init__.py
+${PYSITELIB}/asciidata/__init__.pyc
+${PYSITELIB}/asciidata/__init__.pyo
+${PYSITELIB}/asciidata/asciicolumn.py
+${PYSITELIB}/asciidata/asciicolumn.pyc
+${PYSITELIB}/asciidata/asciicolumn.pyo
+${PYSITELIB}/asciidata/asciidata.py
+${PYSITELIB}/asciidata/asciidata.pyc
+${PYSITELIB}/asciidata/asciidata.pyo
+${PYSITELIB}/asciidata/asciidata_SExtest.py
+${PYSITELIB}/asciidata/asciidata_SExtest.pyc
+${PYSITELIB}/asciidata/asciidata_SExtest.pyo
+${PYSITELIB}/asciidata/asciidata_numtest.py
+${PYSITELIB}/asciidata/asciidata_numtest.pyc
+${PYSITELIB}/asciidata/asciidata_numtest.pyo
+${PYSITELIB}/asciidata/asciidata_test.py
+${PYSITELIB}/asciidata/asciidata_test.pyc
+${PYSITELIB}/asciidata/asciidata_test.pyo
+${PYSITELIB}/asciidata/asciielement.py
+${PYSITELIB}/asciidata/asciielement.pyc
+${PYSITELIB}/asciidata/asciielement.pyo
+${PYSITELIB}/asciidata/asciierror.py
+${PYSITELIB}/asciidata/asciierror.pyc
+${PYSITELIB}/asciidata/asciierror.pyo
+${PYSITELIB}/asciidata/asciifits.py
+${PYSITELIB}/asciidata/asciifits.pyc
+${PYSITELIB}/asciidata/asciifits.pyo
+${PYSITELIB}/asciidata/asciifunction.py
+${PYSITELIB}/asciidata/asciifunction.pyc
+${PYSITELIB}/asciidata/asciifunction.pyo
+${PYSITELIB}/asciidata/asciiheader.py
+${PYSITELIB}/asciidata/asciiheader.pyc
+${PYSITELIB}/asciidata/asciiheader.pyo
+${PYSITELIB}/asciidata/asciisorter.py
+${PYSITELIB}/asciidata/asciisorter.pyc
+${PYSITELIB}/asciidata/asciisorter.pyo
+${PYSITELIB}/asciidata/asciiutils.py
+${PYSITELIB}/asciidata/asciiutils.pyc
+${PYSITELIB}/asciidata/asciiutils.pyo
diff --git a/wip/py-asciidata/distinfo b/wip/py-asciidata/distinfo
new file mode 100644 (file)
index 0000000..267fdb2
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD$
+
+SHA1 (asciidata-1.1.1.tar.gz) = 815307ab8a4063d18a064778cda3c23b2dd7ef80
+RMD160 (asciidata-1.1.1.tar.gz) = d66edac0d1418d990de102e87f591d8c5905b9bf
+Size (asciidata-1.1.1.tar.gz) = 482467 bytes
index 54df012..3f079ee 100644 (file)
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .gz#md5=15cb8e36b433ba6660c67939d234c6af
 MAINTAINER=    jihbed.research@gmail.com
 HOMEPAGE=      http://www.physics.uci.edu/~etolleru/software.html#astropysics
 COMMENT=       Astrophysics libraries for Python
-#LICENSE=      # TODO: (see mk/license.mk)
+LICENSE=       apache-2.0
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff --git a/wip/py-pyfits/DESCR b/wip/py-pyfits/DESCR
new file mode 100644 (file)
index 0000000..25273cc
--- /dev/null
@@ -0,0 +1,5 @@
+FITS (Flexible Image Transport System) is a data format most used in astronomy.
+PyFITS is a Python module for reading, writing, and manipulating FITS files.
+The module uses Python's object-oriented features to provide quick, easy, and
+efficient access to FITS files. The use of Python's array syntax enables
+immediate access to any FITS extension, header cards, or data items.
diff --git a/wip/py-pyfits/Makefile b/wip/py-pyfits/Makefile
new file mode 100644 (file)
index 0000000..6e6fdbe
--- /dev/null
@@ -0,0 +1,20 @@
+# $NetBSD$
+#
+
+DISTNAME=      pyfits-2.3.1
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=    graphics
+MASTER_SITES=  http://www.stsci.edu/resources/software_hardware/pyfits/
+
+MAINTAINER=    kamelderouiche@yahoo.com
+HOMEPAGE=      http://www.stsci.edu/resources/software_hardware/pyfits
+COMMENT=       Python module for reading, writing, and manipulating FITS files
+#LICENSE=      # TODO: (see mk/license.mk)
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+PYDISTUTILSPKG=        yes
+
+.include "../../lang/python/extension.mk"
+.include "../../math/py-numpy/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wip/py-pyfits/PLIST b/wip/py-pyfits/PLIST
new file mode 100644 (file)
index 0000000..d96dfac
--- /dev/null
@@ -0,0 +1,51 @@
+@comment $NetBSD$
+${PYSITELIB}/pyfits/__init__.py
+${PYSITELIB}/pyfits/__init__.pyc
+${PYSITELIB}/pyfits/__init__.pyo
+${PYSITELIB}/pyfits/core.py
+${PYSITELIB}/pyfits/core.pyc
+${PYSITELIB}/pyfits/core.pyo
+${PYSITELIB}/pyfits/pyfitsComp.so
+${PYSITELIB}/pyfits/rec.py
+${PYSITELIB}/pyfits/rec.pyc
+${PYSITELIB}/pyfits/rec.pyo
+${PYSITELIB}/pyfits/svn_version.py
+${PYSITELIB}/pyfits/svn_version.pyc
+${PYSITELIB}/pyfits/svn_version.pyo
+${PYSITELIB}/pyfits/tests/__init__.py
+${PYSITELIB}/pyfits/tests/__init__.pyc
+${PYSITELIB}/pyfits/tests/__init__.pyo
+${PYSITELIB}/pyfits/tests/arange.fits
+${PYSITELIB}/pyfits/tests/ascii.fits
+${PYSITELIB}/pyfits/tests/checksum.fits
+${PYSITELIB}/pyfits/tests/comp.fits
+${PYSITELIB}/pyfits/tests/o4sp040b0_raw.fits
+${PYSITELIB}/pyfits/tests/scale.fits
+${PYSITELIB}/pyfits/tests/stddata.fits
+${PYSITELIB}/pyfits/tests/table.fits
+${PYSITELIB}/pyfits/tests/tb.fits
+${PYSITELIB}/pyfits/tests/test0.fits
+${PYSITELIB}/pyfits/tests/testCore.py
+${PYSITELIB}/pyfits/tests/testCore.pyc
+${PYSITELIB}/pyfits/tests/testCore.pyo
+${PYSITELIB}/pyfits/tests/testPyfitsChecksum.py
+${PYSITELIB}/pyfits/tests/testPyfitsChecksum.pyc
+${PYSITELIB}/pyfits/tests/testPyfitsChecksum.pyo
+${PYSITELIB}/pyfits/tests/testPyfitsDivision.py
+${PYSITELIB}/pyfits/tests/testPyfitsDivision.pyc
+${PYSITELIB}/pyfits/tests/testPyfitsDivision.pyo
+${PYSITELIB}/pyfits/tests/testPyfitsHDUList.py
+${PYSITELIB}/pyfits/tests/testPyfitsHDUList.pyc
+${PYSITELIB}/pyfits/tests/testPyfitsHDUList.pyo
+${PYSITELIB}/pyfits/tests/testPyfitsImage.py
+${PYSITELIB}/pyfits/tests/testPyfitsImage.pyc
+${PYSITELIB}/pyfits/tests/testPyfitsImage.pyo
+${PYSITELIB}/pyfits/tests/testPyfitsTable.py
+${PYSITELIB}/pyfits/tests/testPyfitsTable.pyc
+${PYSITELIB}/pyfits/tests/testPyfitsTable.pyo
+${PYSITELIB}/pyfits/tests/testStructured.py
+${PYSITELIB}/pyfits/tests/testStructured.pyc
+${PYSITELIB}/pyfits/tests/testStructured.pyo
+${PYSITELIB}/pyfits/tests/testUint.py
+${PYSITELIB}/pyfits/tests/testUint.pyc
+${PYSITELIB}/pyfits/tests/testUint.pyo
diff --git a/wip/py-pyfits/distinfo b/wip/py-pyfits/distinfo
new file mode 100644 (file)
index 0000000..dab2c26
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD$
+
+SHA1 (pyfits-2.3.1.tar.gz) = cd6ab6f01d937dd2ad5f28076e351e05767866ae
+RMD160 (pyfits-2.3.1.tar.gz) = 0a2131c05499e5340f972825e71e8e03ae4154b4
+Size (pyfits-2.3.1.tar.gz) = 380022 bytes