update Tue Jun 15 18:37:00 PDT 2010
authorCharlie <root@crater.dragonflybsd.org>
Wed, 16 Jun 2010 01:46:20 +0000 (18:46 -0700)
committerCharlie <root@crater.dragonflybsd.org>
Wed, 16 Jun 2010 01:46:20 +0000 (18:46 -0700)
105 files changed:
archivers/file-roller/Makefile
archivers/file-roller/PLIST
archivers/file-roller/distinfo
archivers/file-roller/patches/patch-unzip
audio/Makefile
audio/gmpc-magnatune/DESCR [new file with mode: 0644]
audio/gmpc-magnatune/Makefile [new file with mode: 0644]
audio/gmpc-magnatune/PLIST [new file with mode: 0644]
audio/gmpc-magnatune/distinfo [new file with mode: 0644]
devel/devhelp/Makefile
devel/devhelp/PLIST
devel/devhelp/distinfo
doc/CHANGES-2010
doc/TODO
editors/gconf-editor/Makefile
editors/gconf-editor/PLIST
editors/gconf-editor/distinfo
fonts/gucharmap/Makefile
fonts/gucharmap/buildlink3.mk
mail/courier-imap/Makefile
mail/courier-imap/PLIST
mail/courier-imap/distinfo
mail/courier-imap/patches/patch-aa
mail/courier-imap/patches/patch-ad
mail/courier-imap/patches/patch-af
mail/courier-imap/patches/patch-ah
mail/courier-imap/patches/patch-an [deleted file]
mail/courier-maildir/distinfo
mail/courier-mta/Makefile
mail/courier-mta/Makefile.common
mail/courier-mta/distinfo
mail/courier-mta/patches/patch-aa
mail/courier-mta/patches/patch-ab
mail/courier-mta/patches/patch-ac
mail/courier-mta/patches/patch-ad
mail/courier-mta/patches/patch-af
mail/courier-mta/patches/patch-ah
mail/courier-mta/patches/patch-an
mail/courier-mta/patches/patch-ax
mail/courier-mta/patches/patch-ay
mail/courier-mta/patches/patch-az [deleted file]
mail/maildrop/Makefile
mail/maildrop/PLIST
mail/maildrop/distinfo
mail/maildrop/patches/patch-aa
mail/maildrop/patches/patch-ab
mail/maildrop/patches/patch-ac
mail/maildrop/patches/patch-ad [deleted file]
mail/sqwebmail/Makefile
mail/sqwebmail/PLIST
mail/sqwebmail/distinfo
mail/sqwebmail/patches/patch-aa
mail/sqwebmail/patches/patch-ad
mail/sqwebmail/patches/patch-ah
mail/sqwebmail/patches/patch-aj
mail/sqwebmail/patches/patch-am
math/gcalctool/Makefile
math/gcalctool/PLIST
math/gcalctool/distinfo
math/gnumeric110/Makefile
math/gnumeric110/PLIST
math/gnumeric110/distinfo
meta-pkgs/courier/Makefile
misc/goffice0.8/Makefile
misc/goffice0.8/PLIST
misc/goffice0.8/distinfo
misc/openoffice3/Makefile
misc/yelp/Makefile
misc/yelp/PLIST
misc/yelp/distinfo
misc/yelp/patches/patch-ac [deleted file]
misc/yelp/patches/patch-ad [deleted file]
misc/yelp/patches/patch-ae [deleted file]
misc/yelp/patches/patch-af [deleted file]
net/couriertcpd/Makefile
net/couriertcpd/distinfo
net/miredo/Makefile
net/miredo/distinfo
net/miredo/patches/patch-ag [deleted file]
net/miredo/patches/patch-ah
pkgtools/pbulk/Makefile
pkgtools/pbulk/files/pbulk/scripts/pkg-build
pkgtools/pbulk/files/pbulk/scripts/scan
pkgtools/pkglint/files/pkglint.pl
pkgtools/rpm2pkg/Makefile
pkgtools/rpm2pkg/files/rpm2pkg.c
security/courier-authlib/Makefile
security/courier-authlib/buildlink3.mk
security/courier-authlib/distinfo
security/courier-authlib/patches/patch-aa
security/courier-authlib/patches/patch-ab
security/opendnssec/Makefile
security/opendnssec/PLIST
security/opendnssec/distinfo
security/opendnssec/patches/patch-aa
www/nginx/Makefile
www/nginx/PLIST
www/nginx/distinfo
www/nginx/options.mk
www/nginx/patches/patch-ab [new file with mode: 0644]
www/py-uwsgi/Makefile
www/py-uwsgi/distinfo
x11/gtk2-engines/Makefile
x11/gtk2-engines/PLIST
x11/gtk2-engines/distinfo

index 3f6be2b..1f3085b 100644 (file)
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.101 2010/06/13 22:43:46 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2010/06/15 20:48:23 drochner Exp $
 #
 
-DISTNAME=      file-roller-2.28.2
-PKGREVISION=   1
+DISTNAME=      file-roller-2.30.1.1
 CATEGORIES=    archivers gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/file-roller/2.28/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/file-roller/2.30/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
index 64b1d83..b542f66 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2009/12/16 17:22:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.35 2010/06/15 20:48:23 drochner Exp $
 bin/file-roller
 libexec/file-roller/isoinfo.sh
 libexec/file-roller/rpm2cpio
@@ -9,6 +9,7 @@ share/file-roller/icons/hicolor/16x16/actions/extract-archive.png
 share/file-roller/icons/hicolor/24x24/actions/add-files-to-archive.png
 share/file-roller/icons/hicolor/24x24/actions/add-folder-to-archive.png
 share/file-roller/icons/hicolor/24x24/actions/extract-archive.png
+share/file-roller/packages.match
 share/file-roller/ui/add-options.ui
 share/file-roller/ui/batch-add-files.ui
 share/file-roller/ui/batch-password.ui
@@ -122,6 +123,12 @@ share/gnome/help/file-roller/vi/figures/file-roller_main_window.png
 share/gnome/help/file-roller/vi/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/vi/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/vi/file-roller.xml
+share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png
+share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
+share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/zh_CN/file-roller.xml
 share/icons/hicolor/16x16/apps/file-roller.png
 share/icons/hicolor/22x22/apps/file-roller.png
 share/icons/hicolor/24x24/apps/file-roller.png
@@ -148,6 +155,7 @@ share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
 share/locale/dz/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
+share/locale/en@shaw/LC_MESSAGES/file-roller.mo
 share/locale/en_CA/LC_MESSAGES/file-roller.mo
 share/locale/en_GB/LC_MESSAGES/file-roller.mo
 share/locale/es/LC_MESSAGES/file-roller.mo
@@ -236,3 +244,4 @@ share/omf/file-roller/file-roller-ru.omf
 share/omf/file-roller/file-roller-sv.omf
 share/omf/file-roller/file-roller-uk.omf
 share/omf/file-roller/file-roller-vi.omf
+share/omf/file-roller/file-roller-zh_CN.omf
index 4184b3c..a7d69ff 100644 (file)
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.51 2009/12/16 17:22:19 drochner Exp $
+$NetBSD: distinfo,v 1.52 2010/06/15 20:48:23 drochner Exp $
 
-SHA1 (file-roller-2.28.2.tar.bz2) = e2a1535b1f8d76db95521b95d8efc9b596be5999
-RMD160 (file-roller-2.28.2.tar.bz2) = 2c5bef872de906a86dee98b1add2ba489ed8907d
-Size (file-roller-2.28.2.tar.bz2) = 1749187 bytes
+SHA1 (file-roller-2.30.1.1.tar.bz2) = 256d86b66fcb671d7bd23b797bd16ba013558698
+RMD160 (file-roller-2.30.1.1.tar.bz2) = 46a9e38f62ae3428da1d991dcef856d94cd180b3
+Size (file-roller-2.30.1.1.tar.bz2) = 1816845 bytes
 SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf
-SHA1 (patch-unzip) = d1abae47ce713af26875c972b351fcd4d00ca22e
+SHA1 (patch-unzip) = 1cd1c33445e2699694ef7daf6dcd09a54fec53bb
index a945c8b..0bf5fc0 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: patch-unzip,v 1.1 2009/09/19 07:46:56 ahoka Exp $
+$NetBSD: patch-unzip,v 1.2 2010/06/15 20:48:23 drochner Exp $
 
---- src/fr-command-zip.c.orig  2009-06-30 01:32:59.000000000 +0200
+--- src/fr-command-zip.c.orig  2010-03-11 17:44:54.000000000 +0000
 +++ src/fr-command-zip.c
 @@ -33,6 +33,7 @@
  #include "fr-command.h"
@@ -37,12 +37,12 @@ $NetBSD: patch-unzip,v 1.1 2009/09/19 07:46:56 ahoka Exp $
        fr_process_add_arg (comm->process, "-t");
        add_password_arg (comm, comm->password);
        fr_process_add_arg (comm->process, comm->filename);
-@@ -399,7 +400,7 @@ fr_command_zip_get_capabilities (FrComma
+@@ -400,7 +401,7 @@ fr_command_zip_get_capabilities (FrComma
                else
                        capabilities |= FR_COMMAND_CAN_READ_WRITE;
        }
--      else if (is_program_in_path ("unzip"))
-+      else if (is_program_in_path (FR_UNZIP_COMMAND))
+-      else if (is_program_available ("unzip", check_command))
++      else if (is_program_available (FR_UNZIP_COMMAND, check_command))
                capabilities |= FR_COMMAND_CAN_READ;
  
        return capabilities;
index a869d8d..a6ba8e2 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.437 2010/06/05 09:28:40 obache Exp $
+# $NetBSD: Makefile,v 1.438 2010/06/15 21:25:23 joerg Exp $
 #
 
 COMMENT=       Audio tools
@@ -123,6 +123,7 @@ SUBDIR+=    gkrellm-xmms
 SUBDIR+=       glurp
 SUBDIR+=       gmp3info
 SUBDIR+=       gmpc
+SUBDIR+=       gmpc-magnatune
 SUBDIR+=       gnome-audio
 SUBDIR+=       gnome-speech
 SUBDIR+=       gnome-speech-espeak
diff --git a/audio/gmpc-magnatune/DESCR b/audio/gmpc-magnatune/DESCR
new file mode 100644 (file)
index 0000000..9d4a69c
--- /dev/null
@@ -0,0 +1,6 @@
+The GNOME Music Player Client is a GTK+ client for remote access,
+control and playlist management of the Music Player Daemon featuring
+ID3 Support and a tray icon for your notification area.
+
+The Magnatune plugin allows easy browsing and playback from the
+Magnatune.com catalog.
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
new file mode 100644 (file)
index 0000000..6a5d65c
--- /dev/null
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1.1.1 2010/06/15 21:24:53 joerg Exp $
+#
+
+DISTNAME=              gmpc-magnatune-0.20.0
+CATEGORIES=            audio
+MASTER_SITES=          http://download.sarine.nl/Programs/gmpc/0.20.0/ \
+                       ${MASTER_SITE_SOURCEFORGE:=musicpd/}
+
+MAINTAINER=            pkgsrc-users@NetBSD.org
+HOMEPAGE=              http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MAGNATUNE
+COMMENT=               Magnatune plugin for GMPC
+LICENSE=               gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+USE_PKGLOCALEDIR=      yes
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            intltool msgfmt pkg-config
+
+.include "../../audio/gmpc/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc-magnatune/PLIST b/audio/gmpc-magnatune/PLIST
new file mode 100644 (file)
index 0000000..83053f6
--- /dev/null
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/06/15 21:24:53 joerg Exp $
+lib/gmpc/plugins/magnatuneplugin.la
+share/gmpc/plugins/magnatune/magnatune.png
diff --git a/audio/gmpc-magnatune/distinfo b/audio/gmpc-magnatune/distinfo
new file mode 100644 (file)
index 0000000..83cf990
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2010/06/15 21:24:53 joerg Exp $
+
+SHA1 (gmpc-magnatune-0.20.0.tar.gz) = f0363aab8f8c18a741da4e009ed880125be86a1c
+RMD160 (gmpc-magnatune-0.20.0.tar.gz) = 5d10ff3423eb16caccb6b561a273dc7a2dc94675
+Size (gmpc-magnatune-0.20.0.tar.gz) = 318606 bytes
index 88897ed..5a58236 100644 (file)
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2010/06/13 22:44:03 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2010/06/15 20:54:37 drochner Exp $
 
-DISTNAME=              devhelp-2.28.1
-PKGREVISION=           3
+DISTNAME=              devhelp-2.30.0
 CATEGORIES=            devel x11
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/devhelp/2.28/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/devhelp/2.30/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users@NetBSD.org
index c25a152..c2c44ab 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/10/30 16:57:53 drochner Exp $
+@comment $NetBSD: PLIST,v 1.17 2010/06/15 20:54:37 drochner Exp $
 bin/devhelp
 include/devhelp-1.0/devhelp/dh-assistant-view.h
 include/devhelp-1.0/devhelp/dh-assistant.h
@@ -34,6 +34,7 @@ share/icons/hicolor/48x48/apps/devhelp.png
 share/icons/hicolor/scalable/apps/devhelp.svg
 share/locale/am/LC_MESSAGES/devhelp.mo
 share/locale/ar/LC_MESSAGES/devhelp.mo
+share/locale/ast/LC_MESSAGES/devhelp.mo
 share/locale/az/LC_MESSAGES/devhelp.mo
 share/locale/be/LC_MESSAGES/devhelp.mo
 share/locale/be@latin/LC_MESSAGES/devhelp.mo
@@ -47,6 +48,7 @@ share/locale/da/LC_MESSAGES/devhelp.mo
 share/locale/de/LC_MESSAGES/devhelp.mo
 share/locale/dz/LC_MESSAGES/devhelp.mo
 share/locale/el/LC_MESSAGES/devhelp.mo
+share/locale/en@shaw/LC_MESSAGES/devhelp.mo
 share/locale/en_CA/LC_MESSAGES/devhelp.mo
 share/locale/en_GB/LC_MESSAGES/devhelp.mo
 share/locale/es/LC_MESSAGES/devhelp.mo
index efceb7c..50ef11d 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2009/10/30 16:57:53 drochner Exp $
+$NetBSD: distinfo,v 1.16 2010/06/15 20:54:37 drochner Exp $
 
-SHA1 (devhelp-2.28.1.tar.bz2) = 8ebaf23722f823eed57b8b6d9fcf83e7b3eaf327
-RMD160 (devhelp-2.28.1.tar.bz2) = 688296616f35ac9af8d0849f6c5b230359ead0ab
-Size (devhelp-2.28.1.tar.bz2) = 473458 bytes
+SHA1 (devhelp-2.30.0.tar.bz2) = 8c99c673366ac3bd549f90b3eb2aa0474c3eb0b5
+RMD160 (devhelp-2.30.0.tar.bz2) = c763fd76c38d933b2e0bc27d7b791172852a27a2
+Size (devhelp-2.30.0.tar.bz2) = 484771 bytes
 SHA1 (patch-ad) = acd18af1eaf048db2bd0e3cbb432dc2674f5522c
index 6cac1c9..4737bc1 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.2242 2010/06/15 16:56:16 bad Exp $
+$NetBSD: CHANGES-2010,v 1.2257 2010/06/16 00:19:43 pettai Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -2392,6 +2392,8 @@ Changes to the packages collection and infrastructure in 2010:
        Updated print/tex-elsarticle to 1.20 [minskim 2010-05-10]
        Updated print/tex-elsarticle-doc to 1.20 [minskim 2010-05-10]
        Updated sysutils/cfengine2 to 2.2.10 [pettai 2010-05-10]
+       Updated net/ruby-dnsruby to 1.46 [pettai 2010-05-10]
+       Updated security/softhsm to version 1.1.4 [pettai 2010-05-10]
        Updated print/tex-algorithms to 2009 [minskim 2010-05-11]
        Updated print/tex-algorithms-doc to 2009 [minskim 2010-05-11]
        Updated print/tex-fancyvrb to 2.7anb1 [minskim 2010-05-11]
@@ -2884,6 +2886,7 @@ Changes to the packages collection and infrastructure in 2010:
        Updated editors/vim-share to 7.2.442 [martti 2010-06-07]
        Updated emulators/tme to 0.8 [tsutsui 2010-06-07]
        Updated databases/py-bsddb3 to 5.0.0nb1 [gls 2010-06-07]
+       Updated net/ruby-dnsruby to 1.47 [pettai 2010-06-07]
        Updated editors/emacs-snapshot to 24.0.50.20100602 [minskim 2010-06-07]
        Added games/powder version 114 [wiz 2010-06-08]
        Updated security/libgpg-error to 1.8 [wiz 2010-06-08]
@@ -2985,3 +2988,15 @@ Changes to the packages collection and infrastructure in 2010:
        Updated devel/hg-git to 0.2.2 [joerg 2010-06-15]
        Updated misc/openoffice3-bin to 3.2.1 [bad 2010-06-15]
        Updated devel/p5-Path-Class to 0.19 [bad 2010-06-15]
+       Updated pkgtools/rpm2pkg to 3.0.2 [tron 2010-06-15]
+       Updated pkgtools/pbulk to 0.47 [joerg 2010-06-15]
+       Added audio/gmpc-magnatune version 0.20.0 [joerg 2010-06-15]
+       Updated mail/courier-maildir to 0.65.0 [pettai 2010-06-15]
+       Updated net/couriertcpd to 0.65.0 [pettai 2010-06-15]
+       Updated mail/maildrop to 2.5.0 [pettai 2010-06-15]
+       Updated mail/courier-mta to 0.65.0 [pettai 2010-06-15]
+       Updated mail/courier-imap to 4.8.0 [pettai 2010-06-15]
+       Updated security/courier-authlib to 0.63.0 [pettai 2010-06-15]
+       Updated mail/sqwebmail to 5.4.1 [pettai 2010-06-15]
+       Updated net/miredo to 1.2.2 [pettai 2010-06-15]
+       Updated security/opendnssec to 1.1.0 [pettai 2010-06-16]
index dae8f14..100fe83 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9409 2010/06/15 14:50:09 wiz Exp $
+$NetBSD: TODO,v 1.9415 2010/06/15 23:28:00 pettai Exp $
 
 Suggested new packages
 ======================
@@ -489,10 +489,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o coreutils-8.4
        o courier-0.64.2
        o courier-analog-0.16
-       o courier-authlib-0.63.0
-       o courier-imap-4.7.0
-       o courier-maildir-0.64.0
-       o courier-mta-0.64.0
        o covered-0.7.8
        o covered-current-20090802
        o cpio-2.9
@@ -927,7 +923,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o mDNSResponder-214.3
        o maelstrom-sdl-3.0.6
        o maelstrom-x11-2.0.7
-       o maildrop-2.4.1 [security]
        o mailgraph-1.14
        o mailman-2.1.13
        o mailscanner-4.74
@@ -1290,7 +1285,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o spcaview-20060501
        o spim-7.4
        o sqlitemanager-1.2.4
-       o sqwebmail-5.4.1
        o srp_client-1.7.5
        o ssh-askpass-1.2.4.1
        o star-1.5.1
index 257ee14..74e4303 100644 (file)
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.68 2010/06/13 22:44:11 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/15 21:01:21 drochner Exp $
 #
 
-DISTNAME=              gconf-editor-2.28.0
-PKGREVISION=           1
+DISTNAME=              gconf-editor-2.30.0
 CATEGORIES=            editors gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gconf-editor/2.28/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gconf-editor/2.30/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users@NetBSD.org
@@ -23,12 +22,6 @@ CONFIGURE_ARGS+=     --with-gconf-mandatory-source=${GCONF_CONFIG_SOURCE:S/gconf.xml
 
 GCONF_SCHEMAS=         gconf-editor.schemas
 
-# needed for gconf-editor-2.28 and gtk2-2.20 -- remove on next update
-BUILDLINK_TRANSFORM+=  rm:-DG_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=  rm:-DGDK_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=  rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
-BUILDLINK_TRANSFORM+=  rm:-DGTK_DISABLE_DEPRECATED
-
 BUILDLINK_API_DEPENDS.GConf+=  GConf>=2.14.0
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -37,7 +30,7 @@ BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0
 .include "../../security/policykit/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
-BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.6.0
+BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
index 36320eb..897c75f 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/10/24 13:00:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/06/15 21:01:21 drochner Exp $
 bin/gconf-editor
 man/man1/gconf-editor.1
 share/applications/gconf-editor.desktop
@@ -161,6 +161,7 @@ share/locale/da/LC_MESSAGES/gconf-editor.mo
 share/locale/de/LC_MESSAGES/gconf-editor.mo
 share/locale/dz/LC_MESSAGES/gconf-editor.mo
 share/locale/el/LC_MESSAGES/gconf-editor.mo
+share/locale/en@shaw/LC_MESSAGES/gconf-editor.mo
 share/locale/en_CA/LC_MESSAGES/gconf-editor.mo
 share/locale/en_GB/LC_MESSAGES/gconf-editor.mo
 share/locale/es/LC_MESSAGES/gconf-editor.mo
index 5d8192b..fa7b71b 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2009/10/24 13:00:04 drochner Exp $
+$NetBSD: distinfo,v 1.21 2010/06/15 21:01:21 drochner Exp $
 
-SHA1 (gconf-editor-2.28.0.tar.bz2) = 5fd385886cb4b2232747b000f2523d7cdbc9b020
-RMD160 (gconf-editor-2.28.0.tar.bz2) = 9c6d619f672a8ce941ff1906b668bcd9676162ac
-Size (gconf-editor-2.28.0.tar.bz2) = 1405006 bytes
+SHA1 (gconf-editor-2.30.0.tar.bz2) = 5fd85bc70278d1904cbe6aec7509b30bed52adfc
+RMD160 (gconf-editor-2.30.0.tar.bz2) = 3a94bee90b068e87906258cbb144b2f27eef0187
+Size (gconf-editor-2.30.0.tar.bz2) = 1389176 bytes
index aa6fac0..780d65b 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2010/06/11 08:50:04 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2010/06/16 01:09:10 obache Exp $
 #
 
 DISTNAME=      gucharmap-2.28.2
+PKGREVISION=   1
 CATEGORIES=    fonts gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gucharmap/2.28/}
 EXTRACT_SUFX=  .tar.bz2
index b58b6c9..9ca1040 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2010/06/13 22:44:16 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2010/06/16 01:25:11 obache Exp $
 
 BUILDLINK_TREE+=       gucharmap
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        gucharmap
 GUCHARMAP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gucharmap+=      gucharmap>=2.24.1
-BUILDLINK_ABI_DEPENDS.gucharmap?=      gucharmap>=2.28.2
+BUILDLINK_ABI_DEPENDS.gucharmap?=      gucharmap>=2.28.2nb1
 BUILDLINK_PKGSRCDIR.gucharmap?=        ../../fonts/gucharmap
 
 .include "../../devel/gettext-lib/buildlink3.mk"
index 1417d03..c6bbe43 100644 (file)
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2010/03/21 16:29:40 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2010/06/15 23:07:06 pettai Exp $
 
-DISTNAME=      courier-imap-4.3.0
-PKGREVISION=   1
+DISTNAME=      courier-imap-4.8.0
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -10,8 +9,8 @@ MAINTAINER=    pkgsrc-users@NetBSD.org
 COMMENT=       IMAP server for access to maildir-style mailboxes
 HOMEPAGE=      http://www.courier-mta.org/imap/
 
-DEPENDS+=      courier-maildir>=0.58.0:../../mail/courier-maildir
-DEPENDS+=      couriertcpd>=0.58.0:../../net/couriertcpd
+DEPENDS+=      courier-maildir>=0.65.0:../../mail/courier-maildir
+DEPENDS+=      couriertcpd>=0.65.0:../../net/couriertcpd
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
index ded8fda..36b17c7 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 18:04:30 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2010/06/15 23:07:07 pettai Exp $
 bin/imapd
 libexec/courier/courierpop3d
 libexec/courier/courierpop3login
@@ -13,12 +13,12 @@ sbin/mkimapdcert
 sbin/mkpop3dcert
 sbin/pop3d
 sbin/pop3d-ssl
-share/courier/imapd
-share/courier/imapd-ssl
+share/courier/imapd.rc
+share/courier/imapd-ssl.rc
 share/courier/mkimapdcert
 share/courier/mkpop3dcert
-share/courier/pop3d
-share/courier/pop3d-ssl
+share/courier/pop3d.rc
+share/courier/pop3d-ssl.rc
 share/doc/courier/courierpop3d.html
 share/doc/courier/imap/BUGS.html
 share/doc/courier/imap/README.html
index 4d25f65..dc9f23a 100644 (file)
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.23 2008/02/19 18:45:14 jlam Exp $
+$NetBSD: distinfo,v 1.24 2010/06/15 23:07:07 pettai Exp $
 
-SHA1 (courier-imap-4.3.0.tar.bz2) = b7c091f2bfdd22308ac26724e88b50e7a4f68cb2
-RMD160 (courier-imap-4.3.0.tar.bz2) = 8865d4b139af5f85a08ce5f1b6e1e453d3827120
-Size (courier-imap-4.3.0.tar.bz2) = 3342522 bytes
-SHA1 (patch-aa) = 9b60c07f2a8c4c3fea3fac8c22a8386de3f7d53b
-SHA1 (patch-ad) = 8a80f42a179e34a838317a0aac2d0a811fd47071
+SHA1 (courier-imap-4.8.0.tar.bz2) = f688cea87c66181362622ce9cbd4710d75268cfc
+RMD160 (courier-imap-4.8.0.tar.bz2) = cfc0beec6893c155cf9712d920002320169ad0c5
+Size (courier-imap-4.8.0.tar.bz2) = 3362734 bytes
+SHA1 (patch-aa) = 268f89763de3cd3a02eb5179ca29fbd5478537a2
+SHA1 (patch-ad) = c62c5efde80bbd748d213e14235393bba81b57f5
 SHA1 (patch-ae) = 9d925f4639086af9f6faecd6a2fab2a9ecab670c
-SHA1 (patch-af) = 37c54ed8aca2f86ac142f8fa920c217058c5fc29
+SHA1 (patch-af) = 0fa0e0bd2f1908404f866de9358c74403615967f
 SHA1 (patch-ag) = 6ddd8b3f6a2cfbab4d814b51552dbf364384cf57
-SHA1 (patch-ah) = 1870daea8320cc9748961fc7e37237bd5cde1b3c
+SHA1 (patch-ah) = e81da45833698ff6da23de640efc322ce34cec0d
 SHA1 (patch-ak) = 057df5c41382768a0f221107137412c46200c035
-SHA1 (patch-an) = da8ce37a8a4ff57a25325153f1d68b7df865faee
 SHA1 (patch-ao) = f576d11ee217000a7760f153b131ed7a445d48f6
index ec9ee85..347c09a 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $
+$NetBSD: patch-aa,v 1.15 2010/06/15 23:07:07 pettai Exp $
 
---- Makefile.in.orig   Sat Sep 29 14:48:20 2007
-+++ Makefile.in
-@@ -250,9 +250,10 @@ DIST_SUBDIRS = numlib md5 sha1 bdbobj gd
+--- Makefile.in.orig   2010-05-30 23:20:04.000000000 +0200
++++ Makefile.in        2010-06-14 00:25:33.000000000 +0200
+@@ -289,9 +289,10 @@
  
 -sbin_SCRIPTS = sharedindexinstall sharedindexsplit
 +sbin_SCRIPTS = 
@@ -18,12 +18,12 @@ $NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $
 +sbinPROGRAMS = 
 +libexecPROGRAMS = imaplogin courierpop3login courierpop3d
  bin_PROGRAMS = @binPROGRAMS_exec@
-@@ -260,3 +261,3 @@ sbin_PROGRAMS = @sbinPROGRAMS_exec@
+@@ -299,3 +300,3 @@
  libexec_PROGRAMS = @libexecPROGRAMS_exec@
 -man_MANS = couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1
 +man_MANS = courierimapd.8 courierpop3d.8 mkimapdcert.8 mkpop3dcert.8
  
-@@ -271,5 +272,5 @@ EXTRA_DIST = 00README.NOW.OR.SUFFER READ
+@@ -310,5 +311,5 @@
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -      imapd.cnf pop3d.cnf quotawarnmsg.example
 +      imapd.cnf pop3d.cnf
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $
 -libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
 +libexec_SCRIPTS = 
  HTML2TXT = links -dump -no-numbering -no-references
-@@ -1045,7 +1046,7 @@ sharedindexsplit: maildir/sharedindexspl
+@@ -1227,7 +1228,7 @@
  
 -pop3login$(EXEEXT): imap/pop3login$(EXEEXT)
 -      cp imap/pop3login$(EXEEXT) .
@@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $
 +courierpop3d$(EXEEXT): imap/pop3d$(EXEEXT)
 +      cp imap/pop3d$(EXEEXT) ./$@
  
-@@ -1093,4 +1094,7 @@ maildirkw.1: maildir/maildirkw.1
+@@ -1275,4 +1276,7 @@
  
 -imapd.8: imap/imapd.8
 -      cp imap/imapd.8 .
@@ -53,15 +53,18 @@ $NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $
 +courierpop3d.8: imap/courierpop3d.8
 +      cp imap/courierpop3d.8 .
  
-@@ -1120,6 +1124,4 @@ install-exec-local:
+@@ -1302,4 +1306,2 @@
        $(mkinstalldirs) $(DESTDIR)$(bindir)
 -      test ! -x tcpd/couriertls || $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) \
 -              tcpd/couriertls $(DESTDIR)$(bindir)/couriertls
        $(mkinstalldirs) $(DESTDIR)$(sbindir)
