Skip to content

Commit

Permalink
Merge pull request #1 from joyent/trunk
Browse files Browse the repository at this point in the history 
Syncing with original
  • Loading branch information
@jussisallinen
jussisallinen authored Oct 12, 2016
2 parents e69f42a + 68ad99e commit 6c222ef
Show file tree
Hide file tree
Showing 9,529 changed files with 298,906 additions and 112,833 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 4 additions & 1 deletion archivers/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.145 2016/05/25 23:21:15 markd Exp $
# $NetBSD: Makefile,v 1.148 2016/09/19 08:02:23 wiz Exp $
#

COMMENT= Archivers
Expand Down Expand Up @@ -48,6 +48,7 @@ SUBDIR+= libunrar
SUBDIR+= libzip
SUBDIR+= lrzip
SUBDIR+= lz4
SUBDIR+= lz4json
SUBDIR+= lzip
SUBDIR+= lziprecover
SUBDIR+= lzma
Expand Down Expand Up @@ -82,6 +83,7 @@ SUBDIR+= php-zlib
SUBDIR+= pigz
SUBDIR+= ppmd
SUBDIR+= ppunpack
SUBDIR+= py-czipfile
SUBDIR+= py-lhafile
SUBDIR+= py-libarchive-c
SUBDIR+= py-yuicompressor
Expand Down Expand Up @@ -117,6 +119,7 @@ SUBDIR+= xz
SUBDIR+= zip
SUBDIR+= zoo
SUBDIR+= zopfli
SUBDIR+= zstd
SUBDIR+= zutils
SUBDIR+= zziplib

Expand Down
4 changes: 2 additions & 2 deletions archivers/ark/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.36 2016/03/05 11:28:02 jperkin Exp $
# $NetBSD: Makefile,v 1.37 2016/07/01 17:55:22 jperkin Exp $

DISTNAME= ark-${_KDE_VERSION}
PKGREVISION= 5
PKGREVISION= 6
CATEGORIES= archivers
COMMENT= Manages various archive formats within the KDE environment

Expand Down
4 changes: 2 additions & 2 deletions archivers/dact/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.22 2014/10/09 14:05:51 wiz Exp $
# $NetBSD: Makefile,v 1.23 2016/08/12 13:38:51 mef Exp $

DISTNAME= dact-0.8.41
CATEGORIES= archivers
MASTER_SITES= http://www.rkeene.org/devel/
MASTER_SITES= http://www.rkeene.org/devel/dact/

MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.rkeene.org/devel/dact/
Expand Down
3 changes: 2 additions & 1 deletion archivers/dar/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.51 2014/10/09 14:05:51 wiz Exp $
# $NetBSD: Makefile,v 1.52 2016/07/09 06:37:46 wiz Exp $

DISTNAME= dar-2.4.13
PKGREVISION= 1
CATEGORIES= archivers sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dar/}

Expand Down
3 changes: 2 additions & 1 deletion archivers/engrampa/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# $NetBSD: Makefile,v 1.2 2016/06/13 22:41:16 youri Exp $
# $NetBSD: Makefile,v 1.3 2016/08/03 10:22:25 adam Exp $

PKGREVISION= 1
.include "../../meta-pkgs/mate/Makefile.common"

DISTNAME= engrampa-1.14.1
Expand Down
4 changes: 2 additions & 2 deletions archivers/fastjar/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.20 2016/03/05 15:08:30 bsiegert Exp $
#
# $NetBSD: Makefile,v 1.21 2016/09/18 11:17:41 wiz Exp $

DISTNAME= fastjar-0.98
PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= http://download.savannah.gnu.org/releases/fastjar/

Expand Down
3 changes: 1 addition & 2 deletions archivers/fastjar/PLIST
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@comment $NetBSD: PLIST,v 1.3 2016/03/05 15:08:30 bsiegert Exp $
@comment $NetBSD: PLIST,v 1.4 2016/09/18 11:17:41 wiz Exp $
bin/fastjar
bin/grepjar
info/fastjar.info
lib/charset.alias
man/man1/fastjar.1
man/man1/grepjar.1
4 changes: 2 additions & 2 deletions archivers/file-roller/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.135 2016/04/09 05:40:46 richard Exp $
# $NetBSD: Makefile,v 1.137 2016/08/03 10:22:26 adam Exp $
#

