head	1.6;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.5
	OPENPKG_E1_MP:1.5
	OPENPKG_E1_MP_2_STABLE:1.5
	OPENPKG_E1_FP:1.5
	OPENPKG_2_STABLE_20061018:1.5
	OPENPKG_2_STABLE:1.5.0.4
	OPENPKG_2_STABLE_BP:1.5
	OPENPKG_2_5_SOLID:1.5.0.2
	OPENPKG_2_5_SOLID_BP:1.5
	OPENPKG_2_4_RELEASE:1.4
	OPENPKG_2_4_SOLID:1.4.0.4
	OPENPKG_2_4_SOLID_BP:1.4
	OPENPKG_CW_FP:1.4
	OPENPKG_2_3_RELEASE:1.4
	OPENPKG_2_3_SOLID:1.4.0.2
	OPENPKG_2_3_SOLID_BP:1.4
	OPENPKG_2_2_RELEASE:1.2
	OPENPKG_2_2_SOLID:1.2.0.6
	OPENPKG_2_2_SOLID_BP:1.2
	OPENPKG_2_1_RELEASE:1.2
	OPENPKG_2_1_SOLID:1.2.0.4
	OPENPKG_2_1_SOLID_BP:1.2
	OPENPKG_2_0_RELEASE:1.2
	OPENPKG_2_0_SOLID:1.2.0.2
	OPENPKG_2_0_SOLID_BP:1.2;
locks; strict;
comment	@# @;


1.6
date	2009.10.18.08.33.09;	author rse;	state Exp;
branches;
next	1.5;
commitid	8U6bGYOlWwueDZ7u;

1.5
date	2005.09.08.07.37.36;	author steve;	state dead;
branches;
next	1.4;

1.4
date	2005.02.06.12.23.06;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2004.10.19.12.34.24;	author ms;	state dead;
branches;
next	1.2;

1.2
date	2004.01.21.15.42.36;	author ms;	state Exp;
branches;
next	1.1;

1.1
date	2003.10.31.09.02.09;	author rse;	state Exp;
branches;
next	;


desc
@@


1.6
log
@fix location of ndiff.1 file
@
text
@Index: ndiff/setup.py
--- ndiff/setup.py.orig	2009-06-24 23:35:54 +0200
+++ ndiff/setup.py	2009-10-18 10:27:48 +0200
@@@@ -29,5 +29,5 @@@@
                 + "Installing your distribution's python-dev package may solve this problem.")
 
 distutils.core.setup(name = u"ndiff", scripts = [u"ndiff"],
-    data_files = [(u"share/man/man1", [u"docs/ndiff.1"])],
+    data_files = [(u"man/man1", [u"docs/ndiff.1"])],
     cmdclass = {"install_egg_info": null_command, "install": checked_install})
@


1.5
log
@upgrading package: nmap 3.81 -> 3.90
@
text
@d1 5
a5 6
Index: tcpip.cc
--- tcpip.cc.orig	2005-02-05 23:37:55.000000000 +0100
+++ tcpip.cc	2005-02-06 13:13:14.706456349 +0100
@@@@ -139,7 +139,7 @@@@
 int if2nameindex(int ifi);
 #endif
d7 4
a10 36
-static PacketCounter PC;
+static PacketCounter PCx;
 
 #ifndef WIN32 /* Already defined in wintcpip.c for now */
 void sethdrinclude(int sd) {
@@@@ -199,10 +199,10 @@@@
 #else
 	  "Raw packets sent: %llu (%s) | Rcvd: %llu (%s)",
 #endif
-	   PC.sendPackets,
-	   ll2shortascii(PC.sendBytes, sendbytesasc, sizeof(sendbytesasc)),
-	   PC.recvPackets,
-	   ll2shortascii(PC.recvBytes, recvbytesasc, sizeof(recvbytesasc)));
+	   PCx.sendPackets,
+	   ll2shortascii(PCx.sendBytes, sendbytesasc, sizeof(sendbytesasc)),
+	   PCx.recvPackets,
+	   ll2shortascii(PCx.recvBytes, recvbytesasc, sizeof(recvbytesasc)));
   return buf;
 }
 
