update Sun Nov 29 18:37:00 PST 2009
authorCharlie <root@crater.dragonflybsd.org>
Mon, 30 Nov 2009 02:47:17 +0000 (18:47 -0800)
committerCharlie <root@crater.dragonflybsd.org>
Mon, 30 Nov 2009 02:47:17 +0000 (18:47 -0800)
83 files changed:
archivers/zziplib/distinfo
archivers/zziplib/patches/patch-ba
archivers/zziplib/patches/patch-bb
archivers/zziplib/patches/patch-bc
archivers/zziplib/patches/patch-bd [deleted file]
archivers/zziplib/patches/patch-be [deleted file]
audio/py-id3lib/Makefile
audio/py-id3lib/distinfo
audio/py-id3lib/patches/patch-aa [new file with mode: 0644]
audio/solfege/Makefile
devel/aegis/distinfo
devel/aegis/patches/patch-ab [new file with mode: 0644]
devel/gentle/Makefile
devel/gentle/distinfo
devel/gentle/patches/patch-ba [new file with mode: 0644]
devel/gentle/patches/patch-bb [new file with mode: 0644]
devel/gentle/patches/patch-bc [new file with mode: 0644]
devel/gentle/patches/patch-bd [new file with mode: 0644]
devel/gentle/patches/patch-be [new file with mode: 0644]
devel/gentle/patches/patch-bf [new file with mode: 0644]
devel/gentle/patches/patch-bg [new file with mode: 0644]
devel/gentle/patches/patch-bh [new file with mode: 0644]
devel/gentle/patches/patch-bi [new file with mode: 0644]
devel/gsoap/Makefile
devel/gsoap/distinfo
devel/gsoap/patches/patch-ac [new file with mode: 0644]
devel/intel2gas/Makefile
devel/intel2gas/distinfo
devel/intel2gas/patches/patch-aa
devel/intel2gas/patches/patch-ab [new file with mode: 0644]
devel/pwlib/Makefile
doc/CHANGES-2009
graphics/Makefile
graphics/inkscape/Makefile
graphics/inkscape/PLIST
graphics/inkscape/distinfo
graphics/inkscape/patches/patch-ab
graphics/inkscape/patches/patch-af
graphics/inkscape/patches/patch-ah
graphics/inkscape/patches/patch-ai
graphics/inkscape/patches/patch-aj
graphics/inkscape/patches/patch-ak
graphics/inkscape/patches/patch-al [deleted file]
graphics/inkscape/patches/patch-am [deleted file]
graphics/inkscape/patches/patch-an [deleted file]
graphics/inkscape/patches/patch-ao [deleted file]
graphics/tango-icon-theme/DESCR [moved from wip/tango-icon-theme/DESCR with 100% similarity]
graphics/tango-icon-theme/Makefile [moved from wip/tango-icon-theme/Makefile with 91% similarity]
graphics/tango-icon-theme/PLIST [moved from wip/tango-icon-theme/PLIST with 99% similarity]
graphics/tango-icon-theme/buildlink3.mk [moved from wip/tango-icon-theme/buildlink3.mk with 65% similarity]
graphics/tango-icon-theme/distinfo [moved from wip/tango-icon-theme/distinfo with 79% similarity]
net/ktorrent3/Makefile
news/nn/Makefile
news/nn/files/m-x86_64.h [new file with mode: 0644]
sysutils/i810switch/distinfo
sysutils/i810switch/patches/patch-aa
wip/Makefile
wip/py-anyjson/DESCR [new file with mode: 0644]
wip/py-anyjson/Makefile [new file with mode: 0644]
wip/py-anyjson/PLIST [new file with mode: 0644]
wip/py-anyjson/distinfo [new file with mode: 0644]
wip/sipbomber/Makefile
wip/sipbomber/distinfo
wip/sipbomber/patches/patch-aa
wip/sipbomber/patches/patch-ab
wip/sipbomber/patches/patch-ac
wip/sipbomber/patches/patch-ad
wip/sipbomber/patches/patch-ae
wip/sipbomber/patches/patch-af
wip/sipbomber/patches/patch-ag
wip/sipbomber/patches/patch-ah [new file with mode: 0644]
www/htdig/distinfo
www/htdig/patches/patch-aj [new file with mode: 0644]
x11/xfce4-panel/Makefile
x11/xfce4-panel/PLIST
x11/xfce4-panel/distinfo
x11/xfce4-settings/Makefile
x11/xfce4-settings/PLIST
x11/xfce4-settings/distinfo
x11/xfce4-settings/patches/patch-ac [deleted file]
x11/xfce4-terminal/Makefile
x11/xfce4-terminal/PLIST
x11/xfce4-terminal/distinfo

index 28ad250..7ddc69e 100644 (file)
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.8 2009/11/22 20:35:25 sno Exp $
+$NetBSD: distinfo,v 1.9 2009/11/29 20:40:08 sno Exp $
 
 SHA1 (zziplib-0.13.56.tar.bz2) = aa8cebc8c5e815a1071b17c6878876adedc4a333
 RMD160 (zziplib-0.13.56.tar.bz2) = c217cff4c4b1ec6bc868a0d89a55c75b8ea46fa9
 Size (zziplib-0.13.56.tar.bz2) = 696931 bytes
 SHA1 (patch-aa) = 6bfead43e5dae726861a8d1c21ed829126e64b41
-SHA1 (patch-ba) = 8b62c70f25a3fa82c611c1c6ad39b9c9bd66878d
-SHA1 (patch-bb) = d9c2091ef8d6a7ee989d2f521f61e6fadc4c3539
-SHA1 (patch-bc) = 7fb2160539fe8ae9ece7c8acc5747b34c82e2791
-SHA1 (patch-bd) = f9bacfd878ff3ed86a03dd3b9d52fd0cca03a2bf
-SHA1 (patch-be) = ae2b2190e9d10828094e36666445a91833b7a3ef
+SHA1 (patch-ba) = 9203c92f8dd76bb2e21e512c7811fb0bd852cbee
+SHA1 (patch-bb) = e2f03667b73ce445d5a96262898dddfe324e0764
+SHA1 (patch-bc) = d5300d81155c11358625ff320cb6055dcc8ed860
index 84a8362..7680bad 100644 (file)
@@ -1,24 +1,16 @@
-$NetBSD: patch-ba,v 1.1 2009/11/22 20:35:25 sno Exp $
+$NetBSD: patch-ba,v 1.2 2009/11/29 20:40:08 sno Exp $
 
 replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
+for non-gnu-ld
 
---- configure.orig     2009-05-30 17:09:35.000000000 +0200
-+++ configure  2009-05-30 17:12:17.000000000 +0200
-@@ -5501,7 +5501,7 @@
-   if test "$ld_shlibs" = yes; then
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    export_dynamic_flag_spec='${EXPORT_SYMBOLS_LDFLAGS}'
-     case $host_os in
-     cygwin* | mingw* | pw32*)
-       # dlltool doesn't understand --whole-archive et. al.
-@@ -9601,7 +9601,7 @@
-     RESOLVES=' '
-   ;;
-   *)
--    ZZIPLIB_LDFLAGS="--export-dynamic"
-+    ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+--- configure.orig     2009-06-27 18:32:33.000000000 +0000
++++ configure  2009-11-29 20:29:57.000000000 +0000
+@@ -16179,7 +16179,7 @@
+     if ".$can_build_shared" = .no
+     then ZZIPLIB_LDFLAGS=""
+-    else ZZIPLIB_LDFLAGS="--export-dynamic"
++    else ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+     fi
      RESOLVES=' # '
    ;;
- esac
index 809fff6..b3d1fa0 100644 (file)
@@ -1,15 +1,16 @@
-$NetBSD: patch-bb,v 1.1 2009/11/22 20:35:25 sno Exp $
+$NetBSD: patch-bb,v 1.2 2009/11/29 20:40:08 sno Exp $
 
 replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
+for non-gnu-ld
 
---- configure.ac.orig  2009-05-30 17:09:44.000000000 +0200
-+++ configure.ac       2009-05-30 17:12:40.000000000 +0200
+--- configure.ac.orig  2009-06-27 18:28:16.000000000 +0000
++++ configure.ac       2009-11-29 20:30:35.000000000 +0000
 @@ -288,7 +288,7 @@
-     RESOLVES=' '
-   ;;
-   *)
--    ZZIPLIB_LDFLAGS="--export-dynamic"
-+    ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+     if ".$can_build_shared" = .no
+     then ZZIPLIB_LDFLAGS=""
+-    else ZZIPLIB_LDFLAGS="--export-dynamic"
++    else ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
+     fi
      RESOLVES=' # '
    ;;
- esac
index ee70827..62186fd 100644 (file)
@@ -1,15 +1,16 @@
-$NetBSD: patch-bc,v 1.1 2009/11/22 20:35:25 sno Exp $
+$NetBSD: patch-bc,v 1.2 2009/11/29 20:40:08 sno Exp $
 
 replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
+for xlc
 
---- aclocal.m4.orig    2009-05-30 17:09:55.000000000 +0200
-+++ aclocal.m4 2009-05-30 17:13:08.000000000 +0200
-@@ -3856,7 +3856,7 @@
-   if test "$ld_shlibs" = yes; then
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    export_dynamic_flag_spec='${EXPORT_SYMBOLS_LDFLAGS}'
-     case $host_os in
-     cygwin* | mingw* | pw32*)
-       # dlltool doesn't understand --whole-archive et. al.
+--- m4/libtool.m4.orig 2009-11-29 20:26:36.000000000 +0000
++++ m4/libtool.m4      2009-11-29 20:29:09.000000000 +0000
+@@ -5947,7 +5947,7 @@
+         xl*)
+           # IBM XL 8.0 on PPC, with GNU ld
+           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-          _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++          _LT_TAGVAR(export_dynamic_flag_spec, $1)='${EXPORT_SYMBOLS_LDFLAGS}'
+           _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+           if test "x$supports_anon_versioning" = xyes; then
+             _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
diff --git a/archivers/zziplib/patches/patch-bd b/archivers/zziplib/patches/patch-bd
deleted file mode 100644 (file)
index d91b662..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2009/11/22 20:35:25 sno Exp $
-
-replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
-
---- zziplib/configure.orig     2009-05-30 17:10:08.000000000 +0200
-+++ zziplib/configure  2009-05-30 17:13:49.000000000 +0200
-@@ -5017,7 +5017,7 @@
-   if test "$ld_shlibs" = yes; then
-     runpath_var=LD_RUN_PATH
-     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    export_dynamic_flag_spec='${EXPORT_SYMBOLS_LDFLAGS}'
-     case $host_os in
-     cygwin* | mingw* | pw32*)
-       # dlltool doesn't understand --whole-archive et. al.
-@@ -8553,7 +8553,7 @@
-     RESOLVES=' '
-   ;;
-   *)
--    ZZIPLIB_LDFLAGS="--export-dynamic"
-+    ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
-     RESOLVES=' # '
-   ;;
- esac
diff --git a/archivers/zziplib/patches/patch-be b/archivers/zziplib/patches/patch-be
deleted file mode 100644 (file)
index 13b4a0b..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-be,v 1.1 2009/11/22 20:35:25 sno Exp $
-
-replacing explicit --export-dynamic by ${EXPORT_SYMBOLS_LDFLAGS}
-
---- zziplib/configure.ac.orig  2009-05-30 17:10:18.000000000 +0200
-+++ zziplib/configure.ac       2009-05-30 17:14:09.000000000 +0200
-@@ -226,7 +226,7 @@
-     RESOLVES=' '
-   ;;
-   *)
--    ZZIPLIB_LDFLAGS="--export-dynamic"
-+    ZZIPLIB_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
-     RESOLVES=' # '
-   ;;
- esac
index 7ce047b..b6aeab4 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2009/07/08 15:54:33 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2009/11/29 23:04:15 dholland Exp $
 #
 
 DISTNAME=      pyid3lib-0.5.1
 PKGNAME=       ${PYPKGPREFIX}-id3lib-0.5.1
+PKGREVISION=   1
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pyid3lib/}
 EXTRACT_SUFX=  .tar.bz2
index f4a1572..3530d55 100644 (file)
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/07 19:15:01 drochner Exp $
+$NetBSD: distinfo,v 1.2 2009/11/29 23:04:15 dholland Exp $
 
 SHA1 (pyid3lib-0.5.1.tar.bz2) = 5026f9aa7f868a081a7caecc54cbdbc0cdaea27b
 RMD160 (pyid3lib-0.5.1.tar.bz2) = cec0607aab0eeaaa953428a4d06c7b7a19232616
 Size (pyid3lib-0.5.1.tar.bz2) = 21207 bytes
