summaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2012-04-23 13:57:39 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2012-04-23 13:57:39 +0000
commit0a9194acaee0bb69d41bdf227ba8d851f7484da9 (patch)
tree639ea868d1bf59e7690c2589c70739d6605fd09b /ports-mgmt
parent- Forced commit to note that devel/love07 was repocopied from devel/love (diff)
- update to 1.0-beta12
- changes: * Fix to be downloaded calculation * Respected rc.conf with handle_rc_scripts * Improve man pages * Fix pkg set -o * new pkg rquery subcommand, do the same as pkg query but for remote repositories * Allow forcing installation of a package even on bad arches * Add indexes to local database, speed up local queries * Speed up file loading from database * lock the database while executing a job * improvements on new pkg version detection
Notes
Notes: svn path=/head/; revision=295312
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/pkg/Makefile11
-rw-r--r--ports-mgmt/pkg/distinfo4
-rw-r--r--ports-mgmt/pkg/files/patch-libpkg__pkgdb.c11
3 files changed, 11 insertions, 15 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index b87d6477800b..07a822f70d43 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= pkg
-DISTVERSION= 1.0-beta11
-PORTREVISION= 1
+DISTVERSION= 1.0-beta12
CATEGORIES= ports-mgmt
MASTER_SITES= LOCAL/portmgr \
http://files.etoilebsd.net/pkg/
@@ -30,6 +29,7 @@ MAN8= pkg.8 \
pkg-audit.8 \
pkg-backup.8 \
pkg-check.8 \
+ pkg-clean.8 \
pkg-create.8 \
pkg-delete.8 \
pkg-fetch.8 \
@@ -38,8 +38,10 @@ MAN8= pkg.8 \
pkg-query.8 \
pkg-register.8 \
pkg-repo.8 \
+ pkg-rquery.8 \
pkg-search.8 \
pkg-set.8 \
+ pkg-shell.8 \
pkg-shlib.8 \
pkg-update.8 \
pkg-updating.8 \
@@ -48,6 +50,8 @@ MAN8= pkg.8 \
pkg-which.8
MAN5= pkg.conf.5
+PORTEXAMPLES= etc/pkg.conf.sample
+
.include <bsd.port.pre.mk>
#define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)
@@ -68,6 +72,9 @@ post-install:
@${MKDIR} ${PREFIX}/etc/periodic/security
@${INSTALL_SCRIPT} ${WRKSRC}/scripts/periodic/410.pkg-audit ${PREFIX}/etc/periodic/security
@${INSTALL_SCRIPT} ${WRKSRC}/ports/pkg2ng ${PREFIX}/sbin
+.if !defined(NOPORTEXAMPLES)
+ @${INSTALL_DATA} ${WRKSRC}/pkg/pkg.conf.sample ${PREFIX}/etc
+.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 7729af199ed3..e292b7f33db1 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.0-beta11.tar.xz) = f99367bf4ff2272bbdfbcf47a66ec5d8af3e2ebac8cc7b0759667f090eccd538
-SIZE (pkg-1.0-beta11.tar.xz) = 1323224
+SHA256 (pkg-1.0-beta12.tar.xz) = 1945c837cde3c5f3ae8c9558bd558fb6163e21b0865d718b4a11eb2e19fd6c67
+SIZE (pkg-1.0-beta12.tar.xz) = 1324588
diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkgdb.c b/ports-mgmt/pkg/files/patch-libpkg__pkgdb.c
deleted file mode 100644
index 84aefeaae979..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__pkgdb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libpkg/pkgdb.c.orig 2012-04-13 22:16:54.000000000 +0200
-+++ ./libpkg/pkgdb.c 2012-04-18 23:22:48.794371806 +0200
-@@ -302,7 +302,7 @@
- }
-
- while (db_version < DBVERSION) {
-- if (!sqlite3_db_readonly(db->sqlite, "main")) {
-+ if (sqlite3_db_readonly(db->sqlite, "main")) {
- pkg_emit_error("The database is outdated and opened readonly");
- return (EPKG_FATAL);
- }