update Mon Feb 15 06:37:00 PST 2010
authorCharlie <root@crater.dragonflybsd.org>
Mon, 15 Feb 2010 14:41:34 +0000 (06:41 -0800)
committerCharlie <root@crater.dragonflybsd.org>
Mon, 15 Feb 2010 14:41:34 +0000 (06:41 -0800)
129 files changed:
devel/p5-CPAN-Reporter/Makefile
devel/p5-CPAN-Reporter/distinfo
devel/p5-Data-Compare/Makefile
devel/p5-Data-Compare/distinfo
devel/p5-Data-Dumper-Concise/Makefile
devel/p5-Data-Dumper-Concise/distinfo
devel/p5-Data-Page/Makefile
devel/p5-Data-Page/distinfo
devel/p5-ExtUtils-ParseXS/Makefile
devel/p5-ExtUtils-ParseXS/distinfo
devel/p5-ExtUtils-XSpp/Makefile
devel/p5-ExtUtils-XSpp/distinfo
doc/CHANGES-2010
doc/TODO
graphics/Makefile
graphics/digikam-doc-kde3/DESCR [moved from graphics/digikam-doc/DESCR with 100% similarity]
graphics/digikam-doc-kde3/Makefile [moved from graphics/digikam-doc/Makefile with 88% similarity]
graphics/digikam-doc-kde3/PLIST [moved from graphics/digikam-doc/PLIST with 99% similarity]
graphics/digikam-doc-kde3/distinfo [moved from graphics/digikam-doc/distinfo with 81% similarity]
graphics/digikam-doc-kde3/patches/patch-aa [moved from graphics/digikam-doc/patches/patch-aa with 95% similarity]
graphics/digikam-kde3/DESCR [copied from graphics/digikam/DESCR with 100% similarity]
graphics/digikam-kde3/Makefile [copied from graphics/digikam/Makefile with 88% similarity]
graphics/digikam-kde3/PLIST [copied from graphics/digikam/PLIST with 99% similarity]
graphics/digikam-kde3/distinfo [copied from graphics/digikam/distinfo with 76% similarity]
graphics/digikam/DESCR
graphics/digikam/Makefile
graphics/digikam/PLIST
graphics/digikam/distinfo
graphics/digikam/options.mk [new file with mode: 0644]
graphics/oxygen-icons/Makefile
graphics/oxygen-icons/PLIST
graphics/oxygen-icons/distinfo
inputmethod/ja-freewnn-dict/Makefile
inputmethod/kinput2/Makefile
inputmethod/kinput2/distinfo
inputmethod/kinput2/options.mk
inputmethod/kinput2/patches/patch-aa
inputmethod/kinput2/patches/patch-ab
inputmethod/kinput2/patches/patch-ac
inputmethod/sj3-client/DESCR [new file with mode: 0644]
inputmethod/sj3-client/Makefile [new file with mode: 0644]
inputmethod/sj3-client/PLIST [new file with mode: 0644]
inputmethod/sj3-client/buildlink3.mk [new file with mode: 0644]
inputmethod/sj3-dict/DESCR [deleted file]
inputmethod/sj3-dict/Makefile [deleted file]
inputmethod/sj3-dict/PLIST [deleted file]
inputmethod/sj3-lib/DESCR [deleted file]
inputmethod/sj3-lib/Makefile [deleted file]
inputmethod/sj3-lib/PLIST [deleted file]
inputmethod/sj3-lib/buildlink3.mk [deleted file]
inputmethod/sj3-lib/distinfo [deleted file]
inputmethod/sj3-lib/patches/patch-aa [deleted file]
inputmethod/sj3-lib/patches/patch-ab [deleted file]
inputmethod/sj3-lib/patches/patch-ac [deleted file]
inputmethod/sj3-lib/patches/patch-ad [deleted file]
inputmethod/sj3-lib/patches/patch-ae [deleted file]
inputmethod/sj3-lib/patches/patch-af [deleted file]
inputmethod/sj3-lib/patches/patch-ag [deleted file]
inputmethod/sj3-lib/patches/patch-ah [deleted file]
inputmethod/sj3-lib/patches/patch-ai [deleted file]
inputmethod/sj3-lib/patches/patch-aj [deleted file]
inputmethod/sj3-lib/patches/patch-ak [deleted file]
inputmethod/sj3-lib/patches/patch-al [deleted file]
inputmethod/sj3-lib/patches/patch-am [deleted file]
inputmethod/sj3-lib/patches/patch-ao [deleted file]
inputmethod/sj3-lib/patches/patch-ap [deleted file]
inputmethod/sj3-lib/patches/patch-aq [deleted file]
inputmethod/sj3-lib/patches/patch-ar [deleted file]
inputmethod/sj3-lib/patches/patch-as [deleted file]
inputmethod/sj3-lib/patches/patch-at [deleted file]
inputmethod/sj3-lib/patches/patch-au [deleted file]
inputmethod/sj3-lib/patches/patch-av [deleted file]
inputmethod/sj3-lib/patches/patch-aw [deleted file]
inputmethod/sj3-lib/patches/patch-ax [deleted file]
inputmethod/sj3-lib/patches/patch-ay [deleted file]
inputmethod/sj3-lib/patches/patch-az [deleted file]
inputmethod/sj3-lib/patches/patch-ba [deleted file]
inputmethod/sj3-lib/patches/patch-bb [deleted file]
inputmethod/sj3-lib/patches/patch-bc [deleted file]
inputmethod/sj3-lib/patches/patch-bd [deleted file]
inputmethod/sj3-lib/patches/patch-be [deleted file]
inputmethod/sj3-server-bin/DESCR [deleted file]
inputmethod/sj3-server-bin/MESSAGE [deleted file]
inputmethod/sj3-server-bin/Makefile [deleted file]
inputmethod/sj3-server-bin/PLIST [deleted file]
inputmethod/sj3-server-bin/files/sj3.sh [deleted file]
inputmethod/sj3-server/DESCR
inputmethod/sj3-server/Makefile
inputmethod/sj3-server/PLIST [new file with mode: 0644]
inputmethod/sj3-server/files/sj3proxy.sh [new file with mode: 0644]
inputmethod/sj3-server/files/sj3serv.sh [new file with mode: 0644]
inputmethod/sj3/DESCR [new file with mode: 0644]
inputmethod/sj3/Makefile [new file with mode: 0644]
inputmethod/sj3/Makefile.common [copied from wip/sj3/Makefile.common with 65% similarity]
inputmethod/sj3/distinfo [new file with mode: 0644]
inputmethod/sj3/patches/patch-aa [new file with mode: 0644]
inputmethod/sj3/version.mk [new file with mode: 0644]
inputmethod/uim/options.mk
mk/defaults/options.description
net/nfdump/distinfo
net/nfdump/patches/patch-ah [new file with mode: 0644]
print/teTeX3-texmfsrc/Makefile
shells/Makefile
shells/bash3/DESCR [deleted file]
shells/bash3/Makefile [deleted file]
shells/bash3/PLIST [deleted file]
shells/bash3/distinfo [deleted file]
shells/bash3/patches/patch-af [deleted file]
shells/bash3/patches/patch-ag [deleted file]
shells/bash3/patches/patch-ah [deleted file]
time/p5-Time-HiRes/Makefile
time/p5-Time-HiRes/distinfo
wip/sj3-server/Makefile
wip/sj3/Makefile.common
wip/sj3/distinfo
wip/sj3/patches/patch-aa [deleted file]
wip/sj3/patches/patch-ab [deleted file]
wip/sj3/patches/patch-ac [deleted file]
wip/sj3/patches/patch-ad [deleted file]
wip/sj3/patches/patch-ae [deleted file]
wip/sj3/patches/patch-af [deleted file]
wip/sj3/patches/patch-ag [deleted file]
wip/sj3/patches/patch-ah [new file with mode: 0644]
wip/sj3/version.mk
www/ap2-fcgid/DESCR
www/ap2-fcgid/Makefile
www/ap2-fcgid/PLIST
www/ap2-fcgid/distinfo
www/ap2-fcgid/patches/patch-aa [new file with mode: 0644]

index 3faccf2..c7b619f 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2009/06/14 19:39:48 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/02/15 14:07:48 sno Exp $
 
-DISTNAME=      CPAN-Reporter-1.1708
+DISTNAME=      CPAN-Reporter-1.1710
 PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    devel perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=CPAN/}
@@ -29,12 +29,13 @@ PKG_SUGGESTED_OPTIONS+=     #empty
 DEPENDS+=      p5-CPAN>=1.9301:../../devel/p5-CPAN
 DEPENDS+=      p5-Config-Tiny>=2.12:../../devel/p5-Config-Tiny
 DEPENDS+=      p5-Devel-Autoflush>=0.04:../../devel/p5-Devel-Autoflush
+DEPENDS+=      p5-ExtUtils-MakeMaker>=6.36:../../devel/p5-ExtUtils-MakeMaker
 DEPENDS+=      p5-File-Copy-Recursive>=0.35:../../sysutils/p5-File-Copy-Recursive
 DEPENDS+=      p5-File-HomeDir>=0.58:../../devel/p5-File-HomeDir
 DEPENDS+=      p5-File-pushd>=0.32:../../devel/p5-File-pushd
 DEPENDS+=      p5-IO-CaptureOutput>=1.03:../../devel/p5-IO-CaptureOutput
 DEPENDS+=      p5-Parse-CPAN-Meta-[0-9]*:../../devel/p5-Parse-CPAN-Meta
-DEPENDS+=      p5-Probe-Perl>=0.01:../../devel/p5-Probe-Perl
+DEPENDS+=      p5-Probe-Perl-[0-9]*:../../devel/p5-Probe-Perl
 DEPENDS+=      p5-Tee>=0.13:../../devel/p5-Tee
 DEPENDS+=      p5-Test-Reporter>=1.54:../../devel/p5-Test-Reporter
 
index aa4dcd3..e41ae57 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/06/14 19:39:48 sno Exp $
+$NetBSD: distinfo,v 1.4 2010/02/15 14:07:48 sno Exp $
 
-SHA1 (CPAN-Reporter-1.1708.tar.gz) = 1c5fc36870711d6461750badc64c8d8c0fd5a0b6
-RMD160 (CPAN-Reporter-1.1708.tar.gz) = e98e0b3582cb9322d439a9277fdf7988953eeaed
-Size (CPAN-Reporter-1.1708.tar.gz) = 123146 bytes
+SHA1 (CPAN-Reporter-1.1710.tar.gz) = 6175a7814501cd0b5d6ec64687ea11d9dfe6191f
+RMD160 (CPAN-Reporter-1.1710.tar.gz) = be225b819b5e38210689d461c32f6d5a3c731010
+Size (CPAN-Reporter-1.1710.tar.gz) = 125717 bytes
index 53a3236..07e12a5 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/02/02 18:11:44 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/15 14:24:33 sno Exp $
 
-DISTNAME=      Data-Compare-1.2102
-PKGNAME=       p5-${DISTNAME:S/2102/21.02/}
+DISTNAME=      Data-Compare-1.22
+PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    devel perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Data/}
 
index 0acdeca..f93d8ae 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2010/02/02 18:11:44 sno Exp $
+$NetBSD: distinfo,v 1.5 2010/02/15 14:24:33 sno Exp $
 
-SHA1 (Data-Compare-1.2102.tar.gz) = 613c560f7aae3ef017d703df5ad85494209981dc
-RMD160 (Data-Compare-1.2102.tar.gz) = f36816c13b4c3c961ae1a8988b80a6b1af56fbbd
-Size (Data-Compare-1.2102.tar.gz) = 24220 bytes
+SHA1 (Data-Compare-1.22.tar.gz) = 00079776bf7481a4c9a76163a269dbd4e40c2bea
+RMD160 (Data-Compare-1.22.tar.gz) = 141aa84b7b5712188be2deb66bd53703ebb3e85b
+Size (Data-Compare-1.22.tar.gz) = 23483 bytes
index c4480a4..846d506 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2009/11/27 23:13:57 seb Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/15 14:29:36 sno Exp $
 #
 
-DISTNAME=      Data-Dumper-Concise-1.002
+DISTNAME=      Data-Dumper-Concise-1.200
 PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    devel perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Data/}
@@ -13,8 +13,9 @@ LICENSE=      ${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-USE_LANGUAGES= # empty
-PERL5_PACKLIST=        auto/Data/Dumper/Concise/.packlist
+USE_LANGUAGES=         # empty
+PERL5_PACKLIST=                auto/Data/Dumper/Concise/.packlist
+PERL5_MODULE_TYPE=     Module::Install::Bundled
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
index 0a772e8..50a2504 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/11/27 23:13:57 seb Exp $
+$NetBSD: distinfo,v 1.3 2010/02/15 14:29:36 sno Exp $
 
-SHA1 (Data-Dumper-Concise-1.002.tar.gz) = 1344c3f251c9a1049db903a978aa34aefda9412f
-RMD160 (Data-Dumper-Concise-1.002.tar.gz) = 7ff242fb393c525f355779df84142d464b98d6dd
-Size (Data-Dumper-Concise-1.002.tar.gz) = 15965 bytes
+SHA1 (Data-Dumper-Concise-1.200.tar.gz) = 0ac5cd102c54a7fb64c804a3a8ebc8b9c6455332
+RMD160 (Data-Dumper-Concise-1.200.tar.gz) = 83814cd77fa5a8b76f0c52c6531be78dcf00dd3c
+Size (Data-Dumper-Concise-1.200.tar.gz) = 17023 bytes
index 2755341..331cfa4 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2009/06/13 06:46:44 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/15 14:33:03 sno Exp $
 
-DISTNAME=      Data-Page-2.01
+DISTNAME=      Data-Page-2.02
 PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    databases perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Data/}
@@ -8,6 +8,7 @@ MASTER_SITES=   ${MASTER_SITE_PERL_CPAN:=Data/}
 MAINTAINER=    pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://search.cpan.org/dist/Data-Page/
 COMMENT=       Pager utility for Class::DBI
+LICENSE=       ${PERL5_LICENSE}
 
 DEPENDS+=      p5-Class-Accessor-Chained>=0:../../devel/p5-Class-Accessor-Chained
 BUILD_DEPENDS+=        p5-Test-Exception>=0:../../devel/p5-Test-Exception
index a5caf4a..279a6af 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/10/30 21:58:25 he Exp $
+$NetBSD: distinfo,v 1.3 2010/02/15 14:33:03 sno Exp $
 
-SHA1 (Data-Page-2.01.tar.gz) = 3e241ace8a40039415dff5f30a74eba1fed84ad4
-RMD160 (Data-Page-2.01.tar.gz) = d4975a937d598d10442cd1de97305541bf4e647a
-Size (Data-Page-2.01.tar.gz) = 6592 bytes
+SHA1 (Data-Page-2.02.tar.gz) = b2dd33ba174dc6a00324e436c6dc0ed50c7b2217
+RMD160 (Data-Page-2.02.tar.gz) = 42095dfc9a9043fedcf025ee0ebe485823468605
+Size (Data-Page-2.02.tar.gz) = 8189 bytes
index ac8fe69..07aed89 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/02/02 18:15:00 sno Exp $
+# $NetBSD: Makefile,v 1.12 2010/02/15 13:42:57 sno Exp $
 
-DISTNAME=      ExtUtils-ParseXS-2.2202
-PKGNAME=       p5-${DISTNAME:S/2202/22.02/}
+DISTNAME=      ExtUtils-ParseXS-2.2203
+PKGNAME=       p5-${DISTNAME:S/2203/22.03/}
 SVR4_PKGNAME=  p5epx
 CATEGORIES=    devel perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=ExtUtils/}
index 64da9f0..60b06c5 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2010/02/02 18:15:00 sno Exp $
+$NetBSD: distinfo,v 1.11 2010/02/15 13:42:57 sno Exp $
 
-SHA1 (ExtUtils-ParseXS-2.2202.tar.gz) = a395d996ccec81813a1d2e51ef65f3242e57a7b8
-RMD160 (ExtUtils-ParseXS-2.2202.tar.gz) = c51cd181aa0b3519b0aad1414dadb509f5308563
-Size (ExtUtils-ParseXS-2.2202.tar.gz) = 40651 bytes
+SHA1 (ExtUtils-ParseXS-2.2203.tar.gz) = c9ae29ad0bb7a2c2a3002c776099958b13a3b1ee
+RMD160 (ExtUtils-ParseXS-2.2203.tar.gz) = a7c00f0564d12ae991b65b141b4e17c6b187899c
+Size (ExtUtils-ParseXS-2.2203.tar.gz) = 40797 bytes
index b22d8eb..9fce5e0 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/01/25 12:14:51 sno Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/15 13:46:54 sno Exp $
 
-DISTNAME=      ExtUtils-XSpp-0.07
+DISTNAME=      ExtUtils-XSpp-0.09
 PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    devel perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=ExtUtils/}
index b5f481b..27da0cb 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2010/01/25 12:14:51 sno Exp $
+$NetBSD: distinfo,v 1.3 2010/02/15 13:46:54 sno Exp $
 
-SHA1 (ExtUtils-XSpp-0.07.tar.gz) = e89cc31402412511c3738a9f2190c79e9966d0f9
-RMD160 (ExtUtils-XSpp-0.07.tar.gz) = a7a8e32d84a83cbe3df87c008aa6ad6c266009b7
-Size (ExtUtils-XSpp-0.07.tar.gz) = 89259 bytes
+SHA1 (ExtUtils-XSpp-0.09.tar.gz) = a128c5aba1105bb3f8aeda50bd3d9a4db99d791b
+RMD160 (ExtUtils-XSpp-0.09.tar.gz) = bf5a8850f1d15821615c0bdaae97439ae746dc36
+Size (ExtUtils-XSpp-0.09.tar.gz) = 96394 bytes
index 2dba8a5..713836c 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.727 2010/02/15 01:04:13 obache Exp $
+$NetBSD: CHANGES-2010,v 1.740 2010/02/15 14:33:13 sno Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -860,10 +860,29 @@ Changes to the packages collection and infrastructure in 2010:
        Updated print/tex-luatex-doc to 0.2 [minskim 2010-02-14]
        Updated textproc/tex-makeindex-doc to 2.12nb1 [minskim 2010-02-14]
        Added net/xymonclient version 4.3.0b2 [spz 2010-02-14]
-       Added net/xymon version 4.3.0b2 [spz 2010-02-14]
+       Added net/xymon version 4.3.0b2 [spz 2010-02-14]
        Updated print/tex-luatex to 0.2nb2 [minskim 2010-02-14]
        Updated fonts/tex-mflogo-doc to 2009 [minskim 2010-02-14]
        Updated print/tex-pdftex-doc to 1.40.10 [minskim 2010-02-15]
        Added print/tex-tetex-doc version 3.0 [minskim 2010-02-15]
        Added print/tex-collection-basic-doc version 2009 [minskim 2010-02-15]
        Updated converters/skf to 1.97.0a [obache 2010-02-15]
+       Updated graphics/oxygen-icons to 4.3.5nb1 [wiz 2010-02-15]
+       Removed shells/bash3 successor shells/bash [wiz 2010-02-15]
+       Removed inputmethod/sj3-lib [obache 2010-02-15]
+       Removed inputmethod/sj3-server-bin [obache 2010-02-15]
+       Removed inputmethod/sj3-dict [obache 2010-02-15]
+       Added inputmethod/sj3-client version 2.0.2.23p1 [obache 2010-02-15]
+       Updated inputmethod/sj3-server to 2.0.2.23p1 [obache 2010-02-15]
+       Added inputmethod/sj3 version 2.0.2.23p1 [obache 2010-02-15]
+       Updated time/p5-Time-HiRes to 1.9720 [sno 2010-02-15]
+       Updated inputmethod/kinput2 to 3.1 [obache 2010-02-15]
+       Updated devel/p5-ExtUtils-ParseXS to 2.22.03 [sno 2010-02-15]
+       Updated devel/p5-ExtUtils-XSpp to 0.09 [sno 2010-02-15]
+       Updated devel/p5-CPAN-Reporter to 1.1710 [sno 2010-02-15]
+       Updated devel/p5-Data-Compare to 1.22 [sno 2010-02-15]
+       Moved graphics/digikam to graphics/digikam-kde3 [wiz 2010-02-15]
+       Moved graphics/digikam-doc to graphics/digikam-doc [wiz 2010-02-15]
+       Updated graphics/digikam to 1.1.0 [wiz 2010-02-15]
+       Updated devel/p5-Data-Dumper-Concise to 1.200 [sno 2010-02-15]
+       Updated devel/p5-Data-Page to 2.02 [sno 2010-02-15]
index 0ed79bf..2d53829 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9026 2010/02/14 20:20:04 snj Exp $
+$NetBSD: TODO,v 1.9029 2010/02/15 13:43:36 sno Exp $
 
 Suggested new packages
 ======================
@@ -371,13 +371,14 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o acr-0.5.2
        o adns-1.4
        o adobe-flash-10.0.32.18
+       o adobe-flash-plugin-091508
        o adocman-0.13
        o adtool-1.3
        o advi-1.8
        o aewm++-1.0.27
        o afterstep-2.2.9
        o aide-0.13.1 [pkg/42677]
-       o akonadi-1.3.0
+       o akonadi-1.3.1
        o album-4.06
        o alee-ttf-11.2
        o alephone-20091015 [pkg/42397]
@@ -434,7 +435,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o awesome-3.4.3
        o baci-20040415
        o bacula-5.0.0
-       o balance-3.50
+       o balance-3.52
        o bash-completion-1.1
        o bbdb-2.35
        o bbkeys-0.9.0
@@ -461,6 +462,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o bzr-2.0.3
        o c4-1.10 [schmonz]
        o cadaver-0.23.0
+       o caff-1.1.3
        o cal3d-0.11.0
        o calamaris-2.59
        o calibre-0.6.40
@@ -571,7 +573,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o espeak-1.40
        o et-2.60
        o etach-1.4.1
-       o etm-526
+       o etm-531
        o eukleides-1.5.0
        o evolution-exchange-2.28.2
        o evolution-mapi-0.28.2 [GNOME 2.28]
@@ -633,6 +635,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o freesci-0.6.4
        o freetype-lib-1.5.20050518
        o freetype-utils-1.5.20050518
+       o freetype2-2.3.12
        o freewais-sf-2.2.14
        o frozen-bubble-2.2.0
        o ftplibpp-2.0.2
@@ -655,9 +658,10 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o gdl-2.28.2 [GNOME 2.28]
        o gdm-2.28.2 [GNOME 2.28]
        o gdsreader-0.3.2
-       o geany-0.18
+       o geany-0.18.1
        o geda-1.6.0.20091004
        o gedit-plugins-2.28.0 [GNOME 2.28]
+       o gegl-0.1.2
        o gentoo-0.15.6
        o gettext-0.17
        o gettext-m4-0.17
@@ -676,7 +680,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o glom-1.10.0 [GNOME 2.26]
        o glpk-4.42
        o glproto-1.4.11
-       o gnash-0.8.6
+       o gnash-0.8.7
        o gnet1-1.1.9
        o gnetman-20050429
        o gnome-bluetooth-2.28.3 [GNOME 2.28]
@@ -695,6 +699,8 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o gnomeicu-0.99.14
        o gnopernicus-1.1.2
        o gnu-crypto-2.1.0
+       o gnumeric-1.10.0
+       o goffice-0.8.0
        o gogo-3.11p1
        o golem-0.0.6
        o gossip-0.31
@@ -799,18 +805,17 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o kde-4.4
        o kdrill-6.5
        o kid3-1.3
-       o kinput2-3.1
        o kismet-2010.01r1
        o kmess-1.5.1
        o kmp-0.5
        o kodos-2.4.5
        o koffice-2.1.1
        o koffice-l10n-de-2.0.2
-       o konversation-1.2.2
+       o konversation-1.2.3
        o kphotobook-0.0.7
        o kronolith-2.3.3
        o krusader-2.0
-       o ktorrent3-3.3.3
+       o ktorrent3-3.3.4
        o lablgtk-2.14.0
        o lapack-3.2.1
        o latd-1.21
@@ -836,10 +841,12 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o libextractor-0.6.0
        o libflash-0.4.13
        o libgda-4.0.7 [GNOME 2.28]
+       o libgdata-0.6.0
        o libgdiplus-2.6
        o libgee-0.5.0
        o libgiigic-1.1.2
        o libgnomedb-3.1.2
+       o libgsf-1.14.17
        o libhydrogen-0.9.2
        o libiconv-1.13.1
        o libixp-0.5 [breaks wmii-3.6, wait for compatible version]
@@ -997,6 +1004,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o oo2c-2.1.7
        o openafs-1.4.10 [pkg/41262]
        o openafs-1.4.11
+       o openbox-3.4.11
        o opencobol-1.0
        o openh323-1.19.1
        o openldap-2.4.21
@@ -1012,7 +1020,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o oroborus-2.0.18
        o oto-0.5
        o otpCalc-0.97
-       o p5-ExtUtils-ParseXS-2.2203
        o p5-Inline-0.46 [pkg/42794]
        o p5-MailTools-2.06
        o p5-Mouse-0.50
@@ -1090,6 +1097,8 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o py-game-1.9.1
        o py-gnosis-1.2.2
        o py-gnosis-utils-1.2.1
+       o py-gstreamer0.10-0.10.18
+       o py-html2text-2.38
        o py-jinja2-2.3 [pkg/42783]
        o py-kenosis-0.96 [pkg/42561]
        o py-m2crypto-0.20.2
@@ -1114,6 +1123,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o raine-0.51.8
        o randread-0.2
        o rapidsvn-0.12
+       o rasqal-0.9.18
        o rat-4.2.25
        o rayshade-4.0.6
        o rc-1.7.1 [at ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/]
@@ -1256,6 +1266,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o tea-26.2.2
        o ted-2.17
        o ted-en-us-2.17
+       o tellico-2.2
        o tex-musixtex-113 [pkg/34758]
        o texmaker-1.9.9
        o tfmxplay-1.1.6
@@ -1337,7 +1348,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o wxRemind-101
        o wyrd-1.4.4
        o x11vnc-0.9.9
-       o x264-devel-20100206
+       o x264-devel-20100213
        o xanalyser-1.30
        o xapian-1.0.17
        o xapian-omega-1.0.17
index ddbce22..35f1b3f 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.550 2010/02/10 17:05:13 joerg Exp $
+# $NetBSD: Makefile,v 1.551 2010/02/15 14:24:20 wiz Exp $
 #
 
 COMMENT=       Graphics tools and libraries
@@ -63,7 +63,8 @@ SUBDIR+=      denemo
 SUBDIR+=       dia
 SUBDIR+=       dia-python
 SUBDIR+=       digikam
-SUBDIR+=       digikam-doc
+SUBDIR+=       digikam-doc-kde3
+SUBDIR+=       digikam-kde3
 SUBDIR+=       djview4
 SUBDIR+=       djvulibre-lib
 SUBDIR+=       djvulibre-tools
similarity index 88%
rename from graphics/digikam-doc/Makefile
rename to graphics/digikam-doc-kde3/Makefile
index dc11974..7f2882a 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2010/01/18 09:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.1.1.1 2010/02/15 14:18:08 wiz Exp $
 
 DISTNAME=              digikam-doc-0.9.5
 PKGREVISION=           3
similarity index 99%
rename from graphics/digikam-doc/PLIST
rename to graphics/digikam-doc-kde3/PLIST
index 13a2bb4..b6c6185 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:59:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/15 14:18:08 wiz Exp $
 share/doc/kde/HTML/da/digikam/common
 share/doc/kde/HTML/da/digikam/index.cache.bz2
 share/doc/kde/HTML/da/digikam/index.docbook
similarity index 81%
rename from graphics/digikam-doc/distinfo
rename to graphics/digikam-doc-kde3/distinfo
index c062a50..ea3116e 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/02/20 19:49:35 wiz Exp $
+$NetBSD: distinfo,v 1.1.1.1 2010/02/15 14:18:08 wiz Exp $
 
 SHA1 (digikam-doc-0.9.5.tar.bz2) = 42b9a1d6240f87d969fe371f0d66b76cf3259e68
 RMD160 (digikam-doc-0.9.5.tar.bz2) = 791b72883fc7043e8130bb827dae943e208840cb
similarity index 95%
rename from graphics/digikam-doc/patches/patch-aa
rename to graphics/digikam-doc-kde3/patches/patch-aa
index ad55c7f..6e52774 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2009/02/20 19:49:35 wiz Exp $
+$NetBSD: patch-aa,v 1.1.1.1 2010/02/15 14:18:08 wiz Exp $
 
 --- configure.orig     2009-01-13 14:23:27.000000000 +0000
 +++ configure
similarity index 88%
copy from graphics/digikam/Makefile
copy to graphics/digikam-kde3/Makefile
index 25b7b06..60032f1 100644 (file)
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.53 2010/01/18 09:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/02/15 14:33:38 wiz Exp $
 
 DISTNAME=              digikam-0.9.6
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            graphics kde
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=digikam/}
 EXTRACT_SUFX=          .tar.bz2
 
-MAINTAINER=            wiz@NetBSD.org
+MAINTAINER=            pkgsrc-users@NetBSD.org
 HOMEPAGE=              http://www.digikam.org/
 COMMENT=               Advanced digital photo management application for KDE
 LICENSE=               gnu-gpl-v2
@@ -39,5 +39,6 @@ PLIST_SUBST=  HTMLDIR=${DISTNAME}
 .include "../../graphics/libkipi/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
similarity index 99%
copy from graphics/digikam/PLIST
copy to graphics/digikam-kde3/PLIST
index 89c9ae7..52b247b 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 20:05:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/15 14:16:57 wiz Exp $
 bin/digikam
 bin/digikamthemedesigner
 bin/digitaglinktree
similarity index 76%
copy from graphics/digikam/distinfo
copy to graphics/digikam-kde3/distinfo
index b232881..f80ed9d 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2009/07/18 20:18:12 wiz Exp $
+$NetBSD: distinfo,v 1.1.1.1 2010/02/15 14:16:57 wiz Exp $
 
 SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5
 RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215
