From 52a1a35f5e02901fff8f963660473498804b7eac Mon Sep 17 00:00:00 2001
From: garga <garga@FreeBSD.org>
Date: Thu, 4 Mar 2010 15:59:30 +0000
Subject: Update to 4.8

Feature safe:	yes
---
 archivers/sharutils/Makefile                     | 12 +++++-------
 archivers/sharutils/distinfo                     |  6 +++---
 archivers/sharutils/files/patch-lib__Makefile.in | 11 +++++++++++
 3 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 archivers/sharutils/files/patch-lib__Makefile.in

diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index 0c33aaa7298b..e136a3015e03 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	sharutils
-PORTVERSION=	4.7
-PORTREVISION=	1
+PORTVERSION=	4.8
 CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}/REL-${PORTVERSION}
+MASTER_SITES=	GNU
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Pack, send and unpack shell archives; synchronize via e-mail
 
+USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--program-prefix=g --disable-uucode
 INSTALL_TARGET=	install install-man
-MAN1=		gshar.1 gunshar.1 gcompress-dummy.1
+MAN1=		gshar.1 gunshar.1
 INFO=		sharutils
 
 .if defined(WITHOUT_NLS)
@@ -36,7 +35,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@SH@|${SH}|' \
 		${WRKSRC}/src/mail-files.in ${WRKSRC}/src/mailshar.in
 	@${REINPLACE_CMD} -e 's|@PERL@|${PERL}|' ${WRKSRC}/src/remsync.in
-	@${FIND} ${WRKSRC} -name \*.c  -or -name \*.h | ${XARGS} \
-		${REINPLACE_CMD} -e 's|uintmax_t|unsigned long long|;s|intmax_t|long long|'
+	@${REINPLACE_CMD} -e 's|gnu_basename|base_name|' ${WRKSRC}/lib/basename.h
 
 .include <bsd.port.mk>
diff --git a/archivers/sharutils/distinfo b/archivers/sharutils/distinfo
index fcaed367b40b..17bdc975b844 100644
--- a/archivers/sharutils/distinfo
+++ b/archivers/sharutils/distinfo
@@ -1,3 +1,3 @@
-MD5 (sharutils-4.7.tar.gz) = 75b474e74d3df66bb8835963d524991d
-SHA256 (sharutils-4.7.tar.gz) = 7be6716ff3c84be85adb3c459766c3b25b907a96e87d2765b7faef234cb77c83
-SIZE (sharutils-4.7.tar.gz) = 832525
+MD5 (sharutils-4.8.tar.bz2) = 1fc05a1ab6c3ba3b663ff8d8364aa7ce
+SHA256 (sharutils-4.8.tar.bz2) = d532fbde62ffb5d712eb1c7e317a314d8f3fa4c73a8752d53a6ea44cf95fd4a6
+SIZE (sharutils-4.8.tar.bz2) = 926526
diff --git a/archivers/sharutils/files/patch-lib__Makefile.in b/archivers/sharutils/files/patch-lib__Makefile.in
new file mode 100644
index 000000000000..5d48eed40a6b
--- /dev/null
+++ b/archivers/sharutils/files/patch-lib__Makefile.in
@@ -0,0 +1,11 @@
+--- lib/Makefile.in.orig	2010-03-04 12:31:24.000000000 -0300
++++ lib/Makefile.in	2010-03-04 12:31:35.000000000 -0300
+@@ -1592,7 +1592,7 @@
+ 	  case '$(host_os)' in \
+ 	    darwin[56]*) \
+ 	      need_charset_alias=true ;; \
+-	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++	    freebsd* | darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ 	      need_charset_alias=false ;; \
+ 	    *) \
+ 	      need_charset_alias=true ;; \
-- 
cgit