DISTNAME= file-roller-2.32.2
PKGREVISION= 24
PKGREVISION= 26
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.32/}
EXTRACT_SUFX= .tar.bz2
Expand Down
6 changes: 3 additions & 3 deletions archivers/gcpio/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.50 2016/05/31 14:05:46 mef Exp $
#
# $NetBSD: Makefile,v 1.51 2016/09/18 11:20:14 wiz Exp $

DISTNAME= cpio-2.12
PKGNAME= g${DISTNAME}
PKGNAME= g${DISTNAME}
PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU:=cpio/}

Expand Down
3 changes: 1 addition & 2 deletions archivers/gcpio/PLIST
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
@comment $NetBSD: PLIST,v 1.15 2016/05/31 14:05:46 mef Exp $
@comment $NetBSD: PLIST,v 1.16 2016/09/18 11:20:14 wiz Exp $
bin/gcpio
gnu/bin/cpio
gnu/man/man1/cpio.1
gnu/man/man1/mt.1
info/cpio.info
lib/charset.alias
libexec/grmt
man/man1/gcpio.1
man/man8/grmt.8
Expand Down
10 changes: 5 additions & 5 deletions archivers/karchive/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.1 2016/05/25 23:20:33 markd Exp $
$NetBSD: distinfo,v 1.2 2016/08/21 21:13:42 markd Exp $

SHA1 (karchive-5.21.0.tar.xz) = 6e2a810ba6d8ab54926ce33055b1e2c79a107a1f
RMD160 (karchive-5.21.0.tar.xz) = 43f9494a800b5b2fbdc18035d226741867873e91
SHA512 (karchive-5.21.0.tar.xz) = bd1294df5357908e4b21474620c3c9357625064e5c5bf1e81f4268844e8f63b4a54123e7705bc02f40273a1c37ca83f45d06d7acb94b112405f1157dbc119204
Size (karchive-5.21.0.tar.xz) = 109316 bytes
SHA1 (karchive-5.25.0.tar.xz) = 298351569bbd505568243a2475e2cfabcf71a836
RMD160 (karchive-5.25.0.tar.xz) = 8b89f137e5d8af008af069b851e5b1d2ddcd4a38
SHA512 (karchive-5.25.0.tar.xz) = 5109af21e1fb2257f1885813483d9ebcfaec99eb3dcce11b22619879753508c51d7cbaba1afb232d021febc46eabc14ba1ad3fc39fabe6a04f5833696034d1ff
Size (karchive-5.25.0.tar.xz) = 110828 bytes
13 changes: 10 additions & 3 deletions archivers/lhasa/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2015/08/26 21:25:31 shattered Exp $
# $NetBSD: Makefile,v 1.8 2016/06/22 10:30:18 wiz Exp $

DISTNAME= lhasa-0.3.0
DISTNAME= lhasa-0.3.1
CATEGORIES= archivers
MASTER_SITES= https://soulsphere.org/projects/lhasa/

Expand All @@ -14,6 +14,13 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= liblhasa.pc.in
TEST_TARGET= check

CONFLICTS= lha-[0-9]*
USE_TOOLS+= bash # tests-only
REPLACE_BASH+= test/test-dry-run
REPLACE_BASH+= test/test-crc-output
REPLACE_BASH+= test/test-print
REPLACE_BASH+= test/test-decompress
REPLACE_BASH+= test/test-file-headers
REPLACE_BASH+= test/test-extract
REPLACE_BASH+= test/test-list-output

.include "../../mk/bsd.pkg.mk"
10 changes: 5 additions & 5 deletions archivers/lhasa/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.7 2015/11/03 00:56:22 agc Exp $
$NetBSD: distinfo,v 1.8 2016/06/22 10:30:18 wiz Exp $

