From 8ee3a19f7729d384fc16cba0043616c6b4e49232 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Mon, 16 Jun 2008 17:53:21 +0000 Subject: [PATCH] Update to 1.11.3 --- wget/build.sh | 74 +++++++++++-------------------------------- wget/meta/depend.wget | 1 - wget/meta/pkgdef | 16 +++++++--- wget/meta/relnotes | 27 ++++++++++++++++ 4 files changed, 56 insertions(+), 62 deletions(-) delete mode 100644 wget/meta/depend.wget create mode 100644 wget/meta/relnotes diff --git a/wget/build.sh b/wget/build.sh index 52121f1..72355d5 100755 --- a/wget/build.sh +++ b/wget/build.sh @@ -3,30 +3,24 @@ # This is a generic build.sh script # It can be used nearly unmodified with many packages # -# The concept of "method" registering and the logic that implements it was shamelessly -# stolen from jhlj's Compile.sh script :) +# build.sh helper functions +. ${BUILDPKG_BASE}/scripts/build.sh.functions # +########################################################### # Check the following 4 variables before running the script topdir=wget -version=1.9.1 -pkgver=2 -source[0]=$topdir-$version.tar.gz +version=1.11.3 +pkgver=1 +source[0]=$topdir-$version.tar.bz2 # If there are no patches, simply comment this #patch[0]= # Source function library -. ${HOME}/buildpkg/scripts/buildpkg.functions +. ${BUILDPKG_BASE}/scripts/buildpkg.functions -# Global options -export LDFLAGS="-L/usr/local/lib -R/usr/local/lib" -export CPPFLAGS="-I/usr/local/include" -configure_args="--prefix=$prefix --disable-nls --enable-static=no --with-ssl" - -# Define script functions and register them -METHODS="" -reg() { - METHODS="$METHODS $1" -} +# Global settings +export CPPFLAGS="-I$prefix/include" +export LDFLAGS="-L$prefix/lib -R$prefix/lib" reg prep prep() @@ -40,11 +34,17 @@ build() generic_build } +reg check +check() +{ + generic_check +} + reg install install() { generic_install DESTDIR - doc README NEWS TODO + doc AUTHORS COPYING NEWS README MAILING-LIST } reg pack @@ -62,42 +62,4 @@ distclean() ################################################### # No need to look below here ################################################### - -reg all -all() -{ - for METHOD in $METHODS - do - case $METHOD in - all*|*clean) ;; - *) $METHOD - ;; - esac - done - -} - -reg -usage() { - echo Usage $0 "{"$(echo $METHODS | tr " " "|")"}" - exit 1 -} - -OK=0 -for METHOD in $* -do - METHOD=" $METHOD *" - if [ "${METHODS%$METHOD}" == "$METHODS" ] ; then - usage - fi - OK=1 -done - -if [ $OK = 0 ] ; then - usage; -fi - -for METHOD in $* -do - ( $METHOD ) -done +build_sh $* diff --git a/wget/meta/depend.wget b/wget/meta/depend.wget deleted file mode 100644 index a82d8b3..0000000 --- a/wget/meta/depend.wget +++ /dev/null @@ -1 +0,0 @@ -P SBossl097dlib OpenSSL - Secure Socket Layer diff --git a/wget/meta/pkgdef b/wget/meta/pkgdef index e44aae8..a57bcb6 100644 --- a/wget/meta/pkgdef +++ b/wget/meta/pkgdef @@ -1,9 +1,15 @@ [wget] -pkgname="$pkgprefix""$topdir" -name="Wget - Retrieves files from the Web" +pkgname="${pkgprefix}${topdir}" +name="$topdir - GNU wget" pkgcat="application" -pkgvendor="http://www.gnu.org" -pkgdesc="Wget is a network utility to retrieve files from the Web using http and ftp" +pkgvendor="http://wget.sunsite.dk/" +pkgdesc="A utility for retrieving files using the HTTP or FTP protocols" pkgver="$pkgver" files(-,root,bin) -* +default_docs +$_bindir +$_sysconfdir/wgetrc +$_mandir/man1/wget.1* +$_infodir/wget.info* +$_sharedir/locale/*/LC_MESSAGES/wget.mo + diff --git a/wget/meta/relnotes b/wget/meta/relnotes new file mode 100644 index 0000000..bd83629 --- /dev/null +++ b/wget/meta/relnotes @@ -0,0 +1,27 @@ +PACKAGE DETAILS +--------------- +Name: %%PKGNAME%% +Version: %%SOURCE_AND_VER%% +Vendor: %%VENDOR%% +Packager: %%PKGEDBY%% + +Source (sha1sum): +%%SOURCE_SHA1SUM%% + +BUILD DETAILS +------------- +Compiler: +%%COMPILER%% + +Environment: +%%ENVIRONMENT%% + +Configure: +%%CONFIGURE%% + +KNOWN DEPENDENCIES +------------------ +%%DEPENDENCIES%% + +ERRORS/MISCELLANEOUS +--------------------