svn commit: r222035 - in head: . lib lib/libpkg share/mk
usr.sbin/pkg_install usr.sbin/pkg_install/add
usr.sbin/pkg_install/create usr.sbin/pkg_install/delete
usr.sbin/pkg_install/info usr.sbin/pkg...
Florent Thoumie
flz at FreeBSD.org
Tue May 17 19:11:48 UTC 2011
Author: flz
Date: Tue May 17 19:11:47 2011
New Revision: 222035
URL: http://svn.freebsd.org/changeset/base/222035
Log:
Backout libinstall.a -> libpkg commit.
Discussed with: erwin, brooks, bapt
Added:
head/usr.sbin/pkg_install/lib/
- copied from r207112, head/usr.sbin/pkg_install/lib/
Deleted:
head/lib/libpkg/
Modified:
head/Makefile.inc1
head/lib/Makefile
head/share/mk/bsd.libnames.mk
head/usr.sbin/pkg_install/Makefile
head/usr.sbin/pkg_install/Makefile.inc
head/usr.sbin/pkg_install/add/Makefile
head/usr.sbin/pkg_install/add/extract.c
head/usr.sbin/pkg_install/add/futil.c
head/usr.sbin/pkg_install/add/main.c
head/usr.sbin/pkg_install/add/perform.c
head/usr.sbin/pkg_install/create/Makefile
head/usr.sbin/pkg_install/create/main.c
head/usr.sbin/pkg_install/create/perform.c
head/usr.sbin/pkg_install/create/pl.c
head/usr.sbin/pkg_install/delete/Makefile
head/usr.sbin/pkg_install/delete/main.c
head/usr.sbin/pkg_install/delete/perform.c
head/usr.sbin/pkg_install/info/Makefile
head/usr.sbin/pkg_install/info/info.h
head/usr.sbin/pkg_install/info/main.c
head/usr.sbin/pkg_install/info/perform.c
head/usr.sbin/pkg_install/info/show.c
head/usr.sbin/pkg_install/updating/Makefile
head/usr.sbin/pkg_install/updating/main.c
head/usr.sbin/pkg_install/version/Makefile
head/usr.sbin/pkg_install/version/main.c
head/usr.sbin/pkg_install/version/perform.c
Directory Properties:
head/share/mk/bsd.arch.inc.mk (props changed)
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue May 17 18:24:59 2011 (r222034)
+++ head/Makefile.inc1 Tue May 17 19:11:47 2011 (r222035)
@@ -1205,7 +1205,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \
lib/libbz2 lib/libcom_err lib/libcrypt \
- lib/libexpat lib/libfetch \
+ lib/libexpat \
${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
@@ -1238,7 +1238,6 @@ _cddl_lib= cddl/lib
_secure_lib_libcrypto= secure/lib/libcrypto
_secure_lib_libssl= secure/lib/libssl
lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
-lib/libfetch__L: secure/lib/libcrypto__L secure/lib/libssl__L lib/libmd__L
.if ${MK_OPENSSH} != "no"
_secure_lib_libssh= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
@@ -1274,7 +1273,7 @@ _lib_libypclnt= lib/libypclnt
.endif
.if ${MK_OPENSSL} == "no"
-lib/libfetch__L lib/libradius__L: lib/libmd__L
+lib/libradius__L: lib/libmd__L
.endif
.for _lib in ${_prereq_libs}
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Tue May 17 18:24:59 2011 (r222034)
+++ head/lib/Makefile Tue May 17 19:11:47 2011 (r222035)
@@ -89,7 +89,6 @@ SUBDIR= ${SUBDIR_ORDERED} \
libopie \
libpam \
libpcap \
- ${_libpkg} \
${_libpmc} \
${_libproc} \
libprocstat \
@@ -215,10 +214,6 @@ _libmp= libmp
_libpmc= libpmc
.endif
-.if ${MK_PKGTOOLS} != "no"
-_libpkg= libpkg
-.endif
-
.if ${MK_SENDMAIL} != "no"
_libmilter= libmilter
_libsm= libsm
Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk Tue May 17 18:24:59 2011 (r222034)
+++ head/share/mk/bsd.libnames.mk Tue May 17 19:11:47 2011 (r222035)
@@ -129,7 +129,6 @@ MINUSLPAM+= -lypclnt
LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a
LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a
-LIBPKG?= ${DESTDIR}${LIBDIR}/libpkg.a
LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a
LIBPROC?= ${DESTDIR}${LIBDIR}/libproc.a
LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a
Modified: head/usr.sbin/pkg_install/Makefile
==============================================================================
--- head/usr.sbin/pkg_install/Makefile Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/Makefile Tue May 17 19:11:47 2011 (r222035)
@@ -2,11 +2,11 @@
.include <bsd.own.mk>
-SUBDIR= add create delete info updating version
+SUBDIR= lib add create delete info updating version
.include <bsd.subdir.mk>
-DATE!= grep PKG_INSTALL_VERSION ${.CURDIR}/Makefile.inc | sed 's|.*=||'
+DATE!= grep PKG_INSTALL_VERSION ${.CURDIR}/lib/lib.h | sed 's|.*[ ]||'
distfile: clean
@(cd ${.CURDIR}/..; \
Modified: head/usr.sbin/pkg_install/Makefile.inc
==============================================================================
--- head/usr.sbin/pkg_install/Makefile.inc Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/Makefile.inc Tue May 17 19:11:47 2011 (r222035)
@@ -2,11 +2,16 @@
.include <bsd.own.mk>
-CFLAGS+= -DPKG_INSTALL_VERSION=20101012
-CFLAGS+= -DYES_I_KNOW_THE_API_IS_RUBBISH_AND_IS_DOOMED_TO_CHANGE
+LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a
-DPADD+= ${LIBPKG}
-LDADD+= -lpkg
+DPADD+= ${LIBUTIL}
+LDADD+= -lutil
+
+.if ${MK_OPENSSL} != "no" && \
+ defined(LDADD) && ${LDADD:M-lfetch} != ""
+DPADD+= ${LIBSSL} ${LIBCRYPTO}
+LDADD+= -lssl -lcrypto
+.endif
# Inherit BINDIR from one level up.
.include "../Makefile.inc"
Modified: head/usr.sbin/pkg_install/add/Makefile
==============================================================================
--- head/usr.sbin/pkg_install/add/Makefile Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/add/Makefile Tue May 17 19:11:47 2011 (r222035)
@@ -1,11 +1,14 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
PROG= pkg_add
SRCS= main.c perform.c futil.c extract.c
+CFLAGS+= -I${.CURDIR}/../lib
+
WARNS?= 3
WFORMAT?= 1
+DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
+LDADD= ${LIBINSTALL} -lfetch -lmd
+
.include <bsd.prog.mk>
Modified: head/usr.sbin/pkg_install/add/extract.c
==============================================================================
--- head/usr.sbin/pkg_install/add/extract.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/add/extract.c Tue May 17 19:11:47 2011 (r222035)
@@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$");
#include <ctype.h>
#include <err.h>
-#include <pkg.h>
+#include "lib.h"
#include "add.h"
Modified: head/usr.sbin/pkg_install/add/futil.c
==============================================================================
--- head/usr.sbin/pkg_install/add/futil.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/add/futil.c Tue May 17 19:11:47 2011 (r222035)
@@ -22,7 +22,7 @@
__FBSDID("$FreeBSD$");
#include <err.h>
-#include <pkg.h>
+#include "lib.h"
#include "add.h"
/*
Modified: head/usr.sbin/pkg_install/add/main.c
==============================================================================
--- head/usr.sbin/pkg_install/add/main.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/add/main.c Tue May 17 19:11:47 2011 (r222035)
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <getopt.h>
-#include <pkg.h>
+#include "lib.h"
#include "add.h"
char *Prefix = NULL;
@@ -132,8 +132,6 @@ main(int argc, char **argv)
static char temppackageroot[MAXPATHLEN];
static char pkgaddpath[MAXPATHLEN];
- pkg_wrap(PKG_INSTALL_VERSION, argv);
-
if (*argv[0] != '/' && strchr(argv[0], '/') != NULL)
PkgAddCmd = realpath(argv[0], pkgaddpath);
else
Modified: head/usr.sbin/pkg_install/add/perform.c
==============================================================================
--- head/usr.sbin/pkg_install/add/perform.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/add/perform.c Tue May 17 19:11:47 2011 (r222035)
@@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <paths.h>
-#include <pkg.h>
+#include "lib.h"
#include "add.h"
#include <libgen.h>
Modified: head/usr.sbin/pkg_install/create/Makefile
==============================================================================
--- head/usr.sbin/pkg_install/create/Makefile Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/create/Makefile Tue May 17 19:11:47 2011 (r222035)
@@ -3,10 +3,12 @@
PROG= pkg_create
SRCS= main.c perform.c pl.c
+CFLAGS+= -I${.CURDIR}/../lib
+
WARNS?= 3
WFORMAT?= 1
-DPADD= ${LIBMD}
-LDADD= -lmd
+DPADD= ${LIBINSTALL} ${LIBMD}
+LDADD= ${LIBINSTALL} -lmd
.include <bsd.prog.mk>
Modified: head/usr.sbin/pkg_install/create/main.c
==============================================================================
--- head/usr.sbin/pkg_install/create/main.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/create/main.c Tue May 17 19:11:47 2011 (r222035)
@@ -15,7 +15,7 @@ __FBSDID("$FreeBSD$");
#include <getopt.h>
#include <err.h>
-#include <pkg.h>
+#include "lib.h"
#include "create.h"
match_t MatchType = MATCH_GLOB;
@@ -72,8 +72,6 @@ main(int argc, char **argv)
int ch;
char **pkgs, **start, *tmp;
- pkg_wrap(PKG_INSTALL_VERSION, argv);
-
pkgs = start = argv;
while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1)
switch(ch) {
Modified: head/usr.sbin/pkg_install/create/perform.c
==============================================================================
--- head/usr.sbin/pkg_install/create/perform.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/create/perform.c Tue May 17 19:11:47 2011 (r222035)
@@ -21,7 +21,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <pkg.h>
+#include "lib.h"
#include "create.h"
#include <err.h>
Modified: head/usr.sbin/pkg_install/create/pl.c
==============================================================================
--- head/usr.sbin/pkg_install/create/pl.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/create/pl.c Tue May 17 19:11:47 2011 (r222035)
@@ -21,7 +21,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <pkg.h>
+#include "lib.h"
#include "create.h"
#include <errno.h>
#include <err.h>
Modified: head/usr.sbin/pkg_install/delete/Makefile
==============================================================================
--- head/usr.sbin/pkg_install/delete/Makefile Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/delete/Makefile Tue May 17 19:11:47 2011 (r222035)
@@ -3,6 +3,11 @@
PROG= pkg_delete
SRCS= main.c perform.c
+CFLAGS+= -I${.CURDIR}/../lib
+
WFORMAT?= 1
+DPADD= ${LIBINSTALL} ${LIBMD}
+LDADD= ${LIBINSTALL} -lmd
+
.include <bsd.prog.mk>
Modified: head/usr.sbin/pkg_install/delete/main.c
==============================================================================
--- head/usr.sbin/pkg_install/delete/main.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/delete/main.c Tue May 17 19:11:47 2011 (r222035)
@@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$");
#include <getopt.h>
#include <err.h>
-#include <pkg.h>
+#include "lib.h"
#include "delete.h"
char *Prefix = NULL;
@@ -67,8 +67,6 @@ main(int argc, char **argv)
const char *tmp;
struct stat stat_s;
- pkg_wrap(PKG_INSTALL_VERSION, argv);
-
pkgs = start = argv;
while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1)
switch(ch) {
Modified: head/usr.sbin/pkg_install/delete/perform.c
==============================================================================
--- head/usr.sbin/pkg_install/delete/perform.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/delete/perform.c Tue May 17 19:11:47 2011 (r222035)
@@ -22,7 +22,7 @@
__FBSDID("$FreeBSD$");
#include <err.h>
-#include <pkg.h>
+#include "lib.h"
#include "delete.h"
static int pkg_do(char *);
Modified: head/usr.sbin/pkg_install/info/Makefile
==============================================================================
--- head/usr.sbin/pkg_install/info/Makefile Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/info/Makefile Tue May 17 19:11:47 2011 (r222035)
@@ -3,9 +3,11 @@
PROG= pkg_info
SRCS= main.c perform.c show.c
+CFLAGS+= -I${.CURDIR}/../lib
+
WFORMAT?= 1
-DPADD= ${LIBMD}
-LDADD= -lmd
+DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
+LDADD= ${LIBINSTALL} -lfetch -lmd
.include <bsd.prog.mk>
Modified: head/usr.sbin/pkg_install/info/info.h
==============================================================================
--- head/usr.sbin/pkg_install/info/info.h Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/info/info.h Tue May 17 19:11:47 2011 (r222035)
@@ -33,26 +33,25 @@
#define MAXNAMESIZE 20
#endif
-#define SHOW_COMMENT 0x000001
-#define SHOW_DESC 0x000002
-#define SHOW_PLIST 0x000004
-#define SHOW_INSTALL 0x000008
-#define SHOW_DEINSTALL 0x000010
-#define SHOW_REQUIRE 0x000020
-#define SHOW_PREFIX 0x000040
-#define SHOW_INDEX 0x000080
-#define SHOW_FILES 0x000100
-#define SHOW_DISPLAY 0x000200
-#define SHOW_REQBY 0x000400
-#define SHOW_MTREE 0x000800
-#define SHOW_SIZE 0x001000
-#define SHOW_ORIGIN 0x002000
-#define SHOW_CKSUM 0x004000
-#define SHOW_FMTREV 0x008000
-#define SHOW_PTREV 0x010000
-#define SHOW_DEPEND 0x020000
-#define SHOW_PKGNAME 0x040000
-#define SHOW_LPREV 0x100000
+#define SHOW_COMMENT 0x00001
+#define SHOW_DESC 0x00002
+#define SHOW_PLIST 0x00004
+#define SHOW_INSTALL 0x00008
+#define SHOW_DEINSTALL 0x00010
+#define SHOW_REQUIRE 0x00020
+#define SHOW_PREFIX 0x00040
+#define SHOW_INDEX 0x00080
+#define SHOW_FILES 0x00100
+#define SHOW_DISPLAY 0x00200
+#define SHOW_REQBY 0x00400
+#define SHOW_MTREE 0x00800
+#define SHOW_SIZE 0x01000
+#define SHOW_ORIGIN 0x02000
+#define SHOW_CKSUM 0x04000
+#define SHOW_FMTREV 0x08000
+#define SHOW_PTREV 0x10000
+#define SHOW_DEPEND 0x20000
+#define SHOW_PKGNAME 0x40000
struct which_entry {
TAILQ_ENTRY(which_entry) next;
Modified: head/usr.sbin/pkg_install/info/main.c
==============================================================================
--- head/usr.sbin/pkg_install/info/main.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/info/main.c Tue May 17 19:11:47 2011 (r222035)
@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
#include <getopt.h>
#include <err.h>
-#include <pkg.h>
+#include "lib.h"
#include "info.h"
int Flags = 0;
@@ -68,8 +68,6 @@ main(int argc, char **argv)
char **pkgs, **start;
char *pkgs_split;
- pkg_wrap(PKG_INSTALL_VERSION, argv);
-
whead = malloc(sizeof(struct which_head));
if (whead == NULL)
err(2, NULL);
@@ -227,10 +225,7 @@ main(int argc, char **argv)
}
case 'P':
- if (Flags & SHOW_PTREV)
- Flags |= SHOW_LPREV;
- else
- Flags = SHOW_PTREV;
+ Flags = SHOW_PTREV;
break;
case 'h':
@@ -247,11 +242,6 @@ main(int argc, char **argv)
if (!Quiet)
printf("Package tools revision: ");
printf("%d\n", PKG_INSTALL_VERSION);
- if (Flags & SHOW_LPREV) {
- if (!Quiet)
- printf("Libpkg revision: ");
- printf("%d\n", libpkg_version());
- }
exit(0);
}
Modified: head/usr.sbin/pkg_install/info/perform.c
==============================================================================
--- head/usr.sbin/pkg_install/info/perform.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/info/perform.c Tue May 17 19:11:47 2011 (r222035)
@@ -21,7 +21,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <pkg.h>
+#include "lib.h"
#include "info.h"
#include <err.h>
#include <signal.h>
Modified: head/usr.sbin/pkg_install/info/show.c
==============================================================================
--- head/usr.sbin/pkg_install/info/show.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/info/show.c Tue May 17 19:11:47 2011 (r222035)
@@ -21,7 +21,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <pkg.h>
+#include "lib.h"
#include "info.h"
#include <err.h>
#include <stdlib.h>
Modified: head/usr.sbin/pkg_install/updating/Makefile
==============================================================================
--- head/usr.sbin/pkg_install/updating/Makefile Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/updating/Makefile Tue May 17 19:11:47 2011 (r222035)
@@ -3,6 +3,11 @@
PROG= pkg_updating
SRCS= main.c
+CFLAGS+= -I${.CURDIR}/../lib
+
WFORMAT?= 1
+DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
+LDADD= ${LIBINSTALL} -lfetch -lmd
+
.include <bsd.prog.mk>
Modified: head/usr.sbin/pkg_install/updating/main.c
==============================================================================
--- head/usr.sbin/pkg_install/updating/main.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/updating/main.c Tue May 17 19:11:47 2011 (r222035)
@@ -19,7 +19,7 @@ __FBSDID("$FreeBSD$");
#include <sysexits.h>
#include <getopt.h>
-#include <pkg.h>
+#include "lib.h"
#include "pathnames.h"
typedef struct installedport {
@@ -87,8 +87,6 @@ main(int argc, char *argv[])
DIR *dir;
FILE *fd;
- pkg_wrap(PKG_INSTALL_VERSION, argv);
-
while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) {
switch (ch) {
case 'd':
Modified: head/usr.sbin/pkg_install/version/Makefile
==============================================================================
--- head/usr.sbin/pkg_install/version/Makefile Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/version/Makefile Tue May 17 19:11:47 2011 (r222035)
@@ -3,8 +3,13 @@
PROG= pkg_version
SRCS= main.c perform.c
+CFLAGS+= -I${.CURDIR}/../lib
+
WFORMAT?= 1
+DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD}
+LDADD= ${LIBINSTALL} -lfetch -lmd
+
test:
sh ${.CURDIR}/test-pkg_version.sh
Modified: head/usr.sbin/pkg_install/version/main.c
==============================================================================
--- head/usr.sbin/pkg_install/version/main.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/version/main.c Tue May 17 19:11:47 2011 (r222035)
@@ -25,7 +25,7 @@ __FBSDID("$FreeBSD$");
#include <getopt.h>
#include <err.h>
-#include <pkg.h>
+#include "lib.h"
#include "version.h"
char *LimitChars = NULL;
@@ -58,8 +58,6 @@ main(int argc, char **argv)
{
int ch, cmp = 0;
- pkg_wrap(PKG_INSTALL_VERSION, argv);
-
if (argc == 4 && !strcmp(argv[1], "-t")) {
cmp = version_cmp(argv[2], argv[3]);
printf(cmp > 0 ? ">\n" : (cmp < 0 ? "<\n" : "=\n"));
Modified: head/usr.sbin/pkg_install/version/perform.c
==============================================================================
--- head/usr.sbin/pkg_install/version/perform.c Tue May 17 18:24:59 2011 (r222034)
+++ head/usr.sbin/pkg_install/version/perform.c Tue May 17 19:11:47 2011 (r222035)
@@ -21,7 +21,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <pkg.h>
+#include "lib.h"
#include "version.h"
#include <err.h>
#include <fetch.h>
More information about the svn-src-all
mailing list