Minimal adjustments to get the Stallion utilities to build and install

in a FreeBSD style source tree.

9 files changed, 70 insertions, 7 deletions

diff --git a/usr.sbin/stallion/Makefile b/usr.sbin/stallion/Makefile
new file mode 100644
index 000000000000..44c3b639d676
--- /dev/null
+++ b/usr.sbin/stallion/Makefile
@@ -0,0 +1,5 @@
+# $Id$
+
+SUBDIR=	bootcode stlload stlstats
+
+.include <bsd.subdir.mk>
diff --git a/usr.sbin/stallion/Makefile.inc b/usr.sbin/stallion/Makefile.inc
new file mode 100644
index 000000000000..53b9b3e6a00b
--- /dev/null
+++ b/usr.sbin/stallion/Makefile.inc
@@ -0,0 +1,7 @@
+# $Id$
+
+BOOTDIR=	/usr/libdata/stallion
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include "${.CURDIR}/../../Makefile.inc"
+.endif
diff --git a/usr.sbin/stallion/bootcode/2681.sys.uu b/usr.sbin/stallion/bootcode/2681.sys.uu
index 8da74933103d..3cbe84201b09 100644
--- a/usr.sbin/stallion/bootcode/2681.sys.uu
+++ b/usr.sbin/stallion/bootcode/2681.sys.uu
@@ -1,4 +1,4 @@
-begin 440 2681.sys
+begin 444 2681.sys
 M````````````````````````````````````````````````````````````
 M``````!>`0``````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/usr.sbin/stallion/bootcode/Makefile b/usr.sbin/stallion/bootcode/Makefile
new file mode 100644
index 000000000000..ea585e8d2ec5
--- /dev/null
+++ b/usr.sbin/stallion/bootcode/Makefile
@@ -0,0 +1,30 @@
+# $Id$
+
+FILES	= 	2681.sys cdk.sys
+
+LIBMODE	=	444
+LIBOWN	=	bin
+LIBGRP	=	bin
+CLEANFILES= 	${FILES}
+
+all: $(FILES)
+
+install:
+	@if [ ! -d ${DESTDIR}${BOOTDIR} ]; then mkdir ${DESTDIR}${BOOTDIR};fi
+	@for i in ${FILES}; do \
+		${ECHO} "installing $$i into ${DESTDIR}${BOOTDIR}"; \
+		${INSTALL} -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \
+		$$i ${DESTDIR}${BOOTDIR}; \
+	done
+
+clean:
+	rm -f ${CLEANFILES}
+
+.include <bsd.prog.mk>
+
+cdk.sys: ${.CURDIR}/cdk.sys.uu
+	uudecode ${.CURDIR}/$@.uu
+
+2681.sys: ${.CURDIR}/2681.sys.uu
+	uudecode ${.CURDIR}/$@.uu
+
diff --git a/usr.sbin/stallion/bootcode/cdk.sys.uu b/usr.sbin/stallion/bootcode/cdk.sys.uu
index 8d000833916f..f8b33edccb06 100644
--- a/usr.sbin/stallion/bootcode/cdk.sys.uu
+++ b/usr.sbin/stallion/bootcode/cdk.sys.uu
@@ -1,4 +1,4 @@
-begin 440 cdk.sys
+begin 444 cdk.sys
 M````````````````````````````````````````````````````````````
 M``````!@`0``````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/usr.sbin/stallion/stlload/Makefile b/usr.sbin/stallion/stlload/Makefile
new file mode 100644
index 000000000000..99142f234a49
--- /dev/null
+++ b/usr.sbin/stallion/stlload/Makefile
@@ -0,0 +1,8 @@
+# $Id$
+
+PROG=	stlload
+NOMAN=	#oops
+
+CFLAGS+=-DBOOTDIR=\"${BOOTDIR}\"
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/stallion/stlload/stlload.c b/usr.sbin/stallion/stlload/stlload.c
index d44c052de96b..7f6277961296 100644
--- a/usr.sbin/stallion/stlload/stlload.c
+++ b/usr.sbin/stallion/stlload/stlload.c
@@ -32,6 +32,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
 /*****************************************************************************/
@@ -45,14 +47,14 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
-#include "cdk.h"
+#include <machine/cdk.h>
 
 /*****************************************************************************/
 
 char	*version = "0.0.5";
 char	*defdevice = "/dev/staliomem%d";
-char	*image = "/usr/lib/stallion/cdk.sys";
-char	*oldimage = "/usr/lib/stallion/2681.sys";
+char	*image = BOOTDIR "/cdk.sys";
+char	*oldimage = BOOTDIR "/2681.sys";
 
 char	*progname;
 char	*memdevice;
diff --git a/usr.sbin/stallion/stlstats/Makefile b/usr.sbin/stallion/stlstats/Makefile
new file mode 100644
index 000000000000..347b4e99f311
--- /dev/null
+++ b/usr.sbin/stallion/stlstats/Makefile
@@ -0,0 +1,9 @@
+# $Id$
+
+PROG=	stlstats
+NOMAN=	#oops
+
+LDADD=	-lncurses
+DPADD=	${LIBNCURSES}
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/stallion/stlstats/stlstats.c b/usr.sbin/stallion/stlstats/stlstats.c
index fcce5c6ae873..e6e304f97f26 100644
--- a/usr.sbin/stallion/stlstats/stlstats.c
+++ b/usr.sbin/stallion/stlstats/stlstats.c
@@ -32,6 +32,8 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id$
  */
 
 /*****************************************************************************/
@@ -46,8 +48,8 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 
-#include "cdk.h"
-#include "comstats.h"
+#include <machine/cdk.h>
+#include <machine/comstats.h>
 
 /*****************************************************************************/