diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2003-09-30 09:32:06 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2003-09-30 09:32:06 +0000 |
| commit | fc46a11cc2e18da0d105aa79f928f5e314b3d0e0 (patch) | |
| tree | bf838f2122cd3ad7e3cb23287780ac13d6c35673 /net/pxe/patches | |
| parent | bab6a6635383140af154515a02a50af06be46be7 (diff) | |
| download | pkgsrc-fc46a11cc2e18da0d105aa79f928f5e314b3d0e0.tar.gz | |
Updated to 1.4.
Patch provided by Adrian Portelli via PR pkg/22323 with some changes by me
(GCC 3.x fixes)
Changes:
* Made the source ansi compliant and fixed namespace usage.
* Made debuging a command line switch.
* Converted code to use namespaces.
Diffstat (limited to 'net/pxe/patches')
| -rw-r--r-- | net/pxe/patches/patch-aa | 37 | ||||
| -rw-r--r-- | net/pxe/patches/patch-ab | 17 |
2 files changed, 45 insertions, 9 deletions
diff --git a/net/pxe/patches/patch-aa b/net/pxe/patches/patch-aa index 69106fed039..3c0ef302d94 100644 --- a/net/pxe/patches/patch-aa +++ b/net/pxe/patches/patch-aa @@ -1,12 +1,31 @@ -$NetBSD: patch-aa,v 1.2 2003/07/30 18:09:28 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2003/09/30 09:32:06 xtraeme Exp $ ---- Makefile.in.orig 2000-10-26 16:02:12.000000000 +0200 -+++ Makefile.in -@@ -1,5 +1,5 @@ --CC = g++ --CFLAGS = -g -ggdb -Wall -+CC = ${CXX} -+CFLAGS += -Wall - LDFLAGS = @LDFLAGS@ @LIBS@ +--- Makefile.in.orig 2003-09-30 11:25:24.000000000 +0200 ++++ Makefile.in 2003-09-30 11:27:19.000000000 +0200 +@@ -1,10 +1,12 @@ + CXX = @CXX@ +-CXXFLAGS = @CXXFLAGS@ +-LDFLAGS = @LDFLAGS@ @LIBS@ ++CXXFLAGS += @CXXFLAGS@ ++LDFLAGS += @LDFLAGS@ @LIBS@ EXECS = pxe + CP = cp + ++EGDIR = ${PREFIX}/share/examples/pxe ++ + all: $(EXECS) + + pxe.o: pxe.cc +@@ -31,7 +33,8 @@ + $(CXX) $(CXXFLAGS) -c $*.cc + + install: all +- $(CP) pxe /usr/sbin/ +- @if test ! -e /etc/pxe.conf; then \ +- $(CP) pxe.conf /etc/; \ ++ ${BSD_INSTALL_PROGRAM} pxe ${PREFIX}/sbin ++ ${BSD_INSTALL_DATA_DIR} $(EGDIR) ++ @if test ! -e $(EGDIR)/pxe.conf; then \ ++ ${BSD_INSTALL_DATA} pxe.conf $(EGDIR); \ + fi diff --git a/net/pxe/patches/patch-ab b/net/pxe/patches/patch-ab new file mode 100644 index 00000000000..52f65a2d08b --- /dev/null +++ b/net/pxe/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.1 2003/09/30 09:32:06 xtraeme Exp $ + +--- packetstore.cc.orig 2003-09-30 11:20:07.000000000 +0200 ++++ packetstore.cc 2003-09-30 11:20:44.000000000 +0200 +@@ -26,9 +26,9 @@ + /* some global variables */ + const char *DHCP_types[DHCP_MAX_TYPES] = + { +- {"INVALID"}, {"DHCPDISCOVER"}, {"DHCPOFFER"}, {"DHCPREQUEST"}, +- {"DHCPDECLINE"}, {"DHCPACK"}, {"DHCPNACK"}, {"DHCPRELEASE"}, +- {"DHCPINFORM"} ++ "INVALID", "DHCPDISCOVER", "DHCPOFFER", "DHCPREQUEST", ++ "DHCPDECLINE", "DHCPACK", "DHCPNACK", "DHCPRELEASE", ++ "DHCPINFORM" + }; + + /****************************************************************************** |