index a61fb74..0191893 100644 (file)
@@ -1,2 +1,35 @@
-Digikam is a simple digital photo management KDE application, which makes
-importing and organizing digital photos easy.
+digiKam is an advanced digital photo management application for
+KDE, which makes importing and organizing digital photos a "snap".
+The photos are organized in albums which can be sorted chronologically,
+by folder layout or by custom collections.
+
+You tag your images which can be spread out across multiple folders,
+and digiKam provides fast and intuitive ways to browse these tagged
+images. You can also add comments to your images.  digiKam makes
+use of a fast and robust database to store these meta-informations
+which makes adding and editing of comments and tags very reliable.
+
+An easy-to-use interface is provided that enables you to connect
+to your camera and preview, download and/or delete your images.
+Basic auto-transformations can be deployed on the fly during image
+downloading.
+
+Another tool, which most artists and photographers will be familiar
+with, is a Light Table. This tool assists artists and photographers
+with reviewing their work ensuring the highest quality only. A
+classical light table will show the artist the place on the images
+to touch up. Well in digiKam, the light table function provides
+the user a similar experience. You can import a photo, drag it onto
+the light table, and touch up only the areas that need it.
+
+The digiKam Image Editor has its own plugin subsystem with some
+common tools e.g. red eye correction or Gamma correction. Additional
+plugins are provided with the main application to process advanced
+corrections on image like color management, noise reduction, or
+special effects. digiKam Image Editor supports all camera RAW file
+formats, 16 bits color depth, Exif/Makernote/IPTC/GPS metadata,
+Color management, tagging/rating/comments pictures, etc.
+
+A stand-alone image editor version named ShowFoto is also available.
+It runs without digiKam images database support, but provides all
+Image Editor functions.
index 25b7b06..6171ae6 100644 (file)
@@ -1,43 +1,37 @@
-# $NetBSD: Makefile,v 1.53 2010/01/18 09:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2010/02/15 14:19:30 wiz Exp $
+#
 
-DISTNAME=              digikam-0.9.6
-PKGREVISION=           4
-CATEGORIES=            graphics kde
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=digikam/}
-EXTRACT_SUFX=          .tar.bz2
+DISTNAME=      digikam-1.1.0
+CATEGORIES=    graphics
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=digikam/}
+EXTRACT_SUFX=  .tar.bz2
 
-MAINTAINER=            wiz@NetBSD.org
-HOMEPAGE=              http://www.digikam.org/
-COMMENT=               Advanced digital photo management application for KDE
-LICENSE=               gnu-gpl-v2
+MAINTAINER=    wiz@NetBSD.org
+HOMEPAGE=      http://digikam.sourceforge.net/
+COMMENT=       Advanced digital photo management application (KDE4)
+LICENSE=       gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
 
-USE_TOOLS+=            gmake msgfmt perl:run pkg-config
-USE_LANGUAGES=         c c++
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
-PKG_DESTDIR_SUPPORT=   user-destdir
-
-CONFIGURE_ARGS+=       --without-included-sqlite3
+BUILD_DEPENDS+=        automoc4>=0.9.83:../../devel/automoc4
+DEPENDS+=      qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
 
-REPLACE_PERL+=         digikam/utilities/scripts/digitaglinktree
+PKG_DESTDIR_SUPPORT=   user-destdir
+USE_PKGLOCALEDIR=      yes
+USE_LANGUAGES=         c c++
 
-BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2
-BUILDLINK_API_DEPENDS.kdelibs+=        kdelibs>=3.5.2
-BUILDLINK_API_DEPENDS.libkexiv2+=      libkexiv2>=0.1.6
-BUILDLINK_API_DEPENDS.libkdcraw+=      libkdcraw>=0.1.6
+REPLACE_PERL=  utilities/scripts/digitaglinktree/digitaglinktree
+USE_CMAKE=     yes
+USE_TOOLS+=    gawk msgfmt perl:run pkg-config
 
-PLIST_SUBST=   HTMLDIR=${DISTNAME}
+.include "options.mk"
 
-.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/imlib2/buildlink3.mk"
-.include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/libkdcraw/buildlink3.mk"
-.include "../../graphics/libkexiv2/buildlink3.mk"
-.include "../../graphics/libkipi/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
+# for libkdcraw>=0.4.0
+BUILDLINK_API_DEPENDS.kdegraphics4+=   kdegraphics4>=4.1.2nb1
+.include "../../graphics/kdegraphics4/buildlink3.mk"
+.include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/liblqr/buildlink3.mk"
+.include "../../multimedia/kdemultimedia4/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index 89c9ae7..6aacc9e 100644 (file)
@@ -1,31 +1,39 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 20:05:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/02/15 14:19:30 wiz Exp $
+bin/cleanup_digikamdb
 bin/digikam
-bin/digikamthemedesigner
 bin/digitaglinktree
 bin/showfoto
+include/digikam/albumdb.h
 include/digikam/bcgmodifier.h
 include/digikam/cietonguewidget.h
 include/digikam/colorgradientwidget.h
 include/digikam/colormodifier.h
+include/digikam/curvesbox.h
 include/digikam/curveswidget.h
 include/digikam/dcolor.h
 include/digikam/dcolorblend.h
 include/digikam/dcolorcomposer.h
 include/digikam/dcolorpixelaccess.h
 include/digikam/dcursortracker.h
-include/digikam/ddebug.h
+include/digikam/dgradientslider.h
 include/digikam/dimg.h
 include/digikam/dimggaussianblur.h
 include/digikam/dimgimagefilters.h
+include/digikam/dimgrefocus.h
 include/digikam/dimgsharpen.h
 include/digikam/dimgthreadedfilter.h
+include/digikam/dimgunsharpmask.h
 include/digikam/dlogoaction.h
 include/digikam/dmetadata.h
 include/digikam/dpopupmenu.h
 include/digikam/dprogressdlg.h
+include/digikam/dzoombar.h
+include/digikam/exifwidget.h
 include/digikam/greycstorationiface.h
 include/digikam/greycstorationsettings.h
 include/digikam/greycstorationwidget.h
+include/digikam/histogrambox.h
+include/digikam/histogrampainter.h
 include/digikam/histogramwidget.h
 include/digikam/hslmodifier.h
 include/digikam/iccpreviewwidget.h
@@ -34,66 +42,76 @@ include/digikam/iccprofilewidget.h
 include/digikam/icctransform.h
 include/digikam/imagecurves.h
 include/digikam/imagedialog.h
-include/digikam/imageguidewidget.h
 include/digikam/imagehistogram.h
 include/digikam/imageiface.h
 include/digikam/imagelevels.h
-include/digikam/imagepanelwidget.h
-include/digikam/imagepaniconwidget.h
 include/digikam/imageplugin.h
-include/digikam/imageregionwidget.h
-include/digikam/imagewidget.h
-include/digikam/listboxpreviewitem.h
+include/digikam/iptcwidget.h
+include/digikam/knotificationwrapper.h
+include/digikam/libsinfodlg.h
+include/digikam/makernotewidget.h
+include/digikam/mdkeylistviewitem.h
+include/digikam/metadatalistview.h
+include/digikam/metadatalistviewitem.h
+include/digikam/metadatawidget.h
+include/digikam/noisereductionsettings.h
 include/digikam/paniconwidget.h
 include/digikam/photoinfocontainer.h
 include/digikam/previewwidget.h
 include/digikam/rawcameradlg.h
 include/digikam/searchtextbar.h
 include/digikam/sidebar.h
-include/digikam/squeezedcombobox.h
 include/digikam/statusled.h
 include/digikam/statusnavigatebar.h
 include/digikam/statusprogressbar.h
 include/digikam/statuszoombar.h
-include/digikam/thumbbar.h
-include/digikam/whitebalance.h
+include/digikam/template.h
+include/digikam/waveletsnr.h
+include/digikam/xmpwidget.h
 include/digikam_export.h
-lib/kde3/digikamimageplugin_adjustcurves.la
-lib/kde3/digikamimageplugin_adjustlevels.la
-lib/kde3/digikamimageplugin_antivignetting.la
-lib/kde3/digikamimageplugin_blurfx.la
-lib/kde3/digikamimageplugin_border.la
-lib/kde3/digikamimageplugin_channelmixer.la
-lib/kde3/digikamimageplugin_charcoal.la
-lib/kde3/digikamimageplugin_colorfx.la
-lib/kde3/digikamimageplugin_core.la
-lib/kde3/digikamimageplugin_distortionfx.la
-lib/kde3/digikamimageplugin_emboss.la
-lib/kde3/digikamimageplugin_filmgrain.la
-lib/kde3/digikamimageplugin_freerotation.la
-lib/kde3/digikamimageplugin_hotpixels.la
-lib/kde3/digikamimageplugin_infrared.la
-lib/kde3/digikamimageplugin_inpainting.la
-lib/kde3/digikamimageplugin_inserttext.la
-lib/kde3/digikamimageplugin_lensdistortion.la
-lib/kde3/digikamimageplugin_noisereduction.la
-lib/kde3/digikamimageplugin_oilpaint.la
-lib/kde3/digikamimageplugin_perspective.la
-lib/kde3/digikamimageplugin_raindrop.la
-lib/kde3/digikamimageplugin_restoration.la
-lib/kde3/digikamimageplugin_sheartool.la
-lib/kde3/digikamimageplugin_superimpose.la
-lib/kde3/digikamimageplugin_texture.la
-lib/kde3/digikamimageplugin_whitebalance.la
-lib/kde3/kio_digikamalbums.la
-lib/kde3/kio_digikamdates.la
-lib/kde3/kio_digikamsearch.la
-lib/kde3/kio_digikamtags.la
-lib/kde3/kio_digikamthumbnail.la
-lib/libdigikam.la
+lib/kde4/digikamimageplugin_adjustcurves.so
+lib/kde4/digikamimageplugin_adjustlevels.so
+lib/kde4/digikamimageplugin_blurfx.so
+lib/kde4/digikamimageplugin_border.so
+lib/kde4/digikamimageplugin_channelmixer.so
+lib/kde4/digikamimageplugin_charcoal.so
+lib/kde4/digikamimageplugin_colorfx.so
+lib/kde4/digikamimageplugin_contentawareresizing.so
+lib/kde4/digikamimageplugin_core.so
+lib/kde4/digikamimageplugin_distortionfx.so
+lib/kde4/digikamimageplugin_emboss.so
+lib/kde4/digikamimageplugin_filmgrain.so
+lib/kde4/digikamimageplugin_freerotation.so
+lib/kde4/digikamimageplugin_hotpixels.so
+lib/kde4/digikamimageplugin_infrared.so
+lib/kde4/digikamimageplugin_inpainting.so
+lib/kde4/digikamimageplugin_inserttext.so
+lib/kde4/digikamimageplugin_lenscorrection.so
+lib/kde4/digikamimageplugin_localcontrast.so
+lib/kde4/digikamimageplugin_oilpaint.so
+lib/kde4/digikamimageplugin_perspective.so
+lib/kde4/digikamimageplugin_raindrop.so
+lib/kde4/digikamimageplugin_restoration.so
+lib/kde4/digikamimageplugin_sheartool.so
+lib/kde4/digikamimageplugin_superimpose.so
+lib/kde4/digikamimageplugin_texture.so
+lib/kde4/digikamimageplugin_whitebalance.so
+lib/kde4/digikamnepomukservice.so
+lib/kde4/kio_digikamalbums.so
+lib/kde4/kio_digikamdates.so
+lib/kde4/kio_digikamsearch.so
+lib/kde4/kio_digikamtags.so
+lib/kde4/plugins/marble/ExternalDraw.so
+lib/libdigikamcore.so
+lib/libdigikamcore.so.1
+lib/libdigikamcore.so.1.0.0
+lib/libdigikamdatabase.so
+lib/libdigikamdatabase.so.1
+lib/libdigikamdatabase.so.1.0.0
+man/man1/cleanup_digikamdb.1
 man/man1/digitaglinktree.1
-share/applications/kde/digikam.desktop
-share/applications/kde/showfoto.desktop
+share/applications/kde4/digikam.desktop
+share/applications/kde4/showfoto.desktop
 share/icons/hicolor/128x128/apps/digikam.png
 share/icons/hicolor/128x128/apps/showfoto.png
 share/icons/hicolor/16x16/apps/digikam.png
@@ -106,32 +124,19 @@ share/icons/hicolor/48x48/apps/digikam.png
 share/icons/hicolor/48x48/apps/showfoto.png
 share/icons/hicolor/64x64/apps/digikam.png
 share/icons/hicolor/64x64/apps/showfoto.png
-share/kde/apps/digikam/about/bar-bottom-left.png
-share/kde/apps/digikam/about/bar-bottom-middle.png
-share/kde/apps/digikam/about/bar-bottom-right.png
-share/kde/apps/digikam/about/bar-middle-left.png
-share/kde/apps/digikam/about/bar-middle-right.png
-share/kde/apps/digikam/about/bar-top-left.png
-share/kde/apps/digikam/about/bar-top-middle.png
-share/kde/apps/digikam/about/bar-top-right.png
-share/kde/apps/digikam/about/bottom-left.png
-share/kde/apps/digikam/about/bottom-middle.png
-share/kde/apps/digikam/about/bottom-right.png
-share/kde/apps/digikam/about/box-bottom-left.png
-share/kde/apps/digikam/about/box-bottom-middle.png
-share/kde/apps/digikam/about/box-bottom-right.png
-share/kde/apps/digikam/about/box-middle-left.png
-share/kde/apps/digikam/about/box-middle-right.png
-share/kde/apps/digikam/about/box-top-left.png
-share/kde/apps/digikam/about/box-top-middle.png
-share/kde/apps/digikam/about/box-top-right.png
+share/icons/hicolor/scalable/apps/digikam.svgz
+share/icons/hicolor/scalable/apps/showfoto.svgz
 share/kde/apps/digikam/about/digikam.css
-share/kde/apps/digikam/about/kde_infopage.css
-share/kde/apps/digikam/about/kde_infopage_rtl.css
 share/kde/apps/digikam/about/main.html
-share/kde/apps/digikam/about/top-left.png
-share/kde/apps/digikam/about/top-middle.png
-share/kde/apps/digikam/about/top-right-digikam.png
+share/kde/apps/digikam/about/top-left-digikam.png
+share/kde/apps/digikam/cameraui.rc
+share/kde/apps/digikam/data/assistant-collection.png
+share/kde/apps/digikam/data/assistant-metadata.png
+share/kde/apps/digikam/data/assistant-openfile.png
+share/kde/apps/digikam/data/assistant-preview.png
+share/kde/apps/digikam/data/assistant-rawimport.png
+share/kde/apps/digikam/data/assistant-scancollection.png
+share/kde/apps/digikam/data/assistant-tooltips.png
 share/kde/apps/digikam/data/banner-digikam.png
 share/kde/apps/digikam/data/bluejean-texture.png
 share/kde/apps/digikam/data/bothhorz.png
@@ -144,9 +149,6 @@ share/kde/apps/digikam/data/cellwood-texture.png
 share/kde/apps/digikam/data/centerheight.png
 share/kde/apps/digikam/data/centerwidth.png
 share/kde/apps/digikam/data/chalk-pattern.png
-share/kde/apps/digikam/data/color-picker-black.png
-share/kde/apps/digikam/data/color-picker-grey.png
-share/kde/apps/digikam/data/color-picker-white.png
 share/kde/apps/digikam/data/craters-pattern.png
 share/kde/apps/digikam/data/curvefree.png
 share/kde/apps/digikam/data/curvemooth.png
@@ -165,13 +167,13 @@ share/kde/apps/digikam/data/indicator-green.png
 share/kde/apps/digikam/data/indicator-red.png
 share/kde/apps/digikam/data/leaf-pattern.png
 share/kde/apps/digikam/data/logo-cimg.png
+share/kde/apps/digikam/data/logo-digikam.png
 share/kde/apps/digikam/data/logo-exiv2.png
 share/kde/apps/digikam/data/logo-gphoto.png
 share/kde/apps/digikam/data/logo-lcms.png
 share/kde/apps/digikam/data/marble-pattern.png
 share/kde/apps/digikam/data/marble-texture.png
 share/kde/apps/digikam/data/marble2-texture.png
-share/kde/apps/digikam/data/menusidepixmap.png
 share/kde/apps/digikam/data/metalwire-texture.png
 share/kde/apps/digikam/data/modern-texture.png
 share/kde/apps/digikam/data/moss-texture.png
@@ -183,28 +185,25 @@ share/kde/apps/digikam/data/parque-pattern.png
 share/kde/apps/digikam/data/pine-pattern.png
 share/kde/apps/digikam/data/pink-pattern.png
 share/kde/apps/digikam/data/rain-pattern.png
-share/kde/apps/digikam/data/rating.png
 share/kde/apps/digikam/data/rock-pattern.png
+share/kde/apps/digikam/data/splash-digikam.png
 share/kde/apps/digikam/data/stone-pattern.png
 share/kde/apps/digikam/data/stone-texture.png
 share/kde/apps/digikam/data/target.png
 share/kde/apps/digikam/data/togglemouseover.png
+share/kde/apps/digikam/data/topicset.iptc-subjectcode.xml
 share/kde/apps/digikam/data/wall-pattern.png
 share/kde/apps/digikam/data/wall-texture.png
 share/kde/apps/digikam/data/wood-pattern.png
-share/kde/apps/digikam/data/worldmap.jpg
-share/kde/apps/digikam/data/zoom10.png
-share/kde/apps/digikam/data/zoom20.png
-share/kde/apps/digikam/data/zoom30.png
-share/kde/apps/digikam/digikam-splash.png
+share/kde/apps/digikam/digikam.notifyrc
 share/kde/apps/digikam/digikamimageplugin_adjustcurves_ui.rc
 share/kde/apps/digikam/digikamimageplugin_adjustlevels_ui.rc
-share/kde/apps/digikam/digikamimageplugin_antivignetting_ui.rc
 share/kde/apps/digikam/digikamimageplugin_blurfx_ui.rc
 share/kde/apps/digikam/digikamimageplugin_border_ui.rc
 share/kde/apps/digikam/digikamimageplugin_channelmixer_ui.rc
 share/kde/apps/digikam/digikamimageplugin_charcoal_ui.rc
 share/kde/apps/digikam/digikamimageplugin_colorfx_ui.rc
+share/kde/apps/digikam/digikamimageplugin_contentawareresizing_ui.rc
 share/kde/apps/digikam/digikamimageplugin_core_ui.rc
 share/kde/apps/digikam/digikamimageplugin_distortionfx_ui.rc
 share/kde/apps/digikam/digikamimageplugin_emboss_ui.rc
@@ -214,8 +213,8 @@ share/kde/apps/digikam/digikamimageplugin_hotpixels_ui.rc
 share/kde/apps/digikam/digikamimageplugin_infrared_ui.rc
 share/kde/apps/digikam/digikamimageplugin_inpainting_ui.rc
 share/kde/apps/digikam/digikamimageplugin_inserttext_ui.rc
-share/kde/apps/digikam/digikamimageplugin_lensdistortion_ui.rc
-share/kde/apps/digikam/digikamimageplugin_noisereduction_ui.rc
+share/kde/apps/digikam/digikamimageplugin_lenscorrection_ui.rc
+share/kde/apps/digikam/digikamimageplugin_localcontrast_ui.rc
 share/kde/apps/digikam/digikamimageplugin_oilpaint_ui.rc
 share/kde/apps/digikam/digikamimageplugin_perspective_ui.rc
 share/kde/apps/digikam/digikamimageplugin_raindrop_ui.rc
@@ -226,34 +225,16 @@ share/kde/apps/digikam/digikamimageplugin_texture_ui.rc
 share/kde/apps/digikam/digikamimageplugin_whitebalance_ui.rc
 share/kde/apps/digikam/digikamimagewindowui.rc
 share/kde/apps/digikam/digikamui.rc
-share/kde/apps/digikam/icons/crystalsvg/128x128/actions/crop.png
-share/kde/apps/digikam/icons/crystalsvg/128x128/actions/fileopen.png
-share/kde/apps/digikam/icons/crystalsvg/128x128/actions/rotate_cw.png
-share/kde/apps/digikam/icons/crystalsvg/16x16/actions/crop.png
-share/kde/apps/digikam/icons/crystalsvg/16x16/actions/fileopen.png
-share/kde/apps/digikam/icons/crystalsvg/16x16/actions/rotate_cw.png
-share/kde/apps/digikam/icons/crystalsvg/22x22/actions/crop.png
-share/kde/apps/digikam/icons/crystalsvg/22x22/actions/fileopen.png
-share/kde/apps/digikam/icons/crystalsvg/22x22/actions/rotate_cw.png
-share/kde/apps/digikam/icons/crystalsvg/32x32/actions/crop.png
-share/kde/apps/digikam/icons/crystalsvg/32x32/actions/fileopen.png
-share/kde/apps/digikam/icons/crystalsvg/32x32/actions/rotate_cw.png
-share/kde/apps/digikam/icons/crystalsvg/48x48/actions/crop.png
-share/kde/apps/digikam/icons/crystalsvg/48x48/actions/fileopen.png
-share/kde/apps/digikam/icons/crystalsvg/48x48/actions/rotate_cw.png
-share/kde/apps/digikam/icons/crystalsvg/64x64/actions/crop.png
-share/kde/apps/digikam/icons/crystalsvg/64x64/actions/fileopen.png
-share/kde/apps/digikam/icons/crystalsvg/64x64/actions/rotate_cw.png
-share/kde/apps/digikam/icons/crystalsvg/scalable/actions/crop.svgz
-share/kde/apps/digikam/icons/crystalsvg/scalable/actions/fileopen.svgz
-share/kde/apps/digikam/icons/crystalsvg/scalable/actions/rotate_cw.svgz
-share/kde/apps/digikam/icons/hicolor/128x128/actions/addimagefolder.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/adjustlevels.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/adjustrgb.png
-share/kde/apps/digikam/icons/hicolor/128x128/actions/albumfoldercomment.png
-share/kde/apps/digikam/icons/hicolor/128x128/actions/albumfoldernew.png
+share/kde/apps/digikam/icons/hicolor/128x128/actions/albumfolder-importdir.png
+share/kde/apps/digikam/icons/hicolor/128x128/actions/albumfolder-importdir2.png
+share/kde/apps/digikam/icons/hicolor/128x128/actions/albumfolder-importimages.png
+share/kde/apps/digikam/icons/hicolor/128x128/actions/albumfolder-new.png
+share/kde/apps/digikam/icons/hicolor/128x128/actions/albumfolder-properties.png
+share/kde/apps/digikam/icons/hicolor/128x128/actions/albumfolder-user-trash.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/antivignetting.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/autocorrection.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/blurfx.png
@@ -267,20 +248,16 @@ share/kde/apps/digikam/icons/hicolor/128x128/actions/colormanagement.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/contrast.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/depth16to8.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/depth8to16.png
-share/kde/apps/digikam/icons/hicolor/128x128/actions/digitalcam.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/distortionfx.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/editimage.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/embosstool.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/exifinfo.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/filmgrain.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/freerotation.png
-share/kde/apps/digikam/icons/hicolor/128x128/actions/histogram.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/hotpixels.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/imagecomment.png
-share/kde/apps/digikam/icons/hicolor/128x128/actions/importfolders2albums.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/infrared.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/inpainting.png
-share/kde/apps/digikam/icons/hicolor/128x128/actions/inserttext.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/invertimage.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/lensdistortion.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/noisereduction.png
@@ -289,28 +266,35 @@ share/kde/apps/digikam/icons/hicolor/128x128/actions/perspective.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/raindrop.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/ratiocrop.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/redeyes.png
-share/kde/apps/digikam/icons/hicolor/128x128/actions/resize_image.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/restoration.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/sharpenimage.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/shear.png
-share/kde/apps/digikam/icons/hicolor/128x128/actions/slideshow.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/superimpose.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/128x128/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/128x128/apps/digikam.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/addimagefolder.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/adjustlevels.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/adjustrgb.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/albumfoldercomment.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/albumfoldernew.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/albumfolder-importdir.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/albumfolder-importdir2.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/albumfolder-importimages.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/albumfolder-new.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/albumfolder-properties.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/albumfolder-user-trash.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/antivignetting.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/autocorrection.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/blurfx.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/blurimage.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/bordertool.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/bqm-add.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/bqm-addqueue.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/bqm-commit.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/bqm-diff.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/bqm-remove.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/bqm-rmqueue.png
+share/kde/apps/digikam/icons/hicolor/16x16/actions/bqm-update.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/bwtonal.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/channelmixer.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/charcoaltool.png
@@ -319,52 +303,53 @@ share/kde/apps/digikam/icons/hicolor/16x16/actions/colormanagement.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/contrast.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/depth16to8.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/depth8to16.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/digitalcam.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/distortionfx.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/editimage.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/embosstool.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/exifinfo.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/filmgrain.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/flip.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/freerotation.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/histogram.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/hotpixels.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/imagecomment.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/importfolders2albums.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/infrared.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/inpainting.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/inserttext.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/invertimage.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/lensdistortion.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/mirror.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/noisereduction.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/oilpaint.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/perspective.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/raindrop.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/ratiocrop.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/redeyes.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/resize_image.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/restoration.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/sharpenimage.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/shear.png
-share/kde/apps/digikam/icons/hicolor/16x16/actions/slideshow.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/superimpose.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/16x16/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/16x16/apps/digikam.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/addimagefolder.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/adjustlevels.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/adjustrgb.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/albumfoldercomment.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/albumfoldernew.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/albumfolder-importdir.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/albumfolder-importdir2.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/albumfolder-importimages.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/albumfolder-new.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/albumfolder-properties.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/albumfolder-user-trash.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/antivignetting.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/autocorrection.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/blurfx.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/blurimage.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/bordertool.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/bqm-add.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/bqm-addqueue.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/bqm-commit.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/bqm-diff.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/bqm-remove.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/bqm-rmqueue.png
+share/kde/apps/digikam/icons/hicolor/22x22/actions/bqm-update.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/bwtonal.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/channelmixer.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/charcoaltool.png
@@ -373,56 +358,54 @@ share/kde/apps/digikam/icons/hicolor/22x22/actions/colormanagement.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/contrast.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/depth16to8.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/depth8to16.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/digitalcam.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/distortionfx.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/editimage.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/embosstool.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/exifinfo.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/filmgrain.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/flip.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/freerotation.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/histogram.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/hotpixels.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/imagecomment.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/importfolders2albums.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/infrared.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/inpainting.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/inserttext.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/invertimage.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/lensdistortion.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/mirror.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/noisereduction.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/oilpaint.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/perspective.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/raindrop.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/ratiocrop.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/redeyes.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/resize_image.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/restoration.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/sharpenimage.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/shear.png
-share/kde/apps/digikam/icons/hicolor/22x22/actions/slideshow.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/superimpose.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/22x22/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/22x22/apps/digikam.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/addimagefolder.png
+share/kde/apps/digikam/icons/hicolor/22x22/mimetypes/raw.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/adjustlevels.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/adjustrgb.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/albumfolder-importdir.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/albumfolder-importdir2.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/albumfolder-importimages.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/albumfolder-new.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/albumfolder-properties.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/albumfoldercomment.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/albumfoldernew.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/albumfolder-user-trash.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/antivignetting.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/autocorrection.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/blurfx.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/blurimage.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/bordertool.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/bqm-add.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/bqm-addqueue.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/bqm-commit.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/bqm-diff.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/bqm-remove.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/bqm-rmqueue.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/bqm-update.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/bwtonal.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/channelmixer.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/charcoaltool.png
@@ -431,27 +414,20 @@ share/kde/apps/digikam/icons/hicolor/32x32/actions/colormanagement.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/contrast.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/depth16to8.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/depth8to16.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/digikamimageplugins.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/digitalcam.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/distortionfx.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/editimage.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/embosstool.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/exifinfo.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/filmgrain.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/flip.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/freerotation.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/histogram.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/hotpixels.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/imagecomment.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/importfolders2albums.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/infrared.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/inpainting.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/inserttext.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/invertimage.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/lensdistortion.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/lighttable.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/lighttableadd.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/mirror.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/noisereduction.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/oilpaint.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/overexposure.png
@@ -459,11 +435,9 @@ share/kde/apps/digikam/icons/hicolor/32x32/actions/perspective.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/raindrop.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/ratiocrop.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/redeyes.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/resize_image.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/restoration.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/sharpenimage.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/shear.png
-share/kde/apps/digikam/icons/hicolor/32x32/actions/slideshow.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/superimpose.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/tag-addressbook.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/tag-assigned.png
@@ -481,20 +455,30 @@ share/kde/apps/digikam/icons/hicolor/32x32/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/underexposure.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/32x32/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/32x32/apps/digikam.png
-share/kde/apps/digikam/icons/hicolor/32x32/apps/digikamimageplugins.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/addimagefolder.png
+share/kde/apps/digikam/icons/hicolor/32x32/actions/zoom-select-fit.png
+share/kde/apps/digikam/icons/hicolor/32x32/mimetypes/raw.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/adjustlevels.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/adjustrgb.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/albumfoldercomment.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/albumfoldernew.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/albumfolder-importdir.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/albumfolder-importdir2.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/albumfolder-importimages.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/albumfolder-new.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/albumfolder-properties.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/albumfolder-user-trash.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/antivignetting.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/autocorrection.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/blurfx.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/blurimage.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/bordertool.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/bqm-add.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/bqm-addqueue.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/bqm-commit.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/bqm-diff.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/bqm-remove.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/bqm-rmqueue.png
+share/kde/apps/digikam/icons/hicolor/48x48/actions/bqm-update.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/bwtonal.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/channelmixer.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/charcoaltool.png
@@ -503,52 +487,54 @@ share/kde/apps/digikam/icons/hicolor/48x48/actions/colormanagement.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/contrast.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/depth16to8.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/depth8to16.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/digitalcam.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/distortionfx.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/editimage.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/embosstool.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/exifinfo.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/filmgrain.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/flip.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/freerotation.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/histogram.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/hotpixels.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/imagecomment.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/importfolders2albums.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/infrared.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/inpainting.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/inserttext.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/invertimage.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/lensdistortion.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/mirror.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/noisereduction.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/oilpaint.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/perspective.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/raindrop.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/ratiocrop.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/redeyes.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/resize_image.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/restoration.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/sharpenimage.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/shear.png
-share/kde/apps/digikam/icons/hicolor/48x48/actions/slideshow.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/superimpose.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/48x48/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/48x48/apps/digikam.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/addimagefolder.png
+share/kde/apps/digikam/icons/hicolor/48x48/mimetypes/raw.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/adjustcurves.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/adjusthsl.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/adjustlevels.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/adjustrgb.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/albumfoldercomment.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/albumfoldernew.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/albumfolder-importdir.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/albumfolder-importdir2.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/albumfolder-importimages.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/albumfolder-new.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/albumfolder-properties.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/albumfolder-user-trash.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/antivignetting.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/autocorrection.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/blurfx.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/blurimage.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/bordertool.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/bqm-add.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/bqm-addqueue.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/bqm-commit.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/bqm-diff.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/bqm-remove.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/bqm-rmqueue.png
+share/kde/apps/digikam/icons/hicolor/64x64/actions/bqm-update.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/bwtonal.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/channelmixer.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/charcoaltool.png
@@ -557,20 +543,16 @@ share/kde/apps/digikam/icons/hicolor/64x64/actions/colormanagement.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/contrast.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/depth16to8.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/depth8to16.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/digitalcam.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/distortionfx.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/editimage.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/embosstool.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/exifinfo.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/filmgrain.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/freerotation.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/histogram.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/hotpixels.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/imagecomment.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/importfolders2albums.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/infrared.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/inpainting.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/inserttext.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/invertimage.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/lensdistortion.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/noisereduction.png
@@ -579,27 +561,35 @@ share/kde/apps/digikam/icons/hicolor/64x64/actions/perspective.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/raindrop.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/ratiocrop.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/redeyes.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/resize_image.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/restoration.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/sharpenimage.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/shear.png
-share/kde/apps/digikam/icons/hicolor/64x64/actions/slideshow.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/superimpose.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/texture.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/viewimage.png
 share/kde/apps/digikam/icons/hicolor/64x64/actions/whitebalance.png
