- Add LICENSE

- Switch to options helpers
- Regenerate patches

2 files changed, 26 insertions, 22 deletions

diff --git a/net/netscript/Makefile b/net/netscript/Makefile
index 77d52a162abe..41e2f261c27f 100644
--- a/net/netscript/Makefile
+++ b/net/netscript/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SF \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable/multi-platform lightweight TCP socket scripting
 
-OPTIONS_DEFINE=	DOCS EXAMPLES GTK1
+LICENSE=	PD
 
 USES=		ncurses shebangfix tar:tgz
 SHEBANG_FILES=	examples/*.ruleset examples/gui/*.ruleset \
@@ -27,6 +27,8 @@ PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/netscript
 
+OPTIONS_DEFINE=	DOCS EXAMPLES GTK1
+
 GTK1_USE=	GNOME=gtk12
 GTK1_CFLAGS=	-DGTK
 GTK1_CPPFLAGS=	$$(gtk-config --cflags gthread)
@@ -37,11 +39,13 @@ do-build:
 		-o netscript ${LDFLAGS})
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} netscript \
-		${STAGEDIR}${PREFIX}/bin)
+	${INSTALL_PROGRAM} ${WRKSRC}/netscript ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} README \
-		${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR})
diff --git a/net/netscript/files/patch-netscript.c b/net/netscript/files/patch-netscript.c
index ece50fc56a7f..a0eb779f95f2 100644
--- a/net/netscript/files/patch-netscript.c
+++ b/net/netscript/files/patch-netscript.c
@@ -1,6 +1,6 @@
---- netscript.c.orig	Tue Oct  8 10:59:06 2002
-+++ netscript.c	Wed Jan 17 15:21:24 2007
-@@ -633,7 +633,7 @@
+--- netscript.c.orig	2002-10-08 02:59:06 UTC
++++ netscript.c
+@@ -633,7 +633,7 @@ U SH isudp=0;
  U SH isudpr=0;
  U SH isvhost=0;
  U SH lnum=0;
@@ -9,7 +9,7 @@
  U SH nofrom=0;
  U SH norrecv=0;
  U SH norsend=0;
-@@ -1551,7 +1551,7 @@
+@@ -1551,7 +1551,7 @@ V wro(C *output,U I size,U SH io){
    /* make sure the socket is really there. */
    IF(SE((sock+1),0,&cfd,0,&tv)>0) 
     WR(sock,output,size);
@@ -18,7 +18,7 @@
     logdata(output,3);
   }
   IF(setroute){
-@@ -1978,7 +1978,7 @@
+@@ -1978,7 +1978,7 @@ V dumpexecline(C *line){
    wro(dump,SL(dump),0);
    wro("\n",1,0);
    /* add the output to the log, if enabled. (-l option) */
@@ -27,7 +27,7 @@
     logdata(dump,0);
    /* last use of dump for this run. */
    FR(dump);
-@@ -2113,8 +2113,10 @@
+@@ -2113,8 +2113,10 @@ V parsesocket(C *host,U I port){
    /* unless udp mode is active, then will rebind. */
    IF(bindmode!=2||isudp){
     /* main server sockaddr structure. */
@@ -40,7 +40,7 @@
     parsesocketopt(1,(isudp?sock:ssock));
     B((V *)&sns,SO(sns));
     sns.sin_family=AF_INET;
-@@ -2379,7 +2381,7 @@
+@@ -2379,7 +2381,7 @@ V parsesocket(C *host,U I port){
    }
   }
   /* states log start time, and ip that was used.  if enabled. (-l option) */
@@ -49,7 +49,7 @@
    logdata("NEW NETSCRIPT SESSION STARTED.",2);
    /* logging of the ip used. */
    logdata(
-@@ -2468,7 +2470,7 @@
+@@ -2468,7 +2470,7 @@ V parsesocket(C *host,U I port){
         pd(iread,0,columns);
        wro(iread,SL(iread),0);
        wro("\n",1,0);
@@ -58,7 +58,7 @@
         logdata(iread,0);
       }
       FC(ifd);
-@@ -2484,7 +2486,7 @@
+@@ -2484,7 +2486,7 @@ V parsesocket(C *host,U I port){
     wro(iswrite,SL(iswrite),0);
     wro("\n",1,0);
     /* add the initial data to the log, if enabled. (-i, and -l option) */
@@ -67,7 +67,7 @@
      logdata(iswrite,0);
    }
   }
-@@ -2501,7 +2503,7 @@
+@@ -2501,7 +2503,7 @@ V parsesocket(C *host,U I port){
    }
    /* handle incoming telnet dumping. (-y, and -Y options) */
    dumptelnet(sread);
@@ -76,7 +76,7 @@
     logdata(sread,3);
    /* check, and use the ns_incoming_raw() symbol.  it passes the raw dump of */
    /* the socket read buffer, the size of the buffer, and the length of the */
-@@ -2578,7 +2580,7 @@
+@@ -2578,7 +2580,7 @@ V parsesocket(C *host,U I port){
      IF(!nosrecv)
       pd(sreadl,1,columns);
      /* add the output to the log, if enabled. (-l option) */
@@ -85,7 +85,7 @@
       logdata(sreadl,1);
      /* reset the temporary variable. */
      IF(stoprules==2)
-@@ -2705,7 +2707,7 @@
+@@ -2705,7 +2707,7 @@ V parsesocket(C *host,U I port){
            pd(iwrite,0,columns);
           wro(iwrite,SL(iwrite),0);
           wro("\n",1,0);
@@ -94,7 +94,7 @@
            logdata(iwrite,0);
           FC(ifd);
          }
-@@ -3036,7 +3038,7 @@
+@@ -3036,7 +3038,7 @@ V parsesocket(C *host,U I port){
         wro(swrite,SL(swrite),0);
         wro("\n",1,0);
         /* add the input to the log, if enabled. (-l option) */
@@ -103,7 +103,7 @@
          logdata(swrite,0);
        }
       }
-@@ -3400,14 +3402,14 @@
+@@ -3400,14 +3402,14 @@ V iface(C *base){
      nsprint("logfile: can not log data to a file with privileged access.\n");
     E{
      IF(!parameter(iread,1,0x20)){
@@ -121,7 +121,7 @@
     }
    }
  #ifdef NCURSES
-@@ -3995,7 +3997,7 @@
+@@ -3995,7 +3997,7 @@ V nsexit(SH i,U SH type){
   IF(tnetraw&&truetnet){
    nsprint("\n");
    /* same goes for logging. */
@@ -130,7 +130,7 @@
     logdata("\n",3);
   }
   closesocket(0);
-@@ -4075,7 +4077,7 @@
+@@ -4075,7 +4077,7 @@ V gtkec(GW *gw,GW *ge){
     wro(et,SL(et),0);
     wro("\n",1,0);
     /* log if requested. */
@@ -139,7 +139,7 @@
      logdata(et,0);
     /* reset waiting loop. */
     isguiwait=0;
-@@ -4926,11 +4928,11 @@
+@@ -4926,11 +4928,11 @@ I main(I ac,C **av){
       IF(isprivileged)
        pe("can not log data to a file with privileged access",0);
       E