summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiramatsu <hiramatsu@pkgsrc.org>2015-04-07 22:08:36 +0000
committerhiramatsu <hiramatsu@pkgsrc.org>2015-04-07 22:08:36 +0000
commit132967f4b72171561b047609eb017376d8862f1e (patch)
treedc6dc2b4726a3bb86af7e5ea797429db91a62ee7
parent206fe747602410b45f853f274adbcd5d29095e3f (diff)
downloadpkgsrc-132967f4b72171561b047609eb017376d8862f1e.tar.gz
Update archivers/gsharutils to 4.15.
This update is provided from kj Woolley in PR 49770, with a patch by me for NetBSD 6. Changes from previous: Version 4.15 - February 2015, by Bruce Korb * shar will no longer choke on 64 bit windows * unshar has a compiler warning fix * Happy 2015 copyright * PO file updates Version 4.14.2 - December 2014, by Bruce Korb * translation updates * use ftello, fseeko and fflush * augment copyright marks in shar.c and shar-std.def * Happy 2014 copyright dates * fix up man pages (use newer doc generation code) Version 4.14 - October 2013, by Bruce Korb * documentation, obscure usage, FSF address
-rw-r--r--archivers/gsharutils/Makefile5
-rw-r--r--archivers/gsharutils/PLIST9
-rw-r--r--archivers/gsharutils/distinfo9
-rw-r--r--archivers/gsharutils/patches/patch-lib_fseeko.c15
4 files changed, 30 insertions, 8 deletions
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 2c97153b255..f694a72edbe 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2014/10/09 14:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2015/04/07 22:08:36 hiramatsu Exp $
-DISTNAME= sharutils-4.13.5
+DISTNAME= sharutils-4.15
PKGNAME= g${DISTNAME}
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU:=sharutils/}
@@ -19,7 +19,6 @@ INSTALL_TARGET= install install-man
INFO_FILES= yes
USE_TOOLS+= makeinfo msgfmt sh:run
-CONFIGURE_ARGS+= --disable-uucode
CONFIGURE_ENV+= SH=${TOOLS_SH}
CONFIGURE_ARGS+= --program-prefix=g
diff --git a/archivers/gsharutils/PLIST b/archivers/gsharutils/PLIST
index 47b60224170..0b3300237d4 100644
--- a/archivers/gsharutils/PLIST
+++ b/archivers/gsharutils/PLIST
@@ -1,13 +1,19 @@
-@comment $NetBSD: PLIST,v 1.11 2013/07/21 09:03:19 shattered Exp $
+@comment $NetBSD: PLIST,v 1.12 2015/04/07 22:08:36 hiramatsu Exp $
bin/gshar
bin/gunshar
+bin/guudecode
+bin/guuencode
gnu/bin/shar
gnu/bin/unshar
gnu/man/man1/shar.1
gnu/man/man1/unshar.1
info/sharutils.info
+lib/charset.alias
man/man1/gshar.1
man/man1/gunshar.1
+man/man1/guudecode.1
+man/man1/guuencode.1
+man/man5/guuencode.5
share/locale/bg/LC_MESSAGES/sharutils.mo
share/locale/ca/LC_MESSAGES/sharutils.mo
share/locale/cs/LC_MESSAGES/sharutils.mo
@@ -27,6 +33,7 @@ share/locale/it/LC_MESSAGES/sharutils.mo
share/locale/ja/LC_MESSAGES/sharutils.mo
share/locale/nl/LC_MESSAGES/sharutils.mo
share/locale/pl/LC_MESSAGES/sharutils.mo
+share/locale/pt_BR/LC_MESSAGES/sharutils.mo
share/locale/ru/LC_MESSAGES/sharutils.mo
share/locale/sr/LC_MESSAGES/sharutils.mo
share/locale/sv/LC_MESSAGES/sharutils.mo
diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo
index c87ca36a674..f24724512e6 100644
--- a/archivers/gsharutils/distinfo
+++ b/archivers/gsharutils/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.19 2014/09/13 10:53:04 shattered Exp $
+$NetBSD: distinfo,v 1.20 2015/04/07 22:08:36 hiramatsu Exp $
-SHA1 (sharutils-4.13.5.tar.gz) = 60868635dff4c36f6ccc7be89b53a591938fa3b2
-RMD160 (sharutils-4.13.5.tar.gz) = 9f59fca8d3ec5e98ba61b7a330fa90a1d02f997d
-Size (sharutils-4.13.5.tar.gz) = 2045022 bytes
+SHA1 (sharutils-4.15.tar.gz) = a073d1912e537a53cabab210ca869adfd907f6f6
+RMD160 (sharutils-4.15.tar.gz) = fd8b1ebe41b1df398eef53513e2e5b5b53e8bbac
+Size (sharutils-4.15.tar.gz) = 2196398 bytes
+SHA1 (patch-lib_fseeko.c) = 325ef24e61d2d6a363262e24fe45a81256d17843
diff --git a/archivers/gsharutils/patches/patch-lib_fseeko.c b/archivers/gsharutils/patches/patch-lib_fseeko.c
new file mode 100644
index 00000000000..d7cbd473067
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-lib_fseeko.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_fseeko.c,v 1.1 2015/04/07 22:08:36 hiramatsu Exp $
+
+Definition of FILE struct is changed on NetBSD 6.
+
+--- lib/fseeko.c.orig 2015-04-05 22:42:44.000000000 +0900
++++ lib/fseeko.c 2015-04-05 22:42:52.000000000 +0900
+@@ -125,7 +125,7 @@
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+-# if defined __CYGWIN__
++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000)
+ /* fp_->_offset is typed as an integer. */
+ fp_->_offset = pos;
+ # else