-share/kde/apps/digikam/icons/hicolor/64x64/apps/digikam.png
-share/kde/apps/digikam/icons/hicolor/scalable/actions/addimagefolder.svgz
+share/kde/apps/digikam/icons/hicolor/64x64/mimetypes/raw.png
 share/kde/apps/digikam/icons/hicolor/scalable/actions/adjustcurves.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/adjustlevels.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/adjustrgb.svgz
-share/kde/apps/digikam/icons/hicolor/scalable/actions/albumfoldercomment.svgz
-share/kde/apps/digikam/icons/hicolor/scalable/actions/albumfoldernew.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/albumfolder-importdir.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/albumfolder-importdir2.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/albumfolder-importimages.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/albumfolder-new.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/albumfolder-properties.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/albumfolder-user-trash.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/antivignetting.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/autocorrection.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/blurfx.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/blurimage.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/bordertool.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/bqm-add.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/bqm-addqueue.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/bqm-commit.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/bqm-diff.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/bqm-remove.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/bqm-rmqueue.svgz
+share/kde/apps/digikam/icons/hicolor/scalable/actions/bqm-update.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/bwtonal.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/channelmixer.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/colormanagement.svgz
@@ -611,31 +601,21 @@ share/kde/apps/digikam/icons/hicolor/scalable/actions/editimage.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/exifinfo.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/filmgrain.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/freerotation.svgz
-share/kde/apps/digikam/icons/hicolor/scalable/actions/histogram.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/hotpixels.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/imagecomment.svgz
-share/kde/apps/digikam/icons/hicolor/scalable/actions/importfolders2albums.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/inpainting.svgz
-share/kde/apps/digikam/icons/hicolor/scalable/actions/inserttext.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/invertimage.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/noisereduction.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/perspective.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/ratiocrop.svgz
-share/kde/apps/digikam/icons/hicolor/scalable/actions/resize_image.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/restoration.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/sharpenimage.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/shear.svgz
-share/kde/apps/digikam/icons/hicolor/scalable/actions/slideshow.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/superimpose.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/texture.svgz
 share/kde/apps/digikam/icons/hicolor/scalable/actions/whitebalance.svgz
 share/kde/apps/digikam/lighttablewindowui.rc
-share/kde/apps/digikam/profiles/adobergb.icm
-share/kde/apps/digikam/profiles/applergb.icm
-share/kde/apps/digikam/profiles/prophoto.icm
-share/kde/apps/digikam/profiles/srgb-d65.icm
-share/kde/apps/digikam/profiles/srgb.icm
-share/kde/apps/digikam/profiles/widegamut.icm
+share/kde/apps/digikam/queuemgrwindowui.rc
 share/kde/apps/digikam/themes/Blue
 share/kde/apps/digikam/themes/Clean
 share/kde/apps/digikam/themes/DLR
@@ -651,83 +631,78 @@ share/kde/apps/digikam/themes/Rose
 share/kde/apps/digikam/themes/Sandy
 share/kde/apps/digikam/tips
 share/kde/apps/digikam/utils/digikam-camera
-share/kde/apps/konqueror/servicemenus/digikam-download.desktop
-share/kde/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop
-share/kde/apps/konqueror/servicemenus/digikam-mount-and-download.desktop
-share/kde/apps/showfoto/icons/hicolor/128x128/apps/showfoto.png
-share/kde/apps/showfoto/icons/hicolor/16x16/apps/showfoto.png
-share/kde/apps/showfoto/icons/hicolor/22x22/apps/showfoto.png
-share/kde/apps/showfoto/icons/hicolor/22x22/mimetypes/raw.png
-share/kde/apps/showfoto/icons/hicolor/32x32/apps/showfoto.png
-share/kde/apps/showfoto/icons/hicolor/32x32/mimetypes/raw.png
-share/kde/apps/showfoto/icons/hicolor/48x48/apps/showfoto.png
-share/kde/apps/showfoto/icons/hicolor/48x48/mimetypes/raw.png
-share/kde/apps/showfoto/icons/hicolor/64x64/apps/showfoto.png
-share/kde/apps/showfoto/icons/hicolor/64x64/mimetypes/raw.png
-share/kde/apps/showfoto/menusidepixmap.png
-share/kde/apps/showfoto/showfoto-splash.png
+share/kde/apps/showfoto/data/banner-showfoto.png
+share/kde/apps/showfoto/data/logo-showfoto.png
+share/kde/apps/showfoto/data/splash-showfoto.png
 share/kde/apps/showfoto/showfotoui.rc
-share/kde/services/digikamalbums.protocol
-share/kde/services/digikamdates.protocol
-share/kde/services/digikamimageplugin_adjustcurves.desktop
-share/kde/services/digikamimageplugin_adjustlevels.desktop
-share/kde/services/digikamimageplugin_antivignetting.desktop
-share/kde/services/digikamimageplugin_blurfx.desktop
-share/kde/services/digikamimageplugin_border.desktop
-share/kde/services/digikamimageplugin_channelmixer.desktop
-share/kde/services/digikamimageplugin_charcoal.desktop
-share/kde/services/digikamimageplugin_colorfx.desktop
-share/kde/services/digikamimageplugin_core.desktop
-share/kde/services/digikamimageplugin_distortionfx.desktop
-share/kde/services/digikamimageplugin_emboss.desktop
-share/kde/services/digikamimageplugin_filmgrain.desktop
-share/kde/services/digikamimageplugin_freerotation.desktop
-share/kde/services/digikamimageplugin_hotpixels.desktop
-share/kde/services/digikamimageplugin_infrared.desktop
-share/kde/services/digikamimageplugin_inpainting.desktop
-share/kde/services/digikamimageplugin_inserttext.desktop
-share/kde/services/digikamimageplugin_lensdistortion.desktop
-share/kde/services/digikamimageplugin_noisereduction.desktop
-share/kde/services/digikamimageplugin_oilpaint.desktop
-share/kde/services/digikamimageplugin_perspective.desktop
-share/kde/services/digikamimageplugin_raindrop.desktop
-share/kde/services/digikamimageplugin_restoration.desktop
-share/kde/services/digikamimageplugin_sheartool.desktop
-share/kde/services/digikamimageplugin_superimpose.desktop
-share/kde/services/digikamimageplugin_texture.desktop
-share/kde/services/digikamimageplugin_whitebalance.desktop
-share/kde/services/digikamsearch.protocol
-share/kde/services/digikamtags.protocol
-share/kde/services/digikamthumbnail.protocol
-share/kde/servicetypes/digikamimageplugin.desktop
+share/kde/apps/solid/actions/digikam-opencamera.desktop
+share/kde4/services/digikamalbums.protocol
+share/kde4/services/digikamdates.protocol
+share/kde4/services/digikamimageplugin_adjustcurves.desktop
+share/kde4/services/digikamimageplugin_adjustlevels.desktop
+share/kde4/services/digikamimageplugin_blurfx.desktop
+share/kde4/services/digikamimageplugin_border.desktop
+share/kde4/services/digikamimageplugin_channelmixer.desktop
+share/kde4/services/digikamimageplugin_charcoal.desktop
+share/kde4/services/digikamimageplugin_colorfx.desktop
+share/kde4/services/digikamimageplugin_contentawareresizing.desktop
+share/kde4/services/digikamimageplugin_core.desktop
+share/kde4/services/digikamimageplugin_distortionfx.desktop
+share/kde4/services/digikamimageplugin_emboss.desktop
+share/kde4/services/digikamimageplugin_filmgrain.desktop
+share/kde4/services/digikamimageplugin_freerotation.desktop
+share/kde4/services/digikamimageplugin_hotpixels.desktop
+share/kde4/services/digikamimageplugin_infrared.desktop
+share/kde4/services/digikamimageplugin_inpainting.desktop
+share/kde4/services/digikamimageplugin_inserttext.desktop
+share/kde4/services/digikamimageplugin_lenscorrection.desktop
+share/kde4/services/digikamimageplugin_localcontrast.desktop
+share/kde4/services/digikamimageplugin_oilpaint.desktop
+share/kde4/services/digikamimageplugin_perspective.desktop
+share/kde4/services/digikamimageplugin_raindrop.desktop
+share/kde4/services/digikamimageplugin_restoration.desktop
+share/kde4/services/digikamimageplugin_sheartool.desktop
+share/kde4/services/digikamimageplugin_superimpose.desktop
+share/kde4/services/digikamimageplugin_texture.desktop
+share/kde4/services/digikamimageplugin_whitebalance.desktop
+share/kde4/services/digikamnepomukservice.desktop
+share/kde4/services/digikamsearch.protocol
+share/kde4/services/digikamtags.protocol
+share/kde4/servicetypes/digikamimageplugin.desktop
 share/locale/ar/LC_MESSAGES/digikam.mo
+share/locale/be/LC_MESSAGES/digikam.mo
 share/locale/bg/LC_MESSAGES/digikam.mo
-share/locale/br/LC_MESSAGES/digikam.mo
 share/locale/ca/LC_MESSAGES/digikam.mo
+share/locale/ca@valencia/LC_MESSAGES/digikam.mo
 share/locale/cs/LC_MESSAGES/digikam.mo
-share/locale/cy/LC_MESSAGES/digikam.mo
 share/locale/da/LC_MESSAGES/digikam.mo
 share/locale/de/LC_MESSAGES/digikam.mo
 share/locale/el/LC_MESSAGES/digikam.mo
 share/locale/en_GB/LC_MESSAGES/digikam.mo
+share/locale/eo/LC_MESSAGES/digikam.mo
 share/locale/es/LC_MESSAGES/digikam.mo
 share/locale/et/LC_MESSAGES/digikam.mo
+share/locale/eu/LC_MESSAGES/digikam.mo
 share/locale/fa/LC_MESSAGES/digikam.mo
 share/locale/fi/LC_MESSAGES/digikam.mo
 share/locale/fr/LC_MESSAGES/digikam.mo
+share/locale/ga/LC_MESSAGES/digikam.mo
 share/locale/gl/LC_MESSAGES/digikam.mo
 share/locale/he/LC_MESSAGES/digikam.mo
+share/locale/hi/LC_MESSAGES/digikam.mo
+share/locale/hne/LC_MESSAGES/digikam.mo
+share/locale/hr/LC_MESSAGES/digikam.mo
 share/locale/hu/LC_MESSAGES/digikam.mo
 share/locale/is/LC_MESSAGES/digikam.mo
 share/locale/it/LC_MESSAGES/digikam.mo
 share/locale/ja/LC_MESSAGES/digikam.mo
-share/locale/ka/LC_MESSAGES/digikam.mo
+share/locale/km/LC_MESSAGES/digikam.mo
+share/locale/ko/LC_MESSAGES/digikam.mo
 share/locale/lt/LC_MESSAGES/digikam.mo
-share/locale/mk/LC_MESSAGES/digikam.mo
-share/locale/ms/LC_MESSAGES/digikam.mo
-share/locale/mt/LC_MESSAGES/digikam.mo
+share/locale/lv/LC_MESSAGES/digikam.mo
 share/locale/nb/LC_MESSAGES/digikam.mo
 share/locale/nds/LC_MESSAGES/digikam.mo
+share/locale/ne/LC_MESSAGES/digikam.mo
 share/locale/nl/LC_MESSAGES/digikam.mo
 share/locale/nn/LC_MESSAGES/digikam.mo
 share/locale/pa/LC_MESSAGES/digikam.mo
@@ -736,18 +711,13 @@ share/locale/pt/LC_MESSAGES/digikam.mo
 share/locale/pt_BR/LC_MESSAGES/digikam.mo
 share/locale/ro/LC_MESSAGES/digikam.mo
 share/locale/ru/LC_MESSAGES/digikam.mo
-share/locale/rw/LC_MESSAGES/digikam.mo
+share/locale/se/LC_MESSAGES/digikam.mo
 share/locale/sk/LC_MESSAGES/digikam.mo
 share/locale/sl/LC_MESSAGES/digikam.mo
-share/locale/sr/LC_MESSAGES/digikam.mo
-share/locale/sr@Latn/LC_MESSAGES/digikam.mo
 share/locale/sv/LC_MESSAGES/digikam.mo
-share/locale/ta/LC_MESSAGES/digikam.mo
 share/locale/th/LC_MESSAGES/digikam.mo
 share/locale/tr/LC_MESSAGES/digikam.mo
 share/locale/uk/LC_MESSAGES/digikam.mo
 share/locale/vi/LC_MESSAGES/digikam.mo
 share/locale/zh_CN/LC_MESSAGES/digikam.mo
 share/locale/zh_TW/LC_MESSAGES/digikam.mo
-@pkgdir share/doc/kde/HTML/en/${HTMLDIR}-apidocs/digikam/html
-@pkgdir share/doc/kde/HTML/en/${HTMLDIR}-apidocs/digikam/digikam/html
index b232881..28a11cb 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.28 2009/07/18 20:18:12 wiz Exp $
+$NetBSD: distinfo,v 1.29 2010/02/15 14:19:30 wiz Exp $
 
-SHA1 (digikam-0.9.6.tar.bz2) = e63148a13c40e87957eeb8b17dc8047dffa2a1a5
-RMD160 (digikam-0.9.6.tar.bz2) = 3abc8d6d7dc4a95473b00eacc8800c044b110215
-Size (digikam-0.9.6.tar.bz2) = 11517637 bytes
+SHA1 (digikam-1.1.0.tar.bz2) = 5ee482ff209c0a29b898e57278d62c428b743ba5
+RMD160 (digikam-1.1.0.tar.bz2) = a4bd749adf24be7cd349e7be464cf22018d21eca
+Size (digikam-1.1.0.tar.bz2) = 15385611 bytes
diff --git a/graphics/digikam/options.mk b/graphics/digikam/options.mk
new file mode 100644 (file)
index 0000000..031f6fe
--- /dev/null
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2010/02/15 14:19:45 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.digikam
+PKG_SUPPORTED_OPTIONS= lensfun liblqr marble pim
+PKG_SUGGESTED_OPTIONS= lensfun liblqr marble pim
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlensfun)
+.include "../../graphics/lensfun/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mliblqr)
+.include "../../graphics/liblqr/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mmarble)
+.include "../../misc/kdeedu4/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpim)
+.include "../../misc/kdepimlibs4/buildlink3.mk"
+.endif
index 9a67652..9c11fe0 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/01/27 10:38:42 markd Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/15 12:14:41 wiz Exp $
 
 DISTNAME=      oxygen-icons-4.3.5
+PKGREVISION=   1
 CATEGORIES=    graphics kde
 MASTER_SITES=  ${MASTER_SITE_KDE:=4.3.5/src/}
 EXTRACT_SUFX=  .tar.bz2
@@ -8,6 +9,10 @@ EXTRACT_SUFX=  .tar.bz2
 MAINTAINER=    markd@NetBSD.org
 HOMEPAGE=      http://www.kde.org/
 COMMENT=       Oxygen icon set for the KDE integrated X11 desktop
+LICENSE=       gnu-lgpl-v3
+
+# remove on update!
+DIST_SUBDIR=   oxygen-icons-4.3.5-nokpgp
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
index f809b3d..f4df581 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/01/27 10:38:42 markd Exp $    
+@comment $NetBSD: PLIST,v 1.6 2010/02/15 12:14:41 wiz Exp $
 share/icons/oxygen/128x128/actions/address-book-new.png
 share/icons/oxygen/128x128/actions/application-exit.png
 share/icons/oxygen/128x128/actions/appointment-new.png
@@ -6,6 +6,7 @@ share/icons/oxygen/128x128/actions/bookmark-new.png
 share/icons/oxygen/128x128/actions/bookmarks-organize.png
 share/icons/oxygen/128x128/actions/configure.png
 share/icons/oxygen/128x128/actions/contact-new.png
+share/icons/oxygen/128x128/actions/continue-data-project.png
 share/icons/oxygen/128x128/actions/dashboard-show.png
 share/icons/oxygen/128x128/actions/dialog-ok-apply.png
 share/icons/oxygen/128x128/actions/dialog-ok.png
@@ -14,6 +15,7 @@ share/icons/oxygen/128x128/actions/document-preview-archive.png
 share/icons/oxygen/128x128/actions/document-preview.png
 share/icons/oxygen/128x128/actions/edit-bomb.png
 share/icons/oxygen/128x128/actions/edit-find.png
+share/icons/oxygen/128x128/actions/folder-new.png
 share/icons/oxygen/128x128/actions/go-bottom.png
 share/icons/oxygen/128x128/actions/go-down.png
 share/icons/oxygen/128x128/actions/go-first-view-page.png
@@ -65,9 +67,12 @@ share/icons/oxygen/128x128/actions/system-switch-user.png
 share/icons/oxygen/128x128/actions/tool-animator.png
 share/icons/oxygen/128x128/actions/tools-media-optical-burn-image.png
 share/icons/oxygen/128x128/actions/tools-media-optical-burn.png
+share/icons/oxygen/128x128/actions/tools-media-optical-copy.png
 share/icons/oxygen/128x128/actions/tools-media-optical-erase.png
 share/icons/oxygen/128x128/actions/tools-media-optical-format.png
 share/icons/oxygen/128x128/actions/tools-report-bug.png
+share/icons/oxygen/128x128/actions/tools-rip-audio-cd.png
+share/icons/oxygen/128x128/actions/tools-rip-video-cd.png
 share/icons/oxygen/128x128/actions/tools-wizard.png
 share/icons/oxygen/128x128/actions/transform-crop-and-resize.png
 share/icons/oxygen/128x128/actions/transform-move.png
@@ -91,6 +96,7 @@ share/icons/oxygen/128x128/apps/akregator.png
 share/icons/oxygen/128x128/apps/basket.png
 share/icons/oxygen/128x128/apps/bovo.png
 share/icons/oxygen/128x128/apps/charm.png
+share/icons/oxygen/128x128/apps/clock.png
 share/icons/oxygen/128x128/apps/device-notifier.png
 share/icons/oxygen/128x128/apps/digikam.png
 share/icons/oxygen/128x128/apps/esd.png
@@ -115,6 +121,7 @@ share/icons/oxygen/128x128/apps/kde.png
 share/icons/oxygen/128x128/apps/kdf.png
 share/icons/oxygen/128x128/apps/kexi.png
 share/icons/oxygen/128x128/apps/kformula.png
+share/icons/oxygen/128x128/apps/kgpg.png
 share/icons/oxygen/128x128/apps/kig.png
 share/icons/oxygen/128x128/apps/kivio.png
 share/icons/oxygen/128x128/apps/kjournal.png
@@ -127,7 +134,6 @@ share/icons/oxygen/128x128/apps/konqueror.png
 share/icons/oxygen/128x128/apps/kontact.png
 share/icons/oxygen/128x128/apps/konversation.png
 share/icons/oxygen/128x128/apps/korgac.png
-share/icons/oxygen/128x128/apps/kpgp.png
 share/icons/oxygen/128x128/apps/kplato.png
 share/icons/oxygen/128x128/apps/kpresenter.png
 share/icons/oxygen/128x128/apps/krdc.png
@@ -257,10 +263,12 @@ share/icons/oxygen/128x128/devices/media-flash-sd-mmc.png
 share/icons/oxygen/128x128/devices/media-flash-smart-media.png
 share/icons/oxygen/128x128/devices/media-flash.png
 share/icons/oxygen/128x128/devices/media-floppy.png
+share/icons/oxygen/128x128/devices/media-optica-data.png
 share/icons/oxygen/128x128/devices/media-optical-audio.png
 share/icons/oxygen/128x128/devices/media-optical-blu-ray.png
 share/icons/oxygen/128x128/devices/media-optical-dvd-video.png
 share/icons/oxygen/128x128/devices/media-optical-dvd.png
+share/icons/oxygen/128x128/devices/media-optical-mixed-cd.png
 share/icons/oxygen/128x128/devices/media-optical-recordable.png
 share/icons/oxygen/128x128/devices/media-optical-video.png
 share/icons/oxygen/128x128/devices/media-optical.png
@@ -371,6 +379,7 @@ share/icons/oxygen/128x128/mimetypes/application-x-java-applet.png
 share/icons/oxygen/128x128/mimetypes/application-x-java-archive.png
 share/icons/oxygen/128x128/mimetypes/application-x-java.png
 share/icons/oxygen/128x128/mimetypes/application-x-javascript.png
+share/icons/oxygen/128x128/mimetypes/application-x-k3b.png
 share/icons/oxygen/128x128/mimetypes/application-x-kcsrc.png
 share/icons/oxygen/128x128/mimetypes/application-x-kgetlist.png
 share/icons/oxygen/128x128/mimetypes/application-x-kontour.png
@@ -554,6 +563,7 @@ share/icons/oxygen/128x128/places/start-here-kde.png
 share/icons/oxygen/128x128/places/start-here.png
 share/icons/oxygen/128x128/places/user-desktop.png
 share/icons/oxygen/128x128/places/user-home.png
+share/icons/oxygen/128x128/places/user-identity.png
 share/icons/oxygen/128x128/places/user-trash.png
 share/icons/oxygen/128x128/status/dialog-error.png
 share/icons/oxygen/128x128/status/dialog-information.png
@@ -670,9 +680,11 @@ share/icons/oxygen/16x16/actions/document-close.png
 share/icons/oxygen/16x16/actions/document-decrypt.png
 share/icons/oxygen/16x16/actions/document-edit.png
 share/icons/oxygen/16x16/actions/document-encrypt.png
+share/icons/oxygen/16x16/actions/document-export-table.png
 share/icons/oxygen/16x16/actions/document-export.png
 share/icons/oxygen/16x16/actions/document-import.png
 share/icons/oxygen/16x16/actions/document-new.png
+share/icons/oxygen/16x16/actions/document-open-data.png
 share/icons/oxygen/16x16/actions/document-open-folder.png
 share/icons/oxygen/16x16/actions/document-open-recent.png
 share/icons/oxygen/16x16/actions/document-open-remote.png
@@ -747,6 +759,12 @@ share/icons/oxygen/16x16/actions/edit-redo.png
 share/icons/oxygen/16x16/actions/edit-rename.png
 share/icons/oxygen/16x16/actions/edit-select-all.png
 share/icons/oxygen/16x16/actions/edit-select.png
+share/icons/oxygen/16x16/actions/edit-table-delete-column.png
+share/icons/oxygen/16x16/actions/edit-table-delete-row.png
+share/icons/oxygen/16x16/actions/edit-table-insert-column-left.png
+share/icons/oxygen/16x16/actions/edit-table-insert-column-right.png
+share/icons/oxygen/16x16/actions/edit-table-insert-row-above.png
+share/icons/oxygen/16x16/actions/edit-table-insert-row-under.png
 share/icons/oxygen/16x16/actions/edit-text-frame-update.png
 share/icons/oxygen/16x16/actions/edit-undo.png
 share/icons/oxygen/16x16/actions/feed-subscribe.png
@@ -1013,6 +1031,8 @@ share/icons/oxygen/16x16/actions/tools-media-optical-copy.png
 share/icons/oxygen/16x16/actions/tools-media-optical-erase.png
 share/icons/oxygen/16x16/actions/tools-media-optical-format.png
 share/icons/oxygen/16x16/actions/tools-report-bug.png
+share/icons/oxygen/16x16/actions/tools-rip-audio-cd.png
+share/icons/oxygen/16x16/actions/tools-rip-video-cd.png
 share/icons/oxygen/16x16/actions/tools-wizard.png
 share/icons/oxygen/16x16/actions/transform-crop-and-resize.png
 share/icons/oxygen/16x16/actions/transform-crop.png
@@ -1028,6 +1048,8 @@ share/icons/oxygen/16x16/actions/user-group-delete.png
 share/icons/oxygen/16x16/actions/user-group-new.png
 share/icons/oxygen/16x16/actions/user-group-properties.png
 share/icons/oxygen/16x16/actions/user-properties.png
+share/icons/oxygen/16x16/actions/view-barcode-add.png
+share/icons/oxygen/16x16/actions/view-barcode.png
 share/icons/oxygen/16x16/actions/view-calendar-agenda.png
 share/icons/oxygen/16x16/actions/view-calendar-birthday.png
 share/icons/oxygen/16x16/actions/view-calendar-day.png
@@ -1050,8 +1072,13 @@ share/icons/oxygen/16x16/actions/view-choose.png
 share/icons/oxygen/16x16/actions/view-close.png
 share/icons/oxygen/16x16/actions/view-file-columns.png
 share/icons/oxygen/16x16/actions/view-filter.png
+share/icons/oxygen/16x16/actions/view-form-action.png
+share/icons/oxygen/16x16/actions/view-form-table.png
+share/icons/oxygen/16x16/actions/view-form.png
 share/icons/oxygen/16x16/actions/view-fullscreen.png
+share/icons/oxygen/16x16/actions/view-grid.png
 share/icons/oxygen/16x16/actions/view-history.png
+share/icons/oxygen/16x16/actions/view-ldap-resource.png
 share/icons/oxygen/16x16/actions/view-left-close.png
 share/icons/oxygen/16x16/actions/view-list-details.png
 share/icons/oxygen/16x16/actions/view-list-icons.png
@@ -1062,6 +1089,7 @@ share/icons/oxygen/16x16/actions/view-media-equalizer.png
 share/icons/oxygen/16x16/actions/view-media-lyrics.png
 share/icons/oxygen/16x16/actions/view-media-playlist.png
 share/icons/oxygen/16x16/actions/view-media-visualization.png
+share/icons/oxygen/16x16/actions/view-multiple-objects.png
 share/icons/oxygen/16x16/actions/view-object-histogram-linear.png
 share/icons/oxygen/16x16/actions/view-object-histogram-logarithmic.png
 share/icons/oxygen/16x16/actions/view-pim-calendar.png
@@ -1123,6 +1151,7 @@ share/icons/oxygen/16x16/apps/akonadi.png
 share/icons/oxygen/16x16/apps/akregator.png
 share/icons/oxygen/16x16/apps/basket.png
 share/icons/oxygen/16x16/apps/bovo.png
+share/icons/oxygen/16x16/apps/clock.png
 share/icons/oxygen/16x16/apps/digikam.png
 share/icons/oxygen/16x16/apps/esd.png
 share/icons/oxygen/16x16/apps/fontforge.png
@@ -1147,6 +1176,7 @@ share/icons/oxygen/16x16/apps/kde.png
 share/icons/oxygen/16x16/apps/kdf.png
 share/icons/oxygen/16x16/apps/kexi.png
 share/icons/oxygen/16x16/apps/kformula.png
+share/icons/oxygen/16x16/apps/kgpg.png
 share/icons/oxygen/16x16/apps/kig.png
 share/icons/oxygen/16x16/apps/kivio.png
 share/icons/oxygen/16x16/apps/kjournal.png
@@ -1159,7 +1189,6 @@ share/icons/oxygen/16x16/apps/konqueror.png
 share/icons/oxygen/16x16/apps/kontact.png
 share/icons/oxygen/16x16/apps/konversation.png
 share/icons/oxygen/16x16/apps/korgac.png
-share/icons/oxygen/16x16/apps/kpgp.png
 share/icons/oxygen/16x16/apps/kplato.png
 share/icons/oxygen/16x16/apps/kpresenter.png
 share/icons/oxygen/16x16/apps/krdc.png
@@ -1300,7 +1329,9 @@ share/icons/oxygen/16x16/devices/media-flash.png
 share/icons/oxygen/16x16/devices/media-floppy.png
 share/icons/oxygen/16x16/devices/media-optical-audio.png
 share/icons/oxygen/16x16/devices/media-optical-blu-ray.png
+share/icons/oxygen/16x16/devices/media-optical-data.png
 share/icons/oxygen/16x16/devices/media-optical-dvd.png
+share/icons/oxygen/16x16/devices/media-optical-mixed-cd.png
 share/icons/oxygen/16x16/devices/media-optical-recordable.png
 share/icons/oxygen/16x16/devices/media-optical-video.png
 share/icons/oxygen/16x16/devices/media-optical.png
@@ -1318,11 +1349,21 @@ share/icons/oxygen/16x16/devices/scanner.png
 share/icons/oxygen/16x16/devices/video-display.png
 share/icons/oxygen/16x16/devices/video-projector.png
 share/icons/oxygen/16x16/devices/video-television.png
+share/icons/oxygen/16x16/emblems/emblem-encrypted-locked.png
+share/icons/oxygen/16x16/emblems/emblem-encrypted-unlocked.png
 share/icons/oxygen/16x16/emblems/emblem-favorite.png
 share/icons/oxygen/16x16/emblems/emblem-important.png
