diff options
| -rw-r--r-- | net/pxe/Makefile | 9 | ||||
| -rw-r--r-- | net/pxe/distinfo | 11 | ||||
| -rw-r--r-- | net/pxe/patches/patch-aa | 17 | ||||
| -rw-r--r-- | net/pxe/patches/patch-ab | 17 |
4 files changed, 20 insertions, 34 deletions
diff --git a/net/pxe/Makefile b/net/pxe/Makefile index c559313dc67..206d4012262 100644 --- a/net/pxe/Makefile +++ b/net/pxe/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:23 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2007/12/22 12:08:58 obache Exp $ # -DISTNAME= pxe-1.4 -PKGREVISION= 1 +DISTNAME= pxe-1.4.2 CATEGORIES= net sysutils MASTER_SITES= http://www.kano.org.uk/projects/pxe/ @@ -21,4 +20,8 @@ CONF_FILES= ${EGDIR}/pxe.conf ${PKG_SYSCONFDIR}/pxe.conf RCD_SCRIPTS= pxe +BUILD_DEFS+= VARBASE + +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.pkg.mk" diff --git a/net/pxe/distinfo b/net/pxe/distinfo index ba8d0c578bd..00dc29b53bf 100644 --- a/net/pxe/distinfo +++ b/net/pxe/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 12:14:02 agc Exp $ +$NetBSD: distinfo,v 1.6 2007/12/22 12:08:58 obache Exp $ -SHA1 (pxe-1.4.tar.gz) = cd84b29e61c7f142e8e7ebe15248de47954d6a68 -RMD160 (pxe-1.4.tar.gz) = 2d06b57fe998ce0904c82d1fbc4d384125b348b5 -Size (pxe-1.4.tar.gz) = 55985 bytes -SHA1 (patch-aa) = f286f08998840e32bd1a4b78ad4a63781bbba9a7 -SHA1 (patch-ab) = 4a50f5047b4304bc41a857775895e5ca8e13b176 +SHA1 (pxe-1.4.2.tar.gz) = b2e53e97eeb01fe8d4e9978016f6a9d7872e869d +RMD160 (pxe-1.4.2.tar.gz) = 8d626d500d088140284bdad32616d8b45aae8baf +Size (pxe-1.4.2.tar.gz) = 56342 bytes +SHA1 (patch-aa) = 7d24c06f1d584d2d4c555e0ca793fb6ee1e0b7f6 diff --git a/net/pxe/patches/patch-aa b/net/pxe/patches/patch-aa index 3c0ef302d94..bda7a151d93 100644 --- a/net/pxe/patches/patch-aa +++ b/net/pxe/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 2003/09/30 09:32:06 xtraeme Exp $ +$NetBSD: patch-aa,v 1.4 2007/12/22 12:08:58 obache Exp $ ---- Makefile.in.orig 2003-09-30 11:25:24.000000000 +0200 -+++ Makefile.in 2003-09-30 11:27:19.000000000 +0200 +--- Makefile.in.orig 2003-02-02 13:32:35.000000000 +0000 ++++ Makefile.in @@ -1,10 +1,12 @@ CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ @@ -17,15 +17,16 @@ $NetBSD: patch-aa,v 1.3 2003/09/30 09:32:06 xtraeme Exp $ all: $(EXECS) pxe.o: pxe.cc -@@ -31,7 +33,8 @@ +@@ -31,7 +33,9 @@ pxe: $(OBJS) $(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); \ ++ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/sbin ++ ${BSD_INSTALL_PROGRAM} pxe ${DESTDIR}${PREFIX}/sbin ++ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(EGDIR) ++ @if test ! -e ${DESTDIR}$(EGDIR)/pxe.conf; then \ ++ ${BSD_INSTALL_DATA} pxe.conf ${DESTDIR}$(EGDIR); \ fi diff --git a/net/pxe/patches/patch-ab b/net/pxe/patches/patch-ab deleted file mode 100644 index 52f65a2d08b..00000000000 --- a/net/pxe/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$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" - }; - - /****************************************************************************** |