svn commit: r202840 - in stable/8/usr.sbin/pkg_install: add create
delete info lib updating version
Florent Thoumie
flz at FreeBSD.org
Fri Jan 22 23:13:47 UTC 2010
Author: flz
Date: Fri Jan 22 23:13:46 2010
New Revision: 202840
URL: http://svn.freebsd.org/changeset/base/202840
Log:
Synchronize pkg_install with HEAD.
Modified:
stable/8/usr.sbin/pkg_install/add/main.c
stable/8/usr.sbin/pkg_install/create/main.c
stable/8/usr.sbin/pkg_install/delete/Makefile
stable/8/usr.sbin/pkg_install/delete/main.c
stable/8/usr.sbin/pkg_install/info/Makefile
stable/8/usr.sbin/pkg_install/info/main.c
stable/8/usr.sbin/pkg_install/lib/lib.h
stable/8/usr.sbin/pkg_install/updating/Makefile
stable/8/usr.sbin/pkg_install/version/Makefile
stable/8/usr.sbin/pkg_install/version/main.c
Modified: stable/8/usr.sbin/pkg_install/add/main.c
==============================================================================
--- stable/8/usr.sbin/pkg_install/add/main.c Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/add/main.c Fri Jan 22 23:13:46 2010 (r202840)
@@ -344,7 +344,7 @@ getpackagesite(void)
}
static void
-usage()
+usage(void)
{
fprintf(stderr, "%s\n%s\n",
"usage: pkg_add [-viInfFrRMSK] [-t template] [-p prefix] [-P prefix] [-C chrootdir]",
Modified: stable/8/usr.sbin/pkg_install/create/main.c
==============================================================================
--- stable/8/usr.sbin/pkg_install/create/main.c Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/create/main.c Fri Jan 22 23:13:46 2010 (r202840)
@@ -249,7 +249,7 @@ main(int argc, char **argv)
}
static void
-usage()
+usage(void)
{
fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
"usage: pkg_create [-YNOhjnvyz] [-C conflicts] [-P pkgs] [-p prefix]",
Modified: stable/8/usr.sbin/pkg_install/delete/Makefile
==============================================================================
--- stable/8/usr.sbin/pkg_install/delete/Makefile Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/delete/Makefile Fri Jan 22 23:13:46 2010 (r202840)
@@ -5,7 +5,6 @@ SRCS= main.c perform.c
CFLAGS+= -I${.CURDIR}/../lib
-WARNS?= 6
WFORMAT?= 1
DPADD= ${LIBINSTALL} ${LIBMD}
Modified: stable/8/usr.sbin/pkg_install/delete/main.c
==============================================================================
--- stable/8/usr.sbin/pkg_install/delete/main.c Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/delete/main.c Fri Jan 22 23:13:46 2010 (r202840)
@@ -170,7 +170,7 @@ main(int argc, char **argv)
}
static void
-usage()
+usage(void)
{
fprintf(stderr, "%s\n%s\n",
"usage: pkg_delete [-dDfGinrvxX] [-p prefix] pkg-name ...",
Modified: stable/8/usr.sbin/pkg_install/info/Makefile
==============================================================================
--- stable/8/usr.sbin/pkg_install/info/Makefile Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/info/Makefile Fri Jan 22 23:13:46 2010 (r202840)
@@ -5,7 +5,6 @@ SRCS= main.c perform.c show.c
CFLAGS+= -I${.CURDIR}/../lib
-WARNS?= 6
WFORMAT?= 1
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
Modified: stable/8/usr.sbin/pkg_install/info/main.c
==============================================================================
--- stable/8/usr.sbin/pkg_install/info/main.c Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/info/main.c Fri Jan 22 23:13:46 2010 (r202840)
@@ -282,7 +282,7 @@ main(int argc, char **argv)
}
static void
-usage()
+usage(void)
{
fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n",
"usage: pkg_info [-bcdDEfgGiIjkKLmopPqQrRsvVxX] [-e package] [-l prefix]",
Modified: stable/8/usr.sbin/pkg_install/lib/lib.h
==============================================================================
--- stable/8/usr.sbin/pkg_install/lib/lib.h Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/lib/lib.h Fri Jan 22 23:13:46 2010 (r202840)
@@ -84,14 +84,14 @@
#define DISPLAY_FNAME "+DISPLAY"
#define MTREE_FNAME "+MTREE_DIRS"
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 800000
+#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000
+#define INDEX_FNAME "INDEX-9"
+#elif defined(__FreeBSD_version) && __FreeBSD_version >= 800000
#define INDEX_FNAME "INDEX-8"
#elif defined(__FreeBSD_version) && __FreeBSD_version >= 700000
#define INDEX_FNAME "INDEX-7"
#elif defined(__FreeBSD_version) && __FreeBSD_version >= 600000
#define INDEX_FNAME "INDEX-6"
-#elif defined(__FreeBSD_version) && __FreeBSD_version >= 500036
-#define INDEX_FNAME "INDEX-5"
#else
#define INDEX_FNAME "INDEX"
#endif
@@ -102,10 +102,10 @@
#define PKG_PREFIX_VNAME "PKG_PREFIX"
/*
- * Version of the package tools - increase only when some
- * functionality used by bsd.port.mk is changed, added or removed
+ * Version of the package tools - increase whenever you make a change
+ * in the code that is not cosmetic only.
*/
-#define PKG_INSTALL_VERSION 20090519
+#define PKG_INSTALL_VERSION 20090902
#define PKG_WRAPCONF_FNAME "/var/db/pkg_install.conf"
#define main(argc, argv) real_main(argc, argv)
Modified: stable/8/usr.sbin/pkg_install/updating/Makefile
==============================================================================
--- stable/8/usr.sbin/pkg_install/updating/Makefile Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/updating/Makefile Fri Jan 22 23:13:46 2010 (r202840)
@@ -5,7 +5,6 @@ SRCS= main.c
CFLAGS+= -I${.CURDIR}/../lib
-WARNS?= 6
WFORMAT?= 1
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
Modified: stable/8/usr.sbin/pkg_install/version/Makefile
==============================================================================
--- stable/8/usr.sbin/pkg_install/version/Makefile Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/version/Makefile Fri Jan 22 23:13:46 2010 (r202840)
@@ -5,7 +5,6 @@ SRCS= main.c perform.c
CFLAGS+= -I${.CURDIR}/../lib
-WARNS?= 6
WFORMAT?= 1
DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
Modified: stable/8/usr.sbin/pkg_install/version/main.c
==============================================================================
--- stable/8/usr.sbin/pkg_install/version/main.c Fri Jan 22 22:14:12 2010 (r202839)
+++ stable/8/usr.sbin/pkg_install/version/main.c Fri Jan 22 23:13:46 2010 (r202840)
@@ -127,7 +127,7 @@ main(int argc, char **argv)
}
static void
-usage()
+usage(void)
{
fprintf(stderr, "%s\n%s\n%s\n",
"usage: pkg_version [-hIoqv] [-l limchar] [-L limchar] [[-X] -s string] [-O origin] [index]",
More information about the svn-src-stable
mailing list