aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2012-07-30 14:23:26 +0800
committerbapt <bapt@FreeBSD.org>2012-07-30 14:23:26 +0800
commit35a432a2338a326842d9ea2da8e4047c4c9fa1f3 (patch)
treeb8d42cb2911f7446c243eba4fd42546062ea1f25
parent40e7d99d1fbffe5a66f0438f165c843c625aef6f (diff)
downloadfreebsd-ports-gnome-35a432a2338a326842d9ea2da8e4047c4c9fa1f3.tar.gz
freebsd-ports-gnome-35a432a2338a326842d9ea2da8e4047c4c9fa1f3.tar.zst
freebsd-ports-gnome-35a432a2338a326842d9ea2da8e4047c4c9fa1f3.zip
- update to 1.0-rc5
- changes: * speed improvements in pkg repo on multi core boxes * fix pkg upgrade proposing to downgrade dependencies * fix pkg2ng losing seom origin from dependencies * fix losing new line informations in descriptions * new -A option to track a new installation as automatically installed
-rw-r--r--ports-mgmt/pkg/Makefile3
-rw-r--r--ports-mgmt/pkg/distinfo4
-rw-r--r--ports-mgmt/pkg/files/patch-ports__pkg2ng46
3 files changed, 3 insertions, 50 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 23ff0e48c9fa..5ec5251b3ff9 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= pkg
-DISTVERSION= 1.0-rc4
-PORTREVISION= 1
+DISTVERSION= 1.0-rc5
CATEGORIES= ports-mgmt
MASTER_SITES= LOCAL/portmgr \
http://files.etoilebsd.net/pkg/
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index b9d58ce30731..794fe66b0183 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.0-rc4.tar.xz) = 3a9c1bbe879e2e37a02aa05d227921f09ed913c2dbb2b23647ff015f1164c212
-SIZE (pkg-1.0-rc4.tar.xz) = 1366868
+SHA256 (pkg-1.0-rc5.tar.xz) = 8956ef5246fc67de9b3eab70f2bdc36cd623b794cbbb03714c3a23e4486f7bc1
+SIZE (pkg-1.0-rc5.tar.xz) = 1368968
diff --git a/ports-mgmt/pkg/files/patch-ports__pkg2ng b/ports-mgmt/pkg/files/patch-ports__pkg2ng
deleted file mode 100644
index 9a6adc8a0cb1..000000000000
--- a/ports-mgmt/pkg/files/patch-ports__pkg2ng
+++ /dev/null
@@ -1,46 +0,0 @@
---- ./ports/pkg2ng.orig 2012-07-20 22:06:38.000000000 +0200
-+++ ./ports/pkg2ng 2012-07-30 00:16:30.916916951 +0200
-@@ -11,12 +11,12 @@
- ARCH=$( uname -m )
- failed_pkgs=""
- MOVED=0
-+DBDIR="/var/db"
-+PKGDB="${DBDIR}/pkg"
-+PKGBAK="${DBDIR}/pkg.bak"
-
- for PKG in $( pkg_info -Ea )
- do
-- DBDIR="/var/db"
-- PKGDB="${DBDIR}/pkg"
-- PKGBAK="${DBDIR}/pkg.bak"
- DB="${PKGDB}/${PKG}"
- DESC="${DB}/+DESC"
- if [ ! -e "${PKGBAK}" ]; then
-@@ -84,10 +84,6 @@
- failed_pkgs="${failed_pkgs} ${PKG}"
- else
- rm -rf ${MANIFEST}
-- if [ -e ${DB} ]; then
-- mv ${DB} ${PKGBAK}/${PKG}
-- MOVED=1
-- fi
- fi
-
- rm -rf ${MDIR}
-@@ -101,6 +97,16 @@
- echo "" >&2
- echo "!!! Some packages failed to register !!!" >&2
- echo "Failed packages: ${failed_pkgs}" >&2
-+else
-+ for PKG in $( pkg_info -Ea ); do
-+ DB="${PKGDB}/${PKG}"
-+ if [ -e ${DB} ]; then
-+ mv ${DB} ${PKGBAK}/${PKG}
-+ MOVED=1
-+ fi
-+ done
-+ echo "Conversion has been successfully finished"
-+ echo "Your old packages database has been moved to: ${PKGBAK}."
- fi
-
- # Delete the portupgrade pkgdb to avoid discrepencies. It will be auto recreated.