+share/icons/oxygen/16x16/emblems/emblem-locked.png
 share/icons/oxygen/16x16/emblems/emblem-mounted.png
 share/icons/oxygen/16x16/emblems/emblem-symbolic-link.png
+share/icons/oxygen/16x16/emblems/emblem-unlocked.png
 share/icons/oxygen/16x16/emblems/emblem-unmounted.png
+share/icons/oxygen/16x16/emblems/vcs-added.png
+share/icons/oxygen/16x16/emblems/vcs-conflicting.png
+share/icons/oxygen/16x16/emblems/vcs-locally-modified.png
+share/icons/oxygen/16x16/emblems/vcs-normal.png
+share/icons/oxygen/16x16/emblems/vcs-removed.png
+share/icons/oxygen/16x16/emblems/vcs-update-required.png
 share/icons/oxygen/16x16/emotes/face-angel.png
 share/icons/oxygen/16x16/emotes/face-embarrassed.png
 share/icons/oxygen/16x16/emotes/face-kiss.png
@@ -1757,6 +1798,7 @@ share/icons/oxygen/22x22/actions/document-close.png
 share/icons/oxygen/22x22/actions/document-decrypt.png
 share/icons/oxygen/22x22/actions/document-edit.png
 share/icons/oxygen/22x22/actions/document-encrypt.png
+share/icons/oxygen/22x22/actions/document-export-table.png
 share/icons/oxygen/22x22/actions/document-export.png
 share/icons/oxygen/22x22/actions/document-import.png
 share/icons/oxygen/22x22/actions/document-new.png
@@ -1831,6 +1873,12 @@ share/icons/oxygen/22x22/actions/edit-redo.png
 share/icons/oxygen/22x22/actions/edit-rename.png
 share/icons/oxygen/22x22/actions/edit-select-all.png
 share/icons/oxygen/22x22/actions/edit-select.png
+share/icons/oxygen/22x22/actions/edit-table-delete-column.png
+share/icons/oxygen/22x22/actions/edit-table-delete-row.png
+share/icons/oxygen/22x22/actions/edit-table-insert-column-left.png
+share/icons/oxygen/22x22/actions/edit-table-insert-column-right.png
+share/icons/oxygen/22x22/actions/edit-table-insert-row-above.png
+share/icons/oxygen/22x22/actions/edit-table-insert-row-under.png
 share/icons/oxygen/22x22/actions/edit-text-frame-update.png
 share/icons/oxygen/22x22/actions/edit-undo.png
 share/icons/oxygen/22x22/actions/feed-subscribe.png
@@ -2100,6 +2148,8 @@ share/icons/oxygen/22x22/actions/tools-media-optical-copy.png
 share/icons/oxygen/22x22/actions/tools-media-optical-erase.png
 share/icons/oxygen/22x22/actions/tools-media-optical-format.png
 share/icons/oxygen/22x22/actions/tools-report-bug.png
+share/icons/oxygen/22x22/actions/tools-rip-audio-cd.png
+share/icons/oxygen/22x22/actions/tools-rip-video-cd.png
 share/icons/oxygen/22x22/actions/tools-wizard.png
 share/icons/oxygen/22x22/actions/transform-crop-and-resize.png
 share/icons/oxygen/22x22/actions/transform-crop.png
@@ -2115,6 +2165,8 @@ share/icons/oxygen/22x22/actions/user-group-delete.png
 share/icons/oxygen/22x22/actions/user-group-new.png
 share/icons/oxygen/22x22/actions/user-group-properties.png
 share/icons/oxygen/22x22/actions/user-properties.png
+share/icons/oxygen/22x22/actions/view-barcode-add.png
+share/icons/oxygen/22x22/actions/view-barcode.png
 share/icons/oxygen/22x22/actions/view-calendar-agenda.png
 share/icons/oxygen/22x22/actions/view-calendar-birthday.png
 share/icons/oxygen/22x22/actions/view-calendar-day.png
@@ -2137,8 +2189,13 @@ share/icons/oxygen/22x22/actions/view-choose.png
 share/icons/oxygen/22x22/actions/view-close.png
 share/icons/oxygen/22x22/actions/view-file-columns.png
 share/icons/oxygen/22x22/actions/view-filter.png
+share/icons/oxygen/22x22/actions/view-form-action.png
+share/icons/oxygen/22x22/actions/view-form-table.png
+share/icons/oxygen/22x22/actions/view-form.png
 share/icons/oxygen/22x22/actions/view-fullscreen.png
+share/icons/oxygen/22x22/actions/view-grid.png
 share/icons/oxygen/22x22/actions/view-history.png
+share/icons/oxygen/22x22/actions/view-ldap-resource.png
 share/icons/oxygen/22x22/actions/view-left-close.png
 share/icons/oxygen/22x22/actions/view-list-details.png
 share/icons/oxygen/22x22/actions/view-list-icons.png
@@ -2149,6 +2206,7 @@ share/icons/oxygen/22x22/actions/view-media-equalizer.png
 share/icons/oxygen/22x22/actions/view-media-lyrics.png
 share/icons/oxygen/22x22/actions/view-media-playlist.png
 share/icons/oxygen/22x22/actions/view-media-visualization.png
+share/icons/oxygen/22x22/actions/view-multiple-objects.png
 share/icons/oxygen/22x22/actions/view-object-histogram-linear.png
 share/icons/oxygen/22x22/actions/view-object-histogram-logarithmic.png
 share/icons/oxygen/22x22/actions/view-pim-calendar.png
@@ -2213,6 +2271,7 @@ share/icons/oxygen/22x22/apps/akonadi.png
 share/icons/oxygen/22x22/apps/akregator.png
 share/icons/oxygen/22x22/apps/basket.png
 share/icons/oxygen/22x22/apps/bovo.png
+share/icons/oxygen/22x22/apps/clock.png
 share/icons/oxygen/22x22/apps/digikam.png
 share/icons/oxygen/22x22/apps/esd.png
 share/icons/oxygen/22x22/apps/fontforge.png
@@ -2236,6 +2295,7 @@ share/icons/oxygen/22x22/apps/kde.png
 share/icons/oxygen/22x22/apps/kdf.png
 share/icons/oxygen/22x22/apps/kexi.png
 share/icons/oxygen/22x22/apps/kformula.png
+share/icons/oxygen/22x22/apps/kgpg.png
 share/icons/oxygen/22x22/apps/kig.png
 share/icons/oxygen/22x22/apps/kjournal.png
 share/icons/oxygen/22x22/apps/klipper.png
@@ -2246,7 +2306,6 @@ share/icons/oxygen/22x22/apps/konqueror.png
 share/icons/oxygen/22x22/apps/kontact.png
 share/icons/oxygen/22x22/apps/konversation.png
 share/icons/oxygen/22x22/apps/korgac.png
-share/icons/oxygen/22x22/apps/kpgp.png
 share/icons/oxygen/22x22/apps/kplato.png
 share/icons/oxygen/22x22/apps/kpresenter.png
 share/icons/oxygen/22x22/apps/krdc.png
@@ -2386,7 +2445,9 @@ share/icons/oxygen/22x22/devices/media-flash.png
 share/icons/oxygen/22x22/devices/media-floppy.png
 share/icons/oxygen/22x22/devices/media-optical-audio.png
 share/icons/oxygen/22x22/devices/media-optical-blu-ray.png
+share/icons/oxygen/22x22/devices/media-optical-data.png
 share/icons/oxygen/22x22/devices/media-optical-dvd.png
+share/icons/oxygen/22x22/devices/media-optical-mixed-cd.png
 share/icons/oxygen/22x22/devices/media-optical-recordable.png
 share/icons/oxygen/22x22/devices/media-optical-video.png
 share/icons/oxygen/22x22/devices/media-optical.png
@@ -2410,11 +2471,21 @@ share/icons/oxygen/22x22/devices/scanner.png
 share/icons/oxygen/22x22/devices/video-display.png
 share/icons/oxygen/22x22/devices/video-projector.png
 share/icons/oxygen/22x22/devices/video-television.png
+share/icons/oxygen/22x22/emblems/emblem-encrypted-locked.png
+share/icons/oxygen/22x22/emblems/emblem-encrypted-unlocked.png
 share/icons/oxygen/22x22/emblems/emblem-favorite.png
 share/icons/oxygen/22x22/emblems/emblem-important.png
+share/icons/oxygen/22x22/emblems/emblem-locked.png
 share/icons/oxygen/22x22/emblems/emblem-mounted.png
 share/icons/oxygen/22x22/emblems/emblem-symbolic-link.png
+share/icons/oxygen/22x22/emblems/emblem-unlocked.png
 share/icons/oxygen/22x22/emblems/emblem-unmounted.png
+share/icons/oxygen/22x22/emblems/vcs-added.png
+share/icons/oxygen/22x22/emblems/vcs-conflicting.png
+share/icons/oxygen/22x22/emblems/vcs-locally-modified.png
+share/icons/oxygen/22x22/emblems/vcs-normal.png
+share/icons/oxygen/22x22/emblems/vcs-removed.png
+share/icons/oxygen/22x22/emblems/vcs-update-required.png
 share/icons/oxygen/22x22/emotes/drink-beer.png
 share/icons/oxygen/22x22/emotes/drink-martini.png
 share/icons/oxygen/22x22/emotes/face-angel.png
@@ -2808,6 +2879,13 @@ share/icons/oxygen/22x22/status/weather-snow-scattered.png
 share/icons/oxygen/22x22/status/weather-snow.png
 share/icons/oxygen/22x22/status/weather-storm.png
 share/icons/oxygen/22x22/status/window-suppressed.png
+share/icons/oxygen/256x256/actions/continue-data-project.png
+share/icons/oxygen/256x256/actions/folder-new.png
+share/icons/oxygen/256x256/actions/tools-media-optical-copy.png
+share/icons/oxygen/256x256/actions/tools-media-optical-erase.png
+share/icons/oxygen/256x256/actions/tools-media-optical-format.png
+share/icons/oxygen/256x256/actions/tools-rip-audio-cd.png
+share/icons/oxygen/256x256/actions/tools-rip-video-cd.png
 share/icons/oxygen/256x256/apps/MameExecutor.png
 share/icons/oxygen/256x256/apps/accessories-calculator.png
 share/icons/oxygen/256x256/apps/accessories-dictionary.png
@@ -2821,11 +2899,11 @@ share/icons/oxygen/256x256/apps/kde-windows.png
 share/icons/oxygen/256x256/apps/kdf.png
 share/icons/oxygen/256x256/apps/kexi.png
 share/icons/oxygen/256x256/apps/kformula.png
+share/icons/oxygen/256x256/apps/kgpg.png
 share/icons/oxygen/256x256/apps/kig.png
 share/icons/oxygen/256x256/apps/kivio.png
 share/icons/oxygen/256x256/apps/konqueror.png
 share/icons/oxygen/256x256/apps/korgac.png
-share/icons/oxygen/256x256/apps/kpgp.png
 share/icons/oxygen/256x256/apps/kplato.png
 share/icons/oxygen/256x256/apps/kpresenter.png
 share/icons/oxygen/256x256/apps/krita.png
@@ -2856,6 +2934,13 @@ share/icons/oxygen/256x256/categories/preferences-system-network.png
 share/icons/oxygen/256x256/categories/preferences-system.png
 share/icons/oxygen/256x256/devices/audio-card.png
 share/icons/oxygen/256x256/devices/camera-photo.png
+share/icons/oxygen/256x256/devices/computer-laptop.png
+share/icons/oxygen/256x256/devices/computer.png
+share/icons/oxygen/256x256/devices/drive-harddisk.png
+share/icons/oxygen/256x256/devices/drive-optical.png
+share/icons/oxygen/256x256/devices/drive-removable-media-usb-pendrive.png
+share/icons/oxygen/256x256/devices/drive-removable-media-usb.png
+share/icons/oxygen/256x256/devices/drive-removable-media.png
 share/icons/oxygen/256x256/devices/input-keyboard.png
 share/icons/oxygen/256x256/devices/input-mouse.png
 share/icons/oxygen/256x256/devices/media-flash-memory-stick.png
@@ -2869,6 +2954,7 @@ share/icons/oxygen/256x256/devices/media-optical-data.png
 share/icons/oxygen/256x256/devices/media-optical-dvd-data.png
 share/icons/oxygen/256x256/devices/media-optical-dvd-video.png
 share/icons/oxygen/256x256/devices/media-optical-dvd.png
+share/icons/oxygen/256x256/devices/media-optical-mixed-cd.png
 share/icons/oxygen/256x256/devices/media-optical-recordable.png
 share/icons/oxygen/256x256/devices/media-optical-video.png
 share/icons/oxygen/256x256/devices/media-optical.png
@@ -2881,10 +2967,12 @@ share/icons/oxygen/256x256/devices/network-wireless-connected-75.png
 share/icons/oxygen/256x256/devices/network-wireless-disconnected.png
 share/icons/oxygen/256x256/devices/network-wireless.png
 share/icons/oxygen/256x256/devices/video-display.png
+share/icons/oxygen/256x256/mimetypes/application-javascript.png
 share/icons/oxygen/256x256/mimetypes/application-msword.png
 share/icons/oxygen/256x256/mimetypes/application-octet-stream.png
 share/icons/oxygen/256x256/mimetypes/application-pdf.png
 share/icons/oxygen/256x256/mimetypes/application-postscript.png
+share/icons/oxygen/256x256/mimetypes/application-rss+xml.png
 share/icons/oxygen/256x256/mimetypes/application-rtf.png
 share/icons/oxygen/256x256/mimetypes/application-sxw.png
 share/icons/oxygen/256x256/mimetypes/application-vnd.ms-excel.png
@@ -2899,23 +2987,46 @@ share/icons/oxygen/256x256/mimetypes/application-vnd.oasis.opendocument.presenta
 share/icons/oxygen/256x256/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
 share/icons/oxygen/256x256/mimetypes/application-vnd.oasis.opendocument.text.png
 share/icons/oxygen/256x256/mimetypes/application-vnd.scribus.png
+share/icons/oxygen/256x256/mimetypes/application-x-archive.png
 share/icons/oxygen/256x256/mimetypes/application-x-bittorrent.png
+share/icons/oxygen/256x256/mimetypes/application-x-blender.png
 share/icons/oxygen/256x256/mimetypes/application-x-bzip-compressed-tar.png
 share/icons/oxygen/256x256/mimetypes/application-x-bzip.png
 share/icons/oxygen/256x256/mimetypes/application-x-cd-image.png
+share/icons/oxygen/256x256/mimetypes/application-x-compress.png
 share/icons/oxygen/256x256/mimetypes/application-x-compressed-tar.png
 share/icons/oxygen/256x256/mimetypes/application-x-cue.png
 share/icons/oxygen/256x256/mimetypes/application-x-deb.png
 share/icons/oxygen/256x256/mimetypes/application-x-executable.png
+share/icons/oxygen/256x256/mimetypes/application-x-font-afm.png
+share/icons/oxygen/256x256/mimetypes/application-x-font-otf.png
+share/icons/oxygen/256x256/mimetypes/application-x-font-ttf.png
+share/icons/oxygen/256x256/mimetypes/application-x-font-type1.png
+share/icons/oxygen/256x256/mimetypes/application-x-gzip.png
+share/icons/oxygen/256x256/mimetypes/application-x-gzpostscript.png
+share/icons/oxygen/256x256/mimetypes/application-x-java-archive.png
+share/icons/oxygen/256x256/mimetypes/application-x-java.png
+share/icons/oxygen/256x256/mimetypes/application-x-javascript.png
+share/icons/oxygen/256x256/mimetypes/application-x-k3b.png
 share/icons/oxygen/256x256/mimetypes/application-x-kplato.png
+share/icons/oxygen/256x256/mimetypes/application-x-krita.png
 share/icons/oxygen/256x256/mimetypes/application-x-lyx.png
+share/icons/oxygen/256x256/mimetypes/application-x-mimearchive.png
 share/icons/oxygen/256x256/mimetypes/application-x-ms-dos-executable.png
+share/icons/oxygen/256x256/mimetypes/application-x-mswinurl.png
+share/icons/oxygen/256x256/mimetypes/application-x-object.png
+share/icons/oxygen/256x256/mimetypes/application-x-perl.png
 share/icons/oxygen/256x256/mimetypes/application-x-qet-element.png
 share/icons/oxygen/256x256/mimetypes/application-x-qet-project.png
 share/icons/oxygen/256x256/mimetypes/application-x-rar.png
 share/icons/oxygen/256x256/mimetypes/application-x-rpm.png
 share/icons/oxygen/256x256/mimetypes/application-x-ruby.png
+share/icons/oxygen/256x256/mimetypes/application-x-sharedlib.png
 share/icons/oxygen/256x256/mimetypes/application-x-shellscript.png
+share/icons/oxygen/256x256/mimetypes/application-x-shockwave-flash.png
+share/icons/oxygen/256x256/mimetypes/application-x-smb-server.png
+share/icons/oxygen/256x256/mimetypes/application-x-smb-workgroup.png
+share/icons/oxygen/256x256/mimetypes/application-x-subrip.png
 share/icons/oxygen/256x256/mimetypes/application-x-trash.png
 share/icons/oxygen/256x256/mimetypes/application-x-zerosize.png
 share/icons/oxygen/256x256/mimetypes/application-xhtml+xml.png
@@ -2929,21 +3040,59 @@ share/icons/oxygen/256x256/mimetypes/audio-x-flac+ogg.png
 share/icons/oxygen/256x256/mimetypes/audio-x-flac.png
 share/icons/oxygen/256x256/mimetypes/audio-x-generic.png
 share/icons/oxygen/256x256/mimetypes/audio-x-wav.png
+share/icons/oxygen/256x256/mimetypes/encrypted.png
+share/icons/oxygen/256x256/mimetypes/image-svg+xml-compressed.png
 share/icons/oxygen/256x256/mimetypes/image-svg+xml.png
+share/icons/oxygen/256x256/mimetypes/image-x-adobe-dng.png
 share/icons/oxygen/256x256/mimetypes/image-x-generic.png
 share/icons/oxygen/256x256/mimetypes/inode-directory.png
+share/icons/oxygen/256x256/mimetypes/message.png
+share/icons/oxygen/256x256/mimetypes/package-x-generic.png
+share/icons/oxygen/256x256/mimetypes/text-calendar.png
+share/icons/oxygen/256x256/mimetypes/text-css.png
+share/icons/oxygen/256x256/mimetypes/text-csv.png
 share/icons/oxygen/256x256/mimetypes/text-html.png
+share/icons/oxygen/256x256/mimetypes/text-mathml.png
 share/icons/oxygen/256x256/mimetypes/text-plain.png
+share/icons/oxygen/256x256/mimetypes/text-vnd.abc.png
+share/icons/oxygen/256x256/mimetypes/text-x-c++hdr.png
+share/icons/oxygen/256x256/mimetypes/text-x-c++src.png
+share/icons/oxygen/256x256/mimetypes/text-x-chdr.png
+share/icons/oxygen/256x256/mimetypes/text-x-csharp.png
 share/icons/oxygen/256x256/mimetypes/text-x-haskell.png
+share/icons/oxygen/256x256/mimetypes/text-x-log.png
+share/icons/oxygen/256x256/mimetypes/text-x-python.png
+share/icons/oxygen/256x256/mimetypes/text-x-tex.png
 share/icons/oxygen/256x256/mimetypes/text-xml.png
 share/icons/oxygen/256x256/mimetypes/unknown.png
 share/icons/oxygen/256x256/mimetypes/video-x-generic.png
 share/icons/oxygen/256x256/places/favorites.png
+share/icons/oxygen/256x256/places/folder-blue.png
+share/icons/oxygen/256x256/places/folder-brown.png
+share/icons/oxygen/256x256/places/folder-cyan.png
+share/icons/oxygen/256x256/places/folder-development.png
 share/icons/oxygen/256x256/places/folder-documents.png
+share/icons/oxygen/256x256/places/folder-downloads.png
 share/icons/oxygen/256x256/places/folder-favorites.png
+share/icons/oxygen/256x256/places/folder-green.png
+share/icons/oxygen/256x256/places/folder-grey.png
+share/icons/oxygen/256x256/places/folder-html.png
 share/icons/oxygen/256x256/places/folder-image.png
+share/icons/oxygen/256x256/places/folder-important.png
+share/icons/oxygen/256x256/places/folder-locked.png
+share/icons/oxygen/256x256/places/folder-orange.png
+share/icons/oxygen/256x256/places/folder-print.png
+share/icons/oxygen/256x256/places/folder-red.png
+share/icons/oxygen/256x256/places/folder-remote.png
 share/icons/oxygen/256x256/places/folder-sound.png
+share/icons/oxygen/256x256/places/folder-tar.png
+share/icons/oxygen/256x256/places/folder-txt.png
 share/icons/oxygen/256x256/places/folder-video.png
+share/icons/oxygen/256x256/places/folder-violet.png
+share/icons/oxygen/256x256/places/folder-yellow.png
+share/icons/oxygen/256x256/places/mail-folder-sent.png
+share/icons/oxygen/256x256/places/network-server.png
+share/icons/oxygen/256x256/places/network-workgroup.png
 share/icons/oxygen/256x256/places/repository.png
 share/icons/oxygen/256x256/places/server-database.png
 share/icons/oxygen/256x256/places/start-here-kde.png
@@ -3029,6 +3178,7 @@ share/icons/oxygen/32x32/actions/document-close.png
 share/icons/oxygen/32x32/actions/document-decrypt.png
 share/icons/oxygen/32x32/actions/document-edit.png
 share/icons/oxygen/32x32/actions/document-encrypt.png
+share/icons/oxygen/32x32/actions/document-export-table.png
 share/icons/oxygen/32x32/actions/document-export.png
 share/icons/oxygen/32x32/actions/document-import.png
 share/icons/oxygen/32x32/actions/document-new.png
@@ -3102,6 +3252,12 @@ share/icons/oxygen/32x32/actions/edit-redo.png
 share/icons/oxygen/32x32/actions/edit-rename.png
 share/icons/oxygen/32x32/actions/edit-select-all.png
 share/icons/oxygen/32x32/actions/edit-select.png
+share/icons/oxygen/32x32/actions/edit-table-delete-column.png
+share/icons/oxygen/32x32/actions/edit-table-delete-row.png
+share/icons/oxygen/32x32/actions/edit-table-insert-column-left.png
+share/icons/oxygen/32x32/actions/edit-table-insert-column-right.png
+share/icons/oxygen/32x32/actions/edit-table-insert-row-above.png
+share/icons/oxygen/32x32/actions/edit-table-insert-row-below.png
 share/icons/oxygen/32x32/actions/edit-text-frame-update.png
 share/icons/oxygen/32x32/actions/edit-undo.png
 share/icons/oxygen/32x32/actions/feed-subscribe.png
@@ -3356,6 +3512,8 @@ share/icons/oxygen/32x32/actions/tools-media-optical-copy.png
 share/icons/oxygen/32x32/actions/tools-media-optical-erase.png
 share/icons/oxygen/32x32/actions/tools-media-optical-format.png
 share/icons/oxygen/32x32/actions/tools-report-bug.png
+share/icons/oxygen/32x32/actions/tools-rip-audio-cd.png
+share/icons/oxygen/32x32/actions/tools-rip-video-cd.png
 share/icons/oxygen/32x32/actions/tools-wizard.png
 share/icons/oxygen/32x32/actions/transform-crop-and-resize.png
 share/icons/oxygen/32x32/actions/transform-crop.png
@@ -3372,6 +3530,8 @@ share/icons/oxygen/32x32/actions/user-group-delete.png
 share/icons/oxygen/32x32/actions/user-group-new.png
 share/icons/oxygen/32x32/actions/user-group-properties.png
 share/icons/oxygen/32x32/actions/user-properties.png
+share/icons/oxygen/32x32/actions/view-barcode-add.png
+share/icons/oxygen/32x32/actions/view-barcode.png
 share/icons/oxygen/32x32/actions/view-calendar-agenda.png
 share/icons/oxygen/32x32/actions/view-calendar-birthday.png
 share/icons/oxygen/32x32/actions/view-calendar-day.png
@@ -3394,8 +3554,13 @@ share/icons/oxygen/32x32/actions/view-choose.png
 share/icons/oxygen/32x32/actions/view-close.png
 share/icons/oxygen/32x32/actions/view-file-columns.png
 share/icons/oxygen/32x32/actions/view-filter.png
+share/icons/oxygen/32x32/actions/view-form-action.png
+share/icons/oxygen/32x32/actions/view-form-table.png
+share/icons/oxygen/32x32/actions/view-form.png
 share/icons/oxygen/32x32/actions/view-fullscreen.png
+share/icons/oxygen/32x32/actions/view-grid.png
 share/icons/oxygen/32x32/actions/view-history.png
+share/icons/oxygen/32x32/actions/view-ldap-resource.png
 share/icons/oxygen/32x32/actions/view-left-close.png
 share/icons/oxygen/32x32/actions/view-list-details.png
 share/icons/oxygen/32x32/actions/view-list-icons.png
@@ -3406,6 +3571,7 @@ share/icons/oxygen/32x32/actions/view-media-equalizer.png
 share/icons/oxygen/32x32/actions/view-media-lyrics.png
 share/icons/oxygen/32x32/actions/view-media-playlist.png
 share/icons/oxygen/32x32/actions/view-media-visualization.png
+share/icons/oxygen/32x32/actions/view-multiple-objects.png
 share/icons/oxygen/32x32/actions/view-object-histogram-linear.png
 share/icons/oxygen/32x32/actions/view-object-histogram-logarithmic.png
 share/icons/oxygen/32x32/actions/view-pim-calendar.png
@@ -3469,6 +3635,7 @@ share/icons/oxygen/32x32/apps/akregator.png
 share/icons/oxygen/32x32/apps/application-sxw.png
 share/icons/oxygen/32x32/apps/basket.png
 share/icons/oxygen/32x32/apps/bovo.png
+share/icons/oxygen/32x32/apps/clock.png
 share/icons/oxygen/32x32/apps/device-notifier.png
 share/icons/oxygen/32x32/apps/digikam.png
 share/icons/oxygen/32x32/apps/esd.png
@@ -3494,6 +3661,7 @@ share/icons/oxygen/32x32/apps/kde.png
 share/icons/oxygen/32x32/apps/kdf.png
 share/icons/oxygen/32x32/apps/kexi.png
 share/icons/oxygen/32x32/apps/kformula.png
+share/icons/oxygen/32x32/apps/kgpg.png
 share/icons/oxygen/32x32/apps/kig.png
 share/icons/oxygen/32x32/apps/kivio.png
 share/icons/oxygen/32x32/apps/kjournal.png
@@ -3506,7 +3674,6 @@ share/icons/oxygen/32x32/apps/konqueror.png
 share/icons/oxygen/32x32/apps/kontact.png
 share/icons/oxygen/32x32/apps/konversation.png
 share/icons/oxygen/32x32/apps/korgac.png
-share/icons/oxygen/32x32/apps/kpgp.png
 share/icons/oxygen/32x32/apps/kplato.png
 share/icons/oxygen/32x32/apps/kpresenter.png
 share/icons/oxygen/32x32/apps/krdc.png
@@ -3647,7 +3814,10 @@ share/icons/oxygen/32x32/devices/media-flash.png
 share/icons/oxygen/32x32/devices/media-floppy.png
 share/icons/oxygen/32x32/devices/media-optical-audio.png
 share/icons/oxygen/32x32/devices/media-optical-blu-ray.png
+share/icons/oxygen/32x32/devices/media-optical-data.png
+share/icons/oxygen/32x32/devices/media-optical-dvd-video.png
 share/icons/oxygen/32x32/devices/media-optical-dvd.png
+share/icons/oxygen/32x32/devices/media-optical-mixed-cd.png
 share/icons/oxygen/32x32/devices/media-optical-recordable.png
 share/icons/oxygen/32x32/devices/media-optical-video.png
 share/icons/oxygen/32x32/devices/media-optical.png
@@ -3671,10 +3841,21 @@ share/icons/oxygen/32x32/devices/scanner.png
 share/icons/oxygen/32x32/devices/video-display.png
 share/icons/oxygen/32x32/devices/video-projector.png
 share/icons/oxygen/32x32/devices/video-television.png
+share/icons/oxygen/32x32/emblems/emblem-encrypted-locked.png
+share/icons/oxygen/32x32/emblems/emblem-encrypted-unlocked.png
 share/icons/oxygen/32x32/emblems/emblem-favorite.png
 share/icons/oxygen/32x32/emblems/emblem-important.png
+share/icons/oxygen/32x32/emblems/emblem-locked.png
 share/icons/oxygen/32x32/emblems/emblem-mounted.png
 share/icons/oxygen/32x32/emblems/emblem-symbolic-link.png
+share/icons/oxygen/32x32/emblems/emblem-unlocked.png
+share/icons/oxygen/32x32/emblems/emblem-unmounted.png
+share/icons/oxygen/32x32/emblems/vcs-added.png
+share/icons/oxygen/32x32/emblems/vcs-conflicting.png
+share/icons/oxygen/32x32/emblems/vcs-locally-modified.png
+share/icons/oxygen/32x32/emblems/vcs-normal.png
+share/icons/oxygen/32x32/emblems/vcs-removed.png
+share/icons/oxygen/32x32/emblems/vcs-update-required.png
 share/icons/oxygen/32x32/emotes/face-angel.png
 share/icons/oxygen/32x32/emotes/face-embarrassed.png
 share/icons/oxygen/32x32/emotes/face-kiss.png
@@ -3761,6 +3942,7 @@ share/icons/oxygen/32x32/mimetypes/application-x-java-applet.png
 share/icons/oxygen/32x32/mimetypes/application-x-java-archive.png
 share/icons/oxygen/32x32/mimetypes/application-x-java.png
 share/icons/oxygen/32x32/mimetypes/application-x-javascript.png
+share/icons/oxygen/32x32/mimetypes/application-x-k3b.png
 share/icons/oxygen/32x32/mimetypes/application-x-kcsrc.png
 share/icons/oxygen/32x32/mimetypes/application-x-kgetlist.png
 share/icons/oxygen/32x32/mimetypes/application-x-kontour.png
@@ -4090,6 +4272,7 @@ share/icons/oxygen/48x48/actions/document-close.png
 share/icons/oxygen/48x48/actions/document-decrypt.png
 share/icons/oxygen/48x48/actions/document-edit.png
 share/icons/oxygen/48x48/actions/document-encrypt.png
