CVS commit: pkgsrc/archivers/libarchive/files/libarchive

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Apr 15 13:37:24 UTC 2024

Modified Files:
        pkgsrc/archivers/libarchive/files/libarchive: archive_pack_dev.c

Log Message:
libarchive: fix builds where __RCSID isn't defined by the OS

The 3.7.3 release removed all __FBSDID and __RCSID strings and support
for them. Evidently there was a merge botch with archive_pack_dev.c
where __RCSID was retained there in our copy, which breaks builds on
most OSes. Addresses PR pkg/58152 from Hiroshi Hakoyama.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c
diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c:1.9 pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c:1.10
--- pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c:1.9 Thu Jan 18 18:00:17 2024
+++ pkgsrc/archivers/libarchive/files/libarchive/archive_pack_dev.c     Mon Apr 15 13:37:24 2024
@@ -1,4 +1,4 @@
-/*     $NetBSD: archive_pack_dev.c,v 1.9 2024/01/18 18:00:17 adam Exp $        */
+/*     $NetBSD: archive_pack_dev.c,v 1.10 2024/04/15 13:37:24 gutteridge Exp $ */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -33,13 +33,6 @@
 
 #include "archive_platform.h"
 
-#if HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-#if !defined(lint)
-__RCSID("$NetBSD: archive_pack_dev.c,v 1.9 2024/01/18 18:00:17 adam Exp $");
-#endif /* not lint */
-
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif