Sync unzip and its helper with latest code.

--HG--
extra : convert_revision : a2ea9f303afba4d3838a39b6908d134245b1fb01
This commit is contained in:
Juan RP 2008-10-30 23:05:58 +01:00
parent faef73b60c
commit 77b4826fdc
2 changed files with 7 additions and 8 deletions

View file

@ -11,11 +11,11 @@ extract_unzip()
[ ! -f $file ] && exit 1 [ ! -f $file ] && exit 1
$XBPS_MASTERDIR/bin/unzip -q -x $file -d $dest $XBPS_MASTERDIR/usr/bin/unzip -q -x $file -d $dest
return $? return $?
} }
if [ ! -x "$XBPS_MASTERDIR/bin/unzip" ]; then if [ ! -x "$XBPS_MASTERDIR/usr/bin/unzip" ]; then
unzip_version="5.52" unzip_version="5.52"
# Save pkgname before installing unzip. # Save pkgname before installing unzip.
@ -23,7 +23,7 @@ if [ ! -x "$XBPS_MASTERDIR/bin/unzip" ]; then
check_installed_pkg unzip $unzip_version check_installed_pkg unzip $unzip_version
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "=> \`\`$save_pkgname´´ package requires unzip for extraction." echo "=> $save_pkgname package requires unzip for extraction."
# #
# Install dependencies required by unzip. # Install dependencies required by unzip.
# #

View file

@ -3,16 +3,13 @@ pkgname=unzip
version=5.52 version=5.52
wrksrc=$pkgname-$version wrksrc=$pkgname-$version
patch_files=$pkgname-fix-unzipsfx.diff patch_files=$pkgname-fix-unzipsfx.diff
distfiles=" distfiles="ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tgz"
ftp://ftp.info-zip.org/pub/infozip/src/unzip552@.tgz"
build_style=gnu_makefile build_style=gnu_makefile
make_cmd="$XBPS_MASTERDIR/bin/gmake"
CFLAGS="-I. -DUNIX -Dunix -DUSE_UNSHRINK"
make_build_args="-f unix/Makefile" make_build_args="-f unix/Makefile"
make_build_target="generic_zlib unzipsfx" make_build_target="generic_zlib unzipsfx"
short_desc="List, test and extract compressed files in a ZIP archive" short_desc="List, test and extract compressed files in a ZIP archive"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=b749b0923bc4cceaa6f937aef688e9713a84328c checksum=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
long_desc=" long_desc="
Unzip will list, test, or extract files from a ZIP archive, commonly Unzip will list, test, or extract files from a ZIP archive, commonly
found on MS-DOS systems. The default behavior (with no options) is to found on MS-DOS systems. The default behavior (with no options) is to
@ -36,3 +33,5 @@ long_desc="
Instead of taking its first non-flag argument to be the zipfile(s) to Instead of taking its first non-flag argument to be the zipfile(s) to
be extracted, unzipsfx seeks itself under the name by which it was be extracted, unzipsfx seeks itself under the name by which it was
invoked and tests or extracts the contents of the appended archive." invoked and tests or extracts the contents of the appended archive."
run_depends="glibc-2.8"