--      for f in mkimapdcert mkpop3dcert ; \
-+      for f in imapd-ssl imapd mkimapdcert mkpop3dcert pop3d pop3d-ssl ; \
-               do rm -f $(DESTDIR)$(sbindir)/$$f ; \
-@@ -1129,17 +1131,4 @@ install-exec-local:
+@@ -1308,2 +1310,5 @@
+               $(LN_S) $(databindir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
++      for f in imapd-ssl imapd pop3d pop3d-ssl ; \
++              do rm -f $(DESTDIR)$(sbindir)/$$f ; \
++              $(LN_S) $(databindir)/$$f.rc $(DESTDIR)$(sbindir)/$$f ; done
+       $(mkinstalldirs) $(DESTDIR)$(localstatedir)
+@@ -1311,17 +1316,4 @@
  install-exec-hook:
 -      chmod 444 $(DESTDIR)$(sysconfdir)/quotawarnmsg.example
 -      mkdir -p $(DESTDIR)$(sysconfdir)/shared
@@ -79,7 +82,7 @@ $NetBSD: patch-aa,v 1.14 2007/10/15 15:37:21 jlam Exp $
 -              $(INSTALL_DATA) $(srcdir)/imap/pop3d.pam \
 -              $(DESTDIR)/etc/pam.d/pop3 || exit 1
        for f in $(man_MANS); do chmod a+r $(DESTDIR)$(mandir)/*/$$f; done
-@@ -1150,3 +1139,2 @@ uninstall-local:
+@@ -1332,3 +1324,2 @@
                do rm -f $(DESTDIR)$(sbindir)/$$f ; done
 -      rm -f $(DESTDIR)$(bindir)/couriertls
  
index 3ac4263..f90fa64 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2008/02/19 18:45:14 jlam Exp $
+$NetBSD: patch-ad,v 1.10 2010/06/15 23:07:07 pettai Exp $
 
 --- configure.orig     2007-11-23 22:20:27.000000000 -0500
 +++ configure
-@@ -20576,9 +20576,6 @@ else
+@@ -12377,9 +12377,6 @@ else
  fi
  
  
index bc8923d..d8a89c1 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.8 2005/08/11 00:04:01 jlam Exp $
+$NetBSD: patch-af,v 1.9 2010/06/15 23:07:07 pettai Exp $
 
 --- imapd.rc.in.orig   2005-07-01 21:13:56.000000000 -0400
 +++ imapd.rc.in
@@ -15,6 +15,6 @@ $NetBSD: patch-af,v 1.8 2005/08/11 00:04:01 jlam Exp $
                        bindir=@bindir@ ;
                        libexecdir=@libexecdir@ ;
 +                      sbindir=@sbindir@ ;
-                               . @sysconfdir@/imapd ; \
                                . @sysconfdir@/imapd-ssl ; \
+                               . @sysconfdir@/imapd ; \
                IMAP_STARTTLS=$IMAPDSTARTTLS ; \
index 5add83b..21b0507 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.7 2005/08/11 00:04:01 jlam Exp $
+$NetBSD: patch-ah,v 1.8 2010/06/15 23:07:07 pettai Exp $
 
 --- pop3d.rc.in.orig   2005-07-01 21:13:56.000000000 -0400
 +++ pop3d.rc.in
@@ -15,6 +15,6 @@ $NetBSD: patch-ah,v 1.7 2005/08/11 00:04:01 jlam Exp $
                bindir=@bindir@ ;
                libexecdir=@libexecdir@ ;
 +              sbindir=@sbindir@ ;
-               . @sysconfdir@/pop3d ; \
                . @sysconfdir@/pop3d-ssl ; \
+               . @sysconfdir@/pop3d ; \
                PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
diff --git a/mail/courier-imap/patches/patch-an b/mail/courier-imap/patches/patch-an
deleted file mode 100644 (file)
index e868e8c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-an,v 1.1 2007/10/15 15:37:21 jlam Exp $
-
---- imap/mailboxlist.c.orig    Fri Jul 27 02:41:01 2007
-+++ imap/mailboxlist.c
-@@ -347,9 +347,11 @@ static void folder_entry(char *folder, c
-       if (!need_add_folders && !need_add_hier)
-               return; /* Nothing to do */
-+      {
-       CHECK_RIGHTSM(folder, have_rights, ACL_LOOKUP);
-       if (!have_rights[0])
-               return;
-+      }
-       if (need_add_folders)
-               (void) add_hier(folders, folder);
index 62bebfa..c9172cb 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2008/02/19 18:45:18 jlam Exp $
+$NetBSD: distinfo,v 1.13 2010/06/15 23:01:23 pettai Exp $
 
-SHA1 (courier-0.58.0.tar.bz2) = 964d81e6de5390678c9f10dddbc176273b925f6d
-RMD160 (courier-0.58.0.tar.bz2) = 940fb7967d154aeeb462691beb508155b3df4e29
-Size (courier-0.58.0.tar.bz2) = 7123136 bytes
+SHA1 (courier-0.65.0.tar.bz2) = 4e5b7e64a35fe886a59621bc87e7f111428f19bc
+RMD160 (courier-0.65.0.tar.bz2) = e5fc4742da27b3b97bd2592ad3ecc96618abada3
+Size (courier-0.65.0.tar.bz2) = 7099997 bytes
index a44a303..5f1caf9 100644 (file)
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2010/03/21 16:29:40 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/15 23:01:23 pettai Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/-mta-/}
-PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -15,7 +14,7 @@ HOMEPAGE=     http://www.courier-mta.org/
 
 DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
 DEPENDS+=      couriertcpd>=${COURIER_VERSION}:../../net/couriertcpd
-DEPENDS+=      maildrop>=2.0.4nb3:../../mail/maildrop
+DEPENDS+=      maildrop>=2.5.0:../../mail/maildrop
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 USE_TOOLS+=            gmake perl:run
@@ -45,7 +44,7 @@ CONFIGURE_ARGS+=      --with-mailgid=${PKG_GID.${COURIER_GROUP}}
 CONFIGURE_ARGS+=       --with-paranoid-smtpext
 CONFIGURE_ARGS+=       --with-piddir=${COURIER_STATEDIR:Q}/tmp
 CONFIGURE_ARGS+=       --with-transport=${COURIER_TRANSPORTS:M*:Q}
-CONFIGURE_ARGS+=       --without-certdb
+#CONFIGURE_ARGS+=      --with-certdb=${SSLCERTS}
 
 # This argument is actually here just to make the "webmail" configure
 # script work.  The value is not actually used since in reality, we are
index affb87e..a15bf1e 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.10 2009/05/19 08:59:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.11 2010/06/15 23:01:23 pettai Exp $
 
-COURIER_VERSION=       0.58.0
+COURIER_VERSION=       0.65.0
 LICENSE=               gnu-gpl-v3
 
 .include "../../mk/bsd.prefs.mk"
index 7fb411c..3bff72a 100644 (file)
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.12 2010/01/09 22:16:20 heinz Exp $
+$NetBSD: distinfo,v 1.13 2010/06/15 23:01:23 pettai Exp $
 
-SHA1 (courier-0.58.0.tar.bz2) = 964d81e6de5390678c9f10dddbc176273b925f6d
-RMD160 (courier-0.58.0.tar.bz2) = 940fb7967d154aeeb462691beb508155b3df4e29
-Size (courier-0.58.0.tar.bz2) = 7123136 bytes
-SHA1 (patch-aa) = 3f5465bd153d51f1dd6ed2f7849c098957afec2e
-SHA1 (patch-ab) = 133f2b48bdff76568b89e51908734a7e29cf9e03
-SHA1 (patch-ac) = 3db182c84827d53af35ea45b7296b98ecf0579d8
-SHA1 (patch-ad) = faa1d2f21f55550efa631c25435fefee5b235bf2
+SHA1 (courier-0.65.0.tar.bz2) = 4e5b7e64a35fe886a59621bc87e7f111428f19bc
+RMD160 (courier-0.65.0.tar.bz2) = e5fc4742da27b3b97bd2592ad3ecc96618abada3
+Size (courier-0.65.0.tar.bz2) = 7099997 bytes
+SHA1 (patch-aa) = eaf5ade8fb49254aeeb66a3dc07368d1559d62e8
+SHA1 (patch-ab) = 0152fc7e178cd6634142e05606b5cfa66bfa163d
+SHA1 (patch-ac) = 78ce4535d6a0d88d00cf0199c879786cde0eb1c1
+SHA1 (patch-ad) = a93db864d07813fe80f6345528ec0ae472fde0a7
 SHA1 (patch-ae) = e52ab2f6a4e253dc4a28291db6744ea2593f2fc3
-SHA1 (patch-af) = a3bcc672fc05e05497d7408c1a96ad52226aee01
+SHA1 (patch-af) = 17afc29c101568e87d941a1f87860523d02b5ac9
 SHA1 (patch-ag) = 1bedd756d9932365896da82704941cdbc06e1dfd
-SHA1 (patch-ah) = 78e0db8d5319d985d7e8aec4c1240561fead3a00
+SHA1 (patch-ah) = d3ee8e92a2927d25f77791db6468b17e6d0e0cf0
 SHA1 (patch-ai) = 1337870d95bb46882980553ffba6ec6956bc9147
 SHA1 (patch-aj) = cf666ac5c05e9fb5aef9c23d534edefa745ab547
 SHA1 (patch-al) = 1c7935b46b7affafa86e4a858ba6a79b7fbebbc5
-SHA1 (patch-an) = 1c78baf7fc393b013c47745b914571aff94f1497
-SHA1 (patch-ax) = ed01509d1868b92e80ec98e320ac285345584e31
-SHA1 (patch-ay) = 499f46a7116da4f7adfa6e7c2d7e4e4856174a9f
-SHA1 (patch-az) = fbe1667536989486e62ecdb50a74cb3c38e3fb0d
+SHA1 (patch-an) = 972f23b312fdd2895a319f1549ba3563e92f8f3a
+SHA1 (patch-ax) = cd7fc4f373e83c1d6777103dc075455f98d24f51
+SHA1 (patch-ay) = d4b391e76167cd27012f928587d5feb57ea1b4ff
index 6957c39..1f1117c 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/Makefile.in.orig   2007-11-23 22:26:43.000000000 -0500
 +++ courier/Makefile.in
-@@ -46,16 +46,16 @@ build_triplet = @build@
+@@ -47,16 +47,16 @@ build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
  pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
@@ -24,16 +24,15 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
        @EXTRASBIN@ $(am__empty)
  cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
  subdir = .
-@@ -433,7 +433,7 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
+@@ -477,29 +477,26 @@ BUILT_SOURCES = prefix.h exec_prefix.h s
        uidgid.h configargs.h sort.h webmlmdhandlerslist.H
  RFCERRTXTIN = rfcerrheader.txt
  RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
 -extrapkglib = makedatprog courierpop3login pcpd
 +extrapkglib = 
- pkglibexecdir = $(libexecdir)/courier
  webmaildir = $(libexecdir)/courier/webmail
  webmail_SOURCES = 
-@@ -441,22 +441,19 @@ sqwebmaild_SOURCES = 
+ sqwebmaild_SOURCES = 
  
  # Don't forget to change perms.sh.in, if webmailimagedir moves.
  webmailimagedir = $(datadir)/sqwebmail/images
