svn commit: r327370 - head/sbin/ccdconfig

[Rodney W. Grimes]

> Author: pfg
> Date: Sat Dec 30 00:26:42 2017
> New Revision: 327370
> URL: https://svnweb.freebsd.org/changeset/base/327370
> 
> Log:
>   ccdconfig: Move VCS tags to be more consistent with our style.
>   
>   Update a now-bogus SPDX tag while here.
> 
> Modified:
>   head/sbin/ccdconfig/ccdconfig.8
>   head/sbin/ccdconfig/ccdconfig.c
>   head/sbin/ccdconfig/pathnames.h
> 
> Modified: head/sbin/ccdconfig/ccdconfig.8
> ==============================================================================
> --- head/sbin/ccdconfig/ccdconfig.8	Sat Dec 30 00:24:53 2017	(r327369)
> +++ head/sbin/ccdconfig/ccdconfig.8	Sat Dec 30 00:26:42 2017	(r327370)
> @@ -1,5 +1,3 @@
> -.\"	$NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
> -.\"
>  .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
>  .\" All rights reserved.
>  .\"
> @@ -27,6 +25,7 @@
>  .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
>  .\" SUCH DAMAGE.
>  .\"
> +.\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
  Obtained from:        NetBSD (CVS ccdconfig.c 1.47, ccdconfig.8 1.24)

So now this confuses me, you just claimed to have pulled in ccdconfig 1.24
changes yet our NetBSD tag is still 1.4??? 


>  .\" $FreeBSD$
>  .\"
>  .Dd October 3, 2016
> 
> Modified: head/sbin/ccdconfig/ccdconfig.c
> ==============================================================================
> --- head/sbin/ccdconfig/ccdconfig.c	Sat Dec 30 00:24:53 2017	(r327369)
> +++ head/sbin/ccdconfig/ccdconfig.c	Sat Dec 30 00:26:42 2017	(r327370)
> @@ -1,7 +1,5 @@
> -/*	$NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $	*/
> -
>  /*-
> - * SPDX-License-Identifier: BSD-4-Clause
> + * SPDX-License-Identifier: BSD-2-Clause
>   *
>   * Copyright (c) 2003 Poul-Henning Kamp
>   * Copyright (c) 1996 The NetBSD Foundation, Inc.
> @@ -30,6 +28,8 @@
>   * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
> + *
> + * NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $
  Obtained from:        NetBSD (CVS ccdconfig.c 1.47, ccdconfig.8 1.24)

Ditto on 1.6 vs 1.47

>   */
>  
>  #include <sys/cdefs.h>
> 
> Modified: head/sbin/ccdconfig/pathnames.h
> ==============================================================================
> --- head/sbin/ccdconfig/pathnames.h	Sat Dec 30 00:24:53 2017	(r327369)
> +++ head/sbin/ccdconfig/pathnames.h	Sat Dec 30 00:26:42 2017	(r327370)
> @@ -1,5 +1,3 @@
> -/*	$NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $	*/
> -
>  /*-
>   * SPDX-License-Identifier: BSD-2-Clause-NetBSD
>   *
> @@ -30,6 +28,7 @@
>   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
>   * POSSIBILITY OF SUCH DAMAGE.
>   *
> + * $NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $
>   * $FreeBSD$
>   */
>  
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org