@@@@ -217,11 +217,11 @@@@
   struct timeval tv;
 
   if (pdir == SENT) {
-    PC.sendPackets++;
-    PC.sendBytes += len;
+    PCx.sendPackets++;
+    PCx.sendBytes += len;
   } else {
-    PC.recvPackets++;
-    PC.recvBytes += len;
+    PCx.recvPackets++;
+    PCx.recvBytes += len;
   }
 
   if (!o.packetTrace()) return;
@


1.4
log
@port to Solaris by replacing the PC variable which occurs somewhere in the Solaris headers and conflicts
@
text
@@


1.3
log
@upgrading package: nmap 3.70 -> 3.75
@
text
@d1 41
a41 5
Index: configure
--- configure.orig	2003-10-31 09:57:22.000000000 +0100
+++ configure	2003-10-31 10:00:48.000000000 +0100
@@@@ -2716,7 +2716,7 @@@@
 _ACEOF
d43 1
a43 72
     ;;
-  *-solaris2.1*)
+  *-solaris2.1 | *-solaris2.1.*)
     cat >>confdefs.h <<\_ACEOF
 #define STUPID_SOLARIS_CHECKSUM_BUG 1
 _ACEOF
@@@@ -2726,7 +2726,7 @@@@
 _ACEOF
 
     ;;
-  *-solaris2.2*)
+  *-solaris2.2 | *-solaris2.2.*)
     cat >>confdefs.h <<\_ACEOF
 #define STUPID_SOLARIS_CHECKSUM_BUG 1
 _ACEOF
@@@@ -2736,7 +2736,7 @@@@
 _ACEOF
 
     ;;
-  *-solaris2.3*)
+  *-solaris2.3 | *-solaris2.3.*)
     cat >>confdefs.h <<\_ACEOF
 #define STUPID_SOLARIS_CHECKSUM_BUG 1
 _ACEOF
@@@@ -2746,7 +2746,7 @@@@
 _ACEOF
 
     ;;
-  *-solaris2.4*)
+  *-solaris2.4 | *-solaris2.4.*)
     cat >>confdefs.h <<\_ACEOF
 #define STUPID_SOLARIS_CHECKSUM_BUG 1
 _ACEOF
Index: nbase/configure
--- nbase/configure.orig	Wed Jan 21 16:15:50 2004
+++ nbase/configure	Wed Jan 21 16:15:49 2004
@@@@ -2477,7 +2477,7 @@@@
 _ACEOF
 
     ;;
-  *-solaris2.1*)
+  *-solaris2.1 | *-solaris2.1.*)
     cat >>confdefs.h <<\_ACEOF
 #define STUPID_SOLARIS_CHECKSUM_BUG 1
 _ACEOF
@@@@ -2487,7 +2487,7 @@@@
 _ACEOF
 
     ;;
-  *-solaris2.2*)
+  *-solaris2.2 | *-solaris2.2.*)
     cat >>confdefs.h <<\_ACEOF
 #define STUPID_SOLARIS_CHECKSUM_BUG 1
 _ACEOF
@@@@ -2497,7 +2497,7 @@@@
 _ACEOF
 
     ;;
-  *-solaris2.3*)
+  *-solaris2.3 | *-solaris2.3.*)
     cat >>confdefs.h <<\_ACEOF
 #define STUPID_SOLARIS_CHECKSUM_BUG 1
 _ACEOF
@@@@ -2507,7 +2507,7 @@@@
 _ACEOF
 
     ;;
-  *-solaris2.4*)
+  *-solaris2.4 | *-solaris2.4.*)
     cat >>confdefs.h <<\_ACEOF
 #define STUPID_SOLARIS_CHECKSUM_BUG 1
 _ACEOF
@


1.2
log
@we build the nbase component as well, so configure it correctly
@
text
@@


1.1
log
@port to Solaris 10
@
text
@d40 39
@