Attachment #139283 for bug #185509

View | Details | Raw Unified | Return to bug 185509
Collapse All | Expand All





PORTNAME=	mknbi
PORTVERSION=	1.4.4
PORTREVISION=	1
CATEGORIES=	net
MASTER_SITES=	SF/etherboot/${PORTNAME}/${PORTVERSION}



BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm

USES=		gmake perl5 shebangfix
SHEBANG_FILES=	*.pl
USE_CSTD=	gnu89
		mknbi-nfl.1 mkelf-nfl.1 mknbi-dos.1 mknbi-fdos.1 mkelf-lua.1
MLINKS+=	mknbi.1 ${i}
.endfor

PORTDOCS=	COPYING README LOG spec.txt

USES=		perl5
USE_GMAKE=	yes
ONLY_FOR_ARCHS=	i386

NO_STAGE=	yes
post-patch:
	@${REINPLACE_CMD} -e 's,^static int terminal,int terminal,' \
		${WRKSRC}/nfl.c




--- Makefile.orig	2004-08-17 11:47:29.000000000 +0900
+++ Makefile	2013-12-24 05:17:46.000000000 +0900
@@ -17,8 +17,8 @@
 # This one makes multiple versions
 FIRSTRELOCS=	0x92800 0x82800
 OLDGAS:=	$(shell $(AS) --version | grep -q '2\.9\.1' && echo -DGAS291)
-CFLAGS=		-I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \
-		-mcpu=i386 \
+CFLAGS+=		-I. -ffreestanding -fstrength-reduce -fomit-frame-pointer \
+		\
 		-Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"
 LDBINARYFLAG=	--oformat binary
 FIRST32SIZE=	6144

 
 INSTALL=	install
 
@@ -101,40 +101,40 @@
 	$(LD) -N -Ttext $* -e _start $(LDBINARYFLAG) -o $@ start32@$*.o first32dos.o printf.o string.o
 
 start32@%.o:	start32.S
-	gcc -E -DRELOC=$* $(OLDGAS) start32.S | $(AS) -o start32@$*.o
+	$(CC) -E -DRELOC=$* $(OLDGAS) start32.S | $(AS) -o start32@$*.o
 
 first32.o:	first32.c etherboot.h start32.h
-	gcc $(CFLAGS) -o first32.o -c first32.c
+	$(CC) $(CFLAGS) -o first32.o -c first32.c
 
 first32elf.o:	first32.c etherboot.h start32.h
-	gcc $(CFLAGS) -DFIRST32ELF -o first32elf.o -c first32.c
+	$(CC) $(CFLAGS) -DFIRST32ELF -o first32elf.o -c first32.c
 
 first32dos.o:	first32.c etherboot.h start32.h
-	gcc $(CFLAGS) -DRELOC=$(F32DRELOC) -DFIRST32DOS -DFIRST32ELF -o first32dos.o -c first32.c
+	$(CC) $(CFLAGS) -DRELOC=$(F32DRELOC) -DFIRST32DOS -DFIRST32ELF -o first32dos.o -c first32.c
 
 memsizes.o:		memsizes.c
-	gcc $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) -c $*.c
 
 printf.o:		printf.c
-	gcc $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) -c $*.c
 
 # DOS first stage setup program, depend on Makefile for version number
 first.dos:	first-dos.S first-dos.h version-dos.h Makefile
 ifeq ($(ASM),as86)
-	gcc $(ASMCFLAGS) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S
+	$(CC) $(ASMCFLAGS) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S
 	as86 -0 -b first.dos first-dos.s
 else
-	gcc $(ASMCFLAGS) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S
+	$(CC) $(ASMCFLAGS) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S
 	nasm -f bin first-dos.s -o first.dos
 endif
 
 # FreeDOS first stage setup program, depend on Makefile for version number
 first.fdos:	first-dos.S first-dos.h version-dos.h Makefile
 ifeq ($(ASM),as86)
-	gcc $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S
+	$(CC) $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S
 	as86 -0 -b first.fdos first-fdos.s
 else
-	gcc $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S
+	$(CC) $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S
 	nasm -f bin first-fdos.s -o first.fdos
 endif
 
@@ -158,51 +158,51 @@
 
 # LUA interpreter
 lua/bin/lua:
-	cd lua; make
+	cd lua; $(MAKE)
 
 startmenu.o:	startmenu.S startmenu.h
-	gcc -E -Ui386 -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S | $(AS) -o startmenu.o
+	$(CC) -E -Ui386 -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S | $(AS) -o startmenu.o
 
 menu.o:		menu.c stddef.h string.h printf.h ansiesc.h \
 		misc.h linux-asm-io.h etherboot.h
-	gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
+	$(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
 
 bootmenu.o:	bootmenu.h bootmenu.c stddef.h string.h md5.h misc.h etherboot.h start32.h
-	gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
+	$(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
 
 string.o:	string.h string.c
-	gcc $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) -c $*.c
 
 ansiesc.o:	ansiesc.h ansiesc.c stddef.h string.h etherboot.h
-	gcc $(CFLAGS) -DGFX -c $*.c
+	$(CC) $(CFLAGS) -DGFX -c $*.c
 
 md5.o:	md5.h md5.c etherboot.h
-	gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
+	$(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
 
 misc.o:	misc.h misc.c ansiesc.h etherboot.h start32.h
-	gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
+	$(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
 
 serial.o:	serial.c
-	gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
+	$(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
 
 menu-simple.o:	menu-simple.h menu-simple.c string.h etherboot.h
-	gcc $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) -c $*.c
 
 # Remove ramdisk utility under DOS
 rmrd.com:	rmrd.S
 ifeq ($(ASM),as86)
-	gcc $(ASMCFLAGS) -DUSE_AS86 -E -traditional -o rmrd.s rmrd.S
+	$(CC) $(ASMCFLAGS) -DUSE_AS86 -E -traditional -o rmrd.s rmrd.S
 	# -s appears to be necessary to start binary at 0x100
 	as86 -0 -b rmrd.com -s rmrd.map rmrd.s
 else
-	gcc $(ASMCFLAGS) -DUSE_NASM -E -traditional -o rmrd.s rmrd.S
+	$(CC) $(ASMCFLAGS) -DUSE_NASM -E -traditional -o rmrd.s rmrd.S
 	nasm -f bin rmrd.s -o rmrd.com
 endif
 
 # Alternate boot block, taken from netboot mknbi-dos
 # Not made by default because not everybody has as86 installed
 $(ALTBOOT):	altboot.S
-	gcc -E altboot.S > altboot.s
+	$(CC) -E altboot.S > altboot.s
 	as86 -s /dev/null -b $(ALTBOOT) altboot.s
 	$(RM) altboot.s
 
@@ -217,17 +217,17 @@
 	pod2html menuc.pl > menuc.html
 
 install:	all $(ALTBOOT)
-	-mkdir -p $(INSTLIBDIR)
-	$(INSTALL) $(PROG) $(INSTLIBDIR)/
-	$(INSTALL) -m 644 $(MODULES) $(FIRSTS) $(ALTBOOT) $(RMRD) $(INSTLIBDIR)/
+	-mkdir -p $(DESTDIR)$(INSTLIBDIR)
+	$(INSTALL) $(PROG) $(DESTDIR)$(INSTLIBDIR)/
+	$(INSTALL) -m 644 $(MODULES) $(FIRSTS) $(ALTBOOT) $(RMRD) $(DESTDIR)$(INSTLIBDIR)/
 	if [ -e lua-4.0.1/bin/lua ]; then \
 		cp -p lua-4.0.1/bin/lua lua; \
 	fi
 	if [ -e lua ]; then \
-		$(INSTALL) -m 644 lua $(INSTLIBDIR)/lua; \
+		$(INSTALL) -m 644 lua $(DESTDIR)$(INSTLIBDIR)/lua; \
 	fi
-	-mkdir -p $(BINDIR)
-	cd $(BINDIR); \
+	-mkdir -p $(DESTDIR)$(BINDIR)
+	cd $(DESTDIR)$(BINDIR); \
 	for i in linux rom fdos dos menu nfl; \
 	do \
 		ln -sf ../lib/mknbi/mknbi mknbi-$$i; \
@@ -236,19 +236,19 @@
 	do \
 		ln -sf ../lib/mknbi/mknbi mkelf-$$i; \
 	done
-	(cd $(BINDIR); ln -sf ../lib/mknbi/disnbi disnbi)
-	(cd $(BINDIR); ln -sf ../lib/mknbi/dismbr dismbr)
-	(cd $(BINDIR); ln -sf ../lib/mknbi/disdosbb disdosbb)
-	(cd $(BINDIR); ln -sf ../lib/mknbi/nbitoelf nbitoelf)
-	-mkdir -p $(MANDIR)
-	$(INSTALL) -m 644 mknbi.1 disnbi.1 $(MANDIR)/
-	cd $(MANDIR); \
+	(cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/disnbi disnbi)
+	(cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/dismbr dismbr)
+	(cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/disdosbb disdosbb)
+	(cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/nbitoelf nbitoelf)
+	-mkdir -p $(DESTDIR)$(MANDIR)
+	$(INSTALL) -m 644 mknbi.1 disnbi.1 $(DESTDIR)$(MANDIR)/
+	cd $(DESTDIR)$(MANDIR); \
 	for i in mkelf mknbi-linux mkelf-linux mknbi-rom mkelf-img mknbi-menu mkelf-menu mknbi-nfl mkelf-nfl mknbi-dos mknbi-fdos mkelf-lua; \
 	do \
 		ln -sf mknbi.1 $$i.1; \
 	done
-	-mkdir -p $(DOCDIR)
-	$(INSTALL) -m 644 COPYING README LOG spec.txt $(DOCDIR)/
+	-mkdir -p $(DESTDIR)$(DOCDIR)
+	$(INSTALL) -m 644 README LOG spec.txt $(DESTDIR)$(DOCDIR)/
 
 tarball:
 	mkdir -p luabuild




bin/disdosbb
bin/dismbr
bin/disnbi
bin/mknbi-dos
bin/mknbi-menu
bin/mknbi-nfl
bin/mkelf-linux
bin/mkelf-img
bin/mkelf-linux
bin/mkelf-lua
bin/mkelf-menu
bin/mkelf-nfl
bin/mknbi-dos
bin/mknbi-fdos
bin/mknbi-linux
bin/mknbi-menu
bin/mknbi-nfl
bin/mknbi-rom
bin/nbitoelf
lib/mknbi/mknbi
lib/mknbi/disnbi
lib/mknbi/dismbr
lib/mknbi/disdosbb
lib/mknbi/nbitoelf
lib/mknbi/Nbi.pm
lib/mknbi/Elf.pm
lib/mknbi/Nbi.pm
lib/mknbi/TruncFD.pm
lib/mknbi/altboot.bin
lib/mknbi/disdosbb
lib/mknbi/dismbr
lib/mknbi/disnbi
lib/mknbi/first.dos
lib/mknbi/first.fdos
lib/mknbi/first32@0x82800.linux
lib/mknbi/first32@0x92800.linux
lib/mknbi/first32elf@0x82800.linux
lib/mknbi/first32elf@0x92800.linux
lib/mknbi/lua
lib/mknbi/menu
lib/mknbi/mknbi
lib/mknbi/nbitoelf
lib/mknbi/nfl
lib/mknbi/altboot.bin
lib/mknbi/rmrd.com
man/man1/disnbi.1.gz
man/man1/mkelf.1.gz
man/man1/mkelf-img.1.gz
man/man1/mkelf-linux.1.gz
man/man1/mkelf-lua.1.gz
man/man1/mkelf-menu.1.gz
man/man1/mkelf-nfl.1.gz
man/man1/mknbi.1.gz
man/man1/mknbi-dos.1.gz
man/man1/mknbi-fdos.1.gz
man/man1/mknbi-linux.1.gz
man/man1/mknbi-menu.1.gz
man/man1/mknbi-nfl.1.gz
man/man1/mknbi-rom.1.gz
%%PORTDOCS%%%%DOCSDIR%%/LOG
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/spec.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/mknbi

Return to bug 185509

Lines 3-8 Link Here

(-)net/mknbi/Makefile (-11 / +4 lines)
3		3
4	PORTNAME= mknbi	4	PORTNAME= mknbi
5	PORTVERSION= 1.4.4	5	PORTVERSION= 1.4.4
		6	PORTREVISION= 1
6	CATEGORIES= net	7	CATEGORIES= net
7	MASTER_SITES= SF/etherboot/${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/etherboot/${PORTNAME}/${PORTVERSION}
8		9
Lines 11-30 Link Here
11		12
12	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm	13	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
13		14
14	MAN1= mknbi.1 disnbi.1	15	USES= gmake perl5 shebangfix
15	.for i in mkelf.1 mknbi-linux.1 mkelf-linux.1 \	16	SHEBANG_FILES= *.pl
16	mknbi-rom.1 mkelf-img.1 mknbi-menu.1 mkelf-menu.1 \	17	USE_CSTD= gnu89
17	mknbi-nfl.1 mkelf-nfl.1 mknbi-dos.1 mknbi-fdos.1 mkelf-lua.1
18	MLINKS+= mknbi.1 ${i}
19	.endfor
20		18
21	PORTDOCS= COPYING README LOG spec.txt
22
23	USES= perl5
24	USE_GMAKE= yes
25	ONLY_FOR_ARCHS= i386	19	ONLY_FOR_ARCHS= i386
26		20
27	NO_STAGE= yes
28	post-patch:	21	post-patch:
29	@${REINPLACE_CMD} -e 's,^static int terminal,int terminal,' \	22	@${REINPLACE_CMD} -e 's,^static int terminal,int terminal,' \
30	${WRKSRC}/nfl.c	23	${WRKSRC}/nfl.c

Lines 1-11 Link Here

(-)net/mknbi/files/patch-Makefile (-5 / +176 lines)
1	--- Makefile.orig Tue Aug 17 04:47:29 2004	1	--- Makefile.orig 2004-08-17 11:47:29.000000000 +0900
2	+++ Makefile Thu Mar 17 21:33:37 2005	2	+++ Makefile 2013-12-24 05:17:46.000000000 +0900
3	@@ -18,7 +18,7 @@	3	@@ -17,8 +17,8 @@
		4	# This one makes multiple versions
4	FIRSTRELOCS= 0x92800 0x82800	5	FIRSTRELOCS= 0x92800 0x82800
5	OLDGAS:= $(shell $(AS) --version \| grep -q '2\.9\.1' && echo -DGAS291)	6	OLDGAS:= $(shell $(AS) --version \| grep -q '2\.9\.1' && echo -DGAS291)
6	CFLAGS= -I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \	7	-CFLAGS= -I. -Os -ffreestanding -fstrength-reduce -fomit-frame-pointer \
7	- -mcpu=i386 \	8	- -mcpu=i386 \
8	+ -march=i386 \	9	+CFLAGS+= -I. -ffreestanding -fstrength-reduce -fomit-frame-pointer \
		10	+ \
9	-Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"	11	-Wall -W -Wno-format -Wno-unused -DVERSION=\"$(VERSION)$(EXTRAVERSION)\"
10	LDBINARYFLAG= --oformat binary	12	LDBINARYFLAG= --oformat binary
11	FIRST32SIZE= 6144	13	FIRST32SIZE= 6144
Lines 26-28 Link Here
26		28
27	INSTALL= install	29	INSTALL= install
28		30
		31	@@ -101,40 +101,40 @@
		32	$(LD) -N -Ttext $* -e _start $(LDBINARYFLAG) -o $@ start32@$*.o first32dos.o printf.o string.o
		33
		34	start32@%.o: start32.S
		35	- gcc -E -DRELOC=$* $(OLDGAS) start32.S \| $(AS) -o start32@$*.o
		36	+ $(CC) -E -DRELOC=$* $(OLDGAS) start32.S \| $(AS) -o start32@$*.o
		37
		38	first32.o: first32.c etherboot.h start32.h
		39	- gcc $(CFLAGS) -o first32.o -c first32.c
		40	+ $(CC) $(CFLAGS) -o first32.o -c first32.c
		41
		42	first32elf.o: first32.c etherboot.h start32.h
		43	- gcc $(CFLAGS) -DFIRST32ELF -o first32elf.o -c first32.c
		44	+ $(CC) $(CFLAGS) -DFIRST32ELF -o first32elf.o -c first32.c
		45
		46	first32dos.o: first32.c etherboot.h start32.h
		47	- gcc $(CFLAGS) -DRELOC=$(F32DRELOC) -DFIRST32DOS -DFIRST32ELF -o first32dos.o -c first32.c
		48	+ $(CC) $(CFLAGS) -DRELOC=$(F32DRELOC) -DFIRST32DOS -DFIRST32ELF -o first32dos.o -c first32.c
		49
		50	memsizes.o: memsizes.c
		51	- gcc $(CFLAGS) -c $*.c
		52	+ $(CC) $(CFLAGS) -c $*.c
		53
		54	printf.o: printf.c
		55	- gcc $(CFLAGS) -c $*.c
		56	+ $(CC) $(CFLAGS) -c $*.c
		57
		58	# DOS first stage setup program, depend on Makefile for version number
		59	first.dos: first-dos.S first-dos.h version-dos.h Makefile
		60	ifeq ($(ASM),as86)
		61	- gcc $(ASMCFLAGS) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S
		62	+ $(CC) $(ASMCFLAGS) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S
		63	as86 -0 -b first.dos first-dos.s
		64	else
		65	- gcc $(ASMCFLAGS) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S
		66	+ $(CC) $(ASMCFLAGS) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-dos-$(VERSION)\" -E -traditional -o first-dos.s first-dos.S
		67	nasm -f bin first-dos.s -o first.dos
		68	endif
		69
		70	# FreeDOS first stage setup program, depend on Makefile for version number
		71	first.fdos: first-dos.S first-dos.h version-dos.h Makefile
		72	ifeq ($(ASM),as86)
		73	- gcc $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S
		74	+ $(CC) $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_AS86 -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S
		75	as86 -0 -b first.fdos first-fdos.s
		76	else
		77	- gcc $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S
		78	+ $(CC) $(ASMCFLAGS) -DFREEDOS -DFDKSEG=$(FDKSEG) -DUSE_NASM -DVENDOR_MAGIC=\"mknbi-fdos-$(VERSION)\" -E -traditional -o first-fdos.s first-dos.S
		79	nasm -f bin first-fdos.s -o first.fdos
		80	endif
		81
		82	@@ -158,51 +158,51 @@
		83
		84	# LUA interpreter
		85	lua/bin/lua:
		86	- cd lua; make
		87	+ cd lua; $(MAKE)
		88
		89	startmenu.o: startmenu.S startmenu.h
		90	- gcc -E -Ui386 -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S \| $(AS) -o startmenu.o
		91	+ $(CC) -E -Ui386 -DRELOC=$(MENURELOC) $(OLDGAS) startmenu.S \| $(AS) -o startmenu.o
		92
		93	menu.o: menu.c stddef.h string.h printf.h ansiesc.h \
		94	misc.h linux-asm-io.h etherboot.h
95	- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
96	+ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
97
98	bootmenu.o: bootmenu.h bootmenu.c stddef.h string.h md5.h misc.h etherboot.h start32.h
99	- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
100	+ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
101
102	string.o: string.h string.c
103	- gcc $(CFLAGS) -c $*.c
104	+ $(CC) $(CFLAGS) -c $*.c
105
106	ansiesc.o: ansiesc.h ansiesc.c stddef.h string.h etherboot.h
107	- gcc $(CFLAGS) -DGFX -c $*.c
108	+ $(CC) $(CFLAGS) -DGFX -c $*.c
109
110	md5.o: md5.h md5.c etherboot.h
111	- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
112	+ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
113
114	misc.o: misc.h misc.c ansiesc.h etherboot.h start32.h
115	- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
116	+ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
117
118	serial.o: serial.c
119	- gcc $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
120	+ $(CC) $(CFLAGS) $(BOOTMENU_FLAGS) -c $*.c
121
122	menu-simple.o: menu-simple.h menu-simple.c string.h etherboot.h
123	- gcc $(CFLAGS) -c $*.c
124	+ $(CC) $(CFLAGS) -c $*.c
125
126	# Remove ramdisk utility under DOS
127	rmrd.com: rmrd.S
128	ifeq ($(ASM),as86)
129	- gcc $(ASMCFLAGS) -DUSE_AS86 -E -traditional -o rmrd.s rmrd.S
130	+ $(CC) $(ASMCFLAGS) -DUSE_AS86 -E -traditional -o rmrd.s rmrd.S
131	# -s appears to be necessary to start binary at 0x100
132	as86 -0 -b rmrd.com -s rmrd.map rmrd.s
133	else
134	- gcc $(ASMCFLAGS) -DUSE_NASM -E -traditional -o rmrd.s rmrd.S
135	+ $(CC) $(ASMCFLAGS) -DUSE_NASM -E -traditional -o rmrd.s rmrd.S
136	nasm -f bin rmrd.s -o rmrd.com
137	endif
138
139	# Alternate boot block, taken from netboot mknbi-dos
140	# Not made by default because not everybody has as86 installed
141	$(ALTBOOT): altboot.S
142	- gcc -E altboot.S > altboot.s
143	+ $(CC) -E altboot.S > altboot.s
144	as86 -s /dev/null -b $(ALTBOOT) altboot.s
145	$(RM) altboot.s
146
147	@@ -217,17 +217,17 @@
148	pod2html menuc.pl > menuc.html
149
150	install: all $(ALTBOOT)
151	- -mkdir -p $(INSTLIBDIR)
152	- $(INSTALL) $(PROG) $(INSTLIBDIR)/
153	- $(INSTALL) -m 644 $(MODULES) $(FIRSTS) $(ALTBOOT) $(RMRD) $(INSTLIBDIR)/
154	+ -mkdir -p $(DESTDIR)$(INSTLIBDIR)
155	+ $(INSTALL) $(PROG) $(DESTDIR)$(INSTLIBDIR)/
156	+ $(INSTALL) -m 644 $(MODULES) $(FIRSTS) $(ALTBOOT) $(RMRD) $(DESTDIR)$(INSTLIBDIR)/
157	if [ -e lua-4.0.1/bin/lua ]; then \
158	cp -p lua-4.0.1/bin/lua lua; \
159	fi
160	if [ -e lua ]; then \
161	- $(INSTALL) -m 644 lua $(INSTLIBDIR)/lua; \
162	+ $(INSTALL) -m 644 lua $(DESTDIR)$(INSTLIBDIR)/lua; \
163	fi
164	- -mkdir -p $(BINDIR)
165	- cd $(BINDIR); \
166	+ -mkdir -p $(DESTDIR)$(BINDIR)
167	+ cd $(DESTDIR)$(BINDIR); \
168	for i in linux rom fdos dos menu nfl; \
169	do \
170	ln -sf ../lib/mknbi/mknbi mknbi-$$i; \
171	@@ -236,19 +236,19 @@
172	do \
173	ln -sf ../lib/mknbi/mknbi mkelf-$$i; \
174	done
175	- (cd $(BINDIR); ln -sf ../lib/mknbi/disnbi disnbi)
176	- (cd $(BINDIR); ln -sf ../lib/mknbi/dismbr dismbr)
177	- (cd $(BINDIR); ln -sf ../lib/mknbi/disdosbb disdosbb)
178	- (cd $(BINDIR); ln -sf ../lib/mknbi/nbitoelf nbitoelf)
179	- -mkdir -p $(MANDIR)
180	- $(INSTALL) -m 644 mknbi.1 disnbi.1 $(MANDIR)/
181	- cd $(MANDIR); \
182	+ (cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/disnbi disnbi)
183	+ (cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/dismbr dismbr)
184	+ (cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/disdosbb disdosbb)
185	+ (cd $(DESTDIR)$(BINDIR); ln -sf ../lib/mknbi/nbitoelf nbitoelf)
186	+ -mkdir -p $(DESTDIR)$(MANDIR)
187	+ $(INSTALL) -m 644 mknbi.1 disnbi.1 $(DESTDIR)$(MANDIR)/
188	+ cd $(DESTDIR)$(MANDIR); \
189	for i in mkelf mknbi-linux mkelf-linux mknbi-rom mkelf-img mknbi-menu mkelf-menu mknbi-nfl mkelf-nfl mknbi-dos mknbi-fdos mkelf-lua; \
190	do \
191	ln -sf mknbi.1 $$i.1; \
192	done
193	- -mkdir -p $(DOCDIR)
194	- $(INSTALL) -m 644 COPYING README LOG spec.txt $(DOCDIR)/
195	+ -mkdir -p $(DESTDIR)$(DOCDIR)
196	+ $(INSTALL) -m 644 README LOG spec.txt $(DESTDIR)$(DOCDIR)/
197
198	tarball:
199	mkdir -p luabuild

Lines 1-35 Link Here

(-)net/mknbi/pkg-plist (-23 / +41 lines)
1	bin/mknbi-linux	1	bin/disdosbb
2	bin/mknbi-rom	2	bin/dismbr
3	bin/mknbi-fdos	3	bin/disnbi
4	bin/mknbi-dos
5	bin/mknbi-menu
6	bin/mknbi-nfl
7	bin/mkelf-linux
8	bin/mkelf-img	4	bin/mkelf-img
		5	bin/mkelf-linux
		6	bin/mkelf-lua
9	bin/mkelf-menu	7	bin/mkelf-menu
10	bin/mkelf-nfl	8	bin/mkelf-nfl
11	bin/mkelf-lua	9	bin/mknbi-dos
12	bin/disnbi	10	bin/mknbi-fdos
13	bin/dismbr	11	bin/mknbi-linux
14	bin/disdosbb	12	bin/mknbi-menu
		13	bin/mknbi-nfl
		14	bin/mknbi-rom
15	bin/nbitoelf	15	bin/nbitoelf
16	lib/mknbi/mknbi
17	lib/mknbi/disnbi
18	lib/mknbi/dismbr
19	lib/mknbi/disdosbb
20	lib/mknbi/nbitoelf
21	lib/mknbi/Nbi.pm
22	lib/mknbi/Elf.pm	16	lib/mknbi/Elf.pm
		17	lib/mknbi/Nbi.pm
23	lib/mknbi/TruncFD.pm	18	lib/mknbi/TruncFD.pm
24	lib/mknbi/first32@0x92800.linux	19	lib/mknbi/altboot.bin
25	lib/mknbi/first32elf@0x92800.linux	20	lib/mknbi/disdosbb
26	lib/mknbi/first32@0x82800.linux	21	lib/mknbi/dismbr
27	lib/mknbi/first32elf@0x82800.linux	22	lib/mknbi/disnbi
28	lib/mknbi/first.dos	23	lib/mknbi/first.dos
29	lib/mknbi/first.fdos	24	lib/mknbi/first.fdos
		25	lib/mknbi/first32@0x82800.linux
		26	lib/mknbi/first32@0x92800.linux
		27	lib/mknbi/first32elf@0x82800.linux
		28	lib/mknbi/first32elf@0x92800.linux
		29	lib/mknbi/lua
30	lib/mknbi/menu	30	lib/mknbi/menu
		31	lib/mknbi/mknbi
		32	lib/mknbi/nbitoelf
31	lib/mknbi/nfl	33	lib/mknbi/nfl
32	lib/mknbi/altboot.bin
33	lib/mknbi/rmrd.com	34	lib/mknbi/rmrd.com
34	lib/mknbi/lua	35	man/man1/disnbi.1.gz
		36	man/man1/mkelf.1.gz
		37	man/man1/mkelf-img.1.gz
		38	man/man1/mkelf-linux.1.gz
		39	man/man1/mkelf-lua.1.gz
		40	man/man1/mkelf-menu.1.gz
		41	man/man1/mkelf-nfl.1.gz
		42	man/man1/mknbi.1.gz
		43	man/man1/mknbi-dos.1.gz
		44	man/man1/mknbi-fdos.1.gz
		45	man/man1/mknbi-linux.1.gz
		46	man/man1/mknbi-menu.1.gz
		47	man/man1/mknbi-nfl.1.gz
		48	man/man1/mknbi-rom.1.gz
		49	%%PORTDOCS%%%%DOCSDIR%%/LOG
		50	%%PORTDOCS%%%%DOCSDIR%%/README
		51	%%PORTDOCS%%%%DOCSDIR%%/spec.txt
		52	%%PORTDOCS%%@dirrm %%DOCSDIR%%
35	@dirrm lib/mknbi	53	@dirrm lib/mknbi