diff --git a/satellites/extrafiles/radare2/radare2-1.3.0-docdir.patch b/satellites/extrafiles/radare2/radare2-1.3.0-docdir.patch new file mode 100644 index 0000000..8ac81fa --- /dev/null +++ b/satellites/extrafiles/radare2/radare2-1.3.0-docdir.patch @@ -0,0 +1,99 @@ ++++ ./Makefile +@@ -186,13 +186,13 @@ + ln -fs "${PWD}/man/$$FILE" "${DESTDIR}${MANDIR}/man7/$$FILE" ; done + + install-doc: +- ${INSTALL_DIR} "${DESTDIR}${DATADIR}/doc/radare2" +- for FILE in doc/* ; do ${INSTALL_DATA} $$FILE "${DESTDIR}${DATADIR}/doc/radare2" ; done ++ ${INSTALL_DIR} "${DESTDIR}${DOCDIR}" ++ for FILE in doc/* ; do ${INSTALL_DATA} $$FILE "${DESTDIR}${DOCDIR}" ; done + + install-doc-symlink: +- ${INSTALL_DIR} "${DESTDIR}${DATADIR}/doc/radare2" ++ ${INSTALL_DIR} "${DESTDIR}${DOCDIR}" + cd doc ; for FILE in * ; do \ +- ln -fs "${PWD}/doc/$$FILE" "${DESTDIR}${DATADIR}/doc/radare2" ; done ++ ln -fs "${PWD}/doc/$$FILE" "${DESTDIR}${DOCDIR}" ; done + + install love: install-doc install-man install-www + cd libr && ${MAKE} install PARENT=1 +@@ -275,7 +275,7 @@ + @echo + + purge-doc: +- rm -rf "${DESTDIR}${DATADIR}/doc/radare2" ++ rm -rf "${DESTDIR}${DOCDIR}" + cd man ; for FILE in *.1 ; do rm -f "${DESTDIR}${MANDIR}/man1/$$FILE" ; done + rm -f "${DESTDIR}${MANDIR}/man1/r2.1" + ++++ ./config-user.mk.acr +@@ -8,6 +8,7 @@ + BINDIR=@BINDIR@ + LIBDIR=@LIBDIR@ + MANDIR=@MANDIR@ ++DOCDIR=@DOCDIR@ + DATADIR=@DATADIR@ + INCLUDEDIR=@INCLUDEDIR@ + ++++ ./configure +@@ -102,7 +102,7 @@ + : ${DATADIR:="${SPREFIX}/share"} + : ${INFODIR:="${DATADIR}/info"} + : ${MANDIR:="${DATADIR}/man"} +-: ${DOCDIR:="${DOCDIR}/man"} ++: ${DOCDIR:="${DATADIR}/doc/radare2"} + : ${LOCALSTATEDIR:="${SPREFIX}/var"} + for A in `echo ${PATH} | sed -e 's,:, ,g'` ; do + [ -e "$A"/ginstall ] && : ${INSTALL:="$A"/ginstall} && break +@@ -143,7 +143,6 @@ + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] +- --docdir=DIR documentation directory [PREFIX/doc] + --datadir=DIR read-only architecture-independent data [PREFIX/share] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] +@@ -153,6 +152,7 @@ + --includedir=DIR C header files [PREFIX/include] + --infodir=DIR info documentation [DATADIR/info] + --mandir=DIR man documentation [DATADIR/man] ++ --docdir=DIR documentation directory [DATADIR/doc/radare2] + + System types: + --build=BUILD configure for building on BUILD [guessed] +@@ -160,8 +160,7 @@ + --target=TARGET configure for building compilers for TARGET [HOST] + EOF2 + +-printf " +-Optional Features: ++printf "\nOptional Features: + --disable-debugger disable native debugger features + --with-sysmagic force to use system's magic + --disable-loadlibs disable loading plugins +@@ -175,10 +174,8 @@ + --with-ostype Choose OS type ( gnulinux windows darwin haiku ) (USEROSTYPE=auto) + --without-pic do not build libr as a program independent location + --with-nonpic build the library archives .a +- --with-libversion specify different libversion (LIBVERSION=xxx) +-" +-printf " +-Some influential environment variables: ++ --with-libversion specify different libversion (LIBVERSION=xxx)\n" ++printf "\nSome influential environment variables: + CC C compiler command + CFLAGS C compiler flags + CPPFLAGS C preprocessor flags +@@ -186,10 +183,8 @@ + nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory +- CPP C preprocessor +-" +-printf " +-Report bugs to: pancake " ++ CPP C preprocessor\n" ++printf "\nReport bugs to: pancake " + echo "" + exit 0 + } diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat index f4b7dfe..d299217 100644 --- a/satellites/palemoon-ublock.sat +++ b/satellites/palemoon-ublock.sat @@ -1,12 +1,12 @@ import 'vcs/git' name=uBlock -version=1.11.2 +version=1.11.4 update_url="https://github.com/gorhill/$name/releases" update_names="/archive/$version.tar.gz" dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.gz" \ - 'f4807729a8e7829a5b8ea494efb002e1' + '95f1c0dcb614f051f7f6492e9b4b971f' ( name=uAssets vcs_git -V "https://github.com/uBlockOrigin/uAssets" ) diff --git a/satellites/radare2.sat b/satellites/radare2.sat index e16370a..a577c66 100644 --- a/satellites/radare2.sat +++ b/satellites/radare2.sat @@ -5,12 +5,13 @@ import 'compile/configure' name=radare2 -version=1.2.0 +version=1.3.0 update_url='http://rada.re/r/down.html' update_names="$name-$version.tar.gz\">$name" dlextract "http://cloud.radare.org/get/$version/$name-$version.tar.gz" \ - 'a463cfd727f31d235afec80ab000345c' + '122978ad5b9698717c680e422c1daad4' +extrafile "$name-$version-docdir.patch" header_end cd "$name-$version" @@ -21,7 +22,7 @@ cd "$name-$version" # There's just one little thing... # Fix paths -sed -i -e "s/\${DATADIR}\/doc/$(safe_sed "/$dir_prefix/$dir_docdir")/" Makefile +patch -p1 -i "../$name-$version-docdir.patch" compile_configure -- --with-syszip diff --git a/satellites/youtube-dl.sat b/satellites/youtube-dl.sat index 04d72db..62e8350 100644 --- a/satellites/youtube-dl.sat +++ b/satellites/youtube-dl.sat @@ -1,11 +1,11 @@ import 'compile/python' name=youtube-dl -version=2017.03.10 +version=2017.03.15 update_url="http://rg3.github.io/$name/download.html" dlextract "https://yt-dl.org/downloads/$version/$name-$version.tar.gz" \ - '2de3a032108c83617de03acee92e8871' + 'f65b127cdd6a570e439c8e2c13552db8' header_end cd "$name"