[pkgsrc/trunk]: pkgsrc/net/pxe Updated to 1.4.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/28e6970bb848
branches:  trunk
changeset: 462311:28e6970bb848
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Sep 30 09:32:06 2003 +0000

description:
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:

 net/pxe/Makefile         |  14 ++++----------
 net/pxe/distinfo         |   9 +++++----
 net/pxe/patches/patch-aa |  37 ++++++++++++++++++++++++++++---------
 net/pxe/patches/patch-ab |  17 +++++++++++++++++
 4 files changed, 54 insertions(+), 23 deletions(-)

diffs (113 lines):

diff -r afa1ae7c5f47 -r 28e6970bb848 net/pxe/Makefile
--- a/net/pxe/Makefile  Tue Sep 30 09:06:01 2003 +0000
+++ b/net/pxe/Makefile  Tue Sep 30 09:32:06 2003 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/30 18:09:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/09/30 09:32:06 xtraeme Exp $
 #
 
-DISTNAME=      pxe-1.2
-PKGREVISION=   1
+DISTNAME=      pxe-1.4
 CATEGORIES=    net sysutils
 MASTER_SITES=  http://www.kano.org.uk/projects/pxe/
 
@@ -14,17 +13,12 @@
 USE_BUILDLINK2=        YES
 USE_PKGINSTALL=        YES
 
-CONFIGURE_ARGS+=--with-log=/var/log/pxe.log
-CONFIGURE_ARGS+=--with-config="${PKG_SYSCONFDIR}/pxe.conf"
+CONFIGURE_ARGS+=       --with-log=/var/log/pxe.log
+CONFIGURE_ARGS+=       --with-config="${PKG_SYSCONFDIR}/pxe.conf"
 
 EGDIR=         ${PREFIX}/share/examples/pxe
 CONF_FILES=    ${EGDIR}/pxe.conf ${PKG_SYSCONFDIR}/pxe.conf
 
 RCD_SCRIPTS=   pxe
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/pxe ${PREFIX}/sbin
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/pxe.conf ${EGDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff -r afa1ae7c5f47 -r 28e6970bb848 net/pxe/distinfo
--- a/net/pxe/distinfo  Tue Sep 30 09:06:01 2003 +0000
+++ b/net/pxe/distinfo  Tue Sep 30 09:32:06 2003 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/07/30 18:09:26 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/09/30 09:32:06 xtraeme Exp $
 
-SHA1 (pxe-1.2.tar.gz) = d298f5892e7a1cf36af5b6c82eba28d4a724f11c
-Size (pxe-1.2.tar.gz) = 44235 bytes
-SHA1 (patch-aa) = 4c641d4e70dacf1d716b7ce120e06b4f9ce6ef13
+SHA1 (pxe-1.4.tar.gz) = cd84b29e61c7f142e8e7ebe15248de47954d6a68
+Size (pxe-1.4.tar.gz) = 55985 bytes
+SHA1 (patch-aa) = f286f08998840e32bd1a4b78ad4a63781bbba9a7
+SHA1 (patch-ab) = 4a50f5047b4304bc41a857775895e5ca8e13b176
diff -r afa1ae7c5f47 -r 28e6970bb848 net/pxe/patches/patch-aa
--- a/net/pxe/patches/patch-aa  Tue Sep 30 09:06:01 2003 +0000
+++ b/net/pxe/patches/patch-aa  Tue Sep 30 09:32:06 2003 +0000
@@ -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 -r afa1ae7c5f47 -r 28e6970bb848 net/pxe/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/pxe/patches/patch-ab  Tue Sep 30 09:32:06 2003 +0000
@@ -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"
+ };
+ 
+ /******************************************************************************