5 files changed, 80 insertions, 106 deletions

diff --git a/net/netboot/Makefile b/net/netboot/Makefile
index dab3f52a6b38..502db84eb77d 100644
--- a/net/netboot/Makefile
+++ b/net/netboot/Makefile
@@ -5,20 +5,27 @@
 # $FreeBSD$
 
 PORTNAME=	netboot
-PORTVERSION=	0.9.8
-PORTREVISION=	2
+PORTVERSION=	0.10.2
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	dyeske@gmail.com
 COMMENT=	Netboot with Packet or NDIS-2 drivers
 
+LIB_DEPENDS=	lzo2.2:${PORTSDIR}/archivers/lzo2
+
+USE_BDB=	42+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_BISON=	build
+CONFIGURE_ARGS+=	--enable-static=no --enable-bootrom=yes
+
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LIBS="${LIBS} -L${LOCALBASE}/lib"
 
 MAN5=		netboot.5 netboot.config.5 netboot.drivers.5 netboot.db.5
-MAN8=		mknbi-mgl.8 makerom.8 mknbi-dos.8 mknbi-linux.8
+MAN8=		mknbi-mgl.8 makerom.8 mknbi-dos.8 mknbi-linux.8 nbdbtool.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/netboot.config ]; then \
diff --git a/net/netboot/distinfo b/net/netboot/distinfo
index ddb215e30d0a..2216549eb454 100644
--- a/net/netboot/distinfo
+++ b/net/netboot/distinfo
@@ -1,3 +1,3 @@
-MD5 (netboot-0.9.8.tar.gz) = 2c4c83c3d7743b73247e2acdda79919d
-SHA256 (netboot-0.9.8.tar.gz) = d5e3be89d4e6eef457148e7a9a3061fe04459f719749f4b2bba45ccb496877ba
-SIZE (netboot-0.9.8.tar.gz) = 966389
+MD5 (netboot-0.10.2.tar.gz) = 9ed71342ec1dfa8d09441dc238d92ded
+SHA256 (netboot-0.10.2.tar.gz) = e07148b0c396fa8c2c542399b79a6adaafa84684b97c0991fd1dacc7f74a8027
+SIZE (netboot-0.10.2.tar.gz) = 1457791
diff --git a/net/netboot/files/patch-misc::Makefile b/net/netboot/files/patch-misc::Makefile
index c1712d4bc983..59617086752b 100644
--- a/net/netboot/files/patch-misc::Makefile
+++ b/net/netboot/files/patch-misc::Makefile
@@ -1,11 +1,11 @@
---- misc/Makefile.orig	Wed Jan 19 15:24:01 2005
-+++ misc/Makefile	Wed Jan 19 15:24:27 2005
-@@ -77,7 +77,7 @@
- 	$(INSTALL) -d $(sysconfdir)
- 	$(INSTALL) -d $(nblibdir)
- 	$(INSTALL) -d $(mandir)/man$(MANEXT)
--	$(INSTALL) -m 644 -o bin -g bin $(nbconfig) $(sysconfdir)/$(nbconfig)
-+	$(INSTALL) -m 644 -o bin -g bin $(nbconfig) $(sysconfdir)/$(nbconfig)-dist
- 	$(INSTALL) -m 644 -o bin -g bin $(drivers) $(nblibdir)/$(drivers)
- 	$(INSTALL) -m 644 -o bin -g bin netboot.man $(mandir)/man$(MANEXT)/netboot.$(MANEXT)
- 	$(INSTALL) -m 644 -o bin -g bin $(nbconfig).man $(mandir)/man$(MANEXT)/$(nbconfig).$(MANEXT)
+--- misc/Makefile.orig	2007-02-01 09:42:10.000000000 -0900
++++ misc/Makefile	2008-02-26 20:54:25.000000000 -0900
+@@ -131,7 +131,7 @@
+ 
+ install-config:		$(nbconfig)
+ 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)
+-	$(INSTALL_DATA) $(nbconfig) $(DESTDIR)$(sysconfdir)/$(nbconfig)
++	$(INSTALL_DATA) $(nbconfig) $(DESTDIR)$(sysconfdir)/$(nbconfig)-dist
+ 
+ 
+ install-drivers:	$(drivers)
diff --git a/net/netboot/files/patch-misc::instdrv b/net/netboot/files/patch-misc::instdrv
deleted file mode 100644
index 8e0d92a2c040..000000000000
--- a/net/netboot/files/patch-misc::instdrv
+++ /dev/null
@@ -1,41 +0,0 @@
---- misc/instdrv.orig	Sun Dec 15 05:50:10 2002
-+++ misc/instdrv	Mon Mar 17 01:12:06 2003
-@@ -48,13 +48,8 @@
- # Get name of driver subdirectory, name of driver file and check for MD5
- # checksum file
- #
--MD5FILE="`echo "$DRVFILE" | sed 's,\.[^/]\+$,\.md5,'`"
--SUBDIR="`echo "$ABSDRVFILE" | sed 's,^.*netdrvr/\([^/]\+\)/.*$,\1,'`"
-+SUBDIR="`echo "$ABSDRVFILE" | sed 's,^.*netdrvr/\([^/].*\)/.*$,\1,'`"
- DRVNAME="`echo "$ABSDRVFILE" | sed 's,^.*/\([^/]\+\.[^/]\+\)$,\1,'`"
--if [ ! -r "$MD5FILE" ]; then
--	echo "$0: unable to read MD5 file $MD5FILE"
--	exit 1
--fi
- 
- 
- #
-@@ -68,12 +63,6 @@
- 	echo $INSTPROG -d $INSTDIR/netdrvr
- 	$INSTPROG -d $INSTDIR/netdrvr
- fi
--SUMFILE="$INSTDIR/netdrvr/MD5SUMS"
--if [ ! -f $SUMFILE ]; then
--	echo "# MD5 checksum file" > $SUMFILE
--fi
--TMPFILE="${TEMP-/tmp}/MD5SUMS.$$"
--trap "rm -f $TMPFILE" 0
- 
- 
- #
-@@ -91,10 +80,5 @@
- # Install MD5 checksum into checksum database. This involves to first
- # remove the old entry from the file, and then to append the new entry
- #
--echo "Installing MD5 checksum into $SUMFILE"
--MD5="`cat $MD5FILE | sed 's,^\(.\+[ 	]\+[ *]\)[^ *].*$,\1,'`"
--sed "/^.*$DRVNAME\$/d;\$a\\
--$MD5$SUBDIR/$DRVNAME" $SUMFILE >$TMPFILE
--$INSTPROG -m 644 $TMPFILE $SUMFILE
- exit 0
- 
diff --git a/net/netboot/pkg-plist b/net/netboot/pkg-plist
index 628d569f101a..3ca7c25acb45 100644
--- a/net/netboot/pkg-plist
+++ b/net/netboot/pkg-plist
@@ -2,53 +2,61 @@ bin/makerom
 bin/mknbi-dos
 bin/mknbi-linux
 bin/mknbi-mgl
