pkgbase: Move ctld/ctladm to iscsi package

While here only compile both of them if WITH_ISCSI is set (this is the default).

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D30755
Sponsored by:	Diablotin Systems

usr.sbin/Makefile

@@ -15,8 +15,6 @@ SUBDIR=	adduser \
 	clear_locks \
 	crashinfo \
 	cron \
-	ctladm \
-	ctld \
 	daemon \
 	dconschat \
 	devctl \
@@ -153,7 +151,7 @@ SUBDIR.${MK_INET6}+=	rtsold
 SUBDIR.${MK_INET6}+=	traceroute6
 SUBDIR.${MK_INETD}+=	inetd
 SUBDIR.${MK_IPFW}+=	ipfwpcap
-SUBDIR.${MK_ISCSI}+=	iscsid
+SUBDIR.${MK_ISCSI}+=	ctladm ctld iscsid
 SUBDIR.${MK_JAIL}+=	jail
 SUBDIR.${MK_JAIL}+=	jexec
 SUBDIR.${MK_JAIL}+=	jls

usr.sbin/ctladm/Makefile

@@ -2,6 +2,7 @@
 
 .include <src.opts.mk>
 
+PACKAGE=	iscsi
 PROG=		ctladm
 SRCS=		ctladm.c util.c ctl_util.c ctl_scsi_all.c
 .PATH:		${SRCTOP}/sys/cam/ctl

usr.sbin/ctld/Makefile

@@ -5,6 +5,7 @@
 CFLAGS+=-I${SRCTOP}/contrib/libucl/include
 .PATH:  ${SRCTOP}/contrib/libucl/include
 
+PACKAGE=	iscsi
 PROG=		ctld
 SRCS=		chap.c ctld.c discovery.c isns.c kernel.c keys.c log.c
 SRCS+=		login.c parse.y pdu.c token.l y.tab.h uclparse.c