+SHA1 (patch-aa) = cd7858485c80394e544133846630f7df8a7b5690
diff --git a/audio/py-id3lib/patches/patch-aa b/audio/py-id3lib/patches/patch-aa
new file mode 100644 (file)
index 0000000..4dc84db
--- /dev/null
@@ -0,0 +1,108 @@
+$NetBSD: patch-aa,v 1.1 2009/11/29 23:04:15 dholland Exp $
+
+Fix for LP64 on python > 2.4.
+
+--- pyid3lib.cc.orig   2003-02-16 18:50:20.000000000 -0500
++++ pyid3lib.cc        2009-11-29 18:02:46.000000000 -0500
+@@ -10,6 +10,14 @@
+ #include <id3/id3lib_frame.h>
+ #include <id3/tag.h>
++#if defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5
++typedef int Py_ssize_t;
++typedef intargfunc ssizeargfunc;
++typedef intintargfunc ssizessizeargfunc;
++typedef intobjargproc ssizeobjargproc;
++typedef intintobjargproc ssizessizeobjargproc;
++#endif
++
+ typedef struct
+ {
+     PyObject_HEAD
+@@ -61,11 +69,11 @@ static PyObject* dict_from_frame( ID3_Fr
+ static ID3_Frame* frame_from_dict( PyObject* dict );
+ static ID3_Frame* frame_from_dict( ID3_FrameID fid, PyObject* dict );
+-static int id3_length( ID3Object* self );
+-static PyObject* id3_item( ID3Object* self, int index );
+-static PyObject* id3_slice( ID3Object* self, int start, int end );
+-static int id3_ass_item( ID3Object* self, int index, PyObject* dict );
+-static int id3_ass_slice( ID3Object* self, int start, int end, PyObject* dict );
++static Py_ssize_t id3_length( ID3Object* self );
++static PyObject* id3_item( ID3Object* self, Py_ssize_t index );
++static PyObject* id3_slice( ID3Object* self, Py_ssize_t start, Py_ssize_t end );
++static int id3_ass_item( ID3Object* self, Py_ssize_t index, PyObject* dict );
++static int id3_ass_slice( ID3Object* self, Py_ssize_t start, Py_ssize_t end, PyObject* dict );
+ static int id3_contains( ID3Object* self, PyObject* other );
+ static PyObject* id3_append( ID3Object* self, PyObject* args );
+@@ -80,13 +88,13 @@ static PyObject* frameid_lookup = NULL;
+ static PySequenceMethods tag_as_sequence = {
+-    (inquiry)id3_length,
++    (lenfunc)id3_length,
+     NULL,
+     NULL,
+-    (intargfunc)id3_item,
+-    (intintargfunc)id3_slice,
+-    (intobjargproc)id3_ass_item,
+-    (intintobjargproc)id3_ass_slice,
++    (ssizeargfunc)id3_item,
++    (ssizessizeargfunc)id3_slice,
++    (ssizeobjargproc)id3_ass_item,
++    (ssizessizeobjargproc)id3_ass_slice,
+     (objobjproc)id3_contains,
+     NULL,
+     NULL,
+@@ -236,12 +244,12 @@ static PyObject* id3iter_iternext( ID3It
+ //
+ /////////////////
+-static int id3_length( ID3Object* self )
++static Py_ssize_t id3_length( ID3Object* self )
+ {
+     return self->size;
+ }
+-static PyObject* id3_item( ID3Object* self, int index )
++static PyObject* id3_item( ID3Object* self, Py_ssize_t index )
+ {
+     if ( index < 0 )
+       index += self->size;
+@@ -255,7 +263,7 @@ static PyObject* id3_item( ID3Object* se
+     return dict_from_frame( self->frames[index] );
+ }
+-static PyObject* id3_slice( ID3Object* self, int start, int end )
++static PyObject* id3_slice( ID3Object* self, Py_ssize_t start, Py_ssize_t end )
+ {
+     PyObject* result;
+     int i;
+@@ -284,7 +292,7 @@ static PyObject* id3_slice( ID3Object* s
+ }
+-static int id3_ass_item( ID3Object* self, int index, PyObject* dict )
++static int id3_ass_item( ID3Object* self, Py_ssize_t index, PyObject* dict )
+ {
+     ID3_Frame* newframe;
+@@ -382,7 +390,7 @@ static ID3_Frame** frames_from_dictseq( 
+     return NULL;
+ }
+-static int id3_ass_slice( ID3Object* self, int start, int end, PyObject* dictseq )
++static int id3_ass_slice( ID3Object* self, Py_ssize_t start, Py_ssize_t end, PyObject* dictseq )
+ {
+     int i, n;
+     int newsize;
+@@ -824,7 +832,7 @@ static ID3_Frame* frame_from_dict( PyObj
+ static ID3_Frame* frame_from_dict( ID3_FrameID fid, PyObject* dict )
+ {
+     char* data;
+-    int size;
++    Py_ssize_t size;
+     
+     ID3_Field* field;
+     ID3_FieldID flid;
index 1040163..727817a 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2009/09/07 19:02:13 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2009/11/29 22:27:54 dholland Exp $
 #
 
 DISTNAME=              solfege-3.14.1
@@ -10,12 +10,14 @@ MAINTAINER=         schmonz@NetBSD.org
 HOMEPAGE=              http://www.solfege.org/
 COMMENT=               Practice several musical ear training exercises
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILD_DEPENDS+=                txt2man-[0-9]*:../../converters/txt2man
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
-CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
+CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q} ac_cv_path_MSGGREP=true
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --disable-oss-sound
 CONFIGURE_ARGS+=       --disable-pygtk-test
index 83cbd97..7201b34 100644 (file)
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2009/06/10 11:16:36 obache Exp $
+$NetBSD: distinfo,v 1.9 2009/11/29 21:55:09 dholland Exp $
 
 SHA1 (aegis-4.24.1.tar.gz) = 825d1fc24c1d9c1250bc297abf5162b1c56cbc63
 RMD160 (aegis-4.24.1.tar.gz) = b8d5e37c0870c21d123ab5b5ec01a84f33f2b424
 Size (aegis-4.24.1.tar.gz) = 4087917 bytes
 SHA1 (patch-aa) = 6b85eb9011379e6bed80635744509a2537f5457b
+SHA1 (patch-ab) = c29c15aff7037f18a2e1cc0847d5ed2adbea38cc
 SHA1 (patch-ad) = fedf733f29e02382887b1e2dbd004404da513787
diff --git a/devel/aegis/patches/patch-ab b/devel/aegis/patches/patch-ab
new file mode 100644 (file)
index 0000000..08a7ffd
--- /dev/null
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.3 2009/11/29 21:55:09 dholland Exp $
+
+Avoid compiler noise when storing an integer in a pointer.
+
+(This code will break on 32-bit platforms after 2038, but that's
+somebody else's problem.)
+
+--- libaegis/project/history/change/change2time.cc~    2008-09-24 17:48:58.000000000 -0400
++++ libaegis/project/history/change/change2time.cc     2009-11-29 15:30:43.000000000 -0500
+@@ -28,13 +28,13 @@ time_t
+ project_ty::change_completion_timestamp(long change_number)
+ {
+     assert(change2time_stp);
+-    time_t result = (time_t)itab_query(change2time_stp, change_number);
++    time_t result = (time_t)(intptr_t)itab_query(change2time_stp, change_number);
+     if (!result)
+     {
+         change::pointer cp = change_alloc(this, change_number);
+         change_bind_existing(cp);
+         result = ::change_completion_timestamp(cp);
+-        itab_assign (change2time_stp, cp->number, (void*)result);
++        itab_assign (change2time_stp, cp->number, (void*)(intptr_t)result);
+         change_free(cp);
+     }
index b05bded..f1ee4af 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2009/11/30 00:03:08 dholland Exp $
 #
 
 DISTNAME=              gentle-97
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          http://gentle.compilertools.net/
 
index 64862f9..8c5247b 100644 (file)
@@ -1,7 +1,16 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:14 agc Exp $
+$NetBSD: distinfo,v 1.3 2009/11/30 00:03:08 dholland Exp $
 
 SHA1 (gentle-97.tar.gz) = 1cbf70aa6c470346630c407f89878a5f3c0c4406
 RMD160 (gentle-97.tar.gz) = 96cbfca6909f23fa192514eaba0f0fffcfac2d40
 Size (gentle-97.tar.gz) = 453860 bytes
 SHA1 (patch-aa) = 4b76e24c516ea96214e749758ff4093c0f464ecc
 SHA1 (patch-ab) = aea90f9fb1c4fbb00d8595bc5f345d816c023e1a
+SHA1 (patch-ba) = 2189027d7dd50604623d8b741de96a6920542efc
+SHA1 (patch-bb) = c0fe7c3f4171904848043ea7ec62c8e2c87b4197
+SHA1 (patch-bc) = 0281d99d868c6e55eca3357819bd4f8d41297fd3
+SHA1 (patch-bd) = 1cc0893b963a8d8e70464d3186e670bd20918bf9
+SHA1 (patch-be) = 2c606659ca0f7e44f7939ba15be4c56c995299f2
+SHA1 (patch-bf) = 6517ef2f65a802fff764965dc3a50bf5ce34fb2c
+SHA1 (patch-bg) = 46ad7192e8a766f8d98d1588a0e72873586bb82a
+SHA1 (patch-bh) = d6f4b4f6a5c3c8a5d90ae3515209598e851ec0ed
+SHA1 (patch-bi) = 7ae860cb89585fcb6223beee5bd6e7def405f69e
diff --git a/devel/gentle/patches/patch-ba b/devel/gentle/patches/patch-ba
new file mode 100644 (file)
index 0000000..ed87458
--- /dev/null
@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- gentle/cyfront.c~  1998-08-20 09:56:09.000000000 -0400
++++ gentle/cyfront.c   2009-11-29 18:57:45.000000000 -0500
+@@ -7,6 +7,7 @@
+ */
++#include <stdio.h>
+ typedef long * yy;
+ #define yyu (-2147483647L)
diff --git a/devel/gentle/patches/patch-bb b/devel/gentle/patches/patch-bb
new file mode 100644 (file)
index 0000000..cb14236
--- /dev/null
@@ -0,0 +1,16 @@
+$NetBSD: patch-bb,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- gentle/main.c~     1998-08-20 09:56:09.000000000 -0400
++++ gentle/main.c      2009-11-29 18:58:37.000000000 -0500
+@@ -7,6 +7,9 @@
+ */
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ static scanargs();
diff --git a/devel/gentle/patches/patch-bc b/devel/gentle/patches/patch-bc
new file mode 100644 (file)
index 0000000..f157847
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- gentle/input.c~    1998-08-20 09:56:09.000000000 -0400
++++ gentle/input.c     2009-11-29 18:58:59.000000000 -0500
+@@ -7,6 +7,8 @@
+ */
++#include <stdlib.h>
++#include <string.h>
+ static long is_defined();
+ static open_next_file ();
diff --git a/devel/gentle/patches/patch-bd b/devel/gentle/patches/patch-bd
new file mode 100644 (file)
index 0000000..6057aaa
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD: patch-bd,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- gentle/symtab.c~   1998-08-20 09:56:09.000000000 -0400
++++ gentle/symtab.c    2009-11-29 18:59:30.000000000 -0500
+@@ -7,6 +7,8 @@
+ */
++#include <stdio.h>
++#include <stdlib.h>
+ #include "gen.h"
diff --git a/devel/gentle/patches/patch-be b/devel/gentle/patches/patch-be
new file mode 100644 (file)
index 0000000..4cb5403
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD: patch-be,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- gentle/grts.c~     1998-08-20 09:56:09.000000000 -0400
++++ gentle/grts.c      2009-11-29 19:00:04.000000000 -0500
+@@ -7,6 +7,8 @@
+ */
++#include <stdio.h>
++#include <stdlib.h>
+ /* Gentle Runtime System */
diff --git a/devel/gentle/patches/patch-bf b/devel/gentle/patches/patch-bf
new file mode 100644 (file)
index 0000000..3369126
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- lib/errmsg.c~      1998-08-20 09:56:11.000000000 -0400
++++ lib/errmsg.c       2009-11-29 19:01:05.000000000 -0500
+@@ -1,3 +1,6 @@
++#include <stdio.h>
++#include <stdlib.h>
++
+ #define PRIVATE static
+ /*--------------------------------------------------------------------*/
diff --git a/devel/gentle/patches/patch-bg b/devel/gentle/patches/patch-bg
new file mode 100644 (file)
index 0000000..d69d1d2
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-bg,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- lib/strings.c~     1998-08-20 09:56:12.000000000 -0400
++++ lib/strings.c      2009-11-29 19:01:41.000000000 -0500
+@@ -1,3 +1,6 @@
++#include <stdio.h>
++#include <stdlib.h>
++
+ #define PRIVATE static
+ /*--------------------------------------------------------------------*/
diff --git a/devel/gentle/patches/patch-bh b/devel/gentle/patches/patch-bh
new file mode 100644 (file)
index 0000000..2eced74
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- lib/idents.c~      1998-08-20 09:56:11.000000000 -0400
++++ lib/idents.c       2009-11-29 19:02:03.000000000 -0500
+@@ -1,3 +1,6 @@
++#include <stdio.h>
++#include <stdlib.h>
++
+ #define PRIVATE static
+ /*--------------------------------------------------------------------*/
diff --git a/devel/gentle/patches/patch-bi b/devel/gentle/patches/patch-bi
new file mode 100644 (file)
index 0000000..87975e1
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2009/11/30 00:03:08 dholland Exp $
+
+Add standard includes needed for LP64 build.
+
+--- reflex/reflex.c~   1998-08-20 09:56:10.000000000 -0400
++++ reflex/reflex.c    2009-11-29 19:02:55.000000000 -0500
+@@ -1,4 +1,6 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ /* ( 1) %{ */
+ /* ( 2) YYSTYPE block */
index c270f05..50493dc 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/05/13 18:46:16 hasso Exp $
+# $NetBSD: Makefile,v 1.7 2009/11/29 21:31:57 dholland Exp $
 
 DISTNAME=              gsoap_2.7.13
 PKGNAME=               gsoap-2.7.13
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gsoap2/}
 
index c33834b..1a4e863 100644 (file)
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/05/13 18:46:16 hasso Exp $
+$NetBSD: distinfo,v 1.4 2009/11/29 21:31:57 dholland Exp $
 
 SHA1 (gsoap_2.7.13.tar.gz) = 4c91ce860ee6853f785a11484c7298d294a53ef6
 RMD160 (gsoap_2.7.13.tar.gz) = 58f2bcd95199fdec3c5ce6579374148eaab955b1
 Size (gsoap_2.7.13.tar.gz) = 6564489 bytes
 SHA1 (patch-aa) = 6e0b1c00244c1dcada571e8d3a7c4b2be5800df3
 SHA1 (patch-ab) = 9a35355d7553d5063278574109a2c1121a2a5b18
+SHA1 (patch-ac) = 0677e3b3efed5b26770782296d9b643a670af0a9
diff --git a/devel/gsoap/patches/patch-ac b/devel/gsoap/patches/patch-ac
new file mode 100644 (file)
index 0000000..5139050
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2009/11/29 21:31:57 dholland Exp $
+
+Get socklen_t defined correctly.
+
+--- gsoap/stdsoap2.h~  2009-03-21 17:24:44.000000000 -0400
++++ gsoap/stdsoap2.h   2009-11-29 15:47:13.000000000 -0500
+@@ -676,7 +676,7 @@ extern "C" {
+ # endif
+ #elif defined(SOCKLEN_T)
+ # define SOAP_SOCKLEN_T SOCKLEN_T
+-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(OS390)
++#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(__NetBSD__) || defined(__OpenBSD__)
+ # define SOAP_SOCKLEN_T socklen_t
+ #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
+ # define SOAP_SOCKLEN_T int
index 544510a..00ba7f0 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/07/22 04:46:15 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2009/11/29 23:34:31 dholland Exp $
 #
 
 DISTNAME=              intel2gas-1.3.3
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/
 
@@ -9,6 +10,8 @@ MAINTAINER=            ccatrian@eml.cc
 HOMEPAGE=              http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/
 COMMENT=               Convert nasm source files to gas source files
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 
index c130ddf..87158ad 100644 (file)
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:16 agc Exp $
+$NetBSD: distinfo,v 1.4 2009/11/29 23:34:31 dholland Exp $
 
 SHA1 (intel2gas-1.3.3.tar.gz) = 755e5a4739586944f974a1e39056cd20f150db65
 RMD160 (intel2gas-1.3.3.tar.gz) = 84b1bdf8c448967e72637bcf2082d57a2e433d5a
 Size (intel2gas-1.3.3.tar.gz) = 48460 bytes
-SHA1 (patch-aa) = 379ca4e385ce9b6e706fa5376a6a2e962146cbb0
+SHA1 (patch-aa) = adc98eba6f3366b6c828d1273c98e83649d7f9f3
+SHA1 (patch-ab) = e623d614b706d666250b774dae3632c44bd1f52d
index ef8c4cd..580d5c0 100644 (file)
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/20 19:22:54 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2009/11/29 23:34:31 dholland Exp $
+
+Config and installation for pkgsrc.
 
 --- Makefile.in.orig   2004-10-20 21:17:04.000000000 +0200
 +++ Makefile.in        2004-10-20 21:19:07.000000000 +0200
@@ -16,18 +18,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/10/20 19:22:54 xtraeme Exp $
  
  install:
 -      install -m 755 -d $(data_prefix)
-+      $(BSD_INSTALL_DATA_DIR) $(data_prefix)
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(data_prefix)
        for datadir in $(DATADIRS); do \
 -        install -m 755 -d $(data_prefix)/$$datadir; \
 -        cp -a $$datadir/* $(data_prefix)/$$datadir; \
-+        $(BSD_INSTALL_DATA_DIR) $(data_prefix)/$$datadir; \
-+        $(BSD_INSTALL_DATA)  $$datadir/*.list $(data_prefix)/$$datadir; \
-+        $(BSD_INSTALL_DATA)  $$datadir/*.syntax $(data_prefix)/$$datadir; \
++        $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(data_prefix)/$$datadir; \
++        $(BSD_INSTALL_DATA)  $$datadir/*.list $(DESTDIR)$(data_prefix)/$$datadir; \
++        $(BSD_INSTALL_DATA)  $$datadir/*.syntax $(DESTDIR)$(data_prefix)/$$datadir; \
        done
 -      install -m 755 -d $(prefix)/bin
 -      install -s -m 755 intel2gas $(prefix)/bin
-+      $(BSD_INSTALL_DATA_DIR) $(prefix)/bin
-+      $(BSD_INSTALL_PROGRAM) intel2gas $(prefix)/bin
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/bin
++      $(BSD_INSTALL_PROGRAM) intel2gas $(DESTDIR)$(prefix)/bin
  
  uninstall:
        for datadir in $(DATADIRS); do \
diff --git a/devel/intel2gas/patches/patch-ab b/devel/intel2gas/patches/patch-ab
new file mode 100644 (file)
index 0000000..c0efe09
--- /dev/null
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2009/11/29 23:29:29 dholland Exp $
+
+Patch out some bogus code that directly inspects addresses of heap
+variables.
+
+--- intel2gas.cc~      2009-11-29 18:24:52.000000000 -0500
++++ intel2gas.cc       2009-11-29 18:31:22.000000000 -0500
+@@ -57,10 +57,12 @@ syntaxlist_t *findSyntax(char const *nam
+   int counter = 0;
+   char* prev = 0;
+   while (l) {
++#if 0
+     if (int(l->name) > 0x10000000) {
+       printf("Error %d, prev=%s\n", counter, prev);
+       break;
+     }
++#endif
+     if (!strcasecmp(name,l->name))
+       return l;
+     counter++;
index b387e61..6038263 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2009/01/30 08:18:45 obache Exp $
+# $NetBSD: Makefile,v 1.61 2009/11/29 23:42:35 dholland Exp $
 
 DISTNAME=      pwlib-v1_8_3-src
 PKGNAME=       pwlib-1.8.3
@@ -9,7 +9,10 @@ EXTRACT_SUFX=  -tar.gz
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://sourceforge.net/projects/openh323/
-COMMENT=       Portable Windows Libary
+COMMENT=       Portable Windows Library
+# note: obsoleted by devel/ptlib
+
+NOT_FOR_PLATFORM+=     *-*-alpha *-*-sparc64 *-*-x86_64
 
 WRKSRC=                        ${WRKDIR}/pwlib
 USE_TOOLS+=            bison gmake
index 02c6a3a..7077946 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.4474 2009/11/29 14:49:55 seb Exp $
+$NetBSD: CHANGES-2009,v 1.4478 2009/11/30 01:30:18 dholland Exp $
 
 Changes to the packages collection and infrastructure in 2009:
 
@@ -5980,3 +5980,12 @@ Changes to the packages collection and infrastructure in 2009:
        Added databases/ruby-ldap version 0.9.8 [obache 2009-11-29]
        Updated databases/p5-Catalyst-Model-DBIC-Schema to 0.31 [seb 2009-11-29]
        Updated databases/p5-Sort-SQL to 0.07 [seb 2009-11-29]
+       Updated graphics/inkscape to 0.47 [tnn 2009-11-29]
+       Added graphics/tango-icon-theme version 0.8.90 [snj 2009-11-29]
+       Updated x11/xfce4-terminal to 0.4.2 [snj 2009-11-29]
+       Updated x11/xfce4-panel to 4.6.2 [snj 2009-11-29]
+       Updated x11/xfce4-settings to 4.6.3 [snj 2009-11-29]
+       Updated devel/gsoap to 2.7.13nb1 [dholland 2009-11-29]
+       Updated audio/py-id3lib to 0.5.1nb1 [dholland 2009-11-29]
+       Updated devel/intel2gas to 1.3.3nb1 [dholland 2009-11-29]
+       Updated devel/gentle to 97nb1 [dholland 2009-11-30]
index c242579..40a46f4 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.542 2009/11/24 11:13:57 drochner Exp $
+# $NetBSD: Makefile,v 1.543 2009/11/29 21:48:40 snj Exp $
 #
 
 COMMENT=       Graphics tools and libraries
@@ -376,6 +376,7 @@ SUBDIR+=    simage
 SUBDIR+=       skencil
 SUBDIR+=       snx101view
 SUBDIR+=       spcaview
+SUBDIR+=       tango-icon-theme
 SUBDIR+=       tesseract
 SUBDIR+=       tex-a2ping
 SUBDIR+=       tex-a2ping-doc
index ef7a825..05e5942 100644 (file)
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2009/11/22 16:08:46 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2009/11/29 20:51:51 tnn Exp $
 
-DISTNAME=      inkscape-0.46
-PKGREVISION=   6
+DISTNAME=      inkscape-0.47
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=inkscape/}
 EXTRACT_SUFX=  .tar.bz2
@@ -16,6 +15,7 @@ PKG_DESTDIR_SUPPORT=  user-destdir
 BUILD_DEPENDS+=                libiconv-[0-9]*:../../converters/libiconv
 .endif
 
+EXTRACT_USING=         bsdtar
 GCC_REQD+=             3.0
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
@@ -53,6 +53,7 @@ BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.12.2
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
index 842d6c0..7501f85 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 17:59:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/11/29 20:51:51 tnn Exp $
 bin/inkscape
 bin/inkview
 man/fr/man1/inkscape.1
@@ -18,6 +18,7 @@ share/inkscape/examples/blend_modes.svg
 share/inkscape/examples/car.svgz
 share/inkscape/examples/data_uri.svg
 share/inkscape/examples/eastern-motive-P4G.svg
+share/inkscape/examples/filters.svg
 share/inkscape/examples/flow-go.svg
 share/inkscape/examples/flowsample.svg
 share/inkscape/examples/gallardo.svgz
@@ -27,17 +28,20 @@ share/inkscape/examples/gradient.svg
 share/inkscape/examples/i18n.svg
 share/inkscape/examples/istest.pov
 share/inkscape/examples/l-systems.svgz
-share/inkscape/examples/lighting_effects.svg
+share/inkscape/examples/lighting_filters.svg
 share/inkscape/examples/live-path-effects-curvestitch.svg
 share/inkscape/examples/live-path-effects-gears.svg
 share/inkscape/examples/live-path-effects-pathalongpath.svg
 share/inkscape/examples/markers.svg
+share/inkscape/examples/replace-hue.svg
 share/inkscape/examples/rope-3D.svg
 share/inkscape/examples/stars.svgz
+share/inkscape/examples/svgfont.svg
 share/inkscape/examples/tesselation-P3.svg
 share/inkscape/examples/text-on-path.svg
 share/inkscape/examples/tiger.svgz
-share/inkscape/examples/turbulence_effects.svg
+share/inkscape/examples/tref.svg
+share/inkscape/examples/turbulence_filters.svg
 share/inkscape/extensions/Barcode/Base.py
 share/inkscape/extensions/Barcode/Code128.py
 share/inkscape/extensions/Barcode/Code39.py
@@ -49,17 +53,119 @@ share/inkscape/extensions/Barcode/RM4CC.py
 share/inkscape/extensions/Barcode/UPCA.py
 share/inkscape/extensions/Barcode/UPCE.py
 share/inkscape/extensions/Barcode/__init__.py
+share/inkscape/extensions/Inkscape.pm
+share/inkscape/extensions/Poly3DObjects/cube.obj
+share/inkscape/extensions/Poly3DObjects/cuboct.obj
+share/inkscape/extensions/Poly3DObjects/dodec.obj
+share/inkscape/extensions/Poly3DObjects/great_dodec.obj
+share/inkscape/extensions/Poly3DObjects/great_rhombicosidodec.obj
+share/inkscape/extensions/Poly3DObjects/great_rhombicuboct.obj
+share/inkscape/extensions/Poly3DObjects/great_stel_dodec.obj
+share/inkscape/extensions/Poly3DObjects/icos.obj
+share/inkscape/extensions/Poly3DObjects/icosidodec.obj
+share/inkscape/extensions/Poly3DObjects/jessens_orthog_icos.obj
+share/inkscape/extensions/Poly3DObjects/methane.obj
+share/inkscape/extensions/Poly3DObjects/oct.obj
+share/inkscape/extensions/Poly3DObjects/rh_axes.obj
+share/inkscape/extensions/Poly3DObjects/rhomb_dodec.obj
+share/inkscape/extensions/Poly3DObjects/rhomb_triacont.obj
+share/inkscape/extensions/Poly3DObjects/small_rhombicosidodec.obj
+share/inkscape/extensions/Poly3DObjects/small_rhombicuboct.obj
+share/inkscape/extensions/Poly3DObjects/small_triam_icos.obj
+share/inkscape/extensions/Poly3DObjects/snub_cube.obj
+share/inkscape/extensions/Poly3DObjects/snub_dodec.obj
+share/inkscape/extensions/Poly3DObjects/szilassi.obj
+share/inkscape/extensions/Poly3DObjects/tet.obj
+share/inkscape/extensions/Poly3DObjects/trunc_cube.obj
+share/inkscape/extensions/Poly3DObjects/trunc_dodec.obj
+share/inkscape/extensions/Poly3DObjects/trunc_icos.obj
+share/inkscape/extensions/Poly3DObjects/trunc_oct.obj
+share/inkscape/extensions/Poly3DObjects/trunc_tet.obj
 share/inkscape/extensions/SpSVG.pm
 share/inkscape/extensions/addnodes.inx
 share/inkscape/extensions/addnodes.py
 share/inkscape/extensions/ai_input.inx
-share/inkscape/extensions/ai_output.inx
 share/inkscape/extensions/aisvg.inx
 share/inkscape/extensions/aisvg.xslt
+share/inkscape/extensions/alphabet_soup/2.svg
+share/inkscape/extensions/alphabet_soup/3.svg
+share/inkscape/extensions/alphabet_soup/6.svg
+share/inkscape/extensions/alphabet_soup/7.svg
+share/inkscape/extensions/alphabet_soup/Cblob.svg
+share/inkscape/extensions/alphabet_soup/Chook.svg
+share/inkscape/extensions/alphabet_soup/Ctail.svg
+share/inkscape/extensions/alphabet_soup/Delta.svg
+share/inkscape/extensions/alphabet_soup/Eb.svg
+share/inkscape/extensions/alphabet_soup/Eserif.svg
+share/inkscape/extensions/alphabet_soup/Et.svg
+share/inkscape/extensions/alphabet_soup/G.svg
+share/inkscape/extensions/alphabet_soup/IBSerif.svg
+share/inkscape/extensions/alphabet_soup/ITSerif.svg
+share/inkscape/extensions/alphabet_soup/Lb.svg
+share/inkscape/extensions/alphabet_soup/Lt.svg
+share/inkscape/extensions/alphabet_soup/Ocross.svg
+share/inkscape/extensions/alphabet_soup/Oterm.svg
+share/inkscape/extensions/alphabet_soup/P.svg
+share/inkscape/extensions/alphabet_soup/Q.svg
+share/inkscape/extensions/alphabet_soup/Rblock.svg
+share/inkscape/extensions/alphabet_soup/Tb.svg
+share/inkscape/extensions/alphabet_soup/Tt.svg
+share/inkscape/extensions/alphabet_soup/U.svg
+share/inkscape/extensions/alphabet_soup/Vser.svg
+share/inkscape/extensions/alphabet_soup/Xh.svg
+share/inkscape/extensions/alphabet_soup/Xne.svg
+share/inkscape/extensions/alphabet_soup/Xnw.svg
+share/inkscape/extensions/alphabet_soup/Xvb.svg
+share/inkscape/extensions/alphabet_soup/Xvt.svg
+share/inkscape/extensions/alphabet_soup/a.svg
+share/inkscape/extensions/alphabet_soup/abase.svg
+share/inkscape/extensions/alphabet_soup/acap.svg
+share/inkscape/extensions/alphabet_soup/b.svg
+share/inkscape/extensions/alphabet_soup/bar.svg
+share/inkscape/extensions/alphabet_soup/bar2.svg
+share/inkscape/extensions/alphabet_soup/barcap.svg
+share/inkscape/extensions/alphabet_soup/c.svg
+share/inkscape/extensions/alphabet_soup/cross.svg
+share/inkscape/extensions/alphabet_soup/cserif.svg
+share/inkscape/extensions/alphabet_soup/e.svg
+share/inkscape/extensions/alphabet_soup/epsilon.svg
+share/inkscape/extensions/alphabet_soup/f.svg
+share/inkscape/extensions/alphabet_soup/gamma.svg
+share/inkscape/extensions/alphabet_soup/h.svg
+share/inkscape/extensions/alphabet_soup/h2.svg
+share/inkscape/extensions/alphabet_soup/hcap.svg
+share/inkscape/extensions/alphabet_soup/idot.svg
+share/inkscape/extensions/alphabet_soup/j.svg
+share/inkscape/extensions/alphabet_soup/k.svg
+share/inkscape/extensions/alphabet_soup/l.svg
+share/inkscape/extensions/alphabet_soup/lserif.svg
+share/inkscape/extensions/alphabet_soup/m.svg
+share/inkscape/extensions/alphabet_soup/mcap.svg
+share/inkscape/extensions/alphabet_soup/n.svg
+share/inkscape/extensions/alphabet_soup/o.svg
+share/inkscape/extensions/alphabet_soup/ocap.svg
+share/inkscape/extensions/alphabet_soup/question.svg
+share/inkscape/extensions/alphabet_soup/r.svg
+share/inkscape/extensions/alphabet_soup/rcap.svg
+share/inkscape/extensions/alphabet_soup/s.svg
+share/inkscape/extensions/alphabet_soup/serif.svg
+share/inkscape/extensions/alphabet_soup/t.svg
+share/inkscape/extensions/alphabet_soup/tserif.svg
+share/inkscape/extensions/alphabet_soup/v.svg
+share/inkscape/extensions/alphabet_soup/vcap.svg
+share/inkscape/extensions/alphabet_soup/vserl.svg
+share/inkscape/extensions/alphabet_soup/vserr.svg
+share/inkscape/extensions/alphabet_soup/x.svg
+share/inkscape/extensions/alphabet_soup/y.svg
+share/inkscape/extensions/alphabet_soup/yogh.svg
+share/inkscape/extensions/alphabet_soup/z.svg
 share/inkscape/extensions/bezmisc.py
-share/inkscape/extensions/cdr2svg.sh
+share/inkscape/extensions/ccx_input.inx
 share/inkscape/extensions/cdr_input.inx
+share/inkscape/extensions/cdt_input.inx
+share/inkscape/extensions/cgm_input.inx
 share/inkscape/extensions/chardataeffect.py
+share/inkscape/extensions/cmx_input.inx
 share/inkscape/extensions/color_brighter.inx
 share/inkscape/extensions/color_brighter.py
 share/inkscape/extensions/color_custom.inx
@@ -98,6 +204,8 @@ share/inkscape/extensions/color_rgbbarrel.inx
 share/inkscape/extensions/color_rgbbarrel.py
 share/inkscape/extensions/coloreffect.py
 share/inkscape/extensions/colors.xml
+share/inkscape/extensions/convert2dashes.inx
+share/inkscape/extensions/convert2dashes.py
 share/inkscape/extensions/cspsubdiv.py
 share/inkscape/extensions/cubicsuperpath.py
 share/inkscape/extensions/dia.inx
@@ -106,28 +214,35 @@ share/inkscape/extensions/dimension.inx
 share/inkscape/extensions/dimension.py
 share/inkscape/extensions/dots.inx
 share/inkscape/extensions/dots.py
+share/inkscape/extensions/draw_from_triangle.inx
+share/inkscape/extensions/draw_from_triangle.py
 share/inkscape/extensions/dxf_input.inx
+share/inkscape/extensions/dxf_input.py
 share/inkscape/extensions/dxf_outlines.inx
 share/inkscape/extensions/dxf_outlines.py
 share/inkscape/extensions/dxf_output.inx
+share/inkscape/extensions/dxf_templates.py
 share/inkscape/extensions/edge3d.inx
 share/inkscape/extensions/edge3d.py
 share/inkscape/extensions/embed_raster_in_svg.pl
 share/inkscape/extensions/embedimage.inx
 share/inkscape/extensions/embedimage.py
 share/inkscape/extensions/eps_input.inx
-share/inkscape/extensions/epsi_output.inx
 share/inkscape/extensions/eqtexsvg.inx
 share/inkscape/extensions/eqtexsvg.py
 share/inkscape/extensions/export_gimp_palette.inx
 share/inkscape/extensions/export_gimp_palette.py
 share/inkscape/extensions/extractimage.inx
 share/inkscape/extensions/extractimage.py
+share/inkscape/extensions/extrude.inx
+share/inkscape/extensions/extrude.py
 share/inkscape/extensions/ffgeom.py
-share/inkscape/extensions/fig2svg.sh
+share/inkscape/extensions/fig2dev-ext.py
 share/inkscape/extensions/fig_input.inx
 share/inkscape/extensions/flatten.inx
 share/inkscape/extensions/flatten.py
+share/inkscape/extensions/foldablebox.inx
+share/inkscape/extensions/foldablebox.py
 share/inkscape/extensions/fractalize.inx
 share/inkscape/extensions/fractalize.py
 share/inkscape/extensions/funcplot.inx
@@ -136,12 +251,18 @@ share/inkscape/extensions/gears.inx
 share/inkscape/extensions/gears.py
 share/inkscape/extensions/gimp_xcf.inx
 share/inkscape/extensions/gimp_xcf.py
+share/inkscape/extensions/grid_cartesian.inx
+share/inkscape/extensions/grid_cartesian.py
+share/inkscape/extensions/grid_polar.inx
+share/inkscape/extensions/grid_polar.py
+share/inkscape/extensions/guides_creator.inx
+share/inkscape/extensions/guides_creator.py
 share/inkscape/extensions/handles.inx
 share/inkscape/extensions/handles.py
+share/inkscape/extensions/hpgl_output.inx
+share/inkscape/extensions/hpgl_output.py
 share/inkscape/extensions/ill2svg.pl
 share/inkscape/extensions/inkex.py
-share/inkscape/extensions/inkscape-shadow-white.sh
-share/inkscape/extensions/inkscape-shadow.sh
 share/inkscape/extensions/inkscape_help_askaquestion.inx
 share/inkscape/extensions/inkscape_help_commandline.inx
 share/inkscape/extensions/inkscape_help_faq.inx
@@ -150,8 +271,13 @@ share/inkscape/extensions/inkscape_help_manual.inx
 share/inkscape/extensions/inkscape_help_relnotes.inx
 share/inkscape/extensions/inkscape_help_reportabug.inx
 share/inkscape/extensions/inkscape_help_svgspec.inx
+share/inkscape/extensions/inkweb.js
+share/inkscape/extensions/inkwebeffect.py
 share/inkscape/extensions/interp.inx
 share/inkscape/extensions/interp.py
+share/inkscape/extensions/interp_att_g.inx
+share/inkscape/extensions/interp_att_g.py
+share/inkscape/extensions/launch_webbrowser.py
 share/inkscape/extensions/lindenmayer.inx
 share/inkscape/extensions/lindenmayer.py
 share/inkscape/extensions/lorem_ipsum.inx
@@ -164,35 +290,52 @@ share/inkscape/extensions/motion.inx
 share/inkscape/extensions/motion.py
 share/inkscape/extensions/outline2svg.inx
 share/inkscape/extensions/outline2svg.pl
+share/inkscape/extensions/param_curves.inx
+share/inkscape/extensions/param_curves.py
 share/inkscape/extensions/pathalongpath.inx
 share/inkscape/extensions/pathalongpath.py
 share/inkscape/extensions/pathmodifier.py
-share/inkscape/extensions/pdf_output.inx.txt
-share/inkscape/extensions/pdf_output_via_gs_on_win32.inx.txt
+share/inkscape/extensions/pathscatter.inx
+share/inkscape/extensions/pathscatter.py
 share/inkscape/extensions/perfectboundcover.inx
 share/inkscape/extensions/perfectboundcover.py
 share/inkscape/extensions/perspective.inx
 share/inkscape/extensions/perspective.py
+share/inkscape/extensions/plt_input.inx
+share/inkscape/extensions/plt_output.inx
+share/inkscape/extensions/plt_output.py
+share/inkscape/extensions/polyhedron_3d.inx
+share/inkscape/extensions/polyhedron_3d.py
+share/inkscape/extensions/printing-marks.inx
+share/inkscape/extensions/printing-marks.py
 share/inkscape/extensions/ps2dxf.sh
-share/inkscape/extensions/ps2epsi.sh
-share/inkscape/extensions/ps2pdf.cmd
-share/inkscape/extensions/ps2pdf.sh
+share/inkscape/extensions/ps2pdf-ext.py
 share/inkscape/extensions/ps_input.inx
 share/inkscape/extensions/pturtle.py
 share/inkscape/extensions/radiusrand.inx
 share/inkscape/extensions/radiusrand.py
-share/inkscape/extensions/randompnt.inx
-share/inkscape/extensions/randompos.inx
+share/inkscape/extensions/render_alphabetsoup.inx
+share/inkscape/extensions/render_alphabetsoup.py
+share/inkscape/extensions/render_alphabetsoup_config.py
 share/inkscape/extensions/render_barcode.inx
 share/inkscape/extensions/render_barcode.py
+share/inkscape/extensions/restack.inx
+share/inkscape/extensions/restack.py
 share/inkscape/extensions/rtree.inx
 share/inkscape/extensions/rtree.py
 share/inkscape/extensions/rubberstretch.inx
 share/inkscape/extensions/rubberstretch.py
+share/inkscape/extensions/run_command.py
+share/inkscape/extensions/scour.inkscape.py
+share/inkscape/extensions/scour.inx
+share/inkscape/extensions/scour.py
 share/inkscape/extensions/simplepath.py
 share/inkscape/extensions/simplepath.rb
 share/inkscape/extensions/simplestyle.py
 share/inkscape/extensions/simpletransform.py
+share/inkscape/extensions/sk1_input.inx
+share/inkscape/extensions/sk1_output.inx
+share/inkscape/extensions/sk1_output.py
 share/inkscape/extensions/sk2svg.sh
 share/inkscape/extensions/sk_input.inx
 share/inkscape/extensions/spirograph.inx
@@ -205,8 +348,11 @@ share/inkscape/extensions/svg2xaml.inx
 share/inkscape/extensions/svg2xaml.xsl
 share/inkscape/extensions/svg_and_media_zip_output.inx
 share/inkscape/extensions/svg_and_media_zip_output.py
-share/inkscape/extensions/svgz_input.inx
-share/inkscape/extensions/svgz_output.inx
+share/inkscape/extensions/svg_regex.py
+share/inkscape/extensions/svgcalendar.inx
+share/inkscape/extensions/svgcalendar.py
+share/inkscape/extensions/text_braille.inx
+share/inkscape/extensions/text_braille.py
 share/inkscape/extensions/text_flipcase.inx
 share/inkscape/extensions/text_flipcase.py
 share/inkscape/extensions/text_lowercase.inx
@@ -221,19 +367,21 @@ share/inkscape/extensions/text_titlecase.inx
 share/inkscape/extensions/text_titlecase.py
 share/inkscape/extensions/text_uppercase.inx
 share/inkscape/extensions/text_uppercase.py
+share/inkscape/extensions/triangle.inx
+share/inkscape/extensions/triangle.py
 share/inkscape/extensions/txt2svg.inx
 share/inkscape/extensions/txt2svg.pl
-share/inkscape/extensions/webbrowser_askaquestion.py
-share/inkscape/extensions/webbrowser_commandline.py
-share/inkscape/extensions/webbrowser_faq.py
-share/inkscape/extensions/webbrowser_keys.py
-share/inkscape/extensions/webbrowser_manual.py
-share/inkscape/extensions/webbrowser_relnotes.py
-share/inkscape/extensions/webbrowser_reportabug.py
-share/inkscape/extensions/webbrowser_svgspec.py
+share/inkscape/extensions/uniconv-ext.py
+share/inkscape/extensions/uniconv_output.py
+share/inkscape/extensions/web-set-att.inx
+share/inkscape/extensions/web-set-att.py
+share/inkscape/extensions/web-transmit-att.inx
+share/inkscape/extensions/web-transmit-att.py
 share/inkscape/extensions/whirl.inx
 share/inkscape/extensions/whirl.py
 share/inkscape/extensions/wmf_input.inx
+share/inkscape/extensions/wmf_output.inx
+share/inkscape/extensions/wmf_output.py
 share/inkscape/extensions/xaml2svg.inx
 share/inkscape/extensions/xaml2svg.xsl
 share/inkscape/extensions/xaml2svg/Makefile.am
@@ -244,10 +392,13 @@ share/inkscape/extensions/xaml2svg/geometry.xsl
 share/inkscape/extensions/xaml2svg/properties.xsl
 share/inkscape/extensions/xaml2svg/shapes.xsl
 share/inkscape/extensions/xaml2svg/transform.xsl
+share/inkscape/extensions/yocto_css.py
+share/inkscape/filters/README
+share/inkscape/filters/filters.svg
+share/inkscape/filters/filters.svg.h
 share/inkscape/fonts/README
 share/inkscape/gradients/README
-share/inkscape/icons/README.icon_themes
-share/inkscape/icons/README.legacy_icons
+share/inkscape/icons/README
 share/inkscape/icons/feBlend-icon.png
 share/inkscape/icons/feBlend-icon.svg
 share/inkscape/icons/feColorMatrix-icon.png
@@ -280,7 +431,8 @@ share/inkscape/icons/icons.svg
 share/inkscape/icons/inkscape.file.png
 share/inkscape/icons/inkscape.file.svg
 share/inkscape/icons/inkscape.svg
-share/inkscape/icons/legacy_icons.svg
+share/inkscape/icons/remove-color.png
+share/inkscape/icons/remove-color.svg
 share/inkscape/icons/tango_icons.svg
 share/inkscape/icons/ticotico.jpg
 share/inkscape/keys/acd-canvas.xml
@@ -300,12 +452,14 @@ share/inkscape/palettes/Greens.gpl
 share/inkscape/palettes/Hilite.gpl
 share/inkscape/palettes/Khaki.gpl
 share/inkscape/palettes/LaTeX-Beamer.gpl
+share/inkscape/palettes/MATLAB-Jet-72.gpl
 share/inkscape/palettes/README
 share/inkscape/palettes/Reds.gpl
 share/inkscape/palettes/Royal.gpl
 share/inkscape/palettes/Tango-Palette.gpl
 share/inkscape/palettes/Topographic.gpl
 share/inkscape/palettes/Ubuntu.gpl
+share/inkscape/palettes/echo-palette.gpl
 share/inkscape/palettes/inkscape.gpl
 share/inkscape/palettes/svg.gpl
 share/inkscape/palettes/webhex.gpl
@@ -313,10 +467,22 @@ share/inkscape/palettes/websafe22.gpl
 share/inkscape/palettes/windowsXP.gpl
 share/inkscape/patterns/README
 share/inkscape/patterns/patterns.svg
+share/inkscape/patterns/patterns.svg.h
+share/inkscape/screens/about.be.svg
 share/inkscape/screens/about.bg.svg
 share/inkscape/screens/about.br.svg
+share/inkscape/screens/about.ca.svg
+share/inkscape/screens/about.cs.svg
+share/inkscape/screens/about.de.svg
+share/inkscape/screens/about.es.svg
+share/inkscape/screens/about.eu.svg
+share/inkscape/screens/about.fi.svg
+share/inkscape/screens/about.fr.svg
 share/inkscape/screens/about.gl.svg
+share/inkscape/screens/about.hu.svg
 share/inkscape/screens/about.it.svg
+share/inkscape/screens/about.nl.svg
+share/inkscape/screens/about.pl.svg
 share/inkscape/screens/about.pt_BR.svg
 share/inkscape/screens/about.ru.svg
 share/inkscape/screens/about.sk.svg
@@ -324,6 +490,7 @@ share/inkscape/screens/about.sl.svg
 share/inkscape/screens/about.sr.svg
 share/inkscape/screens/about.sr@latin.svg
 share/inkscape/screens/about.svg
+share/inkscape/screens/about.uk.svg
 share/inkscape/templates/A4.svg
 share/inkscape/templates/A4_landscape.svg
 share/inkscape/templates/CD_cover_300dpi.svg
@@ -338,6 +505,7 @@ share/inkscape/templates/README
 share/inkscape/templates/black_opaque.svg
 share/inkscape/templates/business_card_85x54mm.svg
 share/inkscape/templates/business_card_90x50mm.svg
+share/inkscape/templates/default.be.svg
 share/inkscape/templates/default.ca.svg
 share/inkscape/templates/default.cs.svg
 share/inkscape/templates/default.de.svg
@@ -348,7 +516,9 @@ share/inkscape/templates/default.fi.svg
 share/inkscape/templates/default.fr.svg
 share/inkscape/templates/default.hu.svg
 share/inkscape/templates/default.it.svg
+share/inkscape/templates/default.ja.svg
 share/inkscape/templates/default.lt.svg
+share/inkscape/templates/default.nl.svg
 share/inkscape/templates/default.pl.svg
 share/inkscape/templates/default.pt_BR.svg
 share/inkscape/templates/default.sk.svg
@@ -373,20 +543,37 @@ share/inkscape/templates/web_banner_468x60.svg
 share/inkscape/templates/web_banner_728x90.svg
 share/inkscape/templates/white_opaque.svg
 share/inkscape/tutorials/README
+share/inkscape/tutorials/edge3d.svg
 share/inkscape/tutorials/gpl-2.svg
 share/inkscape/tutorials/making_markers.svg
 share/inkscape/tutorials/oldguitar.jpg
+share/inkscape/tutorials/potrace-ca.png
 share/inkscape/tutorials/potrace-de.png
+share/inkscape/tutorials/potrace-en.png
+share/inkscape/tutorials/potrace-es.png
+share/inkscape/tutorials/potrace-eu.png
 share/inkscape/tutorials/potrace-fr.png
+share/inkscape/tutorials/potrace-hu.png
+share/inkscape/tutorials/potrace-ja.png
+share/inkscape/tutorials/potrace-pl.png
+share/inkscape/tutorials/potrace-pt_BR.png
 share/inkscape/tutorials/potrace-ru.png
+share/inkscape/tutorials/potrace-sk.png
+share/inkscape/tutorials/potrace-sl.png
+share/inkscape/tutorials/potrace-vi.png
+share/inkscape/tutorials/potrace-zh_CN.png
+share/inkscape/tutorials/potrace-zh_TW.png
 share/inkscape/tutorials/potrace.png
 share/inkscape/tutorials/tutorial-advanced.ca.svg
 share/inkscape/tutorials/tutorial-advanced.cs.svg
 share/inkscape/tutorials/tutorial-advanced.de.svg
 share/inkscape/tutorials/tutorial-advanced.es.svg
+share/inkscape/tutorials/tutorial-advanced.eu.svg
 share/inkscape/tutorials/tutorial-advanced.fr.svg
+share/inkscape/tutorials/tutorial-advanced.hu.svg
 share/inkscape/tutorials/tutorial-advanced.it.svg
 share/inkscape/tutorials/tutorial-advanced.ja.svg
+share/inkscape/tutorials/tutorial-advanced.pl.svg
 share/inkscape/tutorials/tutorial-advanced.pt_BR.svg
 share/inkscape/tutorials/tutorial-advanced.ru.svg
 share/inkscape/tutorials/tutorial-advanced.sk.svg
@@ -394,16 +581,22 @@ share/inkscape/tutorials/tutorial-advanced.sl.svg
 share/inkscape/tutorials/tutorial-advanced.svg
 share/inkscape/tutorials/tutorial-advanced.vi.svg
 share/inkscape/tutorials/tutorial-advanced.zh_CN.svg
+share/inkscape/tutorials/tutorial-advanced.zh_TW.svg
 share/inkscape/tutorials/tutorial-basic.bg.svg
 share/inkscape/tutorials/tutorial-basic.ca.svg
 share/inkscape/tutorials/tutorial-basic.cs.svg
 share/inkscape/tutorials/tutorial-basic.da.svg
 share/inkscape/tutorials/tutorial-basic.de.svg
+share/inkscape/tutorials/tutorial-basic.eo.svg
 share/inkscape/tutorials/tutorial-basic.es.svg
+share/inkscape/tutorials/tutorial-basic.eu.svg
 share/inkscape/tutorials/tutorial-basic.fr.svg
+share/inkscape/tutorials/tutorial-basic.hu.svg
 share/inkscape/tutorials/tutorial-basic.it.svg
 share/inkscape/tutorials/tutorial-basic.ja.svg
+share/inkscape/tutorials/tutorial-basic.nl.svg
 share/inkscape/tutorials/tutorial-basic.nn.svg
+share/inkscape/tutorials/tutorial-basic.pl.svg
 share/inkscape/tutorials/tutorial-basic.pt_BR.svg
 share/inkscape/tutorials/tutorial-basic.ru.svg
 share/inkscape/tutorials/tutorial-basic.sk.svg
@@ -412,31 +605,54 @@ share/inkscape/tutorials/tutorial-basic.svg
 share/inkscape/tutorials/tutorial-basic.tr.svg
 share/inkscape/tutorials/tutorial-basic.vi.svg
 share/inkscape/tutorials/tutorial-basic.zh_CN.svg
+share/inkscape/tutorials/tutorial-basic.zh_TW.svg
 share/inkscape/tutorials/tutorial-calligraphy.ca.svg
 share/inkscape/tutorials/tutorial-calligraphy.cs.svg
 share/inkscape/tutorials/tutorial-calligraphy.de.svg
 share/inkscape/tutorials/tutorial-calligraphy.es.svg
+share/inkscape/tutorials/tutorial-calligraphy.eu.svg
 share/inkscape/tutorials/tutorial-calligraphy.fr.svg
+share/inkscape/tutorials/tutorial-calligraphy.hu.svg
+share/inkscape/tutorials/tutorial-calligraphy.ja.svg
+share/inkscape/tutorials/tutorial-calligraphy.pl.svg
 share/inkscape/tutorials/tutorial-calligraphy.pt_BR.svg
 share/inkscape/tutorials/tutorial-calligraphy.ru.svg
+share/inkscape/tutorials/tutorial-calligraphy.sk.svg
 share/inkscape/tutorials/tutorial-calligraphy.sl.svg
 share/inkscape/tutorials/tutorial-calligraphy.svg
 share/inkscape/tutorials/tutorial-calligraphy.vi.svg
+share/inkscape/tutorials/tutorial-calligraphy.zh_TW.svg
 share/inkscape/tutorials/tutorial-elements.ca.svg
 share/inkscape/tutorials/tutorial-elements.de.svg
 share/inkscape/tutorials/tutorial-elements.es.svg
+share/inkscape/tutorials/tutorial-elements.eu.svg
 share/inkscape/tutorials/tutorial-elements.fr.svg
+share/inkscape/tutorials/tutorial-elements.hu.svg
+share/inkscape/tutorials/tutorial-elements.ja.svg
+share/inkscape/tutorials/tutorial-elements.pl.svg
 share/inkscape/tutorials/tutorial-elements.pt_BR.svg
 share/inkscape/tutorials/tutorial-elements.ru.svg
+share/inkscape/tutorials/tutorial-elements.sk.svg
 share/inkscape/tutorials/tutorial-elements.sl.svg
 share/inkscape/tutorials/tutorial-elements.svg
+share/inkscape/tutorials/tutorial-elements.zh_TW.svg
+share/inkscape/tutorials/tutorial-interpolate.de.svg
+share/inkscape/tutorials/tutorial-interpolate.fr.svg
+share/inkscape/tutorials/tutorial-interpolate.hu.svg
+share/inkscape/tutorials/tutorial-interpolate.pl.svg
+share/inkscape/tutorials/tutorial-interpolate.sl.svg
+share/inkscape/tutorials/tutorial-interpolate.svg
+share/inkscape/tutorials/tutorial-interpolate.vi.svg
 share/inkscape/tutorials/tutorial-shapes.ca.svg
 share/inkscape/tutorials/tutorial-shapes.cs.svg
 share/inkscape/tutorials/tutorial-shapes.de.svg
 share/inkscape/tutorials/tutorial-shapes.es.svg
+share/inkscape/tutorials/tutorial-shapes.eu.svg
 share/inkscape/tutorials/tutorial-shapes.fr.svg
+share/inkscape/tutorials/tutorial-shapes.hu.svg
 share/inkscape/tutorials/tutorial-shapes.it.svg
 share/inkscape/tutorials/tutorial-shapes.ja.svg
+share/inkscape/tutorials/tutorial-shapes.pl.svg
 share/inkscape/tutorials/tutorial-shapes.pt_BR.svg
 share/inkscape/tutorials/tutorial-shapes.ru.svg
 share/inkscape/tutorials/tutorial-shapes.sk.svg
@@ -444,25 +660,38 @@ share/inkscape/tutorials/tutorial-shapes.sl.svg
 share/inkscape/tutorials/tutorial-shapes.svg
 share/inkscape/tutorials/tutorial-shapes.vi.svg
 share/inkscape/tutorials/tutorial-shapes.zh_CN.svg
+share/inkscape/tutorials/tutorial-shapes.zh_TW.svg
 share/inkscape/tutorials/tutorial-tips.ca.svg
 share/inkscape/tutorials/tutorial-tips.de.svg
 share/inkscape/tutorials/tutorial-tips.es.svg
+share/inkscape/tutorials/tutorial-tips.eu.svg
 share/inkscape/tutorials/tutorial-tips.fr.svg
+share/inkscape/tutorials/tutorial-tips.hu.svg
 share/inkscape/tutorials/tutorial-tips.it.svg
+share/inkscape/tutorials/tutorial-tips.ja.svg
+share/inkscape/tutorials/tutorial-tips.pl.svg
 share/inkscape/tutorials/tutorial-tips.pt_BR.svg
 share/inkscape/tutorials/tutorial-tips.ru.svg
 share/inkscape/tutorials/tutorial-tips.sk.svg
 share/inkscape/tutorials/tutorial-tips.sl.svg
 share/inkscape/tutorials/tutorial-tips.svg
+share/inkscape/tutorials/tutorial-tips.vi.svg
+share/inkscape/tutorials/tutorial-tips.zh_TW.svg
 share/inkscape/tutorials/tutorial-tracing.ca.svg
 share/inkscape/tutorials/tutorial-tracing.de.svg
 share/inkscape/tutorials/tutorial-tracing.es.svg
+share/inkscape/tutorials/tutorial-tracing.eu.svg
 share/inkscape/tutorials/tutorial-tracing.fr.svg
+share/inkscape/tutorials/tutorial-tracing.hu.svg
+share/inkscape/tutorials/tutorial-tracing.ja.svg
+share/inkscape/tutorials/tutorial-tracing.pl.svg
 share/inkscape/tutorials/tutorial-tracing.pt_BR.svg
 share/inkscape/tutorials/tutorial-tracing.ru.svg
+share/inkscape/tutorials/tutorial-tracing.sk.svg
 share/inkscape/tutorials/tutorial-tracing.sl.svg
 share/inkscape/tutorials/tutorial-tracing.svg
 share/inkscape/tutorials/tutorial-tracing.vi.svg
+share/inkscape/tutorials/tutorial-tracing.zh_TW.svg
 share/inkscape/tutorials/tux.png
 share/inkscape/ui/keybindings.rc
 share/inkscape/ui/menus-bars.xml
@@ -499,6 +728,7 @@ share/locale/gl/LC_MESSAGES/inkscape.mo
 share/locale/he/LC_MESSAGES/inkscape.mo
 share/locale/hr/LC_MESSAGES/inkscape.mo
 share/locale/hu/LC_MESSAGES/inkscape.mo
+share/locale/hy/LC_MESSAGES/inkscape.mo
 share/locale/id/LC_MESSAGES/inkscape.mo
 share/locale/it/LC_MESSAGES/inkscape.mo
 share/locale/ja/LC_MESSAGES/inkscape.mo
index 28078c8..a2b76a5 100644 (file)
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.29 2009/11/22 16:08:46 drochner Exp $
+$NetBSD: distinfo,v 1.30 2009/11/29 20:51:51 tnn Exp $
 
-SHA1 (inkscape-0.46.tar.bz2) = ca68fc9bf539d7bcfc31f36d24f884255b2154e7
-RMD160 (inkscape-0.46.tar.bz2) = c90713493557bdc17515de1287c9af401a4a3e26
-Size (inkscape-0.46.tar.bz2) = 13368645 bytes
+SHA1 (inkscape-0.47.tar.bz2) = 7c75352f3882ebf4fcaebc22413bcb79bf3b7895
+RMD160 (inkscape-0.47.tar.bz2) = 5f9dc6117e5670e8501769fe1d26945c4de76ffa
+Size (inkscape-0.47.tar.bz2) = 20742550 bytes
 SHA1 (patch-aa) = 595eaa0e71483abe731bc3f69090b0ab5d1d5deb
-SHA1 (patch-ab) = 7eca63e71523f47d968d7b2c513a11010381f1ed
+SHA1 (patch-ab) = b70ffa613c054c26185d4728da4133aed6d88e63
 SHA1 (patch-ac) = 8034de5cf024ef6ec55e378681a1f450da23bbce
 SHA1 (patch-ad) = 3136850b7d34370feb951fc8fdde8cda78d54d60
 SHA1 (patch-ae) = 2b3f06a545d3cf27f59d41619528c59ac142c758
-SHA1 (patch-af) = 190f59d9b3233154e41dd43964265b0a4709c977
+SHA1 (patch-af) = 5f9317fcb7a798afc569aada9683fb1c7f6ba4c7
 SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
-SHA1 (patch-ah) = 964e51dca7e1212037a9f0122fa0ef812bf8f46c
-SHA1 (patch-ai) = 56271685b207f4056952929895f1fdd2ec74e3ef
-SHA1 (patch-aj) = ae258d2b4f3d5bdbfbc6d76d13361b6e672de73c
-SHA1 (patch-ak) = ec8a8ff767da9adeec8e40453d7a2c56fa373cd9
-SHA1 (patch-al) = 0059368f58bc41395d96125c010c6cb574cfca6a
-SHA1 (patch-am) = 0ca65739b623945283569580fe0b194fe89fb392
-SHA1 (patch-an) = 6426a52af7b16c3dfeb51f5e48d879d56f067807
-SHA1 (patch-ao) = e7ac9857bf0d686ae77aaa2f3ab90009bfc0a797
+SHA1 (patch-ah) = 7f5517171073017b3e96367237af2c981cecf628
+SHA1 (patch-ai) = e9c5cdf9ee4c123dd5a1e7ecb85eff9244774ea8
+SHA1 (patch-aj) = 8564ee2d4e884dc31e4ad4232267f6fad09f71ee
+SHA1 (patch-ak) = f10ff5a1e9a45647e6a59ce3219ea8867bbeb641
 SHA1 (patch-ap) = cd29bd178dc2c6c9456bc09d6663d6a25acc7da1
index b3c904e..ca7d1d5 100644 (file)
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.8 2008/06/05 10:17:28 drochner Exp $
+$NetBSD: patch-ab,v 1.9 2009/11/29 20:51:51 tnn Exp $
 
---- ./src/ui/dialog/print.cpp.orig     2008-06-02 23:26:59 +0300
-+++ ./src/ui/dialog/print.cpp  2008-06-02 23:28:48 +0300
+--- src/ui/dialog/print.cpp.orig       2009-11-16 18:29:40.000000000 +0100
++++ src/ui/dialog/print.cpp
 @@ -16,6 +16,8 @@
- #include <io.h>
+ #include <windows.h>
  #endif
  
 +#include <unistd.h> // close() and unlink()
index 81f8be0..6aa7f99 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2008/04/07 17:08:53 adam Exp $
+$NetBSD: patch-af,v 1.4 2009/11/29 20:51:51 tnn Exp $
 
---- packaging/macosx/Resources/script.orig     2008-03-11 05:19:27.000000000 +0100
+--- packaging/macosx/Resources/script.orig     2009-11-16 18:29:06.000000000 +0100
 +++ packaging/macosx/Resources/script
-@@ -30,7 +30,7 @@ if [[ $VERSION -le 4 ]]; then
+@@ -31,7 +31,7 @@ if [[ $VERSION -le 4 ]]; then
        open -a XDarwin /tmp/getdisplay.sh || \
        echo ":0" > /tmp/display.$UID
  
@@ -10,4 +10,4 @@ $NetBSD: patch-af,v 1.3 2008/04/07 17:08:53 adam Exp $
 +      while [ "$?" = "0" -a ! -f /tmp/display.$UID ]; do
            sleep 1
        done
-       export DISPLAY="`cat /tmp/display.$UID`"
+       export DISPLAY=`cat /tmp/display.$UID`
index 386f3f4..21dde7b 100644 (file)
@@ -1,28 +1,13 @@
-$NetBSD: patch-ah,v 1.3 2009/05/20 12:00:17 tnn Exp $
+$NetBSD: patch-ah,v 1.4 2009/11/29 20:51:51 tnn Exp $
 
---- src/widgets/sp-color-slider.cpp.orig       2009-05-20 13:21:10.000000000 +0200
-+++ src/widgets/sp-color-slider.cpp
-@@ -12,6 +12,7 @@
-  * This code is in public domain
-  */
-+#include <gtk/gtkversion.h>
- #include <gtk/gtksignal.h>
- #include "sp-color-scales.h"
-@@ -330,8 +331,14 @@ sp_color_slider_set_adjustment (SPColorS
-       g_return_if_fail (SP_IS_COLOR_SLIDER (slider));
-       if (!adjustment) {
--              adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.1, 0.1);
-+              adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.0, 0.0);
-       }
-+#if GTK_CHECK_VERSION (2,14,0)
-+    else {
-+        gtk_adjustment_set_page_increment(adjustment, 0.0);
-+        gtk_adjustment_set_page_size(adjustment, 0.0);
-+    }
-+#endif
-       if (slider->adjustment != adjustment) {
-               if (slider->adjustment) {
+--- packaging/macosx/Resources/bin/inkscape.orig       2009-11-16 18:29:06.000000000 +0100
++++ packaging/macosx/Resources/bin/inkscape
+@@ -104,7 +104,7 @@ fi
+ # If the AppleCollationOrder preference doesn't exist, we fall back to using
+ # the AppleLocale preference.
+ LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
+-if [ "x$LANGSTR" == "x" ]
++if [ "x$LANGSTR" = "x" ]
+ then
+     echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2
+     LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
index 07e5c1a..3a0d98f 100644 (file)
@@ -1,13 +1,12 @@
-$NetBSD: patch-ai,v 1.3 2009/05/20 12:00:17 tnn Exp $
+$NetBSD: patch-ai,v 1.4 2009/11/29 20:51:51 tnn Exp $
 
---- src/widgets/dash-selector.cpp.orig 2008-03-11 05:20:14.000000000 +0100
-+++ src/widgets/dash-selector.cpp
-@@ -116,7 +116,7 @@ sp_dash_selector_init (SPDashSelector *d
-       }
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (dsel->dash), m);
+--- src/display/nr-arena-shape.cpp.orig        2009-11-16 18:29:13.000000000 +0100
++++ src/display/nr-arena-shape.cpp
+@@ -38,7 +38,6 @@
  
--      dsel->offset = gtk_adjustment_new (0.0, 0.0, 10.0, 0.1, 1.0, 1.0);
-+      dsel->offset = gtk_adjustment_new (0.0, 0.0, 10.0, 0.1, 1.0, 0.0);
-       GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (dsel->offset), 0.1, 2);
-       gtk_tooltips_set_tip (tt, sb, _("Pattern offset"), NULL);
+ #include <glib.h>
+ #include "svg/svg.h"
+-#include <fenv.h>
  
+ //int  showRuns=0;
+ void nr_pixblock_render_shape_mask_or(NRPixBlock &m,Shape* theS);
index b5620e7..767a129 100644 (file)
@@ -1,22 +1,15 @@
-$NetBSD: patch-aj,v 1.1 2009/05/20 12:00:17 tnn Exp $
+$NetBSD: patch-aj,v 1.2 2009/11/29 20:51:51 tnn Exp $
 
---- src/dialogs/stroke-style.cpp.orig  2008-03-11 05:19:51.000000000 +0100
-+++ src/dialogs/stroke-style.cpp
-@@ -1098,7 +1098,7 @@ sp_stroke_style_line_widget_new(void)
- // with it, the two remaining calls of stroke_average_width, allowing us to get rid of that
- // function in desktop-style.
+--- src/live_effects/lpe-dynastroke.cpp.orig   2009-11-16 18:29:33.000000000 +0100
++++ src/live_effects/lpe-dynastroke.cpp
+@@ -25,6 +25,10 @@
+ #include <2geom/sbasis-math.h>
+ #include <2geom/piecewise.h>
++/* xxx should test if this is needed  */
++#define fmin(a,b) ((a)<(b)?(a):(b))
++#define fmax(a,b) ((a)>(b)?(a):(b))
++
+ namespace Inkscape {
+ namespace LivePathEffect {
  
--    a = gtk_adjustment_new(1.0, 0.0, 1000.0, 0.1, 10.0, 10.0);
-+    a = gtk_adjustment_new(1.0, 0.0, 1000.0, 0.1, 10.0, 0.0);
-     gtk_object_set_data(GTK_OBJECT(spw), "width", a);
-     sb = gtk_spin_button_new(GTK_ADJUSTMENT(a), 0.1, 3);
-     gtk_tooltips_set_tip(tt, sb, _("Stroke width"), NULL);
-@@ -1167,7 +1167,7 @@ sp_stroke_style_line_widget_new(void)
-     hb = spw_hbox(t, 3, 1, i);
--    a = gtk_adjustment_new(4.0, 0.0, 100.0, 0.1, 10.0, 10.0);
-+    a = gtk_adjustment_new(4.0, 0.0, 100.0, 0.1, 10.0, 0.0);
-     gtk_object_set_data(GTK_OBJECT(spw), "miterlimit", a);
-     sb = gtk_spin_button_new(GTK_ADJUSTMENT(a), 0.1, 2);
index 82d0e7d..ffa82d0 100644 (file)
@@ -1,41 +1,41 @@
-$NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $
+$NetBSD: patch-ak,v 1.3 2009/11/29 20:51:51 tnn Exp $
 
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig        2008-03-11 05:20:21.000000000 +0100
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig        2009-11-16 18:29:17.000000000 +0100
 +++ src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -810,7 +810,7 @@ void PdfParser::opSetExtGState(Object ar
+@@ -809,7 +809,7 @@ void PdfParser::opSetExtGState(Object ar
          blendingColorSpace = NULL;
          isolated = knockout = gFalse;
-         if (!obj4.dictLookup("CS", &obj5)->isNull()) {
+         if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
 -          blendingColorSpace = GfxColorSpace::parse(&obj5);
-+                blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
++          blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
          }
          obj5.free();
-         if (obj4.dictLookup("I", &obj5)->isBool()) {
-@@ -1010,9 +1010,9 @@ void PdfParser::opSetFillColorSpace(Obje
+         if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
+@@ -1009,9 +1009,9 @@ void PdfParser::opSetFillColorSpace(Obje
    state->setFillPattern(NULL);
    res->lookupColorSpace(args[0].getName(), &obj);
    if (obj.isNull()) {
 -    colorSpace = GfxColorSpace::parse(&args[0]);
-+        colorSpace = GfxColorSpace::parse(&args[0], NULL);
++    colorSpace = GfxColorSpace::parse(&args[0], NULL);
    } else {
 -    colorSpace = GfxColorSpace::parse(&obj);
-+        colorSpace = GfxColorSpace::parse(&obj, NULL);
++    colorSpace = GfxColorSpace::parse(&obj, NULL);
    }
    obj.free();
    if (colorSpace) {
-@@ -1033,9 +1033,9 @@ void PdfParser::opSetStrokeColorSpace(Ob
+@@ -1032,9 +1032,9 @@ void PdfParser::opSetStrokeColorSpace(Ob
    state->setStrokePattern(NULL);
    res->lookupColorSpace(args[0].getName(), &obj);
    if (obj.isNull()) {
 -    colorSpace = GfxColorSpace::parse(&args[0]);
-+        colorSpace = GfxColorSpace::parse(&args[0], NULL);
++    colorSpace = GfxColorSpace::parse(&args[0], NULL);
    } else {
 -    colorSpace = GfxColorSpace::parse(&obj);
-+        colorSpace = GfxColorSpace::parse(&obj, NULL);
++    colorSpace = GfxColorSpace::parse(&obj, NULL);
    }
    obj.free();
    if (colorSpace) {
-@@ -1102,7 +1102,7 @@ void PdfParser::opSetFillColorN(Object a
+@@ -1101,7 +1101,7 @@ void PdfParser::opSetFillColorN(Object a
        builder->updateStyle(state);
      }
      if (args[numArgs-1].isName() &&
@@ -44,7 +44,7 @@ $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $
        state->setFillPattern(pattern);
        builder->updateStyle(state);
      }
-@@ -1146,7 +1146,7 @@ void PdfParser::opSetStrokeColorN(Object
+@@ -1145,7 +1145,7 @@ void PdfParser::opSetStrokeColorN(Object
        builder->updateStyle(state);
      }
      if (args[numArgs-1].isName() &&
@@ -53,7 +53,7 @@ $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $
        state->setStrokePattern(pattern);
        builder->updateStyle(state);
      }
-@@ -1544,7 +1544,7 @@ void PdfParser::opShFill(Object args[], 
+@@ -1543,7 +1543,7 @@ void PdfParser::opShFill(Object args[], 
    double *matrix = NULL;
    GBool savedState = gFalse;
  
@@ -62,43 +62,16 @@ $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $
      return;
    }
  
-@@ -2196,7 +2196,7 @@ void PdfParser::doShowText(GooString *s)
-   int wMode;
-   double riseX, riseY;
-   CharCode code;
--  Unicode u[8];
-+  Unicode *u = NULL;
-   double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY;
-   double originX, originY, tOriginX, tOriginY;
-   double oldCTM[6], newCTM[6];
-@@ -2244,7 +2244,7 @@ void PdfParser::doShowText(GooString *s)
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
--                          u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
-+                          &u, &uLen,
-                           &dx, &dy, &originX, &originY);
-       dx = dx * state->getFontSize() + state->getCharSpace();
-       if (n == 1 && *p == ' ') {
-@@ -2293,7 +2293,7 @@ void PdfParser::doShowText(GooString *s)
-     len = s->getLength();
-     while (len > 0) {
-       n = font->getNextChar(p, len, &code,
--                          u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
-+                          &u, &uLen,
-                           &dx, &dy, &originX, &originY);
-       
-       if (wMode) {
-@@ -2487,7 +2487,7 @@ void PdfParser::doImage(Object *ref, Str
+@@ -2507,7 +2507,7 @@ void PdfParser::doImage(Object *ref, Str
        }
      }
      if (!obj1.isNull()) {
 -      colorSpace = GfxColorSpace::parse(&obj1);
-+          colorSpace = GfxColorSpace::parse(&obj1, NULL);
++      colorSpace = GfxColorSpace::parse(&obj1, NULL);
      } else if (csMode == streamCSDeviceGray) {
        colorSpace = new GfxDeviceGrayColorSpace();
      } else if (csMode == streamCSDeviceRGB) {
-@@ -2572,7 +2572,7 @@ void PdfParser::doImage(Object *ref, Str
+@@ -2592,7 +2592,7 @@ void PdfParser::doImage(Object *ref, Str
          obj2.free();
        }
        }
@@ -107,12 +80,12 @@ $NetBSD: patch-ak,v 1.2 2009/11/22 16:08:46 drochner Exp $
        obj1.free();
        if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
        goto err1;
-@@ -2747,7 +2747,7 @@ void PdfParser::doForm(Object *str) {
-     if (obj1.dictLookup("S", &obj2)->isName("Transparency")) {
+@@ -2767,7 +2767,7 @@ void PdfParser::doForm(Object *str) {
+     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
        transpGroup = gTrue;
-       if (!obj1.dictLookup("CS", &obj3)->isNull()) {
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
 -      blendingColorSpace = GfxColorSpace::parse(&obj3);
-+            blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
++      blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
        }
        obj3.free();
-       if (obj1.dictLookup("I", &obj3)->isBool()) {
+       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
diff --git a/graphics/inkscape/patches/patch-al b/graphics/inkscape/patches/patch-al
deleted file mode 100644 (file)
index b117a9b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2009/10/06 00:53:26 dmcmahill Exp $
-
-gcc44 fixes
-
---- src/streams-handles.cpp.orig       2008-03-11 04:20:00.000000000 +0000
-+++ src/streams-handles.cpp    2009-10-05 18:16:03.000000000 +0000
-@@ -14,4 +14,5 @@
- #include <iostream>
-+#include <cstdio>
- namespace Inkscape {
diff --git a/graphics/inkscape/patches/patch-am b/graphics/inkscape/patches/patch-am
deleted file mode 100644 (file)
index 230b00d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 2009/10/06 00:53:26 dmcmahill Exp $
-
-gcc44 fixes 
-
---- src/streams-zlib.cpp.orig  2008-03-11 04:19:29.000000000 +0000
-+++ src/streams-zlib.cpp       2009-10-05 19:41:10.000000000 +0000
-@@ -10,4 +10,5 @@
-  */
-+#include <cstdio>
- #include <cstring>
- #include <string>
diff --git a/graphics/inkscape/patches/patch-an b/graphics/inkscape/patches/patch-an
deleted file mode 100644 (file)
index 0286c06..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2009/10/06 00:53:26 dmcmahill Exp $
-
-gcc44 fixes
-
---- src/dom/io/uristream.cpp.orig      2008-03-11 04:19:31.000000000 +0000
-+++ src/dom/io/uristream.cpp   2009-10-05 20:00:03.000000000 +0000
-@@ -42,5 +42,5 @@
- #include "uristream.h"
--
-+#include <cstring>
diff --git a/graphics/inkscape/patches/patch-ao b/graphics/inkscape/patches/patch-ao
deleted file mode 100644 (file)
index 79f53eb..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD4
-
-gcc44 fixes
-
---- src/io/sys.cpp.orig        2008-03-11 04:20:06.000000000 +0000
-+++ src/io/sys.cpp     2009-10-05 21:07:59.000000000 +0000
-@@ -16,4 +16,6 @@
- #endif
-+#include <cstdio>
-+
- #include <glib/gutils.h>
- #if GLIB_CHECK_VERSION(2,6,0)
similarity index 91%
rename from wip/tango-icon-theme/Makefile
rename to graphics/tango-icon-theme/Makefile
index b8aa520..62642be 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: Makefile,v 1.1.1.1 2009/11/29 21:47:36 snj Exp $
 
 DISTNAME=      tango-icon-theme-0.8.90
 CATEGORIES=    graphics
similarity index 99%
rename from wip/tango-icon-theme/PLIST
rename to graphics/tango-icon-theme/PLIST
index 7fd884b..da94064 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/29 21:47:38 snj Exp $
 share/icons/Tango/16x16/actions/add.png
 share/icons/Tango/16x16/actions/address-book-new.png
 share/icons/Tango/16x16/actions/appointment-new.png
similarity index 65%
rename from wip/tango-icon-theme/buildlink3.mk
rename to graphics/tango-icon-theme/buildlink3.mk
index 8124c9e..ea9d79e 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/11/29 21:47:36 snj Exp $
 
 BUILDLINK_TREE+=       tango-icon-theme
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        tango-icon-theme
 TANGO_ICON_THEME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.tango-icon-theme+=       tango-icon-theme>=0.8.90
-BUILDLINK_PKGSRCDIR.tango-icon-theme?= ../../wip/tango-icon-theme
+BUILDLINK_PKGSRCDIR.tango-icon-theme?= ../../graphics/tango-icon-theme
 .endif # TANGO_ICON_THEME_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -tango-icon-theme
similarity index 79%
rename from wip/tango-icon-theme/distinfo
rename to graphics/tango-icon-theme/distinfo
index dbc1a15..44dc45d 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.1.1.1 2009/11/29 21:47:36 snj Exp $
 
 SHA1 (tango-icon-theme-0.8.90.tar.gz) = acdfbf3749885d36349263188334f6d6be405acc
 RMD160 (tango-icon-theme-0.8.90.tar.gz) = 5accc7a4741e6acc8d89de59100f31a10206587c
index dceccc6..391bb48 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2009/11/25 15:55:49 abs Exp $
+# $NetBSD: Makefile,v 1.3 2009/11/29 21:11:21 abs Exp $
 
 DISTNAME=      ktorrent-${KTORRENT_VER}
+PKGREVISION=   1
 CATEGORIES=    net kde
 MASTER_SITES=  http://ktorrent.org/downloads/${KTORRENT_VER}/
 EXTRACT_SUFX=  .tar.bz2
@@ -29,6 +30,7 @@ USE_TOOLS+=           awk msgfmt pkg-config perl
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../x11/kdebase-runtime4/buildlink3.mk"
+.include "../../x11/kdebase-workspace4/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=    build
index 7303844..b1e4cd1 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2007/07/29 14:33:12 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2009/11/30 00:38:47 dholland Exp $
 
 DISTNAME=      nn-6.7.3
 CATEGORIES=    news
@@ -50,6 +50,7 @@ post-patch:
            <${WRKSRC}/config.h-dist >${WRKSRC}/config.h
        @${CP} ${FILESDIR}/s-netbsd.h ${WRKSRC}/conf/s-netbsd.h
        @${CP} ${FILESDIR}/m-powerpc.h ${WRKSRC}/conf/m-powerpc.h
+       @${CP} ${FILESDIR}/m-x86_64.h ${WRKSRC}/conf/m-x86_64.h
        @${CP} ${WRKSRC}/conf/m-m680x0.h ${WRKSRC}/conf/m-m68k.h
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/nn/files/m-x86_64.h b/news/nn/files/m-x86_64.h
new file mode 100644 (file)
index 0000000..c04ff03
--- /dev/null
@@ -0,0 +1,24 @@
+/************** Machine (and compiler) dependent definitions. **************
+ *
+ *     Define appropriate types for the following ranges of integer
+ *     variables.  These are processor & compiler dependent, but the
+ *     distributed definitions will probably work on most systems.
+ */
+
+
+
+/*      MACHINE TYPE   DEFINED TYPE            VALUE RANGE     */
+
+typedef unsigned char  int8;           /*        0 ..     255 */
+typedef short          int16;          /*  -10,000 ..  10,000 */
+typedef int            int32;          /* -100,000 .. 100,000 */
+typedef unsigned int   uint32;         /*        0 ..  2^31-1 */
+
+
+
+/*
+ *     Define NETWORK_BYTE_ORDER if the machine's longs are
+ *     already in network byte order.
+ */
+
+#undef NETWORK_BYTE_ORDER
index a333129..2fceed5 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/12/19 18:43:37 joerg Exp $
+$NetBSD: distinfo,v 1.3 2009/11/30 01:01:56 dholland Exp $
 
 SHA1 (i810switch-0.6.5.tar.gz) = 437adeb38f6530b5e68810fc5ee65fb5adaafd97
 RMD160 (i810switch-0.6.5.tar.gz) = 4acaea0c7c4197cdff30885a51f65cda3d3a6df9
 Size (i810switch-0.6.5.tar.gz) = 24287 bytes
-SHA1 (patch-aa) = 1800d6b690d495a33f99347235c31cd24120ed25
+SHA1 (patch-aa) = 91401a0908fc7298c0c15dd21b8b2d693d291bc7
 SHA1 (patch-ab) = 2f1635cc81e409043a6cd63d0609983428564f68
 SHA1 (patch-ac) = 7fab3fadeaabb34372a63b8bd0b7f10492a7fffe
index 81233b6..c329957 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2007/12/19 18:43:38 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2009/11/30 01:01:56 dholland Exp $
 --- Makefile.orig      2003-12-31 09:51:40.000000000 -0500
 +++ Makefile   2006-12-03 23:40:16.000000000 -0500
 @@ -1,7 +1,4 @@
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2007/12/19 18:43:38 joerg Exp $
 +      install -d ${DESTDIR}$(PREFIX)/sbin
 +      install -d ${DESTDIR}$(PREFIX)/man/man1
 +      install i810switch ${DESTDIR}$(PREFIX)/sbin
-+      ln i810switch ${DESTDIR}$(PREFIX)/sbin/i810rotate
++      ln -s i810switch ${DESTDIR}$(PREFIX)/sbin/i810rotate
 +      install i810switch.1.gz i810rotate.1.gz ${DESTDIR}$(PREFIX)/man/man1
 +      gunzip ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1/i810switch.1.gz
 +      gunzip ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1/i810rotate.1.gz
index 1dd5439..c061166 100644 (file)
@@ -1,4 +1,8 @@
-# $Id: Makefile,v 1.3706 2009/11/29 08:13:43 obache Exp $
+<<<<<<< Makefile
+# $Id: Makefile,v 1.3708 2009/11/29 22:23:07 blef Exp $
+=======
+# $Id: Makefile,v 1.3708 2009/11/29 22:23:07 blef Exp $
+>>>>>>> 1.3706
 #
 
 COMMENT=       WIP pkgsrc packages
@@ -1747,6 +1751,7 @@ SUBDIR+=  py-SQLObject
 SUBDIR+=       py-Soya
 SUBDIR+=       py-albatross
 SUBDIR+=       py-amqplib
+SUBDIR+=       py-anyjson
 SUBDIR+=       py-aspects
 SUBDIR+=       py-aspell
 SUBDIR+=       py-aspyct
@@ -2103,7 +2108,6 @@ SUBDIR+=  taglib-extras
 SUBDIR+=       taglib-sharp
 SUBDIR+=       tagtool
 SUBDIR+=       talksoup
-SUBDIR+=       tango-icon-theme
 SUBDIR+=       tardy
 SUBDIR+=       task
 SUBDIR+=       taskbar
diff --git a/wip/py-anyjson/DESCR b/wip/py-anyjson/DESCR
new file mode 100644 (file)
index 0000000..abc3cf4
--- /dev/null
@@ -0,0 +1,2 @@
+Anyjson loads whichever is the fastest JSON module installed and provides
+a uniform API regardless of which JSON implementation is used
diff --git a/wip/py-anyjson/Makefile b/wip/py-anyjson/Makefile
new file mode 100644 (file)
index 0000000..4076001
--- /dev/null
@@ -0,0 +1,21 @@
+# $NetBSD$
+#
+
+DISTNAME=      anyjson-0.2.0.tar
+PKGNAME=       ${PYPKGPREFIX}-anyjson-0.2.0
+CATEGORIES=    textproc python
+MASTER_SITES=  http://pypi.python.org/packages/source/a/anyjson/
+EXTRACT_SUFX=  .gz#md5=7890252975a0efa634900e72fcbca875
+
+MAINTAINER=    kamelderouiche@yahoo.com
+HOMEPAGE=      http://pypi.python.org/pypi/anyjson
+COMMENT=       Wraps the JSON implementation available in a common interface
+#LICENSE=      # TODO: (see mk/license.mk)
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+WRKSRC=                ${WRKDIR}/anyjson-0.2.0
+USE_LANGUAGES= # none
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wip/py-anyjson/PLIST b/wip/py-anyjson/PLIST
new file mode 100644 (file)
index 0000000..18ba35e
--- /dev/null
@@ -0,0 +1,9 @@
+@comment $NetBSD$
+${PYSITELIB}/anyjson-0.2.0-py2.5.egg-info/PKG-INFO
+${PYSITELIB}/anyjson-0.2.0-py2.5.egg-info/SOURCES.txt
+${PYSITELIB}/anyjson-0.2.0-py2.5.egg-info/dependency_links.txt
+${PYSITELIB}/anyjson-0.2.0-py2.5.egg-info/not-zip-safe
+${PYSITELIB}/anyjson-0.2.0-py2.5.egg-info/top_level.txt
+${PYSITELIB}/anyjson.py
+${PYSITELIB}/anyjson.pyc
+${PYSITELIB}/anyjson.pyo
diff --git a/wip/py-anyjson/distinfo b/wip/py-anyjson/distinfo
new file mode 100644 (file)
index 0000000..ce68a66
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD$
+
+SHA1 (anyjson-0.2.0.tar.gz) = c872d06250a553795dba83b79e1da058226e3709
+RMD160 (anyjson-0.2.0.tar.gz) = 906743874bf5385db6b0197ddefc5013dad09fe4
+Size (anyjson-0.2.0.tar.gz) = 3111 bytes
index 9fb97ef..6fee4c0 100644 (file)
@@ -18,6 +18,8 @@ NO_CONFIGURE= YES
 INSTALLATION_DIRS=     bin
 
 CXXFLAGS+=     -DQT_THREAD_SUPPORT -D_REENTRANT
+LIBS.SunOS+=   -lnsl -lsocket
+MAKE_ENV+=     LIBS=${LIBS:Q}
 
 do-install:
                ${INSTALL_PROGRAM} ${WRKSRC}/sipb_main ${DESTDIR}${PREFIX}/bin/sipbomber
index c1e76a5..177f894 100644 (file)
@@ -3,10 +3,11 @@ $NetBSD$
 SHA1 (sipbomber_0.8.tar.gz) = 7e78d3b434b2987fe75c695436b35cac6e5ac785
 RMD160 (sipbomber_0.8.tar.gz) = eabb83d449f09d71e0a3d602d758cd9700bebfd6
 Size (sipbomber_0.8.tar.gz) = 844343 bytes
-SHA1 (patch-aa) = f388fdd15960390c6923dedfaa072c62f2ab8b88
-SHA1 (patch-ab) = 1dce45efbb98a1224c2713e2384d1e1a96309e0a
-SHA1 (patch-ac) = 3b24fce8847dfd38660a5c35acb72760011054b8
-SHA1 (patch-ad) = 9694cf9a3bd59b27ff5ef4e16b339a4bc094b3e7
-SHA1 (patch-ae) = b58241848066776356ff60a7a349ef7f71ffebaa
-SHA1 (patch-af) = e6ea176a3717e8094d2c0d37e60fa6d0b7f83b3e
-SHA1 (patch-ag) = dfc8bf233b6d2667774e52947f662146e641549f
+SHA1 (patch-aa) = 411bc69c77698a6177b3be43bab019f4d04581ee
+SHA1 (patch-ab) = ea45f1ea4e4c759df933bb821b690da70ec0cb63
+SHA1 (patch-ac) = 51a4c2036eccb016045a058e62ea418e7eda311b
+SHA1 (patch-ad) = 0767d3d4c68cfe75faf3c7754f91067e80745629
+SHA1 (patch-ae) = 2f35cca961685a960b784a6604e9d6f38a221847
+SHA1 (patch-af) = 82e0e4b316a58b1bfddfc0d6cdac1fb6926f91dd
+SHA1 (patch-ag) = 24680adefbba9a81863f8a016f92f603b639fffa
+SHA1 (patch-ah) = 7b53dd98e0f8614451bfe9f9eeeb22284dd70315
index 8c860c9..1d3f2ad 100644 (file)
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- sipb_netfun.cpp.orig       2008-07-13 01:21:43.000000000 +0200
-+++ sipb_netfun.cpp    2008-07-13 01:22:11.000000000 +0200
-@@ -10,7 +10,6 @@
+--- sipb_netfun.cpp.orig       2003-05-29 17:30:54.000000000 +0200
++++ sipb_netfun.cpp    2009-11-08 19:17:10.930002000 +0100
+@@ -10,10 +10,12 @@
  #include <sys/socket.h>
  #include <sys/poll.h>
  #include <sys/ioctl.h>
@@ -10,3 +10,9 @@ $NetBSD$
  #include <errno.h>
  #include <string.h>
  #include <string>
++#ifdef __sun
++#include <strings.h> /* for bzero() */
++#endif
+ using namespace std;  //for runtime_error
index 37aff70..d1cd158 100644 (file)
@@ -1,14 +1,17 @@
 $NetBSD$
 
---- sipb_sendrecv_tcp.cpp.orig 2008-07-13 01:19:33.000000000 +0200
-+++ sipb_sendrecv_tcp.cpp      2008-07-13 01:20:15.000000000 +0200
-@@ -10,7 +10,11 @@
+--- sipb_sendrecv_tcp.cpp.orig 2003-05-29 17:30:54.000000000 +0200
++++ sipb_sendrecv_tcp.cpp      2009-11-08 19:08:08.280002000 +0100
+@@ -10,7 +10,14 @@
  #include <sys/socket.h>
  #include <sys/poll.h>
  #include <sys/ioctl.h>
 +#ifdef __linux__
  #include <linux/sockios.h>
 +#else
++#ifdef __sun
++#include <sys/filio.h>
++#endif
 +#define SIOCINQ FIONREAD
 +#endif
  #include <errno.h>
index a95ad51..6eb3421 100644 (file)
@@ -1,14 +1,17 @@
 $NetBSD$
 
---- sipb_sendrecv_udp.cpp.orig 2008-07-13 01:17:46.000000000 +0200
-+++ sipb_sendrecv_udp.cpp      2008-07-13 01:18:45.000000000 +0200
-@@ -10,7 +10,11 @@
+--- sipb_sendrecv_udp.cpp.orig 2003-05-29 17:30:54.000000000 +0200
++++ sipb_sendrecv_udp.cpp      2009-11-08 19:06:18.159999000 +0100
+@@ -10,7 +10,14 @@
  #include <sys/socket.h>
  #include <sys/poll.h>
  #include <sys/ioctl.h>
 +#ifdef __linux__
  #include <linux/sockios.h>
 +#else
++#ifdef __sun
++#include <sys/filio.h>
++#endif
 +#define SIOCINQ FIONREAD
 +#endif
  #include <errno.h>
index 8d9c914..d4868f4 100644 (file)
@@ -1,15 +1,17 @@
 $NetBSD$
 
---- Makefile.orig      2008-07-13 11:59:59.000000000 +0200
-+++ Makefile   2008-07-13 12:05:28.000000000 +0200
-@@ -1,5 +1,5 @@
+--- Makefile.orig      2006-09-21 18:07:42.000000000 +0200
++++ Makefile   2009-11-08 21:45:22.899999000 +0100
+@@ -1,15 +1,15 @@
  #Makefile
 -CPP=c++
 +#CPP=c++
  OPT=-O
  WARN=-Wall -W -Wno-long-long -Wno-unused -ansi
  CFLAG=$(OPT) $(WARN) -DQT_THREAD_SUPPORT -D_REENTRANT
-@@ -8,8 +8,8 @@
+-LIBS=-L$(QTDIR)/lib -lqt-mt -lpthread
++LIBS+=-L$(QTDIR)/lib -lqt-mt -lpthread
  MOC=$(QTDIR)/bin/moc
  INC=-I./ -I$(QTDIR)/include -Istests/ -Ibnf/ -Icert_test
  
index 725119c..0a198e7 100644 (file)
@@ -1,15 +1,17 @@
 $NetBSD$
 
 --- stests/Makefile.orig       2006-09-21 18:06:43.000000000 +0200
-+++ stests/Makefile    2008-07-13 12:57:05.000000000 +0200
-@@ -1,5 +1,5 @@
++++ stests/Makefile    2009-11-08 21:45:00.790003000 +0100
+@@ -1,15 +1,15 @@
  #Makefile
 -CPP=c++
 +#CPP=c++
  OPT=-O
  WARN=-Wall -W -Wno-long-long -Wno-unused -ansi
  CFLAG=$(OPT) $(WARN) -DQT_THREAD_SUPPORT -D_REENTRANT
-@@ -8,8 +8,8 @@
+-LIBS=-L$(QTDIR)/lib -lqt-mt -lpthread
++LIBS+=-L$(QTDIR)/lib -lqt-mt -lpthread
  MOC=$(QTDIR)/bin/moc
  INC=-I../ -I$(QTDIR)/include -I../bnf -I./ -I../cert_test
  
index d0ec3e6..9ac1a12 100644 (file)
@@ -1,15 +1,17 @@
 $NetBSD$
 
---- bnf/Makefile.orig  2008-07-13 12:24:30.000000000 +0200
-+++ bnf/Makefile       2008-07-13 12:26:59.000000000 +0200
-@@ -1,5 +1,5 @@
+--- bnf/Makefile.orig  2006-09-21 18:04:14.000000000 +0200
++++ bnf/Makefile       2009-11-08 21:45:08.119999000 +0100
+@@ -1,14 +1,14 @@
  #Makefile
 -CPP=c++
 +#CPP=c++
  OPT=-O
  WARN=-Wall -W -Wno-long-long -Wno-unused -Werror -ansi
  CFLAG=$(OPT) $(WARN) -DQT_THREAD_SUPPORT -D_REENTRANT
-@@ -8,7 +8,7 @@
+-LIBS=-L$(QTDIR)/lib -lqt-mt -lpthread
++LIBS+=-L$(QTDIR)/lib -lqt-mt -lpthread
  MOC=$(QTDIR)bin/moc
  INC=-I./
  
index bff85ad..cdaa439 100644 (file)
@@ -1,15 +1,17 @@
 $NetBSD$
 
---- cert_test/Makefile.orig    2008-07-13 12:28:01.000000000 +0200
-+++ cert_test/Makefile 2008-07-13 12:28:44.000000000 +0200
-@@ -1,5 +1,5 @@
+--- cert_test/Makefile.orig    2006-09-21 18:05:46.000000000 +0200
++++ cert_test/Makefile 2009-11-08 21:45:15.540000000 +0100
+@@ -1,14 +1,14 @@
  #Makefile
 -CPP=c++
 +#CPP=c++
  OPT=-O
  WARN=-Wall -W -Wno-long-long -Wno-unused -ansi
  CFLAG=$(OPT) $(WARN) -DQT_THREAD_SUPPORT -D_REENTRANT
-@@ -8,7 +8,7 @@
+-LIBS=-L$(QTDIR)/lib -lqt-mt -lpthread
++LIBS+=-L$(QTDIR)/lib -lqt-mt -lpthread
  MOC=$(QTDIR)/bin/moc
  INC=-I./ -I$(QTDIR)/include -I../stests/ -I../bnf/ -I../
  
diff --git a/wip/sipbomber/patches/patch-ah b/wip/sipbomber/patches/patch-ah
new file mode 100644 (file)
index 0000000..78bb908
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- sipb_sendrecv_udp.h.orig   2009-11-08 18:16:03.210004000 +0100
++++ sipb_sendrecv_udp.h        2009-11-08 18:16:20.580002000 +0100
+@@ -27,7 +27,7 @@
+       //run it after make_connect (if not return false)
+       //if error return false (may be message to big or hung up)
+    bool check_hungup();  //must be connect (run it after sendudp)
+-   bool recvudp(in_addr& s_addr,int& s_port,string& to_recv, int ms_timeout); 
++   bool recvudp(in_addr& src_addr,int& s_port,string& to_recv, int ms_timeout); 
+       //MUST NOT BE CONNECT! 
+       //ms_timout --> timeout in milliseconds
index 58b6fe3..aea0757 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/01/24 10:25:15 sborrill Exp $
+$NetBSD: distinfo,v 1.7 2009/11/30 01:28:45 dholland Exp $
 
 SHA1 (htdig-3.1.6.tar.gz) = 603fc244ba59ee1efcbe8f2ba087567cb14468d0
 RMD160 (htdig-3.1.6.tar.gz) = 1414943255f16cd278a31b8014a5bfe6c4400ead
@@ -11,3 +11,4 @@ SHA1 (patch-af) = f9c83efb788cb735f42df606ee451324795140d6
 SHA1 (patch-ag) = d3c0c1b043e27706834aecf7ac0b07651ed5b438
 SHA1 (patch-ah) = e4df51f19717527c3a368cdcaffb4f3c8e7be521
 SHA1 (patch-ai) = 123411dbd3cd53a8765f1130299873eb1aa91389
+SHA1 (patch-aj) = 1f661df74cbf2661737b0c76f8b04e04325909ca
diff --git a/www/htdig/patches/patch-aj b/www/htdig/patches/patch-aj
new file mode 100644 (file)
index 0000000..8133a48
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2009/11/30 01:28:45 dholland Exp $
+
+Fix LP64 build.
+
+--- htdig/SGMLEntities.cc~     2002-01-31 18:47:17.000000000 -0500
++++ htdig/SGMLEntities.cc      2009-11-29 20:30:47.000000000 -0500
+@@ -154,7 +154,7 @@ SGMLEntities::translate(char *entity)
+       return ' ';
+     if (junk.trans->Exists(entity))
+     {
+-      return (unsigned char) ((int) (*junk.trans)[entity]);
++      return (unsigned char) ((int)(intptr_t) (*junk.trans)[entity]);
+     }
+     else if (*entity == '#' && isdigit(entity[1]))
+     {
index e5a04ad..d940451 100644 (file)
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.35 2009/09/16 01:15:35 reed Exp $
+# $NetBSD: Makefile,v 1.36 2009/11/29 22:17:31 snj Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
+XFCE4_VERSION=         4.6.2
+
 DISTNAME=              xfce4-panel-${XFCE4_VERSION}
 CATEGORIES=            x11
 COMMENT=               Xfce panel
 
+MASTER_SITES+=         http://archive.xfce.org/src/xfce/xfce4-panel/4.6/
+
 PKGCONFIG_OVERRIDE=    libxfce4panel/libxfce4panel-1.0.pc.in
 PTHREAD_AUTO_VARS=     yes
 
index 48381de..9457b1c 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:35 reed Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/11/29 22:17:31 snj Exp $
 bin/xfce4-panel
 bin/xfce4-popup-windowlist
 include/xfce4/libxfce4panel/libxfce4panel-enum-types.h
@@ -75,6 +75,7 @@ share/icons/hicolor/48x48/apps/xfce4-systray.png
 share/icons/hicolor/48x48/apps/xfce4-taskbar.png
 share/locale/am/LC_MESSAGES/xfce4-panel.mo
 share/locale/ar/LC_MESSAGES/xfce4-panel.mo
+share/locale/ast/LC_MESSAGES/xfce4-panel.mo
 share/locale/az/LC_MESSAGES/xfce4-panel.mo
 share/locale/be/LC_MESSAGES/xfce4-panel.mo
 share/locale/bg/LC_MESSAGES/xfce4-panel.mo
@@ -104,6 +105,7 @@ share/locale/id/LC_MESSAGES/xfce4-panel.mo
 share/locale/it/LC_MESSAGES/xfce4-panel.mo
 share/locale/ja/LC_MESSAGES/xfce4-panel.mo
 share/locale/ka/LC_MESSAGES/xfce4-panel.mo
+share/locale/kk/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
 share/locale/ku/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
@@ -127,6 +129,7 @@ share/locale/ta/LC_MESSAGES/xfce4-panel.mo
 share/locale/tr/LC_MESSAGES/xfce4-panel.mo
 share/locale/uk/LC_MESSAGES/xfce4-panel.mo
 share/locale/ur/LC_MESSAGES/xfce4-panel.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo
 share/locale/vi/LC_MESSAGES/xfce4-panel.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
index 1b454ad..1ff9c26 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2009/09/16 01:15:35 reed Exp $
+$NetBSD: distinfo,v 1.20 2009/11/29 22:17:31 snj Exp $
 
-SHA1 (xfce4-panel-4.6.1.tar.bz2) = 613c66f6402feba7983a7effb008f091182350d2
-RMD160 (xfce4-panel-4.6.1.tar.bz2) = 47ce1703306e7427d300bb3675e2e8dcd13c459e
-Size (xfce4-panel-4.6.1.tar.bz2) = 868225 bytes
+SHA1 (xfce4-panel-4.6.2.tar.bz2) = 32a5e5b9e8b93c2167077b329cf4d2fcb4323c9e
+RMD160 (xfce4-panel-4.6.2.tar.bz2) = 5d981eaffc5aab227a3db66f8d39d0492d02a16d
+Size (xfce4-panel-4.6.2.tar.bz2) = 876456 bytes
 SHA1 (patch-ab) = 977b38f4e58620b96d28ef2b9992a03169eb7814
index 0445035..af783d8 100644 (file)
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/29 22:19:07 snj Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
+XFCE4_VERSION=         4.6.3
+
 DISTNAME=              xfce4-settings-${XFCE4_VERSION}
 CATEGORIES=            x11
 COMMENT=               Xfce settings manager
 
+MASTER_SITES+=         http://archive.xfce.org/src/xfce/xfce4-settings/4.6/
+
 BUILD_DEFS+=           PKG_SYSCONFBASE
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASE}
index 403991e..1967380 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/11/29 22:19:07 snj Exp $
 bin/xfce4-accessibility-settings
 bin/xfce4-appearance-settings
 bin/xfce4-display-settings
@@ -17,6 +17,7 @@ share/applications/xfce4-accessibility-settings.desktop
 share/applications/xfce4-settings-editor.desktop
 share/examples/xfce4/autostart/xfce4-settings-helper-autostart.desktop
 share/examples/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+share/locale/ast/LC_MESSAGES/xfce4-settings.mo
 share/locale/ca/LC_MESSAGES/xfce4-settings.mo
 share/locale/cs/LC_MESSAGES/xfce4-settings.mo
 share/locale/da/LC_MESSAGES/xfce4-settings.mo
@@ -31,13 +32,18 @@ share/locale/hu/LC_MESSAGES/xfce4-settings.mo
 share/locale/id/LC_MESSAGES/xfce4-settings.mo
 share/locale/it/LC_MESSAGES/xfce4-settings.mo
 share/locale/ja/LC_MESSAGES/xfce4-settings.mo
+share/locale/lv/LC_MESSAGES/xfce4-settings.mo
 share/locale/nb/LC_MESSAGES/xfce4-settings.mo
 share/locale/nl/LC_MESSAGES/xfce4-settings.mo
 share/locale/pl/LC_MESSAGES/xfce4-settings.mo
 share/locale/pt/LC_MESSAGES/xfce4-settings.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
+share/locale/ro/LC_MESSAGES/xfce4-settings.mo
 share/locale/ru/LC_MESSAGES/xfce4-settings.mo
+share/locale/sk/LC_MESSAGES/xfce4-settings.mo
 share/locale/sv/LC_MESSAGES/xfce4-settings.mo
 share/locale/tr/LC_MESSAGES/xfce4-settings.mo
 share/locale/uk/LC_MESSAGES/xfce4-settings.mo
+share/locale/ur/LC_MESSAGES/xfce4-settings.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
index 0863f8f..416e06c 100644 (file)
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
+$NetBSD: distinfo,v 1.2 2009/11/29 22:19:07 snj Exp $
 
-SHA1 (xfce4-settings-4.6.1.tar.bz2) = ab117c3923571e2437095fd165ac4bf392e658e0
-RMD160 (xfce4-settings-4.6.1.tar.bz2) = 6ecfa08d6ad528d43988c5fe128b2fcd6db6f0d3
-Size (xfce4-settings-4.6.1.tar.bz2) = 501587 bytes
+SHA1 (xfce4-settings-4.6.3.tar.bz2) = 8a7f114ae5cab071668937351a0b3b4be1b9b51c
+RMD160 (xfce4-settings-4.6.3.tar.bz2) = 732c19f0e6258a9ea2583eddd57d4953817a206d
+Size (xfce4-settings-4.6.3.tar.bz2) = 534204 bytes
 SHA1 (patch-aa) = 104e459ab5b7bd4ac821cacada43f2aa4da23f10
 SHA1 (patch-ab) = 4f23e05cacd765b5be2e101dec29d3c6f5cd839f
-SHA1 (patch-ac) = 13f09513dbcdc13c11ac92471c34896a3c16d17c
diff --git a/x11/xfce4-settings/patches/patch-ac b/x11/xfce4-settings/patches/patch-ac
deleted file mode 100644 (file)
index 7f95143..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/09/16 01:04:02 reed Exp $
-
-Needed for newer libxlavier API change
-
---- dialogs/keyboard-settings/xfce-keyboard-settings.c.orig    2009-09-15 19:42:23.000000000 -0500
-+++ dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-09-15 19:41:38.000000000 -0500
-@@ -378,7 +378,7 @@
-   xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
-   settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
--  xkl_config_registry_load (settings->priv->xkl_registry);
-+  xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
-   /* Tab */
-   xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");
index 986f763..bb3ea11 100644 (file)
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.11 2009/09/16 01:15:36 reed Exp $
+# $NetBSD: Makefile,v 1.12 2009/11/29 22:16:34 snj Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION= 0.2.12
+XFCE4_VERSION= 0.4.2
 
 DISTNAME=      Terminal-${XFCE4_VERSION}
 PKGNAME=       xfce4-terminal-${XFCE4_VERSION}
 CATEGORIES=    x11
 COMMENT=       Xfce terminal emulator
 
+MASTER_SITES=  http://www.xfce.org/archive/src/apps/terminal/0.4/
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
index 01ab162..0970b1d 100644 (file)
@@ -1,19 +1,16 @@
-@comment $NetBSD: PLIST,v 1.5 2009/09/16 01:15:36 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/11/29 22:16:34 snj Exp $
 bin/Terminal
 bin/terminal
 libexec/TerminalHelp
 man/man1/Terminal.1
 share/Terminal/Terminal-toolbars.ui
+share/Terminal/Terminal.glade
 share/applications/Terminal.desktop
 share/doc/Terminal/C/advanced.html
 share/doc/Terminal/C/copyright.html
 share/doc/Terminal/C/faq.html
 share/doc/Terminal/C/getting-started.html
-share/doc/Terminal/C/images/terminal-applications-dialog.png
-share/doc/Terminal/C/images/terminal-applications-menu.png
-share/doc/Terminal/C/images/terminal-choose-custom-webbrowser.png
 share/doc/Terminal/C/images/terminal-compose-shortcut.png
-share/doc/Terminal/C/images/terminal-edit-applications.png
 share/doc/Terminal/C/images/terminal-edit-preferences.png
 share/doc/Terminal/C/images/terminal-first-time.png
 share/doc/Terminal/C/images/terminal-multiple-tabs.png
@@ -28,15 +25,30 @@ share/doc/Terminal/C/index.html
 share/doc/Terminal/C/preferences.html
 share/doc/Terminal/C/support.html
 share/doc/Terminal/C/usage.html
+share/doc/Terminal/da/advanced.html
+share/doc/Terminal/da/copyright.html
+share/doc/Terminal/da/faq.html
+share/doc/Terminal/da/getting-started.html
+share/doc/Terminal/da/images/terminal-compose-shortcut.png
+share/doc/Terminal/da/images/terminal-edit-preferences.png
+share/doc/Terminal/da/images/terminal-first-time.png
+share/doc/Terminal/da/images/terminal-multiple-tabs.png
+share/doc/Terminal/da/images/terminal-preferences-advanced.png
+share/doc/Terminal/da/images/terminal-preferences-appearance.png
+share/doc/Terminal/da/images/terminal-preferences-colors.png
+share/doc/Terminal/da/images/terminal-preferences-general.png
+share/doc/Terminal/da/images/terminal-preferences-shortcuts.png
+share/doc/Terminal/da/images/terminal-set-title.png
+share/doc/Terminal/da/images/terminal-toolbars.png
+share/doc/Terminal/da/index.html
+share/doc/Terminal/da/preferences.html
+share/doc/Terminal/da/support.html
+share/doc/Terminal/da/usage.html
 share/doc/Terminal/fr/advanced.html
 share/doc/Terminal/fr/copyright.html
 share/doc/Terminal/fr/faq.html
 share/doc/Terminal/fr/getting-started.html
-share/doc/Terminal/fr/images/terminal-applications-dialog.png
-share/doc/Terminal/fr/images/terminal-applications-menu.png
-share/doc/Terminal/fr/images/terminal-choose-custom-webbrowser.png
 share/doc/Terminal/fr/images/terminal-compose-shortcut.png
-share/doc/Terminal/fr/images/terminal-edit-applications.png
 share/doc/Terminal/fr/images/terminal-edit-preferences.png
 share/doc/Terminal/fr/images/terminal-first-time.png
 share/doc/Terminal/fr/images/terminal-multiple-tabs.png
@@ -51,15 +63,49 @@ share/doc/Terminal/fr/index.html
 share/doc/Terminal/fr/preferences.html
 share/doc/Terminal/fr/support.html
 share/doc/Terminal/fr/usage.html
+share/doc/Terminal/gl/advanced.html
+share/doc/Terminal/gl/copyright.html
+share/doc/Terminal/gl/faq.html
+share/doc/Terminal/gl/getting-started.html
+share/doc/Terminal/gl/images/terminal-compose-shortcut.png
+share/doc/Terminal/gl/images/terminal-edit-preferences.png
+share/doc/Terminal/gl/images/terminal-first-time.png
+share/doc/Terminal/gl/images/terminal-multiple-tabs.png
+share/doc/Terminal/gl/images/terminal-preferences-advanced.png
+share/doc/Terminal/gl/images/terminal-preferences-appearance.png
+share/doc/Terminal/gl/images/terminal-preferences-colors.png
+share/doc/Terminal/gl/images/terminal-preferences-general.png
+share/doc/Terminal/gl/images/terminal-preferences-shortcuts.png
+share/doc/Terminal/gl/images/terminal-set-title.png
+share/doc/Terminal/gl/images/terminal-toolbars.png
+share/doc/Terminal/gl/index.html
+share/doc/Terminal/gl/preferences.html
+share/doc/Terminal/gl/support.html
+share/doc/Terminal/gl/usage.html
+share/doc/Terminal/id/advanced.html
+share/doc/Terminal/id/copyright.html
+share/doc/Terminal/id/faq.html
+share/doc/Terminal/id/getting-started.html
+share/doc/Terminal/id/images/terminal-compose-shortcut.png
+share/doc/Terminal/id/images/terminal-edit-preferences.png
+share/doc/Terminal/id/images/terminal-first-time.png
+share/doc/Terminal/id/images/terminal-multiple-tabs.png
+share/doc/Terminal/id/images/terminal-preferences-advanced.png
+share/doc/Terminal/id/images/terminal-preferences-appearance.png
+share/doc/Terminal/id/images/terminal-preferences-colors.png
+share/doc/Terminal/id/images/terminal-preferences-general.png
+share/doc/Terminal/id/images/terminal-preferences-shortcuts.png
+share/doc/Terminal/id/images/terminal-set-title.png
+share/doc/Terminal/id/images/terminal-toolbars.png
+share/doc/Terminal/id/index.html
+share/doc/Terminal/id/preferences.html
+share/doc/Terminal/id/support.html
+share/doc/Terminal/id/usage.html
 share/doc/Terminal/ja/advanced.html
 share/doc/Terminal/ja/copyright.html
 share/doc/Terminal/ja/faq.html
 share/doc/Terminal/ja/getting-started.html
-share/doc/Terminal/ja/images/terminal-applications-dialog.png
-share/doc/Terminal/ja/images/terminal-applications-menu.png
-share/doc/Terminal/ja/images/terminal-choose-custom-webbrowser.png
 share/doc/Terminal/ja/images/terminal-compose-shortcut.png
-share/doc/Terminal/ja/images/terminal-edit-applications.png
 share/doc/Terminal/ja/images/terminal-edit-preferences.png
 share/doc/Terminal/ja/images/terminal-first-time.png
 share/doc/Terminal/ja/images/terminal-multiple-tabs.png
@@ -82,21 +128,16 @@ share/icons/hicolor/16x16/stock/navigation/stock_terminal-newwindow.png
 share/icons/hicolor/16x16/stock/navigation/stock_terminal-reportbug.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-closetab.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-closewindow.png
-share/icons/hicolor/24x24/stock/navigation/stock_terminal-fullscreen.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-newtab.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-newwindow.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-reportbug.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-showborders.png
 share/icons/hicolor/24x24/stock/navigation/stock_terminal-showmenu.png
 share/icons/hicolor/48x48/apps/Terminal.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-advanced.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-appearance.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-colors.png
 share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-general.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-shortcuts.png
 share/icons/hicolor/scalable/apps/Terminal.svg
 share/locale/ar/LC_MESSAGES/Terminal.mo
+share/locale/ast/LC_MESSAGES/Terminal.mo
 share/locale/be/LC_MESSAGES/Terminal.mo
 share/locale/ca/LC_MESSAGES/Terminal.mo
 share/locale/cs/LC_MESSAGES/Terminal.mo
@@ -117,6 +158,7 @@ share/locale/hu/LC_MESSAGES/Terminal.mo
 share/locale/id/LC_MESSAGES/Terminal.mo
 share/locale/it/LC_MESSAGES/Terminal.mo
 share/locale/ja/LC_MESSAGES/Terminal.mo
+share/locale/kk/LC_MESSAGES/Terminal.mo
 share/locale/ko/LC_MESSAGES/Terminal.mo
 share/locale/ku/LC_MESSAGES/Terminal.mo
 share/locale/lt/LC_MESSAGES/Terminal.mo
@@ -135,6 +177,7 @@ share/locale/sv/LC_MESSAGES/Terminal.mo
 share/locale/tr/LC_MESSAGES/Terminal.mo
 share/locale/uk/LC_MESSAGES/Terminal.mo
 share/locale/ur/LC_MESSAGES/Terminal.mo
+share/locale/ur_PK/LC_MESSAGES/Terminal.mo
 share/locale/vi/LC_MESSAGES/Terminal.mo
 share/locale/zh_CN/LC_MESSAGES/Terminal.mo
 share/locale/zh_TW/LC_MESSAGES/Terminal.mo
index f76b2bf..ab1a019 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2009/09/16 01:15:36 reed Exp $
+$NetBSD: distinfo,v 1.6 2009/11/29 22:16:34 snj Exp $
 
-SHA1 (Terminal-0.2.12.tar.bz2) = f6d0fc380fff6ac6fba7842fd4cfc46e2e5c6e40
-RMD160 (Terminal-0.2.12.tar.bz2) = 0879cfbb69d33d63a1a816cf5a67b1c836a5bb65
-Size (Terminal-0.2.12.tar.bz2) = 2005311 bytes
+SHA1 (Terminal-0.4.2.tar.bz2) = bf4510e331284d7f68ba193fe1d6f2e57b7815bb
+RMD160 (Terminal-0.4.2.tar.bz2) = 8e6364673d6b0d8eddfd59f3f82d3944fca45684
+Size (Terminal-0.4.2.tar.bz2) = 1981158 bytes