Add option to append version number in fpkg()

[hvlinux.git] / stage5 / packages-update

diff --git a/stage5/packages-update b/stage5/packages-update
index 21316f8..2e8a260 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -10,8 +10,7 @@ lpkg 3 ${FREETYPE}
 
 fpkg -m gnu ${HELP2MAN}
 fpkg -m gnu ${GSL}
-fpkg -s "$(get_pkg_ver3 ${CUPS})" -f "${CUPS}-source" ${CUPS} \
-    "http://www.cups.org/software"
+fpkg -v 3 -f "${CUPS}-source" ${CUPS} "http://www.cups.org/software"
 fpkg -e "tar.gz" -f "$(get_pkg_name ${CUPS_PDF})_$(get_pkg_ver ${CUPS_PDF})" \
     ${CUPS_PDF} "http://www.cups-pdf.de/src"
 fpkg -m sf -e "tar.bz2" ${SPLIX}
@@ -76,9 +75,9 @@ fpkg -e "tar.gz" ${VIEWNIOR} "https://github.com/xsisqox/Viewnior/archive"
 fpkg -e "tar.xz" -m fd -s "none" ${POPPLER}
 fpkg -m gnome ${LIBCROCO}
 fpkg -m gnome ${LIBRSVG}
-fpkg ${BABL} "ftp://ftp.gtk.org/pub/babl/$(get_pkg_ver2 ${BABL})"
-fpkg ${GEGL} "ftp://ftp.gimp.org/pub/gegl/$(get_pkg_ver2 ${GEGL})"
-fpkg -s "v$(get_pkg_ver2 ${GIMP})" ${GIMP} "http://download.gimp.org/pub/gimp"
+fpkg -v 2 ${BABL} "http://download.gimp.org/pub/babl"
+fpkg -v 2 ${GEGL} "http://download.gimp.org/pub/gegl"
+fpkg -s "v" -v 2 ${GIMP} "http://download.gimp.org/pub/gimp"
 
 fpkg -m sf -s "gimp-print" -e "tar.bz2" ${GUTENPRINT}
 fpkg -m sf -s "boost" ${BOOST}
@@ -87,9 +86,8 @@ fpkg -m sf ${INKSCAPE}
 fpkg ${CDRTOOLS} "ftp://ftp.berlios.de/pub/cdrecord"
 fpkg -e "tar.gz" ${DVDRWTOOLS} \
     "http://fy.chalmers.se/~appro/linux/DVD+RW/tools"
-fpkg -s "$(get_pkg_ver ${LIBDVDCSS})" ${LIBDVDCSS} \
-    "http://www.videolan.org/pub/libdvdcss"
-fpkg -e "tar.bz2" -s "$(get_pkg_ver ${LIBDVDREAD})" ${LIBDVDREAD} \
+fpkg -v 0 ${LIBDVDCSS} "http://www.videolan.org/pub/libdvdcss"
+fpkg -e "tar.bz2" -v 0 ${LIBDVDREAD} \
     "http://download.videolan.org/pub/videolan/libdvdread"
 
 fpkg -e "tar.gz" ${DVDFS} "http://jspenguin.org:81/dvdfs"
@@ -115,13 +113,13 @@ fpkg -m gnome ${VTE}
 fpkg -m sf ${GRIP}
 fpkg -m sf -e "tar.bz2" ${CDRDAO}
 fpkg -m sf ${ID3LIB}
-fpkg -e "tar.xz" ${EASYTAG} "https://download.gnome.org/sources/easytag/$(get_pkg_ver2 ${EASYTAG})"
-fpkg -e "tar.gz" -f "fontforge-2014-11-26-Unix-Source" -s "" ${FONTFORGE} \
-    "https://github.com/fontforge/fontforge/releases/download/$(get_pkg_ver ${FONTFORGE})"
+fpkg -m gnome ${EASYTAG}
+
+fpkg -e "tar.gz" -f "FontForge-$(get_pkg_ver ${FONTFORGE} | sed 's/\./-/g')-Unix-Source" -s "" ${FONTFORGE} \
+    "https://github.com/fontforge/fontforge/releases/download/$(get_pkg_ver ${FONTFORGE} | sed 's/\.//g')"
 
 fpkg -m gnu ${GUILE1}
-fpkg -e "tar.gz" ${LILYPOND} \
-    "http://lilypond.org/download/sources/v$(get_pkg_ver2 ${LILYPOND})"
+fpkg -e "tar.gz" -s "v" -v 2 ${LILYPOND} "http://lilypond.org/download/sources"
 fpkg -m hv ${CHORDPACK}
 fpkg -m hv ${GUITARTEX}
 
@@ -137,8 +135,7 @@ fpkg -m gnome ${GNOME_MEDIA}
 fpkg -m sf -s "wxwindows" ${WXGTK}
 fpkg ${AUDACITY} "http://audacity.googlecode.com/files"
 
-fpkg ${SYLPHEED} \
-    "http://sylpheed.sraoss.jp/sylpheed/v$(get_pkg_ver2 ${SYLPHEED})"
+fpkg -s "v" -v 2 ${SYLPHEED} "http://sylpheed.sraoss.jp/sylpheed"
 
 fpkg -m gnome ${LIBNOTIFY}
 
@@ -166,7 +163,7 @@ fpkg -e "tar.gz" ${LUA} "http://www.lua.org/ftp"
 fpkg -e "tar.xz" -m sf ${VLC}
 fpkg -e "tar.gz" ${SDL} "http://www.libsdl.org/release"
 fpkg -e "tar.gz" ${AGG} "http://www.antigrain.com"
-fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})"
+fpkg -v 0 ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash"
 
 fpkg -e "tar.gz" ${LIBSPF2} "http://libspf2.org/spf"
 fpkg -e "tgz" ${MILTER_GREYLIST} "ftp://ftp.espci.fr/pub/milter-greylist"
@@ -223,13 +220,14 @@ fpkg -m sf -e "tar.xz" ${PCMANFM}
 fpkg -m gnome ${LIBGSF}
 fpkg -m gnome ${GOFFICE}
 fpkg -m gnome ${GNUMERIC}
-fpkg -e "tar.gz" ${WV} "${ABIWORD_URL}/wv/$(get_pkg_ver ${WV})"
+fpkg -e "tar.gz" -v 0 ${WV} "${ABIWORD_URL}/wv"
 fpkg -e "tar.gz" ${ABIWORD} \
     "${ABIWORD_URL}/abiword/$(get_pkg_ver ${ABIWORD})/source"
 
 #fpkg_mis   ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads"
 
-fpkg -e "tar.gz" ${GEDA_GAF} "http://ftp.geda-project.org/geda-gaf/stable/v$(get_pkg_ver2 ${GEDA_GAF})/$(get_pkg_ver ${GEDA_GAF})"
+fpkg -e "tar.gz" -s "v$(get_pkg_ver2 ${GEDA_GAF})/" -v 0 ${GEDA_GAF} \
+     "http://ftp.geda-project.org/geda-gaf/stable"
 
 fpkg -e "tar.gz" ${AVRDUDE} "http://download.savannah.gnu.org/releases/avrdude"