5 files changed, 14 insertions, 33 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index b1781c5358ac..3f4598b9a880 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tar
-PORTVERSION=	1.26
+PORTVERSION=	1.27
 CATEGORIES=	archivers sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,8 +13,7 @@ COMMENT=	GNU version of the traditional tape archiver
 
 INFO=		tar
 
-USES=		iconv
-USE_AUTOTOOLS=	autoconf:env	# autom4te
+USES=		iconv:${STATIC_ARGS}
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g \
@@ -29,12 +28,20 @@ CONFIGURE_ENV+=	gl_cv_func_mknod_works=yes
 OPTIONS_DEFINE=	NLS STATIC
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext
+NLS_USES=	gettext:${STATIC_ARGS}
 NLS_CONFIGURE_ENABLE=	nls
 
 STATIC_LDFLAGS=	-static
 STATIC_CONFIGURE_ENV=	SHLIBEXT=""
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSTATIC}
+STATIC_ARGS=	build
+.else
+STATIC_ARGS=	lib
+.endif
+
 regression-test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
 
diff --git a/archivers/gtar/distinfo b/archivers/gtar/distinfo
index b96b82d2a9da..c3a1a988d723 100644
--- a/archivers/gtar/distinfo
+++ b/archivers/gtar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tar-1.26.tar.xz) = 8e7959b8edfa1eeed75819d887a2da2412a4467ef7312f7242cfc6907854b332
-SIZE (tar-1.26.tar.xz) = 1783904
+SHA256 (tar-1.27.tar.xz) = 1b2a6b4b9de6b48e9e994276197e1f18e512a9acf6f598905f0e481ca3f8245b
+SIZE (tar-1.27.tar.xz) = 1867024
diff --git a/archivers/gtar/files/patch-gnu_Makefile.in b/archivers/gtar/files/patch-gnu_Makefile.in
deleted file mode 100644
index cc254d496081..000000000000
--- a/archivers/gtar/files/patch-gnu_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$FreeBSD$
-
-Don't install lib/charset.alias.
-
---- gnu/Makefile.in.orig	2010-11-07 14:53:46.000000000 +0100
-+++ gnu/Makefile.in	2010-11-27 21:07:28.000000000 +0100
-@@ -1957,7 +1957,7 @@ langinfo.h: langinfo.in.h $(CXXDEFS_H) $
- # avoid installing it.
- 
- all-local: charset.alias ref-add.sed ref-del.sed
--install-exec-local: install-exec-localcharset
-+install-exec-local:
- install-exec-localcharset: all-local
- 	if test $(GLIBC21) = no; then \
- 	  case '$(host_os)' in \
diff --git a/archivers/gtar/files/patch-tests_sparse04.at b/archivers/gtar/files/patch-tests_sparse04.at
deleted file mode 100644
index b7a329d817a1..000000000000
--- a/archivers/gtar/files/patch-tests_sparse04.at
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
---- tests/sparse04.at.orig	2011-02-16 23:12:16.000000000 +0100
-+++ tests/sparse04.at	2011-03-15 22:27:50.000000000 +0100
-@@ -34,7 +34,7 @@ m4_define([NAME_111],
- 
- AT_TAR_CHECK([
- genfile --sparse --file NAME_111 --block-size 512 8M A || AT_SKIP_TEST
--tar -c --sparse --posix NAME_111 | tar t
-+tar -f - -c --sparse --posix NAME_111 | tar tf -
- ],
- [0],
- [NAME_111
diff --git a/archivers/gtar/pkg-plist b/archivers/gtar/pkg-plist
index c304d32fe233..4dd5dc70bb99 100644
--- a/archivers/gtar/pkg-plist
+++ b/archivers/gtar/pkg-plist
@@ -7,6 +7,7 @@ libexec/grmt
 %%NLS%%share/locale/da/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/de/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/el/LC_MESSAGES/tar.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/es/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/et/LC_MESSAGES/tar.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/tar.mo