svn commit: r278070 - head/sbin

[Garrett Cooper]

Author: ngie
Date: Mon Feb  2 10:31:35 2015
New Revision: 278070
URL: https://svnweb.freebsd.org/changeset/base/278070

Log:
  Remove duplicate MK_ISCSI block and sort the conditional blocks so this error
  won't crop up again in the future
  
  Reported by: gjb
  MFC after: 1 week

Modified:
  head/sbin/Makefile

Modified: head/sbin/Makefile
==============================================================================
--- head/sbin/Makefile	Mon Feb  2 10:00:45 2015	(r278069)
+++ head/sbin/Makefile	Mon Feb  2 10:31:35 2015	(r278070)
@@ -91,6 +91,11 @@ SUBDIR+=	hastctl
 SUBDIR+=	hastd
 .endif
 
+.if ${MK_INET6} != "no"
+SUBDIR+=	ping6
+SUBDIR+=	rtsol
+.endif
+	
 .if ${MK_IPFILTER} != "no"
 SUBDIR+=	ipf
 .endif
@@ -114,15 +119,6 @@ SUBDIR+=	pfctl
 SUBDIR+=	pflogd
 .endif
 
-.if ${MK_INET6} != "no"
-SUBDIR+=	ping6
-SUBDIR+=	rtsol
-.endif
-	
-.if ${MK_ISCSI} != "no"
-SUBDIR+=	iscontrol
-.endif
-
 .if ${MK_QUOTAS} != "no"
 SUBDIR+=	quotacheck
 .endif