summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports-mgmt/bpkg/Makefile2
-rw-r--r--ports-mgmt/bpkg/files/bpkg.sh.in15
2 files changed, 9 insertions, 8 deletions
diff --git a/ports-mgmt/bpkg/Makefile b/ports-mgmt/bpkg/Makefile
index 5507f03f0ae8..94ca281c5fc2 100644
--- a/ports-mgmt/bpkg/Makefile
+++ b/ports-mgmt/bpkg/Makefile
@@ -8,7 +8,7 @@
#
PORTNAME= bpkg
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.4
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none
diff --git a/ports-mgmt/bpkg/files/bpkg.sh.in b/ports-mgmt/bpkg/files/bpkg.sh.in
index d0e86cf3f790..cc628ffbbb5b 100644
--- a/ports-mgmt/bpkg/files/bpkg.sh.in
+++ b/ports-mgmt/bpkg/files/bpkg.sh.in
@@ -375,16 +375,16 @@ make_search_info()
pkg_ftp()
{
arch=`uname -m`
- sys=`uname -r | cut -d- -f1,2 | tr '[:upper:]' '[:lower:]'`
+ sys=`uname -r | cut -d- -f1`
for e in $pkg; do
echo "ls $e*" >> /tmp/bpkg.tmp
done
cat /tmp/bpkg.tmp | sed s/[0-9][0-9].*/*/ > /tmp/bpkg1.tmp
- echo "ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-stable/Latest/"
- ftp -4Va ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-$sys/Latest/ < /tmp/bpkg1.tmp > /tmp/bpkg2.tmp
- ftp -4Va ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-$sys/All/ < /tmp/bpkg1.tmp > /tmp/bpkg3.tmp
+ echo "ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-$sys-release/Latest/"
+ ftp -4Va ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-$sys-release/Latest/ < /tmp/bpkg1.tmp > /tmp/bpkg2.tmp
+ ftp -4Va ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-$sys-release/All/ < /tmp/bpkg1.tmp > /tmp/bpkg3.tmp
n=1
for e in `cat /tmp/bpkg2.tmp | awk '{print $9}' | cut -d. -f1`; do
@@ -403,15 +403,16 @@ pkg_ftp()
pkg_latestftp()
{
arch=`uname -m`
+ sys=`uname -r | cut -d. -f1`
for e in $pkg; do
echo "ls $e*" >> /tmp/bpkg.tmp
done
cat /tmp/bpkg.tmp | sed s/[0-9][0-9].*/*/ > /tmp/bpkg1.tmp
- echo "ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-stable/Latest/"
- ftp -4Va ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-stable/Latest/ < /tmp/bpkg1.tmp > /tmp/bpkg2.tmp
- ftp -4Va ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-stable/All/ < /tmp/bpkg1.tmp > /tmp/bpkg3.tmp
+ echo "ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-$sys-stable/Latest/"
+ ftp -4Va ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-$sys-stable/Latest/ < /tmp/bpkg1.tmp > /tmp/bpkg2.tmp
+ ftp -4Va ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-$sys-stable/All/ < /tmp/bpkg1.tmp > /tmp/bpkg3.tmp
n=1
for e in `cat /tmp/bpkg2.tmp | awk '{print $9}' | cut -d. -f1`; do