7 files changed, 55 insertions, 81 deletions

diff --git a/devel/libtar/Makefile b/devel/libtar/Makefile
index 23f8ac7eac81..baa92930d4e5 100644
--- a/devel/libtar/Makefile
+++ b/devel/libtar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=       	libtar
-PORTVERSION=		1.2
+PORTVERSION=		1.2.5
 CATEGORIES=     	devel
 MASTER_SITES=		ftp://ftp-dev.cso.uiuc.edu/pub/libtar/
 
diff --git a/devel/libtar/distinfo b/devel/libtar/distinfo
index 899c471955fb..107af9a0d22e 100644
--- a/devel/libtar/distinfo
+++ b/devel/libtar/distinfo
@@ -1 +1 @@
-MD5 (libtar-1.2.tar.gz) = ad926b68bcf279a0d5e8ae656dc6a612
+MD5 (libtar-1.2.5.tar.gz) = 54a31eb321f75c6a77bd1aec459caae6
diff --git a/devel/libtar/files/manpages b/devel/libtar/files/manpages
index 6412bd4e5b88..2c4f46dbc469 100644
--- a/devel/libtar/files/manpages
+++ b/devel/libtar/files/manpages
@@ -1,70 +1,72 @@
-MAN3=	TH_ISBLK.3 \
-TH_ISCHR.3 \
-TH_ISDIR.3 \
-TH_ISFIFO.3 \
-TH_ISLNK.3 \
-TH_ISLONGLINK.3 \
-TH_ISLONGNAME.3 \
-TH_ISREG.3 \
-TH_ISSYM.3 \
-libtar_hash_delete.3 \
-libtar_hash_insert.3 \
-libtar_hash_kill.3 \
-libtar_hash_new.3 \
-libtar_list_add.3 \
-libtar_list_del.3 \
-libtar_list_kill.3 \
-libtar_list_match.3 \
-libtar_list_new.3 \
-tar_append_eof.3 \
+MAN3=	tar_open.3 \
 tar_append_file.3 \
-tar_append_tree.3 \
 tar_block_read.3 \
-tar_close.3 \
-tar_extract_all.3 \
-tar_extract_blockdev.3 \
-tar_extract_chardev.3 \
-tar_extract_dir.3 \
-tar_extract_fifo.3 \
+th_read.3 \
+th_set_from_stat.3 \
 tar_extract_file.3 \
-tar_fd.3 \
-tar_fdopen.3 \
-tar_open.3 \
-th_finish.3 \
-th_get_crc.3 \
-th_get_devmajor.3 \
-th_get_devminor.3 \
-th_get_gid.3 \
-th_get_linkname.3 \
-th_get_mode.3 \
-th_get_mtime.3 \
 th_get_pathname.3 \
-th_print.3 \
 th_print_long_ls.3 \
-th_read.3 \
-th_set_device.3 \
-th_set_from_stat.3
-MLINKS=	tar_append_file.3 tar_append_regfile.3 \
+tar_extract_all.3 \
+libtar_hash_new.3 \
+libtar_list_new.3
+MLINKS=	tar_open.3 tar_fdopen.3 \
+tar_open.3 tar_fd.3 \
+tar_open.3 tar_close.3 \
+tar_append_file.3 tar_append_eof.3 \
+tar_append_file.3 tar_append_regfile.3 \
 tar_block_read.3 tar_block_write.3 \
 th_read.3 th_write.3 \
+th_set_from_stat.3 th_finish.3 \
+th_set_from_stat.3 th_set_device.3 \
 th_set_from_stat.3 th_set_group.3 \
 th_set_from_stat.3 th_set_link.3 \
 th_set_from_stat.3 th_set_mode.3 \
 th_set_from_stat.3 th_set_path.3 \
 th_set_from_stat.3 th_set_type.3 \
 th_set_from_stat.3 th_set_user.3 \
+tar_extract_file.3 tar_extract_blockdev.3 \
+tar_extract_file.3 tar_extract_chardev.3 \
+tar_extract_file.3 tar_extract_dir.3 \
+tar_extract_file.3 tar_extract_fifo.3 \
 tar_extract_file.3 tar_extract_hardlink.3 \
 tar_extract_file.3 tar_extract_regfile.3 \
 tar_extract_file.3 tar_extract_symlink.3 \
 tar_extract_file.3 tar_skip_regfile.3 \
 tar_extract_file.3 tar_set_file_perms.3 \
