CVS commit: src/sys/arch/x68k/stand/loadbsd

2016-12-10 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sat Dec 10 14:06:44 UTC 2016

Modified Files:
src/sys/arch/x68k/stand/loadbsd: Makefile

Log Message:
Fix comment. We do not use the a.out format anymore...


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/stand/loadbsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x68k/stand/loadbsd/Makefile
diff -u src/sys/arch/x68k/stand/loadbsd/Makefile:1.17 src/sys/arch/x68k/stand/loadbsd/Makefile:1.18
--- src/sys/arch/x68k/stand/loadbsd/Makefile:1.17	Sat Dec 10 14:03:34 2016
+++ src/sys/arch/x68k/stand/loadbsd/Makefile	Sat Dec 10 14:06:44 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2016/12/10 14:03:34 rin Exp $
+#	$NetBSD: Makefile,v 1.18 2016/12/10 14:06:44 rin Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -15,7 +15,7 @@ BINDIR=		/usr/mdec
 .include 
 .include 
 
-STRIPFLAG=		# not an a.out
+STRIPFLAG=		# not an elf
 
 AOUT2HUXDIR!=	cd ${.CURDIR}/../aout2hux && ${PRINTOBJDIR}
 AOUT2HUX=	${AOUT2HUXDIR}/aout2hux



CVS commit: src/sys/arch/x68k/stand/loadbsd

2016-12-10 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sat Dec 10 14:03:34 UTC 2016

Modified Files:
src/sys/arch/x68k/stand/loadbsd: Makefile

Log Message:
Clear STRIPFLAG after include bsd.own.mk; it can be modified by mk.conf via
bsd.own.mk.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x68k/stand/loadbsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x68k/stand/loadbsd/Makefile
diff -u src/sys/arch/x68k/stand/loadbsd/Makefile:1.16 src/sys/arch/x68k/stand/loadbsd/Makefile:1.17
--- src/sys/arch/x68k/stand/loadbsd/Makefile:1.16	Wed Aug 21 08:17:34 2013
+++ src/sys/arch/x68k/stand/loadbsd/Makefile	Sat Dec 10 14:03:34 2016
@@ -1,10 +1,9 @@
-#	$NetBSD: Makefile,v 1.16 2013/08/21 08:17:34 matt Exp $
+#	$NetBSD: Makefile,v 1.17 2016/12/10 14:03:34 rin Exp $
 
 S=	${.CURDIR}/../../../..
 
 BASE=	loadbsd
 PROG=	${BASE}.x	# Human68k ".x" executable
-STRIPFLAG=		# not an a.out
 BINMODE=444		# not to be run on NetBSD
 SRCS=	start.S loadbsd.c xprintf.c trampoline.S
 
@@ -16,6 +15,8 @@ BINDIR=		/usr/mdec
 .include 
 .include 
 
+STRIPFLAG=		# not an a.out
+
 AOUT2HUXDIR!=	cd ${.CURDIR}/../aout2hux && ${PRINTOBJDIR}
 AOUT2HUX=	${AOUT2HUXDIR}/aout2hux
 LIBDOS!=	cd ${.CURDIR}/../libdos && ${PRINTOBJDIR}



CVS commit: src/sys/arch/x68k/stand/loadbsd

2013-08-21 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed Aug 21 08:17:34 UTC 2013

Modified Files:
src/sys/arch/x68k/stand/loadbsd: Makefile

Log Message:
Use bsd.klinks.mk


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x68k/stand/loadbsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x68k/stand/loadbsd/Makefile
diff -u src/sys/arch/x68k/stand/loadbsd/Makefile:1.15 src/sys/arch/x68k/stand/loadbsd/Makefile:1.16
--- src/sys/arch/x68k/stand/loadbsd/Makefile:1.15	Mon Aug 12 16:34:05 2013
+++ src/sys/arch/x68k/stand/loadbsd/Makefile	Wed Aug 21 08:17:34 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2013/08/12 16:34:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2013/08/21 08:17:34 matt Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -14,6 +14,7 @@ BINDIR=		/usr/mdec
 .PATH:	${.CURDIR}/../common
 
 .include bsd.own.mk
+.include bsd.klinks.mk
 
 AOUT2HUXDIR!=	cd ${.CURDIR}/../aout2hux  ${PRINTOBJDIR}
 AOUT2HUX=	${AOUT2HUXDIR}/aout2hux
@@ -31,13 +32,6 @@ LDLIBS=		-L${LIBDOS} -ldos -L${LIBIOCS} 
 DPADD+=		${AOUT2HUX}
 
 CLEANFILES+=	${BASE}1 ${BASE}2
