Harmonisé les noms des différentes fonctions get_pkg_ver...

[hvlinux.git] / stage5 / packages-update

diff --git a/stage5/packages-update b/stage5/packages-update
index e1f3b54..4ae8ea3 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -26,8 +26,8 @@ fpkg -m gnome ${PYGTK}
 fpkg -e "tar.gz" ${GC} "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source"
 
 fpkg -m gnu ${EMACS}
-fpkg -m hv ${HVCLOCK}
-fpkg -m hv ${WMNOTIFY}
+fpkg -e "tar.gz" ${HVCLOCK}  "http://www.hugovil.com/repository/hvclock"
+fpkg -e "tar.gz" ${WMNOTIFY} "http://www.hugovil.com/repository/wmnotify"
 
 fpkg -e "tar.bz2" ${DESKTOP_FILE_UTILS} \
     "http://freedesktop.org/software/desktop-file-utils/releases"
@@ -63,9 +63,9 @@ fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_OTHER}
 fpkg ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick"
 fpkg -m fd -s "none" ${POPPLER}
 fpkg -m gnome ${LIBRSVG}
-fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver_base ${BABL})"
-fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver_base ${BABL})"
-fpkg ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver_base ${GIMP})"
+fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver2 ${BABL})"
+fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver2 ${BABL})"
+fpkg ${GIMP} "ftp://ftp.gimp.org/pub/gimp/v$(get_pkg_ver2 ${GIMP})"
 fpkg -m sf -s "gimp-print" -e "tar.bz2" ${GUTENPRINT}
 fpkg -m sf -s "boost" ${BOOST}
 fpkg -m sf ${INKSCAPE}
@@ -130,11 +130,11 @@ fpkg -m sf ${GRIP}
 fpkg -m sf -e "tar.bz2" ${CDRDAO}
 fpkg -m sf -e "tar.bz2" ${EASYTAG}
 fpkg -e "tar.gz" ${LILYPOND} \
-    "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})"
+    "http://lilypond.org/download/sources/v$(get_pkg_ver2 ${LILYPOND})"
 fpkg -m hv ${FFMPEG}
 
 fpkg ${SYLPHEED} \
-    "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})"
+    "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})"
 fpkg -m hv ${NSS}
 fpkg -f "${FIREFOX}.source" ${FIREFOX} \
     "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(get_pkg_ver ${FIREFOX})/source"
@@ -187,7 +187,8 @@ fpkg -m hv ${UML_UTILITIES}
 
 fpkg ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files"
 
-fpkg -e "tar.gz" ${CKERMIT} "ftp://kermit.columbia.edu/kermit/archives"
+# Ckermit decompresses all of its files in the current directory, so created a proper archive on hv server.
+fpkg -m hv ${CKERMIT}
 
 fpkg -e "tar.gz" ${LIBGAMIN} "http://www.gnome.org/~veillard/gamin/sources"
 
@@ -197,7 +198,7 @@ fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
 
 #fpkg_mis   ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads"
 
-GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver_base ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA})
+GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver2 ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA})
 
 #fpkg ${LIBGEDA}       ${GEDA_BASE_URL}
 #fpkg ${GEDA_SYMBOLS}  ${GEDA_BASE_URL}