summaryrefslogtreecommitdiff
path: root/www
AgeCommit message (Collapse)AuthorFilesLines
2008-06-22Install lynx.lss manually for slang option case.wiz1-1/+4
(I guess it is probably not needed in this case, but the changes to ignore it for the slang option alone are much more effort). Addresses PR 38284 by Daniel Horecki.
2008-06-21Add p5-LWP-UserAgent-Determined.he1-1/+2
2008-06-21Import p5-LWP-UserAgent-Determined version 1.03.he3-0/+37
This class works just like LWP::UserAgent (and is based on it, by being a subclass of it), except that when you use it to get a web page but run into a possibly-temporary error (like a DNS lookup timeout), it'll wait a few seconds and retry a few times. It also adds some methods for controlling exactly what errors are considered retry-worthy and how many times to wait and for how many seconds, but normally you needn't bother about these, as the default settings are relatively sane.
2008-06-21+py-rss2gentonnerre1-1/+2
2008-06-21Import Python PyRSS2Gen module which is used by various Subversion helpertonnerre4-0/+30
scripts and other scripts which output RSS. Other than most other RSS libraries for Python, this one handles escaping of input and is supposed to be extensible.
2008-06-21Add and enable zope211.taca1-1/+2
2008-06-21Importing Zope 2.11.0.taca14-0/+9878
Some new features of Zope 2.11: * ZODB 3.8 with blob support (binary large objects) * Zope 3.4 integration * transactional Mailhost implementation * lots of minor improvements and fixes For more information on what is new in this release, see the CHANGES.txt files for the release: http://www.zope.org/Products/Zope/2.11.0/CHANGES.txt
2008-06-21Update squid package to 2.6.20 (2.6.STABLE20).taca2-6/+6
It would be last 2.6 stable release. Changes to squid-2.6.STABLE20 (25 Apr 2008) - Bug #2263: Custom log formats fail to log file sizes >2GB properly on 32-bit platforms - Fix stripping NT domain in squid_ldap_group - Bug #2278: Cache-Control: max-stale=0 forwarded wrongly as max-stale (without delta) - Bug #2283: Fails to parse chunked encoding using chunk extensions - Bug #420: Deal properly with empty list HTTP header members - Windows Server 2008 support - Bug #1886: tcp_outgoing_address acl doesn't work with indirect source address (follow-x-forwarded-for) - Bug #2296: Stuck in 100% CPU when fetching an corrupt peer digest - Add support for the resolv.conf domain directive, and also automatically derived default domain - minimum_icp_query_timeout directive - Bug #2329: Range header ignored on HIT
2008-06-20Add p5-Apache2-AuthCookieDBI.he1-1/+2
2008-06-20Import p5-Apache2-AuthCookieDBI version 2.03.he4-0/+37
2008-06-20Add p5-Apache2-AuthCookie.he1-1/+2
2008-06-20Import p5-Apache2-AuthCookie version 3.12.he3-0/+31
2008-06-20Apply the patch for CVE-2008-2364 from apache.he3-2/+74
Bump pkg revision.
2008-06-20Update rails to 2.1.0.minskim3-14/+28
New major features: - Time zones - Dirty tracking - Gem Dependencies - Named scope - UTC-based migrations - Better caching
2008-06-20Update ruby-activeresource to 2.1.0.minskim2-8/+7
Too many changes since 2.0.2. See CHANGELOG for the complete list.
2008-06-20Update ruby-actionpack to 2.1.0.minskim3-14/+70
Too many changes since 2.0.2. See CHANGELOG for the complete list.
2008-06-20Add DESTDIR support.joerg92-272/+431
2008-06-19Version 1.5.0epg1-2/+1
(17 Jun 2008, from /branches/1.5.x) http://svn.collab.net/repos/svn/tags/1.5.0 pkgsrc changes: - Drop patch-{aa,ag,ah,ai,aj,ak}: applied upstream. - Drop part of patch-ad fixed upstream; only INSTALLDIRS=vendor left. - Dropped -lib from BUILD_TARGET of ruby/perl/python, not necessary for ages. - Add java-subversion package, but: Only tested with sun-jdk6-6.0.5; maybe it works with other Java, maybe no. make test only works if you install junit by hand, as it does not seem to be packaged. User-visible changes: - Major new features: * Merge Tracking [foundational] (issue #820) * Sparse checkouts (see new '--depth' option) (issue #695) * Interactive conflict resolution (r25670 et al) * svn:externals handles relative URLs (issue #1336) and peg URLs * Changelist support * WebDAV transparent write-through proxy * Better support for large FSFS deployments (via sharding & partitioning) * Cyrus SASL support for ra_svn and svnserve (issue #1144) - Minor new features and improvements: * 'svn resolve' (with '--accept' option) replaces "resolved" (issue #2784) * 'svn move file1 file2 ... dir' now moves the files into dir (issue #747) * 'svn mkdir' and 'svn copy' now take '--parents' option (issue #1776) * 'svn delete' now takes '--keep-local' to not remove working copy files * 'svn copy', 'move' now support peg revisions (issue #2546; also r26484) * 'svn copy A B ; svn move B C' now the same as 'svn copy A C' (issue #756) * 'svn copy -rBASE' now works in a working copy (issue #1643) * 'svn import' now takes '--force' (issue #2806) * 'svn status -u' now shows of locally deleted directories (issue #2420) * 'svn switch' now takes '--force' (issue #2392) * 'svn switch' now takes '--ignore-externals' option (issue #2189) * 'svn switch' now supports peg revisions (issue #2545) * 'svn checkout' now takes '--force' option (issue #1328) * 'svn proplist' and 'svn propget' now support peg revisions (issue #3070) * 'svn propget' now takes '--xml' option (issue #2696) * 'svn propedit' now support URLs (issue #2238, but see issue #2923) * 'svn proplist --quiet' no longer prints extra info (issue #1547) * 'svn diff --summarize' now takes '--xml' option (issue #2967) * 'svn diff -x' now takes '-p' extension option (issue #2995) * 'svn log' now takes '-c' option (r27933) * 'svn log' now takes '-l' as short form of '--limit' (r25829) * 'svn log --xml' now takes '--with-revprop' option (issue #2850) * 'svn diff'/'svnlook diff' now show property actions better (issue #3019) * 'svn merge' now has informative messages on reverse merges (issue #2848) * 'svn merge FILE' now honors '--ignore-ancestry' (issue #2853, r25891) * 'svn merge' handles multiple notifications for single items (issue #2828) * 'svn merge' handles skipped path better (issue #2829) * 'svn merge' handles merges from foreign repositories more completely * 'update', 'checkout', 'switch' now handle obstructions gracefully (r22257) * 'svn update' now takes '--force' (issue #2392) * 'svn update' now sometimes copies or moves local files, for efficiency * 'svnadmin lslocks' now accepts path within repository (issue #2965) * 'svnadmin recover' now supports FSFS repositories (issue #2992) * 'svnadmin verify' now has '-q' and '-r' options (r22103) * 'svnadmin setrevprop' command added (r21736) * 'svnadmin setuuid' command added (r28511) * 'svnsync sync' now shows commit progress like 'svn commit' * 'svnsync' now takes '-q, --quiet' option (r26465) * 'svnsync' now supports separate authn for source/target (issue #2717) * 'svnsync copy-revprops' now supports revision ranges (r23498) * 'svnsync copy-revprops' now supports "HEAD" revision alias (r23500) * 'svnmucc' is new name for contrib tool formerly called 'mucc' * 'svnmucc' now has propset and propdel subcommands (issue #2758) * 'svnmucc' now has more authentication options * 'svnmucc' now now takes '--non-interactive' option (r25977) * 'svnmucc' now takes a global base revision, for extra safety (r23764) * 'svnlook' now takes '--extensions' option (issue #2912) * 'svnlook' now takes '-N' option (issue #2663) * 'svnlook history' now takes '-l' / '--limit' option (r25843) * 'svnserve' now takes '--config-file' option (r24119) * 'mod_dav_svn' now uses Apache default mime-type for files (issue #2304) * new '--with-revprop' option on all commands that commit (issue #1976) * now accept "peg dates" (URL@{DATE}), behaving like peg revs (issue #2602) * easier to try out experimental ra_serf http:// access module * select ra_neon vs ra_serf on a site-by-site basis in config (r25535) * client-side post-commit processing now more efficient (issue #2607) * windows binaries now use a custom crash handler (issue #1628) * add vim swap file patterns to default global-ignores (r24348) * add "*.pyc" and "*.pyo" patterns to default global-ignores (issue #2415) * add unix/libtool library patterns to default global-ignores (issue #2415) * naming scheme for conflict files is now configurable (issue #2474) * removed svn-ref.tex as it's extremely out of date (issue #2762) * improved cancellation response in many situations * support Neon up to 0.28 * character set conversion now uses native API on Windows (r25650) * HTTP authn protocol now configurable (for Neon 0.26 and higher) (r21531) * http:// (over Neon) supports HTTP redirection / relocation (issue #660) * support PKCS#11-provided (smartcard) SSL client certs with Neon (r29421) * authz now supports aliases (r21982) * authz token rules for authenticated-only, anonymous, and inverse (r23750) * mailer.py now supports properties in commit messages (r21684) * ra_serf now supports NTLM/SSPI authentication (issue #2900) * warn if try to turn off boolean property via propset/propedit (r25486) * display repository basename in XML and HTML index views (r25837, r25838) * config 'http-auth-type' can be overridden to force BASIC auth (r23900) * translation updates for all languages, as usual * Revamp mod_dav_svn logging; see tools/server-side/svn_dav_log_parse.py * misleading configure arg --enable-dso now --enable-runtime-module-search - Client-side bugfixes: * 'svn revert' of missing scheduled addition broke wc (issue #2425) * 'svn export' should export svn:externals from local copies (issue #2429) * 'svn status -uN' should show status of files (issue #2468) * 'svn update' overwrote if local timestamp unchanged (issue #2746) * 'svn update -N' errored when receiving a deletion (issue #3039) * 'svn merge' would delete locally modified props (issue #2857) * 'svn log --xml' could output invalid XML (issue #2866) * 'svn copy' on URL with spaces made wrong WC file name (issue #2955) * 'svn diff' was failing w/ large diffs on Windows (issue #1789) * 'svn delete' no longer deletes locally-modified files (issue #1808) * 'svn move' moved files to wrong directory on Windows (issue #1869) * 'svn revert' mistakenly used leftover .svn-revert files (issue #2927) * 'svn diff' output now shows relative paths (issue #2723) * 'svn diff' wasn't ignoring all EOLs (issue #2920) * 'svn cleanup' no longer fails on a missing .svn/tmp dir (r23370) * infinite loop in UTF conversion in non-C locale (issue #2577) * interrupting "svn status" could make svn crash (issue #2623) * commit-email.pl date header output now RFC2822-compliant (issue #2633) * authz write access to folder wasn't permitting locking (issue #2700) * stop complaining just because $HOME is unreadable (issue #2363) * do not display unescaped characters in error message (issue #2471) * propchange received on subdir merge causes conflict (issue #2969) * revert replaced-with-history files should restore checksum (issue #2928) * catch improper arguments to diff (issue #2996) * handle URLs like http://hostname (i.e. no path part) (issue #1851) * config autoprops honored regardless of case of entry (issue #2036) * "Cannot replace a directory from within" error now rarer (issue #2047) * handle _svn/.svn as part of a path (issue #3026) * make permissions changes on symlinks a no-op (issue #2581) * error usefully if asked to update a URL (r22296) * fixed infinite loop on Windows if fail to find repository root (r22483) * 'svn info $REPO_ROOT' now supports pre-1.2 svn:// servers (r26264) * be more resilient in the face of faulty .svn/entries files (r26482) * 'svn diff -x --ignore-eol-style' failed to ignore all EOLs (r27094) * rare property dataloss bug now fixed (issue #2986, see also r29538) * fixed faulty status reporting for some missing directories (issue #2804) * 'svn diff --summarize' showed wrong output paths (issue #2765) * propset and move interaction could cause property weirdness (r25833) * 'svn propget <propname> .@HEAD' now works (issue #3012) * 'svnsync' had bug with replaced+modified rev over serf (issue #2904) * 'svnsync --config-dir' sometimes ignored, thus tunnel agent bug (r27056) * update/merge safely receives file on top of schedule-add file (r23506) * http:// (over Neon) reports progress while disk-spooling delta (r26271) * print "Out of memory" before dying from memory shortage (issue #2167) * warn when used on old checkout without a repository root entry (r25168) * merge to missing file target wrongly appeared to succeed (issue #2782) * 'svn merge URL PATH -cX' could cause property corruption (issue #2781) * URL parsing now consistently checks for error earlier (issue #2207) * security hole: files could be created above cwd (r26047, CVE-2007-3846) * local property mods to replaced-with-history file could be lost (r26364) * revert of replaced-with-history path left copyfrom info (r23452) * character encoding translation could hang (r23492) * un-substituting keywords was buggy ($Id$ vs. $Id:$) (issue #2640) * ra_neon and ra_serf lost pre-revprop-change hook output (issue #443) * merge of non-empty subdir could be committed incorrectly (issue #1962) * many other minor bugfixes, optimizations, plugs of memory leaks, etc - Server-side bugfixes: * segfault in svnserve and svnversion commands fixed (issue #2757) * segfault when stopping httpd (if BDB repository) fixed (issue #2732) * 'svnadmin dump' had a path ordering bug (issue #2641) * better FSFS support for NFS v3 and lower (r24470) * better FSFS support for some buggy NFS clients (r29448) * authentication and authz bugs w.r.t. anonymous access (issue #2712) * inconclusive authz result should deny, not allow (r23815) * better reporting of problems parsing authz files (r22329) * set svn:date revprop even if dumpstream does not (issue #2729) * http:// commit can now create empty files properly (r25471, r25474) * squelch not-a-directory errors in both FS backends (issue #2549) * segfault on update-report response without base revision (issue #3023) * 'svnserve --root PATH' checks that PATH exists (r22580, r22701) * 'svnlook propget -t TXN_NAME' reports errors better (r22772) * make location of mod_dav_svn activity database configurable (r24873) * select only paths that are proper children of requested path (r25231) * http:// commit error could leave empty transactions behind (r23594) * 'svn switch --relocate' now works against unreadable repos root (r23848) * many other minor bugfixes too numerous to list here - Contributed tools improvements and bugfixes: * svn_load_dirs.pl: - Support global-ignores list (issue #2470) - Allow "@" in filenames (r22203, Debian bug 359145) - Add -no_auto_exe option (r26399) * svnmerge.py: - fixed: Always get end_rev from source instead of target (issue #2863) - fixed: 'init' now chooses a better default revision range (issue #2810) - fixed: Consider revs changing blocking status as reflected (issue #2814) - Performance inmprovement (issue #2812) - initialized revisions can be excluded (issue #2851) * new 'svn-populate-node-origins-index' tool (issue #3024) * new 'svn-merge-vendor.py' to assist in merging vendor branches (r23030) * 'svn2rss.py' is now called 'svn2feed.py' * svn2cl: New release 0.9 (r24498) * commit-email.pl: various improvements (r22971, r22589) * commit-email.rb: various improvements * psvn.el: too many improvements and new features to list them all here * dsvn.el: improve XEmacs compatibility (r24337) * svn-tweak-author.py: make NEWAUTHOR argument optional (r24387) * And more stuff that we just didn't have time to list. Enjoy. Developer-visible changes: * General: - libsvn_ra_neon is new name for libsvn_ra_dav (to accommodate ra_serf) - many abort() calls removed, replaced with error returns - client and server now do capabilities exchange (r29358 et al) - gen_win.py: auto-detect the path to the JDK on Windows (r24333) * API changes: - many, many new APIs and types as part of the new features in 1.5.0 - APIs to allow retrieving multiple revprops in one fetch (issue #2850) - basic progress reporting for ra_svn (issue #901) - new APIs for creating and using iterators (r26533) - svn_fs_node_origin_rev finds line of history origin (issue #3017, #3024) - svn_revnum_parse for parsing revision numbers (r26195) - svn_path_is_canonical for validating paths (r26481) - new API svn_fs_txn_root_base_revision() (r22610) - pass individual arguments rather than config objects (r25182, r25190) - clients can now extend HTTP User-Agent header (r28613) - SVN_ERR_RA_DAV_PATH_NOT_FOUND is deprecated and no longer raised * Bindings: - Many improvements to all bindings (Java, Perl, Python, and Ruby)
2008-06-19use more INSTALLATION_DIRS. There should be no functional change.taca1-9/+9
2008-06-19Bump PKGREVISION of rubygem based packages which contain extention libraries.taca2-2/+4
2008-06-19- ruby-clearsilver switch to use vendor_dir with Ruby 1.8.7.taca4-6/+24
Bump PKGREVISION.
2008-06-19- Switch to use vendor_dir with Ruby 1.8.7.taca8-1374/+1382
Bump PKGREVISION.
2008-06-19- Switch to use vendor_dir with Ruby 1.8.7.taca5-56/+101
- And make it build with Ruby 1.8.7, too. Bump PKGREVISION.
2008-06-19Add a security fix for kses, HTML filter which isn't used with defaulttaca4-4/+32
configuration: http://www.geeklog.net/article.php/kses. Also fix one pkglint warning. Bump PKGREVISION.
2008-06-19make GEEKLOG_BASE and GEEKLOG_PUB settable.taca1-4/+6
2008-06-18Update "apache22" package to version 2.2.9.tron6-236/+141
This version of Apache is principally a bug and security fix release. The following potential security flaws are addressed: - CVE-2008-2364: mod_proxy_http: Better handling of excessive interim responses from origin server to prevent potential denial of service and high memory usage. Reported by Ryujiro Shibuya. - CVE-2007-6420: mod_proxy_balancer: Prevent CSRF attacks against the balancer-manager interface. pkgsrc related notes: - CVE-2008-2364 was already fixed in "pkgsrc" - CVE-2007-6420 doesn't affect the package in the default configuration because the "proxy_balancer" isn't enabled.
2008-06-17The major changes compared to the Horde version H3 (3.2.1) are:adrianp3-24/+16
* Escape item names in the object browser. * Select db before queries in MySQL SessionHandler. * Format messages sent through MIME_Mail in flowed text format. * Fixes for SQL shares with split read/write databases, and various fixes for hierarchical shares. * Workaround broken IE behavior when downloading files with 8-bit filenames. * Fix storing of unlocked preferences set by hooks. * Allow Horde memcache driver to use UNIX sockets. * Fix parsing of addresses in headers when the RFC 2047-encoded personal part of the address contains address list delimiters. * Fix generation of unique keys in configuration for machines too fast for microtime(). * Added group driver for Kolab. * Added IMAP based preferences driver for Kolab. * Fix missing timestamp variable in Horde SQL cache driver. * Fix over-zealous preference caching when preferences are requested for a different user. * Fix issue in Horde_Image that caused errors when performing certain image operations immediately after an image had been cropped when using the ImageMagick driver. The full list of changes (from version 3.2) can be viewed here: http://cvs.horde.org/diff.php/horde/docs/CHANGES?r1=1.515.2.392&r2=1.515.2.413&ty=h
2008-06-13remove an "extern inline" which is gcc specific and doesn't work on IRIX,drochner3-1/+29
reported by Stuart Shelton in PR pkg/38252, I also think that the PRIVOXY_GROUP thing was a false report caused by some pkgsrc framework glitch -- the value passed to "configure" is correct for me (check "config.status").
2008-06-13Set BUILD_DEPENDS on doxygen to 1.5.6 because doxygen's ABI changedgdt1-2/+2
in that version to generate additional files.
2008-06-12Add patch for CVE-2008-2364 from the Apache SVN repository.tron3-3/+87
2008-06-12Add missing doc/html file to PLIST; PKGREVISION++gdt2-2/+4
2008-06-12Add DESTDIR support.joerg70-147/+282
2008-06-08DESTDIR support.joerg1-4/+6
2008-06-06Update plone3 package to 3.1.2.taca4-11/+35
* Correct registration of the Sarissa javascript library: current KSS uses it as well. Fixes bug 8141. * Correct handling of external links in the portal section tabs. Fixes bug 7155. * Correct display of sub-collections. Fixes bug 8159. * Use a custom permission for collection portlets so users can use it on their dashboard. * Fix handling of unicode versioning comments. Fixes bug 7400. * Update translations. * Do not allow backquotes in URLs but replace them with a dash. * Make CSS classes for the navigation tree more consistent. * KSS updates: o kss.demo is no longer required. o Improve support for Sarari 3.1. o Correct logging of doubly registered actions. * Update the quick installer tool: o Log ImportErrors in installation methods instead of silently ignoring them. o Sort products by title instead of id. This fixes bug 8012. o Fix installation/upgrade of products which had pre-Plone 3.0/CMF 21 style actions. * Update the kupu visual editor: o Add a hint for Deliverance so it will not style kupu pages. o Fix Plone bugs 7779, 7958, 7990, 8003, 8009, 8014, 8039, 8080, and 8129 . * Update Zope: o Bug 142350: Display description for properties as row title, if present. o Bug 143813: zopectl now exits non-zero when child processes fail. o Bug 164783: Indexes were migrated on initial creation of a ZODB. o Bug 173658: Removed dead code in OFS.Traversable's unrestrictedTraverse (apparent NameError). o Bug 198274: "empty" ZopePageTemplates could not be unpickled. o Bug 200007: DateTime(anotherDateTime) now preserves the timezone. o Bug 213311: Handle "unsubscriptable object" errors during publishing traversal. o zope.security: upgrade to version 3.3.3, which contains a backport of a huge performance bugfix from the 3.4 branch.
2008-06-06Start update of plone3 to 3.1.2.taca1-2/+2
2008-06-05Add a option for "amazon_s3".reed1-2/+9
The ikiwiki amazon_s3 plugin injects wiki pages into Amazon S3 allowing ikiwiki to be used without a dedicated web server. This option just make a dependency for required perl module. Note the plugin is installed regardless (just like the svn and img support are installed without the options bringing in dependencies).
2008-06-05Update to 2.48.reed4-23/+8
See http://ikiwiki.info/news/ for complete list of changes. Major changes include: - "fixes an important security hole" - new plugins: amazon_s3, pingee, pinger patch-aa removed, fixed now.
2008-06-05fix PLIST, from Hasso Tepper per PR pkg/38848drochner2-12/+18
2008-05-31tie down API dependency to firefox 2.xtnn1-1/+2
2008-05-31Tie down the firefox API dependency for the firefox option to <= 2.99.tnn1-1/+2
"gtkmozembed" is deprecated and not shipped with firefox 3.0+ Some packages that need firefox (like www/epiphany?) can be configured to use libxul instead. For those packages that support it, it might be a good idea to add a firefox3 option when we get closer to firefox 3 launch day.
2008-05-30Bump PKGREVISION for gtkspell API bump.wiz1-2/+2
2008-05-30Drop lang/mono/Makefile.common which is not needed anymore.tnn1-3/+1
2008-05-29update to 2.22.2drochner2-6/+6
changes: -bugfixes -translation updates
2008-05-29update to 2.22.2drochner2-6/+7
changes: bugfixes pkgsrc change: pull in libnotify to get download completion notifications
2008-05-29update to 3.18.2drochner2-6/+6
changes: -fix for flickering -translation updates
2008-05-26Horde version 3.2 is a major upgrade in the 3.x release series, including theseadrianp4-173/+2610
enhancements: * Stable synchronization support through integrated SyncML server. * A new Alarm system that can send email alarms, generate popup or inline notifications, and play sounds for events in any Horde application. * Support for separate read and write databases, and improved useability when the database is unavailable. * Improved performance, through caching and native SQL drivers for shares, groups, and permissions; faster DataTree queries, and smarter use of session data. * The administrator can disable users' ability to change permissions on their Shares. * Two slick new themes, Tango Blue and Silver Surfer. * WCAG 1.0 Priority 2/Section 508 accessibility guidelines compliance. * Full Kolab webclient support. * Improved JavaScript code including more caching, JSON support, new spell checking and color picking widgets, replacing htmlarea with xinha, and dynamic portal updates. * Help is now searchable and has a tree view for easy organization and exploration of help topics. * Wider memcache support and easier memcache configuration, including connection pooling and multiple memcache servers. * A more complete WebDAV server. * "Drop-in" configuration support for applications through config/registry.d/. * Many additional hooks, for performing actions on preference value changes, and after loading an application. * and much, much more.
2008-05-26Second round of explicit pax dependencies. As reminded by tnn@,joerg32-83/+125
many packages used to use ${PAX}. Use the common way of directly calling pax, it is created as tool after all.
2008-05-26Needs full pax dependency. Bump revision.joerg1-5/+8
2008-05-25Explicitly add pax dependency in those Makefiles that use it (or havejoerg6-14/+13
patches to add it). Drop pax from the default USE_TOOLS list. Make bsdtar the default for those places that wanted gtar to extract long links etc, as bsdtar can be built of the tree.
2008-05-25Remove EXTRACT_USING=pax.joerg1-2/+1