X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fpackage-get.el;h=1ca37a648e298639ee8fc0f1c5d88d5e605b7a9b;hb=93b4859ea602158208485a5b1253e46be6da4e53;hp=c0d29a49c474de62d8be4987c242cf1f03105f38;hpb=ee38d21b330f5001b47a577cefb5ba7b82a3b7d3;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/package-get.el b/lisp/package-get.el index c0d29a4..1ca37a6 100644 --- a/lisp/package-get.el +++ b/lisp/package-get.el @@ -204,6 +204,7 @@ directory." ("US (Main XEmacs Site)" "ftp.xemacs.org" "pub/xemacs/packages") ;; In alphabetical order of Country, our mirrors... + ("Argentina (xmundo.net)" "xemacs.xmundo.net" "pub/mirrors/xemacs/packages") ("Australia (aarnet.edu.au)" "mirror.aarnet.edu.au" "pub/xemacs/packages") ("Australia (au.xemacs.org)" "ftp.au.xemacs.org" "pub/xemacs/packages") ("Austria (at.xemacs.org)" "ftp.at.xemacs.org" "editors/xemacs/packages") @@ -211,39 +212,37 @@ directory." ("Brazil (br.xemacs.org)" "ftp.br.xemacs.org" "pub/xemacs/packages") ("Canada (ca.xemacs.org)" "ftp.ca.xemacs.org" "pub/Mirror/xemacs/packages") ("Canada (crc.ca)" "ftp.crc.ca" "pub/packages/editors/xemacs/packages") - ("Canada (ualberta.ca)" "sunsite.ualberta.ca" "pub/Mirror/xemacs/packages") + ("Canada (nrc.ca)" "ftp.nrc.ca" "pub/packages/editors/xemacs/packages") +; ;; no anonymous ftp available: +; ("Chile (cl.xemacs.org)" "ftp.cl.xemacs.org" "packages") ("Czech Republic (cz.xemacs.org)" "ftp.cz.xemacs.org" "MIRRORS/ftp.xemacs.org/pub/xemacs/packages") - ("Denmark (dk.xemacs.org)" "ftp.dk.xemacs.org" "pub/emacs/xemacs/packages") + ("Denmark (dk.xemacs.org)" "ftp.dk.xemacs.org" "xemacs/packages") ("Finland (fi.xemacs.org)" "ftp.fi.xemacs.org" "pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/packages") ("France (fr.xemacs.org)" "ftp.fr.xemacs.org" "pub/xemacs/packages") ("France (mirror.cict.fr)" "mirror.cict.fr" "xemacs/packages") ("France (pasteur.fr)" "ftp.pasteur.fr" "pub/computing/xemacs/packages") ("Germany (de.xemacs.org)" "ftp.de.xemacs.org" "pub/ftp.xemacs.org/tux/xemacs/packages") - ("Germany (tu-darmstadt.de)" "ftp.tu-darmstadt.de" "pub/editors/xemacs/packages") + ("Greece (gr.xemacs.org)" "ftp.gr.xemacs.org" "mirrors/XEmacs/ftp/packages") + ("Hong Kong (hk.xemacs.org)" "ftp.hk.xemacs.org" "pub/xemacsftp/packages") ("Ireland (ie.xemacs.org)" "ftp.ie.xemacs.org" "mirrors/ftp.xemacs.org/pub/xemacs/packages") + ("Ireland (heanet.ie)" "ftp.heanet.ie" "mirrors/ftp.xemacs.org/packages") ("Italy (it.xemacs.org)" "ftp.it.xemacs.org" "unix/packages/XEMACS/packages") - ("Japan (aist.go.jp)" "ring.aist.go.jp" "pub/text/xemacs/packages") - ("Japan (asahi-net.or.jp)" "ring.asahi-net.or.jp" "pub/text/xemacs/packages") ("Japan (dti.ad.jp)" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/packages") - ("Japan (jaist.ac.jp)" "ftp.jaist.ac.jp" "pub/GNU/xemacs/packages") - ("Japan (jp.xemacs.org)" "ftp.jp.xemacs.org" "pub/GNU/xemacs/packages") - ("Japan (nucba.ac.jp)" "mirror.nucba.ac.jp" "mirror/xemacs/packages") - ("Japan (sut.ac.jp)" "sunsite.sut.ac.jp" "pub/archives/packages/xemacs/packages") +; ("Japan (jaist.ac.jp)" "ftp.jaist.ac.jp" "pub/GNU/xemacs/packages") + ("Japan (jp.xemacs.org)" "ftp.jp.xemacs.org" "pub/text/xemacs/packages") +; ("Japan (nucba.ac.jp)" "mirror.nucba.ac.jp" "mirror/xemacs/packages") ("Korea (kr.xemacs.org)" "ftp.kr.xemacs.org" "pub/tools/emacs/xemacs/packages") - ("New Zealand (nz.xemacs.org)" "ftp.nz.xemacs.org" "mirror/ftp.xemacs.org/packages") + ("Netherlands (nl.xemacs.org)" "ftp.nl.xemacs.org" "pub/xemacs/ftp/packages") ("Norway (no.xemacs.org)" "ftp.no.xemacs.org" "pub/xemacs/packages") - ("Poland (pl.xemacs.org)" "ftp.pl.xemacs.org" "pub/unix/editors/xemacs/packages") - ("Russia (ru.xemacs.org)" "ftp.ru.xemacs.org" "pub/xemacs/packages") - ("Slovakia (sk.xemacs.org)" "ftp.sk.xemacs.org" "pub/mirrors/xemacs/packages") - ("South Africa (za.xemacs.org)" "ftp.za.xemacs.org" "mirrorsites/ftp.xemacs.org/packages") + ("Portugal (pt.xemacs.org)" "ftp.pt.xemacs.org" "pub/MIRRORS/ftp.xemacs.org/packages") + ("Russia (ru.xemacs.org)" "ftp.ru.xemacs.org" "pub/emacs/xemacs/packages") + ("Saudi Arabia (sa.xemacs.org)" "ftp.sa.xemacs.org" "pub/xemacs.org/packages") ("Sweden (se.xemacs.org)" "ftp.se.xemacs.org" "pub/gnu/xemacs/packages") ("Switzerland (ch.xemacs.org)" "ftp.ch.xemacs.org" "mirror/xemacs/packages") + ("Taiwan (ftp.tw.xemacs.org)" "ftp.tw.xemacs.org" "Unix/Editors/XEmacs/packages") ("UK (uk.xemacs.org)" "ftp.uk.xemacs.org" "sites/ftp.xemacs.org/pub/xemacs/packages") - ("US (ibiblio.org)" "ibiblio.org" "pub/packages/editors/xemacs/packages") - ("US (stealth.net)" "ftp.stealth.net" "pub/mirrors/ftp.xemacs.org/pub/xemacs/packages") - ("US (unc.edu)" "metalab.unc.edu" "pub/packages/editors/xemacs/packages") - ("US (us.xemacs.org)" "ftp.us.xemacs.org" "pub/xemacs/packages") - ("US (utk.edu)" "ftp.sunsite.utk.edu" "pub/xemacs/packages") + ("US (ibiblio.org)" "mirrors.ibiblio.org" "pub/mirrors/xemacs/packages") + ("US (us.xemacs.org)" "ftp.us.xemacs.org" "pub/mirrors/xemacs/packages") ) "*List of remote sites available for downloading packages. List format is '(site-description site-name directory-on-site). @@ -260,27 +259,32 @@ variable actually used to specify package download sites." (defcustom package-get-pre-release-download-sites '( ;; Main XEmacs Site (ftp.xemacs.org) - ("Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org" + ("US Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org" "pub/xemacs/beta/experimental/packages") ;; In alphabetical order of Country, our mirrors... + ("Argentina Pre-Releases (xmundo.net)" "xemacs.xmundo.net" + "pub/mirrors/xemacs/beta/experimental/packages") ("Australia Pre-Releases (aarnet.edu.au)" "mirror.aarnet.edu.au" "pub/xemacs/beta/experimental/packages") ("Australia Pre-Releases (au.xemacs.org)" "ftp.au.xemacs.org" "pub/xemacs/beta/experimental/packages") ("Austria Pre-Releases (at.xemacs.org)" "ftp.at.xemacs.org" - "editors/xemacs/beta/experimentsl/packages") + "editors/xemacs/beta/experimental/packages") + ("Belgium (be.xemacs.org)" "ftp.be.xemacs.org" + "xemacs/beta/experimental/packages") ("Brazil Pre-Releases (br.xemacs.org)" "ftp.br.xemacs.org" "pub/xemacs/xemacs-21.5/experimental/packages") ("Canada Pre-Releases (ca.xemacs.org)" "ftp.ca.xemacs.org" "pub/Mirror/xemacs/beta/experimental/packages") - ("Canada Pre-Releases (crc.ca)" "ftp.crc.ca" + ("Canada Pre-Releases (nrc.ca)" "ftp.nrc.ca" "pub/packages/editors/xemacs/beta/experimental/packages") - ("Canada Pre-Releases (ualberta.ca)" "sunsite.ualberta.ca" - "pub/Mirror/xemacs/beta/experimental/packages") +; ;; no anonymous ftp available: +; ("Chile Pre-Releases (cl.xemacs.org)" "ftp.cl.xemacs.org" +; "beta/experimental/packages") ("Czech Republic Pre-Releases (cz.xemacs.org)" "ftp.cz.xemacs.org" "MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21.5/experimental/packages") ("Denmark Pre-Releases (dk.xemacs.org)" "ftp.dk.xemacs.org" - "pub/emacs/xemacs/beta/experimental/packages") + "xemacs/beta/experimental/packages") ("Finland Pre-Releases (fi.xemacs.org)" "ftp.fi.xemacs.org" "pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/beta/experimental/packages") ("France Pre-Releases (fr.xemacs.org)" "ftp.fr.xemacs.org" @@ -291,53 +295,47 @@ variable actually used to specify package download sites." "pub/computing/xemacs/beta/experimental/packages") ("Germany Pre-Releases (de.xemacs.org)" "ftp.de.xemacs.org" "pub/ftp.xemacs.org/tux/xemacs/beta/experimental/packages") - ("Germany Pre-Releases (tu-darmstadt.de)" "ftp.tu-darmstadt.de" - "pub/editors/xemacs/beta/experimental/packages") + ("Greece Pre-Releases (gr.xemacs.org)" "ftp.gr.xemacs.org" + "mirrors/XEmacs/ftp/beta/experimental/packages") + ("Hong Kong Pre-Releases (hk.xemacs.org)" "ftp.hk.xemacs.org" + "pub/xemacsftp/beta/experimental/packages") ("Ireland Pre-Releases (ie.xemacs.org)" "ftp.ie.xemacs.org" "mirrors/ftp.xemacs.org/pub/xemacs/beta/experimental/packages") + ("Ireland Pre-Releases (heanet.ie)" "ftp.heanet.ie" + "mirrors/ftp.xemacs.org/beta/experimental/packages") ("Italy Pre-Releases (it.xemacs.org)" "ftp.it.xemacs.org" "unix/packages/XEMACS/beta/experimental/packages") - ("Japan Pre-Releases (aist.go.jp)" "ring.aist.go.jp" - "pub/text/xemacs/beta/experimental/packages") - ("Japan Pre-Releases (asahi-net.or.jp)" "ring.asahi-net.or.jp" - "pub/text/xemacs/beta/experimental/packages") ("Japan Pre-Releases (dti.ad.jp)" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/beta/experimental/packages") - ("Japan Pre-Releases (jaist.ac.jp)" "ftp.jaist.ac.jp" - "pub/GNU/xemacs/beta/experimental/packages") +; ("Japan Pre-Releases (jaist.ac.jp)" "ftp.jaist.ac.jp" +; "pub/GNU/xemacs/beta/experimental/packages") ("Japan Pre-Releases (jp.xemacs.org)" "ftp.jp.xemacs.org" - "pub/GNU/xemacs/beta/experimental/packages") - ("Japan Pre-Releases (sut.ac.jp)" "sunsite.sut.ac.jp" - "pub/archives/packages/xemacs/xemacs-21.5/experimental/packages") - ("New Zealand Pre-Releases (nz.xemacs.org)" "ftp.nz.xemacs.org" "mirror/ftp.xemacs.org/packages") + "pub/text/xemacs/beta/experimental/packages") + ("Korea (kr.xemacs.org)" "ftp.kr.xemacs.org" + "pub/tools/emacs/xemacs/beta/experimental/packages") + ("Netherlands (nl.xemacs.org)" "ftp.nl.xemacs.org" + "pub/xemacs/ftp/beta/experimental/packages") ("Norway Pre-Releases (no.xemacs.org)" "ftp.no.xemacs.org" "pub/xemacs/beta/experimental/packages") - ("Poland Pre-Releases (pl.xemacs.org)" "ftp.pl.xemacs.org" - "pub/unix/editors/xemacs/beta/experimental/packages") + ("Portugal Pre-Releases (pt.xemacs.org)" "ftp.pt.xemacs.org" + "pub/MIRRORS/ftp.xemacs.org/beta/experimental/packages") ("Russia Pre-Releases (ru.xemacs.org)" "ftp.ru.xemacs.org" - "pub/xemacs/beta/experimental/packages") - ("Saudi Arabia Pre-Releases (sa.xemacs.org)" "ftp.sa.xemacs.org" - "pub/mirrors/ftp.xemacs.org/xemacs/xemacs-21.5/experimental/packages") - ("Slovakia Pre-Releases (sk.xemacs.org)" "ftp.sk.xemacs.org" - "pub/mirrors/xemacs/beta/experimental/packages") - ("South Africa Pre-Releases (za.xemacs.org)" "ftp.za.xemacs.org" - "mirrorsites/ftp.xemacs.org/beta/experimental/packages") + "pub/emacs/xemacs/beta/experimental/packages") + ("Saudi Arabia (sa.xemacs.org)" "ftp.sa.xemacs.org" + "pub/xemacs.org/beta/experimental/packages") ("Sweden Pre-Releases (se.xemacs.org)" "ftp.se.xemacs.org" "pub/gnu/xemacs/beta/experimental/packages") ("Switzerland Pre-Releases (ch.xemacs.org)" "ftp.ch.xemacs.org" "mirror/xemacs/beta/experimental/packages") + ("Taiwan Pre-Releases (ftp.tw.xemacs.org)" "ftp.tw.xemacs.org" + "Unix/Editors/XEmacs/beta/experimental/packages") ("UK Pre-Releases (uk.xemacs.org)" "ftp.uk.xemacs.org" "sites/ftp.xemacs.org/pub/xemacs/beta/experimental/packages") - ("US Pre-Releases (ibiblio.org)" "ibiblio.org" - "pub/packages/editors/xemacs/beta/experimental/packages") - ("US Pre-Releases (stealth.net)" "ftp.stealth.net" - "pub/mirrors/ftp.xemacs.org/pub/xemacs/beta/experimental/packages") - ("US Pre-Releases (unc.edu)" "metalab.unc.edu" - "pub/packages/editors/xemacs/beta/experimental/packages") + ("US Pre-Releases (ibiblio.org)" "mirrors.ibiblio.org" + "pub/mirrors/xemacs/beta/experimental/packages") ("US Pre-Releases (us.xemacs.org)" "ftp.us.xemacs.org" - "pub/xemacs/beta/experimental/packages") - ("US Pre-Releases (utk.edu)" "ftp.sunsite.utk.edu" - "pub/xemacs/beta/experimental/packages")) + "pub/mirrors/xemacs/beta/experimental/packages") +) "*List of remote sites available for downloading \"Pre-Release\" packages. List format is '(site-description site-name directory-on-site). SITE-DESCRIPTION is a textual description of the site. SITE-NAME @@ -844,14 +842,7 @@ Return `t' upon complete success, `nil' if any errors occurred." (progn ;; Add lispdir to load-path if it doesn't already exist. ;; NOTE: this does not take symlinks, etc., into account. - (if (let ((dirs load-path)) - (catch 'done - (while dirs - (if (string-equal (car dirs) lispdir) - (throw 'done nil)) - (setq dirs (cdr dirs))) - t)) - (setq load-path (cons lispdir load-path))) + (add-to-list 'load-path (file-name-as-directory lispdir)) (if (not (package-get-load-package-file lispdir "auto-autoloads")) (package-get-load-package-file lispdir "_pkg")) t)