-CLEANFILES+=	machine m68k
-
-.if !make(obj)  !make(clean)  !make(cleandir)
-.BEGIN:
-	rm -f machine  ln -s $S/arch/x68k/include machine
-	rm -f m68k  ln -s $S/arch/m68k/include m68k
-.endif
 
 ${PROG}: ${BASE}1 ${BASE}2
 	${_MKTARGET_LINK}



CVS commit: src/sys/arch/x68k/stand/loadbsd

2012-02-08 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Wed Feb  8 23:51:37 UTC 2012

Modified Files:
src/sys/arch/x68k/stand/loadbsd: Makefile

Log Message:
Don't depend on cat pages to be installed, just run mandoc here.
Also provide a HTML version for user of modern technology.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/stand/loadbsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x68k/stand/loadbsd/Makefile
diff -u src/sys/arch/x68k/stand/loadbsd/Makefile:1.13 src/sys/arch/x68k/stand/loadbsd/Makefile:1.14
--- src/sys/arch/x68k/stand/loadbsd/Makefile:1.13	Wed Apr 13 11:10:49 2011
+++ src/sys/arch/x68k/stand/loadbsd/Makefile	Wed Feb  8 23:51:37 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2011/04/13 11:10:49 he Exp $
+#	$NetBSD: Makefile,v 1.14 2012/02/08 23:51:37 joerg Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -54,6 +54,7 @@ ${BASE}${i}:	${OBJS} ${LIBDOS}/libdos.a 
 release: check_RELEASEDIR
 	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
 	${RELEASEDIR}/${MACHINE}/installation/misc
-	${HOST_INSTALL_FILE} -m ${NONBINMODE} \
-	${DESTDIR}/usr/share/man/cat8/x68k/loadbsd.0 \
-	${RELEASEDIR}/${MACHINE}/installation/misc
+	${TOOL_MANDOC_ASCII} ${DESTDIR}/usr/share/man/man8/x68k/loadbsd.8  \
+	${RELEASEDIR}/${MACHINE}/installation/misc/loadbsd.0
+	${TOOL_MANDOC_HTML} ${DESTDIR}/usr/share/man/man8/x68k/loadbsd.8  \
+	${RELEASEDIR}/${MACHINE}/installation/misc/loadbsd.html



CVS commit: src/sys/arch/x68k/stand/loadbsd

2011-04-13 Thread Havard Eidnes
Module Name:src
Committed By:   he
Date:   Wed Apr 13 11:10:50 UTC 2011

Modified Files:
src/sys/arch/x68k/stand/loadbsd: Makefile

Log Message:
Convert to using -nostdinc, and set include paths and create symlinks
so that we include the source tree's sys/, machine/ and m68k/ headers,
and only as a last resort use DESTDIR's /usr/include.  For some reason
the host's bootinfo.h got included ahead of the x68k variant, causing
a build failure in my case.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/loadbsd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x68k/stand/loadbsd/Makefile
diff -u src/sys/arch/x68k/stand/loadbsd/Makefile:1.12 src/sys/arch/x68k/stand/loadbsd/Makefile:1.13
--- src/sys/arch/x68k/stand/loadbsd/Makefile:1.12	Thu Jun 29 03:46:43 2006
+++ src/sys/arch/x68k/stand/loadbsd/Makefile	Wed Apr 13 11:10:49 2011
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.12 2006/06/29 03:46:43 lukem Exp $
+#	$NetBSD: Makefile,v 1.13 2011/04/13 11:10:49 he Exp $
+
+S=	${.CURDIR}/../../../..
 
 BASE=	loadbsd
 PROG=	${BASE}.x	# Human68k .x executable
@@ -20,12 +22,22 @@
 
 CPPFLAGS=	-W -Wall -O -fomit-frame-pointer
 CPPFLAGS+=	-m68000 -Wa,-mc68000
+CPPFLAGS+=	-nostdinc 
+CPPFLAGS+=	-I$S -I.
 CPPFLAGS+=	-I${.CURDIR}/../libdos -I${.CURDIR}/../libiocs
+CPPFLAGS+=	-I${DESTDIR}/usr/include
 LDFLAGS=	-nostdlib -static -N
 LDLIBS=		-L${LIBDOS} -ldos -L${LIBIOCS} -liocs -L${DESTDIR}/usr/lib -lc
 DPADD+=		${AOUT2HUX}
 
 CLEANFILES+=	${BASE}1 ${BASE}2
+CLEANFILES+=	machine m68k
+
+.if !make(obj)  !make(clean)  !make(cleandir)
+.BEGIN:
+	rm -f machine  ln -s $S/arch/x68k/include machine
+	rm -f m68k  ln -s $S/arch/m68k/include m68k
+.endif
 
 ${PROG}: ${BASE}1 ${BASE}2
 	${_MKTARGET_LINK}