+share/icons/oxygen/48x48/actions/document-export-table.png
 share/icons/oxygen/48x48/actions/document-export.png
 share/icons/oxygen/48x48/actions/document-import.png
 share/icons/oxygen/48x48/actions/document-new.png
@@ -4152,6 +4335,12 @@ share/icons/oxygen/48x48/actions/edit-redo.png
 share/icons/oxygen/48x48/actions/edit-rename.png
 share/icons/oxygen/48x48/actions/edit-select-all.png
 share/icons/oxygen/48x48/actions/edit-select.png
+share/icons/oxygen/48x48/actions/edit-table-delete-column.png
+share/icons/oxygen/48x48/actions/edit-table-delete-row.png
+share/icons/oxygen/48x48/actions/edit-table-insert-column-left.png
+share/icons/oxygen/48x48/actions/edit-table-insert-column-right.png
+share/icons/oxygen/48x48/actions/edit-table-insert-row-above.png
+share/icons/oxygen/48x48/actions/edit-table-insert-row-below.png
 share/icons/oxygen/48x48/actions/edit-text-frame-update.png
 share/icons/oxygen/48x48/actions/edit-undo.png
 share/icons/oxygen/48x48/actions/feed-subscribe.png
@@ -4396,6 +4585,8 @@ share/icons/oxygen/48x48/actions/tools-media-optical-copy.png
 share/icons/oxygen/48x48/actions/tools-media-optical-erase.png
 share/icons/oxygen/48x48/actions/tools-media-optical-format.png
 share/icons/oxygen/48x48/actions/tools-report-bug.png
+share/icons/oxygen/48x48/actions/tools-rip-audio-cd.png
+share/icons/oxygen/48x48/actions/tools-rip-video-cd.png
 share/icons/oxygen/48x48/actions/tools-wizard.png
 share/icons/oxygen/48x48/actions/transform-crop-and-resize.png
 share/icons/oxygen/48x48/actions/transform-crop.png
@@ -4411,6 +4602,8 @@ share/icons/oxygen/48x48/actions/user-group-delete.png
 share/icons/oxygen/48x48/actions/user-group-new.png
 share/icons/oxygen/48x48/actions/user-group-properties.png
 share/icons/oxygen/48x48/actions/user-properties.png
+share/icons/oxygen/48x48/actions/view-barcode-add.png
+share/icons/oxygen/48x48/actions/view-barcode.png
 share/icons/oxygen/48x48/actions/view-calendar-agenda.png
 share/icons/oxygen/48x48/actions/view-calendar-birthday.png
 share/icons/oxygen/48x48/actions/view-calendar-day.png
@@ -4433,8 +4626,13 @@ share/icons/oxygen/48x48/actions/view-choose.png
 share/icons/oxygen/48x48/actions/view-close.png
 share/icons/oxygen/48x48/actions/view-file-columns.png
 share/icons/oxygen/48x48/actions/view-filter.png
+share/icons/oxygen/48x48/actions/view-form-action.png
+share/icons/oxygen/48x48/actions/view-form-table.png
+share/icons/oxygen/48x48/actions/view-form.png
 share/icons/oxygen/48x48/actions/view-fullscreen.png
+share/icons/oxygen/48x48/actions/view-grid.png
 share/icons/oxygen/48x48/actions/view-history.png
+share/icons/oxygen/48x48/actions/view-ldap-resource.png
 share/icons/oxygen/48x48/actions/view-left-close.png
 share/icons/oxygen/48x48/actions/view-list-details.png
 share/icons/oxygen/48x48/actions/view-list-text.png
@@ -4444,6 +4642,7 @@ share/icons/oxygen/48x48/actions/view-media-equalizer.png
 share/icons/oxygen/48x48/actions/view-media-lyrics.png
 share/icons/oxygen/48x48/actions/view-media-playlist.png
 share/icons/oxygen/48x48/actions/view-media-visualization.png
+share/icons/oxygen/48x48/actions/view-multiple-objects.png
 share/icons/oxygen/48x48/actions/view-pim-calendar.png
 share/icons/oxygen/48x48/actions/view-pim-contacts.png
 share/icons/oxygen/48x48/actions/view-pim-journal.png
@@ -4505,6 +4704,7 @@ share/icons/oxygen/48x48/apps/akonadi.png
 share/icons/oxygen/48x48/apps/akregator.png
 share/icons/oxygen/48x48/apps/basket.png
 share/icons/oxygen/48x48/apps/bovo.png
+share/icons/oxygen/48x48/apps/clock.png
 share/icons/oxygen/48x48/apps/digikam.png
 share/icons/oxygen/48x48/apps/esd.png
 share/icons/oxygen/48x48/apps/fontforge.png
@@ -4529,6 +4729,7 @@ share/icons/oxygen/48x48/apps/kde.png
 share/icons/oxygen/48x48/apps/kdf.png
 share/icons/oxygen/48x48/apps/kexi.png
 share/icons/oxygen/48x48/apps/kformula.png
+share/icons/oxygen/48x48/apps/kgpg.png
 share/icons/oxygen/48x48/apps/kig.png
 share/icons/oxygen/48x48/apps/kivio.png
 share/icons/oxygen/48x48/apps/kjournal.png
@@ -4541,7 +4742,6 @@ share/icons/oxygen/48x48/apps/konqueror.png
 share/icons/oxygen/48x48/apps/kontact.png
 share/icons/oxygen/48x48/apps/konversation.png
 share/icons/oxygen/48x48/apps/korgac.png
-share/icons/oxygen/48x48/apps/kpgp.png
 share/icons/oxygen/48x48/apps/kplato.png
 share/icons/oxygen/48x48/apps/kpresenter.png
 share/icons/oxygen/48x48/apps/krdc.png
@@ -4682,7 +4882,10 @@ share/icons/oxygen/48x48/devices/media-flash.png
 share/icons/oxygen/48x48/devices/media-floppy.png
 share/icons/oxygen/48x48/devices/media-optical-audio.png
 share/icons/oxygen/48x48/devices/media-optical-blu-ray.png
+share/icons/oxygen/48x48/devices/media-optical-data.png
+share/icons/oxygen/48x48/devices/media-optical-dvd-video.png
 share/icons/oxygen/48x48/devices/media-optical-dvd.png
+share/icons/oxygen/48x48/devices/media-optical-mixed-cd.png
 share/icons/oxygen/48x48/devices/media-optical-recordable.png
 share/icons/oxygen/48x48/devices/media-optical-video.png
 share/icons/oxygen/48x48/devices/media-optical.png
@@ -4797,6 +5000,7 @@ share/icons/oxygen/48x48/mimetypes/application-x-java-applet.png
 share/icons/oxygen/48x48/mimetypes/application-x-java-archive.png
 share/icons/oxygen/48x48/mimetypes/application-x-java.png
 share/icons/oxygen/48x48/mimetypes/application-x-javascript.png
+share/icons/oxygen/48x48/mimetypes/application-x-k3b.png
 share/icons/oxygen/48x48/mimetypes/application-x-kcsrc.png
 share/icons/oxygen/48x48/mimetypes/application-x-kgetlist.png
 share/icons/oxygen/48x48/mimetypes/application-x-kontour.png
@@ -5066,6 +5270,7 @@ share/icons/oxygen/64x64/actions/bookmark-new.png
 share/icons/oxygen/64x64/actions/bookmarks-organize.png
 share/icons/oxygen/64x64/actions/configure.png
 share/icons/oxygen/64x64/actions/contact-new.png
+share/icons/oxygen/64x64/actions/continue-data-project.png
 share/icons/oxygen/64x64/actions/dashboard-show.png
 share/icons/oxygen/64x64/actions/dialog-ok-apply.png
 share/icons/oxygen/64x64/actions/dialog-ok.png
@@ -5074,6 +5279,7 @@ share/icons/oxygen/64x64/actions/document-preview-archive.png
 share/icons/oxygen/64x64/actions/document-preview.png
 share/icons/oxygen/64x64/actions/edit-bomb.png
 share/icons/oxygen/64x64/actions/edit-find.png
+share/icons/oxygen/64x64/actions/folder-new.png
 share/icons/oxygen/64x64/actions/go-bottom.png
 share/icons/oxygen/64x64/actions/go-down.png
 share/icons/oxygen/64x64/actions/go-first-view-page.png
@@ -5128,6 +5334,8 @@ share/icons/oxygen/64x64/actions/tools-media-optical-burn.png
 share/icons/oxygen/64x64/actions/tools-media-optical-erase.png
 share/icons/oxygen/64x64/actions/tools-media-optical-format.png
 share/icons/oxygen/64x64/actions/tools-report-bug.png
+share/icons/oxygen/64x64/actions/tools-rip-audio-cd.png
+share/icons/oxygen/64x64/actions/tools-rip-video-cd.png
 share/icons/oxygen/64x64/actions/tools-wizard.png
 share/icons/oxygen/64x64/actions/transform-crop-and-resize.png
 share/icons/oxygen/64x64/actions/transform-move.png
@@ -5151,6 +5359,8 @@ share/icons/oxygen/64x64/apps/akonadi.png
 share/icons/oxygen/64x64/apps/akregator.png
 share/icons/oxygen/64x64/apps/basket.png
 share/icons/oxygen/64x64/apps/bovo.png
+share/icons/oxygen/64x64/apps/charm.png
+share/icons/oxygen/64x64/apps/clock.png
 share/icons/oxygen/64x64/apps/digikam.png
 share/icons/oxygen/64x64/apps/esd.png
 share/icons/oxygen/64x64/apps/fontforge.png
@@ -5174,6 +5384,7 @@ share/icons/oxygen/64x64/apps/kde.png
 share/icons/oxygen/64x64/apps/kdf.png
 share/icons/oxygen/64x64/apps/kexi.png
 share/icons/oxygen/64x64/apps/kformula.png
+share/icons/oxygen/64x64/apps/kgpg.png
 share/icons/oxygen/64x64/apps/kig.png
 share/icons/oxygen/64x64/apps/kivio.png
 share/icons/oxygen/64x64/apps/kjournal.png
@@ -5186,7 +5397,6 @@ share/icons/oxygen/64x64/apps/konqueror.png
 share/icons/oxygen/64x64/apps/kontact.png
 share/icons/oxygen/64x64/apps/konversation.png
 share/icons/oxygen/64x64/apps/korgac.png
-share/icons/oxygen/64x64/apps/kpgp.png
 share/icons/oxygen/64x64/apps/kplato.png
 share/icons/oxygen/64x64/apps/kpresenter.png
 share/icons/oxygen/64x64/apps/krdc.png
@@ -5314,7 +5524,9 @@ share/icons/oxygen/64x64/devices/media-flash.png
 share/icons/oxygen/64x64/devices/media-floppy.png
 share/icons/oxygen/64x64/devices/media-optical-audio.png
 share/icons/oxygen/64x64/devices/media-optical-blu-ray.png
+share/icons/oxygen/64x64/devices/media-optical-dvd-video.png
 share/icons/oxygen/64x64/devices/media-optical-dvd.png
+share/icons/oxygen/64x64/devices/media-optical-mixed-cd.png
 share/icons/oxygen/64x64/devices/media-optical-recordable.png
 share/icons/oxygen/64x64/devices/media-optical-video.png
 share/icons/oxygen/64x64/devices/media-optical.png
@@ -5426,6 +5638,7 @@ share/icons/oxygen/64x64/mimetypes/application-x-java-applet.png
 share/icons/oxygen/64x64/mimetypes/application-x-java-archive.png
 share/icons/oxygen/64x64/mimetypes/application-x-java.png
 share/icons/oxygen/64x64/mimetypes/application-x-javascript.png
+share/icons/oxygen/64x64/mimetypes/application-x-k3b.png
 share/icons/oxygen/64x64/mimetypes/application-x-kcsrc.png
 share/icons/oxygen/64x64/mimetypes/application-x-kgetlist.png
 share/icons/oxygen/64x64/mimetypes/application-x-kontour.png
@@ -5609,6 +5822,7 @@ share/icons/oxygen/64x64/places/start-here-kde.png
 share/icons/oxygen/64x64/places/start-here.png
 share/icons/oxygen/64x64/places/user-desktop.png
 share/icons/oxygen/64x64/places/user-home.png
+share/icons/oxygen/64x64/places/user-identity.png
 share/icons/oxygen/64x64/places/user-trash.png
 share/icons/oxygen/64x64/status/dialog-error.png
 share/icons/oxygen/64x64/status/dialog-information.png
@@ -5652,9 +5866,13 @@ share/icons/oxygen/64x64/status/weather-snow.png
 share/icons/oxygen/64x64/status/weather-storm-day.png
 share/icons/oxygen/64x64/status/weather-storm-night.png
 share/icons/oxygen/64x64/status/weather-storm.png
+share/icons/oxygen/8x8/emblems/emblem-encrypted-locked.png
+share/icons/oxygen/8x8/emblems/emblem-encrypted-unlocked.png
 share/icons/oxygen/8x8/emblems/emblem-important.png
 share/icons/oxygen/8x8/emblems/emblem-link.png
+share/icons/oxygen/8x8/emblems/emblem-locked.png
 share/icons/oxygen/8x8/emblems/emblem-mounted.png
+share/icons/oxygen/8x8/emblems/emblem-unlocked.png
 share/icons/oxygen/8x8/emblems/emblem-unmounted.png
 share/icons/oxygen/8x8/emblems/vcs-added.png
 share/icons/oxygen/8x8/emblems/vcs-conflicting.png
index f44ebb0..bcddfb9 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2010/01/27 10:38:42 markd Exp $
+$NetBSD: distinfo,v 1.6 2010/02/15 12:14:41 wiz Exp $
 
-SHA1 (oxygen-icons-4.3.5.tar.bz2) = f705ad86685f51ab4214381bff3fd2f33c9dd80a
-RMD160 (oxygen-icons-4.3.5.tar.bz2) = dc6f36ba68d6d84e7b0cff8a081b491d8bdc3f39
-Size (oxygen-icons-4.3.5.tar.bz2) = 125785026 bytes
+SHA1 (oxygen-icons-4.3.5-nokpgp/oxygen-icons-4.3.5.tar.bz2) = 9cc70eeb8e6796bab36b6222ada7248a38979e9e
+RMD160 (oxygen-icons-4.3.5-nokpgp/oxygen-icons-4.3.5.tar.bz2) = 4353dbb2bb4d4afdf8a63843289cff87d06fd2e8
+Size (oxygen-icons-4.3.5-nokpgp/oxygen-icons-4.3.5.tar.bz2) = 124506101 bytes
index d107f44..dc27a8b 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/08 22:43:23 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/15 14:00:01 joerg Exp $
 #
 
 PKGNAME=       ja-FreeWnn-dict-1.10
@@ -11,6 +11,8 @@ COMMENT=      Japanese/Chinese/Korean input method (Japanese dictionary)
 
 BUILD_DEPENDS+=        ja-FreeWnn-server-bin>=1.10nb1:../../inputmethod/ja-freewnn-server-bin
 
+MAKE_JOBS_SAFE=        no
+
 WNNDIR=                Wnn
 WNN_TARGET=    DICT
 WNN_LANG=      ja_JP
index fb566bc..7e6ee81 100644 (file)
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2008/11/10 17:21:36 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/15 13:41:17 obache Exp $
 
-DISTNAME=      kinput2-v3
-PKGNAME=       kinput2-3.0
-PKGREVISION=   3
+DISTNAME=      kinput2-v3.1
+PKGNAME=       kinput2-3.1
 CATEGORIES=    japanese inputmethod
-MASTER_SITES=  ftp://ftp.sra.co.jp/pub/x11/kinput2/version-3/
+MASTER_SITES=  ftp://ftp.sra.co.jp/pub/x11/kinput2/
 
 MAINTAINER=    tech-pkg-ja@jp.NetBSD.org
 COMMENT=       Input server of Japanese text
index cbd39d2..18bf188 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/01/09 11:50:36 obache Exp $
+$NetBSD: distinfo,v 1.5 2010/02/15 13:41:17 obache Exp $
 
-SHA1 (kinput2-v3.tar.gz) = a9e2be1fe4da4c5f4921a1d753f58d20f1ef3693
-RMD160 (kinput2-v3.tar.gz) = 8c8a72a693edc52882be392ef91e7ad9a5c2a7e6
-Size (kinput2-v3.tar.gz) = 462281 bytes
-SHA1 (patch-aa) = c41b2baa5de117c031c266afbff0e947340ab708
-SHA1 (patch-ab) = b2372ee1f50cc828eae4e8c6ca6d7bc6de11964b
-SHA1 (patch-ac) = 318e4fd8404bc19080f6879a2895ba36aca89c15
+SHA1 (kinput2-v3.1.tar.gz) = 48050f70e7c0cc67193ea260f8d7f6e822a02ca3
+RMD160 (kinput2-v3.1.tar.gz) = c56684769859bbee5f8238cd1af061796ff931e8
+Size (kinput2-v3.1.tar.gz) = 512177 bytes
+SHA1 (patch-aa) = debe271517550c47610a7ac128432e6e567fb6d7
+SHA1 (patch-ab) = a084421f399e753f25040fd0cba6d43a391fc15b
+SHA1 (patch-ac) = cd71af4a86102c1aedb84f64cda29ad5df2b7789
index a0e2600..ee3db7c 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/01 18:58:39 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2010/02/15 13:41:17 obache Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kinput2
 PKG_OPTIONS_NONEMPTY_SETS=     inputmethod
@@ -29,7 +29,7 @@ PLIST_SRC+=   ${PKGDIR}/PLIST-freewnn
 .endif
 
 .if !empty(PKG_OPTIONS:Msj3)
-.include "../../inputmethod/sj3-lib/buildlink3.mk"
+.include "../../inputmethod/sj3-client/buildlink3.mk"
 KINPUT2_DEFS+= -DUseSj3
 KINPUT2_DEFS+= -Dport_SJ3SRC=${BUILDLINK_PREFIX.sj3-lib}/include
 KINPUT2_DEFS+= -Dport_SJ3LIB="${LDFLAGS} -lsj3lib"
index 5985597..a8fa31c 100644 (file)
@@ -1,10 +1,12 @@
-$NetBSD: patch-aa,v 1.1 2002/05/31 13:01:26 seb Exp $
+$NetBSD: patch-aa,v 1.2 2010/02/15 13:41:18 obache Exp $
 
---- include/wnnlib.h.orig      Thu May 27 08:55:22 1999
-+++ include/wnnlib.h   Fri Sep  3 09:34:09 1999
-@@ -29,4 +29,5 @@
+--- include/wnnlib.h.orig      2002-10-03 09:35:27.000000000 +0000
++++ include/wnnlib.h
+@@ -28,6 +28,7 @@
+ #ifndef _wnnlib_h
  #define _wnnlib_h
  
 +#include      <config.h>
  #include      <commonhd.h>
  #include      <jllib.h>
+ #include      <wnnerror.h>
index 026ead3..319772f 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2004/09/18 07:59:57 uebayasi Exp $
+$NetBSD: patch-ab,v 1.2 2010/02/15 13:41:18 obache Exp $
 
---- sj3def/Imakefile.orig      1999-05-27 08:55:31.000000000 +0900
+--- sj3def/Imakefile.orig      2002-10-03 09:35:31.000000000 +0000
 +++ sj3def/Imakefile
 @@ -24,7 +24,7 @@ SjdefTarget(sjrc)
  SjdefTarget(sjrk)
index bc0e2bc..2e77a16 100644 (file)
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2010/01/09 11:50:36 obache Exp $
+$NetBSD: patch-ac,v 1.2 2010/02/15 13:41:18 obache Exp $
 
 Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
 
---- lib/cconv.c.orig   1999-05-26 23:55:25.000000000 +0000
+--- lib/cconv.c.orig   2002-10-03 09:35:28.000000000 +0000
 +++ lib/cconv.c
-@@ -767,7 +767,7 @@ static wchar *promptsave(wchar *);
+@@ -790,7 +790,7 @@ static wchar *promptsave(wchar *);
  static int parseLine(uchar *, uchar **, int);
  static FILE *openfile(char *);
  static int doinclude(uchar *, Files *, void (*)());
@@ -13,7 +13,7 @@ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
  static int readRuleFile(ccRule, char *);
  static int registMode(ccRule, int, uchar **);
  static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
-@@ -1012,8 +1012,8 @@ void (*efunc)();
+@@ -1035,8 +1035,8 @@ void (*efunc)();
        return 0;
  }
  
@@ -24,7 +24,7 @@ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
  uchar *line;
  int linesize;
  Files *files;
-@@ -1077,7 +1077,7 @@ char *file;
+@@ -1100,7 +1100,7 @@ char *file;
        rule->nmode = 0;
        rule->initialmode = -1;
  
@@ -33,7 +33,7 @@ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008.
                (void)Strcpy(tmp, line);
                if ((argc = parseLine(tmp, argv, 20)) == 0)
                        continue;
-@@ -1246,7 +1246,7 @@ uchar **av;
+@@ -1269,7 +1269,7 @@ uchar **av;
        cdbuf.cdbuf = NULL;
  
        /* \e$B%k!<%k$rFI$s$G%9%H%"$9$k\e(B */
