Get rid of NET2_FTS and NET2_REGEX #ifdefs since they are useless.

Change NET2_STAT into LONG_OFF_T for portability to systems with
a 32bit off_t.

1 files changed, 5 insertions, 18 deletions

diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index e8affe51ff5..9ea2e86dcc6 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,28 +1,15 @@
-#	$OpenBSD: Makefile,v 1.9 1997/09/21 11:35:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2001/05/26 00:32:20 millert Exp $
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
 #
-# -DNET2_STAT	Use NET2 or older stat structure. The version of the
-# 		stat structure is easily determined by looking at the
-# 		basic type of an off_t (often defined in the file:
-# 		/usr/include/sys/types.h). If off_t is a long (and is
-# 		NOT A quad) then you must define NET2_STAT.
+# -DLONG_OFF_T	Define this if the base type of an off_t is a long (and is
+#		NOT a quad).  (This is often defined in the file
+#		/usr/include/sys/types.h).
 # 		This define is important, as if you do have a quad_t
-# 		off_t and define NET2_STAT, pax will compile but will
+# 		off_t and define LONG_OFF_T, pax will compile but will
 # 		NOT RUN PROPERLY.
 #
-# -DNET2_FTS	Use the older NET2 fts. To identify the version,
-# 		examine the file: /usr/include/fts.h. If FTS_COMFOLLOW
-# 		is not defined then you must define NET2_FTS.
-# 		Pax may not compile if this not (un)defined properly.
-#
-# -DNET2_REGEX	Use the older regexp.h not regex.h. The regex version
-# 		is determined by looking at the value returned by
-# 		regexec() (man 3 regexec). If regexec return a 1 for
-# 		success (and NOT a 0 for success) you have the older
-# 		regex routines and must define NET2_REGEX.
-# 		Pax may not compile if this not (un)defined properly.
 
 PROG=   pax
 SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c\