SHA1 (lhasa-0.3.0.tar.gz) = 044e9bf2bcef5664c1e13ecf440c4a4829059f0d
RMD160 (lhasa-0.3.0.tar.gz) = 55d3dc69186fdc138279106f94cfb424559fad84
SHA512 (lhasa-0.3.0.tar.gz) = 1a7d8f69866d8345418d6a75c6ccdf359975094f76516d61c84ec4970645500abe4f186a0511ca31b2621849990b39ba9441c0085b991939139afbf125f9e745
Size (lhasa-0.3.0.tar.gz) = 2921183 bytes
SHA1 (lhasa-0.3.1.tar.gz) = 1a5d827100d1e6445b377029b69b901af3ffa240
RMD160 (lhasa-0.3.1.tar.gz) = 4e4cef0525d99c0b4cbe58529da8edaf6b01608b
SHA512 (lhasa-0.3.1.tar.gz) = 6e4797aaa054f2ecd25069b32b809ab0111d0179adfd9c676e0609d69efbcc968ec6dce67fbd8ce6bccc102d09ee69996805a5542882b432731e3c273f132c05
Size (lhasa-0.3.1.tar.gz) = 2933084 bytes
7 changes: 6 additions & 1 deletion archivers/libarchive/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
# $NetBSD: Makefile,v 1.42 2016/02/25 09:28:36 jperkin Exp $
# $NetBSD: Makefile,v 1.46 2016/09/14 12:57:55 gdt Exp $

.include "Makefile.common"

PKGREVISION= 2
COMMENT= Library to read/create different archive formats

USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-bsdcat
CONFIGURE_ARGS+= --disable-bsdcpio
CONFIGURE_ARGS+= --disable-bsdtar

do-extract:
${CP} -r ${FILESDIR} ${WRKSRC}
# Contents of ${FILESDIR} may not have the u=w bit set, and
# the build system assumes files in ${WRKSRC} are writable.
${CHMOD} -R u+w ${WRKSRC}

# workaround for pkg/45491
CONFIGURE_ENV.SunOS+= ac_cv_header_ext2fs_ext2_fs_h=no
Expand Down
6 changes: 3 additions & 3 deletions archivers/libarchive/Makefile.common
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# $NetBSD: Makefile.common,v 1.4 2016/03/05 11:28:02 jperkin Exp $
# $NetBSD: Makefile.common,v 1.6 2016/06/21 12:23:01 joerg Exp $
# used by archivers/bsdtar/Makefile
# used by archivers/libarchive/Makefile

DISTNAME= libarchive-3.1.2
PKGREVISION= 2
DISTNAME= libarchive-3.2.1
CATEGORIES= archivers
MASTER_SITES= http://www.libarchive.org/downloads/
DISTFILES= # empty
Expand All @@ -18,3 +17,4 @@ CONFIGURE_ARGS+= --without-expat
CONFIGURE_ARGS+= --without-lzo2
CONFIGURE_ARGS+= --without-nettle
CONFIGURE_ARGS+= --without-xml2
CONFIGURE_ARGS+= --disable-maintainer-mode
4 changes: 3 additions & 1 deletion archivers/libarchive/PLIST
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.8 2015/01/17 12:44:47 adam Exp $
@comment $NetBSD: PLIST,v 1.9 2016/06/20 17:28:33 joerg Exp $
include/archive.h
include/archive_entry.h
lib/libarchive.la
Expand All @@ -11,6 +11,7 @@ man/man3/archive_entry_perms.3
man/man3/archive_entry_stat.3
man/man3/archive_entry_time.3
man/man3/archive_read.3
man/man3/archive_read_add_passphrase.3
man/man3/archive_read_data.3
man/man3/archive_read_disk.3
man/man3/archive_read_extract.3
Expand All @@ -34,6 +35,7 @@ man/man3/archive_write_header.3
man/man3/archive_write_new.3
man/man3/archive_write_open.3
man/man3/archive_write_set_options.3
man/man3/archive_write_set_passphrase.3
man/man3/libarchive.3
man/man3/libarchive_changes.3
man/man3/libarchive_internals.3
Expand Down
4 changes: 2 additions & 2 deletions archivers/libarchive/buildlink3.mk
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.8 2015/01/17 12:44:47 adam Exp $
# $NetBSD: buildlink3.mk,v 1.9 2016/07/01 17:55:22 jperkin Exp $

BUILDLINK_TREE+= libarchive

.if !defined(LIBARCHIVE_BUILDLINK3_MK)
LIBARCHIVE_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.1
BUILDLINK_ABI_DEPENDS.libarchive+= libarchive>=3.1.2
BUILDLINK_ABI_DEPENDS.libarchive+= libarchive>=3.2.1nb2
BUILDLINK_PKGSRCDIR.libarchive?= ../../archivers/libarchive

CHECK_BUILTIN.libarchive:= yes
Expand Down
Loading

0 comments on commit 6c222ef

Please sign in to comment.