diff --git a/inputmethod/sj3-client/DESCR b/inputmethod/sj3-client/DESCR
new file mode 100644 (file)
index 0000000..a87b65e
--- /dev/null
@@ -0,0 +1,3 @@
+SJ3 is is a Japanese input system developed by Sony Corporation.
+
+This package contains the Kana-Kanji conversion library and client utilities.
diff --git a/inputmethod/sj3-client/Makefile b/inputmethod/sj3-client/Makefile
new file mode 100644 (file)
index 0000000..11df0cc
--- /dev/null
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2010/02/15 13:35:21 obache Exp $
+#
+
+.include "../../inputmethod/sj3/Makefile.common"
+
+PKGNAME=       ${DISTNAME:S/sj3-/sj3-client-/}
+
+COMMENT=       SJ3 Japanese input method client & library
+
+CONFLICTS=     sj3-lib-[0-9]* sj3-server-bin-[0-9]*
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+CONFIGURE_ARGS+=       --enable-client
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/sj3-client/PLIST b/inputmethod/sj3-client/PLIST
new file mode 100644 (file)
index 0000000..467c862
--- /dev/null
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2010/02/15 13:35:21 obache Exp $
+bin/sj3dic
+bin/sj3stat
+include/sj3lib.h
+lib/libsj3lib.la
+lib/pkgconfig/sj3lib.pc
+man/man1/sj3dic.1
+share/doc/sj3/Nihongo.ps
+share/doc/sj3/sj3lib.ms
diff --git a/inputmethod/sj3-client/buildlink3.mk b/inputmethod/sj3-client/buildlink3.mk
new file mode 100644 (file)
index 0000000..64ba48c
--- /dev/null
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2010/02/15 13:35:21 obache Exp $
+#
+
+BUILDLINK_TREE+=       sj3-client
+
+.if !defined(SJ3_CLIENT_BUILDLINK3_MK)
+SJ3_CLIENT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.sj3-client+=     sj3-client>=2.0.1.23
+BUILDLINK_PKGSRCDIR.sj3-client?=       ../../inputmethod/sj3-client
+.endif # SJ3_CLIENT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -sj3-client
diff --git a/inputmethod/sj3-dict/DESCR b/inputmethod/sj3-dict/DESCR
deleted file mode 100644 (file)
index f781437..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-SJ3 is a Japanese input method developed by Sony Corporation.  SJ3 is
-composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji
-conversion client for terminals (sj3) and Kana-Kanji conversion library
-(sj3lib).
-
-This package contains the Kana-Kanji dictionary file.
diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile
deleted file mode 100644 (file)
index d5f4dc8..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2008/03/04 15:55:14 jlam Exp $
-#
-
-DISTNAME=      sj3-2.0.1.20
-PKGNAME=       sj3-dict-2.0.1.20
-PKGREVISION=   3
-CATEGORIES=    japanese inputmethod
-MASTER_SITES=  ftp://ftp.sony.co.jp/pub/unsupported/src/       \
-               ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
-
-MAINTAINER=    tech-pkg-ja@jp.NetBSD.org
-COMMENT=       SJ3 Japanese input method dictionary
-
-BUILD_DEPENDS+=        sj3-server-bin>=2.0.1.20nb1:../../inputmethod/sj3-server-bin
-
-FILESDIR=      ${.CURDIR}/../sj3-lib/files
-DISTINFO_FILE= ${.CURDIR}/../sj3-lib/distinfo
-PATCHDIR=      ${.CURDIR}/../sj3-lib/patches
-
-PKG_DESTDIR_SUPPORT=   user-destdir
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_TOOLS+=    itools
-USE_IMAKE=     yes
-MAKE_ENV+=     SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
-               IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
-FILES_SUBST+=  SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} IMDICTDIR=${IMDICTDIR}
-EVAL_PREFIX+=  SJ3SERVERBINDIR=sj3-server-bin
-
-CONFIGURE_DIRS+=       dict/dict
-
-SJ3OWNER?=     daemon
-SJ3GROUP?=     daemon
-
-INSTALLATION_DIRS=     ${PREFIX}/libdata
-
-pre-configure:
-       @${CHMOD} +w ${WRKSRC}/dict/dict/Imakefile*
-       @${MV} ${WRKSRC}/dict/dict/Imakefile ${WRKSRC}/dict/dict/Imakefile.orig
-       @${SED} -e 's|$$(TOOL_DIR)/|${SJ3SERVERBINDIR}/bin/|' \
-               ${WRKSRC}/dict/dict/Imakefile.orig \
-                       > ${WRKSRC}/dict/dict/Imakefile
-
-do-install:
-       ${INSTALL_DATA} ${WRKSRC}/dict/dict/sj3main.dic \
-               ${DESTDIR}${PREFIX}/libdata
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/sj3-dict/PLIST b/inputmethod/sj3-dict/PLIST
deleted file mode 100644 (file)
index c424ae0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2006/07/05 04:55:23 jlam Exp $
-libdata/sj3main.dic
diff --git a/inputmethod/sj3-lib/DESCR b/inputmethod/sj3-lib/DESCR
deleted file mode 100644 (file)
index 93fcb26..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-SJ3 is a Japanese input method developed by Sony Corporation.  SJ3 is
-composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji
-conversion client for terminals (sj3) and Kana-Kanji conversion library
-(sj3lib).
-
-This package contains the Kana-Kanji conversion library (sj3lib).
diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile
deleted file mode 100644 (file)
index b63e74e..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2010/01/09 11:37:10 obache Exp $
-
-DISTNAME=      sj3-2.0.1.20
-PKGNAME=       sj3-lib-2.0.1.20
-PKGREVISION=   3
-CATEGORIES=    japanese inputmethod
-MASTER_SITES=  ftp://ftp.sony.co.jp/pub/unsupported/src/       \
-               ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
-
-MAINTAINER=    tech-pkg-ja@jp.NetBSD.org
-COMMENT=       SJ3 Japanese input method library
-
-PKG_DESTDIR_SUPPORT=   destdir
-
-USE_TOOLS+=    itools
-USE_IMAKE=     yes
-MAKE_ENV+=     IMDICTDIR=${IMDICTDIR:Q}
-
-pre-configure:
-       @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
-       @${SED} -e 's|\(SUBDIRS = \).*\(sj3lib\).*|\1\2|'       \
-               ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/sj3-lib/PLIST b/inputmethod/sj3-lib/PLIST
deleted file mode 100644 (file)
index 7eba911..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:23:00 jlam Exp $
-include/sj3lib.h
-lib/libsj3lib.a
diff --git a/inputmethod/sj3-lib/buildlink3.mk b/inputmethod/sj3-lib/buildlink3.mk
deleted file mode 100644 (file)
index 74b8f60..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:47 joerg Exp $
-
-BUILDLINK_TREE+=       sj3-lib
-
-.if !defined(SJ3_LIB_BUILDLINK3_MK)
-SJ3_LIB_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.sj3-lib+=        sj3-lib>=2.0.1.20nb1
-BUILDLINK_PKGSRCDIR.sj3-lib?=  ../../inputmethod/sj3-lib
-BUILDLINK_DEPMETHOD.sj3-lib?=  build
-.endif # SJ3_LIB_BUILDLINK3_MK
-
-BUILDLINK_TREE+=       -sj3-lib
diff --git a/inputmethod/sj3-lib/distinfo b/inputmethod/sj3-lib/distinfo
deleted file mode 100644 (file)
index e6b68f1..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: distinfo,v 1.9 2009/10/06 17:41:49 joerg Exp $
-
-SHA1 (sj3-2.0.1.20.tar.gz) = b1cae59065ebc9caf5e198143ceb9558c932f259
-RMD160 (sj3-2.0.1.20.tar.gz) = b25f2c585485516fddf3b9168e4cb8552cd26f71
-Size (sj3-2.0.1.20.tar.gz) = 584065 bytes
-SHA1 (patch-aa) = b818996516360d1cdbef193eed5eb93fb488ef89
-SHA1 (patch-ab) = a64f78ccb3db3f4349f191abe47c6daebb2bbadd
-SHA1 (patch-ac) = a2a9c21618e7de1e56d371cb05cf866d549d50a1
-SHA1 (patch-ad) = 6f45996f04f894e28f2dd5d1276c31b3c6a7b12a
-SHA1 (patch-ae) = 3b07eb2ea9d72049a8f322220836a631598ea7dc
-SHA1 (patch-af) = 33ac72303dfa13929d423ecaf5d9b7cb308f8ff5
-SHA1 (patch-ag) = 14744940b736cee683a59a25a2bda0a2ce85d319
-SHA1 (patch-ah) = 77dd83b13facb0c99fc50ebb883591b590a2cab1
-SHA1 (patch-ai) = c29e6770c8679baa7401e20a7a0e2655382bcd7a
-SHA1 (patch-aj) = a8055ef4e06f70b344f5eadf1c2f0042e22781db
-SHA1 (patch-ak) = 3aab5f0e57212414e0ec2b5a71dd3583a1379e5c
-SHA1 (patch-al) = 330b4580fccb0cb70541376620916dc32662e378
-SHA1 (patch-am) = dd5f2b962b64969c05e3fc020ceae8bfa6e8e220
-SHA1 (patch-ao) = d260a370cafc1943f6063de8e3f6be444e3d18bc
-SHA1 (patch-ap) = a2c619a2f2fe040ba0a3b570ce34b8f72512c970
-SHA1 (patch-aq) = d24e22974b088c02bfdca75cf97d0e8d7a8d8992
-SHA1 (patch-ar) = 3cdbb095338b2052398bbc5c7cd69cd50cd46d31
-SHA1 (patch-as) = fbe7d015904f38ada14ec9ae5cc8332f725bbeac
-SHA1 (patch-at) = a00e1505af56f7b566232338ef910f899b401ac7
-SHA1 (patch-au) = 57ac169871ef5f38fb4d1fd4387fc4197419b7c6
-SHA1 (patch-av) = 6e2569b3240d09bfd57b2dcde8611e5b9ed9bf14
-SHA1 (patch-aw) = 078fa620e5fe099441dbc6fcba36a0441cc222ca
-SHA1 (patch-ax) = 3ea04cd507909c6dd6b0163230dd03b8c21fbced
-SHA1 (patch-ay) = ec24897bab84adda7873995f708eb70e1a6f03a7
-SHA1 (patch-az) = b8cbe3decf83c3b1dca10dfc674988423f3cd998
-SHA1 (patch-ba) = 773d37a4125ecf0c76aaef679a5b944a034bf4c9
-SHA1 (patch-bb) = c75a239de17f67647e3e87ff87b5f371f9614566
-SHA1 (patch-bc) = ccdacbab35ab001f57010af9fc3071eb4c42348f
-SHA1 (patch-bd) = f29a875734c17c7e6d4b51db081b58af1baf4d04
-SHA1 (patch-be) = e59571ea5d7036900f48a8df75a79de77f9a5594
diff --git a/inputmethod/sj3-lib/patches/patch-aa b/inputmethod/sj3-lib/patches/patch-aa
deleted file mode 100644 (file)
index 8a1475e..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2005/12/02 22:57:32 joerg Exp $
-
---- sj3/sj3.c.orig     2005-12-02 22:27:01.000000000 +0000
-+++ sj3/sj3.c
-@@ -38,14 +38,12 @@
- #include "sj_sysvdef.h"
- #include "wchar16.h"
- #include <signal.h>
--#include <sys/errno.h>
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
--#if defined(__NetBSD__) || defined(__bsdi__)
-+#include <errno.h>
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
- #define       USE_OLD_TTY
- #if defined(__NetBSD__)
- #define LACKOF_SETLOCALE
- #endif
--#endif
- #include <curses.h>
- #endif
-@@ -473,7 +471,7 @@ getmaster ()
-  * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v].
-  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/10
-  */
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-       struct stat     stb;
-       int             h, i, j, k1, k2;
- #else /* !__FreeBSD__ */
-@@ -492,7 +490,7 @@ getmaster ()
-  * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v].
-  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/10
-  */
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-       for (h = 0; h < 8; h++) {
-               line[k1] = "pqrsPQRS"[h];
-               line[k2] = '0';
-@@ -852,7 +850,7 @@ shellprocess ()
-       SCPYN(Utmp.ut_line, strrchr (slave_name, '/') + 1);
-       time (&Utmp.ut_time);
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
-       if (setsid() < 0)
-               perror("setsid()");
- #else
-@@ -937,7 +935,7 @@ getslave ()
-               done2 ();
-       }
- #ifndef SYSV_TERMIOS
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
-       ioctl(slave, TIOCSCTTY, NULL);
- #endif
-       ioctl (slave, TIOCSETP, (char *)&b);
-@@ -1085,7 +1083,6 @@ suspend ()
-       SELECT_FD       ifds;
-       int             nc;
-       struct timeval  t;
--      extern int      errno;
-       clear_guide_line ();
diff --git a/inputmethod/sj3-lib/patches/patch-ab b/inputmethod/sj3-lib/patches/patch-ab
deleted file mode 100644 (file)
index 6c97689..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/08/25 19:23:01 jlam Exp $
-
---- include/Const.h.orig       Thu Jan 23 12:20:52 1997
-+++ include/Const.h    Wed Dec  8 10:33:54 1999
-@@ -70,7 +70,15 @@
- #define ProtoName               "tcp"
- #define       PortNumber              "3000"
- #else
-+/*
-+ * Change the default Port number of sj3 for FreeBSD.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/20
-+ */
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#define       PortNumber              3086
-+#else /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
- #define       PortNumber              3000
-+#endif /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
- #endif
- #define       DirectryMode            0755
- #define       DictFileMode            0644
diff --git a/inputmethod/sj3-lib/patches/patch-ac b/inputmethod/sj3-lib/patches/patch-ac
deleted file mode 100644 (file)
index 3357d7d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/08/25 19:23:01 jlam Exp $
-
---- dict/dict/Imakefile.~1~    Thu Jan 23 20:20:51 1997
-+++ dict/dict/Imakefile        Tue Aug 18 10:51:14 1998
-@@ -48,7 +48,7 @@
- XCOMM INSTFLAGS       = -o $(SJ3OWNER) -g $(SJ3GROUP) -m 444
--all:          $(OBJS)
-+all::         $(OBJS)
- $(OBJS):      $(SRCS)
-               $(TOOL_DIR)/$(TOOL_NAME) $(SRCS) $(OBJS) > $(OUTPUT)
diff --git a/inputmethod/sj3-lib/patches/patch-ad b/inputmethod/sj3-lib/patches/patch-ad
deleted file mode 100644 (file)
index 4f0bef8..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/08/25 19:23:01 jlam Exp $
-
---- sj3.tmpl.orig      Thu Jan 23 20:20:58 1997
-+++ sj3.tmpl   Fri Jul 30 20:27:08 1999
-@@ -32,12 +32,12 @@
-  * $SonyDate: 1997/01/23 11:20:57 $
-  */
--SJ3TOP                = /usr/local
-+SJ3TOP                = $(PREFIX)
- SJ3BINDIR     = $(SJ3TOP)/bin
- SJ3HDRDIR     = $(SJ3TOP)/include
- SJ3LIBDIR     = $(SJ3TOP)/lib
--SJ3CONFDIR    = $(SJ3TOP)/lib/sj3
--SJ3DICTDIR    = $(SJ3CONFDIR)/dict
-+SJ3CONFDIR    = $(SJ3TOP)/share/sj3
-+SJ3DICTDIR    = $(IMDICTDIR)/sj3
- /*
-  * Change for FreeBSD.
-@@ -45,10 +45,11 @@
-  * return NULL, use it in library libxpg4 
-  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/10
-  */
-+#if 0
- #if defined(FreeBSDArchitecture)
- CODE_LIBS     = -lxpg4
--SJ3OWNER      = root
-+SJ3OWNER      = bin
- SJ3GROUP      = bin
- #else
-@@ -61,4 +62,5 @@
- SJ3GROUP      = staff
- #endif
-+#endif
- #endif
diff --git a/inputmethod/sj3-lib/patches/patch-ae b/inputmethod/sj3-lib/patches/patch-ae
deleted file mode 100644 (file)
index 4ab7f25..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/08/25 19:23:01 jlam Exp $
-
---- include/Paths.h.in.orig    Thu Jan 23 20:20:57 1997
-+++ include/Paths.h.in Tue Aug 18 11:29:00 1998
-@@ -33,7 +33,22 @@
-  * $SonyDate: 1997/01/23 11:20:55 $
-  */
--#define ErrorOutFile            "/dev/console"
-+/*
-+ * Change ErrotOutFile variable.
-+ * Because suppress a error when sj3serv start up, change to "/dev/stderr".
-+ * This error is "Cannot Open "/dev/console".". 
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/10
-+ *
-+ * Change ErrotOutFile variable.
-+ * This default value is "/dev/null" in document.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/11
-+ */
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#define       ErrorOutFile            "/dev/console"
-+#else
-+/* #define    ErrorOutFile            "/dev/stderr" */        /* for test */
-+#define       ErrorOutFile            "/dev/null"
-+#endif
- #define SocketName              "/tmp/sj3sock"
- #define LockFile                "/tmp/SJ3SERV.EXIST"
diff --git a/inputmethod/sj3-lib/patches/patch-af b/inputmethod/sj3-lib/patches/patch-af
deleted file mode 100644 (file)
index d7fa53c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.3 2002/08/25 19:23:01 jlam Exp $
-
---- server/main.c.orig Mon Mar 23 19:48:03 1998
-+++ server/main.c      Mon Aug  2 19:26:45 1999
-@@ -215,9 +215,11 @@
-       (void) setlocale(LC_CTYPE, "ja_JP.EUC");
- #endif
-       opening();
-+#ifndef __NetBSD__
-       if (setuid(geteuid())) {
-               fprintf(stderr, "error at setuid.\r\n"); exit(1);
-       }
-+#endif
-       parse_arg(argc, argv);          
-       read_runcmd();                  
diff --git a/inputmethod/sj3-lib/patches/patch-ag b/inputmethod/sj3-lib/patches/patch-ag
deleted file mode 100644 (file)
index ecb090f..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2005/09/28 18:22:11 rillig Exp $
-
-- Don't abuse an int as a pointer (optarg).
-- Consistently provide lowercase and MixedCase options.
-
---- server/setup.c.orig        Mon Mar 23 11:48:02 1998
-+++ server/setup.c     Wed Sep 28 20:06:34 2005
-@@ -139,10 +139,13 @@ u_char   *src, *dst;
--static        u_char  *get_str(p, dst)
-+static        u_char  *get_str(p, pv_dst)
- u_char        *p;
--char  **dst;
-+void  *pv_dst;
- {
-+      char            **dst;
-+
-+      dst = pv_dst;
-       if (!*dst) {
-               *dst = malloc(strlen((char *)p) + 1);
-               if (!*dst) RcError("no more memory");
-@@ -151,21 +154,26 @@ char     **dst;
-       while (*p++) ;
-       return p;
- }
--static        u_char  *get_int(p, dst)
-+static        u_char  *get_int(p, pv_dst)
- u_char        *p;
--int   *dst;
-+void  *pv_dst;
- {
-       register char   *fmt;
-+      int             *dst;
-+      dst = pv_dst;
-       fmt = (*p == '0') ? "%o" : "%d";
-       if (sscanf((char *)p, fmt, dst) != 1) RcError("bad integer");
-       while (*p++) ;
-       return p;
- }
--static        u_char  *get_flag(p, dst)
-+static        u_char  *get_flag(p, pv_dst)
- u_char        *p;
--int   *dst;
-+void  *pv_dst;
- {
-+      int             *dst;
-+
-+      dst = pv_dst;
-       if (sscanf((char *)p, "%d", dst) == 1)
-               ;
-       else if (!cmpstr("on", p))
-@@ -219,33 +227,56 @@ StrList  **dst;
- struct        optlist {
-       char    *optname;
-       u_char  *(*optfunc)();
--      int     optarg;
-+      void    *optarg;
- } option[] = {
--      "DebugOut",     get_str,        (int)&debug_file,
--      "DebugLevel",   get_int,        (int)&debug_level,
--      "ForkFlag",     get_flag,       (int)&fork_flag,
-+/*
-+ * Add option flag.
-+ * Because They are lacked in here. See document.
-+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/10
-+ */
-+      "DebugOut",     get_str,        &debug_file,
-+      "debugout",     get_str,        &debug_file,
-+      "DebugLevel",   get_int,        &debug_level,
-+      "debuglevel",   get_int,        &debug_level,
-+      "ForkFlag",     get_flag,       &fork_flag,
-+      "forkflag",     get_flag,       &fork_flag,
--      "PortName",     get_str,        (int)&port_name,
-+      "PortName",     get_str,        &port_name,
-+      "portname",     get_str,        &port_name,
- #ifdef TLI
--      "PortNumber",   get_str,        (int)&port_number,
--        "ProtoName",    get_str,        (int)&proto_name,
-+      "PortNumber",   get_str,        &port_number,
-+      "portnumber",   get_str,        &port_number,
-+      "ProtoName",    get_str,        &proto_name,
-+      "protoname",    get_str,        &proto_name,
- #else
--      "PortNumber",   get_int,        (int)&port_number,
-+      "PortNumber",   get_int,        &port_number,
-+      "portnumber",   get_int,        &port_number,
- #endif
--      "SocketName",   get_str,        (int)&socket_name,
-+      "SocketName",   get_str,        &socket_name,
-+      "socketname",   get_str,        &socket_name,
- #ifdef        LOCK_FILE
--      "LockFile",     get_str,        (int)&lock_file;
-+      "LockFile",     get_str,        &lock_file;
-+      "lockfile",     get_str,        &lock_file;
- #endif
--      "maxclient",    get_int,        (int)&max_client,
--      "dictdir",      get_str,        (int)&dict_dir,
--      "readdict",     get_list,       (int)&read_dict,
--      "opendict",     get_list,       (int)&open_dict,
--      "errorout",     get_str,        (int)&error_file,
--      "logout",       get_str,        (int)&log_file,
--      "dirmode",      get_int,        (int)&dir_mode,
--      "filemode",     get_int,        (int)&file_mode,
--      "allowuser",    get_list,       (int)&allow_user,
-+      "MaxClient",    get_int,        &max_client,
-+      "maxclient",    get_int,        &max_client,
-+      "DictDir",      get_str,        &dict_dir,
-+      "dictdir",      get_str,        &dict_dir,
-+      "ReadDict",     get_list,       &read_dict,
-+      "readdict",     get_list,       &read_dict,
-+      "OpenDict",     get_list,       &open_dict,
-+      "opendict",     get_list,       &open_dict,
-+      "ErrorOut",     get_str,        &error_file,
-+      "errorout",     get_str,        &error_file,
-+      "LogOut",       get_str,        &log_file,
-+      "logout",       get_str,        &log_file,
-+      "DirMode",      get_int,        &dir_mode,
-+      "dirmode",      get_int,        &dir_mode,
-+      "FileMode",     get_int,        &file_mode,
-+      "filemode",     get_int,        &file_mode,
-+      "AllowUser",    get_list,       &allow_user,
-+      "allowuser",    get_list,       &allow_user,
-       0, 0, 0
- };
diff --git a/inputmethod/sj3-lib/patches/patch-ah b/inputmethod/sj3-lib/patches/patch-ah
deleted file mode 100644 (file)
index f515c0a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/09/28 17:32:17 rillig Exp $
-
---- doc/doc/sj3serv.ms.orig    Fri Jun  3 10:00:50 1994
-+++ doc/doc/sj3serv.ms Wed Sep 28 19:19:34 2005
-@@ -111,7 +111,7 @@ DictDir         \fIdirectory_name\fP
- ¤½¤Î¥Õ¥¡¥¤¥ë̾¤òÀäÂХѥ¹¤È¤·¤Æ¼­½ñ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¤¬¡¢\'/\'°Ê³°¤Î¤È¤­¤Ë¤Ï¡¢
- ¤³¤³¤Ç»ØÄꤵ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¤ÎÁêÂХѥ¹¤È¤·¤Æ¼­½ñ¤Ë¥¢¥¯¥»¥¹¤·¤Þ¤¹¡£
- .br
--¥Ç¥Õ¥©¥ë¥È¤Ï /usr/dict/sj3 ¤Ç¤¹¡£
-+¥Ç¥Õ¥©¥ë¥È¤Ï /usr/local/lib/sj3/dict ¤Ç¤¹¡£
- .RE
- .sp
- .NH 3
diff --git a/inputmethod/sj3-lib/patches/patch-ai b/inputmethod/sj3-lib/patches/patch-ai
deleted file mode 100644 (file)
index 6f5be9b..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/09/28 17:32:17 rillig Exp $
-
---- doc/man/sj3.1.orig Fri Jun  3 10:00:51 1994
-+++ doc/man/sj3.1      Wed Sep 28 19:19:34 2005
-@@ -109,13 +109,13 @@ sj3 \- ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP 15
--/usr/dict/sj3/user/$USER/private.dic
-+/usr/local/lib/sj3/dict/user/$USER/private.dic
- ²¾Ì¾´Á»úÊÑ´¹¥æ¡¼¥¶¼­½ñ
- .TP
--/usr/dict/sj3/user/$USER/study.dat
-+/usr/local/lib/sj3/dict/user/$USER/study.dat
- ²¾Ì¾´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
--/usr/lib/sj3/sjrk
-+/usr/local/lib/sj3/sjrk
- ¥Ç¥Õ¥©¥ë¥È¥í¡¼¥Þ»ú²¾Ì¾ÊÑ´¹µ¬Â§ÄêµÁ¥Õ¥¡¥¤¥ë
- .SH ´ØÏ¢»ö¹à
- sj3serv(1), sj3lib(3) 
diff --git a/inputmethod/sj3-lib/patches/patch-aj b/inputmethod/sj3-lib/patches/patch-aj
deleted file mode 100644 (file)
index 5f9a335..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/09/28 17:32:17 rillig Exp $
-
---- doc/man/sj3dic.1.orig      Fri Jun  3 10:00:52 1994
-+++ doc/man/sj3dic.1   Wed Sep 28 19:19:35 2005
-@@ -105,16 +105,16 @@ sj3dic \- sj3 ¥æ¡¼¥¶¼­½ñ¥á¥ó¥Æ¥Ê¥ó¥¹¥Ä¡¼
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\fIusername\fP/private.dic'u+2n
--/usr/bin/sj3serv
-+/usr/local/bin/sj3serv
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð
- .TP
--/usr/lib/sj3/serverrc
-+/usr/local/lib/sj3/serverrc
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
--/usr/bin/sj3
-+/usr/local/bin/sj3
- ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥µ
- .TP
--/usr/dict/sj3/
-+/usr/local/lib/sj3/dict/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
-     sj3main.dic
-@@ -126,10 +126,10 @@ sj3dic \- sj3 ¥æ¡¼¥¶¼­½ñ¥á¥ó¥Æ¥Ê¥ó¥¹¥Ä¡¼
-     user/\fIusername\fP/study.dat
- ¤«¤Ê´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
--/usr/include/sj3lib.h
-+/usr/local/include/sj3lib.h
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥êÍÑ¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë
- .TP
--/usr/lib/libsj3lib.a
-+/usr/local/lib/libsj3lib.a
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê
- .\".TP
- .\"/usr/sony/demo/sj3/*
diff --git a/inputmethod/sj3-lib/patches/patch-ak b/inputmethod/sj3-lib/patches/patch-ak
deleted file mode 100644 (file)
index bf8b6a4..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/09/28 17:32:17 rillig Exp $
-
---- doc/man/sj3mkdic.1.orig    Thu Sep  5 14:08:27 1996
-+++ doc/man/sj3mkdic.1 Wed Sep 28 19:19:35 2005
-@@ -539,16 +539,16 @@
- .SH ¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\f2username\f1/private.dic'u+2n
--.B /usr/bin/sj3serv
-+.B /usr/local/bin/sj3serv
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð
- .TP
--.B /usr/lib/sj3/serverrc
-+.B /usr/local/lib/sj3/serverrc
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
--.B /usr/bin/sj3
-+.B /usr/local/bin/sj3
- ÆüËܸìÆþÎÏ¥Õ¥í¥ó¥È¥¨¥ó¥É¥×¥í¥»¥Ã¥µ
- .TP
--.B /usr/dict/sj3/
-+.B /usr/local/lib/sj3/dict/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
- .B "   sj3main.dic
-@@ -560,14 +560,14 @@
- .B "   user/\f2username\f1/study.dat
- ¤«¤Ê´Á»úÊÑ´¹³Ø½¬¥Õ¥¡¥¤¥ë
- .TP
--.B /usr/include/sj3lib.h
-+.B /usr/local/include/sj3lib.h
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥êÍÑ¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë
- .TP
--.B /usr/lib/libsj3lib.a
-+.B /usr/local/lib/libsj3lib.a
- ¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê
--.TP
--\f3/usr/demo/sj3/ *\f1
--¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê »ÈÍÑË¡¥µ¥ó¥×¥ë
-+.\".TP
-+.\"\f3/usr/local/demo/sj3/ *\f1
-+.\"¤«¤Ê´Á»úÊÑ´¹¥é¥¤¥Ö¥é¥ê »ÈÍÑË¡¥µ¥ó¥×¥ë
- .PD
- .SH ´ØÏ¢¹àÌÜ
- \f4sj3\f1 (1),
diff --git a/inputmethod/sj3-lib/patches/patch-al b/inputmethod/sj3-lib/patches/patch-al
deleted file mode 100644 (file)
index a2a9fc9..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/09/28 17:32:17 rillig Exp $
-
---- doc/man/sj3serv.1.orig     Fri Jun  3 10:00:53 1994
-+++ doc/man/sj3serv.1  Wed Sep 28 19:19:35 2005
-@@ -47,17 +47,17 @@ sj3serv \- ²¾Ì¾´Á»úÊÑ´¹¥µ¡¼¥Ð
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\fIsj3serv\fP ¤ÎÆɤ߹þ¤à¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
- .br
- \fIsj3serv\fP ¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
--¡Æ/usr/lib/sj3/serverrc¡Ç¤òÆɤ߹þ¤ß¤Þ¤¹¤¬¡¢
-+¡Æ/usr/local/lib/sj3/serverrc¡Ç¤òÆɤ߹þ¤ß¤Þ¤¹¤¬¡¢
- ¤³¤Î¥ª¥×¥·¥ç¥ó¤¬»ØÄꤵ¤ì¤¿¤È¤­¤Ë¤Ï¤«¤ï¤ê¤Ë
- ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç»ØÄꤵ¤ì¤¿¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£
- .br
- .SH ´ØÏ¢¥Õ¥¡¥¤¥ë
- .PD 0
- .TP \w'\ \ \ \ user/\fIusername\fP/private.dic'u+2n
--/usr/lib/sj3/serverrc
-+/usr/local/lib/sj3/serverrc
- ¥Ç¥Õ¥©¥ë¥È²¾Ì¾ÊÑ´¹¥µ¡¼¥Ð ¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
- .TP
--/usr/sony/dict/sj3/
-+/usr/local/lib/sj3/dict/
- ¤«¤Ê´Á»úÊÑ´¹¥µ¡¼¥Ð ¥Ç¥Õ¥©¥ë¥È¼­½ñ¥Ç¥£¥ì¥¯¥È¥ê
- .TP
-     sj3main.dic
diff --git a/inputmethod/sj3-lib/patches/patch-am b/inputmethod/sj3-lib/patches/patch-am
deleted file mode 100644 (file)
index 2fab6c3..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/09/28 17:32:17 rillig Exp $
-
---- doc/doc/sj3lib.ms.orig     Fri Jun  3 10:00:49 1994
-+++ doc/doc/sj3lib.ms  Wed Sep 28 19:19:34 2005
-@@ -56,7 +56,7 @@ JIS ¤ò»ÈÍѤ·¤Þ¤¹¡£
- .IP ¡¦
- ¥á¥¤¥ó¼­½ñ¡¢¥æ¡¼¥¶¼­½ñ¡¢³Ø½¬¥Õ¥¡¥¤¥ë¤Ï¡¢Àܳ¤¹¤ë¥µ¡¼¥Ð¤ÎÆ°ºî¤·¤Æ¤¤¤ë¥Þ¥·¥ó¾å¤Î¤â¤Î¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£
- .br
--¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥Ç¥£¥ì¥¯¥È¥ê \fB/usr/dict/sj3\fP ¤Î²¼¤Ë¤ª¤«¤ì¤Þ¤¹¤¬¡¢¥µ¡¼¥Ð¤Î¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë¤è¤êÊѹ¹¤¬²Äǽ¤Ç¤¹¡£
-+¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¥Ç¥£¥ì¥¯¥È¥ê \fB/usr/local/lib/sj3/dict\fP ¤Î²¼¤Ë¤ª¤«¤ì¤Þ¤¹¤¬¡¢¥µ¡¼¥Ð¤Î¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤Ë¤è¤êÊѹ¹¤¬²Äǽ¤Ç¤¹¡£
- .IP ¡¦
- ¥æ¡¼¥¶¼­½ñ¤È³Ø½¬¥Õ¥¡¥¤¥ë¤Ï¡¢´Ø¿ô sj3_open ¤Ç»ØÄꤵ¤ì¤¿¥æ¡¼¥¶Ì¾¤ò USER ¤È
- ¤¹¤ì¤Ð¡¢\fBuser/USER/private.dic\fP ¤È \fBuser/USER/study.dat\fP ¤Ç¤¹¡£
-@@ -91,7 +91,7 @@ char *uname;         /* ¥æ¡¼¥¶Ì¾¤Ø¤Î¥Ý¥¤¥ó¥¿ */
- ¥µ¡¼¥Ð¤ÈÀµ¾ï¤ËÀܳ¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤ò¡¢²¿¤«¥¨¥é¡¼¤Î¤¢¤Ã¤¿¤È¤­¤Ë¤Ï 0 °Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£
- .sp
--¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
-+¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë¥Ó¥Ã¥È¥¢¥µ¥¤¥ó¤µ¤ì¤¿Ãͤǡ¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_SERVER_DEAD\fP
-@@ -138,7 +138,7 @@ sj3_close()
- ¥µ¡¼¥Ð¤È¤Î»ÈÍѤòÀµ¾ï¤Ë½ªÎ»¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤ò¡¢
- ²¿¤«¥¨¥é¡¼¤Î¤¢¤Ã¤¿¤È¤­¤Ë¤Ï 0 °Ê³°¤Î¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤·¤Þ¤¹¡£
- .sp
--¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
-+¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë¥Ó¥Ã¥È¥¢¥µ¥¤¥ó¤µ¤ì¤¿Ãͤǡ¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_SERVER_DEAD\fP
-@@ -187,7 +187,7 @@ int                knjsiz;         /* ´Á»úʸ»úÎó³ÊǼÎΰè¤ÎÂç¤
- ÊÑ´¹·ë²Ì¤Î´Á»úʸ»úÎó¤ò¡¢ÇÛÎó \fBstruct bunsetu bun[]\fP ¤Ë
- ³ÆʸÀá¤Ë´Ø¤¹¤ë¾ðÊó¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£
- .br
--\fBstruct bunsetu\fP ¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
-+\fBstruct bunsetu\fP ¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- Àë¸À¤µ¤ì¤Æ¤¤¤ë°Ê²¼¤Î¤è¤¦¤Ê¹½Â¤ÂΤǤ¹¡£
- .sp
- .RS
-@@ -417,7 +417,7 @@ int        hinsi;                  /* Éʻ쥳¡¼¥É             *
- ¤Ê¤ê¤Þ¤»¤ó¡£
- ¤Þ¤¿¤½¤ÎŤµ¤Ï¡¢ºÇÂç¤Ç¤â 32 Ê¸»ú¤ò±Û¤¨¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
- .sp
--Éʻ쥳¡¼¥É¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
-+Éʻ쥳¡¼¥É¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£
- .sp
- .RS
-@@ -445,7 +445,7 @@ SJ3_H_ADJECT    ·ÁÍƻ젠        SJ3_H_SI
- ÅÐÏ¿¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤¬¡¢ÅÐÏ¿¤Ç¤­¤Ê¤«¤Ã¤¿¤È¤­¤Ë¤Ï¤½¤ì°Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
- .sp
--¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/include/sj3lib.h\fP ¤Ç
-+¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë \fB/usr/local/include/sj3lib.h\fP ¤Ç
- ÄêµÁ¤µ¤ì¡¢¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_DICT_ERROR\fP
-@@ -519,7 +519,7 @@ int        hinsi;                  /* Éʻ쥳¡¼¥É */
- ¤Ê¤ê¤Þ¤»¤ó¡£
- ¤Þ¤¿¤½¤ÎŤµ¤Ï¡¢ºÇÂç¤Ç¤â 32 Ê¸»ú¤ò±Û¤¨¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£
- .sp
--Éʻ쥳¡¼¥É¤Ï \fB/usr/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î
-+Éʻ쥳¡¼¥É¤Ï \fB/usr/local/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¤ë°Ê²¼¤ÎÉÊ»ì¤Î
- ¤¦¤Á¤Î°ì¤Ä¤Ç¤¹¡£
- .sp
- .RS
-@@ -547,7 +547,7 @@ SJ3_H_ADJECT    ·ÁÍƻ젠        SJ3_H_SI
- ºï½ü¤Ç¤­¤¿¤È¤­¤Ë¤Ï 0 ¤¬¡¢ºï½ü¤Ç¤­¤Ê¤«¤Ã¤¿¤È¤­¤Ë¤Ï¤½¤ì°Ê³°¤Î
- ¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤¬ÊÖ¤µ¤ì¤Þ¤¹¡£
- .sp
--¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï \fB/usr/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¡¢
-+¥¨¥é¡¼¥¹¥Æ¡¼¥¿¥¹¤Ï \fB/usr/local/include/sj3lib.h\fP ¤ÇÄêµÁ¤µ¤ì¡¢
- ¾ÜºÙ¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£
- .sp
- .IP "\fBSJ3_DICT_ERROR\fP
diff --git a/inputmethod/sj3-lib/patches/patch-ao b/inputmethod/sj3-lib/patches/patch-ao
deleted file mode 100644 (file)
index 618ac28..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- sj3lib/level1.c.orig       2005-12-02 22:29:21.000000000 +0000
-+++ sj3lib/level1.c
-@@ -303,7 +303,7 @@ static     open_unix()
-       }
-       len = strlen(sunix.sun_path)+sizeof(sunix.sun_family);
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-       len += sizeof(sunix.sun_len);
- #endif
-       if (connect(fd, (struct sockaddr *)&sunix, len)
diff --git a/inputmethod/sj3-lib/patches/patch-ap b/inputmethod/sj3-lib/patches/patch-ap
deleted file mode 100644 (file)
index 5f18b4a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- sj3/sjgetchar.c.orig       2005-12-02 22:29:41.000000000 +0000
-+++ sj3/sjgetchar.c
-@@ -48,14 +48,12 @@
- #include <sys/types.h>
- #include <sys/fcntl.h>
- #endif
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
--#if defined(__NetBSD__) || defined(__bsdi__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
- #define       USE_OLD_TTY
--#endif
- #include <curses.h>
- #endif
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/file.h>
- #include "sj2.h"
- #include "select.h"
-@@ -72,7 +70,6 @@ static wchar16_t  backup = (wchar16_t) 0
- static int    eucmode = 0;
- extern int    master;
--extern int    errno;
- wchar16_t SJ_getchar()
- {
diff --git a/inputmethod/sj3-lib/patches/patch-aq b/inputmethod/sj3-lib/patches/patch-aq
deleted file mode 100644 (file)
index 4d6533c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- kanakan/depend.c.orig      2005-12-02 22:30:03.000000000 +0000
-+++ kanakan/depend.c
-@@ -318,7 +318,7 @@ char       *passwd;
-               serv_errno = SJ3_IncorrectPasswd; goto error1;
-       }
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
-       if ((dp = (Uchar *)malloc((long)sbuf.st_size)) == NULL) {
- #else
-       if ((dp = (Uchar *)malloc(sbuf.st_size)) == NULL) {
-@@ -330,7 +330,7 @@ char       *passwd;
-       }
-       memset(dfp, '\0', sizeof(*dfp));
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__DragonFly__)
-       if (fgetfile(fp, 0L, (long)sbuf.st_size, dp) == ERROR) goto error3;
- #else
-       if (fgetfile(fp, 0L, sbuf.st_size, dp) == ERROR) goto error3;
diff --git a/inputmethod/sj3-lib/patches/patch-ar b/inputmethod/sj3-lib/patches/patch-ar
deleted file mode 100644 (file)
index ef24ebd..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- include/Paths.h.in.orig    2005-12-02 22:30:39.000000000 +0000
-+++ include/Paths.h.in
-@@ -43,7 +43,7 @@
-  * This default value is "/dev/null" in document.
-  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/11
-  */
--#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
- #define       ErrorOutFile            "/dev/console"
- #else
- /* #define    ErrorOutFile            "/dev/stderr" */        /* for test */
diff --git a/inputmethod/sj3-lib/patches/patch-as b/inputmethod/sj3-lib/patches/patch-as
deleted file mode 100644 (file)
index 3574c22..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- include/Const.h.orig       2005-12-02 22:31:07.000000000 +0000
-+++ include/Const.h
-@@ -74,7 +74,7 @@
-  * Change the default Port number of sj3 for FreeBSD.
-  * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp)               1996/8/20
-  */
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #define       PortNumber              3086
- #else /* ! __FreeBSD__ __NetBSD__ __OpenBSD__ */
- #define       PortNumber              3000
diff --git a/inputmethod/sj3-lib/patches/patch-at b/inputmethod/sj3-lib/patches/patch-at
deleted file mode 100644 (file)
index 4e2b566..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- dict/tool/file.c.orig      2005-12-02 22:31:36.000000000 +0000
-+++ dict/tool/file.c
-@@ -124,7 +124,7 @@ char       *filename;
- {
-       struct  stat    buf;
--#if defined(__NetBSD__) || defined(__FreeBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-       if (stat(filename, &buf) == 0) return (long)buf.st_size;
- #else
-       if (stat(filename, &buf) == 0) return buf.st_size;
diff --git a/inputmethod/sj3-lib/patches/patch-au b/inputmethod/sj3-lib/patches/patch-au
deleted file mode 100644 (file)
index 7f14c1b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-au,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- kanakan/depend.c.orig      2005-12-02 22:33:25.000000000 +0000
-+++ kanakan/depend.c
-@@ -50,7 +50,6 @@
- # define FD_CLR __FD_CLR
- #endif
--extern        int     errno;
- extern        int     serv_errno;
- extern        Global  *work_base;
- char  *malloc();
diff --git a/inputmethod/sj3-lib/patches/patch-av b/inputmethod/sj3-lib/patches/patch-av
deleted file mode 100644 (file)
index 7779b26..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-av,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- sj3/conv.c.orig    2005-12-02 22:43:26.000000000 +0000
-+++ sj3/conv.c
-@@ -35,7 +35,7 @@
--#include <sys/errno.h>
-+#include <errno.h>
- #include "wchar16.h"
- #include "select.h"
- #include "key.h"
-@@ -204,7 +204,6 @@ register int       *count;
-       register int    n;
-       SELECT_FD       ifds;
-       struct timeval  t;
--      extern int      errno;
-       register wchar16_t *s;
-       int             value;
diff --git a/inputmethod/sj3-lib/patches/patch-aw b/inputmethod/sj3-lib/patches/patch-aw
deleted file mode 100644 (file)
index f6b5cc5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- sj3/display.c.orig 2005-12-02 22:43:59.000000000 +0000
-+++ sj3/display.c
-@@ -36,7 +36,7 @@
- #include "sj_sysvdef.h"
--#include <sys/errno.h>
-+#include <errno.h>
- #include "common.h"
- #include "inkey.h"
- #include "select.h"
-@@ -201,7 +201,6 @@ master_flush ()
-       SELECT_FD       ifds;
-       int             nc;
-       struct timeval  t;
--      extern int      errno;
-       do {
- cont:
diff --git a/inputmethod/sj3-lib/patches/patch-ax b/inputmethod/sj3-lib/patches/patch-ax
deleted file mode 100644 (file)
index abd20e4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- server/comuni.c.orig       2005-12-02 22:44:55.000000000 +0000
-+++ server/comuni.c
-@@ -98,7 +98,6 @@ extern  char    *proto_name;
- extern        int     port_number;
- #endif
- extern        int     max_client;
--extern        int     errno;
- static        int     fd_inet = -1;
- static        int     fd_unix = -1;
diff --git a/inputmethod/sj3-lib/patches/patch-ay b/inputmethod/sj3-lib/patches/patch-ay
deleted file mode 100644 (file)
index ceaa3a5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2005/12/02 22:57:32 joerg Exp $
-
---- server/execute.c.orig      2005-12-02 22:45:34.000000000 +0000
-+++ server/execute.c
-@@ -53,8 +53,6 @@
- #define SJIS_PROTO 1
- #define EUC_PROTO 2
--extern        int     errno;
--
- extern        Global  *work_base;
- extern        STDY    *stdy_base;
- extern        int     serv_errno;
-@@ -82,7 +80,6 @@ static       Client  *cur_cli;               
- static Uchar defaultchar[2] = {(Uchar)0x81, (Uchar)0x40};   
- static int  defuse=0, defuse2=0;
--char  *malloc();
- DictFile *opendict();
- int   closedict();
- StdyFile *openstdy();
diff --git a/inputmethod/sj3-lib/patches/patch-az b/inputmethod/sj3-lib/patches/patch-az
deleted file mode 100644 (file)
index 2399532..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-az,v 1.1 2009/10/06 17:41:49 joerg Exp $
-
---- sj3dic/sjrc.c.orig 2009-10-06 19:30:07.000000000 +0200
-+++ sj3dic/sjrc.c
-@@ -108,9 +108,8 @@ sjset_code()
- getsjrc ()
- {
--      FILE *fd, *fopen();
-+      FILE *fd;
-       register char *p;
--      char *getenv();
-       sjset_code();
-       RCfile[0] = '\0';
diff --git a/inputmethod/sj3-lib/patches/patch-ba b/inputmethod/sj3-lib/patches/patch-ba
deleted file mode 100644 (file)
index 0f54d40..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2009/10/06 17:41:49 joerg Exp $
-
---- sj3/nmttyslot.c.orig       2009-10-06 19:31:25.000000000 +0200
-+++ sj3/nmttyslot.c
-@@ -40,14 +40,13 @@
-+#include <string.h>
-+#include <unistd.h>
--
--char  *ttyname();
--char  *getttys();
--char  *strrchr();
-+static char   *getttys();
- static        char    *ttys   = "/etc/ttys";
- #define       NULL    0
diff --git a/inputmethod/sj3-lib/patches/patch-bb b/inputmethod/sj3-lib/patches/patch-bb
deleted file mode 100644 (file)
index 9ac651a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2009/10/06 17:41:49 joerg Exp $
-
---- sj3rkcv/sj3_rkcv.c.orig    2009-10-06 19:36:40.000000000 +0200
-+++ sj3rkcv/sj3_rkcv.c
-@@ -33,7 +33,7 @@
-  * $SonyDate: 1995/02/10 06:02:25 $
-  */
--
-+#include <string.h>
- #include "wchar16.h"
- #include "sj.h"
diff --git a/inputmethod/sj3-lib/patches/patch-bc b/inputmethod/sj3-lib/patches/patch-bc
deleted file mode 100644 (file)
index 28ebc77..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2009/10/06 17:41:49 joerg Exp $
-
---- sj3dic/sjrc.c.orig 2009-10-06 19:37:25.000000000 +0200
-+++ sj3dic/sjrc.c
-@@ -36,7 +36,7 @@
--
-+#include <string.h>
- #include <stdio.h>
- #include <locale.h>
- #include <ctype.h>
diff --git a/inputmethod/sj3-lib/patches/patch-bd b/inputmethod/sj3-lib/patches/patch-bd
deleted file mode 100644 (file)
index 197cebc..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2009/10/06 17:41:49 joerg Exp $
-
---- sj3dic/dictdisp.c.orig     2009-10-06 19:37:59.000000000 +0200
-+++ sj3dic/dictdisp.c
-@@ -35,7 +35,7 @@
--
-+#include <string.h>
- #include <stdio.h>
- #include <ctype.h>
diff --git a/inputmethod/sj3-lib/patches/patch-be b/inputmethod/sj3-lib/patches/patch-be
deleted file mode 100644 (file)
index 1ccdd0f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1 2009/10/06 17:41:49 joerg Exp $
-
---- sj3dic/codecnv.c.orig      2009-10-06 19:38:30.000000000 +0200
-+++ sj3dic/codecnv.c
-@@ -35,7 +35,7 @@
--
-+#include <string.h>
- #include <stdio.h>
- #include <ctype.h>
- #include <locale.h>
diff --git a/inputmethod/sj3-server-bin/DESCR b/inputmethod/sj3-server-bin/DESCR
deleted file mode 100644 (file)
index cebe440..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-SJ3 is a Japanese input method developed by Sony Corporation.  SJ3 is
-composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji
-conversion client for terminals (sj3) and Kana-Kanji conversion library
-(sj3lib).
-
-This package contains the Kana-Kanji conversion server and client.
diff --git a/inputmethod/sj3-server-bin/MESSAGE b/inputmethod/sj3-server-bin/MESSAGE
deleted file mode 100644 (file)
index 5697365..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/07/05 04:55:24 jlam Exp $
-
-The default port number for the SJ3 service should be added to the
-/etc/services database:
-
-    sj3       3086/tcp
-
-This port number may be changed in configuration files.
-===========================================================================
diff --git a/inputmethod/sj3-server-bin/Makefile b/inputmethod/sj3-server-bin/Makefile
deleted file mode 100644 (file)
index e37f583..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2010/01/09 16:15:41 joerg Exp $
-#
-
-DISTNAME=      sj3-2.0.1.20
-PKGNAME=       sj3-server-bin-2.0.1.20
-PKGREVISION=   6
-CATEGORIES=    japanese inputmethod
-MASTER_SITES=  ftp://ftp.sony.co.jp/pub/unsupported/src/       \
-               ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
-
-MAINTAINER=    tech-pkg-ja@jp.NetBSD.org
-COMMENT=       SJ3 Japanese input method server & client
-
-DISTINFO_FILE= ${.CURDIR}/../sj3-lib/distinfo
-PATCHDIR=      ${.CURDIR}/../sj3-lib/patches
-
-NOT_FOR_PLATFORM+=     ${LP64PLATFORMS}
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_TOOLS+=    itools
-USE_IMAKE=     yes
-MAKE_ENV+=     SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q}           \
-               IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
-
-SJ3OWNER?=     daemon
-SJ3GROUP?=     daemon
-
-FILES_SUBST+=  IMDICTDIR=${IMDICTDIR:Q}
-FILES_SUBST+=  SJ3OWNER=${SJ3OWNER:Q}
-FILES_SUBST+=  SJ3GROUP=${SJ3GROUP:Q}
-
-PKG_GROUPS+=   ${SJ3GROUP}
-PKG_USERS+=    ${SJ3OWNER}:${SJ3GROUP}
-
-PKG_GROUPS_VARS+=      SJ3GROUP
-PKG_USERS_VARS+=       SJ3USER
-
-MAKE_DIRS+=            ${IMDICTDIR}
-OWN_DIRS+=             ${IMDICTDIR}/sj3
-OWN_DIRS_PERMS+=       ${IMDICTDIR}/sj3/user ${SJ3OWNER} ${SJ3GROUP} 0755
-
-RCD_SCRIPTS=   sj3
-
-pre-configure:
-       @${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
-       @${SED} -e 's|\(SUBDIRS = .*\)sj3lib \(.*\)|\1\2|'      \
-               ${WRKSRC}/Imakefile.orig > ${WRKSRC}/Imakefile
-       @${MV} ${WRKSRC}/dict/Imakefile ${WRKSRC}/dict/Imakefile.orig
-       @${SED} -e 's|\(SUBDIRS = .*\)dict|\1|' \
-               ${WRKSRC}/dict/Imakefile.orig > ${WRKSRC}/dict/Imakefile
-       @for file in `${FIND} ${WRKSRC} -name Imakefile -print`; do     \
-               ${MV} -f $$file $$file.orig;                    \
-               ${SED} -e 's|\(= \).*/lib\(sj3lib\).a|\1-l\2|'  \
-                       -e 's|^DEPLIBS.*|DEPLIBS =|'            \
-                       $$file.orig > $$file;                   \
-        done
-
-.include "../../inputmethod/sj3-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/sj3-server-bin/PLIST b/inputmethod/sj3-server-bin/PLIST
deleted file mode 100644 (file)
index 8320379..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:01:32 joerg Exp $
-bin/sj3
-bin/sj3dic
-bin/sj3mkdic
-bin/sj3serv
-bin/sj3stat
-man/ja_JP.EUC/man1/sj3.1
-man/ja_JP.EUC/man1/sj3dic.1
-man/ja_JP.EUC/man1/sj3mkdic.1
-man/ja_JP.EUC/man1/sj3serv.1
-share/examples/rc.d/sj3
-share/sj3/Nihongo.ps.Z
-share/sj3/cvtkey.news
-share/sj3/cvtkey.nwp511
-share/sj3/cvtkey.nwp517
-share/sj3/cvtkey.xterm
-share/sj3/hinsi.ms
-share/sj3/makedict.ms
-share/sj3/serverrc
-share/sj3/sj3lib.ms
-share/sj3/sj3serv.ms
-share/sj3/sjrc
-share/sj3/sjrk
diff --git a/inputmethod/sj3-server-bin/files/sj3.sh b/inputmethod/sj3-server-bin/files/sj3.sh
deleted file mode 100644 (file)
index 745cc89..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: sj3.sh,v 1.2 2006/07/05 04:55:24 jlam Exp $
-#
-# PROVIDE: sj3
-# REQUIRE: LOGIN
-#
-
-. /etc/rc.subr
-
-name="sj3"
-rcvar=$name
-command="@PREFIX@/bin/sj3serv"
-start_precmd="sj3_prestart"
-
-mkdir_perms() {
-       dir="$1"; user="$2"; group="$3"; mode="$4"
-       @TEST@ -d $dir || @MKDIR@ $dir
-       @CHOWN@ $user $dir
-       @CHGRP@ $group $dir
-       @CHMOD@ $mode $dir
-}
-
-sj3_prestart()
-{
-       @MKDIR@ @IMDICTDIR@/sj3
-       mkdir_perms @IMDICTDIR@/sj3/user @SJ3OWNER@ @SJ3GROUP@ 0755
-       srcdict="@PREFIX@/libdata/sj3main.dic"
-       dict="@IMDICTDIR@/sj3/sj3main.dic"
-       if @TEST@ -f $srcdict; then
-               @RM@ -f $srcdict
-               @LN@ -fs $srcdict $dict
-       fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
index 447a901..53fd9f0 100644 (file)
@@ -1,4 +1,3 @@
-SJ3 is a Japanese input method developed by Sony Corporation.  SJ3 is
-composed of a Kana-Kanji conversion server (sj3serv), a Kana-Kanji
-conversion client for terminals (sj3) and Kana-Kanji conversion library
-(sj3lib).
+SJ3 is is a Japanese input system developed by Sony Corporation.
+
+This package contains the Kana-Kanji conversion server and utilities.
index 4f38c51..0a868bf 100644 (file)
@@ -1,15 +1,41 @@
-# $NetBSD: Makefile,v 1.10 2009/04/08 23:09:59 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/15 13:35:22 obache Exp $
+#
 
-DISTNAME=      sj3-server-2.0.1.20
-PKGREVISION=   3
-CATEGORIES=    japanese inputmethod
+.include "../../inputmethod/sj3/Makefile.common"
+
+PKGNAME=       ${DISTNAME:S/sj3-/sj3-server-/}
 
-MAINTAINER=    tech-pkg-ja@jp.NetBSD.org
 COMMENT=       SJ3 Japanese input method server
 
-META_PACKAGE=  # empty
+CONFLICTS=     sj3-dict-[0-9]* sj3-server-bin-[0-9]*
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+USE_TOOLS+=    pkg-config
+
+CONFIGURE_ARGS+=       --with-external-lua
+CONFIGURE_ARGS+=       --enable-server
+CONFIGURE_ARGS+=       --enable-dict
+
+CONF_FILES+=           share/examples/sj3/sj3proxy.lua.example \
+                       ${PKG_SYSCONFDIR}/sj3proxy.lua
+CONF_FILES+=           share/examples/sj3/sj3serv.lua.example \
+                       ${PKG_SYSCONFDIR}/sj3serv.lua
+
+OWN_DIRS_PERMS+=       ${VARBASE}/sj3/run ${SJ3OWNER} ${SJ3GROUP} 755
+OWN_DIRS_PERMS+=       ${VARBASE}/sj3/dict/user ${SJ3OWNER} ${SJ3GROUP} 700
+CONF_FILES_PERMS+=     libdata/sj3main.dic \
+                       ${VARBASE}/sj3/dict/sj3main.dic \
+                       ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
+
+RCD_SCRIPTS=           sj3proxy sj3serv
+
+INSTALLATION_DIRS+=    libdata
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/dict/sj3main.dic \
+               ${DESTDIR}${PREFIX}/libdata/sj3main.dic
 
-DEPENDS+=      sj3-server-bin>=2.0.1.20nb6:../../inputmethod/sj3-server-bin
-DEPENDS+=      sj3-dict>=2.0.1.20nb3:../../inputmethod/sj3-dict
 
+.include "../../lang/lua/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/sj3-server/PLIST b/inputmethod/sj3-server/PLIST
new file mode 100644 (file)
index 0000000..c9a3b53
--- /dev/null
@@ -0,0 +1,17 @@
+@comment $NetBSD: PLIST,v 1.6 2010/02/15 13:35:22 obache Exp $
+bin/sj3mkdic
+lib/libsj3core.la
+libdata/sj3main.dic
+man/man1/sj3mkdic.1
+man/man1/sj3serv.1
+sbin/sj3proxy
+sbin/sj3serv
+share/doc/sj3/hinsi.ms
+share/doc/sj3/makedict.ms
+share/doc/sj3/sj3serv.ms
+share/examples/rc.d/sj3proxy
+share/examples/rc.d/sj3serv
+share/examples/sj3/freebsd-sj3.sh.in
+share/examples/sj3/freebsd-sj3proxy.sh.in
+share/examples/sj3/sj3proxy.lua.example
+share/examples/sj3/sj3serv.lua.example
diff --git a/inputmethod/sj3-server/files/sj3proxy.sh b/inputmethod/sj3-server/files/sj3proxy.sh
new file mode 100644 (file)
index 0000000..83bc925
--- /dev/null
@@ -0,0 +1,18 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: sj3proxy.sh,v 1.1 2010/02/15 13:35:22 obache Exp $
+#
+# PROVIDE: sj3proxy
+# REQUIRE: sj3serv
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+#
+
+. /etc/rc.subr
+
+name="sj3proxy"
+rcvar=$name
+command="@PREFIX@/sbin/sj3proxy"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/inputmethod/sj3-server/files/sj3serv.sh b/inputmethod/sj3-server/files/sj3serv.sh
new file mode 100644 (file)
index 0000000..ace3669
--- /dev/null
@@ -0,0 +1,18 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: sj3serv.sh,v 1.1 2010/02/15 13:35:22 obache Exp $
+#
+# PROVIDE: sj3serv
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+#
+
+. /etc/rc.subr
+
+name="sj3serv"
+rcvar=$name
+command="@PREFIX@/sbin/sj3serv"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/inputmethod/sj3/DESCR b/inputmethod/sj3/DESCR
new file mode 100644 (file)
index 0000000..d9b0473
--- /dev/null
@@ -0,0 +1,4 @@
+SJ3 is is a Japanese input system developed by Sony Corporation.
+
+SJ3 is composed of Kana-Kanji conversion server(sj3serv),
+Kana-Kanji conversion library(sj3lib) and utility tools.
diff --git a/inputmethod/sj3/Makefile b/inputmethod/sj3/Makefile
new file mode 100644 (file)
index 0000000..8aa77f8
--- /dev/null
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2010/02/15 13:35:21 obache Exp $
+#
+
+.include "version.mk"
+
+DISTNAME=      sj3-${SJ3_VERSION}
+CATEGORIES=    japanese inputmethod
+MASTER_SITES=  http://sj3.googlecode.com/files/
+
+MAINTAINER=    obache@NetBSD.org
+HOMEPAGE=      http://code.google.com/p/sj3/
+COMMENT=       SJ3 Japanese input method
+
+META_PACKAGE=  yes
+
+DEPENDS+=      sj3-server>=${SJ3_VERSION}:../../wip/sj3-server
+DEPENDS+=      sj3-client>=${SJ3_VERSION}:../../wip/sj3-client
+
+.include "../../mk/bsd.pkg.mk"
similarity index 65%
copy from wip/sj3/Makefile.common
copy to inputmethod/sj3/Makefile.common
index 9c52b28..9c4d2b5 100644 (file)
@@ -1,9 +1,9 @@
-# $NetBSD$
-# used by wip/sj3-server/Makefile
-# used by wip/sj3-client/Makefile
+# $NetBSD: Makefile.common,v 1.1 2010/02/15 13:35:21 obache Exp $
+# used by inputmethod/sj3-server/Makefile
+# used by inputmethod/sj3-client/Makefile
 #
 
-.include "${.CURDIR}/../../wip/sj3/version.mk"
+.include "${.CURDIR}/../../inputmethod/sj3/version.mk"
 
 DISTNAME=      sj3-${SJ3_VERSION}
 CATEGORIES=    japanese inputmethod
@@ -15,11 +15,10 @@ COMMENT?=   SJ3 Japanese input method
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-DISTINFO_FILE= ${.CURDIR}/../../wip/sj3/distinfo
-PATCHDIR=      ${.CURDIR}/../../wip/sj3/patches
+DISTINFO_FILE= ${.CURDIR}/../../inputmethod/sj3/distinfo
+PATCHDIR=      ${.CURDIR}/../../inputmethod/sj3/patches
 
 GNU_CONFIGURE= yes
-USE_TOOLS+=    aclocal autoconf automake
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 
@@ -34,8 +33,8 @@ PKG_USERS=            ${SJ3OWNER}:${SJ3GROUP}
 PKG_GROUPS_VARS+=      SJ3GROUP
 PKG_USERS_VARS+=       SJ3OWNER
 
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}/sj3
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}/sj3
 CONFIGURE_ARGS+=       --with-user=${SJ3OWNER:Q}
 CONFIGURE_ARGS+=       --with-group=${SJ3GROUP:Q}
 CONFIGURE_ARGS+=       --disable-server
@@ -46,6 +45,3 @@ CONFIGURE_ARGS+=      --disable-demo
 BUILD_DEFS+=           VARBASE
 
 PKG_SYSCONFSUBDIR=     sj3
-
-pre-configure:
-       ${RUN} cd ${WRKSRC}; aclocal; autoconf; automake
diff --git a/inputmethod/sj3/distinfo b/inputmethod/sj3/distinfo
new file mode 100644 (file)
index 0000000..2885fb4
--- /dev/null
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2010/02/15 13:35:21 obache Exp $
+
+SHA1 (sj3-2.0.1.23p1.tar.gz) = 313a8f71f03071ad4d6006d18b569ce390edca8d
+RMD160 (sj3-2.0.1.23p1.tar.gz) = 2541f19bcf6b74c5b59c2e930fe27bb0ffa97ddf
+Size (sj3-2.0.1.23p1.tar.gz) = 1117190 bytes
+SHA1 (patch-aa) = 83416c5aeae4514349c6ab1a4f1ac3018feea406
diff --git a/inputmethod/sj3/patches/patch-aa b/inputmethod/sj3/patches/patch-aa
new file mode 100644 (file)
index 0000000..30da11e
--- /dev/null
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1 2010/02/15 13:35:21 obache Exp $
+
+Handled by pkgsrc framework.
+
+--- dict/Makefile.in.orig      2010-02-14 14:45:04.000000000 +0000
++++ dict/Makefile.in
+@@ -368,11 +368,6 @@ uninstall-am: uninstall-info-am
+ @BUILDABLE_SJ3DICT_TRUE@      $(top_builddir)/src/sj3mkdic/sj3mkdic ./visual.dic sj3main.dic > Moutput
+ @BUILDABLE_SJ3DICT_TRUE@install:: sj3main.dic
+-@BUILDABLE_SJ3DICT_TRUE@      ($(mkdir_p) $(DESTDIR)$(SJ3DICTDIR); \
+-@BUILDABLE_SJ3DICT_TRUE@       $(INSTALL_DATA) sj3main.dic $(DESTDIR)$(SJ3DICTDIR); \
+-@BUILDABLE_SJ3DICT_TRUE@       $(mkdir_p) $(DESTDIR)$(SJ3DICTDIR)/user; \
+-@BUILDABLE_SJ3DICT_TRUE@       chown $(SJ3OWNER) $(DESTDIR)$(SJ3DICTDIR)/user; \
+-@BUILDABLE_SJ3DICT_TRUE@       chgrp $(SJ3GROUP) $(DESTDIR)$(SJ3DICTDIR)/user;)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/inputmethod/sj3/version.mk b/inputmethod/sj3/version.mk
new file mode 100644 (file)
index 0000000..cfc38a0
--- /dev/null
@@ -0,0 +1,3 @@
+# $NetBSD: version.mk,v 1.1 2010/02/15 13:35:21 obache Exp $
+
+SJ3_VERSION=   2.0.1.23p1
index f84aeab..621b031 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.18 2010/01/20 11:06:07 obache Exp $
+# $NetBSD: options.mk,v 1.19 2010/02/15 13:56:17 obache Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uim
 #PKG_SUPPORTED_OPTIONS=        anthy canna eb gnome gtk m17nlib prime sj3 uim-fep wnn xim
-PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk m17nlib prime uim-fep xim
+PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk m17nlib prime sj3 uim-fep xim
 PKG_OPTIONS_OPTIONAL_GROUPS=   kde qt
 PKG_OPTIONS_GROUP.kde= kde kde4
 PKG_OPTIONS_GROUP.qt=  qt qt4
@@ -144,13 +144,13 @@ CONFIGURE_ARGS+=  --with-prime
 PLIST.prime=           yes
 .endif
 
-#.if !empty(PKG_OPTIONS:Msj3)
-#.  include "../../inputmethod/sj3-lib/buildlink3.mk"
-#CONFIGURE_ARGS+=      --with-sj3
-#CONFIGURE_ARGS+=      SJ3_CFLAGS=-I${BUILDLINK_PREFIX.sj3-lib}/includes
-#CONFIGURE_ARGS+=      SJ3_LIBS="-L${BUILDLINK_PREFIX.sj3-lib}/lib -lsj3lib"
-#PLIST.sj3=            yes
-#.endif
+.if !empty(PKG_OPTIONS:Msj3)
+.  include "../../inputmethod/sj3-client/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-sj3
+CONFIGURE_ARGS+=       SJ3_CFLAGS=-I${BUILDLINK_PREFIX.sj3-lib}/includes
+CONFIGURE_ARGS+=       SJ3_LIBS="-L${BUILDLINK_PREFIX.sj3-lib}/lib -lsj3lib"
+PLIST.sj3=             yes
+.endif
 
 #.if !empty(PKG_OPTIONS:Mwnn)
 #.  include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
index 4415ec8..e7a6ec7 100644 (file)
@@ -169,8 +169,8 @@ gstreamer           Enable gstreamer support.
 gtk                    Enable support for GTK.
 gtk2                   Enable support for GTK2.
 gtkspell               Enable gtkspell support.        
-gzip                   Enable compression using gzip
 guile                  Enable support for GUILE
+gzip                   Enable compression using gzip
 hal                    Support for the freedesktop.org Hardware Abstraction Layer
 halfops                        Halfops are similar to plain ops, but can't kick/deop plain ops.
 hping-suid             Install hping executable setuid root.
@@ -267,9 +267,11 @@ lang-zh-cn         Add Chinese Simplified language support.
 lang-zh-tw             Add Chinese Traditional language support.
 lcms                   Enable Light Color Management System support.
 ldap                   Enable LDAP support.
+lensfun                        Enable lensfun (camera lens distortion rectifyer) support.
 libao                  Enable the platform-independent 'ao' audio library.
 libgpod                        Enable libgpod support.
 libiconv-cp932         Add supplemental support for CP932
+liblqr                 Enable liblqr (liquid rescale) support.
 libmtp                 Enable MTP via libmtp support.
 libofx                 Enable OFX support.
 libspiff               Use libspiff for XML shareable playlist support.
@@ -293,6 +295,7 @@ m68060-optimized    Optimize for m68060 (only).
 mac                    Enable Monkey's Audio Codec support.
 mad                    Enable usage of the mad library to play MP3 files.
 maintainer-zts         Enable the Zend Thread Safety option for PHP
+marble                 Enable marble (virtual globe) support.
 mex                    Enable matlab mex support (Linux and Solaris only).
 mikmod                 Enable MikMod sound library.
 mitshm                 Enable MIT-SHM X extension support.
@@ -356,6 +359,7 @@ pcb-motif           Use Motif for the gui instead of GTK for cad/pcb.
 pcre                   Enable Perl-compatible regular expressions.
 perl                   Enable Perl support.
 pgsql                  Enable PostgreSQL support.
+pim                    Enable pim (personal information management) support.
 pinepwd                        Enable $HOME/.pinepwd stored IMAP password file.
 pinfo-native-curses    Use NetBSD native curses rather than ncurses.
 pkcs11                 Use certificate-on-a-stick (or card) support.
@@ -503,8 +507,8 @@ xjdic-locale                Honor LOCALE env var, instead of requiring ISO-2022-JP
 xlockmore-allow-root   Allow root to get access.
 xlockmore-dpms         Use DPMS.
 xml                    Enable XML support.
-xrender                        Enable Xrender support.
 xrandr                 Enable Xrandr support.
+xrender                        Enable Xrender support.
 xscreensaver-webcollage        Install webcollage screensaver.
 xterm-256color         Enable 256 color support.
 xterm-88color          Enable 88 color support.
index a72a750..8547790 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2008/02/24 20:38:49 seb Exp $
+$NetBSD: distinfo,v 1.5 2010/02/15 14:30:40 joerg Exp $
 
 SHA1 (nfdump-1.5.7.tar.gz) = 74965ba1b0bdb8e789ec8fb3d546d0520b2e9774
 RMD160 (nfdump-1.5.7.tar.gz) = c0a3fb6f0692e891a1f98a2779ef19146dffced7
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = bba19ce3e28b0d74d06ae694790e7aaeb73bfc6b
 SHA1 (patch-ae) = fad625c83fc7fad601252236d246286d04eff43d
 SHA1 (patch-af) = 06f045e735b689cd05c140c87753329cf6962d5c
 SHA1 (patch-ag) = 7ec59c455e51d6b8d5f2154b45bbb051f325bb7e
+SHA1 (patch-ah) = 2ffff479256c127fdb9f677f3b6872a8dd7f84b8
diff --git a/net/nfdump/patches/patch-ah b/net/nfdump/patches/patch-ah
new file mode 100644 (file)
index 0000000..3172772
--- /dev/null
@@ -0,0 +1,34 @@
+$NetBSD: patch-ah,v 1.1 2010/02/15 14:30:41 joerg Exp $
+
+--- Makefile.in.orig   2010-02-15 14:07:30.000000000 +0000
++++ Makefile.in
+@@ -47,8 +47,8 @@ YFLAGS        = -d -v
+ LFLAGS         = @LFLAGS@
+ LDFLAGS        = @LDFLAGS@
+ prefix   = @prefix@
+-PREFIX         = $(DESTDIR)/$(prefix)
+-MANDIR         = $(DESTDIR)/@mandir@
++PREFIX         = $(prefix)
++MANDIR         = @mandir@
+ COMMON_OBJ    = minilzo.o nffile.o nf_common.o util.o flist.o panonymizer.o rijndael.o @FTS_OBJ@
+ FILTER_OBJ    = grammar.o scanner.o nftree.o ipconv.o 
+ NFDUMP_OBJ    = nfdump.o $(COMMON_OBJ) $(FILTER_OBJ) nfstat.o nfprof.o
+@@ -103,14 +103,12 @@ nfreader: $(NFRDR_OBJ)
+       $(CC) $(CFLAGS) -o $@ $(NFRDR_OBJ) $(LDFLAGS)
+ install: $(OBJECTS)
+-      test -d $(PREFIX) || install -d -o root -g bin -m 755 $(PREFIX)
+-      test -d $(PREFIX)/bin || install -d -o root -g bin -m 755 $(PREFIX)/bin
+-      test -d $(MANDIR) || install -d -o root -g bin -m 755 $(MANDIR)
+-      test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
++      test -d ${DESTDIR}$(PREFIX)/bin || ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}$(PREFIX)/bin
++      test -d ${DESTDIR}$(MANDIR)/man1 || ${BSD_INSTALL_MAN_DIR} ${DESTDIR}$(MANDIR)/man1
+       for file in $(OBJECTS); do \
+               if [ -f $$file.1 ]; then \
+-                      $(INSTALL) -o root -g bin -m 755 $$file $(PREFIX)/bin ; \
+-                      $(INSTALL) -o root -g bin -m 644 $$file.1 $(MANDIR)/man1 ; \
++                      ${BSD_INSTALL_PROGRAM} $$file ${DESTDIR}$(PREFIX)/bin ; \
++                      ${BSD_INSTALL_MAN} $$file.1 ${DESTDIR}$(MANDIR)/man1 ; \
+               fi \
+       done;
index 49ac1ad..e82e5b9 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/09/02 08:34:15 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/15 13:38:20 joerg Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
@@ -18,6 +18,8 @@ DEPENDS+=     teTeX-texmf>=3.0nb3:../../print/teTeX3-texmf
 
 CONFLICTS+=    teTeX-sharesrc-[0-9]*
 
+BROKEN=                Conflicts with dependency (tex-koma-script).
+
 WRKSRC=                ${WRKDIR}
 DIST_SUBDIR=   teTeX
 NO_CONFIGURE=  yes
index 0108e46..c220257 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2009/07/26 21:30:28 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2010/02/15 12:58:14 wiz Exp $
 #
 
 COMMENT=       Shells
@@ -8,7 +8,6 @@ SUBDIR+=        bash
 SUBDIR+=       bash-completion
 SUBDIR+=       bash2
 SUBDIR+=       bash2-doc
-SUBDIR+=       bash3
 SUBDIR+=       dash
 SUBDIR+=       eltclsh
 SUBDIR+=       es
diff --git a/shells/bash3/DESCR b/shells/bash3/DESCR
deleted file mode 100644 (file)
index 7e21fbd..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Bash is an sh-compatible shell that incorporates useful features from
-the Korn shell (ksh) and C shell (csh). It is intended to conform to
-the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard.
-
-It offers functional improvements over sh for both programming and
-interactive use; these include command line editing, unlimited size
-command history, job control, shell functions and aliases, indexed
-arrays of unlimited size, and integer arithmetic in any base from two
-to sixty-four. In addition, most sh scripts can be run by Bash without
-modification.
-
-This package contains the outdated version 3 of bash.
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
deleted file mode 100644 (file)
index b4969dc..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2009/05/20 00:58:27 wiz Exp $
-
-DISTNAME=      bash-3.2.48
-PKGREVISION=   1
-CATEGORIES=    shells
-MASTER_SITES=  ${MASTER_SITE_GNU:=bash/} \
-               ftp://ftp.cwru.edu/pub/bash/
-
-MAINTAINER=    pkgsrc-users@NetBSD.org
-HOMEPAGE=      http://www.gnu.org/software/bash/bash.html
-COMMENT=       The GNU Bourne Again Shell (version 3)
-
-CONFLICTS=     static-bash-[0-9]*
-
-PKG_INSTALLATION_TYPES=        overwrite pkgviews
-PKG_DESTDIR_SUPPORT=   user-destdir
-
-USE_TOOLS+=            makeinfo yacc
-USE_PKGLOCALEDIR=      yes
-TEXINFO_REQD=          4.1
-GNU_CONFIGURE=         yes
-MAKE_ENV+=             INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
-CONFIGURE_ARGS=                LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q}
-CPPFLAGS+=             -DDEFAULT_PATH_VALUE="\"/usr/bin:/bin:${LOCALBASE}/bin:/usr/local/bin\""
-MAKE_JOBS_SAFE=                no
-TEST_TARGET=           test
-
-INFO_FILES=            YES # PLIST
-PKG_SHELL=             bin/bash
-INSTALLATION_DIRS=     ${PKGMANDIR}/man1
-
-# All features enabled by default.
-CONFIGURE_ARGS+=       --enable-readline
-CONFIGURE_ARGS+=       --enable-progcomp
-CONFIGURE_ARGS+=       --enable-process-substitution
-CONFIGURE_ARGS+=       --enable-job-control
-CONFIGURE_ARGS+=       --enable-history
-CONFIGURE_ARGS+=       --enable-help-builtin
-CONFIGURE_ARGS+=       --enable-extended-glob
-CONFIGURE_ARGS+=       --enable-dparen-arithmetic
-CONFIGURE_ARGS+=       --enable-directory-stack
-CONFIGURE_ARGS+=       --enable-debugger
-CONFIGURE_ARGS+=       --enable-cond-regexp
-CONFIGURE_ARGS+=       --enable-alias
-CONFIGURE_ARGS+=       --enable-brace-expansion
-CONFIGURE_ARGS+=       --enable-array-variables
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.bash
-PKG_SUPPORTED_OPTIONS= static
-
-.include "../../mk/bsd.options.mk"
-
-##
-## Static link
-##
-.if !empty(PKG_OPTIONS:Mstatic)
-CONFIGURE_ARGS+=       --enable-static-link
-BUILDLINK_DEPMETHOD.gettext=   build
-BUILDLINK_DEPMETHOD.readline=  build
-.endif
-
-# the code has problems with older versions of yacc
-.if !empty(MACHINE_PLATFORM:MIRIX-5*)
-USE_TOOLS+=    bison
-.endif
-
-# Use "readline" package on Darwin to avoid link erros.
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=               --with-installed-readline
-
-USE_GNU_READLINE=              yes
-BUILDLINK_API_DEPENDS.readline+=       readline>=4.3
-
-.include "../../devel/readline/buildlink3.mk"
-.endif
-
-post-install:
-       ${INSTALL_MAN} ${WRKSRC}/doc/bash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_MAN} ${WRKSRC}/doc/bashbug.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/shells/bash3/PLIST b/shells/bash3/PLIST
deleted file mode 100644 (file)
index d800cbc..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/24 15:47:43 wiz Exp $
-bin/bash
-bin/bashbug
-info/bash.info
-man/man1/bash.1
-man/man1/bashbug.1
-share/locale/en@boldquot/LC_MESSAGES/bash.mo
-share/locale/en@quot/LC_MESSAGES/bash.mo
diff --git a/shells/bash3/distinfo b/shells/bash3/distinfo
deleted file mode 100644 (file)
index b3900d2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/02/24 15:47:43 wiz Exp $
-
-SHA1 (bash-3.2.48.tar.gz) = efaff12f5d58d81999830891b030842858a1e7e8
-RMD160 (bash-3.2.48.tar.gz) = 41b7091859e64b049d131ed3e84909916a2e4a2f
-Size (bash-3.2.48.tar.gz) = 2541712 bytes
-SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8
-SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
-SHA1 (patch-ah) = 6f88b33d9b56fabd319fa23cd1ff41594a01045b
diff --git a/shells/bash3/patches/patch-af b/shells/bash3/patches/patch-af
deleted file mode 100644 (file)
index f3abd88..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/02/24 15:47:43 wiz Exp $
-
---- builtins/printf.def.orig   2007-09-18 15:24:09.000000000 +0000
-+++ builtins/printf.def
-@@ -74,6 +74,11 @@ $END
- #  undef PRIdMAX
- #endif
-+#if defined (_AIX) && !defined (_AIX51)
-+   /* AIX defines do not work.  Undefine them.  */
-+#  undef PRIdMAX
-+#  undef PRIuMAX
-+#endif
- #if !defined (PRIdMAX)
- #  if HAVE_LONG_LONG
- #    define PRIdMAX   "lld"
-@@ -81,6 +86,13 @@ $END
- #    define PRIdMAX   "ld"
- #  endif
- #endif
-+#if !defined (PRIuMAX) && defined (_AIX)
-+#  if HAVE_LONG_LONG
-+#    define PRIuMAX "llu"
-+#  else
-+#    define PRIuMAX "lu"
-+#  endif
-+#endif
- #if !defined (errno)
- extern int errno;
-@@ -466,7 +478,11 @@ printf_builtin (list)
-               p = pp = getintmax ();
-               if (p != pp)
-                 {
-+#if defined (_AIX) && !defined (_AIX51)
-+                  f = mklong (start, PRIdMAX, sizeof (intmax_t) - 2);
-+#else
-                   f = mklong (start, PRIdMAX, sizeof (PRIdMAX) - 2);
-+#endif
-                   PF (f, pp);
-                 }
-               else
-@@ -493,7 +509,11 @@ printf_builtin (list)
-               p = pp = getuintmax ();
-               if (p != pp)
-                 {
-+#if defined (_AIX) && !defined (_AIX51)
-+                  f = mklong (start, PRIuMAX, sizeof (uintmax_t) - 2);
-+#else
-                   f = mklong (start, PRIdMAX, sizeof (PRIdMAX) - 2);
-+#endif
-                   PF (f, pp);
-                 }
-               else
diff --git a/shells/bash3/patches/patch-ag b/shells/bash3/patches/patch-ag
deleted file mode 100644 (file)
index d8cf2c6..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/02/24 15:47:43 wiz Exp $
-
---- builtins/psize.c.orig      2005-07-07 14:21:32.000000000 +0200
-+++ builtins/psize.c
-@@ -41,10 +41,6 @@
- #include "../general.h"
- #include "../sig.h"
--#ifndef errno
--extern int errno;
--#endif
--
- int nw;
- sighandler
diff --git a/shells/bash3/patches/patch-ah b/shells/bash3/patches/patch-ah
deleted file mode 100644 (file)
index e67d691..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/02/24 15:47:43 wiz Exp $
-
---- po/LINGUAS.orig    2006-01-10 22:51:33.000000000 +0000
-+++ po/LINGUAS
-@@ -1,2 +1,2 @@
- # Set of available languages.
--en@quot en@boldquot ru
-+en@quot en@boldquot
index aba6751..a300ee1 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2010/01/16 19:27:18 heinz Exp $
+# $NetBSD: Makefile,v 1.28 2010/02/15 13:39:39 sno Exp $
 
