svn commit: r257444 - in head: . etc/periodic/daily etc/periodic/security etc/periodic/weekly share/man/man5 tools/build/mk tools/build/options usr.sbin usr.sbin/pkg_install

Baptiste Daroussin bapt at FreeBSD.org
Thu Oct 31 13:00:37 UTC 2013 

Author: bapt
Date: Thu Oct 31 13:00:35 2013
New Revision: 257444
URL: http://svnweb.freebsd.org/changeset/base/257444

Log:
  After around 20 years of duty it is time for pkg_install to retire

Deleted:
  head/etc/periodic/daily/220.backup-pkgdb
  head/etc/periodic/daily/490.status-pkg-changes
  head/etc/periodic/security/460.chkportsum
  head/etc/periodic/weekly/400.status-pkg
  head/tools/build/options/WITH_PKGTOOLS
  head/usr.sbin/pkg_install/
Modified:
  head/ObsoleteFiles.inc
  head/etc/periodic/daily/Makefile
  head/etc/periodic/security/Makefile
  head/etc/periodic/weekly/Makefile
  head/share/man/man5/src.conf.5
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.sbin/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Oct 31 12:59:25 2013	(r257443)
+++ head/ObsoleteFiles.inc	Thu Oct 31 13:00:35 2013	(r257444)
@@ -38,6 +38,23 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131031: pkg_install has been removed
+OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
+OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
+OLD_FILES+=etc/periodic/security/460.chkportsum
+OLD_FILES+=etc/periodic/weekly/400.status-pkg
+OLD_FILES+=usr/sbin/pkg_add
+OLD_FILES+=usr/sbin/pkg_create
+OLD_FILES+=usr/sbin/pkg_delete
+OLD_FILES+=usr/sbin/pkg_info
+OLD_FILES+=usr/sbin/pkg_updating
+OLD_FILES+=usr/sbin/pkg_version
+OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
 # 20131030: /etc/keys moved to /usr/share/keys
 OLD_DIRS+=etc/keys
 OLD_DIRS+=etc/keys/pkg

Modified: head/etc/periodic/daily/Makefile
==============================================================================
--- head/etc/periodic/daily/Makefile	Thu Oct 31 12:59:25 2013	(r257443)
+++ head/etc/periodic/daily/Makefile	Thu Oct 31 13:00:35 2013	(r257444)
@@ -36,11 +36,6 @@ FILES+=	130.clean-msgs
 FILES+=	480.status-ntpd
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	220.backup-pkgdb \
-	490.status-pkg-changes
-.endif
-
 .if ${MK_RCMDS} != "no"
 FILES+=	140.clean-rwho \
 	430.status-rwho

Modified: head/etc/periodic/security/Makefile
==============================================================================
--- head/etc/periodic/security/Makefile	Thu Oct 31 12:59:25 2013	(r257443)
+++ head/etc/periodic/security/Makefile	Thu Oct 31 13:00:35 2013	(r257444)
@@ -29,8 +29,4 @@ FILES+=	500.ipfwdenied \
 FILES+=	520.pfdenied
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	460.chkportsum
-.endif
-
 .include <bsd.prog.mk>

Modified: head/etc/periodic/weekly/Makefile
==============================================================================
--- head/etc/periodic/weekly/Makefile	Thu Oct 31 12:59:25 2013	(r257443)
+++ head/etc/periodic/weekly/Makefile	Thu Oct 31 13:00:35 2013	(r257444)
@@ -16,8 +16,4 @@ FILES+=	310.locate
 FILES+=	320.whatis 330.catman
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	400.status-pkg
-.endif
-
 .include <bsd.prog.mk>

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Thu Oct 31 12:59:25 2013	(r257443)
+++ head/share/man/man5/src.conf.5	Thu Oct 31 13:00:35 2013	(r257444)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd October 25, 2013
+.Dd October 31, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -860,15 +860,10 @@ When set, it also enforces the following
 .Va WITHOUT_AUTHPF
 .El
 .It Va WITHOUT_PKGBOOTSTRAP
-.\" from FreeBSD: head/tools/build/options/WITHOUT_PKGBOOTSTRAP 238023 2012-07-02 20:26:11Z marcel
+.\" $FreeBSD: head/tools/build/options/WITHOUT_PKGBOOTSTRAP 257440 2013-10-31 12:05:37Z bapt
 Set to not build
-.Xr pkg 1
+.Xr pkg 7
 bootstrap tool
-.It Va WITH_PKGTOOLS
-.\" from FreeBSD: head/tools/build/options/WITH_PKGTOOLS 253305 2013-07-12 23:11:17Z bapt
-Set to build
-.Xr pkg_add 8
-and related programs.
 .It Va WITHOUT_PMC
 .\" from FreeBSD: head/tools/build/options/WITHOUT_PMC 183242 2008-09-21 22:02:26Z sam
 Set to not build

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Oct 31 12:59:25 2013	(r257443)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Oct 31 13:00:35 2013	(r257444)
@@ -3613,29 +3613,6 @@ OLD_FILES+=usr/sbin/pkg
 OLD_FILES+=usr/share/man/man7/pkg.7.gz
 .endif
 
-.if ${MK_PKGTOOLS} == no
-OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
-OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
-OLD_FILES+=etc/periodic/security/460.chkportsum
-OLD_FILES+=etc/periodic/weekly/400.status-pkg
-OLD_FILES+=usr/include/pkg.h
-OLD_FILES+=usr/lib/libpkg.a
-OLD_FILES+=usr/lib/libpkg.so
-OLD_LIBS+=usr/lib/libpkg.so.0
-OLD_FILES+=usr/sbin/pkg_add
-OLD_FILES+=usr/sbin/pkg_create
-OLD_FILES+=usr/sbin/pkg_delete
-OLD_FILES+=usr/sbin/pkg_info
-OLD_FILES+=usr/sbin/pkg_updating
-OLD_FILES+=usr/sbin/pkg_version
-OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
-.endif
-
 .if ${MK_PORTSNAP} == no
 OLD_FILES+=etc/portsnap.conf
 OLD_FILES+=usr/libexec/make_index

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Thu Oct 31 12:59:25 2013	(r257443)
+++ head/usr.sbin/Makefile	Thu Oct 31 13:00:35 2013	(r257444)
@@ -251,10 +251,6 @@ SUBDIR+=	ftp-proxy
 SUBDIR+=	pkg
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-SUBDIR+=	pkg_install
-.endif
-
 # XXX MK_TOOLCHAIN?
 .if ${MK_PMC} != "no"
 SUBDIR+=	pmcannotate

More information about the svn-src-head mailing list