@@ -62,7 +61,7 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
  
  mlmdatadir = $(datadir)/couriermlm
  mlmdata_DATA = \
-@@ -512,7 +509,7 @@ mlmdata_DATA = \
+@@ -555,7 +552,7 @@ mlmdata_DATA = \
        webmlmsublist.tmpl.html \
        webmlm.tmpl.html
  
@@ -71,7 +70,7 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
  cmdlibdir = @libexecdir@/courier
  
  # Subdirectories
-@@ -1673,6 +1670,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
+@@ -1896,6 +1893,12 @@ couriertls$(EXEEXT): ../tcpd/couriertls$
  courierpop3login$(EXEEXT): ../imap/pop3login$(EXEEXT)
        cp -f ../imap/pop3login$(EXEEXT) courierpop3login$(EXEEXT)
  
@@ -84,7 +83,7 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
  sort.h:
        echo '#define SORT "$(SORT)"' >sort.h
  
-@@ -1828,39 +1831,21 @@ dist-hook:
+@@ -2051,39 +2054,21 @@ dist-hook:
  
  install-exec-hook:
        for d in $(bindir) $(sbindir) $(libexecdir) $(libexecdir)/courier \
@@ -126,7 +125,7 @@ $NetBSD: patch-aa,v 1.5 2008/02/19 18:45:24 jlam Exp $
        test -f $(DESTDIR)$(sysconfdir)/enablefiltering && exit 0; \
                echo esmtp >$(DESTDIR)$(sysconfdir)/enablefiltering
        test -f $(DESTDIR)$(sysconfdir)/aliases/system && exit 0; \
