add Berkeley specific header

SCCS-vsn: usr.sbin/lpr/filters/Makefile 5.4
SCCS-vsn: old/vfilters/Makefile 6.3
SCCS-vsn: old/vfilters/vplotf/chrtab.c 5.2
SCCS-vsn: old/vfilters/necf/necf.c 5.2
SCCS-vsn: old/vfilters/railmag/railmag.c 5.2
SCCS-vsn: old/vfilters/rvcat/rvcat.c 5.3
SCCS-vsn: old/vfilters/rvsort/rvsort.c 5.2
SCCS-vsn: old/vfilters/sidebyside/sidebyside.c 1.3
SCCS-vsn: old/vfilters/vcat/vcat.c 5.3
SCCS-vsn: old/vfilters/vdmp/vdmp.c 5.2
SCCS-vsn: old/vfilters/vpf/vpf.c 5.2
SCCS-vsn: old/vfilters/vplotf/vplotf.c 5.3
SCCS-vsn: old/vfilters/vpltdmp/vpltdmp.c 5.2
SCCS-vsn: old/vfilters/vpsf/vpsf.c 5.2
SCCS-vsn: old/vfilters/vsort/vsort.c 5.1

diff --git a/usr/src/old/vfilters/Makefile b/usr/src/old/vfilters/Makefile
index 2bd383c..732439f 100644 (file)
--- a/usr/src/old/vfilters/Makefile
+++ b/usr/src/old/vfilters/Makefile
@@ -1,9 +1,15 @@
 #
 # Copyright (c) 1987 Regents of the University of California.
 #
 # Copyright (c) 1987 Regents of the University of California.

-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
+# All rights reserved.

 #
 #

-#      @(#)Makefile    6.2     (Berkeley)      %G%
+# Redistribution and use in source and binary forms are permitted
+# provided that this notice is preserved and that due credit is given
+# to the University of California at Berkeley. The name of the University
+# may not be used to endorse or promote products derived from this
+# software without specific prior written permission. This software
+# is provided ``as is'' without express or implied warranty.
+#
+#      @(#)Makefile    6.3 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a

diff --git a/usr/src/old/vfilters/necf/necf.c b/usr/src/old/vfilters/necf/necf.c
index d26cabd..5257046 100644 (file)
--- a/usr/src/old/vfilters/necf/necf.c
+++ b/usr/src/old/vfilters/necf/necf.c
@@ -1,12 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)necf.c     5.1 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)necf.c     5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <stdio.h>
 #include <sgtty.h>
 
 #include <stdio.h>
 #include <sgtty.h>

