From owner-freebsd-ports  Thu Feb 20 23:55:21 1997
Return-Path: <owner-ports>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id XAA12209
          for ports-outgoing; Thu, 20 Feb 1997 23:55:21 -0800 (PST)
Received: from dfw-ix10.ix.netcom.com (dfw-ix10.ix.netcom.com [206.214.98.10])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id XAA12052;
          Thu, 20 Feb 1997 23:52:30 -0800 (PST)
Received: (from smap@localhost)
          by dfw-ix10.ix.netcom.com (8.8.4/8.8.4)
	  id BAA04833; Fri, 21 Feb 1997 01:51:40 -0600 (CST)
Received: from wck-ca11-17.ix.netcom.com(204.31.231.177) by dfw-ix10.ix.netcom.com via smap (V1.3)
	id sma004819; Fri Feb 21 01:51:26 1997
Received: (from asami@localhost) by silvia.HIP.Berkeley.EDU (8.8.5/8.6.9) id XAA02773; Thu, 20 Feb 1997 23:51:22 -0800 (PST)
Date: Thu, 20 Feb 1997 23:51:22 -0800 (PST)
Message-Id: <199702210751.XAA02773@silvia.HIP.Berkeley.EDU>
To: gpalmer@FreeBSD.ORG, sanpei@yy.cs.keio.ac.jp, max@FreeBSD.ORG
CC: ports@FreeBSD.ORG
Subject: __FreeBSD_version
From: asami@vader.cs.berkeley.edu (Satoshi Asami)
Sender: owner-ports@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

I did a find/grep of all "__FreeBSD_version"s in the ports tree, and
have fixed most of them.  They will be committed shortly.  (In case
you missed the commit message, 2.2-* is now "220000" and 3.0-* is now
"300000".)

However, I'm not sure what to do with the following three ports.  In
each case, it is drawing a line between 199607 (2.1.5R) and 199608
(2.2-current right after 2.1.5 is released), so the question is
whether it just meant "on the 2.1 branch" (at that time, of course it
was correct) or was it really fixed in 2.1.6R?

(1) net/ucd-snmp (maintainer gpalmer)

===
+#if __FreeBSD_version > 199607
+    struct rlisthdr swaplist;
+    struct rlist *swapptr;
+#else
+    struct rlist *swaplist;
+#endif
===

(2) net/wide-dhcp (maintainer sanpei)

===
+#if __FreeBSD_version < 199608
+  snd.ether->ether_type = ETHERTYPE_IP;
+#else
   snd.ether->ether_type = htons(ETHERTYPE_IP);
+#endif
===

(3) net/cap (maintainer max)

===
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && __FreeBSD_version <= 199607
   /* This should really be fixed in the kernel. */
   eh.ether_type = buflen;
 #else
===

Hopefully with the new numbering scheme, we will have no more
confusions of this sort! :)

Satoshi