-@@ -1872,10 +1857,6 @@ install-data-hook:
+@@ -2095,10 +2080,6 @@ install-data-hook:
        rm -f $(DESTDIR)$(bindir)/rmail
        $(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
        -$(mkinstalldirs) $(DESTDIR)@mandir@/man8
index 5b82665..fa783b6 100644 (file)
@@ -1,21 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2010/01/09 22:16:20 heinz Exp $
-
-  first hunk: make option "--without-ldapaliasd" work (see patch-az)
+$NetBSD: patch-ab,v 1.6 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/configure.orig     2007-11-24 03:26:42.000000000 +0000
 +++ courier/configure
-@@ -21071,7 +21071,9 @@ LIBS="$saveLIBS"
- # Check whether --with-ldapaliasd was given.
- if test "${with_ldapaliasd+set}" = set; then
--  withval=$with_ldapaliasd; ldapaliasd="$withval"; ldapaliasd="yes"
-+  withval=$with_ldapaliasd; ldapaliasd="$withval"
-+else
-+  ldapaliasd="yes"
- fi
-@@ -22366,9 +22368,9 @@ done
+@@ -18398,9 +18398,9 @@ done
  
  if test "$testmode" = "0"
  then
index c3f3ca5..6e607ae 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/doc/Makefile.in.orig       2007-11-17 19:48:53.000000000 -0500
 +++ courier/doc/Makefile.in
-@@ -151,7 +151,7 @@ top_srcdir = @top_srcdir@
+@@ -169,7 +169,7 @@ top_srcdir = @top_srcdir@
  version = @version@
  htmldocdir = @datadir@/htmldoc
  CLEANFILES = permissions.dat
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $
                draft-varshavchik-exdata-smtpext.txt \
                draft-varshavchik-verp-smtpext.txt \
                draft-varshavchik-security-smtpext.txt \
-@@ -189,66 +189,38 @@ htmlin = \
+@@ -207,67 +189,38 @@ htmlin = \
                courier.html \
                courierldapaliasd.html \
                couriermlm.html \
@@ -63,7 +63,8 @@ $NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $
 -man1 = sendmail.1 preline.1 maildirmake.1 cancelmsg.1 lockmail.1 maildrop.1 \
 -      mailq.1 mailbot.1 makemime.1 mimegpg.1 maildiracl.1 \
 -      makedat.1 reformail.1 reformime.1 couriermlm.1 testmxlookup.1 \
--      dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1 webmlmd.1
+-      dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1 \
+-      webmlmd.1
 -
 -man5 = dot-courier.5 maildir.5
 -man7 = localmailfilter.7 maildirquota.7 maildropgdbm.7 maildropfilter.7 \
@@ -83,21 +84,21 @@ $NetBSD: patch-ac,v 1.5 2008/02/19 18:45:24 jlam Exp $
 -      mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
 +      mkesmtpdcert.8 \
        makealiases.8 makepercentrelay.8 makesmtpaccess.8 \
--      pop3d.8 submit.8 imapd.8
+-      pop3d.8 pop3d-ssl.8 submit.8 imapd.8
 +      submit.8
  
  BUILT_SOURCES = \
        aliaslookup.html aliaslookup.8 \
-@@ -275,7 +247,7 @@ BUILT_SOURCES = \
+@@ -294,7 +265,7 @@ BUILT_SOURCES = \
        webmlmd.html.in webmlmd.1.in
  
- EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
+ EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES) dotforward.1 pop3d-ssl.8
 -man_LINKS = $(man8dir)/courierpop3login.8 \
 +man_LINKS = \
        $(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
        $(man8dir)/makesmtpaccess-msa.8 \
        $(man8dir)/esmtpd-msa.8
-@@ -1156,8 +1128,7 @@ preline.1: preline.1.in
+@@ -1215,8 +1186,7 @@ preline.1: preline.1.in
  
  install-man-extra:
        cd $(DESTDIR)$(man8dir) ; \
index ab90ca3..ebb711f 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/filters/Makefile.in.orig   2007-11-17 19:49:01.000000000 -0500
 +++ courier/filters/Makefile.in
-@@ -236,11 +236,12 @@ SUBDIRS = libfilter perlfilter
+@@ -283,11 +283,12 @@ SUBDIRS = libfilter perlfilter
  CLEANFILES = $(htmldoc_DATA) $(man_MANS) filtersocketdir.h filteractivedir.h \
        pidfile.h permissions.dat
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.4 2008/02/19 18:45:24 jlam Exp $
  filtersocketdir = $(localstatedir)/filters
  allfiltersocketdir = $(localstatedir)/allfilters
  filterconfdir = $(sysconfdir)/filters
-@@ -931,16 +932,12 @@ install-exec-hook:
+@@ -1083,16 +1084,12 @@ install-exec-hook:
  install-data-hook:
        -$(mkinstalldirs) $(DESTDIR)$(filtersocketdir)
        -$(mkinstalldirs) $(DESTDIR)$(allfiltersocketdir)
index f69f6e5..dfbb65a 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2007/10/15 15:37:14 jlam Exp $
+$NetBSD: patch-af,v 1.4 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/filters/perlfilter/Makefile.in.orig        Sat Jul 21 20:31:15 2007
 +++ courier/filters/perlfilter/Makefile.in
-@@ -207,7 +207,8 @@ top_srcdir = @top_srcdir@
+@@ -234,7 +234,8 @@ top_srcdir = @top_srcdir@
  EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl
  BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c
  CLEANFILES = $(BUILT_SOURCES) permissions.dat
index c09df25..042dec9 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2007/08/10 17:57:05 jlam Exp $
+$NetBSD: patch-ah,v 1.3 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/module.local/deliver.c.orig        2006-05-28 11:29:52.000000000 -0400
 +++ courier/module.local/deliver.c
-@@ -635,7 +635,7 @@ static int docommand(const char *extensi
+@@ -649,7 +649,7 @@ static int docommand(const char *extensi
                const char *defaultmail,
                int recursion_level)
  {
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.2 2007/08/10 17:57:05 jlam Exp $
  const char *p;
  const char *hostp;
  pid_t pid;
-@@ -727,7 +727,9 @@ const char *shell=getenv("SHELL");
+@@ -741,7 +741,9 @@ const char *shell=getenv("SHELL");
        envs[17]=courier_malloc(strlen(shell)
                                +sizeof("SHELL="));
        strcat(strcpy(envs[17], "SHELL="), shell);
index 1dab76a..c77ee53 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2007/10/15 15:37:15 jlam Exp $
+$NetBSD: patch-an,v 1.4 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/webmlmd.C.orig     Thu Jul  5 01:47:38 2007
 +++ courier/webmlmd.C
@@ -10,11 +10,10 @@ $NetBSD: patch-an,v 1.3 2007/10/15 15:37:15 jlam Exp $
  #include      <sys/types.h>
  #include      <sys/stat.h>
  #include        <sys/socket.h>
-@@ -40,6 +41,39 @@
- #include      <fstream>
+@@ -41,6 +42,39 @@
  #include      <sstream>
  #include      <map>
-+
+
 +#if defined(__FreeBSD_version) && (__FreeBSD_version < 500029)
 +#include      <cwchar>
 +namespace std {
@@ -47,6 +46,7 @@ $NetBSD: patch-an,v 1.3 2007/10/15 15:37:15 jlam Exp $
 +      };
 +}
 +#endif
++
  #include      "cmlm.h"
  #include      "cmlmcmdmisc.h"
+ #include      "webmlmd.H"
index c71e668..e98f002 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.1 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-ax,v 1.2 2010/06/15 23:01:23 pettai Exp $
 
 --- courier/module.esmtp/Makefile.in.orig      2007-11-17 19:49:38.000000000 -0500
 +++ courier/module.esmtp/Makefile.in
-@@ -870,17 +870,11 @@ install-data-local:
+@@ -955,17 +955,11 @@ install-data-local:
        test -f $(DESTDIR)$(sbindir)/courieresmtpd && exit 0; $(mkinstalldirs) $(DESTDIR)$(sbindir) || :; rm -f $(DESTDIR)$(sbindir)/courieresmtpd && $(LN_S) $(moduledir)/courieresmtpd $(DESTDIR)$(sbindir)/courieresmtpd
        -$(mkinstalldirs) $(DESTDIR)$(bindir)
        test -f $(DESTDIR)$(bindir)/addcr && exit 0; rm -f $(DESTDIR)$(bindir)/addcr && $(LN_S) $(moduledir)/addcr $(DESTDIR)$(bindir)/addcr
index 87ee493..b12d967 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.1 2008/02/19 18:45:24 jlam Exp $
+$NetBSD: patch-ay,v 1.2 2010/06/15 23:01:23 pettai Exp $
 
 --- webadmin/Makefile.in.orig  2007-11-17 19:53:34.000000000 -0500
 +++ webadmin/Makefile.in
-@@ -603,9 +603,6 @@ uninstall-am: uninstall-webadminDATA uni
+@@ -679,9 +679,6 @@ uninstall-am: uninstall-webadminDATA uni
  
  
  install-exec-hook:
diff --git a/mail/courier-mta/patches/patch-az b/mail/courier-mta/patches/patch-az
deleted file mode 100644 (file)
index 7ae71be..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-az,v 1.1 2010/01/09 22:16:20 heinz Exp $
-
-   wrong syntax prevents valid ACTION-IF-NOT-GIVEN, so "--without-ldapaliasd"
-   cannot work.
-   Reported upstream in http://sourceforge.net/mailarchive/message.php?msg_name=20100109205111.GB703%40silence.h.kh-22.de
-
---- courier/configure.in.orig  2007-11-24 03:25:52.000000000 +0000
-+++ courier/configure.in
-@@ -267,7 +267,8 @@ AC_CHECK_FUNC(ldap_search_st, HAVE_LDAP=
- LIBS="$saveLIBS"
- AC_ARG_WITH(ldapaliasd, [ --without-ldapaliasd ],
--                      ldapaliasd="$withval"; ldapaliasd="yes")
-+                      ldapaliasd="$withval",
-+                      ldapaliasd="yes")
- if test "$ldapaliasd" = "no"
- then
index 4e7635f..0c34b99 100644 (file)
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2010/03/21 16:29:40 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2010/06/15 23:14:47 pettai Exp $
 
-DISTNAME=      maildrop-2.0.4
-PKGREVISION=   3
+DISTNAME=      maildrop-2.5.0
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -12,7 +11,7 @@ HOMEPAGE=     http://www.courier-mta.org/maildrop/
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-DEPENDS+=      courier-maildir>=0.58.0:../../mail/courier-maildir
+DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
 
 USE_TOOLS+=            gmake perl
 USE_TOOLS+=            cat:run         # used by makedat(1)
index ede69b9..af77934 100644 (file)
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:04:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/06/15 23:14:47 pettai Exp $
 bin/lockmail
 bin/mailbot
 bin/maildrop
+bin/makedatprog
 bin/makedat
 bin/makemime
 bin/reformail
 bin/reformime
 libexec/courier/makedatprog
+libexec/courier/makedat
 man/man1/lockmail.1
 man/man1/mailbot.1
 man/man1/maildrop.1
@@ -17,7 +19,6 @@ man/man1/reformime.1
 man/man7/maildropex.7
 man/man7/maildropfilter.7
 man/man7/maildropgdbm.7
-share/courier/makedat
 share/doc/courier/README.postfix
 share/doc/courier/lockmail.html
 share/doc/courier/mailbot.html
index 091bcb8..e6e9613 100644 (file)
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.13 2007/08/27 22:33:19 jlam Exp $
+$NetBSD: distinfo,v 1.14 2010/06/15 23:14:47 pettai Exp $
 
-SHA1 (maildrop-2.0.4.tar.bz2) = df2755c1d0e00d19506b0659e59bf5d4756cce17
-RMD160 (maildrop-2.0.4.tar.bz2) = 9c0a349879cc0791ad01e5bae04b680de3a7a606
-Size (maildrop-2.0.4.tar.bz2) = 2286125 bytes
-SHA1 (patch-aa) = 294f05cf64f8ada8b18f6e555a93149850d93933
-SHA1 (patch-ab) = c863a21be30ee0808c6bc4cafd9a8775015a727e
-SHA1 (patch-ac) = b2f4f054b4fda15e110d7813d1e092660f018493
-SHA1 (patch-ad) = e3ce0e564df467d7af0266df0467b382cbc8c831
+SHA1 (maildrop-2.5.0.tar.bz2) = e09255dec179d796e55af008a8a536479aec55ac
+RMD160 (maildrop-2.5.0.tar.bz2) = ad7880bace6e6e6135d9bc25aec7397d7ac96837
+Size (maildrop-2.5.0.tar.bz2) = 2413245 bytes
+SHA1 (patch-aa) = 85956cf69abc361264a92ec1748cd3ef23b52089
+SHA1 (patch-ab) = 448fb6c46f05e634534c4a7c1547d54323b24dfa
+SHA1 (patch-ac) = 2dbda2413f35808ce6805289f1a44be3dfa59ea3
index 2fc9f4b..3c532bf 100644 (file)
@@ -1,39 +1,70 @@
-$NetBSD: patch-aa,v 1.7 2007/08/10 17:57:09 jlam Exp $
+$NetBSD: patch-aa,v 1.8 2010/06/15 23:14:47 pettai Exp $
 
---- Makefile.in.orig   2007-04-22 11:24:04.000000000 -0400
-+++ Makefile.in
-@@ -249,15 +249,12 @@ DELIVERQUOTAHTMLSOURCE = maildirquota.ht
- @INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
- @INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAMAN = 
- @INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
+--- Makefile.in.orig   2010-05-30 23:36:17.000000000 +0200
++++ Makefile.in        2010-06-13 12:28:00.000000000 +0200
+@@ -294,16 +294,14 @@
+       maildroptips.txt COPYING.GPL manpage.css pgpkeys.txt
+ scriptdir = $(pkgdatadir)/scripts
+-DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
+-DELIVERQUOTAHTML = $(DELIVERQUOTAHTMLSOURCE)
+-DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
 -MAILDROPHTML = lockmail.html maildirmake.html maildropex.html \
 -      maildir.html \
++DELIVERQUOTAHTMLSOURCE = 
++DELIVERQUOTAHTML = 
++DELIVERQUOTAMAN = 
 +MAILDROPHTML = lockmail.html maildropex.html \
        maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
        makemime.html reformail.html reformime.html
  
 -MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
 -      maildir.5 \
--      maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1 \
--      maildirquota.7 deliverquota.8
 +MAILDROPMAN = lockmail.1 maildrop.1 mailbot.1 maildropex.7 \
-+      maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
+       maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
  
  EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
- @DEVEL_TRUE@DEVEL_MAN = rfc822.3 rfc2045.3
-@@ -1084,11 +1081,12 @@ install-maildrop:
+@@ -1140,12 +1138,8 @@
+ #  Create a soft link from bindir/deliverquota to libdir/bin/deliverquota
+ install-deliverquota:
+-      $(mkinstalldirs) $(DESTDIR)$(bindir)
+-      $(INSTALL_PROGRAM) maildir/deliverquota $(DESTDIR)$(bindir)/deliverquota
+-      cd $(DESTDIR)$(bindir); rm -f maildrop.deliverquota
+ uninstall-deliverquota:
+-      rm -f $(DESTDIR)$(bindir)/deliverquota
+ install-data-local: install-man install-deliverquota install-maildrop
+@@ -1173,23 +1167,24 @@
                $(INSTALL_PROGRAM) maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
        done
        $(INSTALL_PROGRAM) liblock/lockmail $(DESTDIR)$(bindir)/lockmail
 -      $(INSTALL_PROGRAM) maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
        $(INSTALL_PROGRAM) rfc2045/reformime $(DESTDIR)$(bindir)/reformime
        $(INSTALL_PROGRAM) rfc2045/makemime $(DESTDIR)$(bindir)/makemime
--      $(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
--      $(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(bindir)/makedat
-+      $(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog
-+      $(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(datadir)/makedat
-+      rm -f $(DESTDIR)$(bindir)/makedat
-+      $(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
+       test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-              $(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
++              $(INSTALL_PROGRAM) makedat/makedatprog $(DESTDIR)$(libexecdir)/makedatprog
++              $(LN_S) $(libexecdir)/makedatprog $(DESTDIR)$(bindir)/makedatprog
+       test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-              $(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(bindir)/makedat
++              $(INSTALL_SCRIPT)  makedat/makedat     $(DESTDIR)$(libexecdir)/makedat
++              $(LN_S) $(libexecdir)/makedat $(DESTDIR)$(bindir)/makedat
        . maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
        . maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
  
+ uninstall-maildrop:
+-      for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \
++      for f in maildrop mailbot reformail lockmail makemime reformime; do \
+               rm -f $(DESTDIR)$(bindir)/$$f ; \
+       done
+       test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-              rm -f $(DESTDIR)$(bindir)/makedat ; \
+-              rm -f $(DESTDIR)$(bindir)/makedatprog
++              rm -f $(DESTDIR)$(libexecdir)/makedat ; \
++              rm -f $(DESTDIR)$(libexecdir)/makedatprog
+ all-recursive: all-make-check
index 8ac611c..1358837 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2007/08/10 17:57:09 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2010/06/15 23:14:47 pettai Exp $
 
 --- maildrop/configure.orig    2007-04-22 11:24:25.000000000 -0400
 +++ maildrop/configure
-@@ -21562,7 +21562,7 @@ fi
+@@ -19066,7 +19066,7 @@ fi
  test "x$prefix" = xNONE && prefix=$ac_default_prefix
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.4 2007/08/10 17:57:09 jlam Exp $
  then
  #
  # This version of maildrop is integrated into Courier mail server
-@@ -21699,7 +21699,7 @@ SPOOLDIR="$DIR"
+@@ -19203,7 +19203,7 @@ SPOOLDIR="$DIR"
  
  get_spooldir() {
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2007/08/10 17:57:09 jlam Exp $
  then
        MBOX_RESET_GID=1
        SPOOLDIR="./Maildir"
-@@ -21767,7 +21767,7 @@ if test "${with_default_maildrop+set}" =
+@@ -19270,7 +19270,7 @@ if test "${with_default_maildrop+set}" =
  else
    # Courier defaults to ./Maildir
  
index caddf9a..8414332 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2007/08/27 22:33:19 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2010/06/15 23:14:47 pettai Exp $
 
 --- maildrop/main.C.orig       2006-10-01 20:03:37.000000000 -0400
 +++ maildrop/main.C
-@@ -576,7 +576,7 @@ uid_t      my_u=getuid();
+@@ -575,7 +575,7 @@ uid_t      my_u=getuid();
        if (!found)
        {
  #if HAVE_COURIER
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2007/08/27 22:33:19 jlam Exp $
  #endif
                {
                        my_pw=getpwuid(my_u);
-@@ -628,6 +628,14 @@ Buffer    value;
+@@ -635,6 +635,14 @@ Buffer    value;
        {
        const char *p;
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.3 2007/08/27 22:33:19 jlam Exp $
                if ((p=getenv("HOME")) && *p)
                        maildrop.init_home=p;
  
-@@ -652,6 +660,8 @@ Buffer     value;
+@@ -659,6 +667,8 @@ Buffer     value;
  
                if ((p=getenv("MAILDIRQUOTA")) && *p)
                        maildrop.init_quota=p;
diff --git a/mail/maildrop/patches/patch-ad b/mail/maildrop/patches/patch-ad
deleted file mode 100644 (file)
index 4684d6e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/08/10 17:57:09 jlam Exp $
-
---- configure.orig     2007-04-22 11:24:05.000000000 -0400
-+++ configure
-@@ -20529,7 +20529,8 @@ esac
--if test "$maildirquota" = "1"; then
-+# deliverquota is installed by pkgsrc/mail/courier-maildir.
-+if false && test "$maildirquota" = "1"; then
-   INSTALL_DELIVERQUOTA_TRUE=
-   INSTALL_DELIVERQUOTA_FALSE='#'
- else
index e0f22e0..64011aa 100644 (file)
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2010/03/21 16:29:41 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/15 23:18:13 pettai Exp $
 
-DISTNAME=      sqwebmail-5.2.0
-PKGREVISION=   2
+DISTNAME=      sqwebmail-5.4.1
 CATEGORIES=    mail www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
@@ -10,8 +9,8 @@ MAINTAINER=    pkgsrc-users@NetBSD.org
 COMMENT=       Webmail CGI for access to maildir-style mailboxes
 HOMEPAGE=      http://www.courier-mta.org/sqwebmail/
 
-DEPENDS+=      courier-maildir>=0.58.0:../../mail/courier-maildir
-DEPENDS+=      maildrop>=2.0.4nb3:../../mail/maildrop
+DEPENDS+=      courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
+DEPENDS+=      maildrop>=2.5.0:../../mail/maildrop
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
index ccbdb0f..bcefeed 100644 (file)
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:04:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/06/15 23:18:13 pettai Exp $
 bin/mimegpg
 libexec/courier/pcpd
 libexec/courier/sqwebmaild
 libexec/courier/sqwebpasswd
 libexec/courier/webmail/webmail
 man/man1/mimegpg.1
-sbin/webmaild
+sbin/webmaild.rc
 sbin/webgpg
 share/courier/sqwebmail/cleancache.pl
 share/courier/sqwebmail/html/en
index 50e6588..1c19a60 100644 (file)
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.20 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: distinfo,v 1.21 2010/06/15 23:18:13 pettai Exp $
 
-SHA1 (sqwebmail-5.2.0.tar.bz2) = 3032f673e9033c7d26a30bc50e24f2897e7ea22d
-RMD160 (sqwebmail-5.2.0.tar.bz2) = b0ba837df30605e6f337c3f0b04200d14bd618cc
-Size (sqwebmail-5.2.0.tar.bz2) = 3926342 bytes
-SHA1 (patch-aa) = 1f25c41ecdf0378f8ee57a9531f787c58ed7d37a
-SHA1 (patch-ad) = ae222755e2291636c3d8b9f5328b3001cf713ddc
-SHA1 (patch-ah) = 762491372570553cc00af0e0d5198b728707eccb
+SHA1 (sqwebmail-5.4.1.tar.bz2) = d0d89af201d78814e252c311ebdd33e3329878af
+RMD160 (sqwebmail-5.4.1.tar.bz2) = 1ae425c0d1dba76cff8b1458faa87c2202af21a1
+Size (sqwebmail-5.4.1.tar.bz2) = 3921443 bytes
+SHA1 (patch-aa) = 4b0e0aec5c8b63d09309f137dc2c49a401d57483
+SHA1 (patch-ad) = 486883ae1924d2184f3ac8862decbabfc11334f3
+SHA1 (patch-ah) = 988c5825294ce78e8f4305d131a34c8eddd710f7
 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = fe79e0bdec04d29514c77a7110369f1ded76af77
-SHA1 (patch-am) = d5e654e23473fc3ff613020b0ec99f6eba7b99ea
+SHA1 (patch-aj) = 195ff33119c1991bac32282f2d9a5d15dc00b0d8
+SHA1 (patch-am) = 5b8b5da12c66034c48f7324d959e5ee66d492f22
index 822cc3d..d699633 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2010/06/15 23:18:13 pettai Exp $
 
 --- Makefile.in.orig   Sat Sep 29 14:52:57 2007
 +++ Makefile.in
-@@ -244,19 +244,19 @@ EXTRA_DIST = INSTALL.html README NEWS RE
+@@ -283,18 +283,19 @@ EXTRA_DIST = INSTALL.html README NEWS RE
  
  scriptbindir = $(sbindir)
  scriptbin_SCRIPTS = \
@@ -10,7 +10,6 @@ $NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
 +      webmaild.rc
  
 -pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
--pkglibexecdir = $(libexecdir)/sqwebmail
 +pkglibPROGRAMS = pcpd
 +pkglibexecdir = $(libexecdir)/courier
  pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@
@@ -28,7 +27,7 @@ $NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
  @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index2.html
  all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -836,6 +836,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
+@@ -975,6 +976,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
  sqwebmaild.dist: sqwebmail/sqwebmaild.dist
        cp sqwebmail/sqwebmaild.dist .
  
@@ -38,7 +37,7 @@ $NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
  pcpd: pcp/pcpd
        cp pcp/pcpd .
  
-@@ -871,7 +874,7 @@ install-exec-local:
+@@ -1010,7 +1014,7 @@ install-exec-local:
        $(mkinstalldirs) $(DESTDIR)$(cgibindir)
        test -w $(DESTDIR)$(cgibindir) || exit 0; \
                $(INSTALL_PROGRAM) sqwebmail/sqwebmail \
index 1f0c1b2..1e02bba 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-ad,v 1.11 2010/06/15 23:18:13 pettai Exp $
 
 --- sqwebmail/Makefile.in.orig Sat Sep 29 14:53:23 2007
 +++ sqwebmail/Makefile.in
-@@ -1012,7 +1012,7 @@ install-perms-local: install-perms-cache
+@@ -1143,7 +1143,7 @@ install-perms-local: install-perms-cache
  
  htmllibdir.h: config.status
        echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.10 2007/10/15 15:38:52 jlam Exp $
        echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
        echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
        echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
-@@ -1020,7 +1020,7 @@ htmllibdir.h: config.status
+@@ -1151,7 +1151,7 @@ htmllibdir.h: config.status
        echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h
        echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h
        echo '#define SQWEBPASSWD "$(pkglibexecdir)/sqwebpasswd"' >>htmllibdir.h
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.10 2007/10/15 15:38:52 jlam Exp $
                ; then \
                echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
                ; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
-@@ -1057,9 +1057,6 @@ install-perms-cache:
+@@ -1188,9 +1188,6 @@ install-perms-cache:
        @echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat
  
  cache-reminder:
index 8ea7cd5..669c433 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-ah,v 1.7 2010/06/15 23:18:13 pettai Exp $
 
 --- sqwebmail/configure.orig   Sat Sep 29 14:53:22 2007
 +++ sqwebmail/configure
-@@ -19893,7 +19893,7 @@ fi
+@@ -12502,7 +12502,7 @@ fi
  
  
  
index e4064bc..e6c0402 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.7 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-aj,v 1.8 2010/06/15 23:18:13 pettai Exp $
 
 --- INSTALL.html.orig  Mon Sep  3 16:05:20 2007
 +++ INSTALL.html
-@@ -809,7 +809,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
+@@ -820,7 +820,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
    configuration files are installed in
    <code>/usr/lib/sqwebmail</code> (the default).</p>
  
index f85bee8..95e16d2 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-am,v 1.3 2010/06/15 23:18:13 pettai Exp $
 
---- pcp/configure.orig Sun Jul 22 01:27:29 2007
-+++ pcp/configure
-@@ -28669,14 +28669,15 @@ LIBS="$saveLIBS"
+--- pcp/configure.orig 2010-03-21 01:56:14.000000000 +0100
++++ pcp/configure      2010-06-11 00:59:42.000000000 +0200
+@@ -21456,14 +21456,15 @@ LIBS="$saveLIBS"
  echo $NETLIBS >pcp.libs
  
  
@@ -19,4 +19,4 @@ $NetBSD: patch-am,v 1.2 2007/10/15 15:38:52 jlam Exp $
 +SENDIT="$sysconfdir/sendit.sh"
  
  
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
index 4850d42..9f0e055 100644 (file)
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.87 2010/06/13 22:44:56 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2010/06/15 21:09:31 drochner Exp $
 #
 
-DISTNAME=              gcalctool-5.28.2
-PKGREVISION=           1
+DISTNAME=              gcalctool-5.30.1
 CATEGORIES=            math gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gcalctool/5.28/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gcalctool/5.30/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users@NetBSD.org
index 6f604cb..0df9ea3 100644 (file)
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.27 2009/11/10 18:07:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2010/06/15 21:09:31 drochner Exp $
+bin/gcalccmd
 bin/gcalctool
 bin/gnome-calculator
 man/man1/gcalctool.1
@@ -6,140 +7,538 @@ share/applications/gcalctool.desktop
 share/gcalctool/financial.ui
 share/gcalctool/gcalctool.ui
 share/gconf/schemas/gcalctool.schemas
-share/gnome/help/gcalctool/C/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/C/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/C/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/C/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/C/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/C/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/C/gcalctool.xml
+share/gnome/help/gcalctool/C/absolute.page
+share/gnome/help/gcalctool/C/base.page
+share/gnome/help/gcalctool/C/boolean.page
+share/gnome/help/gcalctool/C/complex.page
+share/gnome/help/gcalctool/C/conv-base.page
+share/gnome/help/gcalctool/C/conv-character.page
+share/gnome/help/gcalctool/C/conv-currency.page
+share/gnome/help/gcalctool/C/conv-length.page
+share/gnome/help/gcalctool/C/conv-time.page
+share/gnome/help/gcalctool/C/conv-weight.page
+share/gnome/help/gcalctool/C/equation.page
+share/gnome/help/gcalctool/C/factorial.page
+share/gnome/help/gcalctool/C/factorize.page
+share/gnome/help/gcalctool/C/financial.page
+share/gnome/help/gcalctool/C/functions.page
+share/gnome/help/gcalctool/C/index.page
+share/gnome/help/gcalctool/C/keyboard.page
 share/gnome/help/gcalctool/C/legal.xml
-share/gnome/help/gcalctool/bg/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/bg/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/bg/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/bg/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/bg/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/bg/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/bg/gcalctool.xml
-share/gnome/help/gcalctool/ca/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/ca/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/ca/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/ca/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/ca/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/ca/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/ca/gcalctool.xml
-share/gnome/help/gcalctool/cs/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/cs/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/cs/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/cs/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/cs/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/cs/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/cs/gcalctool.xml
-share/gnome/help/gcalctool/de/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/de/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/de/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/de/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/de/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/de/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/de/gcalctool.xml
-share/gnome/help/gcalctool/el/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/el/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/el/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/el/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/el/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/el/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/el/gcalctool.xml
-share/gnome/help/gcalctool/es/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/es/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/es/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/es/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/es/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/es/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/es/gcalctool.xml
-share/gnome/help/gcalctool/eu/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/eu/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/eu/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/eu/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/eu/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/eu/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/eu/gcalctool.xml
-share/gnome/help/gcalctool/fr/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/fr/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/fr/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/fr/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/fr/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/fr/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/fr/gcalctool.xml
-share/gnome/help/gcalctool/it/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/it/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/it/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/it/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/it/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/it/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/it/gcalctool.xml
-share/gnome/help/gcalctool/ja/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/ja/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/ja/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/ja/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/ja/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/ja/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/ja/gcalctool.xml
-share/gnome/help/gcalctool/ko/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/ko/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/ko/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/ko/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/ko/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/ko/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/ko/gcalctool.xml
-share/gnome/help/gcalctool/oc/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/oc/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/oc/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/oc/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/oc/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/oc/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/oc/gcalctool.xml
-share/gnome/help/gcalctool/pt_BR/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/pt_BR/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/pt_BR/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/pt_BR/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/pt_BR/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/pt_BR/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/pt_BR/gcalctool.xml
-share/gnome/help/gcalctool/ru/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/ru/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/ru/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/ru/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/ru/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/ru/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/ru/gcalctool.xml
-share/gnome/help/gcalctool/sv/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/sv/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/sv/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/sv/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/sv/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/sv/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/sv/gcalctool.xml
-share/gnome/help/gcalctool/zh_CN/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/zh_CN/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/zh_CN/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/zh_CN/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/zh_CN/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/zh_CN/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/zh_CN/gcalctool.xml
-share/gnome/help/gcalctool/zh_HK/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/zh_HK/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/zh_HK/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/zh_HK/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/zh_HK/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/zh_HK/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/zh_HK/gcalctool.xml
-share/gnome/help/gcalctool/zh_TW/figures/gcalctool_advanced_window.png
-share/gnome/help/gcalctool/zh_TW/figures/gcalctool_basic_window.png
-share/gnome/help/gcalctool/zh_TW/figures/gcalctool_financial_window.png
-share/gnome/help/gcalctool/zh_TW/figures/gcalctool_menu_symbol.png
-share/gnome/help/gcalctool/zh_TW/figures/gcalctool_programming_window.png
-share/gnome/help/gcalctool/zh_TW/figures/gcalctool_scientific_window.png
-share/gnome/help/gcalctool/zh_TW/gcalctool.xml
+share/gnome/help/gcalctool/C/logarithm.page
+share/gnome/help/gcalctool/C/modulus.page
+share/gnome/help/gcalctool/C/mouse.page
+share/gnome/help/gcalctool/C/number-display.page
+share/gnome/help/gcalctool/C/percentage.page
+share/gnome/help/gcalctool/C/power.page
+share/gnome/help/gcalctool/C/scientific.page
+share/gnome/help/gcalctool/C/superscript.page
+share/gnome/help/gcalctool/C/trigonometry.page
+share/gnome/help/gcalctool/C/variables.page
+share/gnome/help/gcalctool/bg/absolute.page
+share/gnome/help/gcalctool/bg/base.page
+share/gnome/help/gcalctool/bg/boolean.page
+share/gnome/help/gcalctool/bg/complex.page
+share/gnome/help/gcalctool/bg/conv-base.page
+share/gnome/help/gcalctool/bg/conv-character.page
+share/gnome/help/gcalctool/bg/conv-currency.page
+share/gnome/help/gcalctool/bg/conv-length.page
+share/gnome/help/gcalctool/bg/conv-time.page
+share/gnome/help/gcalctool/bg/conv-weight.page
+share/gnome/help/gcalctool/bg/equation.page
+share/gnome/help/gcalctool/bg/factorial.page
+share/gnome/help/gcalctool/bg/factorize.page
+share/gnome/help/gcalctool/bg/financial.page
+share/gnome/help/gcalctool/bg/functions.page
+share/gnome/help/gcalctool/bg/index.page
+share/gnome/help/gcalctool/bg/keyboard.page
+share/gnome/help/gcalctool/bg/legal.xml
+share/gnome/help/gcalctool/bg/logarithm.page
+share/gnome/help/gcalctool/bg/modulus.page
+share/gnome/help/gcalctool/bg/mouse.page
+share/gnome/help/gcalctool/bg/number-display.page
+share/gnome/help/gcalctool/bg/percentage.page
+share/gnome/help/gcalctool/bg/power.page
+share/gnome/help/gcalctool/bg/scientific.page
+share/gnome/help/gcalctool/bg/superscript.page
+share/gnome/help/gcalctool/bg/trigonometry.page
+share/gnome/help/gcalctool/bg/variables.page
+share/gnome/help/gcalctool/ca/absolute.page
+share/gnome/help/gcalctool/ca/base.page
+share/gnome/help/gcalctool/ca/boolean.page
+share/gnome/help/gcalctool/ca/complex.page
+share/gnome/help/gcalctool/ca/conv-base.page
+share/gnome/help/gcalctool/ca/conv-character.page
+share/gnome/help/gcalctool/ca/conv-currency.page
+share/gnome/help/gcalctool/ca/conv-length.page
+share/gnome/help/gcalctool/ca/conv-time.page
+share/gnome/help/gcalctool/ca/conv-weight.page
+share/gnome/help/gcalctool/ca/equation.page
+share/gnome/help/gcalctool/ca/factorial.page
+share/gnome/help/gcalctool/ca/factorize.page
+share/gnome/help/gcalctool/ca/financial.page
+share/gnome/help/gcalctool/ca/functions.page
+share/gnome/help/gcalctool/ca/index.page
+share/gnome/help/gcalctool/ca/keyboard.page
+share/gnome/help/gcalctool/ca/legal.xml
+share/gnome/help/gcalctool/ca/logarithm.page
+share/gnome/help/gcalctool/ca/modulus.page
+share/gnome/help/gcalctool/ca/mouse.page
+share/gnome/help/gcalctool/ca/number-display.page
+share/gnome/help/gcalctool/ca/percentage.page
+share/gnome/help/gcalctool/ca/power.page
+share/gnome/help/gcalctool/ca/scientific.page
+share/gnome/help/gcalctool/ca/superscript.page
+share/gnome/help/gcalctool/ca/trigonometry.page
+share/gnome/help/gcalctool/ca/variables.page
+share/gnome/help/gcalctool/cs/absolute.page
+share/gnome/help/gcalctool/cs/base.page
+share/gnome/help/gcalctool/cs/boolean.page
+share/gnome/help/gcalctool/cs/complex.page
+share/gnome/help/gcalctool/cs/conv-base.page
+share/gnome/help/gcalctool/cs/conv-character.page
+share/gnome/help/gcalctool/cs/conv-currency.page
+share/gnome/help/gcalctool/cs/conv-length.page
+share/gnome/help/gcalctool/cs/conv-time.page
+share/gnome/help/gcalctool/cs/conv-weight.page
+share/gnome/help/gcalctool/cs/equation.page
+share/gnome/help/gcalctool/cs/factorial.page
+share/gnome/help/gcalctool/cs/factorize.page
+share/gnome/help/gcalctool/cs/financial.page
+share/gnome/help/gcalctool/cs/functions.page
+share/gnome/help/gcalctool/cs/index.page
+share/gnome/help/gcalctool/cs/keyboard.page
+share/gnome/help/gcalctool/cs/legal.xml
+share/gnome/help/gcalctool/cs/logarithm.page
+share/gnome/help/gcalctool/cs/modulus.page
+share/gnome/help/gcalctool/cs/mouse.page
+share/gnome/help/gcalctool/cs/number-display.page
+share/gnome/help/gcalctool/cs/percentage.page
+share/gnome/help/gcalctool/cs/power.page
+share/gnome/help/gcalctool/cs/scientific.page
+share/gnome/help/gcalctool/cs/superscript.page
+share/gnome/help/gcalctool/cs/trigonometry.page
+share/gnome/help/gcalctool/cs/variables.page
+share/gnome/help/gcalctool/de/absolute.page
+share/gnome/help/gcalctool/de/base.page
+share/gnome/help/gcalctool/de/boolean.page
+share/gnome/help/gcalctool/de/complex.page
+share/gnome/help/gcalctool/de/conv-base.page
+share/gnome/help/gcalctool/de/conv-character.page
+share/gnome/help/gcalctool/de/conv-currency.page
+share/gnome/help/gcalctool/de/conv-length.page
+share/gnome/help/gcalctool/de/conv-time.page
+share/gnome/help/gcalctool/de/conv-weight.page
+share/gnome/help/gcalctool/de/equation.page
+share/gnome/help/gcalctool/de/factorial.page
+share/gnome/help/gcalctool/de/factorize.page
+share/gnome/help/gcalctool/de/financial.page
+share/gnome/help/gcalctool/de/functions.page
+share/gnome/help/gcalctool/de/index.page
+share/gnome/help/gcalctool/de/keyboard.page
+share/gnome/help/gcalctool/de/legal.xml
+share/gnome/help/gcalctool/de/logarithm.page
+share/gnome/help/gcalctool/de/modulus.page
+share/gnome/help/gcalctool/de/mouse.page
+share/gnome/help/gcalctool/de/number-display.page
+share/gnome/help/gcalctool/de/percentage.page
+share/gnome/help/gcalctool/de/power.page
+share/gnome/help/gcalctool/de/scientific.page
+share/gnome/help/gcalctool/de/superscript.page
+share/gnome/help/gcalctool/de/trigonometry.page
+share/gnome/help/gcalctool/de/variables.page
+share/gnome/help/gcalctool/el/absolute.page
+share/gnome/help/gcalctool/el/base.page
+share/gnome/help/gcalctool/el/boolean.page
+share/gnome/help/gcalctool/el/complex.page
+share/gnome/help/gcalctool/el/conv-base.page
+share/gnome/help/gcalctool/el/conv-character.page
+share/gnome/help/gcalctool/el/conv-currency.page
+share/gnome/help/gcalctool/el/conv-length.page
+share/gnome/help/gcalctool/el/conv-time.page
+share/gnome/help/gcalctool/el/conv-weight.page
+share/gnome/help/gcalctool/el/equation.page
+share/gnome/help/gcalctool/el/factorial.page
+share/gnome/help/gcalctool/el/factorize.page
+share/gnome/help/gcalctool/el/financial.page
+share/gnome/help/gcalctool/el/functions.page
+share/gnome/help/gcalctool/el/index.page
+share/gnome/help/gcalctool/el/keyboard.page
+share/gnome/help/gcalctool/el/legal.xml
+share/gnome/help/gcalctool/el/logarithm.page
+share/gnome/help/gcalctool/el/modulus.page
+share/gnome/help/gcalctool/el/mouse.page
+share/gnome/help/gcalctool/el/number-display.page
+share/gnome/help/gcalctool/el/percentage.page
+share/gnome/help/gcalctool/el/power.page
+share/gnome/help/gcalctool/el/scientific.page
+share/gnome/help/gcalctool/el/superscript.page
+share/gnome/help/gcalctool/el/trigonometry.page
+share/gnome/help/gcalctool/el/variables.page
+share/gnome/help/gcalctool/es/absolute.page
+share/gnome/help/gcalctool/es/base.page
+share/gnome/help/gcalctool/es/boolean.page
+share/gnome/help/gcalctool/es/complex.page
+share/gnome/help/gcalctool/es/conv-base.page
+share/gnome/help/gcalctool/es/conv-character.page
+share/gnome/help/gcalctool/es/conv-currency.page
+share/gnome/help/gcalctool/es/conv-length.page
+share/gnome/help/gcalctool/es/conv-time.page
+share/gnome/help/gcalctool/es/conv-weight.page
+share/gnome/help/gcalctool/es/equation.page
+share/gnome/help/gcalctool/es/factorial.page
+share/gnome/help/gcalctool/es/factorize.page
+share/gnome/help/gcalctool/es/financial.page
+share/gnome/help/gcalctool/es/functions.page
+share/gnome/help/gcalctool/es/index.page
+share/gnome/help/gcalctool/es/keyboard.page
+share/gnome/help/gcalctool/es/legal.xml
+share/gnome/help/gcalctool/es/logarithm.page
+share/gnome/help/gcalctool/es/modulus.page
+share/gnome/help/gcalctool/es/mouse.page
+share/gnome/help/gcalctool/es/number-display.page
+share/gnome/help/gcalctool/es/percentage.page
+share/gnome/help/gcalctool/es/power.page
+share/gnome/help/gcalctool/es/scientific.page
+share/gnome/help/gcalctool/es/superscript.page
+share/gnome/help/gcalctool/es/trigonometry.page
+share/gnome/help/gcalctool/es/variables.page
+share/gnome/help/gcalctool/eu/absolute.page
+share/gnome/help/gcalctool/eu/base.page
+share/gnome/help/gcalctool/eu/boolean.page
+share/gnome/help/gcalctool/eu/complex.page
+share/gnome/help/gcalctool/eu/conv-base.page
+share/gnome/help/gcalctool/eu/conv-character.page
+share/gnome/help/gcalctool/eu/conv-currency.page
+share/gnome/help/gcalctool/eu/conv-length.page
+share/gnome/help/gcalctool/eu/conv-time.page
+share/gnome/help/gcalctool/eu/conv-weight.page
+share/gnome/help/gcalctool/eu/equation.page
+share/gnome/help/gcalctool/eu/factorial.page
+share/gnome/help/gcalctool/eu/factorize.page
+share/gnome/help/gcalctool/eu/financial.page
+share/gnome/help/gcalctool/eu/functions.page
+share/gnome/help/gcalctool/eu/index.page
+share/gnome/help/gcalctool/eu/keyboard.page
+share/gnome/help/gcalctool/eu/legal.xml
+share/gnome/help/gcalctool/eu/logarithm.page
+share/gnome/help/gcalctool/eu/modulus.page
+share/gnome/help/gcalctool/eu/mouse.page
+share/gnome/help/gcalctool/eu/number-display.page
+share/gnome/help/gcalctool/eu/percentage.page
+share/gnome/help/gcalctool/eu/power.page
+share/gnome/help/gcalctool/eu/scientific.page
+share/gnome/help/gcalctool/eu/superscript.page
+share/gnome/help/gcalctool/eu/trigonometry.page
+share/gnome/help/gcalctool/eu/variables.page
+share/gnome/help/gcalctool/fr/absolute.page
+share/gnome/help/gcalctool/fr/base.page
+share/gnome/help/gcalctool/fr/boolean.page
+share/gnome/help/gcalctool/fr/complex.page
+share/gnome/help/gcalctool/fr/conv-base.page
+share/gnome/help/gcalctool/fr/conv-character.page
+share/gnome/help/gcalctool/fr/conv-currency.page
+share/gnome/help/gcalctool/fr/conv-length.page
+share/gnome/help/gcalctool/fr/conv-time.page
+share/gnome/help/gcalctool/fr/conv-weight.page
+share/gnome/help/gcalctool/fr/equation.page
+share/gnome/help/gcalctool/fr/factorial.page
+share/gnome/help/gcalctool/fr/factorize.page
+share/gnome/help/gcalctool/fr/financial.page
+share/gnome/help/gcalctool/fr/functions.page
+share/gnome/help/gcalctool/fr/index.page
+share/gnome/help/gcalctool/fr/keyboard.page
+share/gnome/help/gcalctool/fr/legal.xml
+share/gnome/help/gcalctool/fr/logarithm.page
+share/gnome/help/gcalctool/fr/modulus.page
+share/gnome/help/gcalctool/fr/mouse.page
+share/gnome/help/gcalctool/fr/number-display.page
+share/gnome/help/gcalctool/fr/percentage.page
+share/gnome/help/gcalctool/fr/power.page
+share/gnome/help/gcalctool/fr/scientific.page
+share/gnome/help/gcalctool/fr/superscript.page
+share/gnome/help/gcalctool/fr/trigonometry.page
+share/gnome/help/gcalctool/fr/variables.page
+share/gnome/help/gcalctool/it/absolute.page
+share/gnome/help/gcalctool/it/base.page
+share/gnome/help/gcalctool/it/boolean.page
+share/gnome/help/gcalctool/it/complex.page
+share/gnome/help/gcalctool/it/conv-base.page
+share/gnome/help/gcalctool/it/conv-character.page
+share/gnome/help/gcalctool/it/conv-currency.page
+share/gnome/help/gcalctool/it/conv-length.page
+share/gnome/help/gcalctool/it/conv-time.page
+share/gnome/help/gcalctool/it/conv-weight.page
+share/gnome/help/gcalctool/it/equation.page
+share/gnome/help/gcalctool/it/factorial.page
+share/gnome/help/gcalctool/it/factorize.page
+share/gnome/help/gcalctool/it/financial.page
+share/gnome/help/gcalctool/it/functions.page
+share/gnome/help/gcalctool/it/index.page
+share/gnome/help/gcalctool/it/keyboard.page
+share/gnome/help/gcalctool/it/legal.xml
+share/gnome/help/gcalctool/it/logarithm.page
+share/gnome/help/gcalctool/it/modulus.page
+share/gnome/help/gcalctool/it/mouse.page
+share/gnome/help/gcalctool/it/number-display.page
+share/gnome/help/gcalctool/it/percentage.page
+share/gnome/help/gcalctool/it/power.page
+share/gnome/help/gcalctool/it/scientific.page
+share/gnome/help/gcalctool/it/superscript.page
+share/gnome/help/gcalctool/it/trigonometry.page
+share/gnome/help/gcalctool/it/variables.page
+share/gnome/help/gcalctool/ja/absolute.page
+share/gnome/help/gcalctool/ja/base.page
+share/gnome/help/gcalctool/ja/boolean.page
+share/gnome/help/gcalctool/ja/complex.page
+share/gnome/help/gcalctool/ja/conv-base.page
+share/gnome/help/gcalctool/ja/conv-character.page
+share/gnome/help/gcalctool/ja/conv-currency.page
+share/gnome/help/gcalctool/ja/conv-length.page
+share/gnome/help/gcalctool/ja/conv-time.page
+share/gnome/help/gcalctool/ja/conv-weight.page
+share/gnome/help/gcalctool/ja/equation.page
+share/gnome/help/gcalctool/ja/factorial.page
+share/gnome/help/gcalctool/ja/factorize.page
+share/gnome/help/gcalctool/ja/financial.page
+share/gnome/help/gcalctool/ja/functions.page
+share/gnome/help/gcalctool/ja/index.page
+share/gnome/help/gcalctool/ja/keyboard.page
+share/gnome/help/gcalctool/ja/legal.xml
+share/gnome/help/gcalctool/ja/logarithm.page
+share/gnome/help/gcalctool/ja/modulus.page
+share/gnome/help/gcalctool/ja/mouse.page
+share/gnome/help/gcalctool/ja/number-display.page
+share/gnome/help/gcalctool/ja/percentage.page
+share/gnome/help/gcalctool/ja/power.page
+share/gnome/help/gcalctool/ja/scientific.page
+share/gnome/help/gcalctool/ja/superscript.page
+share/gnome/help/gcalctool/ja/trigonometry.page
+share/gnome/help/gcalctool/ja/variables.page
+share/gnome/help/gcalctool/ko/absolute.page
+share/gnome/help/gcalctool/ko/base.page
+share/gnome/help/gcalctool/ko/boolean.page
+share/gnome/help/gcalctool/ko/complex.page
+share/gnome/help/gcalctool/ko/conv-base.page
+share/gnome/help/gcalctool/ko/conv-character.page
+share/gnome/help/gcalctool/ko/conv-currency.page
+share/gnome/help/gcalctool/ko/conv-length.page
+share/gnome/help/gcalctool/ko/conv-time.page
+share/gnome/help/gcalctool/ko/conv-weight.page
+share/gnome/help/gcalctool/ko/equation.page
+share/gnome/help/gcalctool/ko/factorial.page
+share/gnome/help/gcalctool/ko/factorize.page
+share/gnome/help/gcalctool/ko/financial.page
+share/gnome/help/gcalctool/ko/functions.page
+share/gnome/help/gcalctool/ko/index.page
+share/gnome/help/gcalctool/ko/keyboard.page
+share/gnome/help/gcalctool/ko/legal.xml
+share/gnome/help/gcalctool/ko/logarithm.page
+share/gnome/help/gcalctool/ko/modulus.page
+share/gnome/help/gcalctool/ko/mouse.page
+share/gnome/help/gcalctool/ko/number-display.page
+share/gnome/help/gcalctool/ko/percentage.page
+share/gnome/help/gcalctool/ko/power.page
+share/gnome/help/gcalctool/ko/scientific.page
+share/gnome/help/gcalctool/ko/superscript.page
+share/gnome/help/gcalctool/ko/trigonometry.page
+share/gnome/help/gcalctool/ko/variables.page
+share/gnome/help/gcalctool/oc/absolute.page
+share/gnome/help/gcalctool/oc/base.page
+share/gnome/help/gcalctool/oc/boolean.page
+share/gnome/help/gcalctool/oc/complex.page
+share/gnome/help/gcalctool/oc/conv-base.page
+share/gnome/help/gcalctool/oc/conv-character.page
+share/gnome/help/gcalctool/oc/conv-currency.page
+share/gnome/help/gcalctool/oc/conv-length.page
+share/gnome/help/gcalctool/oc/conv-time.page
+share/gnome/help/gcalctool/oc/conv-weight.page
+share/gnome/help/gcalctool/oc/equation.page
+share/gnome/help/gcalctool/oc/factorial.page
+share/gnome/help/gcalctool/oc/factorize.page
+share/gnome/help/gcalctool/oc/financial.page
+share/gnome/help/gcalctool/oc/functions.page
+share/gnome/help/gcalctool/oc/index.page
+share/gnome/help/gcalctool/oc/keyboard.page
+share/gnome/help/gcalctool/oc/legal.xml
+share/gnome/help/gcalctool/oc/logarithm.page
+share/gnome/help/gcalctool/oc/modulus.page
+share/gnome/help/gcalctool/oc/mouse.page
+share/gnome/help/gcalctool/oc/number-display.page
+share/gnome/help/gcalctool/oc/percentage.page
+share/gnome/help/gcalctool/oc/power.page
+share/gnome/help/gcalctool/oc/scientific.page
+share/gnome/help/gcalctool/oc/superscript.page
+share/gnome/help/gcalctool/oc/trigonometry.page
+share/gnome/help/gcalctool/oc/variables.page
+share/gnome/help/gcalctool/pt_BR/absolute.page
+share/gnome/help/gcalctool/pt_BR/base.page
+share/gnome/help/gcalctool/pt_BR/boolean.page
+share/gnome/help/gcalctool/pt_BR/complex.page
+share/gnome/help/gcalctool/pt_BR/conv-base.page
+share/gnome/help/gcalctool/pt_BR/conv-character.page
+share/gnome/help/gcalctool/pt_BR/conv-currency.page
+share/gnome/help/gcalctool/pt_BR/conv-length.page
+share/gnome/help/gcalctool/pt_BR/conv-time.page
+share/gnome/help/gcalctool/pt_BR/conv-weight.page
+share/gnome/help/gcalctool/pt_BR/equation.page
+share/gnome/help/gcalctool/pt_BR/factorial.page
+share/gnome/help/gcalctool/pt_BR/factorize.page
+share/gnome/help/gcalctool/pt_BR/financial.page
+share/gnome/help/gcalctool/pt_BR/functions.page
+share/gnome/help/gcalctool/pt_BR/index.page
+share/gnome/help/gcalctool/pt_BR/keyboard.page
+share/gnome/help/gcalctool/pt_BR/legal.xml
+share/gnome/help/gcalctool/pt_BR/logarithm.page
+share/gnome/help/gcalctool/pt_BR/modulus.page
+share/gnome/help/gcalctool/pt_BR/mouse.page
+share/gnome/help/gcalctool/pt_BR/number-display.page
+share/gnome/help/gcalctool/pt_BR/percentage.page
+share/gnome/help/gcalctool/pt_BR/power.page
+share/gnome/help/gcalctool/pt_BR/scientific.page
+share/gnome/help/gcalctool/pt_BR/superscript.page
+share/gnome/help/gcalctool/pt_BR/trigonometry.page
+share/gnome/help/gcalctool/pt_BR/variables.page
+share/gnome/help/gcalctool/ru/absolute.page
+share/gnome/help/gcalctool/ru/base.page
+share/gnome/help/gcalctool/ru/boolean.page
+share/gnome/help/gcalctool/ru/complex.page
+share/gnome/help/gcalctool/ru/conv-base.page
+share/gnome/help/gcalctool/ru/conv-character.page
+share/gnome/help/gcalctool/ru/conv-currency.page
+share/gnome/help/gcalctool/ru/conv-length.page
+share/gnome/help/gcalctool/ru/conv-time.page
+share/gnome/help/gcalctool/ru/conv-weight.page
+share/gnome/help/gcalctool/ru/equation.page
+share/gnome/help/gcalctool/ru/factorial.page
+share/gnome/help/gcalctool/ru/factorize.page
+share/gnome/help/gcalctool/ru/financial.page
+share/gnome/help/gcalctool/ru/functions.page
+share/gnome/help/gcalctool/ru/index.page
+share/gnome/help/gcalctool/ru/keyboard.page
+share/gnome/help/gcalctool/ru/legal.xml
+share/gnome/help/gcalctool/ru/logarithm.page
+share/gnome/help/gcalctool/ru/modulus.page
+share/gnome/help/gcalctool/ru/mouse.page
+share/gnome/help/gcalctool/ru/number-display.page
+share/gnome/help/gcalctool/ru/percentage.page
+share/gnome/help/gcalctool/ru/power.page
+share/gnome/help/gcalctool/ru/scientific.page
+share/gnome/help/gcalctool/ru/superscript.page
+share/gnome/help/gcalctool/ru/trigonometry.page
+share/gnome/help/gcalctool/ru/variables.page
+share/gnome/help/gcalctool/sv/absolute.page
+share/gnome/help/gcalctool/sv/base.page
+share/gnome/help/gcalctool/sv/boolean.page
+share/gnome/help/gcalctool/sv/complex.page
+share/gnome/help/gcalctool/sv/conv-base.page
+share/gnome/help/gcalctool/sv/conv-character.page
+share/gnome/help/gcalctool/sv/conv-currency.page
+share/gnome/help/gcalctool/sv/conv-length.page
+share/gnome/help/gcalctool/sv/conv-time.page
+share/gnome/help/gcalctool/sv/conv-weight.page
+share/gnome/help/gcalctool/sv/equation.page
+share/gnome/help/gcalctool/sv/factorial.page
+share/gnome/help/gcalctool/sv/factorize.page
+share/gnome/help/gcalctool/sv/financial.page
+share/gnome/help/gcalctool/sv/functions.page
+share/gnome/help/gcalctool/sv/index.page
+share/gnome/help/gcalctool/sv/keyboard.page
+share/gnome/help/gcalctool/sv/legal.xml
+share/gnome/help/gcalctool/sv/logarithm.page
+share/gnome/help/gcalctool/sv/modulus.page
+share/gnome/help/gcalctool/sv/mouse.page
+share/gnome/help/gcalctool/sv/number-display.page
+share/gnome/help/gcalctool/sv/percentage.page
+share/gnome/help/gcalctool/sv/power.page
+share/gnome/help/gcalctool/sv/scientific.page
+share/gnome/help/gcalctool/sv/superscript.page
+share/gnome/help/gcalctool/sv/trigonometry.page
+share/gnome/help/gcalctool/sv/variables.page
+share/gnome/help/gcalctool/zh_CN/absolute.page
+share/gnome/help/gcalctool/zh_CN/base.page
+share/gnome/help/gcalctool/zh_CN/boolean.page
+share/gnome/help/gcalctool/zh_CN/complex.page
+share/gnome/help/gcalctool/zh_CN/conv-base.page
+share/gnome/help/gcalctool/zh_CN/conv-character.page
+share/gnome/help/gcalctool/zh_CN/conv-currency.page
+share/gnome/help/gcalctool/zh_CN/conv-length.page
+share/gnome/help/gcalctool/zh_CN/conv-time.page
+share/gnome/help/gcalctool/zh_CN/conv-weight.page
+share/gnome/help/gcalctool/zh_CN/equation.page
+share/gnome/help/gcalctool/zh_CN/factorial.page
+share/gnome/help/gcalctool/zh_CN/factorize.page
+share/gnome/help/gcalctool/zh_CN/financial.page
+share/gnome/help/gcalctool/zh_CN/functions.page
+share/gnome/help/gcalctool/zh_CN/index.page
+share/gnome/help/gcalctool/zh_CN/keyboard.page
+share/gnome/help/gcalctool/zh_CN/legal.xml
+share/gnome/help/gcalctool/zh_CN/logarithm.page
+share/gnome/help/gcalctool/zh_CN/modulus.page
+share/gnome/help/gcalctool/zh_CN/mouse.page
+share/gnome/help/gcalctool/zh_CN/number-display.page
+share/gnome/help/gcalctool/zh_CN/percentage.page
+share/gnome/help/gcalctool/zh_CN/power.page
+share/gnome/help/gcalctool/zh_CN/scientific.page
+share/gnome/help/gcalctool/zh_CN/superscript.page
+share/gnome/help/gcalctool/zh_CN/trigonometry.page
+share/gnome/help/gcalctool/zh_CN/variables.page
+share/gnome/help/gcalctool/zh_HK/absolute.page
+share/gnome/help/gcalctool/zh_HK/base.page
+share/gnome/help/gcalctool/zh_HK/boolean.page
+share/gnome/help/gcalctool/zh_HK/complex.page
+share/gnome/help/gcalctool/zh_HK/conv-base.page
+share/gnome/help/gcalctool/zh_HK/conv-character.page
+share/gnome/help/gcalctool/zh_HK/conv-currency.page
+share/gnome/help/gcalctool/zh_HK/conv-length.page
+share/gnome/help/gcalctool/zh_HK/conv-time.page
+share/gnome/help/gcalctool/zh_HK/conv-weight.page
+share/gnome/help/gcalctool/zh_HK/equation.page
+share/gnome/help/gcalctool/zh_HK/factorial.page
+share/gnome/help/gcalctool/zh_HK/factorize.page
+share/gnome/help/gcalctool/zh_HK/financial.page
+share/gnome/help/gcalctool/zh_HK/functions.page
+share/gnome/help/gcalctool/zh_HK/index.page
+share/gnome/help/gcalctool/zh_HK/keyboard.page
+share/gnome/help/gcalctool/zh_HK/legal.xml
+share/gnome/help/gcalctool/zh_HK/logarithm.page
+share/gnome/help/gcalctool/zh_HK/modulus.page
+share/gnome/help/gcalctool/zh_HK/mouse.page
+share/gnome/help/gcalctool/zh_HK/number-display.page
+share/gnome/help/gcalctool/zh_HK/percentage.page
+share/gnome/help/gcalctool/zh_HK/power.page
+share/gnome/help/gcalctool/zh_HK/scientific.page
+share/gnome/help/gcalctool/zh_HK/superscript.page
+share/gnome/help/gcalctool/zh_HK/trigonometry.page
+share/gnome/help/gcalctool/zh_HK/variables.page
+share/gnome/help/gcalctool/zh_TW/absolute.page
+share/gnome/help/gcalctool/zh_TW/base.page
+share/gnome/help/gcalctool/zh_TW/boolean.page
+share/gnome/help/gcalctool/zh_TW/complex.page
+share/gnome/help/gcalctool/zh_TW/conv-base.page
+share/gnome/help/gcalctool/zh_TW/conv-character.page
+share/gnome/help/gcalctool/zh_TW/conv-currency.page
+share/gnome/help/gcalctool/zh_TW/conv-length.page
+share/gnome/help/gcalctool/zh_TW/conv-time.page
+share/gnome/help/gcalctool/zh_TW/conv-weight.page
+share/gnome/help/gcalctool/zh_TW/equation.page
+share/gnome/help/gcalctool/zh_TW/factorial.page
+share/gnome/help/gcalctool/zh_TW/factorize.page
+share/gnome/help/gcalctool/zh_TW/financial.page
+share/gnome/help/gcalctool/zh_TW/functions.page
+share/gnome/help/gcalctool/zh_TW/index.page
+share/gnome/help/gcalctool/zh_TW/keyboard.page
+share/gnome/help/gcalctool/zh_TW/legal.xml
+share/gnome/help/gcalctool/zh_TW/logarithm.page
+share/gnome/help/gcalctool/zh_TW/modulus.page
+share/gnome/help/gcalctool/zh_TW/mouse.page
+share/gnome/help/gcalctool/zh_TW/number-display.page
+share/gnome/help/gcalctool/zh_TW/percentage.page
+share/gnome/help/gcalctool/zh_TW/power.page
+share/gnome/help/gcalctool/zh_TW/scientific.page
+share/gnome/help/gcalctool/zh_TW/superscript.page
+share/gnome/help/gcalctool/zh_TW/trigonometry.page
+share/gnome/help/gcalctool/zh_TW/variables.page
 share/locale/af/LC_MESSAGES/gcalctool.mo
 share/locale/am/LC_MESSAGES/gcalctool.mo
 share/locale/ar/LC_MESSAGES/gcalctool.mo
@@ -160,6 +559,7 @@ share/locale/da/LC_MESSAGES/gcalctool.mo
 share/locale/de/LC_MESSAGES/gcalctool.mo
 share/locale/dz/LC_MESSAGES/gcalctool.mo
 share/locale/el/LC_MESSAGES/gcalctool.mo
+share/locale/en@shaw/LC_MESSAGES/gcalctool.mo
 share/locale/en_CA/LC_MESSAGES/gcalctool.mo
 share/locale/en_GB/LC_MESSAGES/gcalctool.mo
 share/locale/en_US/LC_MESSAGES/gcalctool.mo
@@ -223,22 +623,3 @@ share/locale/xh/LC_MESSAGES/gcalctool.mo
 share/locale/zh_CN/LC_MESSAGES/gcalctool.mo
 share/locale/zh_HK/LC_MESSAGES/gcalctool.mo
 share/locale/zh_TW/LC_MESSAGES/gcalctool.mo
-share/omf/gcalctool/gcalctool-C.omf
-share/omf/gcalctool/gcalctool-bg.omf
-share/omf/gcalctool/gcalctool-ca.omf
-share/omf/gcalctool/gcalctool-cs.omf
-share/omf/gcalctool/gcalctool-de.omf
-share/omf/gcalctool/gcalctool-el.omf
-share/omf/gcalctool/gcalctool-es.omf
-share/omf/gcalctool/gcalctool-eu.omf
-share/omf/gcalctool/gcalctool-fr.omf
-share/omf/gcalctool/gcalctool-it.omf
-share/omf/gcalctool/gcalctool-ja.omf
-share/omf/gcalctool/gcalctool-ko.omf
-share/omf/gcalctool/gcalctool-oc.omf
-share/omf/gcalctool/gcalctool-pt_BR.omf
-share/omf/gcalctool/gcalctool-ru.omf
-share/omf/gcalctool/gcalctool-sv.omf
-share/omf/gcalctool/gcalctool-zh_CN.omf
-share/omf/gcalctool/gcalctool-zh_HK.omf
-share/omf/gcalctool/gcalctool-zh_TW.omf
index 1073f2e..986cc89 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.42 2009/12/16 17:56:53 drochner Exp $
+$NetBSD: distinfo,v 1.43 2010/06/15 21:09:31 drochner Exp $
 
-SHA1 (gcalctool-5.28.2.tar.bz2) = 59f12100e3375aeb55e83a33c3dfdf2aaf948033
-RMD160 (gcalctool-5.28.2.tar.bz2) = 3f2db9213e483439afae2b555cd41b592ad7e06d
-Size (gcalctool-5.28.2.tar.bz2) = 2273145 bytes
+SHA1 (gcalctool-5.30.1.tar.bz2) = 9a7f561705e931416ba028f712ef3f16c9b58fee
+RMD160 (gcalctool-5.30.1.tar.bz2) = 27122e63ceb2880ca27cf550ab8c55bfd865d169
+Size (gcalctool-5.30.1.tar.bz2) = 1125957 bytes
index 11fab00..a9df6e3 100644 (file)
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:56 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/15 21:16:20 drochner Exp $
 #
 
-DISTNAME=              gnumeric-1.10.3
-PKGREVISION=           1
+DISTNAME=              gnumeric-1.10.5
 CATEGORIES=            math gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnumeric/1.10/}
 EXTRACT_SUFX=          .tar.bz2
@@ -44,7 +43,7 @@ BUILDLINK_API_DEPENDS.libgsf+=        libgsf>=1.14.6
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
-BUILDLINK_API_DEPENDS.goffice0.6+= goffice0.8-0.8.3{,nb*}
+BUILDLINK_API_DEPENDS.goffice0.6+= goffice0.8-0.8.5{,nb*}
 .include "../../misc/goffice0.8/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
index 53a8d8d..cc5b7f2 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2010/05/17 16:30:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/06/15 21:16:20 drochner Exp $
 bin/gnumeric
 bin/${PKGNAME}
 bin/ssconvert
@@ -189,6 +189,8 @@ lib/gnumeric/${PKGVERSION}/plugins/lpsolve/lpsolve.la
 lib/gnumeric/${PKGVERSION}/plugins/lpsolve/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/mps/mps.la
 lib/gnumeric/${PKGVERSION}/plugins/mps/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/nlsolve/nlsolve.la
+lib/gnumeric/${PKGVERSION}/plugins/nlsolve/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/oleo/oleo.la
 lib/gnumeric/${PKGVERSION}/plugins/oleo/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/openoffice/openoffice.la
@@ -217,8 +219,8 @@ lib/gnumeric/${PKGVERSION}/plugins/uihello/plugin.la
 lib/gnumeric/${PKGVERSION}/plugins/uihello/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/xbase/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/xbase/xbase.la
-lib/goffice/0.8.3/plugins/gnumeric/gnumeric.la
-lib/goffice/0.8.3/plugins/gnumeric/plugin.xml
+lib/goffice/0.8.5/plugins/gnumeric/gnumeric.la
+lib/goffice/0.8.5/plugins/gnumeric/plugin.xml
 lib/libspreadsheet.la
 lib/pkgconfig/libspreadsheet-1.10.pc
 man/man1/gnumeric.1
@@ -780,6 +782,7 @@ share/gnumeric/${PKGVERSION}/glade/solver.glade
 share/gnumeric/${PKGVERSION}/glade/tabulate.glade
 share/gnumeric/${PKGVERSION}/glade/variance-tests.glade
 share/gnumeric/${PKGVERSION}/glade/view.glade
+share/gnumeric/${PKGVERSION}/glade/wilcoxon-mann-whitney.glade
 share/gnumeric/${PKGVERSION}/glade/workbook-attr.glade
 share/gnumeric/${PKGVERSION}/templates/calendar.gnumeric
 share/gnumeric/${PKGVERSION}/templates/invoice.gnumeric
index be267be..e01c4c5 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2010/05/17 16:30:12 drochner Exp $
+$NetBSD: distinfo,v 1.6 2010/06/15 21:16:20 drochner Exp $
 
-SHA1 (gnumeric-1.10.3.tar.bz2) = 06987beea6dd10e27f04c3fb72929f81b0381e0d
-RMD160 (gnumeric-1.10.3.tar.bz2) = ee3fb3e3d93b1e67d5256e62e339803025947f47
-Size (gnumeric-1.10.3.tar.bz2) = 17645603 bytes
+SHA1 (gnumeric-1.10.5.tar.bz2) = 4422e6b5becc6aeb30f8ce794b037eeeaa9ea04e
+RMD160 (gnumeric-1.10.5.tar.bz2) = e213ae973743ba016c2513dc2b31ab0cc491964f
+Size (gnumeric-1.10.5.tar.bz2) = 17674361 bytes
 SHA1 (patch-aa) = f1cefe02242eebccef616365bd08627d5e9fb4cd
 SHA1 (patch-ab) = 16a2b836b490386060e82e9e9d695ccfc9d28457
 SHA1 (patch-af) = eb444e3f097b991d4f3ff97b716e4cd84df69ccc
index adf2305..2f75c8f 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/03/21 16:29:41 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/15 23:01:23 pettai Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 CATEGORIES=    meta-pkgs mail
@@ -14,7 +14,7 @@ META_PACKAGE= yes
 # COURIER_VERSION should match the variable of the same name found in
 # pkgsrc/mail/courier-mta/Makefile.common.
 #
-COURIER_VERSION=       0.58.0
+COURIER_VERSION=       0.65.0
 
 # The following packages are built from the same Courier sources and
 # should match in version number:
@@ -30,13 +30,13 @@ DEPENDS+=   courier-mta>=${COURIER_VERSION}:../../mail/courier-mta
 #
 #      mail/maildrop, mail/courier-imap, mail/sqwebmail
 #
-DEPENDS+=      maildrop>=2.0.4nb3:../../mail/maildrop
-DEPENDS+=      courier-imap>=4.3.0:../../mail/courier-imap
-DEPENDS+=      sqwebmail>=5.2.0nb2:../../mail/sqwebmail
+DEPENDS+=      maildrop>=2.5.0:../../mail/maildrop
+DEPENDS+=      courier-imap>=4.8.0:../../mail/courier-imap
+DEPENDS+=      sqwebmail>=5.4.1:../../mail/sqwebmail
 
 # We tack on courier-analog because its version is somewhat tied to the
 # log format of the current Courier release.
 #
-DEPENDS+=      courier-analog>=0.15:../../mail/courier-analog
+DEPENDS+=      courier-analog>=0.16:../../mail/courier-analog
 
 .include "../../mk/bsd.pkg.mk"
index 4e88923..ebec819 100644 (file)
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:59 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/15 21:12:39 drochner Exp $
 #
 
-DISTNAME=              goffice-0.8.3
-PKGNAME=               goffice0.8-0.8.3
-PKGREVISION=           1
+DISTNAME=              goffice-0.8.5
+PKGNAME=               goffice0.8-0.8.5
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/goffice/0.8/}
 
index 20b4051..4c4a449 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/04/28 18:34:22 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/06/15 21:12:39 drochner Exp $
 include/libgoffice-0.8/goffice/app/error-info.h
 include/libgoffice-0.8/goffice/app/file.h
 include/libgoffice-0.8/goffice/app/go-cmd-context-impl.h
@@ -129,6 +129,7 @@ include/libgoffice-0.8/goffice/math/go-distribution.h
 include/libgoffice-0.8/goffice/math/go-fft.h
 include/libgoffice-0.8/goffice/math/go-math.h
 include/libgoffice-0.8/goffice/math/go-matrix3x3.h
+include/libgoffice-0.8/goffice/math/go-quad.h
 include/libgoffice-0.8/goffice/math/go-rangefunc.h
 include/libgoffice-0.8/goffice/math/go-regression.h
 include/libgoffice-0.8/goffice/math/goffice-math.h
index ddc1114..1e219a9 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/05/17 16:25:43 drochner Exp $
+$NetBSD: distinfo,v 1.4 2010/06/15 21:12:39 drochner Exp $
 
-SHA1 (goffice-0.8.3.tar.gz) = ab38ff76a72a4bf53fef10055544163f8e1c9d0f
-RMD160 (goffice-0.8.3.tar.gz) = 7cc788ed7ba77c119c52be265ab510591b84624a
-Size (goffice-0.8.3.tar.gz) = 3678207 bytes
+SHA1 (goffice-0.8.5.tar.gz) = ba5ee7c4c375cf7cf54933818a0b683968923931
+RMD160 (goffice-0.8.5.tar.gz) = c6bd0addd4a5715f7a6562b0bb3b3ef7f690ba91
+Size (goffice-0.8.5.tar.gz) = 3682814 bytes
index 50fd03d..3ce7583 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:02 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/15 22:19:15 joerg Exp $
 
 OO_VER=                        3.1.1
 OO_TAG=                        OOO310_m19
@@ -22,9 +22,7 @@ LICENSE=              gnu-lgpl-v3
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-BUILD_DEPENDS+=                bison-[0-9]*:../../devel/bison
 BUILD_DEPENDS+=                zip-[0-9]*:../../archivers/zip
-BUILD_DEPENDS+=                unzip-[0-9]*:../../archivers/unzip
 BUILD_DEPENDS+=                p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
 
 DEPENDS+=              libpaper-[0-9]*:../../print/libpaper
@@ -45,7 +43,7 @@ CONFLICTS+=           openoffice2-bin-[0-9]*
 CONFLICTS+=            openoffice3-bin-[0-9]*
 CONFLICTS+=            openoffice-linux-[0-9]*
 
-USE_TOOLS+=            bash gmake imake perl pkg-config tar
+USE_TOOLS+=            bash bison gmake imake perl pkg-config tar unzip
 PTHREAD_OPTS+=         require
 PTHREAD_AUTO_VARS=     yes
 
index 8bb742c..d58c5d5 100644 (file)
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2010/06/13 22:45:03 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2010/06/15 21:24:14 drochner Exp $
 #
 
-DISTNAME=              yelp-2.28.1
-PKGREVISION=           3
+DISTNAME=              yelp-2.30.1
 CATEGORIES=            misc gnome
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/yelp/2.28/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/yelp/2.30/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users@NetBSD.org
index 810aad5..55abec1 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/12/02 12:57:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/06/15 21:24:14 drochner Exp $
 bin/gnome-help
 bin/yelp
 share/applications/yelp.desktop
@@ -19,6 +19,7 @@ share/locale/br/LC_MESSAGES/yelp.mo
 share/locale/bs/LC_MESSAGES/yelp.mo
 share/locale/ca/LC_MESSAGES/yelp.mo
 share/locale/ca@valencia/LC_MESSAGES/yelp.mo
+share/locale/crh/LC_MESSAGES/yelp.mo
 share/locale/cs/LC_MESSAGES/yelp.mo
 share/locale/cy/LC_MESSAGES/yelp.mo
 share/locale/da/LC_MESSAGES/yelp.mo
index 559adb4..8d228ff 100644 (file)
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.29 2010/02/13 12:26:15 tnn Exp $
+$NetBSD: distinfo,v 1.30 2010/06/15 21:24:14 drochner Exp $
 
-SHA1 (yelp-2.28.1.tar.bz2) = 260719600148490effaba2e78a9d536f251f5b66
-RMD160 (yelp-2.28.1.tar.bz2) = 0cac3a3504065fece952390a05b9612cfe180f11
-Size (yelp-2.28.1.tar.bz2) = 1136184 bytes
+SHA1 (yelp-2.30.1.tar.bz2) = 941b4c3aecd379ea2ff26d12a37efe32afbf0ab1
+RMD160 (yelp-2.30.1.tar.bz2) = a8529e8cbdb021690bcc8a399a1d1b14b0e964ad
+Size (yelp-2.30.1.tar.bz2) = 1139961 bytes
 SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea
-SHA1 (patch-ac) = 188a0a2ed84e54f9c73f589d14bfea155233021a
-SHA1 (patch-ad) = 7a737e7890be40ace92cdd79d234c57ca6e6f223
-SHA1 (patch-ae) = cb64a4aab05937b35482c83276058ae64618532b
-SHA1 (patch-af) = b6ef2e6b00ff3a1c807499113926d8ac3072e67d
diff --git a/misc/yelp/patches/patch-ac b/misc/yelp/patches/patch-ac
deleted file mode 100644 (file)
index bcb89bb..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2010/02/13 12:26:15 tnn Exp $
-
-http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
-
---- src/yelp-html.cpp.orig     2009-11-19 17:09:56.000000000 +0000
-+++ src/yelp-html.cpp
-@@ -24,6 +24,8 @@
- #include <mozilla-config.h>
- #include <config.h>
-+#include <string.h>
-+
- #include "yelp-gecko-services.h"
- #include "yelp-gecko-utils.h"
- #include "yelp-marshal.h"
-@@ -90,13 +92,20 @@ static gint
- html_open_uri (GtkMozEmbed *embed, const gchar *uri)
- {
-     YelpHtml *html = YELP_HTML (embed);
--    gboolean block_load;
-+    gboolean block_load = FALSE;
-     g_return_val_if_fail (uri != NULL, FALSE);
-     debug_print (DB_FUNCTION, "entering\n");
-     debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
-+    if (g_str_equal (html->priv->base_uri, uri)) {
-+      /* As of xulrunner 1.6.2, open_uri is called in response
-+         to the base URI we pass in.
-+       */
-+      return FALSE;
-+    }
-+
-     if (!html->priv->frames_enabled) {
-       g_signal_emit (html, signals[URI_SELECTED], 0, uri, FALSE);
-       block_load = TRUE;
diff --git a/misc/yelp/patches/patch-ad b/misc/yelp/patches/patch-ad
deleted file mode 100644 (file)
index 366328b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/02/13 12:26:15 tnn Exp $
-
-http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
-
---- src/yelp-window.c.orig     2009-11-19 17:09:56.000000000 +0000
-+++ src/yelp-window.c
-@@ -1854,14 +1854,21 @@ html_uri_selected_cb (YelpHtml  *html,
-                     gboolean   handled,
-                     gpointer   user_data)
- {
-+    gchar *new_uri = uri;
-     YelpWindow *window = YELP_WINDOW (user_data);
-     debug_print (DB_FUNCTION, "entering\n");
-     debug_print (DB_ARG, "  uri = \"%s\"\n", uri);
-+    if (g_str_has_prefix (uri, "xref:"))
-+        new_uri = g_strconcat (window->priv->base_uri, "#", uri + 5, NULL);
-+
-     if (!handled) {
--      yelp_window_load (window, uri);
-+      yelp_window_load (window, new_uri);
-     }
-+
-+    if (new_uri != uri)
-+        g_free (new_uri);
- }
- static gboolean
diff --git a/misc/yelp/patches/patch-ae b/misc/yelp/patches/patch-ae
deleted file mode 100644 (file)
index 4e43087..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/02/13 12:26:15 tnn Exp $
-
-http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
-
---- stylesheets/db2html.xsl.in.orig    2009-11-19 17:09:56.000000000 +0000
-+++ stylesheets/db2html.xsl.in
-@@ -68,7 +68,7 @@ FIXME: yelp:cache no longer works
- <!-- == db.xref.target == -->
- <xsl:template name="db.xref.target">
-   <xsl:param name="linkend"/>
--  <xsl:value-of select="concat('#', $linkend)"/>
-+  <xsl:value-of select="concat('xref:', $linkend)"/>
- </xsl:template>
- <!-- == db2html.css.custom == -->
diff --git a/misc/yelp/patches/patch-af b/misc/yelp/patches/patch-af
deleted file mode 100644 (file)
index 220a3d2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/02/13 12:26:16 tnn Exp $
-
-http://git.gnome.org/browse/yelp/commit/?id=a5588114ed94d00ca64913aa5b248e09a5e13edc
-
---- stylesheets/mal2html.xsl.in.orig   2009-11-19 17:09:56.000000000 +0000
-+++ stylesheets/mal2html.xsl.in
-@@ -44,10 +44,10 @@
-     <xsl:when test="contains($xref, '#')">
-       <xsl:variable name="pageid" select="substring-before($xref, '#')"/>
-       <xsl:variable name="sectionid" select="substring-after($xref, '#')"/>
--      <xsl:value-of select="concat('#', $pageid, '/', $sectionid)"/>
-+      <xsl:value-of select="concat('xref:', $pageid, '/', $sectionid)"/>
-     </xsl:when>
-     <xsl:otherwise>
--      <xsl:value-of select="concat('#', $xref)"/>
-+      <xsl:value-of select="concat('xref:', $xref)"/>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
index aa5daf9..1cc4246 100644 (file)
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/03/21 16:29:41 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/15 23:01:23 pettai Exp $
 
 DISTNAME=      courier-${COURIER_VERSION}
 PKGNAME=       ${DISTNAME:S/-/tcpd-/}
-PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
index a880cf2..d1021ee 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2008/02/19 18:45:41 jlam Exp $
+$NetBSD: distinfo,v 1.9 2010/06/15 23:01:23 pettai Exp $
 
-SHA1 (courier-0.58.0.tar.bz2) = 964d81e6de5390678c9f10dddbc176273b925f6d
-RMD160 (courier-0.58.0.tar.bz2) = 940fb7967d154aeeb462691beb508155b3df4e29
-Size (courier-0.58.0.tar.bz2) = 7123136 bytes
+SHA1 (courier-0.65.0.tar.bz2) = 4e5b7e64a35fe886a59621bc87e7f111428f19bc
+RMD160 (courier-0.65.0.tar.bz2) = e5fc4742da27b3b97bd2592ad3ecc96618abada3
+Size (courier-0.65.0.tar.bz2) = 7099997 bytes
index 5554804..00ac7b3 100644 (file)
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/06/06 17:31:05 gson Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/15 23:49:30 pettai Exp $
 
-DISTNAME=      miredo-1.1.7
-PKGREVISION=   1
+DISTNAME=      miredo-1.2.2
 CATEGORIES=    net
-MASTER_SITES=  http://www.remlab.net/files/miredo/archive/
+MASTER_SITES=  http://www.remlab.net/files/miredo/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
index 3f536be..7a3eb90 100644 (file)
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2010/05/14 06:18:48 pettai Exp $
+$NetBSD: distinfo,v 1.11 2010/06/15 23:49:30 pettai Exp $
 
-SHA1 (miredo-1.1.7.tar.bz2) = a1484c7b47f332b551ef946e064d116cb11af432
-RMD160 (miredo-1.1.7.tar.bz2) = e15aa09f03fe47a6da1cfc4a53c5cf69399fd013
-Size (miredo-1.1.7.tar.bz2) = 517231 bytes
+SHA1 (miredo-1.2.2.tar.bz2) = 9facd2ef23ae7a9969dfbe179a6c3ebddd87a2cc
+RMD160 (miredo-1.2.2.tar.bz2) = 16c9ec08d5ae935027a49153dc44745e2cc916c7
+Size (miredo-1.2.2.tar.bz2) = 529200 bytes
 SHA1 (patch-ab) = b9b1ed3d47ebe992e3eb33dec46a7419273e7d3c
-SHA1 (patch-ag) = 75223566133380122c8ea58c8509d2180fe778fd
-SHA1 (patch-ah) = 078cb0a78210aa6d77e8f1fa1d158b03bb9204bc
+SHA1 (patch-ah) = 2091460b84a8a84a4e7595e5ec4fa13b03287c4f
diff --git a/net/miredo/patches/patch-ag b/net/miredo/patches/patch-ag
deleted file mode 100644 (file)
index 33b4d4b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/05/14 06:18:49 pettai Exp $
-
---- libtun6/diag.c.orig        2010-05-11 21:04:33.000000000 +0200
-+++ libtun6/diag.c     2010-05-11 21:10:22.000000000 +0200
-@@ -98,10 +98,10 @@
-                       return -1;
-       }
- #else
-+      const char tundev[] = "/dev/tun0";
- #if 1 /* BSD creates a tunnel even on stat() - skip diagnostics */
-       return 0;
- #else
--      const char tundev[] = "/dev/tun0";
-       struct stat st;
-       if (stat (tundev, &st) == 0)
index 0af5a0c..1e9294d 100644 (file)
@@ -1,21 +1,24 @@
-$NetBSD: patch-ah,v 1.1 2010/05/14 06:18:49 pettai Exp $
+$NetBSD: patch-ah,v 1.2 2010/06/15 23:49:30 pettai Exp $
 
---- misc/Makefile.in.orig      2009-07-06 17:57:11.000000000 +0200
-+++ misc/Makefile.in   2010-05-13 23:34:06.000000000 +0200
-@@ -265,13 +265,13 @@
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+--- misc/Makefile.in.orig      2009-11-05 20:03:42.000000000 +0100
++++ misc/Makefile.in   2010-06-08 23:15:53.000000000 +0200
+@@ -296,7 +296,7 @@
+ $(am__aclocal_m4_deps):
  install-confSCRIPTS: $(conf_SCRIPTS)
        @$(NORMAL_INSTALL)
 -      test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
-+      test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)/../rc.d"
-       @list='$(conf_SCRIPTS)'; for p in $$list; do \
++      test -z "$(examplesdir)/../rc.d" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)/../rc.d"
+       @list='$(conf_SCRIPTS)'; test -n "$(confdir)" || list=; \
+       for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         if test -f $$d$$p; then \
-           f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
--          echo " $(confSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
--          $(confSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
-+          echo " $(confSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(examplesdir)/../rc.d/$$f'"; \
-+          $(confSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(examplesdir)/../rc.d/$$f"; \
-         else :; fi; \
-       done
+@@ -315,8 +315,8 @@
+       while read type dir files; do \
+            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+            test -z "$$files" || { \
+-             echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(confdir)$$dir'"; \
+-             $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(confdir)$$dir" || exit $$?; \
++             echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(examplesdir)/../rc.d/$$dir'"; \
++             $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(examplesdir)/../rc.d/$$dir" || exit $$?; \
+            } \
+       ; done
  
index 0bdda75..0aa86f3 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2010/02/24 22:54:54 joerg Exp $
+# $NetBSD: Makefile,v 1.61 2010/06/15 21:11:43 joerg Exp $
 
-DISTNAME=      pbulk-0.46
+DISTNAME=      pbulk-0.47
 COMMENT=       Modular bulk build framework
 
 PKG_DESTDIR_SUPPORT=   user-destdir
index f0eb90c..5058a72 100755 (executable)
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pkg-build,v 1.20 2010/02/24 22:51:37 joerg Exp $
+# $NetBSD: pkg-build,v 1.21 2010/06/15 21:11:43 joerg Exp $
 #
 # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -69,6 +69,21 @@ run_make() {
 
 }
 
+run_usergroup() {
+       [ "${use_destdir}" != no ] || return 0
+       case "${usergroup_phase}" in
+       *configure)
+               [ "$1" != "configure" ] || ${make} create-usergroup
+               ;;
+       *build)
+               [ "$1" != "build" ] || ${make} create-usergroup
+               ;;
+       pre-install)
+               [ "$1" != "install" ] || ${make} create-usergroup
+               ;;
+       esac
+}
+
 while read build_info_line; do
        case "${build_info_line}" in
        PKGNAME=*)
@@ -89,6 +104,8 @@ while read build_info_line; do
        BOOTSTRAP_PKG=*)
                is_bootstrap=${build_info_line#BOOTSTRAP_PKG=}
                ;;
+       USERGROUP_PHASE=*)
+               usergroup_phase=${build_info_line#USERGROUP_PHASE=}
        esac
 done
 
@@ -107,6 +124,11 @@ destdir)
        ;;
 esac
 
+if [ `whoami` != "root" ]; then
+       run_build=run_direct
+       run_install=run_direct
+fi
+
 ${pkg_up_to_date_script} ${pkgname} ${dependencies} && exit 0
 
 set -e
@@ -157,9 +179,12 @@ if [ ! -z "$dependencies" ]; then
 fi
 # Build package, create a separate log file for each major phase
 run_make run_direct checksum  > ${bulklog}/${pkgname}/checksum.log 2>&1 || cleanup
-run_make ${run_build} configure  > ${bulklog}/${pkgname}/configure.log 2>&1 || cleanup
-run_make ${run_build} all  > ${bulklog}/${pkgname}/build.log 2>&1 || cleanup
-run_make ${run_install} stage-install  > ${bulklog}/${pkgname}/install.log 2>&1 || cleanup
+run_usergroup configure > ${bulklog}/${pkgname}/configure.log 2>&1 || cleanup
+run_make ${run_build} configure >> ${bulklog}/${pkgname}/configure.log 2>&1 || cleanup
+run_usergroup build> ${bulklog}/${pkgname}/build.log 2>&1 || cleanup
+run_make ${run_build} all >> ${bulklog}/${pkgname}/build.log 2>&1 || cleanup
+run_usergroup install > ${bulklog}/${pkgname}/install.log 2>&1 || cleanup
+run_make ${run_install} stage-install >> ${bulklog}/${pkgname}/install.log 2>&1 || cleanup
 run_make run_direct package  > ${bulklog}/${pkgname}/package.log 2>&1 || cleanup
 
 # When using DESTDIR build, add the package once to test install rules.
index e5e9ec4..09b0ae6 100755 (executable)
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: scan,v 1.6 2009/12/30 21:14:43 joerg Exp $
+# $NetBSD: scan,v 1.7 2010/06/15 21:11:43 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
 # All rights reserved.
@@ -72,7 +72,7 @@ if [ -z "${limited_list}" ]; then
 else
        initial=1
        mkdir -p ${loc}
-       cp "${limited_list}" ${loc}/missing
+       grep -v '^#' "${limited_list}" > ${loc}/missing
 
        while [ -s ${loc}/missing ]; do
                sort -u ${loc}/missing > ${loc}/missing.s
index 5307b35..2bf6af1 100644 (file)
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.822 2010/03/10 14:42:22 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.823 2010/06/15 22:06:48 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -7387,12 +7387,12 @@ sub checkfile_patch($) {
                        #
                }], [PST_TEXT, re_patch_cfd, PST_CFA, sub() {
                        if (!$seen_comment) {
-                               $opt_warn_style and $line->log_warning("Comment expected.");
+                               $line->log_warning("Comment expected.");
                        }
                        $line->log_warning("Please use unified diffs (diff -u) for patches.");
                }], [PST_TEXT, re_patch_ufd, PST_UFA, sub() {
                        if (!$seen_comment) {
-                               $opt_warn_style and $line->log_warning("Comment expected.");
+                               $line->log_warning("Comment expected.");
                        }
                }], [PST_TEXT, re_patch_text, PST_TEXT, sub() {
                        $seen_comment = true;
@@ -7404,14 +7404,14 @@ sub checkfile_patch($) {
                        if ($seen_comment) {
                                $opt_warn_space and $line->log_note("Empty line expected.");
                        } else {
-                               $opt_warn_style and $line->log_warning("Comment expected.");
+                               $line->log_warning("Comment expected.");
                        }
                        $line->log_warning("Please use unified diffs (diff -u) for patches.");
                }], [PST_CENTER, re_patch_ufd, PST_UFA, sub() {
                        if ($seen_comment) {
                                $opt_warn_space and $line->log_note("Empty line expected.");
                        } else {
-                               $opt_warn_style and $line->log_warning("Comment expected.");
+                               $line->log_warning("Comment expected.");
                        }
                }], [PST_CENTER, undef, PST_TEXT, sub() {
                        $opt_warn_space and $line->log_note("Empty line expected.");
index fb51839..c78d615 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2010/06/14 11:24:47 tron Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/15 19:52:02 tron Exp $
 
-DISTNAME=      rpm2pkg-3.0.1
+DISTNAME=      rpm2pkg-3.0.2
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
index 51d7105..0f06669 100644 (file)
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpm2pkg.c,v 1.10 2010/06/14 11:24:48 tron Exp $        */
+/*     $NetBSD: rpm2pkg.c,v 1.11 2010/06/15 19:52:02 tron Exp $        */
 
 /*-
  * Copyright (c) 2004-2009 The NetBSD Foundation, Inc.
@@ -206,7 +206,7 @@ Open(int fd)
                                bzMatch++;
                                if (bzMatch == sizeof(BZipMagic)) {
                                        archive_type = 1;
-                                       offset = i - bytes -
+                                       offset = (off_t)i - (off_t)bytes -
                                            sizeof(BZipMagic) + 1;
                                        break;
                                }
@@ -219,7 +219,7 @@ Open(int fd)
                                gzMatch++;
                                if (gzMatch == sizeof(GZipMagic)) {
                                        archive_type = 2;
-                                       offset = i - bytes -
+                                       offset = (off_t)i - (off_t)bytes -
                                            sizeof(GZipMagic) + 1;
                                        break;
                                }
index e1355c9..58e8813 100644 (file)
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/03/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/15 23:10:44 pettai Exp $
 
 .include "Makefile.common"
 
-DISTNAME=      courier-authlib-0.62.2
-PKGREVISION=   1
+DISTNAME=      courier-authlib-0.63.0
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=  .tar.bz2
index 40c0e9e..d2278d8 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:16 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/15 23:10:44 pettai Exp $
 
 BUILDLINK_TREE+=       courier-authlib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        courier-authlib
 COURIER_AUTHLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.courier-authlib+=        courier-authlib>=0.53
-BUILDLINK_ABI_DEPENDS.courier-authlib?=        courier-authlib>=0.58nb2
+BUILDLINK_ABI_DEPENDS.courier-authlib?=        courier-authlib>=0.63.0
 BUILDLINK_PKGSRCDIR.courier-authlib?=  ../../security/courier-authlib
 .endif # COURIER_AUTHLIB_BUILDLINK3_MK
 
index 5d842e2..31b04ef 100644 (file)
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2009/07/02 12:23:44 obache Exp $
+$NetBSD: distinfo,v 1.14 2010/06/15 23:10:44 pettai Exp $
 
-SHA1 (courier-authlib-0.62.2.tar.bz2) = dc495ad6c54c271483d4862e09788621d86629a9
-RMD160 (courier-authlib-0.62.2.tar.bz2) = c0f4f32994056f8034f30055cfe55238d137a2ca
-Size (courier-authlib-0.62.2.tar.bz2) = 2233216 bytes
-SHA1 (patch-aa) = 6984af03cce59cee3987526d5c87bb71c8eac635
-SHA1 (patch-ab) = 0f3d86e9bd296c9abc044917656495fd8584bc08
+SHA1 (courier-authlib-0.63.0.tar.bz2) = c0877274de8b58ec4c7a41cfd87ad9b37c408304
+RMD160 (courier-authlib-0.63.0.tar.bz2) = 4528672a11895c9d705340523e578284e40b5dea
+Size (courier-authlib-0.63.0.tar.bz2) = 2817119 bytes
+SHA1 (patch-aa) = 19e4481ef98ccce9376222611f4ac179af747ed3
+SHA1 (patch-ab) = a266fc7b01fb77117b78630892574ebee81f9a57
index e6300a6..fd313e1 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
+$NetBSD: patch-aa,v 1.8 2010/06/15 23:10:44 pettai Exp $
 
 --- Makefile.in.orig   2009-02-03 23:39:56.000000000 +0000
 +++ Makefile.in
-@@ -453,7 +453,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h 
+@@ -511,7 +511,7 @@ CLEANFILES = authldaprc.h authmysqlrc.h 
  
  DISTCLEANFILES = dbobj.config README_authlib.html
  commonlibdep = libcourierauthcommon.la
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  commonlibadd = libcourierauthcommon.la
  libcourierauthcommon_t = @CRYPTLIBS@
  libcourierauthcommon_la_SOURCES = \
-@@ -468,7 +468,7 @@ libcourierauthcommon_la_SOURCES = \
+@@ -527,7 +527,7 @@ libcourierauthcommon_la_SOURCES = \
  
  libcourierauthcommon_la_DEPENDENCIES = libcourierauth.la
  libcourierauthcommon_la_LIBADD = libcourierauth.la
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  libcourierauth_la_SOURCES = authdaemon.c authdaemonlib.c preauthdaemon.c \
        authmoduser2.c authmoduser3.c debug.c \
        courierauthdebug.h \
-@@ -477,7 +477,7 @@ libcourierauth_la_SOURCES = authdaemon.c
+@@ -536,7 +536,7 @@ libcourierauth_la_SOURCES = authdaemon.c
  libcourierauth_la_LIBADD = libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la numlib/libnumlib.la \
        random128/librandom128.la rfc822/libencode.la
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  
  # The userdb module
  libauthuserdb_t = userdb/libuserdb.la @dblibrary@ @LIBGDBM@ @LIBDB@
-@@ -569,7 +569,7 @@ libcourierauthsasl_la_SOURCES = \
+@@ -629,7 +629,7 @@ libcourierauthsasl_la_SOURCES = \
        authsaslfrombase64.c authsasltobase64.c
  
  libcourierauthsasl_la_LIBADD = libcourierauth.la
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  libcourierauthsaslclient_la_SOURCES = courierauthsaslclient.h \
        authsaslclient.c authsaslclient.h authsaslclientcram.c \
        authsaslclientcrammd5.c authsaslclientcramsha1.c \
-@@ -578,7 +578,7 @@ libcourierauthsaslclient_la_SOURCES = co
+@@ -638,7 +638,7 @@ libcourierauthsaslclient_la_SOURCES = co
        authsaslfrombase64.c authsasltobase64.c
  
  libcourierauthsaslclient_la_LIBADD = libcourierauth.la
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  include_HEADERS = courier_auth_config.h courierauth.h courierauthsasl.h \
        courierauthsaslclient.h courierauthdebug.h
  
-@@ -609,9 +609,9 @@ authdaemondprog_DEPENDENCIES = libcourie
+@@ -669,9 +669,9 @@ authdaemondprog_DEPENDENCIES = libcourie
  
  authdaemondprog_LDADD = $(LIBLTDL) libcourierauthcommon.la liblock/liblock.la \
        libhmac/libhmac.la md5/libmd5.la sha1/libsha1.la \
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  authdaemontest_SOURCES = authdaemontest.c
  authdaemontest_DEPENDENCIES = libcourierauthcommon.la
  authdaemontest_LDADD = libcourierauthcommon.la @NETLIBS@
-@@ -1517,14 +1517,14 @@ uninstall-man: uninstall-man1 uninstall-
+@@ -1689,14 +1689,14 @@ uninstall-man: uninstall-man1 uninstall-
  authpgsqllib.lo: authpgsqllib.c authpgsqlrc.h
  
  @HAVE_AUTHPGSQL_TRUE@install-authpgsqlrc:
@@ -79,7 +79,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  
  @HAVE_AUTHPGSQL_FALSE@install-authpgsqlrc:
  @HAVE_AUTHPGSQL_FALSE@        @:
-@@ -1533,19 +1533,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
+@@ -1705,19 +1705,19 @@ authpgsqllib.lo: authpgsqllib.c authpgsq
  @HAVE_AUTHPGSQL_FALSE@        @:
  
  authpgsqlrc.h:
@@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  
  @HAVE_LDAP_FALSE@install-authldaprc:
  @HAVE_LDAP_FALSE@     @:
-@@ -1554,19 +1554,19 @@ authldaplib.lo: authldaplib.c authldaprc
+@@ -1726,19 +1726,19 @@ authldaplib.lo: authldaplib.c authldaprc
  @HAVE_LDAP_FALSE@     @:
  
  authldaprc.h:
@@ -131,7 +131,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  
  @HAVE_AUTHMYSQL_FALSE@install-authmysqlrc:
  @HAVE_AUTHMYSQL_FALSE@        @:
-@@ -1575,27 +1575,27 @@ authmysqllib.lo: authmysqllib.c authmysq
+@@ -1747,27 +1747,27 @@ authmysqllib.lo: authmysqllib.c authmysq
  @HAVE_AUTHMYSQL_FALSE@        @:
  
  authmysqlrc.h:
@@ -168,7 +168,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
        echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h
        echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h
        echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h
-@@ -1613,20 +1613,20 @@ authchangepwdir.h: config.status
+@@ -1785,20 +1785,20 @@ authchangepwdir.h: config.status
        echo '#define AUTHCHANGEPWDIR "$(pkglibexecdir)"' >authchangepwdir.h
  
  sbindir.h: config.status
@@ -193,7 +193,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  
  dist-hook:
        for f in $(BUILT1) ; do rm -f $(distdir)/$$f; done
-@@ -1642,10 +1642,10 @@ install-exec-hook:
+@@ -1814,10 +1814,10 @@ install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(sbindir) || :
        $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
        $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
@@ -208,7 +208,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
        test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
                $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \
                                $(DESTDIR)$(pkglibexecdir)/makedatprog ; \
-@@ -1659,7 +1659,6 @@ install-exec-hook:
+@@ -1831,7 +1831,6 @@ install-exec-hook:
                                $(DESTDIR)$(sbindir)/userdbpw ; \
                $(INSTALL_SCRIPT) userdb-test-cram-md5.pl \
                                $(DESTDIR)$(sbindir)/userdb-test-cram-md5
@@ -216,7 +216,7 @@ $NetBSD: patch-aa,v 1.7 2009/07/02 12:23:44 obache Exp $
  
  uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc
        rm -f $(DESTDIR)$(pkglibexecdir)/authdaemond
-@@ -1751,13 +1750,13 @@ README_authlib.html: README_authlib.html
+@@ -1930,13 +1930,13 @@ README_authlib.html: README_authlib.html
  authdaemond.o: authdaemonrc.h authdaemond.c
  
  install-migrate: authmigrate
index d7f393e..644eea0 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2009/07/02 12:23:44 obache Exp $
+$NetBSD: patch-ab,v 1.7 2010/06/15 23:10:44 pettai Exp $
 
 --- configure.orig     2009-02-03 23:39:55.000000000 +0000
 +++ configure
-@@ -23578,7 +23578,7 @@ done
+@@ -17617,7 +17617,7 @@ done
  test -n "$PG_CONFIG" || PG_CONFIG="pg_config"
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2009/07/02 12:23:44 obache Exp $
  
  # Check whether --with-pgsql-libs was given.
  if test "${with_pgsql_libs+set}" = set; then
-@@ -25365,7 +25365,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
+@@ -19439,7 +19439,7 @@ rm -f authdaemonrc.h authldaprc.h authmy
  
  result=""
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.6 2009/07/02 12:23:44 obache Exp $
  then
        $COURIERCONFIG >conftest.out || exit 1
        sed -n '/^mail/p' <conftest.out >conftest2.out || exit 1
-@@ -25377,7 +25377,7 @@ then
+@@ -19451,7 +19451,7 @@ then
        result=" (from courier-config)"
  fi
  
index 3a236d4..b370598 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2010/05/06 14:56:16 pettai Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/16 00:19:08 pettai Exp $
 #
 
-DISTNAME=      opendnssec-1.0.0
+DISTNAME=      opendnssec-1.1.0
 CATEGORIES=    security net
 MASTER_SITES=  http://www.opendnssec.org/files/source/
 
@@ -10,16 +10,18 @@ HOMEPAGE=   http://www.opendnssec.org/
 COMMENT=       OSS for a fast and easy DNSSEC deployment
 LICENSE=       2-clause-bsd
 
+DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=      ${PYPKGPREFIX}-4Suite-[0-9]*:../../textproc/py-4Suite
 DEPENDS+=      ldns>=1.6.4:../../net/ldns
-DEPENDS+=      ${RUBY_PKGPREFIX}-dnsruby>=1.43:../../net/ruby-dnsruby
+DEPENDS+=      rubygems:../../misc/rubygems
+DEPENDS+=      ${RUBY_PKGPREFIX}-dnsruby>=1.46:../../net/ruby-dnsruby
 BUILD_DEPENDS+=        CUnit-[0-9]*:../../devel/cunit
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 BUILD_DEFS+=   VARBASE
 
-USE_TOOLS+=    bash gmake perl
+USE_TOOLS+=    bash gmake
 CONFIG_SHELL=  ${BASH}
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
@@ -29,6 +31,17 @@ CONFIGURE_ARGS+=     --prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 CONFIGURE_ENV+=                RUBY=${RUBY}
 
+ODS_USER?=     opendnssec
+ODS_GROUP?=    opendnssec
+
+PKG_GROUPS=            ${ODS_GROUP}
+PKG_USERS=             ${ODS_USER}:${ODS_GROUP}
+PKG_GECOS.${ODS_USER}= OpenDNSSEC user
+PKG_HOME.${ODS_USER}=  ${VARBASE}/opendnssec
+PKG_SHELL.${ODS_USER}= ${SH}
+PKG_USERS_VARS+=       ODS_USER
+PKG_GROUPS_VARS+=      ODS_GROUP
+
 EGDIR=                 ${PREFIX}/share/examples/opendnssec
 ODS_SYSCONFDIR=                ${PKG_SYSCONFDIR}/opendnssec
 
index 707ee44..a89a7aa 100644 (file)
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/05/06 12:50:17 pettai Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/06/16 00:19:08 pettai Exp $
 bin/ods-auditor
 bin/ods-hsmspeed
 bin/ods-hsmutil
+bin/ods-kasp2html
 bin/ods-kaspcheck
 bin/ods-ksmutil
 include/hsmtest.h
@@ -13,6 +14,7 @@ lib/opendnssec/kasp_auditor/auditor.rb
 lib/opendnssec/kasp_auditor/config.rb
 lib/opendnssec/kasp_auditor/key_tracker.rb
 lib/opendnssec/kasp_auditor/parse.rb
+lib/opendnssec/kasp_auditor/partial_auditor.rb
 lib/opendnssec/kasp_auditor/preparser.rb
 lib/opendnssec/kasp_checker.rb
 lib/opendnssec/signer/Engine.py
@@ -41,11 +43,8 @@ libexec/opendnssec/create_dnskey
 libexec/opendnssec/finalizer
 libexec/opendnssec/get_class
 libexec/opendnssec/get_serial
-libexec/opendnssec/nsec3er
-libexec/opendnssec/nseccer
+libexec/opendnssec/quicksorter
 libexec/opendnssec/signer
-libexec/opendnssec/signer_threads
-libexec/opendnssec/sorter
 libexec/opendnssec/zone_fetcher
 libexec/opendnssec/zone_reader
 man/man1/ods-auditor.1
index 4eae89a..9b2cfc8 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/05/06 12:50:17 pettai Exp $
+$NetBSD: distinfo,v 1.2 2010/06/16 00:19:08 pettai Exp $
 
-SHA1 (opendnssec-1.0.0.tar.gz) = fc2deb8277753f74807d0a0a335120bce4e656b7
-RMD160 (opendnssec-1.0.0.tar.gz) = e41016fe350f1a0706ea5910841417d6850c69de
-Size (opendnssec-1.0.0.tar.gz) = 2055424 bytes
-SHA1 (patch-aa) = 189bada3d170c621e486f9d0e065fc028902862e
+SHA1 (opendnssec-1.1.0.tar.gz) = 8ee63ab38164d691dfa05fb09c3ffaa1f663c614
+RMD160 (opendnssec-1.1.0.tar.gz) = ed671c275682298a3d4e4b5764877a1c9544260f
+Size (opendnssec-1.1.0.tar.gz) = 2205923 bytes
+SHA1 (patch-aa) = 0007803ca6b323775b7d5e03d5f00c07030e14cc
index d9f3cf5..b7d9978 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/05/06 12:50:17 pettai Exp $
+$NetBSD: patch-aa,v 1.2 2010/06/16 00:19:08 pettai Exp $
 
 --- conf/Makefile.in.orig      2009-12-19 21:39:52.000000000 +0100
 +++ conf/Makefile.in   2009-12-19 21:43:40.000000000 +0100
@@ -10,21 +10,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/05/06 12:50:17 pettai Exp $
  target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
-@@ -553,19 +554,19 @@
+@@ -540,19 +541,19 @@
                (echo "kasp.xml built")
  
  install-data-hook:
--      test -d ${sysconfdir} || mkdir -p ${DESTDIR}${sysconfdir}
--      test -f ${sysconfdir}/conf.xml || \
+-      test -d ${DESTDIR}${sysconfdir} || mkdir -p ${DESTDIR}${sysconfdir}
+-      test -f ${DESTDIR}${sysconfdir}/conf.xml || \
 -              ${INSTALL_DATA} -m 0640 ${top_builddir}/conf.xml ${DESTDIR}${sysconfdir}
 -      ${INSTALL_DATA} -m 640 ${top_builddir}/conf.xml ${DESTDIR}${sysconfdir}/conf.xml.sample
--      test -f ${sysconfdir}/zonelist.xml || \
+-      test -f ${DESTDIR}${sysconfdir}/zonelist.xml || \
 -              ${INSTALL_DATA} ${top_builddir}/zonelist.xml ${DESTDIR}${sysconfdir}
 -      ${INSTALL_DATA} ${top_builddir}/zonelist.xml ${DESTDIR}${sysconfdir}/zonelist.xml.sample
--      test -f ${sysconfdir}/zonefetch.xml || \
+-      test -f ${DESTDIR}${sysconfdir}/zonefetch.xml || \
 -              ${INSTALL_DATA} -m 0640 ${top_builddir}/zonefetch.xml ${DESTDIR}${sysconfdir}
 -      ${INSTALL_DATA} -m 640 ${top_builddir}/zonefetch.xml ${DESTDIR}${sysconfdir}/zonefetch.xml.sample
--      test -f ${sysconfdir}/kasp.xml || \
+-      test -f ${DESTDIR}${sysconfdir}/kasp.xml || \
 -              ${INSTALL_DATA} ${top_builddir}/kasp.xml ${DESTDIR}${sysconfdir}
 -      ${INSTALL_DATA} ${top_builddir}/kasp.xml ${DESTDIR}${sysconfdir}/kasp.xml.sample
 +      test -d ${DESTDIR}${EGDIR} || mkdir -p ${DESTDIR}${EGDIR}
@@ -40,6 +40,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/05/06 12:50:17 pettai Exp $
 +      test -f ${DESTDIR}${EGDIR}/kasp.xml || \
 +              ${INSTALL_DATA} ${top_builddir}/kasp.xml ${DESTDIR}${EGDIR}
 +      ${INSTALL_DATA} ${top_builddir}/kasp.xml ${DESTDIR}${EGDIR}/kasp.xml.sample
  # 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 3145ae6..9a791ff 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/03/08 13:54:47 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/15 20:05:48 joerg Exp $
 
-DISTNAME=              nginx-0.8.34
+DISTNAME=              nginx-0.8.41
 DISTFILES=             ${DEFAULT_DISTFILES}
 CATEGORIES=            www
 MASTER_SITES=          http://sysoev.ru/nginx/
@@ -11,7 +11,6 @@ COMMENT=              Lightweight HTTP server and mail proxy server
 LICENSE=               2-clause-bsd
 
 PKG_DESTDIR_SUPPORT=   user-destdir
-
 .include "../../mk/bsd.prefs.mk"
 
 NGINX_USER?=           nginx
@@ -52,7 +51,7 @@ CONFIGURE_ARGS+=      --http-fastcgi-temp-path=${NGINX_DATADIR}/fstcgi_temp
 PKG_SYSCONFSUBDIR=     nginx
 
 EGDIR=                 ${PREFIX}/share/examples/nginx
-EGFILES              fastcgi.conf fastcgi_params koi-utf koi-win \
+EGFILES+=              fastcgi.conf fastcgi_params koi-utf koi-win \
                        mime.types nginx.conf win-utf
 
 .for file in ${EGFILES}
@@ -79,6 +78,8 @@ SUBST_SED.paths+=     -e 's,%%NGINX_GROUP%%,${NGINX_GROUP},g'
 MESSAGE_SUBST+=                NGINX_LOGDIR=${NGINX_LOGDIR}
 MESSAGE_SUBST+=                NGINX_PIDDIR=${NGINX_PIDDIR}
 
+.include "options.mk"
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${DESTDIR}${PREFIX}/sbin/nginx
 .for file in ${EGFILES}
@@ -87,7 +88,5 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/html/50x.html ${DESTDIR}${EGDIR}/html/50x.html
        ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
 
-.include "options.mk"
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index 59a9c4b..eccddb8 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2010/01/23 16:32:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/06/15 20:05:48 joerg Exp $
 sbin/nginx
 share/examples/nginx/conf/fastcgi.conf
 share/examples/nginx/conf/fastcgi_params
@@ -6,6 +6,7 @@ share/examples/nginx/conf/koi-utf
 share/examples/nginx/conf/koi-win
 share/examples/nginx/conf/mime.types
 share/examples/nginx/conf/nginx.conf
+${PLIST.uwsgi}share/examples/nginx/conf/uwsgi_params
 share/examples/nginx/conf/win-utf
 share/examples/nginx/html/50x.html
 share/examples/nginx/html/index.html
index 0415198..d2e3e12 100644 (file)
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.8 2010/03/21 22:32:35 joerg Exp $
+$NetBSD: distinfo,v 1.9 2010/06/15 20:05:48 joerg Exp $
 
-SHA1 (nginx-0.8.34.tar.gz) = bf9a291ee7c20ea6aca4e785af59c8b662ec1d24
-RMD160 (nginx-0.8.34.tar.gz) = 9472f7d2b7b456d54fdc8e4c8dcb35e6531d4a67
-Size (nginx-0.8.34.tar.gz) = 621534 bytes
-SHA1 (uwsgi-0.9.4.3.tar.gz) = 8271fe6f612176ce1a75d3363b5a63e395cc6830
-RMD160 (uwsgi-0.9.4.3.tar.gz) = d03be633473924239bac1f8861e0c8b293afe635
-Size (uwsgi-0.9.4.3.tar.gz) = 82312 bytes
+SHA1 (nginx-0.8.41.tar.gz) = a1030c9418415f106c768f282a9948c59cbff0e6
+RMD160 (nginx-0.8.41.tar.gz) = a24db63048ef2bb4f4800d73267b81718e0e70a3
+Size (nginx-0.8.41.tar.gz) = 634823 bytes
 SHA1 (patch-aa) = 1ef1a800f0d7dffe182b8a74f115105ded205f8e
+SHA1 (patch-ab) = 6f20ef8ac9a042faf7e22770de7c16b351cb1191
index 45599dc..f63b43c 100644 (file)
@@ -1,10 +1,12 @@
-# $NetBSD: options.mk,v 1.8 2010/03/21 22:32:35 joerg Exp $
+# $NetBSD: options.mk,v 1.9 2010/06/15 20:05:48 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= ssl pcre dav flv sub gtools mail-proxy memcache \
                        realip inet6 uwsgi
 PKG_SUGGESTED_OPTIONS= ssl pcre
 
+PLIST_VARS+=           uwsgi
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mssl)
@@ -53,8 +55,8 @@ CONFIGURE_ARGS+=       --with-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Muwsgi)
-UWSGI=                 uwsgi-0.9.4.3
-DISTFILES+=            ${UWSGI}.tar.gz
-SITES.${UWSGI}.tar.gz= http://projects.unbit.it/downloads/
-CONFIGURE_ARGS+=       --add-module=../${UWSGI}/nginx
+EGFILES+=              uwsgi_params
+PLIST.uwsgi=           yes
+.else
+CONFIGURE_ARGS+=       --without-http_uwsgi_module
 .endif
diff --git a/www/nginx/patches/patch-ab b/www/nginx/patches/patch-ab
new file mode 100644 (file)
index 0000000..fd2862b
--- /dev/null
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2010/06/15 20:05:48 joerg Exp $
+
+Workaround for /bin/sh bug on NetBSD
+
+--- auto/install.orig  2010-06-15 19:50:33.000000000 +0000
++++ auto/install
+@@ -114,9 +114,6 @@ install:   $NGX_OBJS${ngx_dirsep}nginx${ng
+               || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
+       cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
+-      test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \
+-              || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
+-
+       test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' || \
+               mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
index 24a99c0..d06c964 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2010/03/17 16:13:45 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/15 22:18:34 joerg Exp $
 #
 
-DISTNAME=      uwsgi-0.9.4.3
+DISTNAME=      uwsgi-0.9.4.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    www python
 MASTER_SITES=  http://projects.unbit.it/downloads/
index 376b613..67a0e8a 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/03/17 16:13:45 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/06/15 22:18:34 joerg Exp $
 
-SHA1 (uwsgi-0.9.4.3.tar.gz) = 8271fe6f612176ce1a75d3363b5a63e395cc6830
-RMD160 (uwsgi-0.9.4.3.tar.gz) = d03be633473924239bac1f8861e0c8b293afe635
-Size (uwsgi-0.9.4.3.tar.gz) = 82312 bytes
+SHA1 (uwsgi-0.9.4.4.tar.gz) = 84ade184baab77f009baeac7af5940b91bd2016c
+RMD160 (uwsgi-0.9.4.4.tar.gz) = b248d11cf82c31388a18b01bad6a7ecbfc4b1fe0
+Size (uwsgi-0.9.4.4.tar.gz) = 82723 bytes
index 0cce9c2..191c748 100644 (file)
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2010/06/15 21:29:25 drochner Exp $
 
-DISTNAME=              gtk-engines-2.18.5
+DISTNAME=              gtk-engines-2.20.1
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=           1
 CATEGORIES=            x11
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gtk-engines/2.18/}
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gtk-engines/2.20/}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users@NetBSD.org
index 742678b..e4ea74b 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/10/24 12:51:42 drochner Exp $
+@comment $NetBSD: PLIST,v 1.24 2010/06/15 21:29:25 drochner Exp $
 lib/gtk-2.0/2.10.0/engines/libclearlooks.la
 lib/gtk-2.0/2.10.0/engines/libcrux-engine.la
 lib/gtk-2.0/2.10.0/engines/libglide.la
@@ -16,8 +16,10 @@ share/gtk-engines/industrial.xml
 share/gtk-engines/mist.xml
 share/gtk-engines/redmond95.xml
 share/gtk-engines/thinice.xml
+share/locale/af/LC_MESSAGES/gtk-engines.mo
 share/locale/ar/LC_MESSAGES/gtk-engines.mo
 share/locale/as/LC_MESSAGES/gtk-engines.mo
+share/locale/ast/LC_MESSAGES/gtk-engines.mo
 share/locale/be@latin/LC_MESSAGES/gtk-engines.mo
 share/locale/bg/LC_MESSAGES/gtk-engines.mo
 share/locale/bn/LC_MESSAGES/gtk-engines.mo
@@ -29,6 +31,7 @@ share/locale/da/LC_MESSAGES/gtk-engines.mo
 share/locale/de/LC_MESSAGES/gtk-engines.mo
 share/locale/dz/LC_MESSAGES/gtk-engines.mo
 share/locale/el/LC_MESSAGES/gtk-engines.mo
+share/locale/en@shaw/LC_MESSAGES/gtk-engines.mo
 share/locale/en_GB/LC_MESSAGES/gtk-engines.mo
 share/locale/es/LC_MESSAGES/gtk-engines.mo
 share/locale/et/LC_MESSAGES/gtk-engines.mo
index 5127d51..57d326f 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.33 2010/01/18 18:31:10 drochner Exp $
+$NetBSD: distinfo,v 1.34 2010/06/15 21:29:25 drochner Exp $
 
-SHA1 (gtk-engines-2.18.5.tar.bz2) = bc540837ec7aa81b155c46317aacb367c3b71314
-RMD160 (gtk-engines-2.18.5.tar.bz2) = 34b47034302b18defdd2191bb9bea06b2ca4e614
-Size (gtk-engines-2.18.5.tar.bz2) = 675585 bytes
+SHA1 (gtk-engines-2.20.1.tar.bz2) = 908d24ae48e70a0ce2f047ba9f494f35153e3982
+RMD160 (gtk-engines-2.20.1.tar.bz2) = 336465821ded77e69d9cafe2cd07f3417dd97dc5
+Size (gtk-engines-2.20.1.tar.bz2) = 679326 bytes