Date: Sat, 10 Jan 2009 10:25:25 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r187015 - in stable/7: . tools/build/mk Message-ID: <200901101025.n0AAPP5b086546@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Jan 10 10:25:25 2009 New Revision: 187015 URL: http://svn.freebsd.org/changeset/base/187015 Log: MFC r183002 to stable/7: Add files to remove when WITHOUT_HESIOD is set. This fixes "make check-old" when WITH_HESIOD is set. PR: 122406 MFC after: 1 month Modified: stable/7/ObsoleteFiles.inc stable/7/tools/build/mk/OptionalObsoleteFiles.inc Modified: stable/7/ObsoleteFiles.inc ============================================================================== --- stable/7/ObsoleteFiles.inc Sat Jan 10 09:17:16 2009 (r187014) +++ stable/7/ObsoleteFiles.inc Sat Jan 10 10:25:25 2009 (r187015) @@ -3531,7 +3531,6 @@ OLD_FILES+=usr/games/worm OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump OLD_FILES+=sbin/mount_reiserfs -OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/include/c++/3.4/ext/demangle.h OLD_FILES+=usr/include/cam/cam_extend.h OLD_FILES+=usr/include/dev/wi/wi_hostap.h @@ -3941,10 +3940,8 @@ OLD_FILES+=usr/share/doc/ntp/release.htm OLD_FILES+=usr/share/doc/ntp/tickadj.htm OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz OLD_FILES+=usr/share/doc/papers/px.ascii.gz -OLD_FILES+=usr/share/man/man1/hesinfo.1.gz OLD_FILES+=usr/share/man/man3/mbrune.3.gz OLD_FILES+=usr/share/man/man3/rune.3.gz -OLD_FILES+=usr/share/man/man3/hesiod.3.gz OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz @@ -3959,7 +3956,6 @@ OLD_FILES+=usr/share/man/man3/setruneloc OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz OLD_FILES+=usr/share/man/man3/mbrune.3.gz OLD_FILES+=usr/share/man/man3/rune.3.gz -OLD_FILES+=usr/share/man/man3/hesiod.3.gz OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz @@ -3975,7 +3971,6 @@ OLD_FILES+=usr/share/man/man3/setinvalid OLD_FILES+=usr/share/man/man3/fungetrune.3.gz OLD_FILES+=usr/share/man/man3/fputrune.3.gz OLD_FILES+=usr/share/man/man3/fgetrune.3.gz -OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" OLD_FILES+=usr/share/man/man8/boot_i386.8.gz Modified: stable/7/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/7/tools/build/mk/OptionalObsoleteFiles.inc Sat Jan 10 09:17:16 2009 (r187014) +++ stable/7/tools/build/mk/OptionalObsoleteFiles.inc Sat Jan 10 10:25:25 2009 (r187015) @@ -402,9 +402,13 @@ OLD_FILES+=usr/share/man/man1/gcov.1.gz # to be filled in #.endif -#.if ${MK_HESIOD} == no -# to be filled in -#.endif +.if ${MK_HESIOD} == no +OLD_FILES+=usr/bin/hesinfo +OLD_FILES+=usr/include/hesiod.h +OLD_FILES+=usr/share/man/man1/hesinfo.1.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz +.endif #.if ${MK_HTML} == no # to be filled in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901101025.n0AAPP5b086546>