svn commit: r289684 - in projects/zfsd/head: cddl/sbin/zfsd lib lib/libdevctl lib/libdevdctl share/mk

[Baptiste Daroussin]

Author: bapt
Date: Wed Oct 21 09:44:50 2015
New Revision: 289684
URL: https://svnweb.freebsd.org/changeset/base/289684

Log:
  Rename libdevctl into libdevdctl
  
  In recent head there is already a libdevctl so we need to avoid conflicts
  
  Sponsored by:	Gandi.net

Added:
  projects/zfsd/head/lib/libdevdctl/
     - copied from r289683, projects/zfsd/head/lib/libdevctl/
Deleted:
  projects/zfsd/head/lib/libdevctl/
Modified:
  projects/zfsd/head/cddl/sbin/zfsd/Makefile.common
  projects/zfsd/head/lib/Makefile
  projects/zfsd/head/lib/libdevdctl/Makefile
  projects/zfsd/head/share/mk/bsd.libnames.mk

Modified: projects/zfsd/head/cddl/sbin/zfsd/Makefile.common
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/Makefile.common	Wed Oct 21 09:37:34 2015	(r289683)
+++ projects/zfsd/head/cddl/sbin/zfsd/Makefile.common	Wed Oct 21 09:44:50 2015	(r289684)
@@ -34,9 +34,9 @@ INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/
 
 CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}
 
-DPADD=  ${LIBDEVCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \
+DPADD=  ${LIBDEVDCTL} ${LIBZFS} ${LIBZFS_CORE} ${LIBUTIL} ${LIBGEOM} \
 	${LIBBSDXML} ${LIBSBUF} ${LIBNVPAIR} ${LIBUUTIL}
-LDADD=  -ldevctl -lzfs -lzfs_core -lutil -lgeom -lbsdxml -lsbuf -lnvpair -luutil
+LDADD=  -ldevdctl -lzfs -lzfs_core -lutil -lgeom -lbsdxml -lsbuf -lnvpair -luutil
 
 cscope:
 	find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \

Modified: projects/zfsd/head/lib/Makefile
==============================================================================
--- projects/zfsd/head/lib/Makefile	Wed Oct 21 09:37:34 2015	(r289683)
+++ projects/zfsd/head/lib/Makefile	Wed Oct 21 09:44:50 2015	(r289684)
@@ -41,7 +41,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libcom_err} \
 	libcompat \
 	libcrypt \
-	libdevctl \
+	libdevdctl \
 	libdevinfo \
 	libdevstat \
 	libdpv \

Modified: projects/zfsd/head/lib/libdevdctl/Makefile
==============================================================================
--- projects/zfsd/head/lib/libdevctl/Makefile	Wed Oct 21 09:37:34 2015	(r289683)
+++ projects/zfsd/head/lib/libdevdctl/Makefile	Wed Oct 21 09:44:50 2015	(r289684)
@@ -1,6 +1,6 @@
 # $FreeBSD: stable/9/lib/libdevinfo/Makefile 201381 2010-01-02 09:58:07Z ed $
 
-LIB=	devctl
+LIB=	devdctl
 INCS=	consumer.h		\
 	event.h			\
 	event_factory.h		\

Modified: projects/zfsd/head/share/mk/bsd.libnames.mk
==============================================================================
--- projects/zfsd/head/share/mk/bsd.libnames.mk	Wed Oct 21 09:37:34 2015	(r289683)
+++ projects/zfsd/head/share/mk/bsd.libnames.mk	Wed Oct 21 09:44:50 2015	(r289684)
@@ -39,7 +39,7 @@ LIBCRYPT?=	${DESTDIR}${LIBDIR}/libcrypt.
 LIBCRYPTO?=	${DESTDIR}${LIBDIR}/libcrypto.a
 LIBCTF?=	${DESTDIR}${LIBDIR}/libctf.a
 LIBCURSES?=	${DESTDIR}${LIBDIR}/libcurses.a
-LIBDEVCLT?=	${DESTDIR}${LIBDIR}/libdevctl.a
+LIBDEVDCTL?=	${DESTDIR}${LIBDIR}/libdevdctl.a
 LIBDEVINFO?=	${DESTDIR}${LIBDIR}/libdevinfo.a
 LIBDEVSTAT?=	${DESTDIR}${LIBDIR}/libdevstat.a
 LIBDIALOG?=	${DESTDIR}${LIBDIR}/libdialog.a