regress/crypto/Makefile: Merge with EOM 1.7

regress/ec2n/Makefile: Merge with EOM 1.8
regress/exchange/Makefile: Merge with EOM 1.8
regress/prf/Makefile: Merge with EOM 1.6
regress/x509/Makefile: Merge with EOM 1.12

author: ho
Revert to manual OS selection.

author: ho
Another way to do multiple OSes

diff --git a/sbin/isakmpd/regress/crypto/Makefile b/sbin/isakmpd/regress/crypto/Makefile
index 063d4cf..a9f04df 100644 (file)
--- a/sbin/isakmpd/regress/crypto/Makefile
+++ b/sbin/isakmpd/regress/crypto/Makefile
@@ -1,5 +1,5 @@
-#      $OpenBSD: Makefile,v 1.5 2000/02/25 17:23:35 niklas Exp $
-#      $EOM: Makefile,v 1.5 2000/02/20 19:58:43 niklas Exp $
+#      $OpenBSD: Makefile,v 1.6 2000/04/07 22:06:10 niklas Exp $
+#      $EOM: Makefile,v 1.7 2000/03/28 21:22:06 ho Exp $
 
 # Test Crypto:
 

diff --git a/sbin/isakmpd/regress/ec2n/Makefile b/sbin/isakmpd/regress/ec2n/Makefile
index a8750d9..d75d7cc 100644 (file)
--- a/sbin/isakmpd/regress/ec2n/Makefile
+++ b/sbin/isakmpd/regress/ec2n/Makefile
@@ -1,5 +1,5 @@
-#      $OpenBSD: Makefile,v 1.4 1999/02/26 03:27:31 niklas Exp $
-#      $EOM: Makefile,v 1.6 1999/02/25 15:10:08 niklas Exp $
+#      $OpenBSD: Makefile,v 1.5 2000/04/07 22:06:11 niklas Exp $
+#      $EOM: Makefile,v 1.8 2000/03/28 21:22:06 ho Exp $
 
 # Test EC2N:
 

diff --git a/sbin/isakmpd/regress/exchange/Makefile b/sbin/isakmpd/regress/exchange/Makefile
index f4fe8a7..812455b 100644 (file)
--- a/sbin/isakmpd/regress/exchange/Makefile
+++ b/sbin/isakmpd/regress/exchange/Makefile
@@ -1,5 +1,5 @@
-#      $OpenBSD: Makefile,v 1.5 1999/04/27 21:02:55 niklas Exp $
-#      $EOM: Makefile,v 1.6 1999/04/05 18:27:35 niklas Exp $
+#      $OpenBSD: Makefile,v 1.6 2000/04/07 22:06:11 niklas Exp $
+#      $EOM: Makefile,v 1.8 2000/03/28 21:22:07 ho Exp $
 
 #
 # Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.

diff --git a/sbin/isakmpd/regress/prf/Makefile b/sbin/isakmpd/regress/prf/Makefile
index 10ada67..84786d5 100644 (file)
--- a/sbin/isakmpd/regress/prf/Makefile
+++ b/sbin/isakmpd/regress/prf/Makefile
@@ -1,5 +1,5 @@
-#      $OpenBSD: Makefile,v 1.5 2000/02/25 17:23:36 niklas Exp $
-#      $EOM: Makefile,v 1.4 2000/02/20 19:58:44 niklas Exp $
+#      $OpenBSD: Makefile,v 1.6 2000/04/07 22:06:11 niklas Exp $
+#      $EOM: Makefile,v 1.6 2000/03/28 21:22:07 ho Exp $
 
 # Test PRF:
 

diff --git a/sbin/isakmpd/regress/x509/Makefile b/sbin/isakmpd/regress/x509/Makefile
index be6c21a..cf42294 100644 (file)
--- a/sbin/isakmpd/regress/x509/Makefile
+++ b/sbin/isakmpd/regress/x509/Makefile
@@ -1,5 +1,5 @@
-#      $OpenBSD: Makefile,v 1.8 2000/02/25 17:23:37 niklas Exp $
-#      $EOM: Makefile,v 1.10 2000/02/20 19:58:44 niklas Exp $
+#      $OpenBSD: Makefile,v 1.9 2000/04/07 22:06:11 niklas Exp $
+#      $EOM: Makefile,v 1.12 2000/03/28 21:22:07 ho Exp $
 
 #
 # Copyright (c) 1999 Niels Provos.  All rights reserved.