+th_get_pathname.3 TH_ISBLK.3 \
+th_get_pathname.3 TH_ISCHR.3 \
+th_get_pathname.3 TH_ISDIR.3 \
+th_get_pathname.3 TH_ISFIFO.3 \
+th_get_pathname.3 TH_ISLNK.3 \
+th_get_pathname.3 TH_ISLONGLINK.3 \
+th_get_pathname.3 TH_ISLONGNAME.3 \
+th_get_pathname.3 TH_ISREG.3 \
+th_get_pathname.3 TH_ISSYM.3 \
+th_get_pathname.3 th_get_crc.3 \
+th_get_pathname.3 th_get_devmajor.3 \
+th_get_pathname.3 th_get_devminor.3 \
+th_get_pathname.3 th_get_gid.3 \
+th_get_pathname.3 th_get_linkname.3 \
+th_get_pathname.3 th_get_mode.3 \
+th_get_pathname.3 th_get_mtime.3 \
 th_get_pathname.3 th_get_size.3 \
 th_get_pathname.3 th_get_uid.3 \
+th_print_long_ls.3 th_print.3 \
 tar_extract_all.3 tar_extract_glob.3 \
-libtar_hash_new.3 libtar_hash_read.3 \
-libtar_hash_new.3 libtar_hash_read_reset.3 \
-libtar_hash_new.3 libtar_hash_value.3 \
-libtar_list_new.3 libtar_list_read.3 \
-libtar_list_new.3 libtar_list_read_reset.3 \
-libtar_list_new.3 libtar_list_reverse_read.3 \
-libtar_list_new.3 libtar_list_reverse_read_reset.3
+tar_extract_all.3 tar_append_tree.3 \
+libtar_hash_new.3 libtar_hash_free.3 \
+libtar_hash_new.3 libtar_hash_next.3 \
+libtar_hash_new.3 libtar_hash_prev.3 \
+libtar_hash_new.3 libtar_hash_search.3 \
+libtar_hash_new.3 libtar_hash_add.3 \
+libtar_hash_new.3 libtar_hash_getkey.3 \
+libtar_hash_new.3 libtar_hash_del.3 \
+libtar_list_new.3 libtar_list_free.3 \
+libtar_list_new.3 libtar_list_next.3 \
+libtar_list_new.3 libtar_list_prev.3 \
+libtar_list_new.3 libtar_list_search.3 \
+libtar_list_new.3 libtar_list_add.3 \
+libtar_list_new.3 libtar_list_add_str.3 \
+libtar_list_new.3 libtar_list_del.3 \
+libtar_list_new.3 libtar_list_dup.3 \
+libtar_list_new.3 libtar_list_merge.3
diff --git a/devel/libtar/files/patch-lib::append.c b/devel/libtar/files/patch-lib::append.c
deleted file mode 100644
index f97a560934ec..000000000000
--- a/devel/libtar/files/patch-lib::append.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/append.c.orig	Sat Jan  6 17:47:16 2001
-+++ lib/append.c	Sat Jan  6 17:47:40 2001
-@@ -16,7 +16,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/param.h>
--#include <sys/sysmacros.h>
- 
- #include <compat.h>
- 
diff --git a/devel/libtar/files/patch-lib::encode.c b/devel/libtar/files/patch-lib::encode.c
deleted file mode 100644
index 51baeaf7b335..000000000000
--- a/devel/libtar/files/patch-lib::encode.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/encode.c.orig	Sat Jan  6 17:47:54 2001
-+++ lib/encode.c	Sat Jan  6 17:47:59 2001
-@@ -15,7 +15,6 @@
- 
- #include <pwd.h>
- #include <grp.h>
--#include <sys/sysmacros.h>
- 
- #ifdef STDC_HEADERS
- # include <string.h>
diff --git a/devel/libtar/files/patch-lib::extract.c b/devel/libtar/files/patch-lib::extract.c
deleted file mode 100644
index 7c7afb5ca6f4..000000000000
--- a/devel/libtar/files/patch-lib::extract.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/extract.c.orig	Sat Jan  6 17:48:06 2001
-+++ lib/extract.c	Sat Jan  6 17:48:12 2001
-@@ -15,7 +15,6 @@
- 
- #include <stdio.h>
- #include <sys/param.h>
--#include <sys/sysmacros.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <utime.h>
diff --git a/devel/libtar/pkg-descr b/devel/libtar/pkg-descr
index 3e005fb7e0e4..15a206edd45e 100644
--- a/devel/libtar/pkg-descr
+++ b/devel/libtar/pkg-descr
@@ -4,3 +4,5 @@ extensions.
 
 - George Reid
 greid@ukug.uk.freebsd.org
+
+WWW: http://www-dev.cso.uiuc.edu/libtar/