-DISTNAME=              Time-HiRes-1.9719
+DISTNAME=              Time-HiRes-1.9720
 PKGNAME=               p5-${DISTNAME}
-PKGREVISION=           1
+#PKGREVISION=          1
 SVR4_PKGNAME=          p5thr
 CATEGORIES=            time perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=Time/}
index da9d3f0..1e0c8d8 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2009/02/25 20:59:56 sno Exp $
+$NetBSD: distinfo,v 1.16 2010/02/15 13:39:39 sno Exp $
 
-SHA1 (Time-HiRes-1.9719.tar.gz) = 800f3c97491706824dd1b946d417807b813bb56a
-RMD160 (Time-HiRes-1.9719.tar.gz) = 3e56602cc5dddac6204e12c48d215acf222ff13e
-Size (Time-HiRes-1.9719.tar.gz) = 87541 bytes
+SHA1 (Time-HiRes-1.9720.tar.gz) = 83e69dfc8d40f98f771a4906c3bc5f8de4894704
+RMD160 (Time-HiRes-1.9720.tar.gz) = 5fb2d88678a3cbd8e42d8ce6d45e6ef7686d3a96
+Size (Time-HiRes-1.9720.tar.gz) = 87505 bytes
index 4ad88e4..4d95d93 100644 (file)
@@ -4,7 +4,6 @@
 .include "../../wip/sj3/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/sj3-/sj3-server-/}
