Edit version back to 2.5.2b where it should be,

sweep up some Makefile corrections that were left behind in
the last submit.

SVN-Revision: 17

diff --git a/NEWS b/NEWS
index f217db97a00c9e6eb1c45ac12c8e76f11af37052..ef54a328679d2675e6fa6980e9fe43b6bda8439b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,5 @@
 
-May 02, 2008: libarchive 2.5.5b released
-
-May 02, 2008: libarchive 2.5.4b released
-
-May 02, 2008: libarchive 2.5.3b released
-
 May 02, 2008: libarchive 2.5.2b released
-
 Mar 30, 2008: libarchive 2.5.1b released
 
 Mar 15, 2008: libarchive 2.5.0b released

diff --git a/configure.ac b/configure.ac
index 1e8047fc1770d57e9ee21d03bd4255ce63f2b20f..188ff0dd9b3f844b47c013ed63f627d2e82ec0ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ dnl First, define all of the version numbers up front.
 dnl In particular, this allows the version macro to be used in AC_INIT
 
 dnl These first two version numbers are updated automatically on each release.
-m4_define([LIBARCHIVE_VERSION_S],[2.5.5b])
-m4_define([LIBARCHIVE_VERSION_N],[2005005])
+m4_define([LIBARCHIVE_VERSION_S],[2.5.2b])
+m4_define([LIBARCHIVE_VERSION_N],[2005002])
 
 dnl bsdtar versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())

diff --git a/libarchive/Makefile b/libarchive/Makefile
index 92fe0a8fa3dfe42efb2a61cc04eec314e79e566d..b106eeb55ef01543c2eccb8e7267606444e31a48 100644 (file)
--- a/libarchive/Makefile
+++ b/libarchive/Makefile
@@ -4,19 +4,8 @@ LIB=   archive
 DPADD= ${LIBBZ2} ${LIBZ}
 LDADD= -lbz2 -lz
 
-# The libarchive version stamp.
-# Version is three numbers:
-#  Major: Bumped ONLY when API/ABI breakage happens (see SHLIB_MAJOR)
-#  Minor: Bumped when significant new features are added
-#  Revision: Bumped frequently.
-
-# The useful version number (one integer, easy to compare)
-LIBARCHIVE_VERSION_NUMBER=2005001
-# The pretty version string
-LIBARCHIVE_VERSION_STRING=2.5.1b
-
 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
-# It has no real relation to the version number above.
+# It has no real relation to the libarchive version number.
 SHLIB_MAJOR= 4
 
 CFLAGS+=       -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
@@ -27,20 +16,8 @@ WARNS?=      6
 # Headers to be installed in /usr/include
 INCS=  archive.h archive_entry.h
 
-# Build archive.h from archive.h.in by substituting version information.
-# Note: FreeBSD has inttypes.h, so enable that include in archive.h.in
-archive.h:     archive.h.in Makefile
-       cat ${.CURDIR}/archive.h.in | sed                               \
-          -e 's/@LIBARCHIVE_VERSION_NUMBER@/${LIBARCHIVE_VERSION_NUMBER}/g' \
-          -e 's/@LIBARCHIVE_VERSION_STRING@/${LIBARCHIVE_VERSION_STRING}/g' \
-               > archive.h
-
-# archive.h needs to be cleaned
-CLEANFILES+=   archive.h
-
 # Sources to be compiled.
-SRCS=  archive.h                                       \
-       archive_check_magic.c                           \
+SRCS=  archive_check_magic.c                           \
        archive_entry.c                                 \
        archive_entry_copy_stat.c                       \
        archive_entry_stat.c                            \

diff --git a/libarchive/archive.h b/libarchive/archive.h
index ae7c2fb7ae622347a4dacf73ee162aeb85906a79..293735bd796b4f6c5ccecea27ae4bf04cf90f2e2 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -108,7 +108,7 @@ __LA_DECL int               archive_version_number(void);
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define        ARCHIVE_VERSION_STRING  "libarchive 2.5.2b"
+#define        ARCHIVE_VERSION_STRING "libarchive 2.5.2b"
 __LA_DECL const char * archive_version_string(void);
 
 #if ARCHIVE_VERSION_NUMBER < 3000000

diff --git a/upload.sh b/release.sh
similarity index 100%
rename from upload.sh
rename to release.sh

diff --git a/tar/Makefile b/tar/Makefile
index fbfa1a107fcef667fb3135250dd47662d65b58a4..fd7ad1c0a1355022d6e591bb98871e91055fbb83 100644 (file)
--- a/tar/Makefile
+++ b/tar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: src/usr.bin/tar/Makefile,v 1.34 2008/03/18 06:18:49 kientzle Exp $
 
 PROG=  bsdtar
-BSDTAR_VERSION_STRING=2.5.1b
+BSDTAR_VERSION_STRING=2.5.2b
 SRCS=  bsdtar.c getdate.y matching.c read.c tree.c util.c write.c
 WARNS?=        5
 DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}

diff --git a/version b/version
index 1da2751a6ae1f84b09966ac4173e0be6de98c63e..1b4ec16f0ff731a5eb93ccf85f79a65d53efc248 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-2005005b
+2005002b