+bin/nbdbtool
 @unexec if cmp -s %D/etc/netboot.config %D/etc/netboot.config-dist; then rm -f %D/etc/netboot.config; fi
 etc/netboot.config-dist
 @exec [ -f %B/netboot.config ] || cp %B/%f %B/netboot.config
-lib/netboot/netboot.drivers
-lib/netboot/binaries/floppy.bin
-lib/netboot/binaries/floppy86.bin
-lib/netboot/binaries/kernel.bin
-lib/netboot/binaries/kernel86.bin
-lib/netboot/binaries/kernelm.bin
-lib/netboot/binaries/netndis.bin
-lib/netboot/binaries/netndis86.bin
-lib/netboot/binaries/netpkt.bin
-lib/netboot/binaries/netpkt86.bin
-lib/netboot/binaries/netundi.bin
-lib/netboot/binaries/netundi86.bin
-lib/netboot/binaries/rom.bin
-lib/netboot/binaries/rom86.bin
-lib/netboot/netdrvr/pktdrvr/drivers/3c501.com
-lib/netboot/netdrvr/pktdrvr/drivers/3c503.com
-lib/netboot/netdrvr/pktdrvr/drivers/3c505.com
-lib/netboot/netdrvr/pktdrvr/drivers/3c507.com
-lib/netboot/netdrvr/pktdrvr/drivers/3c509.com
-lib/netboot/netdrvr/pktdrvr/drivers/3c523.com
-lib/netboot/netdrvr/pktdrvr/drivers/dc21x4.com
-lib/netboot/netdrvr/pktdrvr/drivers/de600.com
-lib/netboot/netdrvr/pktdrvr/drivers/depca.com
-lib/netboot/netdrvr/pktdrvr/drivers/ee10pkt.com
-lib/netboot/netdrvr/pktdrvr/drivers/e10ppkt.com
-lib/netboot/netdrvr/pktdrvr/drivers/e100bpkt.com
-lib/netboot/netdrvr/pktdrvr/drivers/epropkt.com
-lib/netboot/netdrvr/pktdrvr/drivers/exos205.com
-lib/netboot/netdrvr/pktdrvr/drivers/exp16.com
-lib/netboot/netdrvr/pktdrvr/drivers/hppclan.com
-lib/netboot/netdrvr/pktdrvr/drivers/hppclanp.com
-lib/netboot/netdrvr/pktdrvr/drivers/lan595.com
-lib/netboot/netdrvr/pktdrvr/drivers/ne1000.com
-lib/netboot/netdrvr/pktdrvr/drivers/ne2.com
-lib/netboot/netdrvr/pktdrvr/drivers/ne2000.com
-lib/netboot/netdrvr/pktdrvr/drivers/ne2100.com
-lib/netboot/netdrvr/pktdrvr/drivers/smc_wd.com
-lib/netboot/utils/pktwatch.com
-lib/netboot/utils/romcheck.bin
-@dirrm lib/netboot/binaries
-@dirrm lib/netboot/netdrvr/ndis2
-@dirrm lib/netboot/netdrvr/pktdrvr/drivers
-@dirrm lib/netboot/netdrvr/pktdrvr
-@dirrm lib/netboot/netdrvr/undi
-@dirrm lib/netboot/netdrvr
-@dirrm lib/netboot/utils
+include/nblib.h
+lib/libnb.la
+lib/libnb.so
+lib/libnb.so.1
+lib/netboot/instdrv
+lib/netboot/mntnbi.pl
+lib/netboot/nbmd5
+%%DATADIR%%/binaries/floppy.bin
+%%DATADIR%%/binaries/kernel.bin
+%%DATADIR%%/binaries/netndis.bin
+%%DATADIR%%/binaries/netpkt.bin
+%%DATADIR%%/binaries/netundi.bin
+%%DATADIR%%/binaries/rom.bin
+%%DATADIR%%/makerom.help
+%%DATADIR%%/misc/menu.mgl
+%%DATADIR%%/misc/mgl.vim
+%%DATADIR%%/misc/nbramdrv.sys
+%%DATADIR%%/misc/odbc.sql
+%%DATADIR%%/misc/pktwatch.com
+%%DATADIR%%/misc/rmrd.com
+%%DATADIR%%/misc/romcheck.bin
+%%DATADIR%%/netboot.drivers
+%%DATADIR%%/netdrvr/MD5SUMS
+%%DATADIR%%/netdrvr/pktdrvr/3c501.com
+%%DATADIR%%/netdrvr/pktdrvr/3c503.com
+%%DATADIR%%/netdrvr/pktdrvr/3c505.com
+%%DATADIR%%/netdrvr/pktdrvr/3c507.com
+%%DATADIR%%/netdrvr/pktdrvr/3c509.com
+%%DATADIR%%/netdrvr/pktdrvr/3c523.com
+%%DATADIR%%/netdrvr/pktdrvr/dc21x4.com
+%%DATADIR%%/netdrvr/pktdrvr/de600.com
+%%DATADIR%%/netdrvr/pktdrvr/depca.com
+%%DATADIR%%/netdrvr/pktdrvr/e100bpkt.com
+%%DATADIR%%/netdrvr/pktdrvr/e10ppkt.com
+%%DATADIR%%/netdrvr/pktdrvr/ee10pkt.com
+%%DATADIR%%/netdrvr/pktdrvr/epropkt.com
+%%DATADIR%%/netdrvr/pktdrvr/exos205.com
+%%DATADIR%%/netdrvr/pktdrvr/exp16.com
+%%DATADIR%%/netdrvr/pktdrvr/hppclan.com
+%%DATADIR%%/netdrvr/pktdrvr/hppclanp.com
+%%DATADIR%%/netdrvr/pktdrvr/lan595.com
+%%DATADIR%%/netdrvr/pktdrvr/ne1000.com
+%%DATADIR%%/netdrvr/pktdrvr/ne2.com
+%%DATADIR%%/netdrvr/pktdrvr/ne2000.com
+%%DATADIR%%/netdrvr/pktdrvr/ne2100.com
+%%DATADIR%%/netdrvr/pktdrvr/smc_wd.com
+@dirrm %%DATADIR%%/netdrvr/undi
+@dirrm %%DATADIR%%/netdrvr/pktdrvr
+@dirrm %%DATADIR%%/netdrvr/ndis2
+@dirrm %%DATADIR%%/netdrvr
+@dirrm %%DATADIR%%/misc
+@dirrm %%DATADIR%%/binaries
+@dirrm %%DATADIR%%
 @dirrm lib/netboot