-PKGREVISION=   1
 
 COMMENT=       SJ3 Japanese input method server
 
@@ -23,13 +22,11 @@ CONF_FILES+=                share/examples/sj3/sj3proxy.lua.example \
 CONF_FILES+=           share/examples/sj3/sj3serv.lua.example \
                        ${PKG_SYSCONFDIR}/sj3serv.lua
 
-MAKE_DIRS+=            ${VARBASE}
-OWN_DIRS_PERMS+=       ${VARBASE}/sj3 ${SJ3OWNER} ${SJ3GROUP} 755
 OWN_DIRS_PERMS+=       ${VARBASE}/sj3/run ${SJ3OWNER} ${SJ3GROUP} 755
 OWN_DIRS_PERMS+=       ${VARBASE}/sj3/dict/user ${SJ3OWNER} ${SJ3GROUP} 700
 CONF_FILES_PERMS+=      libdata/sj3main.dic \
                        ${VARBASE}/sj3/dict/sj3main.dic \
-                       ${ROOT_USER} ${ROOT_GROUP} 644
+                       ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
 
 RCD_SCRIPTS=           sj3proxy sj3serv
 
index 9c52b28..5703adc 100644 (file)
@@ -19,7 +19,6 @@ DISTINFO_FILE=        ${.CURDIR}/../../wip/sj3/distinfo
 PATCHDIR=      ${.CURDIR}/../../wip/sj3/patches
 
 GNU_CONFIGURE= yes
-USE_TOOLS+=    aclocal autoconf automake
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 
@@ -46,6 +45,3 @@ CONFIGURE_ARGS+=      --disable-demo
 BUILD_DEFS+=           VARBASE
 
 PKG_SYSCONFSUBDIR=     sj3
-
-pre-configure:
-       ${RUN} cd ${WRKSRC}; aclocal; autoconf; automake
index ec4f206..bbc3032 100644 (file)
@@ -1,12 +1,6 @@
 $NetBSD$
 
-SHA1 (sj3-2.0.1.23.tar.gz) = 511b45c43ec72d85421e94f41b53adc677f19bf7
-RMD160 (sj3-2.0.1.23.tar.gz) = a4ff47ea13e18792c3734243d80e4eb9d47913db
-Size (sj3-2.0.1.23.tar.gz) = 1110084 bytes
-SHA1 (patch-aa) = f4ab12c0ba329c2c2bc14b0fc4b0caa4fb14eba8
-SHA1 (patch-ab) = 3676ece5f2e862196abe5fce8908186006c57cb7
-SHA1 (patch-ac) = 435ec69a5040eadcb43e37a019d001282388c9aa
-SHA1 (patch-ad) = e21e334bdc9a2444c7691fc3d0d9ac5435a8bf94
-SHA1 (patch-ae) = 8b86bff6662ee029aaf4fb87ccb3f6b2cd5c81bf
-SHA1 (patch-af) = bd50302329f0c651a1cfb44edd5afd382adf2a0c
-SHA1 (patch-ag) = 6e026d2f58bb5744d9ee7df1ab74916b08d90048
+SHA1 (sj3-2.0.1.23p1.tar.gz) = 313a8f71f03071ad4d6006d18b569ce390edca8d
+RMD160 (sj3-2.0.1.23p1.tar.gz) = 2541f19bcf6b74c5b59c2e930fe27bb0ffa97ddf
+Size (sj3-2.0.1.23p1.tar.gz) = 1117190 bytes
+SHA1 (patch-ah) = 83416c5aeae4514349c6ab1a4f1ac3018feea406
diff --git a/wip/sj3/patches/patch-aa b/wip/sj3/patches/patch-aa
deleted file mode 100644 (file)
index 38722b4..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
---- Makefile.am.orig   2008-02-12 16:56:07.000000000 +0000
-+++ Makefile.am
-@@ -15,4 +15,4 @@ SUBDIRS = \
-       dict
- install-data-local:
--      $(mkdir_p) $(SJ3VARDIR)
-+      $(mkdir_p) $(DESTDIR)$(SJ3VARDIR)
diff --git a/wip/sj3/patches/patch-ab b/wip/sj3/patches/patch-ab
deleted file mode 100644 (file)
index 2309621..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- configure.in.orig  2008-02-17 06:27:27.000000000 +0000
-+++ configure.in
-@@ -820,7 +820,11 @@ AC_ARG_WITH(external-lua,
-     fi
-   ],
-   [
-+    if test "x$enable_server" = "xyes"; then
-       with_internal_lua=yes
-+    else
-+      with_internal_lua=no
-+    fi
-   ]
- )
- AM_CONDITIONAL(SJ3_INTERNAL_LUA, test x$with_internal_lua = xyes)
diff --git a/wip/sj3/patches/patch-ac b/wip/sj3/patches/patch-ac
deleted file mode 100644 (file)
index a66695e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- dict/Makefile.am.orig      2008-02-12 16:55:23.000000000 +0000
-+++ dict/Makefile.am
-@@ -8,11 +8,11 @@ sj3main.dic: visual.dic
-       $(top_srcdir)/src/sj3mkdic/sj3mkdic ./visual.dic sj3main.dic > Moutput
- install::
--      ($(mkdir_p) $(SJ3DICTDIR); \
--       $(INSTALL_DATA) sj3main.dic $(SJ3DICTDIR); \
--       $(mkdir_p) $(SJ3DICTDIR)/user; \
--       chown $(SJ3OWNER) $(SJ3DICTDIR)/user; \
--       chgrp $(SJ3GROUP) $(SJ3DICTDIR)/user;)
-+      ($(mkdir_p) $(DESTDIR)$(SJ3DICTDIR); \
-+       $(INSTALL_DATA) sj3main.dic $(DESTDIR)$(SJ3DICTDIR); \
-+       $(mkdir_p) $(DESTDIR)$(SJ3DICTDIR)/user; \
-+       chown $(SJ3OWNER) $(DESTDIR)$(SJ3DICTDIR)/user; \
-+       chgrp $(SJ3GROUP) $(DESTDIR)$(SJ3DICTDIR)/user;)
- CLEANFILES = sj3main.dic Moutput
diff --git a/wip/sj3/patches/patch-ad b/wip/sj3/patches/patch-ad
deleted file mode 100644 (file)
index a1961ab..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- include/Makefile.am.orig   2008-02-12 16:55:27.000000000 +0000
-+++ include/Makefile.am
-@@ -2,6 +2,11 @@ SUBDIRS = \
-       sj3common \
-       sj3compat \
-       sj3core \
--      sj3lib \
--      sj3lua \
--      sj3rkcv
-+      sj3lua
-+
-+if BUILDABLE_SJ3CLIENT
-+SUBDIRS+=sj3lib
-+endif
-+if BUILDABLE_SJ3DEMO
-+SUBDIRS+=sj3rkcv
-+endif
diff --git a/wip/sj3/patches/patch-ae b/wip/sj3/patches/patch-ae
deleted file mode 100644 (file)
index 3fdbcb4..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- lib/sj3lua/Makefile.am.orig        2008-02-12 16:55:46.000000000 +0000
-+++ lib/sj3lua/Makefile.am
-@@ -1,3 +1,5 @@
-+if BUILDABLE_SJ3SERV
-+
- INCLUDES = \
-       -I$(top_srcdir)/include/sj3compat \
-       -I$(top_srcdir)/include/sj3lua
-@@ -14,3 +16,5 @@ noinst_LTLIBRARIES = libsj3lua.la
- libsj3lua_la_SOURCES = \
-       sj3lua.c
-+
-+endif
diff --git a/wip/sj3/patches/patch-af b/wip/sj3/patches/patch-af
deleted file mode 100644 (file)
index ee6116a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- src/sj3proxy/priv.c.orig   2008-02-12 16:56:03.000000000 +0000
-+++ src/sj3proxy/priv.c
-@@ -57,12 +57,12 @@ set_priv(const char *title)
-           setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
-           setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1
- #elif defined(HAVE_SETREUID) && !defined(BROKEN_SETREUID)
--          setregid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
--          setreuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1
-+          setregid(pw->pw_gid, pw->pw_gid) == -1 ||
-+          setreuid(pw->pw_uid, pw->pw_uid) == -1
- #else
- # ifndef SETEUID_BREAKS_SETUID
-           setegid(pw->pw_gid) == -1 ||
--          seteuid(pw->pw_uid) == -1
-+          seteuid(pw->pw_uid) == -1 ||
- # endif
-           setgid(pw->pw_gid) == -1 ||
-           setuid(pw->pw_uid) == -1
diff --git a/wip/sj3/patches/patch-ag b/wip/sj3/patches/patch-ag
deleted file mode 100644 (file)
index bcc158a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- src/sj3serv/priv.c.orig    2008-02-12 16:56:02.000000000 +0000
-+++ src/sj3serv/priv.c
-@@ -58,12 +58,12 @@ set_priv(const char *title)
-           setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
-           setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1
- #elif defined(HAVE_SETREUID) && !defined(BROKEN_SETREUID)
--          setregid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1 ||
--          setreuid(pw->pw_uid, pw->pw_uid, pw->pw_uid) == -1
-+          setregid(pw->pw_gid, pw->pw_gid) == -1 ||
-+          setreuid(pw->pw_uid, pw->pw_uid) == -1
- #else
- # ifndef SETEUID_BREAKS_SETUID
-           setegid(pw->pw_gid) == -1 ||
--          seteuid(pw->pw_uid) == -1
-+          seteuid(pw->pw_uid) == -1 ||
- # endif
-           setgid(pw->pw_gid) == -1 ||
-           setuid(pw->pw_uid) == -1
diff --git a/wip/sj3/patches/patch-ah b/wip/sj3/patches/patch-ah
new file mode 100644 (file)
index 0000000..8ffdb35
--- /dev/null
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Handled by pkgsrc framework.
+
+--- dict/Makefile.in.orig      2010-02-14 14:45:04.000000000 +0000
++++ dict/Makefile.in
+@@ -368,11 +368,6 @@ uninstall-am: uninstall-info-am
+ @BUILDABLE_SJ3DICT_TRUE@      $(top_builddir)/src/sj3mkdic/sj3mkdic ./visual.dic sj3main.dic > Moutput
+ @BUILDABLE_SJ3DICT_TRUE@install:: sj3main.dic
+-@BUILDABLE_SJ3DICT_TRUE@      ($(mkdir_p) $(DESTDIR)$(SJ3DICTDIR); \
+-@BUILDABLE_SJ3DICT_TRUE@       $(INSTALL_DATA) sj3main.dic $(DESTDIR)$(SJ3DICTDIR); \
+-@BUILDABLE_SJ3DICT_TRUE@       $(mkdir_p) $(DESTDIR)$(SJ3DICTDIR)/user; \
+-@BUILDABLE_SJ3DICT_TRUE@       chown $(SJ3OWNER) $(DESTDIR)$(SJ3DICTDIR)/user; \
+-@BUILDABLE_SJ3DICT_TRUE@       chgrp $(SJ3GROUP) $(DESTDIR)$(SJ3DICTDIR)/user;)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
index cf37126..f7f8164 100644 (file)
@@ -1,3 +1,3 @@
 # $NetBSD$
 
-SJ3_VERSION=   2.0.1.23
+SJ3_VERSION=   2.0.1.23p1
index b743889..8808aa9 100644 (file)
@@ -1,4 +1,5 @@
-The mod_fcgid Apache module is a binary compatible alternative to
-Apache module mod_fastcgi, but only for apache2 and later.
-FastCGI provides a high-performance alternative to CGI for writing
-webserver applications.
+High performance alternative to mod_cgi or mod_cgid, which starts a sufficient
+number instances of the CGI program to handle concurrent requests, and these
+programs remain running to handle further incoming requests. It is favored by
+the PHP developers, for example, as a preferred alternative to running mod_php
+in-process, delivering very similar performance.
index 8f765d2..e866f47 100644 (file)
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2008/06/12 02:14:54 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/02/15 11:38:44 fhajny Exp $
 
-DISTNAME=      mod_fcgid.2.2
-PKGNAME=       ${APACHE_PKG_PREFIX}-fcgid-2.2
+DISTNAME=      mod_fcgid-2.3.5
+PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mod-fcgid/}
+MASTER_SITES=  ${MASTER_SITE_APACHE:=httpd/mod_fcgid/}
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
-HOMEPAGE=      http://fastcgi.coremail.cn/
-COMMENT=       Binary compatible alternative to Apache module mod_fastcgi
+HOMEPAGE=      http://httpd.apache.org/mod_fcgid/
+COMMENT=       High performance alternative to mod_cgi or mod_cgid
+LICENSE=       apache-2.0
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -15,13 +16,13 @@ PKG_APACHE_ACCEPTED=        apache2 apache22
 APACHE_MODULE=         YES
 USE_LIBTOOL=           YES
 
+CONFIGURE_ENV+=                APXS=${APXS:Q}
+
 MAKE_FLAGS+=           LIBTOOL=${LIBTOOL:Q}
 MAKE_FLAGS+=           INCLUDES="-I${BUILDLINK_PREFIX.apache}/include/httpd"
 
-SUBST_CLASSES+=                ap2
-SUBST_STAGE.ap2=       pre-build
-SUBST_FILES.ap2=       Makefile
-SUBST_SED.ap2=         -e s,/usr/local/apache2,${PREFIX}/share/httpd,
+do-configure:
+       cd ${WRKSRC} && ./configure.apxs
 
 .include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
index f74be5c..28127aa 100644 (file)
@@ -1,2 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/01/25 20:22:54 abs Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/02/15 11:38:44 fhajny Exp $
 lib/httpd/mod_fcgid.so
+share/httpd/manual/mod/mod_fcgid.html
+share/httpd/manual/mod/mod_fcgid.html.en
+share/httpd/manual/mod/mod_fcgid.xml
+share/httpd/manual/mod/mod_fcgid.xml.meta
index 9213544..31e2274 100644 (file)
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/04/17 18:18:08 abs Exp $
+$NetBSD: distinfo,v 1.3 2010/02/15 11:38:44 fhajny Exp $
 
-SHA1 (mod_fcgid.2.2.tar.gz) = dc817a20ad6528480a441e4b7ad6920ec11c55e0
-RMD160 (mod_fcgid.2.2.tar.gz) = 9c45c2b25fcf0f4069cee4fb8917493f0a13b338
-Size (mod_fcgid.2.2.tar.gz) = 56954 bytes
+SHA1 (mod_fcgid-2.3.5.tar.gz) = e64d21ee27b8c0327c1c2754a68173def5c80de6
+RMD160 (mod_fcgid-2.3.5.tar.gz) = 9e989b6f91dcffa8a61dd855aa305bfc5c698dab
+Size (mod_fcgid-2.3.5.tar.gz) = 97784 bytes
+SHA1 (patch-aa) = 412ff767f32e569e7cee1940d382ea2d0f4ea235
diff --git a/www/ap2-fcgid/patches/patch-aa b/www/ap2-fcgid/patches/patch-aa
new file mode 100644 (file)
index 0000000..eccbc98
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2010/02/15 11:38:44 fhajny Exp $
+
+Do not mangle httpd.conf.
+
+--- Makefile.apxs.orig 2009-11-11 15:13:31.000000000 +0000
++++ Makefile.apxs
+@@ -21,7 +21,7 @@ SUBDIRS = modules/fcgid
+ CLEAN_SUBDIRS = 
+ TARGETS         = 
+-INSTALL_TARGETS = install-conf install-manual
++INSTALL_TARGETS = install-manual
+ ## no such targets yet; install-include
+ DISTCLEAN_TARGETS  = config.apxs.log modules/fcgid/fcgid_config.h
+ EXTRACLEAN_TARGETS =