diff --git a/usr/src/old/vfilters/railmag/railmag.c b/usr/src/old/vfilters/railmag/railmag.c
index 5a30c79..80ee24c 100644 (file)
--- a/usr/src/old/vfilters/railmag/railmag.c
+++ b/usr/src/old/vfilters/railmag/railmag.c
@@ -1,12 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)railmag.c  5.1 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)railmag.c  5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * tell vcat which fonts are loaded on the "typesetter"
 
 /*
  * tell vcat which fonts are loaded on the "typesetter"

diff --git a/usr/src/old/vfilters/rvcat/rvcat.c b/usr/src/old/vfilters/rvcat/rvcat.c
index 2e7c97b..b11a0b2 100644 (file)
--- a/usr/src/old/vfilters/rvcat/rvcat.c
+++ b/usr/src/old/vfilters/rvcat/rvcat.c
@@ -1,12 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)rvcat.c    5.2 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)rvcat.c    5.3 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * Cat Simulator for Versatec and Varian
 
 /*
  * Cat Simulator for Versatec and Varian

diff --git a/usr/src/old/vfilters/rvsort/rvsort.c b/usr/src/old/vfilters/rvsort/rvsort.c
index c3359db..2a7d2ba 100644 (file)
--- a/usr/src/old/vfilters/rvsort/rvsort.c
+++ b/usr/src/old/vfilters/rvsort/rvsort.c
@@ -1,12 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)rvsort.c   5.1 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)rvsort.c   5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * Sort troff output for versatec to reduce amount of reverse leading
 
 /*
  * Sort troff output for versatec to reduce amount of reverse leading

diff --git a/usr/src/old/vfilters/sidebyside/sidebyside.c b/usr/src/old/vfilters/sidebyside/sidebyside.c
index 88673c5..4e3ab12 100644 (file)
--- a/usr/src/old/vfilters/sidebyside/sidebyside.c
+++ b/usr/src/old/vfilters/sidebyside/sidebyside.c
@@ -1,18 +1,24 @@
 /*
  * Copyright (c) 1987 Regents of the University of California.
 /*
  * Copyright (c) 1987 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1987 Regents of the University of California.\n\
  All rights reserved.\n";
  */
 
 #ifndef lint
 char copyright[] =
 "@(#) Copyright (c) 1987 Regents of the University of California.\n\
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)sidebyside.c       1.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)sidebyside.c       1.3 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <stdio.h>
 /*
 
 #include <stdio.h>
 /*

diff --git a/usr/src/old/vfilters/vcat/vcat.c b/usr/src/old/vfilters/vcat/vcat.c
index de79a05..365b75f 100644 (file)
--- a/usr/src/old/vfilters/vcat/vcat.c
+++ b/usr/src/old/vfilters/vcat/vcat.c
@@ -1,12 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)vcat.c     5.2 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)vcat.c     5.3 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * Cat Simulator for Versatec and Varian
 
 /*
  * Cat Simulator for Versatec and Varian

diff --git a/usr/src/old/vfilters/vdmp/vdmp.c b/usr/src/old/vfilters/vdmp/vdmp.c
index c472d28..dfae3cb 100644 (file)
--- a/usr/src/old/vfilters/vdmp/vdmp.c
+++ b/usr/src/old/vfilters/vdmp/vdmp.c
@@ -1,11 +1,23 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)vdmp.c     5.1 (Berkeley) %G%";
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)vdmp.c     5.2 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*

diff --git a/usr/src/old/vfilters/vpf/vpf.c b/usr/src/old/vfilters/vpf/vpf.c
index 4d13bbe..657afa8 100644 (file)
--- a/usr/src/old/vfilters/vpf/vpf.c
+++ b/usr/src/old/vfilters/vpf/vpf.c
@@ -1,12 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)vpf.c      5.1 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)vpf.c      5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * Varian/Versatec printer filter
 
 /*
  * Varian/Versatec printer filter

diff --git a/usr/src/old/vfilters/vplotf/chrtab.c b/usr/src/old/vfilters/vplotf/chrtab.c
index 7ce629f..05b2513 100644 (file)
--- a/usr/src/old/vfilters/vplotf/chrtab.c
+++ b/usr/src/old/vfilters/vplotf/chrtab.c
@@ -1,12 +1,18 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)chrtab.c   5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)chrtab.c   5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 char   chrtab[][16] = {
 0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000, /*, sp, */
 
 char   chrtab[][16] = {
 0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000,0000, /*, sp, */

diff --git a/usr/src/old/vfilters/vplotf/vplotf.c b/usr/src/old/vfilters/vplotf/vplotf.c
index 06df228..eb4d502 100644 (file)
--- a/usr/src/old/vfilters/vplotf/vplotf.c
+++ b/usr/src/old/vfilters/vplotf/vplotf.c
@@ -1,12 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)vplotf.c   5.2 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)vplotf.c   5.3 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  *  Lpd filter to read standard graphics input and produce a plot on the
 
 /*
  *  Lpd filter to read standard graphics input and produce a plot on the

diff --git a/usr/src/old/vfilters/vpltdmp/vpltdmp.c b/usr/src/old/vfilters/vpltdmp/vpltdmp.c
index f7ff82e..0689a47 100644 (file)
--- a/usr/src/old/vfilters/vpltdmp/vpltdmp.c
+++ b/usr/src/old/vfilters/vpltdmp/vpltdmp.c
@@ -1,17 +1,26 @@
 /*
 /*

- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1981 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)vpltdmp.c  5.1 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1981 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)vpltdmp.c  5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
 
 /*

- * Copyright (C) 1981, Regents of the University of California
- *     All rights reserved
- *

  *  reads raster file created by vplot and dumps it onto the
  *  Varian or Versatec plotter.
  *  Input comes from file descriptor 0, output is to file descriptor 1.
  *  reads raster file created by vplot and dumps it onto the
  *  Varian or Versatec plotter.
  *  Input comes from file descriptor 0, output is to file descriptor 1.


@@ -22,7 +31,7 @@ static char sccsid[] = "@(#)vpltdmp.c 5.1 (Berkeley) %G%";
 #define IN     0
 #define OUT    1
 
 #define IN     0
 #define OUT    1
 

-static char *Sid = "@(#)vpltdmp.c      5.1\t%G%";
+static char *Sid = "@(#)vpltdmp.c      5.2\t%G%";

 
 int    plotmd[] = { VPLOT };
 int    prtmd[]  = { VPRINT };
 
 int    plotmd[] = { VPLOT };
 int    prtmd[]  = { VPRINT };

diff --git a/usr/src/old/vfilters/vpsf/vpsf.c b/usr/src/old/vfilters/vpsf/vpsf.c
index f37b693..fd65594 100644 (file)
--- a/usr/src/old/vfilters/vpsf/vpsf.c
+++ b/usr/src/old/vfilters/vpsf/vpsf.c
@@ -1,12 +1,24 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)vpsf.c     5.1 (Berkeley) %G%";
-#endif not lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)vpsf.c     5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * Versatec printer filter
 
 /*
  * Versatec printer filter

diff --git a/usr/src/old/vfilters/vsort/vsort.c b/usr/src/old/vfilters/vsort/vsort.c
index 038e8f3..b94a1ac 100644 (file)
--- a/usr/src/old/vfilters/vsort/vsort.c
+++ b/usr/src/old/vfilters/vsort/vsort.c
@@ -1,11 +1,23 @@
 /*
  * Copyright (c) 1983 Regents of the University of California.
 /*
  * Copyright (c) 1983 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of California at Berkeley. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)vsort.c    1.2 (Berkeley) %G%";
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)vsort.c    5.1 (Berkeley) %G%";

 #endif /* not lint */
 
 # include <stdio.h>
 #endif /* not lint */
 
 # include <stdio.h>

diff --git a/usr/src/usr.sbin/lpr/filters/Makefile b/usr/src/usr.sbin/lpr/filters/Makefile
index 9b79e92..d269bcb 100644 (file)
--- a/usr/src/usr.sbin/lpr/filters/Makefile
+++ b/usr/src/usr.sbin/lpr/filters/Makefile
@@ -1,9 +1,15 @@
 #
 # Copyright (c) 1987 Regents of the University of California.
 #
 # Copyright (c) 1987 Regents of the University of California.

-# All rights reserved.  The Berkeley software License Agreement
-# specifies the terms and conditions for redistribution.
+# All rights reserved.

 #
 #

-#      @(#)Makefile    5.3     (Berkeley)      %G%
+# Redistribution and use in source and binary forms are permitted
+# provided that this notice is preserved and that due credit is given
+# to the University of California at Berkeley. The name of the University
+# may not be used to endorse or promote products derived from this
+# software without specific prior written permission. This software
+# is provided ``as is'' without express or implied warranty.
+#
+#      @(#)Makefile    5.4 (Berkeley) %G%

 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a
 #
 CFLAGS=        -O
 LIBC=  /lib/libc.a