svn commit: r227951 - in head: . gnu/lib share/mk

[Max Khon]

Author: fjoe
Date: Thu Nov 24 20:31:06 2011
New Revision: 227951
URL: http://svn.freebsd.org/changeset/base/227951

Log:
  libodialog: disconnect from the build and obsolete.

Modified:
  head/ObsoleteFiles.inc
  head/gnu/lib/Makefile
  head/share/mk/bsd.libnames.mk

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Nov 24 19:02:04 2011	(r227950)
+++ head/ObsoleteFiles.inc	Thu Nov 24 20:31:06 2011	(r227951)
@@ -38,6 +38,17 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20111125: libodialog removed
+OLD_FILES+=usr/lib/libodialog.a
+OLD_FILES+=usr/lib/libodialog.so
+OLD_LIBS+=usr/lib/libodialog.so.7
+OLD_FILES+=usr/lib/libodialog_p.a
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/libodialog.a
+OLD_FILES+=usr/lib32/libodialog.so
+OLD_LIBS+=usr/lib32/libodialog.so.7
+OLD_FILES+=usr/lib32/libodialog_p.a
+.endif
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz

Modified: head/gnu/lib/Makefile
==============================================================================
--- head/gnu/lib/Makefile	Thu Nov 24 19:02:04 2011	(r227950)
+++ head/gnu/lib/Makefile	Thu Nov 24 20:31:06 2011	(r227951)
@@ -2,8 +2,7 @@
 
 .include <bsd.own.mk>
 
-SUBDIR= csu libgcc libgcov libdialog libgomp libodialog libregex libreadline \
-	libssp
+SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline libssp
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.

Modified: head/share/mk/bsd.libnames.mk
==============================================================================
--- head/share/mk/bsd.libnames.mk	Thu Nov 24 19:02:04 2011	(r227950)
+++ head/share/mk/bsd.libnames.mk	Thu Nov 24 20:31:06 2011	(r227951)
@@ -100,7 +100,6 @@ LIBNCURSESW?=	${DESTDIR}${LIBDIR}/libncu
 LIBNETGRAPH?=	${DESTDIR}${LIBDIR}/libnetgraph.a
 LIBNGATM?=	${DESTDIR}${LIBDIR}/libngatm.a
 LIBNVPAIR?=	${DESTDIR}${LIBDIR}/libnvpair.a
-LIBODIALOG?=	${DESTDIR}${LIBDIR}/libodialog.a
 LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
 
 # The static PAM library doesn't know its secondary dependencies,