diff options
author | wiz <wiz@pkgsrc.org> | 2014-08-17 16:28:18 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-08-17 16:28:18 +0000 |
commit | 0cc81602c67e643821a07323154bbbacdad90536 (patch) | |
tree | 8f1ce30129c24cb425db3083f563c7ead982a850 | |
parent | ec2d826e1116572a595d580ba28b47b5dc02532e (diff) | |
download | pkgsrc-0cc81602c67e643821a07323154bbbacdad90536.tar.gz |
Update gtar to 1.28. Add a Makefile.common and use it.
Use official man page, now that there is one.
version 1.28, 2014-07-28
* New checkpoint action: totals
The --checkpoint-action=totals option instructs tar to output the
total number of bytes transferred at each checkpoint.
* Extended checkpoint format specification.
New conversion specifiers are implemented. Some of them take
optional arguments, supplied in curly braces between the percent
sign and the specifier letter.
%d - Number of seconds since tar started.
%{r,w,d}T - I/O totals; optional arguments supply prefixes
to be used before number of bytes read, written and
deleted, correspondingly.
%{FMT}t - Current local time using FMT as strftime(3) format.
If {FMT} is omitted, use %c.
%{N}* - Pad output with spaces to the Nth column, or to the
current screen width, if {N} is not given.
%c - A shortcut for "%{%Y-%m-%d %H:%M:%S}t: %ds, %{read,wrote}T%*\r"
* New option --one-top-level
The option --one-top-level tells tar to extract all files into a
subdirectory named by the base name of the archive (minus standard
compression suffixes recognizable by --auto-compress). When used with
an argument, as in --one-top-level=DIR, the files are extracted into the
supplied DIRectory. This ensures that no archive members are
extracted outside of the specified directory, even if the archive is
crafted so as to put them elsewhere.
* New option --sort
The --sort=ORDER option instructs tar to sort directory entries
according to ORDER. It takes effect when creating archives.
Available ORDERs are: none (the default), name and inode. The
latter may be absent, if the underlying system does not provide
the necessary information.
Using --sort=name ensures the member ordering in the created archive
is uniform and reproducible. Using --sort=inode reduces the number
of disk seeks made when creating the archive and thus can considerably
speed up archivation.
* New exclusion options
--exclude-ignore=FILE Before dumping a directory check if it
contains FILE, and if so read exclude
patterns for this directory from FILE.
--exclude-ignore-recursive=FILE
Same as above, but the exclusion patterns
read from FILE remain in effect for any
subdirectory, recursively.
--exclude-vcs-ignores Read exclude tags from VCS ignore files,
where such files exist. Supported VCS's
are: CVS, Git, Bazaar, Mercurial.
* Tar refuses to read input from and write output to a tty device.
* Manpages
This release includes official tar(1) and rmt(8) manpages.
Distribution maintainers are kindly asked to use these instead of the
home-made pages they have been providing so far.
-rw-r--r-- | archivers/gtar-base/Makefile | 32 | ||||
-rw-r--r-- | archivers/gtar-base/PLIST | 3 | ||||
-rw-r--r-- | archivers/gtar-base/distinfo | 10 | ||||
-rw-r--r-- | archivers/gtar-base/files/gtar.1 | 611 | ||||
-rw-r--r-- | archivers/gtar-base/patches/patch-src_Makefile.in | 20 | ||||
-rw-r--r-- | archivers/gtar-info/Makefile | 13 | ||||
-rw-r--r-- | archivers/gtar/Makefile | 12 | ||||
-rw-r--r-- | archivers/gtar/Makefile.common | 18 |
8 files changed, 34 insertions, 685 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index e19801cd67b..b6b0ea10348 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,25 +1,17 @@ -# $NetBSD: Makefile,v 1.84 2014/08/04 10:27:29 joerg Exp $ +# $NetBSD: Makefile,v 1.85 2014/08/17 16:28:18 wiz Exp $ # # Please run 'make files/gtar.1' when updating version of this package # to regenerate the man page. converters/help2man is needed. -DISTNAME= tar-1.27.1 +.include "../../archivers/gtar/Makefile.common" + PKGNAME= ${DISTNAME:S/tar/gtar-base/} -PKGREVISION= 1 SVR4_PKGNAME= gtarb -CATEGORIES= archivers -MASTER_SITES= ${MASTER_SITE_GNU:=tar/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/tar/tar.html COMMENT= The GNU tape archiver with remote magnetic tape support LICENSE= gnu-gpl-v3 CONFLICTS= gcpio-[0-9]* -PKG_INSTALLATION_TYPES= overwrite pkgviews - USE_FEATURES= snprintf USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt @@ -70,24 +62,8 @@ SYMLINKS= bin/gtar ${PKGGNUDIR}bin/tar \ SYMLINKS+= libexec/grmt ${PKGGNUDIR}libexec/rmt .endif -.if ${OS_VARIANT} == "SCOOSR5" -# SCO OpenServer 5.0.7/3.2 has strtoimax() declaration in inttypes.h, -# but libc.so has no implementation. And gnulib in GNU tar 1.27 has broken -# strtoimax() support. We have to use BSDL implementation instead. -pre-configure: - cd ${WRKSRC} && ${CC} -c -o strtoimax.o strtoimax.c -.endif - -files/gtar.1: build - ${ECHO} .\\\" > ${FILESDIR}/gtar.1 - ${ECHO} .\\\" \$$""NetBSD\$$ >> ${FILESDIR}/gtar.1 - help2man --name "The GNU version of the tar archiving utility" \ - --info-page tar ${WRKSRC}/src/tar | \ - ${SED} '/help2man/d' >> ${FILESDIR}/gtar.1 - post-install: - ${INSTALL_MAN} ${FILESDIR}/gtar.1 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtar.1 + ${INSTALL_DATA} ${WRKSRC}/doc/tar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gtar.1 .for o n in ${SYMLINKS} ${LN} -sf ${PREFIX}/${o} ${DESTDIR}${PREFIX}/${n} .endfor diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST index f13a978c280..27920568bc7 100644 --- a/archivers/gtar-base/PLIST +++ b/archivers/gtar-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2014/02/24 08:16:56 adam Exp $ +@comment $NetBSD: PLIST,v 1.18 2014/08/17 16:28:18 wiz Exp $ bin/gtar gnu/bin/tar gnu/man/man1/tar.1 @@ -36,6 +36,7 @@ share/locale/ro/LC_MESSAGES/tar.mo share/locale/ru/LC_MESSAGES/tar.mo share/locale/sk/LC_MESSAGES/tar.mo share/locale/sl/LC_MESSAGES/tar.mo +share/locale/sr/LC_MESSAGES/tar.mo share/locale/sv/LC_MESSAGES/tar.mo share/locale/tr/LC_MESSAGES/tar.mo share/locale/uk/LC_MESSAGES/tar.mo diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo index 631a157c11a..548a9d9f810 100644 --- a/archivers/gtar-base/distinfo +++ b/archivers/gtar-base/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.34 2014/07/20 03:15:42 mspo Exp $ +$NetBSD: distinfo,v 1.35 2014/08/17 16:28:18 wiz Exp $ -SHA1 (tar-1.27.1.tar.bz2) = 67aa31d0d497849c05ba5ea6eb41cff130407751 -RMD160 (tar-1.27.1.tar.bz2) = a99ccfd874ac72c1e0feec2d86423c3e5bcd19fb -Size (tar-1.27.1.tar.bz2) = 2573070 bytes +SHA1 (tar-1.28.tar.bz2) = 668ea52014ef7e70afc4ff7324410ee32f2970ef +RMD160 (tar-1.28.tar.bz2) = a2edf2a854fa9a7bc7383638038a7465ae8bba51 +Size (tar-1.28.tar.bz2) = 2693989 bytes SHA1 (patch-ad) = f3a988a6b675a389d8d307fe1a90dde81ba98df5 SHA1 (patch-gnu_readlinkat.c) = b1ddbf5159db92df9186354f27db5c9cb93b9afa -SHA1 (patch-src_Makefile.in) = 9c6b469c8f43c043f44aed74e06df8d9a06b27b2 -SHA1 (patch-strtoimax.c) = a0385d8db47e95066c28c53aab4d74f9ab836b12 diff --git a/archivers/gtar-base/files/gtar.1 b/archivers/gtar-base/files/gtar.1 deleted file mode 100644 index 1ecce96a481..00000000000 --- a/archivers/gtar-base/files/gtar.1 +++ /dev/null @@ -1,611 +0,0 @@ -.\" -.\" $NetBSD: gtar.1,v 1.5 2014/03/12 13:32:14 fhajny Exp $ -.TH TAR "1" "March 2014" "tar 1.27.1" "User Commands" -.SH NAME -tar \- The GNU version of the tar archiving utility -.SH SYNOPSIS -.B tar -[\fIOPTION\fR...] [\fIFILE\fR]... -.SH DESCRIPTION -GNU 'tar' saves many files together into a single tape or disk archive, and can -restore individual files from the archive. -.SH EXAMPLES -.TP -tar \-cf archive.tar foo bar -# Create archive.tar from files foo and bar. -.TP -tar \-tvf archive.tar -# List all files in archive.tar verbosely. -.TP -tar \-xf archive.tar -# Extract all files from archive.tar. -.IP -Main operation mode: -.TP -\-A, \-\-catenate, \-\-concatenate -append tar files to an archive -.TP -\-c, \-\-create -create a new archive -.TP -\-d, \-\-diff, \-\-compare -find differences between archive and file system -.TP -\-\-delete -delete from the archive (not on mag tapes!) -.TP -\-r, \-\-append -append files to the end of an archive -.TP -\-t, \-\-list -list the contents of an archive -.TP -\-\-test\-label -test the archive volume label and exit -.TP -\-u, \-\-update -only append files newer than copy in archive -.TP -\-x, \-\-extract, \-\-get -extract files from an archive -.IP -Operation modifiers: -.TP -\-\-check\-device -check device numbers when creating incremental -archives (default) -.TP -\-g, \-\-listed\-incremental=FILE -handle new GNU\-format incremental backup -.TP -\-G, \-\-incremental -handle old GNU\-format incremental backup -.TP -\-\-ignore\-failed\-read -do not exit with nonzero on unreadable files -.TP -\-\-level=NUMBER -dump level for created listed\-incremental archive -.TP -\-n, \-\-seek -archive is seekable -.TP -\-\-no\-check\-device -do not check device numbers when creating -incremental archives -.TP -\-\-no\-seek -archive is not seekable -.TP -\-\-occurrence[=NUMBER] -process only the NUMBERth occurrence of each file -in the archive; this option is valid only in -conjunction with one of the subcommands \-\-delete, -\-\-diff, \-\-extract or \-\-list and when a list of -files is given either on the command line or via -the \-T option; NUMBER defaults to 1 -.TP -\-\-sparse\-version=MAJOR[.MINOR] -set version of the sparse format to use (implies -\-\-sparse) -.TP -\-S, \-\-sparse -handle sparse files efficiently -.IP -Overwrite control: -.TP -\-k, \-\-keep\-old\-files -don't replace existing files when extracting, -treat them as errors -.TP -\-\-keep\-directory\-symlink -preserve existing symlinks to directories when -extracting -.TP -\-\-keep\-newer\-files -don't replace existing files that are newer than -their archive copies -.TP -\-\-no\-overwrite\-dir -preserve metadata of existing directories -.TP -\-\-overwrite -overwrite existing files when extracting -.TP -\-\-overwrite\-dir -overwrite metadata of existing directories when -extracting (default) -.TP -\-\-recursive\-unlink -empty hierarchies prior to extracting directory -.TP -\-\-remove\-files -remove files after adding them to the archive -.TP -\-\-skip\-old\-files -don't replace existing files when extracting, -silently skip over them -.TP -\-U, \-\-unlink\-first -remove each file prior to extracting over it -.TP -\-W, \-\-verify -attempt to verify the archive after writing it -.IP -Select output stream: -.HP -\-\-ignore\-command\-error ignore exit codes of children -.TP -\-\-no\-ignore\-command\-error -treat non\-zero exit codes of children as -error -.TP -\-O, \-\-to\-stdout -extract files to standard output -.TP -\-\-to\-command=COMMAND -pipe extracted files to another program -.IP -Handling of file attributes: -.TP -\-\-atime\-preserve[=METHOD] -preserve access times on dumped files, either -by restoring the times after reading -(METHOD='replace'; default) or by not setting the -times in the first place (METHOD='system') -.TP -\-\-delay\-directory\-restore -delay setting modification times and -permissions of extracted directories until the end -of extraction -.TP -\-\-group=NAME -force NAME as group for added files -.TP -\-\-mode=CHANGES -force (symbolic) mode CHANGES for added files -.TP -\-\-mtime=DATE\-OR\-FILE -set mtime for added files from DATE\-OR\-FILE -.TP -\-m, \-\-touch -don't extract file modified time -.TP -\-\-no\-delay\-directory\-restore -cancel the effect of \-\-delay\-directory\-restore -option -.TP -\-\-no\-same\-owner -extract files as yourself (default for ordinary -users) -.TP -\-\-no\-same\-permissions -apply the user's umask when extracting permissions -from the archive (default for ordinary users) -.TP -\-\-numeric\-owner -always use numbers for user/group names -.TP -\-\-owner=NAME -force NAME as owner for added files -.TP -\-p, \-\-preserve\-permissions, \-\-same\-permissions -extract information about file permissions -(default for superuser) -.TP -\-\-preserve -same as both \-p and \-s -.TP -\-\-same\-owner -try extracting files with the same ownership as -exists in the archive (default for superuser) -.TP -\-s, \-\-preserve\-order, \-\-same\-order -member arguments are listed in the same order as -the files in the archive -.IP -Handling of extended file attributes: -.TP -\-\-acls -Enable the POSIX ACLs support -.TP -\-\-no\-acls -Disable the POSIX ACLs support -.TP -\-\-no\-selinux -Disable the SELinux context support -.TP -\-\-no\-xattrs -Disable extended attributes support -.TP -\-\-selinux -Enable the SELinux context support -.TP -\-\-xattrs -Enable extended attributes support -.TP -\-\-xattrs\-exclude=MASK -specify the exclude pattern for xattr keys -.TP -\-\-xattrs\-include=MASK -specify the include pattern for xattr keys -.IP -Device selection and switching: -.TP -\-f, \-\-file=ARCHIVE -use archive file or device ARCHIVE -.TP -\-\-force\-local -archive file is local even if it has a colon -.TP -\-F, \-\-info\-script=NAME, \-\-new\-volume\-script=NAME -run script at end of each tape (implies \-M) -.TP -\-L, \-\-tape\-length=NUMBER -change tape after writing NUMBER x 1024 bytes -.TP -\-M, \-\-multi\-volume -create/list/extract multi\-volume archive -.TP -\-\-rmt\-command=COMMAND -use given rmt COMMAND instead of rmt -.TP -\-\-rsh\-command=COMMAND -use remote COMMAND instead of rsh -.TP -\-\-volno\-file=FILE -use/update the volume number in FILE -.IP -Device blocking: -.TP -\-b, \-\-blocking\-factor=BLOCKS -BLOCKS x 512 bytes per record -.TP -\-B, \-\-read\-full\-records -reblock as we read (for 4.2BSD pipes) -.TP -\-i, \-\-ignore\-zeros -ignore zeroed blocks in archive (means EOF) -.TP -\-\-record\-size=NUMBER -NUMBER of bytes per record, multiple of 512 -.IP -Archive format selection: -.TP -\-H, \-\-format=FORMAT -create archive of the given format -.IP -FORMAT is one of the following: -.TP -gnu -GNU tar 1.13.x format -.TP -oldgnu -GNU format as per tar <= 1.12 -.TP -pax -POSIX 1003.1\-2001 (pax) format -.TP -posix -same as pax -.TP -ustar -POSIX 1003.1\-1988 (ustar) format -.TP -v7 -old V7 tar format -.TP -\-\-old\-archive, \-\-portability -same as \-\-format=v7 -.TP -\-\-pax\-option=keyword[[:]=value][,keyword[[:]=value]]... -control pax keywords -.TP -\-\-posix -same as \-\-format=posix -.TP -\-V, \-\-label=TEXT -create archive with volume name TEXT; at -list/extract time, use TEXT as a globbing pattern -for volume name -.IP -Compression options: -.TP -\-a, \-\-auto\-compress -use archive suffix to determine the compression -program -.TP -\-I, \-\-use\-compress\-program=PROG -filter through PROG (must accept \-d) -.TP -\-j, \-\-bzip2 -filter the archive through bzip2 -.TP -\-J, \-\-xz -filter the archive through xz -.TP -\-\-lzip -filter the archive through lzip -.TP -\-\-lzma -filter the archive through lzma -.HP -\-\-lzop -.TP -\-\-no\-auto\-compress -do not use archive suffix to determine the -compression program -.TP -\-z, \-\-gzip, \-\-gunzip, \-\-ungzip -filter the archive through gzip -.TP -\-Z, \-\-compress, \-\-uncompress -filter the archive through compress -.IP -Local file selection: -.TP -\-\-add\-file=FILE -add given FILE to the archive (useful if its name -starts with a dash) -.TP -\-\-backup[=CONTROL] -backup before removal, choose version CONTROL -.TP -\-C, \-\-directory=DIR -change to directory DIR -.TP -\-\-exclude=PATTERN -exclude files, given as a PATTERN -.TP -\-\-exclude\-backups -exclude backup and lock files -.TP -\-\-exclude\-caches -exclude contents of directories containing -CACHEDIR.TAG, except for the tag file itself -.TP -\-\-exclude\-caches\-all -exclude directories containing CACHEDIR.TAG -.TP -\-\-exclude\-caches\-under exclude everything under directories containing -CACHEDIR.TAG -.TP -\-\-exclude\-tag=FILE -exclude contents of directories containing FILE, -except for FILE itself -.HP -\-\-exclude\-tag\-all=FILE exclude directories containing FILE -.TP -\-\-exclude\-tag\-under=FILE -exclude everything under directories -containing FILE -.TP -\-\-exclude\-vcs -exclude version control system directories -.TP -\-h, \-\-dereference -follow symlinks; archive and dump the files they -point to -.TP -\-\-hard\-dereference -follow hard links; archive and dump the files they -refer to -.TP -\-K, \-\-starting\-file=MEMBER\-NAME -begin at member MEMBER\-NAME when reading the -archive -.TP -\-\-newer\-mtime=DATE -compare date and time when data changed only -.TP -\-\-no\-null -disable the effect of the previous \-\-null option -.TP -\-\-no\-recursion -avoid descending automatically in directories -.TP -\-\-no\-unquote -do not unquote filenames read with \-T -.HP -\-\-null \-T reads null\-terminated names, disable \-C -.TP -\-N, \-\-newer=DATE\-OR\-FILE, \-\-after\-date=DATE\-OR\-FILE -only store files newer than DATE\-OR\-FILE -.TP -\-\-one\-file\-system -stay in local file system when creating archive -.TP -\-P, \-\-absolute\-names -don't strip leading '/'s from file names -.TP -\-\-recursion -recurse into directories (default) -.TP -\-\-suffix=STRING -backup before removal, override usual suffix ('~' -unless overridden by environment variable -SIMPLE_BACKUP_SUFFIX) -.TP -\-T, \-\-files\-from=FILE -get names to extract or create from FILE -.TP -\-\-unquote -unquote filenames read with \-T (default) -.TP -\-X, \-\-exclude\-from=FILE -exclude patterns listed in FILE -.IP -File name transformations: -.TP -\-\-strip\-components=NUMBER -strip NUMBER leading components from file -names on extraction -.TP -\-\-transform=EXPRESSION, \-\-xform=EXPRESSION -use sed replace EXPRESSION to transform file -names -.IP -File name matching options (affect both exclude and include patterns): -.TP -\-\-anchored -patterns match file name start -.TP -\-\-ignore\-case -ignore case -.TP -\-\-no\-anchored -patterns match after any '/' (default for -exclusion) -.TP -\-\-no\-ignore\-case -case sensitive matching (default) -.TP -\-\-no\-wildcards -verbatim string matching -.TP -\-\-no\-wildcards\-match\-slash -wildcards do not match '/' -.TP -\-\-wildcards -use wildcards (default for exclusion) -.TP -\-\-wildcards\-match\-slash -wildcards match '/' (default for exclusion) -.IP -Informative output: -.TP -\-\-checkpoint[=NUMBER] -display progress messages every NUMBERth record -(default 10) -.TP -\-\-checkpoint\-action=ACTION -execute ACTION on each checkpoint -.TP -\-\-full\-time -print file time to its full resolution -.TP -\-\-index\-file=FILE -send verbose output to FILE -.TP -\-l, \-\-check\-links -print a message if not all links are dumped -.TP -\-\-no\-quote\-chars=STRING -disable quoting for characters from STRING -.TP -\-\-quote\-chars=STRING -additionally quote characters from STRING -.TP -\-\-quoting\-style=STYLE -set name quoting style; see below for valid STYLE -values -.TP -\-R, \-\-block\-number -show block number within archive with each message -.TP -\-\-show\-defaults -show tar defaults -.TP -\-\-show\-omitted\-dirs -when listing or extracting, list each directory -that does not match search criteria -.TP -\-\-show\-snapshot\-field\-ranges -show valid ranges for snapshot\-file fields -.TP -\-\-show\-transformed\-names, \-\-show\-stored\-names -show file or archive names after transformation -.TP -\-\-totals[=SIGNAL] -print total bytes after processing the archive; -with an argument \- print total bytes when this -SIGNAL is delivered; Allowed signals are: SIGHUP, -SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names -without SIG prefix are also accepted -.TP -\-\-utc -print file modification times in UTC -.TP -\-v, \-\-verbose -verbosely list files processed -.TP -\-\-warning=KEYWORD -warning control -.TP -\-w, \-\-interactive, \-\-confirmation -ask for confirmation for every action -.IP -Compatibility options: -.TP -\-o -when creating, same as \-\-old\-archive; when -extracting, same as \-\-no\-same\-owner -.IP -Other options: -.TP -\-?, \-\-help -give this help list -.TP -\-\-restrict -disable use of some potentially harmful options -.TP -\-\-usage -give a short usage message -.TP -\-\-version -print program version -.PP -Mandatory or optional arguments to long options are also mandatory or optional -for any corresponding short options. -.PP -The backup suffix is '~', unless set with \-\-suffix or SIMPLE_BACKUP_SUFFIX. -The version control may be set with \-\-backup or VERSION_CONTROL, values are: -.TP -none, off -never make backups -.TP -t, numbered -make numbered backups -.TP -nil, existing -numbered if numbered backups exist, simple otherwise -.TP -never, simple -always make simple backups -.PP -Valid arguments for the \-\-quoting\-style option are: -.IP -literal -shell -shell\-always -c -c\-maybe -escape -locale -clocale -.PP -*This* tar defaults to: -\-\-format=gnu \-f\- \-b20 \-\-quoting\-style=escape -\-\-rmt\-command=/opt/local/libexec/grmt \-\-rsh\-command=/usr/bin/rsh -.SH AUTHOR -Written by John Gilmore and Jay Fenlason. -.SH "REPORTING BUGS" -Report bugs to <bug\-tar@gnu.org>. -.SH COPYRIGHT -Copyright \(co 2013 Free Software Foundation, Inc. -License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. -.br -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. -.SH "SEE ALSO" -The full documentation for -.B tar -is maintained as a Texinfo manual. If the -.B info -and -.B tar -programs are properly installed at your site, the command -.IP -.B info tar -.PP -should give you access to the complete manual. diff --git a/archivers/gtar-base/patches/patch-src_Makefile.in b/archivers/gtar-base/patches/patch-src_Makefile.in deleted file mode 100644 index 408451e4d93..00000000000 --- a/archivers/gtar-base/patches/patch-src_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2014/07/18 11:12:41 ryoon Exp $ - ---- src/Makefile.in.orig 2013-11-17 16:18:38.000000000 +0000 -+++ src/Makefile.in -@@ -1300,6 +1300,15 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS - done; \ - done; rm -f c$${pid}_.???; exit $$bad - -+# SCO OpenServer 5.0.7/3.2 requires strtoimax(). -+OS!= uname -s -+REL!= uname -r -+.if $(OS) == "SCO_SV" -+.if $(REL) == "3.2" -+tar_OBJECTS += ../strtoimax.o -+.endif -+.endif -+ - tar$(EXEEXT): $(tar_OBJECTS) $(tar_DEPENDENCIES) $(EXTRA_tar_DEPENDENCIES) - @rm -f tar$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(tar_OBJECTS) $(tar_LDADD) $(LIBS) diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile index e27af2c8bb7..f8f8dea0baa 100644 --- a/archivers/gtar-info/Makefile +++ b/archivers/gtar-info/Makefile @@ -1,19 +1,12 @@ -# $NetBSD: Makefile,v 1.33 2014/02/24 08:16:56 adam Exp $ +# $NetBSD: Makefile,v 1.34 2014/08/17 16:28:18 wiz Exp $ + +.include "../../archivers/gtar/Makefile.common" -DISTNAME= tar-1.27.1 PKGNAME= ${DISTNAME:S/tar/gtar-info/} SVR4_PKGNAME= gtari -CATEGORIES= archivers -MASTER_SITES= ${MASTER_SITE_GNU:=tar/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/tar/tar.html COMMENT= Info format documentation for the GNU tape archiver LICENSE= gnu-fdl-v1.1 -PKG_INSTALLATION_TYPES= overwrite pkgviews - NO_CONFIGURE= yes NO_BUILD= yes INFO_FILES= yes diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile index aeac7f583c2..17ca6f746f9 100644 --- a/archivers/gtar/Makefile +++ b/archivers/gtar/Makefile @@ -1,12 +1,8 @@ -# $NetBSD: Makefile,v 1.43 2014/02/24 08:16:56 adam Exp $ +# $NetBSD: Makefile,v 1.44 2014/08/17 16:28:18 wiz Exp $ -DISTNAME= gtar-1.27.1 -CATEGORIES= archivers -MASTER_SITES= # empty -DISTFILES= # empty +.include "../../archivers/gtar/Makefile.common" -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/tar/tar.html +PKGNAME= g${DISTNAME} COMMENT= The "meta-package" for the GNU tape archiver (tar) LICENSE= gnu-gpl-v3 AND gnu-fdl-v1.1 @@ -15,6 +11,4 @@ META_PACKAGE= yes DEPENDS+= gtar-base-${PKGVERSION_NOREV}{,nb*}:../../archivers/gtar-base DEPENDS+= gtar-info-${PKGVERSION_NOREV}{,nb*}:../../archivers/gtar-info -PKG_INSTALLATION_TYPES= overwrite pkgviews - .include "../../mk/bsd.pkg.mk" diff --git a/archivers/gtar/Makefile.common b/archivers/gtar/Makefile.common new file mode 100644 index 00000000000..215b155e1a3 --- /dev/null +++ b/archivers/gtar/Makefile.common @@ -0,0 +1,18 @@ +# $NetBSD: Makefile.common,v 1.1 2014/08/17 16:28:18 wiz Exp $ +# +# used by archivers/gtar-base/Makefile +# used by archivers/gtar-info/Makefile +# used by archivers/gtar/Makefile + +DISTNAME= tar-1.28 +CATEGORIES= archivers +MASTER_SITES= ${MASTER_SITE_GNU:=tar/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.gnu.org/software/tar/tar.html +COMMENT= The GNU tape archiver with remote magnetic tape support +LICENSE= gnu-gpl-v3 + +PATCHDIR= ${.CURDIR}/../../archivers/gtar-base/patches +DISTINFO_FILE= ${.CURDIR}/../../archivers/gtar-base/distinfo |