Index: stable/10/lib/libprocstat/Versions.def
===================================================================
--- stable/10/lib/libprocstat/Versions.def	(revision 312284)
+++ stable/10/lib/libprocstat/Versions.def	(nonexistent)
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-# This version was first added to 9.0-current.
-FBSD_1.2 {
-};
-
-# This version was first added to 10.0-current.
-FBSD_1.3 {
-} FBSD_1.2;
-

Property changes on: stable/10/lib/libprocstat/Versions.def
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: stable/10/lib/libprocstat/Makefile
===================================================================
--- stable/10/lib/libprocstat/Makefile	(revision 312284)
+++ stable/10/lib/libprocstat/Makefile	(revision 312285)
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 LIB=	procstat
 
 SRCS=	cd9660.c	\
 	common_kvm.c	\
 	core.c		\
 	libprocstat.c	\
 	msdosfs.c	\
 	smbfs.c		\
 	udf.c
 
-VERSION_DEF=	${.CURDIR}/Versions.def
+VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
 INCS=		libprocstat.h
 CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
 SHLIB_MAJOR=	1
 
 DPADD=		${LIBELF} ${LIBKVM} ${LIBUTIL}
 LDADD=		-lelf -lkvm -lutil
 
 MAN=		libprocstat.3
 
 # XXX This is a hack.
 .if ${MK_CDDL} != "no"
 CFLAGS+=	-DLIBPROCSTAT_ZFS
 OBJS+=	zfs/zfs.o
 SOBJS+=	zfs/zfs.So
 POBJS+=	zfs/zfs.po
 SUBDIR=	zfs
 zfs/zfs.o: .PHONY
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs.o
 zfs/zfs.So: .PHONY
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs.So
 zfs/zfs.po: .PHONY
 	@cd ${.CURDIR}/zfs && ${MAKE} zfs.po
 .endif
 
 .include <bsd.lib.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 312284)
+++ stable/10	(revision 312285)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r311781