svn commit: r275081 - in stable/9: . gnu/lib/libdialog lib lib/libdpv lib/libfigpar share/mk sys/sys usr.bin usr.bin/dpv

[Devin Teske]

Author: dteske
Date: Tue Nov 25 22:16:43 2014
New Revision: 275081
URL: https://svnweb.freebsd.org/changeset/base/275081

Log:
  Revert revisions 275047, 275051, and 275056.
  Oops, dpv(1,3) requires dialog-1.2-20130923 or higher (which I
  introduced to HEAD via r255852 prior to the creation of the
  stable/10 branch; however it never got merged to stable/9 so
  we can't have dpv in stable/9).
  
  Brief summary of reverted revisions:
  r275047: Add dpv(1,3)/figpar(3)
  r275051: Fixes
  r275056: Enable compilation of dpv(1,3)
  
  Pointy-hat:	me

Deleted:
  stable/9/lib/libdpv/
  stable/9/lib/libfigpar/
  stable/9/usr.bin/dpv/
Modified:
  stable/9/Makefile.inc1   (contents, props changed)
  stable/9/gnu/lib/libdialog/Makefile
  stable/9/lib/Makefile   (contents, props changed)
  stable/9/share/mk/bsd.libnames.mk
  stable/9/sys/sys/param.h
  stable/9/usr.bin/Makefile
Directory Properties:
  stable/9/   (props changed)
  stable/9/gnu/lib/libdialog/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/share/mk/   (props changed)
  stable/9/sys/sys/   (props changed)
  stable/9/usr.bin/   (props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Tue Nov 25 22:10:31 2014	(r275080)
+++ stable/9/Makefile.inc1	Tue Nov 25 22:16:43 2014	(r275081)
@@ -1353,7 +1353,6 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_kerberos5_lib_libroken} \
 		lib/libbz2 lib/libcom_err lib/libcrypt \
 		lib/libelf lib/libexpat \
-		lib/libfigpar \
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
@@ -1364,8 +1363,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_cddl_lib_libzfs_core} \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
-		${_secure_lib_libssh} ${_secure_lib_libssl} \
-		gnu/lib/libdialog
+		${_secure_lib_libssh} ${_secure_lib_libssl}
 
 .if ${MK_LIBTHR} != "no"
 _lib_libthr=	lib/libthr
@@ -1445,8 +1443,6 @@ _lib_libypclnt=	lib/libypclnt
 lib/libradius__L: lib/libmd__L
 .endif
 
-gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
-
 .for _lib in ${_prereq_libs}
 ${_lib}__PL: .PHONY
 .if exists(${.CURDIR}/${_lib})

Modified: stable/9/gnu/lib/libdialog/Makefile
==============================================================================
--- stable/9/gnu/lib/libdialog/Makefile	Tue Nov 25 22:10:31 2014	(r275080)
+++ stable/9/gnu/lib/libdialog/Makefile	Tue Nov 25 22:16:43 2014	(r275081)
@@ -13,9 +13,6 @@ SRCS=		argv.c arrows.c buttons.c calenda
 INCS=		dialog.h dlg_colors.h dlg_config.h dlg_keys.h
 MAN=		dialog.3
 
-DPADD=		${LIBNCURSESW} ${LIBM}
-LDADD=		-lncursesw -lm
-
 CFLAGS+= 	-I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED
 .PATH:		${DIALOG}
 WARNS?=		1

Modified: stable/9/lib/Makefile
==============================================================================
--- stable/9/lib/Makefile	Tue Nov 25 22:10:31 2014	(r275080)
+++ stable/9/lib/Makefile	Tue Nov 25 22:16:43 2014	(r275081)
@@ -22,7 +22,6 @@
 # libsbuf must be built before libcam.
 # libtacplus must be built before libpam.
 # libutil must be built before libpam.
-# libfigpar must be built before libdpv (but after ncurses and libutil).
 # libypclnt must be built before libpam.
 # libgssapi must be built before librpcsec_gss
 #
@@ -49,7 +48,6 @@ SUBDIR_ORDERED=	${_csu} \
 	libsbuf \
 	libtacplus \
 	libutil \
-	libfigpar \
 	${_libypclnt} \
 	${_libcxxrt} \
 	${_libcplusplus}
@@ -69,7 +67,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libdevinfo \
 	libdevstat \
 	libdisk \
-	libdpv \
 	libdwarf \
 	libedit \
 	${_libefi} \

Modified: stable/9/share/mk/bsd.libnames.mk
==============================================================================
--- stable/9/share/mk/bsd.libnames.mk	Tue Nov 25 22:10:31 2014	(r275080)
+++ stable/9/share/mk/bsd.libnames.mk	Tue Nov 25 22:16:43 2014	(r275081)
@@ -45,13 +45,11 @@ LIBDEVSTAT?=	${DESTDIR}${LIBDIR}/libdevs
 LIBDIALOG?=	${DESTDIR}${LIBDIR}/libdialog.a
 LIBDISK?=	${DESTDIR}${LIBDIR}/libdisk.a
 LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
-LIBDPV?=	${DESTDIR}${LIBDIR}/libdpv.a
 LIBDTRACE?=	${DESTDIR}${LIBDIR}/libdtrace.a
 LIBDWARF?=	${DESTDIR}${LIBDIR}/libdwarf.a
 LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
 LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
 LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
-LIBFIGPAR?=	${DESTDIR}${LIBDIR}/libfigpar.a
 LIBFL?=		"don't use LIBFL, use LIBL"
 LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
 LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a

Modified: stable/9/sys/sys/param.h
==============================================================================
--- stable/9/sys/sys/param.h	Tue Nov 25 22:10:31 2014	(r275080)
+++ stable/9/sys/sys/param.h	Tue Nov 25 22:16:43 2014	(r275081)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 903507	/* Master, propagated to newvers */
+#define __FreeBSD_version 903506	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

Modified: stable/9/usr.bin/Makefile
==============================================================================
--- stable/9/usr.bin/Makefile	Tue Nov 25 22:10:31 2014	(r275080)
+++ stable/9/usr.bin/Makefile	Tue Nov 25 22:16:43 2014	(r275081)
@@ -36,7 +36,6 @@ SUBDIR=	alias \
 	ctlstat \
 	cut \
 	dirname \
-	dpv \
 	du \
 	ee \
 	elf2aout \