Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Sep 2016 09:01:28 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421316 - in head/net/pxe: . files
Message-ID:  <201609040901.u8491SvD058351@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun Sep  4 09:01:28 2016
New Revision: 421316
URL: https://svnweb.freebsd.org/changeset/ports/421316

Log:
  - Add LICENSE
  - Switch to options helpers
  - Cosmetic fixes

Modified:
  head/net/pxe/Makefile
  head/net/pxe/files/patch-pxe.cc

Modified: head/net/pxe/Makefile
==============================================================================
--- head/net/pxe/Makefile	Sun Sep  4 08:46:46 2016	(r421315)
+++ head/net/pxe/Makefile	Sun Sep  4 09:01:28 2016	(r421316)
@@ -11,27 +11,32 @@ MASTER_SITES=	http://www.kano.org.uk/pro
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PXE daemon, set up a boot menu for netbooting PXE enabled clients
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENCE
+
 USE_RC_SUBR=	pxe
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-config=${PREFIX}/etc/pxe.conf \
-			--with-log=/var/log/pxe.log \
-			--with-setuid=nobody
+CONFIGURE_ARGS=	--with-config=${PREFIX}/etc/pxe.conf \
+		--with-log=/var/log/pxe.log \
+		--with-setuid=nobody
 
-PORTDOCS=	Changes INSTALL LICENCE README THANKS
-PLIST_FILES=	sbin/pxe etc/pxe.conf.sample
+PORTDOCS=	Changes INSTALL README THANKS
+PLIST_FILES=	etc/pxe.conf.sample sbin/pxe
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/tmp/pxe.pid|/var/run/pxe.pid|' \
+	@${REINPLACE_CMD} -e 's|/tmp/pxe.pid|/var/run/pxe.pid|' \
 		${WRKSRC}/autoconf.h.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pxe ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/pxe.conf \
 		${STAGEDIR}${PREFIX}/etc/pxe.conf.sample
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor

Modified: head/net/pxe/files/patch-pxe.cc
==============================================================================
--- head/net/pxe/files/patch-pxe.cc	Sun Sep  4 08:46:46 2016	(r421315)
+++ head/net/pxe/files/patch-pxe.cc	Sun Sep  4 09:01:28 2016	(r421316)
@@ -1,6 +1,6 @@
---- pxe.cc.orig	Sun Feb  2 13:39:26 2003
-+++ pxe.cc	Sun Jun  3 21:34:25 2007
-@@ -208,6 +208,31 @@
+--- pxe.cc.orig	2003-02-02 12:39:26 UTC
++++ pxe.cc
+@@ -208,6 +208,31 @@ int StartPxeService(const char *configfi
  	return(retval);
  }
  
@@ -32,7 +32,7 @@
  
  /******************************************************************************
   * main - kick things off and do cool things                                  *
-@@ -247,6 +272,15 @@
+@@ -247,6 +272,15 @@ int main(int argc, char **argv)
  	}
  	debug.close();
  
@@ -48,7 +48,7 @@
  	// redirect the file descriptors
  	if (0 == _debug) {
  		debug.open("/dev/null", std::ios::out);
-@@ -258,34 +292,6 @@
+@@ -258,34 +292,6 @@ int main(int argc, char **argv)
  		debug.close();
  	}
  
@@ -83,7 +83,7 @@
  	// if not in debug mode, fork and go
  	if (0 == _debug) {
  		signal(SIGCHLD, SIG_IGN);
-@@ -320,6 +326,7 @@
+@@ -320,6 +326,7 @@ int main(int argc, char **argv)
  				}
  				close(chk);
  
@@ -91,7 +91,7 @@
  				StartPxeService(configfile);
  
  				exit(0);
-@@ -328,6 +335,7 @@
+@@ -328,6 +335,7 @@ int main(int argc, char **argv)
  		}
  
  	} else { // debug



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609040901.u8491SvD058351>