From 0ef05b2ef0bd2ee6177cf6533a2feb5171074c7e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 22 Jun 2016 04:45:53 +0200 Subject: [PATCH] */*: sync with upstream Taken from: FreeBSD --- audio/soundgrab/Makefile | 2 +- biology/wise/Makefile | 16 +- .../wise/files/patch-src_models_phasemodel.c | 2 +- databases/p5-DBD-CSV/Makefile | 2 +- databases/p5-DBD-CSV/distinfo | 5 +- databases/p5-DBD-CSV/pkg-plist | 6 - .../p5-DBIx-Class-EncodedColumn/Makefile | 3 +- .../p5-DBIx-Class-EncodedColumn/distinfo | 5 +- databases/p5-DBIx-Class/Makefile | 2 +- databases/p5-DBIx-Class/distinfo | 5 +- databases/p5-Mojo-Pg/Makefile | 2 +- databases/p5-Mojo-Pg/distinfo | 6 +- databases/p5-MongoDB/Makefile | 2 +- databases/p5-MongoDB/distinfo | 6 +- databases/p5-Prophet/Makefile | 2 +- databases/sqlitestudio/Makefile | 87 +- databases/sqlitestudio/distinfo | 5 +- databases/sqlitestudio/pkg-plist | 9 +- databases/yasql/Makefile | 2 +- devel/Makefile | 5 +- devel/elixir-connection/Makefile | 2 +- devel/elixir-connection/distinfo | 5 +- devel/elixir-csv/Makefile | 2 +- devel/elixir-csv/distinfo | 6 +- devel/elixir-plug/Makefile | 3 +- devel/elixir-plug/distinfo | 6 +- devel/elixir-plug/files/patch-mix.exs | 11 - devel/elixir-poison/Makefile | 2 +- devel/elixir-poison/distinfo | 5 +- devel/elixir-poison/pkg-plist | 1 + devel/hyperscan/distinfo | 2 - devel/p5-B-Generate/Makefile | 2 +- devel/p5-B-Generate/distinfo | 5 +- devel/p5-B-OPCheck/Makefile | 2 +- devel/p5-B-OPCheck/distinfo | 5 +- devel/p5-CPAN-Checksums/Makefile | 4 +- devel/p5-CPAN-Checksums/distinfo | 5 +- devel/p5-CPAN-Perl-Releases/Makefile | 2 +- devel/p5-CPAN-Perl-Releases/distinfo | 6 +- devel/p5-CPANPLUS-Dist-Build/Makefile | 3 +- devel/p5-CPANPLUS-Dist-Build/distinfo | 5 +- devel/p5-Cache-FastMmap/Makefile | 4 +- devel/p5-Cache-FastMmap/distinfo | 5 +- devel/p5-Carp-Clan/Makefile | 3 +- devel/p5-Carp-Clan/distinfo | 5 +- devel/p5-Config-Model/Makefile | 2 +- devel/p5-Config-Model/distinfo | 5 +- devel/p5-DateTime-Locale/Makefile | 2 +- devel/p5-DateTime-Locale/distinfo | 5 +- devel/p5-Debug-Client/Makefile | 4 +- devel/p5-Devel-PPPort/Makefile | 2 +- devel/p5-Devel-PPPort/distinfo | 5 +- devel/p5-Eval-Closure/Makefile | 2 +- devel/p5-Eval-Closure/distinfo | 5 +- devel/p5-Event/Makefile | 3 +- devel/p5-Event/distinfo | 5 +- devel/p5-Git-PurePerl/Makefile | 4 +- devel/p5-Git-PurePerl/distinfo | 5 +- devel/p5-Git-Repository/Makefile | 4 +- devel/p5-Git-Repository/distinfo | 6 +- devel/p5-Hash-Util-FieldHash-Compat/Makefile | 2 +- devel/p5-Hash-Util-FieldHash-Compat/distinfo | 5 +- devel/p5-Locale-libintl/Makefile | 8 +- devel/p5-Locale-libintl/distinfo | 6 +- devel/p5-MCE/Makefile | 2 +- devel/p5-MCE/distinfo | 6 +- devel/p5-Mock-Quick/Makefile | 2 +- devel/p5-Mock-Quick/distinfo | 5 +- devel/p5-Module-CoreList/Makefile | 2 +- devel/p5-Module-CoreList/distinfo | 6 +- devel/p5-Moo/Makefile | 3 +- devel/p5-Moo/distinfo | 5 +- devel/p5-Moo/pkg-plist | 1 - devel/p5-Moose/Makefile | 2 +- devel/p5-Moose/distinfo | 6 +- devel/p5-MooseX-ClassAttribute/Makefile | 4 +- devel/p5-MooseX-ClassAttribute/distinfo | 6 +- devel/p5-MooseX-Getopt/Makefile | 4 +- devel/p5-MooseX-Getopt/distinfo | 5 +- devel/p5-MooseX-Types-Path-Class/Makefile | 2 +- devel/p5-MooseX-Types-Path-Class/distinfo | 5 +- devel/p5-ReadLine-Gnu/distinfo | 2 - devel/p5-ReadLine-Gnu/pkg-plist | 7 - devel/p5-ReadLine-Perl/Makefile | 18 - devel/p5-ReadLine-Perl/distinfo | 2 - devel/p5-ReadLine-Perl/pkg-descr | 10 - devel/p5-ReadLine-Perl/pkg-plist | 2 - devel/p5-Reply/Makefile | 2 +- devel/p5-Reply/distinfo | 5 +- devel/p5-Scope-Upper/Makefile | 11 +- devel/p5-Scope-Upper/distinfo | 5 +- devel/p5-Scope-Upper/files/patch-MANIFEST | 10 - devel/p5-Scope-Upper/files/patch-Makefile.PL | 11 - devel/p5-Scope-Upper/files/patch-Upper.xs | 2099 ----------------- .../files/patch-t_13-reap-ctl.t | 18 - devel/p5-Scope-Upper/files/patch-t_91-pod.t | 16 - .../files/patch-t_92-pod-coverage.t | 17 - .../files/patch-t_93-pod-spelling.t | 16 - .../files/patch-t_95-portability-files.t | 16 - devel/p5-Scope-Upper/files/patch-xsh_caps.h | 50 - devel/p5-Scope-Upper/files/patch-xsh_debug.h | 30 - .../p5-Scope-Upper/files/patch-xsh_threads.h | 504 ---- devel/p5-Scope-Upper/files/patch-xsh_util.h | 100 - devel/p5-System-Command/Makefile | 2 +- devel/p5-System-Command/distinfo | 5 +- devel/p5-Term-Clui/Makefile | 2 +- .../Makefile | 7 +- devel/p5-Term-ReadLine-Gnu/distinfo | 3 + .../pkg-descr | 0 devel/p5-Term-ReadLine-Gnu/pkg-plist | 44 + devel/p5-Term-ReadLine-Perl/Makefile | 2 +- .../Makefile | 5 +- .../distinfo | 0 .../pkg-descr | 0 .../pkg-plist | 0 devel/p5-Test-Strict/Makefile | 2 +- devel/p5-Test-Strict/distinfo | 5 +- devel/p5-VCS/Makefile | 3 +- devel/p5-VCS/distinfo | 5 +- devel/p5-constant-lexical/Makefile | 15 +- devel/p5-constant-lexical/distinfo | 5 +- devel/p5-constant-lexical/pkg-plist | 4 +- devel/perlconsole/Makefile | 2 +- devel/py-simpy/Makefile | 2 +- devel/py-simpy/distinfo | 5 +- editors/codelite/Makefile | 55 +- emulators/qemu-sbruno/Makefile | 5 +- emulators/qemu-sbruno/distinfo | 6 +- ftp/p5-Net-FTPSSL/Makefile | 2 +- ftp/p5-Net-FTPSSL/distinfo | 5 +- ftp/profxp/Makefile | 2 +- games/eduke32/Makefile | 8 +- games/eduke32/distinfo | 4 +- games/eduke32/files/patch-Makefile.common | 13 +- .../eduke32/files/patch-build_src_baselayer.c | 12 +- graphics/p5-Image-ExifTool-devel/Makefile | 2 +- graphics/p5-Image-ExifTool-devel/distinfo | 6 +- lang/p5-Expect/Makefile | 4 +- lang/p5-Expect/distinfo | 5 +- lang/p5-ExtUtils-F77/Makefile | 2 +- lang/p5-ExtUtils-F77/distinfo | 5 +- lang/p5-ExtUtils-F77/files/patch-F77.pm | 65 - mail/fetchmail/Makefile | 77 +- mail/fetchmail/files/patch-fetchmail.c | 26 + mail/fetchmail/files/patch-socket.c | 24 + mail/fetchmail/files/pkg-deinstall.in | 13 - mail/fetchmail/files/pkg-install.in | 13 - mail/fetchmail/pkg-plist | 5 +- mail/rspamd-devel/Makefile | 8 +- mail/rspamd-devel/distinfo | 5 +- mail/rspamd-devel/pkg-plist | 5 + mail/rspamd/Makefile | 2 +- mail/rspamd/distinfo | 4 +- mail/rubygem-mail_room/Makefile | 2 +- mail/rubygem-mail_room/distinfo | 5 +- mail/sieve-connect/Makefile | 2 +- math/PDL/Makefile | 4 +- math/gap/Makefile | 4 +- math/gap/distinfo | 4 +- math/p5-Math-Currency/Makefile | 4 +- math/p5-Math-Currency/distinfo | 5 +- misc/p5-Array-Compare/Makefile | 5 +- misc/p5-Array-Compare/distinfo | 5 +- misc/p5-Business-ISBN/Makefile | 4 +- misc/p5-Business-ISBN/distinfo | 5 +- misc/pfm/Makefile | 2 +- multimedia/gtk-youtube-viewer/Makefile | 2 +- multimedia/zoneminder/Makefile | 6 +- net-im/ttytter/Makefile | 4 +- net-mgmt/p5-Net-Abuse-Utils/Makefile | 2 +- net-mgmt/p5-Net-Abuse-Utils/distinfo | 5 +- net/ldapscripts/Makefile | 2 +- net/ldapscripts/distinfo | 5 +- net/ldapsh/Makefile | 2 +- net/p5-Net-Address-Ethernet/Makefile | 2 +- net/p5-Net-Address-Ethernet/distinfo | 5 +- .../files/patch-Makefile.PL | 16 - net/shelldap/Makefile | 2 +- print/lyx/Makefile | 2 +- print/lyx/distinfo | 5 +- print/lyx/pkg-plist | 4 + security/kpcli/Makefile | 2 +- security/p5-Crypt-PBKDF2/Makefile | 2 +- security/p5-Crypt-PBKDF2/distinfo | 5 +- security/p5-CryptX/Makefile | 2 +- security/p5-CryptX/distinfo | 6 +- security/p5-Digest-Bcrypt/Makefile | 2 +- security/p5-Digest-Bcrypt/distinfo | 5 +- security/p5-Module-Signature/Makefile | 2 +- security/p5-Module-Signature/distinfo | 5 +- shells/p5-Term-ShellUI/Makefile | 2 +- sysutils/backuppc-devel/Makefile | 2 +- .../files/patch-lib_BackupPC_Xfer_Smb.pm | 33 + .../files/patch-lib__BackupPC__CGI__View.pm | 17 +- sysutils/backuppc-devel/files/pkg-message.in | 9 + sysutils/backuppc/Makefile | 2 +- .../files/patch-lib_BackupPC_Xfer_Smb.pm | 33 + .../files/patch-lib__BackupPC__CGI__View.pm | 17 +- sysutils/backuppc/files/pkg-message.in | 9 + sysutils/duplicity/Makefile | 5 +- sysutils/duplicity/distinfo | 5 +- sysutils/extipl/Makefile | 23 +- sysutils/p5-File-Next/Makefile | 3 +- sysutils/p5-File-Next/distinfo | 5 +- sysutils/uptimed/Makefile | 11 +- sysutils/uptimed/distinfo | 5 +- sysutils/uptimed/pkg-descr | 2 +- textproc/p5-Lingua-EN-NameParse/Makefile | 2 +- textproc/p5-Lingua-EN-NameParse/distinfo | 5 +- textproc/p5-PDF-API2/Makefile | 2 +- textproc/p5-PDF-API2/distinfo | 5 +- textproc/p5-Pod-Autopod/Makefile | 2 +- textproc/p5-Pod-Autopod/distinfo | 5 +- textproc/p5-Text-BibTeX/Makefile | 2 +- textproc/p5-Text-BibTeX/distinfo | 5 +- textproc/p5-XML-LibXML/Makefile | 2 +- textproc/p5-XML-LibXML/distinfo | 5 +- textproc/p5-XML-XPath/Makefile | 2 +- textproc/p5-XML-XPath/distinfo | 5 +- www/Makefile | 1 + www/asql/Makefile | 2 +- www/calamaris-devel/Makefile | 38 + www/calamaris-devel/distinfo | 3 + www/calamaris-devel/pkg-descr | 6 + www/calamaris-devel/pkg-plist | 10 + www/calamaris/Makefile | 6 +- www/chromium/Makefile | 3 +- www/chromium/distinfo | 10 +- www/elixir-phoenix_html/Makefile | 2 +- www/elixir-phoenix_html/distinfo | 6 +- www/elixir-phoenix_html/pkg-plist | 4 + www/gitlab/Makefile | 17 +- www/gitlab/distinfo | 6 +- www/gitlab/files/gitlab.in | 2 - www/gitlab/files/patch-Gemfile | 65 +- .../files/patch-config_gitlab.yml.example | 9 +- .../patch-config_initializers_1__settings.rb | 10 +- .../files/patch-lib_support_nginx_gitlab | 8 +- .../files/patch-lib_support_nginx_gitlab-ssl | 10 +- www/gitlab/pkg-plist | 170 +- www/p5-CGI/Makefile | 2 +- www/p5-CGI/distinfo | 5 +- .../Makefile | 3 +- .../distinfo | 5 +- www/p5-Catalyst-Runtime/Makefile | 2 +- www/p5-Catalyst-Runtime/distinfo | 5 +- www/p5-HTML-FormFu/Makefile | 3 +- www/p5-HTML-FormFu/distinfo | 5 +- www/p5-WWW-Search/Makefile | 2 +- www/p5-WWW-Search/distinfo | 5 +- www/p5-WWW-Search/files/patch-Makefile.PL | 16 - www/redmine/Makefile | 68 +- www/redmine/distinfo | 5 +- www/redmine/files/ldap.rb | 1 + www/redmine/files/markdown.rb | 1 + www/redmine/files/mysql.rb | 1 + www/redmine/files/patch-Gemfile | 91 +- www/redmine/files/pg.rb | 1 + www/redmine/files/rmagic.rb | 2 +- www/redmine/pkg-plist | 515 ++-- x11-toolkits/p5-Prima/Makefile | 8 +- x11-toolkits/p5-Prima/distinfo | 5 +- x11-toolkits/p5-Prima/pkg-plist | 10 + 263 files changed, 1510 insertions(+), 3883 deletions(-) delete mode 100644 devel/elixir-plug/files/patch-mix.exs delete mode 100644 devel/p5-ReadLine-Gnu/distinfo delete mode 100644 devel/p5-ReadLine-Gnu/pkg-plist delete mode 100644 devel/p5-ReadLine-Perl/Makefile delete mode 100644 devel/p5-ReadLine-Perl/distinfo delete mode 100644 devel/p5-ReadLine-Perl/pkg-descr delete mode 100644 devel/p5-ReadLine-Perl/pkg-plist delete mode 100644 devel/p5-Scope-Upper/files/patch-MANIFEST delete mode 100644 devel/p5-Scope-Upper/files/patch-Makefile.PL delete mode 100644 devel/p5-Scope-Upper/files/patch-Upper.xs delete mode 100644 devel/p5-Scope-Upper/files/patch-t_13-reap-ctl.t delete mode 100644 devel/p5-Scope-Upper/files/patch-t_91-pod.t delete mode 100644 devel/p5-Scope-Upper/files/patch-t_92-pod-coverage.t delete mode 100644 devel/p5-Scope-Upper/files/patch-t_93-pod-spelling.t delete mode 100644 devel/p5-Scope-Upper/files/patch-t_95-portability-files.t delete mode 100644 devel/p5-Scope-Upper/files/patch-xsh_caps.h delete mode 100644 devel/p5-Scope-Upper/files/patch-xsh_debug.h delete mode 100644 devel/p5-Scope-Upper/files/patch-xsh_threads.h delete mode 100644 devel/p5-Scope-Upper/files/patch-xsh_util.h rename devel/{p5-ReadLine-Gnu => p5-Term-ReadLine-Gnu}/Makefile (79%) create mode 100644 devel/p5-Term-ReadLine-Gnu/distinfo rename devel/{p5-ReadLine-Gnu => p5-Term-ReadLine-Gnu}/pkg-descr (100%) create mode 100644 devel/p5-Term-ReadLine-Gnu/pkg-plist rename devel/{p5-ReadLine-TTYtter => p5-Term-ReadLine-TTYtter}/Makefile (88%) rename devel/{p5-ReadLine-TTYtter => p5-Term-ReadLine-TTYtter}/distinfo (100%) rename devel/{p5-ReadLine-TTYtter => p5-Term-ReadLine-TTYtter}/pkg-descr (100%) rename devel/{p5-ReadLine-TTYtter => p5-Term-ReadLine-TTYtter}/pkg-plist (100%) delete mode 100644 lang/p5-ExtUtils-F77/files/patch-F77.pm create mode 100644 mail/fetchmail/files/patch-fetchmail.c create mode 100644 mail/fetchmail/files/patch-socket.c delete mode 100644 mail/fetchmail/files/pkg-deinstall.in delete mode 100644 mail/fetchmail/files/pkg-install.in delete mode 100644 net/p5-Net-Address-Ethernet/files/patch-Makefile.PL create mode 100644 sysutils/backuppc-devel/files/patch-lib_BackupPC_Xfer_Smb.pm create mode 100644 sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm create mode 100644 www/calamaris-devel/Makefile create mode 100644 www/calamaris-devel/distinfo create mode 100644 www/calamaris-devel/pkg-descr create mode 100644 www/calamaris-devel/pkg-plist delete mode 100644 www/p5-WWW-Search/files/patch-Makefile.PL create mode 100644 www/redmine/files/ldap.rb create mode 100644 www/redmine/files/markdown.rb create mode 100644 www/redmine/files/mysql.rb create mode 100644 www/redmine/files/pg.rb diff --git a/audio/soundgrab/Makefile b/audio/soundgrab/Makefile index f84eb3e6f2e..638ffc9cf47 100644 --- a/audio/soundgrab/Makefile +++ b/audio/soundgrab/Makefile @@ -14,7 +14,7 @@ RUN_DEPENDS= sox:audio/sox \ rawplay:audio/rawrec \ oggenc:audio/vorbis-tools \ flac:audio/flac \ - p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \ + p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu \ p5-Time-HiRes>=0:devel/p5-Time-HiRes LICENSE= GPLv2 diff --git a/biology/wise/Makefile b/biology/wise/Makefile index f6385382960..8c499fa90ea 100644 --- a/biology/wise/Makefile +++ b/biology/wise/Makefile @@ -10,8 +10,6 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Intelligent algorithms for DNA searches -OPTIONS_DEFINE= DOCS EXAMPLES - BUILD_WRKSRC= ${WRKSRC}/src USES= pkgconfig @@ -20,10 +18,6 @@ MAKEFILE= makefile SUB_FILES= pkg-message -PORTDOCS= * -PORTEXAMPLES= * -PLIST_FILES= ${BINFILES:S,^,bin/,} ${DATAFILES:S,^,%%DATADIR%%/,} - # # Actually want an 'ALL_TARGET = all perl' which then requires # 'USE_PERL5= yes' but the perl sub-build is currently broken. @@ -42,6 +36,12 @@ DATAFILES= BLOSUM30.bla BLOSUM45.bla BLOSUM62.bla BLOSUM80.bla aa.rnd \ human.stats idenity.bla methods pb.gf pombe.gf tm.pri \ wise.2 wise.per worm.gf +PORTDOCS= * +PORTEXAMPLES= * +PLIST_FILES= ${BINFILES:S,^,bin/,} ${DATAFILES:S,^,%%DATADIR%%/,} + +OPTIONS_DEFINE= DOCS EXAMPLES + post-patch: @${FIND} ${BUILD_WRKSRC} -name "makefile" | ${XARGS} \ ${REINPLACE_CMD} -e \ @@ -60,8 +60,12 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/wisecfg && ${INSTALL_DATA} ${DATAFILES} \ ${STAGEDIR}${DATADIR}) + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + +do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/test_data && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) diff --git a/biology/wise/files/patch-src_models_phasemodel.c b/biology/wise/files/patch-src_models_phasemodel.c index fa7516acc7e..e76d8cdac56 100644 --- a/biology/wise/files/patch-src_models_phasemodel.c +++ b/biology/wise/files/patch-src_models_phasemodel.c @@ -1,4 +1,4 @@ ---- src/models/phasemodel.c.orig 2007-09-08 08:05:32.000000000 +0000 +--- src/models/phasemodel.c.orig 2007-09-08 08:05:32 UTC +++ src/models/phasemodel.c @@ -3,6 +3,10 @@ extern "C" { #endif diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile index a69dc3c79d0..7f74e593486 100644 --- a/databases/p5-DBD-CSV/Makefile +++ b/databases/p5-DBD-CSV/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= DBD-CSV -PORTVERSION= 0.48 +PORTVERSION= 0.49 PORTEPOCH= 1 CATEGORIES= databases perl5 MASTER_SITES= CPAN diff --git a/databases/p5-DBD-CSV/distinfo b/databases/p5-DBD-CSV/distinfo index b3de9c205d0..52182fa86bb 100644 --- a/databases/p5-DBD-CSV/distinfo +++ b/databases/p5-DBD-CSV/distinfo @@ -1,2 +1,3 @@ -SHA256 (DBD-CSV-0.48.tgz) = e118b6d847419292284c9d308368507df0cee132087f71223b23c5ceeef2b57d -SIZE (DBD-CSV-0.48.tgz) = 40358 +TIMESTAMP = 1466507621 +SHA256 (DBD-CSV-0.49.tgz) = 86fcea010571a6f774344c920c23619c899f8aee30d2961fe2716306a95e9a80 +SIZE (DBD-CSV-0.49.tgz) = 39271 diff --git a/databases/p5-DBD-CSV/pkg-plist b/databases/p5-DBD-CSV/pkg-plist index 17053832401..c86f2ae0c73 100644 --- a/databases/p5-DBD-CSV/pkg-plist +++ b/databases/p5-DBD-CSV/pkg-plist @@ -2,11 +2,5 @@ %%SITE_PERL%%/DBD/CSV.pm %%SITE_PERL%%/DBD/CSV/GetInfo.pm %%SITE_PERL%%/DBD/CSV/TypeInfo.pm -%%SITE_PERL%%/DBI/Test/Case/DBD/CSV/t10_base.pm -%%SITE_PERL%%/DBI/Test/Case/DBD/CSV/t11_dsnlist.pm -%%SITE_PERL%%/DBI/Test/Case/DBD/CSV/t20_createdrop.pm -%%SITE_PERL%%/DBI/Test/Case/DBD/CSV/t85_error.pm -%%SITE_PERL%%/DBI/Test/DBD/CSV/Conf.pm -%%SITE_PERL%%/DBI/Test/DBD/CSV/List.pm %%PERL5_MAN3%%/Bundle::DBD::CSV.3.gz %%PERL5_MAN3%%/DBD::CSV.3.gz diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile index 9744e338f29..ed67a5ab377 100644 --- a/databases/p5-DBIx-Class-EncodedColumn/Makefile +++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= DBIx-Class-EncodedColumn -PORTVERSION= 0.00013 -PORTREVISION= 1 +PORTVERSION= 0.00015 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/databases/p5-DBIx-Class-EncodedColumn/distinfo b/databases/p5-DBIx-Class-EncodedColumn/distinfo index a2dcb815c49..bae378ba5aa 100644 --- a/databases/p5-DBIx-Class-EncodedColumn/distinfo +++ b/databases/p5-DBIx-Class-EncodedColumn/distinfo @@ -1,2 +1,3 @@ -SHA256 (DBIx-Class-EncodedColumn-0.00013.tar.gz) = c9d2f70c231ac866582e48c239d4872783a62df7acecff7df22fe8efb3eb1717 -SIZE (DBIx-Class-EncodedColumn-0.00013.tar.gz) = 42853 +TIMESTAMP = 1466508441 +SHA256 (DBIx-Class-EncodedColumn-0.00015.tar.gz) = cf51194dab478b10880c750b5e5d4dfea74c4eadbc94766214e1e17469f9b4c4 +SIZE (DBIx-Class-EncodedColumn-0.00015.tar.gz) = 44361 diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile index 6c848d624ec..fd9da939189 100644 --- a/databases/p5-DBIx-Class/Makefile +++ b/databases/p5-DBIx-Class/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= DBIx-Class -PORTVERSION= 0.082821 +PORTVERSION= 0.082840 CATEGORIES= databases perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/databases/p5-DBIx-Class/distinfo b/databases/p5-DBIx-Class/distinfo index 6a9525c3120..ca5982beff5 100644 --- a/databases/p5-DBIx-Class/distinfo +++ b/databases/p5-DBIx-Class/distinfo @@ -1,2 +1,3 @@ -SHA256 (DBIx-Class-0.082821.tar.gz) = dc6e0ce7fa4f732c6e584e89019df9cb8ac25d3f7bd51b94ba4d97cffd8a2cde -SIZE (DBIx-Class-0.082821.tar.gz) = 852841 +TIMESTAMP = 1466508100 +SHA256 (DBIx-Class-0.082840.tar.gz) = 4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef +SIZE (DBIx-Class-0.082840.tar.gz) = 860243 diff --git a/databases/p5-Mojo-Pg/Makefile b/databases/p5-Mojo-Pg/Makefile index 5a212df6ce2..60b7a7f657c 100644 --- a/databases/p5-Mojo-Pg/Makefile +++ b/databases/p5-Mojo-Pg/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Mojo-Pg -PORTVERSION= 2.27 +PORTVERSION= 2.28 CATEGORIES= databases www perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:SRI diff --git a/databases/p5-Mojo-Pg/distinfo b/databases/p5-Mojo-Pg/distinfo index 7127327c4a6..93aa4477f05 100644 --- a/databases/p5-Mojo-Pg/distinfo +++ b/databases/p5-Mojo-Pg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464328700 -SHA256 (Mojo-Pg-2.27.tar.gz) = 404e1041bacbeb712fb503069069e008fa74d590c88a3d0ac8ce4647eb9e424a -SIZE (Mojo-Pg-2.27.tar.gz) = 26465 +TIMESTAMP = 1466507481 +SHA256 (Mojo-Pg-2.28.tar.gz) = 55d6f9b6b9f4ef43d88fff189bb6c12e5032147d2dc971adf0ec8b7cce2d82e7 +SIZE (Mojo-Pg-2.28.tar.gz) = 26480 diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile index b1ddef90cba..32ced087de4 100644 --- a/databases/p5-MongoDB/Makefile +++ b/databases/p5-MongoDB/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MongoDB -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 DISTVERSIONPREFIX= v CATEGORIES= databases perl5 MASTER_SITES= CPAN diff --git a/databases/p5-MongoDB/distinfo b/databases/p5-MongoDB/distinfo index ee7c151698c..9e496a9400e 100644 --- a/databases/p5-MongoDB/distinfo +++ b/databases/p5-MongoDB/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463680542 -SHA256 (MongoDB-v1.4.1.tar.gz) = 5d6efb371fabf56b8163d0ac830852e6cddf1db7fb0e88305695577b5a16e432 -SIZE (MongoDB-v1.4.1.tar.gz) = 2532533 +TIMESTAMP = 1466508961 +SHA256 (MongoDB-v1.4.2.tar.gz) = 471dd3700c19876336745e35270fd7c6f947daf9f50099d1a21b5952d690bdb5 +SIZE (MongoDB-v1.4.2.tar.gz) = 2532631 diff --git a/databases/p5-Prophet/Makefile b/databases/p5-Prophet/Makefile index 0bfda7f93e6..9bd92e56181 100644 --- a/databases/p5-Prophet/Makefile +++ b/databases/p5-Prophet/Makefile @@ -34,7 +34,7 @@ BUILD_DEPENDS= p5-Any-Moose>=0.04:devel/p5-Any-Moose \ p5-Proc-InvokeEditor>=0:editors/p5-Proc-InvokeEditor \ p5-Template-Declare>=0.35:textproc/p5-Template-Declare \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ - p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl \ + p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl \ p5-Time-Progress>=0:devel/p5-Time-Progress \ p5-URI>=0:net/p5-URI \ p5-UUID-Tiny>=1.02:devel/p5-UUID-Tiny \ diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile index b7e7b4939e4..c491021ac45 100644 --- a/databases/sqlitestudio/Makefile +++ b/databases/sqlitestudio/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sqlitestudio -PORTVERSION= 3.0.7 +PORTVERSION= 3.1.0 CATEGORIES= databases MASTER_SITES= http://sqlitestudio.pl/files/sqlitestudio3/complete/tar/ @@ -12,52 +12,48 @@ COMMENT= SQLite database GUI manager LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/guiSQLiteStudio/license.txt -OPTIONS_DEFINE= PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT PLUGIN_HTML_EXPORT -OPTIONS_DEFINE+= PLUGIN_PDF_EXPORT PLUGIN_JSON_EXPORT PLUGIN_XML_EXPORT -OPTIONS_DEFINE+= PLUGIN_SQL_EXPORT PLUGIN_REGEXP_IMPORT -OPTIONS_DEFINE+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_ENTERPRISE_FORMATTER -OPTIONS_DEFINE+= PLUGIN_PRINTING +OPTIONS_DEFINE= PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT PLUGIN_DB_SQLITE_CIPHER PLUGIN_HTML_EXPORT +OPTIONS_DEFINE+= PLUGIN_JSON_EXPORT PLUGIN_PDF_EXPORT PLUGIN_PRINTING PLUGIN_REGEXP_IMPORT +OPTIONS_DEFINE+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_EXPORT PLUGIN_SQL_ENTERPRISE_FORMATTER +OPTIONS_DEFINE+= PLUGIN_XML_EXPORT PLUGIN_CSV_IMPORT_DESC= Install CsvImport plugin PLUGIN_CSV_EXPORT_DESC= Install CsvExport plugin +PLUGIN_DB_SQLITE_CIPHER_DESC= Install DbSqliteCipher plugin PLUGIN_HTML_EXPORT_DESC= Install HtmlExport plugin -PLUGIN_PDF_EXPORT_DESC= Install PdfExport plugin PLUGIN_JSON_EXPORT_DESC= Install JsonExport plugin -PLUGIN_XML_EXPORT_DESC= Install XmlExport plugin -PLUGIN_SQL_EXPORT_DESC= Install SqlExport plugin +PLUGIN_PDF_EXPORT_DESC= Install PdfExport plugin +PLUGIN_PRINTING_DESC= Install Printing plugin PLUGIN_REGEXP_IMPORT_DESC= Install RegExp plugin PLUGIN_SQL_FORMATTER_SIMPLE_DESC= Install SqlFormatterSimple plugin +PLUGIN_SQL_EXPORT_DESC= Install SqlExport plugin PLUGIN_SQL_ENTERPRISE_FORMATTER_DESC= Install SqlEnterpriseFormatter plugin -PLUGIN_PRINTING_DESC= Install Printing plugin +PLUGIN_XML_EXPORT_DESC= Install XmlExport plugin + OPTIONS_DEFAULT= PLUGIN_CSV_IMPORT PLUGIN_CSV_EXPORT PLUGIN_HTML_EXPORT -OPTIONS_DEFAULT+= PLUGIN_PDF_EXPORT PLUGIN_JSON_EXPORT PLUGIN_XML_EXPORT -OPTIONS_DEFAULT+= PLUGIN_SQL_EXPORT PLUGIN_REGEXP_IMPORT -OPTIONS_DEFAULT+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_ENTERPRISE_FORMATTER -OPTIONS_DEFAULT+= PLUGIN_PRINTING +OPTIONS_DEFAULT+= PLUGIN_JSON_EXPORT PLUGIN_PDF_EXPORT PLUGIN_PRINTING PLUGIN_REGEXP_IMPORT +OPTIONS_DEFAULT+= PLUGIN_SQL_FORMATTER_SIMPLE PLUGIN_SQL_EXPORT PLUGIN_SQL_ENTERPRISE_FORMATTER +OPTIONS_DEFAULT+= PLUGIN_XML_EXPORT OPTIONS_SUB= yes WRKSRC= ${WRKDIR}/SQLiteStudio3 -USES= compiler:c++11-lib gmake ncurses qmake sqlite +USES= compiler:c++11-lib gmake ncurses qmake readline sqlite +USE_CXXSTD= c++11 USE_QT5= core gui svg sql xml network sql-sqlite3_run widgets script \ concurrent uitools buildtools_build linguisttools_build USE_GL= gl USE_LDCONFIG= yes -.include - -.if ${COMPILER_TYPE} == clang && (${COMPILER_VERSION} < 37) -# The reason for clang37 is that previous versions fail to compile with various errors -BUILD_DEPENDS+= clang37:lang/clang37 -CPP= clang-cpp37 -CC= clang37 -CXX= clang++37 -.endif +CXXFLAGS+= -I${WRKSRC}/coreSQLiteStudio post-patch: @${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|' \ ${WRKSRC}/dirs.pri @${REINPLACE_CMD} -e 's|pluginDirs += QDir(CFG->getConfigDir()).absoluteFilePath("plugins");|pluginDirs += "${LOCALBASE}/lib/sqlitestudio";|' \ ${WRKSRC}/coreSQLiteStudio/services/impl/pluginmanagerimpl.cpp + # Patch from http://bugs.sqlitestudio.pl/index.rvt?id=3102 + @${REINPLACE_CMD} -e 's|^include(.*|include($$$$PWD/../../SQLiteStudio3/plugins.pri)|' \ + ${WRKDIR}/Plugins/DbSqliteCipher/DbSqliteCipher.pro .include @@ -68,36 +64,43 @@ PLUGIN_DIRS += CsvImport .if ${PORT_OPTIONS:MPLUGIN_CSV_EXPORT} PLUGIN_DIRS += CsvExport .endif +.if ${PORT_OPTIONS:MPLUGIN_DB_SQLITE_CIPHER} +PLUGIN_DIRS += DbSqliteCipher +USE_OPENSSL= yes +.endif .if ${PORT_OPTIONS:MPLUGIN_HTML_EXPORT} PLUGIN_DIRS += HtmlExport .endif -.if ${PORT_OPTIONS:MPLUGIN_PDF_EXPORT} -PLUGIN_DIRS += PdfExport -.endif .if ${PORT_OPTIONS:MPLUGIN_JSON_EXPORT} PLUGIN_DIRS += JsonExport .endif -.if ${PORT_OPTIONS:MPLUGIN_XML_EXPORT} -PLUGIN_DIRS += XmlExport -.endif -.if ${PORT_OPTIONS:MPLUGIN_SQL_EXPORT} -PLUGIN_DIRS += SqlExport -.endif -.if ${PORT_OPTIONS:MPLUGIN_REGEXP_IMPORT} -PLUGIN_DIRS += RegExpImport -.endif -.if ${PORT_OPTIONS:MPLUGIN_SQL_FORMATTER_SIMPLE} -PLUGIN_DIRS += SqlFormatterSimple -.endif -.if ${PORT_OPTIONS:MPLUGIN_SQL_ENTERPRISE_FORMATTER} -PLUGIN_DIRS += SqlEnterpriseFormatter +.if ${PORT_OPTIONS:MPLUGIN_PDF_EXPORT} +PLUGIN_DIRS += PdfExport .endif .if ${PORT_OPTIONS:MPLUGIN_PRINTING} PLUGIN_DIRS += Printing USE_QT5+= printsupport .endif +.if ${PORT_OPTIONS:MPLUGIN_REGEXP_IMPORT} +PLUGIN_DIRS += RegExpImport +.endif +.if ${PORT_OPTIONS:MPLUGIN_SQL_ENTERPRISE_FORMATTER} +PLUGIN_DIRS += SqlEnterpriseFormatter +.endif +.if ${PORT_OPTIONS:MPLUGIN_SQL_EXPORT} +PLUGIN_DIRS += SqlExport +.endif +.if ${PORT_OPTIONS:MPLUGIN_SQL_FORMATTER_SIMPLE} +PLUGIN_DIRS += SqlFormatterSimple +.endif +.if ${PORT_OPTIONS:MPLUGIN_XML_EXPORT} +PLUGIN_DIRS += XmlExport +.endif post-configure: + # Fix for a suspected bug in qmake: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210418 + @${REINPLACE_CMD} -E 's|SUBLIBS) -L[^ ]+|SUBLIBS) |' ${WRKSRC}/sqlitestudio/Makefile + @${REINPLACE_CMD} -E 's|LIBS)$$|LIBS) -L${PREFIX}/lib|' ${WRKSRC}/sqlitestudio/Makefile .for plugin in ${PLUGIN_DIRS} @cd ${WRKDIR}/Plugins/${plugin} && \ ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH} @@ -113,4 +116,4 @@ post-install: ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} .endfor -.include +.include diff --git a/databases/sqlitestudio/distinfo b/databases/sqlitestudio/distinfo index 5d6f1cc1b98..4042e0c3283 100644 --- a/databases/sqlitestudio/distinfo +++ b/databases/sqlitestudio/distinfo @@ -1,2 +1,3 @@ -SHA256 (sqlitestudio-3.0.7.tar.gz) = b5ad7ac22a88eacb9404637ca6257934d0b1b59e16a182099bbdb158a7af55aa -SIZE (sqlitestudio-3.0.7.tar.gz) = 2551341 +TIMESTAMP = 1466103045 +SHA256 (sqlitestudio-3.1.0.tar.gz) = e36690e71825a21d4274de730932a05a029b01dad28728b2c45f9fce0cfe9894 +SIZE (sqlitestudio-3.1.0.tar.gz) = 4565170 diff --git a/databases/sqlitestudio/pkg-plist b/databases/sqlitestudio/pkg-plist index 2bbca3e0bfb..5fbfbc4ffc1 100644 --- a/databases/sqlitestudio/pkg-plist +++ b/databases/sqlitestudio/pkg-plist @@ -10,12 +10,13 @@ lib/libguiSQLiteStudio.so.1.0 lib/libguiSQLiteStudio.so.1.0.0 %%PLUGIN_CSV_IMPORT%%lib/sqlitestudio/libCsvImport.so %%PLUGIN_CSV_EXPORT%%lib/sqlitestudio/libCsvExport.so +%%PLUGIN_DB_SQLITE_CIPHER%%lib/sqlitestudio/libDbSqliteCipher.so %%PLUGIN_HTML_EXPORT%%lib/sqlitestudio/libHtmlExport.so -%%PLUGIN_PDF_EXPORT%%lib/sqlitestudio/libPdfExport.so %%PLUGIN_JSON_EXPORT%%lib/sqlitestudio/libJsonExport.so -%%PLUGIN_XML_EXPORT%%lib/sqlitestudio/libXmlExport.so -%%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so +%%PLUGIN_PDF_EXPORT%%lib/sqlitestudio/libPdfExport.so +%%PLUGIN_PRINTING%%lib/sqlitestudio/libPrinting.so %%PLUGIN_REGEXP_IMPORT%%lib/sqlitestudio/libRegExpImport.so %%PLUGIN_SQL_FORMATTER_SIMPLE%%lib/sqlitestudio/libSqlFormatterSimple.so +%%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so %%PLUGIN_SQL_ENTERPRISE_FORMATTER%%lib/sqlitestudio/libSqlEnterpriseFormatter.so -%%PLUGIN_PRINTING%%lib/sqlitestudio/libPrinting.so +%%PLUGIN_XML_EXPORT%%lib/sqlitestudio/libXmlExport.so diff --git a/databases/yasql/Makefile b/databases/yasql/Makefile index 545d13ff9ba..d9caed7f499 100644 --- a/databases/yasql/Makefile +++ b/databases/yasql/Makefile @@ -13,7 +13,7 @@ COMMENT= Yet Another SQL*Plus Replacement LICENSE= GPLv2 RUN_DEPENDS= p5-DBD-Oracle>0:databases/p5-DBD-Oracle \ - p5-ReadLine-Gnu>0:devel/p5-ReadLine-Gnu + p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu NO_ARCH= yes diff --git a/devel/Makefile b/devel/Makefile index 1e903eece84..bf7f825dcdf 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -2988,9 +2988,6 @@ SUBDIR += p5-Range-String SUBDIR += p5-Rcs SUBDIR += p5-Rcs-Agent - SUBDIR += p5-ReadLine-Gnu - SUBDIR += p5-ReadLine-Perl - SUBDIR += p5-ReadLine-TTYtter SUBDIR += p5-Readonly SUBDIR += p5-Readonly-XS SUBDIR += p5-Reflex @@ -3173,7 +3170,9 @@ SUBDIR += p5-Term-RawInput SUBDIR += p5-Term-ReadKey SUBDIR += p5-Term-ReadLine + SUBDIR += p5-Term-ReadLine-Gnu SUBDIR += p5-Term-ReadLine-Perl + SUBDIR += p5-Term-ReadLine-TTYtter SUBDIR += p5-Term-ReadLine-Zoid SUBDIR += p5-Term-ReadPassword SUBDIR += p5-Term-Screen diff --git a/devel/elixir-connection/Makefile b/devel/elixir-connection/Makefile index 8c0a4cada73..76e3b2e5b21 100644 --- a/devel/elixir-connection/Makefile +++ b/devel/elixir-connection/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= connection -PORTVERSION= 1.0.2 +PORTVERSION= 1.0.3 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-connection/distinfo b/devel/elixir-connection/distinfo index a37fafed1de..7727a8654fe 100644 --- a/devel/elixir-connection/distinfo +++ b/devel/elixir-connection/distinfo @@ -1,2 +1,3 @@ -SHA256 (fishcakez-connection-v1.0.2_GH0.tar.gz) = 9244b425f53c8bff0149fddd5a9ce3b3761bbaa839ee14516a0769ef8d3e5f2f -SIZE (fishcakez-connection-v1.0.2_GH0.tar.gz) = 14292 +TIMESTAMP = 1466541327 +SHA256 (fishcakez-connection-v1.0.3_GH0.tar.gz) = 2600c5284ede40f1fb12b8c410e9af46d2aedf02b7d9bd070c17ab55a51337cf +SIZE (fishcakez-connection-v1.0.3_GH0.tar.gz) = 14350 diff --git a/devel/elixir-csv/Makefile b/devel/elixir-csv/Makefile index ee3e0b8a1ff..3a86fe2498a 100644 --- a/devel/elixir-csv/Makefile +++ b/devel/elixir-csv/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= csv -PORTVERSION= 1.4.1 +PORTVERSION= 1.4.2 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-csv/distinfo b/devel/elixir-csv/distinfo index c7a7ec8b24f..a38013f4059 100644 --- a/devel/elixir-csv/distinfo +++ b/devel/elixir-csv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463924896 -SHA256 (beatrichartz-csv-v1.4.1_GH0.tar.gz) = 9aebf7da2b20b37dfc290e68d04c695abc70efce2d01e149c728043e7565da9f -SIZE (beatrichartz-csv-v1.4.1_GH0.tar.gz) = 16814 +TIMESTAMP = 1466540234 +SHA256 (beatrichartz-csv-v1.4.2_GH0.tar.gz) = 51f94ca6be1cbdc4b4025f8ccdd67a3183d402005f804d63fdb400327f4ed439 +SIZE (beatrichartz-csv-v1.4.2_GH0.tar.gz) = 16819 diff --git a/devel/elixir-plug/Makefile b/devel/elixir-plug/Makefile index 5aee989a5ca..5ac259b5cb4 100644 --- a/devel/elixir-plug/Makefile +++ b/devel/elixir-plug/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= plug -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.6 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- @@ -14,5 +14,6 @@ LICENSE= APACHE20 USES= elixir USE_GITHUB= yes GH_ACCOUNT= elixir-lang +MIX_REWRITE= yes .include diff --git a/devel/elixir-plug/distinfo b/devel/elixir-plug/distinfo index b73900b3835..11efd01ebc5 100644 --- a/devel/elixir-plug/distinfo +++ b/devel/elixir-plug/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464594983 -SHA256 (elixir-lang-plug-v1.1.5_GH0.tar.gz) = 1401d5b000e94da95e97e310c1aabf2c51b7a1b356b1dd81664fde15ccf8c1e7 -SIZE (elixir-lang-plug-v1.1.5_GH0.tar.gz) = 108782 +TIMESTAMP = 1466540586 +SHA256 (elixir-lang-plug-v1.1.6_GH0.tar.gz) = f1713316c2cf712673bdad0016a19e452b6b6f41fad018bd9031b86ab02f0f78 +SIZE (elixir-lang-plug-v1.1.6_GH0.tar.gz) = 108845 diff --git a/devel/elixir-plug/files/patch-mix.exs b/devel/elixir-plug/files/patch-mix.exs deleted file mode 100644 index 07aff16872e..00000000000 --- a/devel/elixir-plug/files/patch-mix.exs +++ /dev/null @@ -1,11 +0,0 @@ ---- mix.exs.orig 2015-07-27 05:39:41 UTC -+++ mix.exs -@@ -7,7 +7,7 @@ defmodule Plug.Mixfile do - [app: :plug, - version: @version, - elixir: "~> 1.0", -- deps: deps, -+ deps: [], - package: package, - description: "A specification and conveniences for composable " <> - "modules in between web applications", diff --git a/devel/elixir-poison/Makefile b/devel/elixir-poison/Makefile index 78b4cf8f241..4a13fcbc158 100644 --- a/devel/elixir-poison/Makefile +++ b/devel/elixir-poison/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= poison -PORTVERSION= 2.1.0 +PORTVERSION= 2.2.0 CATEGORIES= devel PKGNAMEPREFIX= elixir- diff --git a/devel/elixir-poison/distinfo b/devel/elixir-poison/distinfo index 3409c050ed7..03ab5f91037 100644 --- a/devel/elixir-poison/distinfo +++ b/devel/elixir-poison/distinfo @@ -1,2 +1,3 @@ -SHA256 (devinus-poison-2.1.0_GH0.tar.gz) = ec0bce4b6cdb8d9cd4b9702cad695f0e653cf1f6d4f85ee67f057ce5d90dc0a5 -SIZE (devinus-poison-2.1.0_GH0.tar.gz) = 30145 +TIMESTAMP = 1466540464 +SHA256 (devinus-poison-2.2.0_GH0.tar.gz) = a635728834d9e93cbd08dc69c94b737b35e4336fe004939fde855ea238d0a58d +SIZE (devinus-poison-2.2.0_GH0.tar.gz) = 30779 diff --git a/devel/elixir-poison/pkg-plist b/devel/elixir-poison/pkg-plist index 4efd2dac9e4..aa61177230a 100644 --- a/devel/elixir-poison/pkg-plist +++ b/devel/elixir-poison/pkg-plist @@ -12,6 +12,7 @@ lib/elixir/lib/poison/ebin/Elixir.Poison.Encoder.HashSet.beam lib/elixir/lib/poison/ebin/Elixir.Poison.Encoder.Integer.beam lib/elixir/lib/poison/ebin/Elixir.Poison.Encoder.List.beam lib/elixir/lib/poison/ebin/Elixir.Poison.Encoder.Map.beam +lib/elixir/lib/poison/ebin/Elixir.Poison.Encoder.MapSet.beam lib/elixir/lib/poison/ebin/Elixir.Poison.Encoder.Range.beam lib/elixir/lib/poison/ebin/Elixir.Poison.Encoder.Stream.beam lib/elixir/lib/poison/ebin/Elixir.Poison.Encoder.beam diff --git a/devel/hyperscan/distinfo b/devel/hyperscan/distinfo index 2afc06a7c93..fd8895adc7b 100644 --- a/devel/hyperscan/distinfo +++ b/devel/hyperscan/distinfo @@ -2,5 +2,3 @@ SHA256 (01org-hyperscan-v4.2.0_GH0.tar.gz) = d06d8f31a62e5d2903a8ccf07696e02cadf SIZE (01org-hyperscan-v4.2.0_GH0.tar.gz) = 1362515 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (01org-hyperscan-v4.2.0_GH0.tar.gz) = d06d8f31a62e5d2903a8ccf07696e02cadf4de2024dc3b558d410d913c81dbef -SIZE (01org-hyperscan-v4.2.0_GH0.tar.gz) = 1362515 diff --git a/devel/p5-B-Generate/Makefile b/devel/p5-B-Generate/Makefile index a46119828b9..a74ac5e8491 100644 --- a/devel/p5-B-Generate/Makefile +++ b/devel/p5-B-Generate/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= B-Generate -PORTVERSION= 1.53 +PORTVERSION= 1.54 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-B-Generate/distinfo b/devel/p5-B-Generate/distinfo index 8d9f2d4d5e8..062b7b6e8be 100644 --- a/devel/p5-B-Generate/distinfo +++ b/devel/p5-B-Generate/distinfo @@ -1,2 +1,3 @@ -SHA256 (B-Generate-1.53.tar.gz) = 8922042f100f64cdf18c15598bad1be86778185ba298dea268ada457dfbf456e -SIZE (B-Generate-1.53.tar.gz) = 37591 +TIMESTAMP = 1466509043 +SHA256 (B-Generate-1.54.tar.gz) = 33cd1e0fee083bef93bc10aa75888b5b2f99500679c24431628ec2ddb7359a6a +SIZE (B-Generate-1.54.tar.gz) = 38330 diff --git a/devel/p5-B-OPCheck/Makefile b/devel/p5-B-OPCheck/Makefile index b97f71638ca..6505f65a3ff 100644 --- a/devel/p5-B-OPCheck/Makefile +++ b/devel/p5-B-OPCheck/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= B-OPCheck -PORTVERSION= 0.30 +PORTVERSION= 0.31 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-B-OPCheck/distinfo b/devel/p5-B-OPCheck/distinfo index 7d4423f7f50..574195ebea2 100644 --- a/devel/p5-B-OPCheck/distinfo +++ b/devel/p5-B-OPCheck/distinfo @@ -1,2 +1,3 @@ -SHA256 (B-OPCheck-0.30.tar.gz) = 3a01bb406543cd204453322647fa48fcad2ecd9d5cc689154dfad71a441ad1bd -SIZE (B-OPCheck-0.30.tar.gz) = 74668 +TIMESTAMP = 1466509546 +SHA256 (B-OPCheck-0.31.tar.gz) = d589fbfbaef8e4c0a6caf515647b7522a92c7a59e73d6cc1d3bd00a67c46d65d +SIZE (B-OPCheck-0.31.tar.gz) = 76059 diff --git a/devel/p5-CPAN-Checksums/Makefile b/devel/p5-CPAN-Checksums/Makefile index 6a7c724c81a..b8b922006f6 100644 --- a/devel/p5-CPAN-Checksums/Makefile +++ b/devel/p5-CPAN-Checksums/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= CPAN-Checksums -PORTVERSION= 2.11 +PORTVERSION= 2.12 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,9 +14,9 @@ LICENSE= ART10 GPLv1 LICENSE_COMB= dual BUILD_DEPENDS= p5-Data-Compare>=0:devel/p5-Data-Compare \ + p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 \ p5-Module-Signature>=0:security/p5-Module-Signature RUN_DEPENDS:= ${BUILD_DEPENDS} -TEST_DEPENDS= p5-Compress-Bzip2>=0:archivers/p5-Compress-Bzip2 NO_ARCH= yes USES= perl5 diff --git a/devel/p5-CPAN-Checksums/distinfo b/devel/p5-CPAN-Checksums/distinfo index a9656e03464..c5a50ae3534 100644 --- a/devel/p5-CPAN-Checksums/distinfo +++ b/devel/p5-CPAN-Checksums/distinfo @@ -1,2 +1,3 @@ -SHA256 (CPAN-Checksums-2.11.tar.gz) = 69a734fd3abd7de02cb07bef481ec79c93dc703ca116fbc6e6ef9975fb6d35e2 -SIZE (CPAN-Checksums-2.11.tar.gz) = 14686 +TIMESTAMP = 1466509957 +SHA256 (CPAN-Checksums-2.12.tar.gz) = 99600fb2d1a007f84e16b5eae608ffbc288bd0af92fbcc5d73120d43ee5d2d38 +SIZE (CPAN-Checksums-2.12.tar.gz) = 14868 diff --git a/devel/p5-CPAN-Perl-Releases/Makefile b/devel/p5-CPAN-Perl-Releases/Makefile index 1c73d6447c3..eed13dc60fc 100644 --- a/devel/p5-CPAN-Perl-Releases/Makefile +++ b/devel/p5-CPAN-Perl-Releases/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= CPAN-Perl-Releases -PORTVERSION= 2.78 +PORTVERSION= 2.80 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-CPAN-Perl-Releases/distinfo b/devel/p5-CPAN-Perl-Releases/distinfo index 3cdfa6dd905..3bf7679201b 100644 --- a/devel/p5-CPAN-Perl-Releases/distinfo +++ b/devel/p5-CPAN-Perl-Releases/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464178135 -SHA256 (CPAN-Perl-Releases-2.78.tar.gz) = e95304d4a73e082c3d5e52b33098f7fe8b2b02375217847a5861148e5a3eb9f9 -SIZE (CPAN-Perl-Releases-2.78.tar.gz) = 25288 +TIMESTAMP = 1466510360 +SHA256 (CPAN-Perl-Releases-2.80.tar.gz) = 03a20b05fb9c0f618dc1016d782de7ea5356418ea328136334a4bb59f1d51be8 +SIZE (CPAN-Perl-Releases-2.80.tar.gz) = 24884 diff --git a/devel/p5-CPANPLUS-Dist-Build/Makefile b/devel/p5-CPANPLUS-Dist-Build/Makefile index a80e5398233..bb918f56485 100644 --- a/devel/p5-CPANPLUS-Dist-Build/Makefile +++ b/devel/p5-CPANPLUS-Dist-Build/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= CPANPLUS-Dist-Build -PORTVERSION= 0.78 -PORTREVISION= 1 +PORTVERSION= 0.80 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-CPANPLUS-Dist-Build/distinfo b/devel/p5-CPANPLUS-Dist-Build/distinfo index 00cf7518957..92b504c4119 100644 --- a/devel/p5-CPANPLUS-Dist-Build/distinfo +++ b/devel/p5-CPANPLUS-Dist-Build/distinfo @@ -1,2 +1,3 @@ -SHA256 (CPANPLUS-Dist-Build-0.78.tar.gz) = 27710356feeb9ed30aadc033040150127a5a3b760d7e58c2a8be68d6b5c7ee69 -SIZE (CPANPLUS-Dist-Build-0.78.tar.gz) = 48511 +TIMESTAMP = 1466510438 +SHA256 (CPANPLUS-Dist-Build-0.80.tar.gz) = 85268f85372ebb571da15295381b36f59ee7ad1f3d75d80927e7eb00bfa7518d +SIZE (CPANPLUS-Dist-Build-0.80.tar.gz) = 48769 diff --git a/devel/p5-Cache-FastMmap/Makefile b/devel/p5-Cache-FastMmap/Makefile index 62b91bebe56..fb35e8df0ac 100644 --- a/devel/p5-Cache-FastMmap/Makefile +++ b/devel/p5-Cache-FastMmap/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= Cache-FastMmap -PORTVERSION= 1.43 +PORTVERSION= 1.44 CATEGORIES= devel perl5 -MASTER_SITES= CPAN +MASTER_SITES= CPAN CPAN/Cache MASTER_SITE_SUBDIR= CPAN:ROBM PKGNAMEPREFIX= p5- diff --git a/devel/p5-Cache-FastMmap/distinfo b/devel/p5-Cache-FastMmap/distinfo index 947d5e576b4..a095029cf2d 100644 --- a/devel/p5-Cache-FastMmap/distinfo +++ b/devel/p5-Cache-FastMmap/distinfo @@ -1,2 +1,3 @@ -SHA256 (Cache-FastMmap-1.43.tar.gz) = 71836096c8ed19ceecbac227a8ed639ac79ac6581c22fe22f23e1e13e10261a2 -SIZE (Cache-FastMmap-1.43.tar.gz) = 48725 +TIMESTAMP = 1466510516 +SHA256 (Cache-FastMmap-1.44.tar.gz) = 0597423c9bca4469b124d51dfd439eaacb2241d6a03b48191448fd457d8061d6 +SIZE (Cache-FastMmap-1.44.tar.gz) = 49451 diff --git a/devel/p5-Carp-Clan/Makefile b/devel/p5-Carp-Clan/Makefile index 19735c2a2ea..23d2abe3739 100644 --- a/devel/p5-Carp-Clan/Makefile +++ b/devel/p5-Carp-Clan/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Carp-Clan -PORTVERSION= 6.04 -PORTREVISION= 1 +PORTVERSION= 6.06 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Carp-Clan/distinfo b/devel/p5-Carp-Clan/distinfo index 7c4f95633dd..edae34b3d29 100644 --- a/devel/p5-Carp-Clan/distinfo +++ b/devel/p5-Carp-Clan/distinfo @@ -1,2 +1,3 @@ -SHA256 (Carp-Clan-6.04.tar.gz) = 542e13ece92d40545b8ba6626cfc6ed73071c6cbf6a5537ca126c41b349ae1ec -SIZE (Carp-Clan-6.04.tar.gz) = 19345 +TIMESTAMP = 1466510706 +SHA256 (Carp-Clan-6.06.tar.gz) = ea4ac8f611354756d43cb369880032901e9cc4cc7e0bebb7b647186dac00c9d4 +SIZE (Carp-Clan-6.06.tar.gz) = 21556 diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile index 5ecb3d266e9..57e76829588 100644 --- a/devel/p5-Config-Model/Makefile +++ b/devel/p5-Config-Model/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Config-Model -PORTVERSION= 2.083 +PORTVERSION= 2.086 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Config-Model/distinfo b/devel/p5-Config-Model/distinfo index d0a93e30f6a..7b2aa980f0f 100644 --- a/devel/p5-Config-Model/distinfo +++ b/devel/p5-Config-Model/distinfo @@ -1,2 +1,3 @@ -SHA256 (Config-Model-2.083.tar.gz) = 4d7d0e69556fa2d8f5f3f998bbea72bf52b3a17e2b30f2bcdc06e1a58a0978cf -SIZE (Config-Model-2.083.tar.gz) = 331089 +TIMESTAMP = 1466510786 +SHA256 (Config-Model-2.086.tar.gz) = a8ce5ae745c1d6e1022f82f3c7e767ca1478746562243ab3712de6587d80d310 +SIZE (Config-Model-2.086.tar.gz) = 326391 diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile index 8176536d34b..e6f18a040be 100644 --- a/devel/p5-DateTime-Locale/Makefile +++ b/devel/p5-DateTime-Locale/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= DateTime-Locale -PORTVERSION= 1.03 +PORTVERSION= 1.04 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-DateTime-Locale/distinfo b/devel/p5-DateTime-Locale/distinfo index a69f7f3ffaa..aa77593d975 100644 --- a/devel/p5-DateTime-Locale/distinfo +++ b/devel/p5-DateTime-Locale/distinfo @@ -1,2 +1,3 @@ -SHA256 (DateTime-Locale-1.03.tar.gz) = 3100568a62a91ca1c09c0aac8e1e4ba34e6f82047ec64f714733a647c040f511 -SIZE (DateTime-Locale-1.03.tar.gz) = 959190 +TIMESTAMP = 1466510910 +SHA256 (DateTime-Locale-1.04.tar.gz) = 26227b38cd5c9eabef00316215942b2a44b7939b5e226d25864e9bccf6909ac9 +SIZE (DateTime-Locale-1.04.tar.gz) = 959451 diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile index e13ad461196..5112e56c10d 100644 --- a/devel/p5-Debug-Client/Makefile +++ b/devel/p5-Debug-Client/Makefile @@ -14,10 +14,10 @@ LICENSE= ART10 GPLv1 LICENSE_COMB= dual BUILD_DEPENDS= p5-PadWalker>=1.96:devel/p5-PadWalker \ - p5-ReadLine-Perl>=1.0303:devel/p5-ReadLine-Perl + p5-Term-ReadLine-Perl>=1.0303:devel/p5-Term-ReadLine-Perl RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-File-HomeDir>=1:devel/p5-File-HomeDir \ - p5-ReadLine-Gnu>=1.20:devel/p5-ReadLine-Gnu \ + p5-Term-ReadLine-Gnu>=1.20:devel/p5-Term-ReadLine-Gnu \ p5-Test-CheckDeps>=0.006:devel/p5-Test-CheckDeps \ p5-Test-Class>=0.39:devel/p5-Test-Class \ p5-Test-Deep>=0.110:devel/p5-Test-Deep \ diff --git a/devel/p5-Devel-PPPort/Makefile b/devel/p5-Devel-PPPort/Makefile index 2eab9f99530..b606352ec4b 100644 --- a/devel/p5-Devel-PPPort/Makefile +++ b/devel/p5-Devel-PPPort/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Devel-PPPort -PORTVERSION= 3.32 +PORTVERSION= 3.35 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Devel-PPPort/distinfo b/devel/p5-Devel-PPPort/distinfo index b2341b97f71..716443864b3 100644 --- a/devel/p5-Devel-PPPort/distinfo +++ b/devel/p5-Devel-PPPort/distinfo @@ -1,2 +1,3 @@ -SHA256 (Devel-PPPort-3.32.tar.gz) = 257801ef441f317bc79d20cdc72344e5b4ff6f685d65bdf79ff153e733fa3856 -SIZE (Devel-PPPort-3.32.tar.gz) = 218396 +TIMESTAMP = 1466511092 +SHA256 (Devel-PPPort-3.35.tar.gz) = 07071b7d383e3936b3d753ba6d4de23f497888ee991d58ae52c81d1b9d160aed +SIZE (Devel-PPPort-3.35.tar.gz) = 224242 diff --git a/devel/p5-Eval-Closure/Makefile b/devel/p5-Eval-Closure/Makefile index c6544d6a144..201ab6f6370 100644 --- a/devel/p5-Eval-Closure/Makefile +++ b/devel/p5-Eval-Closure/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Eval-Closure -PORTVERSION= 0.13 +PORTVERSION= 0.14 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:DOY diff --git a/devel/p5-Eval-Closure/distinfo b/devel/p5-Eval-Closure/distinfo index e909e8f00f8..1edf4be6a62 100644 --- a/devel/p5-Eval-Closure/distinfo +++ b/devel/p5-Eval-Closure/distinfo @@ -1,2 +1,3 @@ -SHA256 (Eval-Closure-0.13.tar.gz) = 65bec0368e8f0631a24bf6dc6dd24d2d8d485350e406d20005db2c6aa1c0445d -SIZE (Eval-Closure-0.13.tar.gz) = 19735 +TIMESTAMP = 1466511227 +SHA256 (Eval-Closure-0.14.tar.gz) = ea0944f2f5ec98d895bef6d503e6e4a376fea6383a6bc64c7670d46ff2218cad +SIZE (Eval-Closure-0.14.tar.gz) = 20128 diff --git a/devel/p5-Event/Makefile b/devel/p5-Event/Makefile index 7fcaff0fd3d..0d9ebfca12a 100644 --- a/devel/p5-Event/Makefile +++ b/devel/p5-Event/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Event -PORTVERSION= 1.24 -PORTREVISION= 1 +PORTVERSION= 1.26 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Event/distinfo b/devel/p5-Event/distinfo index d9f9911ffef..5ff928328a8 100644 --- a/devel/p5-Event/distinfo +++ b/devel/p5-Event/distinfo @@ -1,2 +1,3 @@ -SHA256 (Event-1.24.tar.gz) = 8a7ff96b6f058f2f2b45e5eef8438dcc335151571c274ae2bdbe2d91abb36d7e -SIZE (Event-1.24.tar.gz) = 254789 +TIMESTAMP = 1466511290 +SHA256 (Event-1.26.tar.gz) = 4fb5362415b650b5ae7152ca41c0fac3f010979fb3573a2e0218579eeacb2ec5 +SIZE (Event-1.26.tar.gz) = 254787 diff --git a/devel/p5-Git-PurePerl/Makefile b/devel/p5-Git-PurePerl/Makefile index d228e3855c0..2e1db7709b9 100644 --- a/devel/p5-Git-PurePerl/Makefile +++ b/devel/p5-Git-PurePerl/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= Git-PurePerl -PORTVERSION= 0.51 +PORTVERSION= 0.52 CATEGORIES= devel perl5 -MASTER_SITES= CPAN +MASTER_SITES= CPAN/Git CPAN MASTER_SITE_SUBDIR= CPAN:BROQ PKGNAMEPREFIX= p5- diff --git a/devel/p5-Git-PurePerl/distinfo b/devel/p5-Git-PurePerl/distinfo index ff8971653d9..1256e2fafb7 100644 --- a/devel/p5-Git-PurePerl/distinfo +++ b/devel/p5-Git-PurePerl/distinfo @@ -1,2 +1,3 @@ -SHA256 (Git-PurePerl-0.51.tar.gz) = 3775f385ae566ea392ece0913a06ffec46441a1273c19ba9a6d990574ec34d00 -SIZE (Git-PurePerl-0.51.tar.gz) = 65486 +TIMESTAMP = 1466511386 +SHA256 (Git-PurePerl-0.52.tar.gz) = f2cefd2b37d5bc21c048e1c692026d9a58849a610280059cc47ec2fc35ea9190 +SIZE (Git-PurePerl-0.52.tar.gz) = 65501 diff --git a/devel/p5-Git-Repository/Makefile b/devel/p5-Git-Repository/Makefile index c058cb1b847..465396dfe36 100644 --- a/devel/p5-Git-Repository/Makefile +++ b/devel/p5-Git-Repository/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Git-Repository -PORTVERSION= 1.319 +PORTVERSION= 1.320 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= git:devel/git \ p5-Git-Version-Compare>=1.001:devel/p5-Git-Version-Compare \ - p5-System-Command>=1.103:devel/p5-System-Command \ + p5-System-Command>=1.118:devel/p5-System-Command \ p5-namespace-clean>=0:devel/p5-namespace-clean RUN_DEPENDS:= ${BUILD_DEPENDS} TEST_DEPENDS= p5-Test-Requires-Git>=1.005:devel/p5-Test-Requires-Git diff --git a/devel/p5-Git-Repository/distinfo b/devel/p5-Git-Repository/distinfo index c3b5d847d62..67d88abe6fb 100644 --- a/devel/p5-Git-Repository/distinfo +++ b/devel/p5-Git-Repository/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463680573 -SHA256 (Git-Repository-1.319.tar.gz) = 1b66f64f66a61349a10b6d13f8fc74bfe48a96de5eb8de5c0d091699c9f33e53 -SIZE (Git-Repository-1.319.tar.gz) = 54309 +TIMESTAMP = 1466511602 +SHA256 (Git-Repository-1.320.tar.gz) = 3df3e65fb84052cfe5a9c4276ca1506061d5207bda903aa93c19e7c13709f628 +SIZE (Git-Repository-1.320.tar.gz) = 54445 diff --git a/devel/p5-Hash-Util-FieldHash-Compat/Makefile b/devel/p5-Hash-Util-FieldHash-Compat/Makefile index cc136a426cd..98aee9eca95 100644 --- a/devel/p5-Hash-Util-FieldHash-Compat/Makefile +++ b/devel/p5-Hash-Util-FieldHash-Compat/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Hash-Util-FieldHash-Compat -PORTVERSION= 0.10 +PORTVERSION= 0.11 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Hash-Util-FieldHash-Compat/distinfo b/devel/p5-Hash-Util-FieldHash-Compat/distinfo index 82f8f93e125..d5ee34de608 100644 --- a/devel/p5-Hash-Util-FieldHash-Compat/distinfo +++ b/devel/p5-Hash-Util-FieldHash-Compat/distinfo @@ -1,2 +1,3 @@ -SHA256 (Hash-Util-FieldHash-Compat-0.10.tar.gz) = 29b1bafc14cc09d87b9648ad9cff17479ffc8987d2b13f83da22f9d1385310dc -SIZE (Hash-Util-FieldHash-Compat-0.10.tar.gz) = 27200 +TIMESTAMP = 1466511902 +SHA256 (Hash-Util-FieldHash-Compat-0.11.tar.gz) = 642e46a75b537ba11420b30f8b03403c90a06a15458cd8009f339fe9e5f3741b +SIZE (Hash-Util-FieldHash-Compat-0.11.tar.gz) = 27473 diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile index 55f06a97d25..e7af82adbae 100644 --- a/devel/p5-Locale-libintl/Makefile +++ b/devel/p5-Locale-libintl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Locale-libintl -PORTVERSION= 1.25 +PORTVERSION= 1.26 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,9 +13,13 @@ COMMENT= Internationalization library for Perl LICENSE= LGPL21 -USES= gettext perl5 +USES= gettext iconv:translit perl5 USE_PERL5= configure +post-configure: + @${REINPLACE_CMD} -e '/cd gettext_xs/s=cd =cd $$(.CURDIR)/=' \ + ${WRKSRC}/Makefile + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Locale/gettext_xs/gettext_xs.so diff --git a/devel/p5-Locale-libintl/distinfo b/devel/p5-Locale-libintl/distinfo index 52b806613e5..c131c64ecc2 100644 --- a/devel/p5-Locale-libintl/distinfo +++ b/devel/p5-Locale-libintl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463505844 -SHA256 (libintl-perl-1.25.tar.gz) = a597e128742e1c1c973a5e968626ef55eb270e8ecde793333c7a7247895f2431 -SIZE (libintl-perl-1.25.tar.gz) = 462985 +TIMESTAMP = 1466512036 +SHA256 (libintl-perl-1.26.tar.gz) = 3f28eaa9d824c2852cf96bb6aa98495d302a6b95302f3e0738fe9389f8053e50 +SIZE (libintl-perl-1.26.tar.gz) = 463128 diff --git a/devel/p5-MCE/Makefile b/devel/p5-MCE/Makefile index 9afe9b53cc9..03aaa21a2fc 100644 --- a/devel/p5-MCE/Makefile +++ b/devel/p5-MCE/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MCE -PORTVERSION= 1.707 +PORTVERSION= 1.800 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:MARIOROY diff --git a/devel/p5-MCE/distinfo b/devel/p5-MCE/distinfo index 9ac9cd3fbfb..77a8fb54d98 100644 --- a/devel/p5-MCE/distinfo +++ b/devel/p5-MCE/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464328735 -SHA256 (MCE-1.707.tar.gz) = 8762aced95356047b8b3dee0ca0a32495f76a0899e70abc943016b5a12a0684b -SIZE (MCE-1.707.tar.gz) = 162331 +TIMESTAMP = 1466512826 +SHA256 (MCE-1.800.tar.gz) = 615612ce170be7abc27e592dfc2a4e25498cfd3e4fac15f4fba8bc66098fcc69 +SIZE (MCE-1.800.tar.gz) = 165132 diff --git a/devel/p5-Mock-Quick/Makefile b/devel/p5-Mock-Quick/Makefile index c43894b1879..85a45901955 100644 --- a/devel/p5-Mock-Quick/Makefile +++ b/devel/p5-Mock-Quick/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Mock-Quick -PORTVERSION= 1.110 +PORTVERSION= 1.111 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:EXODIST diff --git a/devel/p5-Mock-Quick/distinfo b/devel/p5-Mock-Quick/distinfo index 8d73c56a64b..55d8345e0dd 100644 --- a/devel/p5-Mock-Quick/distinfo +++ b/devel/p5-Mock-Quick/distinfo @@ -1,2 +1,3 @@ -SHA256 (Mock-Quick-1.110.tar.gz) = 58fc564bbc132f253ac2d0296f14304a02e58b71e4f1ed9915702e8fc331f83c -SIZE (Mock-Quick-1.110.tar.gz) = 18599 +TIMESTAMP = 1466512973 +SHA256 (Mock-Quick-1.111.tar.gz) = ff786008bf8c022064ececd3b7ed89c76b35e8d1eac6cf472a9f51771c1c9f2c +SIZE (Mock-Quick-1.111.tar.gz) = 18595 diff --git a/devel/p5-Module-CoreList/Makefile b/devel/p5-Module-CoreList/Makefile index 49dba0f6d76..8d9b2748222 100644 --- a/devel/p5-Module-CoreList/Makefile +++ b/devel/p5-Module-CoreList/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Module-CoreList -PORTVERSION= 5.20160520 +PORTVERSION= 5.20160620 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Module-CoreList/distinfo b/devel/p5-Module-CoreList/distinfo index 7837425c0ad..88e7d66b083 100644 --- a/devel/p5-Module-CoreList/distinfo +++ b/devel/p5-Module-CoreList/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464328750 -SHA256 (Module-CoreList-5.20160520.tar.gz) = cfc6f12313eafcaf32e1b48e750fba1175ebf77b9b45d531b35634862fbec8e1 -SIZE (Module-CoreList-5.20160520.tar.gz) = 89516 +TIMESTAMP = 1466513050 +SHA256 (Module-CoreList-5.20160620.tar.gz) = b37151038c9b488346ded30c0043e77e84049edbdf139b7b61468dc61f462d06 +SIZE (Module-CoreList-5.20160620.tar.gz) = 89917 diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile index 50036ccfe2b..d616358d46c 100644 --- a/devel/p5-Moo/Makefile +++ b/devel/p5-Moo/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Moo -PORTVERSION= 2.001001 -PORTREVISION= 3 +PORTVERSION= 2.002002 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:HAARG diff --git a/devel/p5-Moo/distinfo b/devel/p5-Moo/distinfo index da96a458ca3..9f7b9e1497e 100644 --- a/devel/p5-Moo/distinfo +++ b/devel/p5-Moo/distinfo @@ -1,2 +1,3 @@ -SHA256 (Moo-2.001001.tar.gz) = a68155b642f389cb1cc40139e2663d0c5d15eb71d9ecb0961623a73c10dd8ec0 -SIZE (Moo-2.001001.tar.gz) = 97813 +TIMESTAMP = 1466513113 +SHA256 (Moo-2.002002.tar.gz) = 5e684e216ebd4531f5fa69d97fa4911344abcb5e2f7f8c240240ec03fa2c5eff +SIZE (Moo-2.002002.tar.gz) = 104744 diff --git a/devel/p5-Moo/pkg-plist b/devel/p5-Moo/pkg-plist index 2898d7cc6e9..4a66d6ececb 100644 --- a/devel/p5-Moo/pkg-plist +++ b/devel/p5-Moo/pkg-plist @@ -2,7 +2,6 @@ %%SITE_PERL%%/Method/Generate/BuildAll.pm %%SITE_PERL%%/Method/Generate/Constructor.pm %%SITE_PERL%%/Method/Generate/DemolishAll.pm -%%SITE_PERL%%/Method/Inliner.pm %%SITE_PERL%%/Moo.pm %%SITE_PERL%%/Moo/HandleMoose.pm %%SITE_PERL%%/Moo/HandleMoose/FakeMetaClass.pm diff --git a/devel/p5-Moose/Makefile b/devel/p5-Moose/Makefile index dbc8211b65e..b0c1354cccc 100644 --- a/devel/p5-Moose/Makefile +++ b/devel/p5-Moose/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Moose -PORTVERSION= 2.1802 +PORTVERSION= 2.1804 PORTEPOCH= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN diff --git a/devel/p5-Moose/distinfo b/devel/p5-Moose/distinfo index 1b0826d75bc..3ad8420cba4 100644 --- a/devel/p5-Moose/distinfo +++ b/devel/p5-Moose/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464192192 -SHA256 (Moose-2.1802.tar.gz) = f446de4cfd23fa44dee70835e78ec95051614b90003e7df0b10ffe35f5b1f5f4 -SIZE (Moose-2.1802.tar.gz) = 807133 +TIMESTAMP = 1466513295 +SHA256 (Moose-2.1804.tar.gz) = 4d4ef9460a3bb82e4f84b0fe429c68552388b0fe8c03c680f50e2f8c7d53f4b3 +SIZE (Moose-2.1804.tar.gz) = 807829 diff --git a/devel/p5-MooseX-ClassAttribute/Makefile b/devel/p5-MooseX-ClassAttribute/Makefile index 2f3de6efef2..6024337982f 100644 --- a/devel/p5-MooseX-ClassAttribute/Makefile +++ b/devel/p5-MooseX-ClassAttribute/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= MooseX-ClassAttribute -PORTVERSION= 0.28 +PORTVERSION= 0.29 CATEGORIES= devel perl5 -MASTER_SITES= CPAN +MASTER_SITES= CPAN/MooseX CPAN MASTER_SITE_SUBDIR= CPAN:DROLSKY PKGNAMEPREFIX= p5- diff --git a/devel/p5-MooseX-ClassAttribute/distinfo b/devel/p5-MooseX-ClassAttribute/distinfo index 0bc4c26060e..909a8d04a80 100644 --- a/devel/p5-MooseX-ClassAttribute/distinfo +++ b/devel/p5-MooseX-ClassAttribute/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463680593 -SHA256 (MooseX-ClassAttribute-0.28.tar.gz) = 5160f0139e3f530b65c309db48c6d2b021e673107a09a0e2d5f1912527f91dbf -SIZE (MooseX-ClassAttribute-0.28.tar.gz) = 36084 +TIMESTAMP = 1466513415 +SHA256 (MooseX-ClassAttribute-0.29.tar.gz) = 6144c77c52770d4f831cadb6cada37125c80b3e4ffcb246da7ee9d55922ee725 +SIZE (MooseX-ClassAttribute-0.29.tar.gz) = 36365 diff --git a/devel/p5-MooseX-Getopt/Makefile b/devel/p5-MooseX-Getopt/Makefile index 25ebe28eada..32424736ed9 100644 --- a/devel/p5-MooseX-Getopt/Makefile +++ b/devel/p5-MooseX-Getopt/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= MooseX-Getopt -PORTVERSION= 0.69 +PORTVERSION= 0.71 CATEGORIES= devel perl5 -MASTER_SITES= CPAN +MASTER_SITES= CPAN/MooseX CPAN MASTER_SITE_SUBDIR= CPAN:ETHER PKGNAMEPREFIX= p5- diff --git a/devel/p5-MooseX-Getopt/distinfo b/devel/p5-MooseX-Getopt/distinfo index 1d70ae6c491..ef910c8c2a0 100644 --- a/devel/p5-MooseX-Getopt/distinfo +++ b/devel/p5-MooseX-Getopt/distinfo @@ -1,2 +1,3 @@ -SHA256 (MooseX-Getopt-0.69.tar.gz) = 0ef348a5edb8aca9a8bf4aff9dbcc2ac4281682fdc65b210b3c87cffd7501308 -SIZE (MooseX-Getopt-0.69.tar.gz) = 54085 +TIMESTAMP = 1466513504 +SHA256 (MooseX-Getopt-0.71.tar.gz) = de18f8ea0a5650cbbdebecb8f4c028f5f951fc5698332f7b8e20c7874902c259 +SIZE (MooseX-Getopt-0.71.tar.gz) = 54544 diff --git a/devel/p5-MooseX-Types-Path-Class/Makefile b/devel/p5-MooseX-Types-Path-Class/Makefile index 01599654996..ba1ff3f0b2b 100644 --- a/devel/p5-MooseX-Types-Path-Class/Makefile +++ b/devel/p5-MooseX-Types-Path-Class/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= MooseX-Types-Path-Class -PORTVERSION= 0.08 +PORTVERSION= 0.09 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-MooseX-Types-Path-Class/distinfo b/devel/p5-MooseX-Types-Path-Class/distinfo index e51490023b0..ce0ad95a8e9 100644 --- a/devel/p5-MooseX-Types-Path-Class/distinfo +++ b/devel/p5-MooseX-Types-Path-Class/distinfo @@ -1,2 +1,3 @@ -SHA256 (MooseX-Types-Path-Class-0.08.tar.gz) = 38c55c0723d2533b0b16b41eda78adbe71194f3b7588a3b3f7ec71b2768664b7 -SIZE (MooseX-Types-Path-Class-0.08.tar.gz) = 28203 +TIMESTAMP = 1466513557 +SHA256 (MooseX-Types-Path-Class-0.09.tar.gz) = e784bab53698ae95a709a8663306145ffec55668df6cf31615333523fbe7ef7e +SIZE (MooseX-Types-Path-Class-0.09.tar.gz) = 29220 diff --git a/devel/p5-ReadLine-Gnu/distinfo b/devel/p5-ReadLine-Gnu/distinfo deleted file mode 100644 index a0d5bfc2809..00000000000 --- a/devel/p5-ReadLine-Gnu/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (Term-ReadLine-Gnu-1.31.tar.gz) = 42174b4bc9d3881502d527fc7c8bd1c0a4b266c2f0bbee012e9a604999418f3b -SIZE (Term-ReadLine-Gnu-1.31.tar.gz) = 78350 diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-ReadLine-Gnu/pkg-plist deleted file mode 100644 index abd36e5e16e..00000000000 --- a/devel/p5-ReadLine-Gnu/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/perlsh -%%SITE_ARCH%%/Term/ReadLine/Gnu.pm -%%SITE_ARCH%%/Term/ReadLine/Gnu/XS.pm -%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/Gnu.so -%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/autosplit.ix -%%PERL5_MAN1%%/perlsh.1.gz -%%PERL5_MAN3%%/Term::ReadLine::Gnu.3.gz diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile deleted file mode 100644 index 3f1e0f48f95..00000000000 --- a/devel/p5-ReadLine-Perl/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Created by: Matthew Hunt -# $FreeBSD$ - -PORTNAME= ReadLine-Perl -PORTVERSION= 1.0303 -PORTREVISION= 3 -CATEGORIES= devel perl5 -MASTER_SITES= CPAN/Term -PKGNAMEPREFIX= p5- -DISTNAME= Term-${PORTNAME}-${PORTVERSION} - -MAINTAINER= perl@FreeBSD.org -COMMENT= Perl 5 module for Term::ReadLine editing without GNU readline - -USES= perl5 -USE_PERL5= configure - -.include diff --git a/devel/p5-ReadLine-Perl/distinfo b/devel/p5-ReadLine-Perl/distinfo deleted file mode 100644 index 508c7ab89a5..00000000000 --- a/devel/p5-ReadLine-Perl/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (Term-ReadLine-Perl-1.0303.tar.gz) = 314b9f8df7e89e77eaac200b9bbcbe28e01e0dab2646ada83c5b26584839095d -SIZE (Term-ReadLine-Perl-1.0303.tar.gz) = 48710 diff --git a/devel/p5-ReadLine-Perl/pkg-descr b/devel/p5-ReadLine-Perl/pkg-descr deleted file mode 100644 index 22600d11a8d..00000000000 --- a/devel/p5-ReadLine-Perl/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Perl 5 ships with a module called Term::ReadLine which is an interface -to command line editing and recall. The version that ships with Perl -is only a stub, and offers little functionality. - -This module supplants the Term::ReadLine stubs with real command line -editing and recall facilities, written entirely in Perl. Applications -that use Term::ReadLine do not need to be modified to gain the benefits -of this package; it will happen transparently upon installation. - -WWW: http://search.cpan.org/dist/Term-ReadLine-Perl/ diff --git a/devel/p5-ReadLine-Perl/pkg-plist b/devel/p5-ReadLine-Perl/pkg-plist deleted file mode 100644 index 11c3f24b655..00000000000 --- a/devel/p5-ReadLine-Perl/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -%%SITE_PERL%%/Term/ReadLine/Perl.pm -%%SITE_PERL%%/Term/ReadLine/readline.pm diff --git a/devel/p5-Reply/Makefile b/devel/p5-Reply/Makefile index 548ad268836..da7184f4177 100644 --- a/devel/p5-Reply/Makefile +++ b/devel/p5-Reply/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Reply -PORTVERSION= 0.38 +PORTVERSION= 0.39 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:DOY diff --git a/devel/p5-Reply/distinfo b/devel/p5-Reply/distinfo index 547d3c9df56..11e0171c5be 100644 --- a/devel/p5-Reply/distinfo +++ b/devel/p5-Reply/distinfo @@ -1,2 +1,3 @@ -SHA256 (Reply-0.38.tar.gz) = d9c994c2f4a92d8cd221f8baa746dce9457666bac2113986fa36c6b75df7222e -SIZE (Reply-0.38.tar.gz) = 28022 +TIMESTAMP = 1466515913 +SHA256 (Reply-0.39.tar.gz) = 59515f984ed6e7f1729c825019a61423f17359c1d663060b833aeed6445f65c8 +SIZE (Reply-0.39.tar.gz) = 28092 diff --git a/devel/p5-Scope-Upper/Makefile b/devel/p5-Scope-Upper/Makefile index 2b46b745a7b..ca734c768d8 100644 --- a/devel/p5-Scope-Upper/Makefile +++ b/devel/p5-Scope-Upper/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Scope-Upper -PORTVERSION= 0.28 -PORTREVISION= 1 +PORTVERSION= 0.29 CATEGORIES= devel perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:VPIT @@ -21,10 +20,4 @@ USE_PERL5= configure post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Scope/Upper/Upper.so -.include - -.if ${PERL_LEVEL} >= 502308 -BROKEN= Fails to build after argarray removal -.endif - -.include +.include diff --git a/devel/p5-Scope-Upper/distinfo b/devel/p5-Scope-Upper/distinfo index 0891052d665..27ba9cd78c5 100644 --- a/devel/p5-Scope-Upper/distinfo +++ b/devel/p5-Scope-Upper/distinfo @@ -1,2 +1,3 @@ -SHA256 (Scope-Upper-0.28.tar.gz) = a0da8103debe014410fc6718fe3275db2713be95c235f18c4592cd4148e82137 -SIZE (Scope-Upper-0.28.tar.gz) = 86754 +TIMESTAMP = 1466515981 +SHA256 (Scope-Upper-0.29.tar.gz) = 4b07360a243ce0ccaacfdfa98ae38ef2686aa908fcf4ef3d669105ac36759e0a +SIZE (Scope-Upper-0.29.tar.gz) = 93763 diff --git a/devel/p5-Scope-Upper/files/patch-MANIFEST b/devel/p5-Scope-Upper/files/patch-MANIFEST deleted file mode 100644 index 7387f49d2a8..00000000000 --- a/devel/p5-Scope-Upper/files/patch-MANIFEST +++ /dev/null @@ -1,10 +0,0 @@ ---- MANIFEST.orig 2015-03-23 19:15:17 UTC -+++ MANIFEST -@@ -66,3 +66,7 @@ t/87-stress-uid.t - t/lib/Scope/Upper/TestGenerator.pm - t/lib/Test/Leaner.pm - t/lib/VPIT/TestHelpers.pm -+xsh/caps.h -+xsh/debug.h -+xsh/threads.h -+xsh/util.h diff --git a/devel/p5-Scope-Upper/files/patch-Makefile.PL b/devel/p5-Scope-Upper/files/patch-Makefile.PL deleted file mode 100644 index aed6e86558f..00000000000 --- a/devel/p5-Scope-Upper/files/patch-Makefile.PL +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.PL.orig 2015-03-27 19:07:42 UTC -+++ Makefile.PL -@@ -51,7 +51,7 @@ print $is_gcc_34 ? "yes\n" : "no\n"; - - # Threads, Windows and 5.8.x don't seem to be best friends - if ($^O eq 'MSWin32' && "$]" < 5.009) { -- push @DEFINES, '-DSU_MULTIPLICITY=0'; -+ push @DEFINES, '-DXSH_MULTIPLICITY=0'; - } - - @DEFINES = (DEFINE => join ' ', @DEFINES) if @DEFINES; diff --git a/devel/p5-Scope-Upper/files/patch-Upper.xs b/devel/p5-Scope-Upper/files/patch-Upper.xs deleted file mode 100644 index 24e80a068e7..00000000000 --- a/devel/p5-Scope-Upper/files/patch-Upper.xs +++ /dev/null @@ -1,2099 +0,0 @@ ---- Upper.xs.orig 2015-08-18 13:52:04 UTC -+++ Upper.xs -@@ -6,21 +6,21 @@ - #include "perl.h" - #include "XSUB.h" - --#define __PACKAGE__ "Scope::Upper" -+/* --- XS helpers ---------------------------------------------------------- */ - --#ifndef SU_DEBUG --# define SU_DEBUG 0 --#endif -+#define XSH_PACKAGE "Scope::Upper" -+ -+#include "xsh/caps.h" -+#include "xsh/util.h" -+#include "xsh/debug.h" - - /* --- Compatibility ------------------------------------------------------- */ - --#ifndef NOOP --# define NOOP -+/* perl 5.23.8 onwards has a revamped context system */ -+#if XSH_HAS_PERL(5, 23, 8) -+# define SU_HAS_NEW_CXT - #endif - --#ifndef dNOOP --# define dNOOP --#endif - - #ifndef dVAR - # define dVAR dNOOP -@@ -42,31 +42,6 @@ - # define PERL_UNUSED_VAR(V) - #endif - --#ifndef STMT_START --# define STMT_START do --#endif -- --#ifndef STMT_END --# define STMT_END while (0) --#endif -- --#if SU_DEBUG --# define SU_D(X) STMT_START X STMT_END --static void su_debug_log(const char *fmt, ...) { -- va_list va; -- SV *sv; -- dTHX; -- va_start(va, fmt); -- sv = get_sv(__PACKAGE__ "::DEBUG", 0); -- if (sv && SvTRUE(sv)) -- PerlIO_vprintf(Perl_debug_log, fmt, va); -- va_end(va); -- return; --} --#else --# define SU_D(X) --#endif -- - #ifndef Newx - # define Newx(v, n, c) New(0, v, n, c) - #endif -@@ -228,45 +203,6 @@ static U8 su_op_gimme_reverse(U8 gimme) - # define NEGATIVE_INDICES_VAR "NEGATIVE_INDICES" - #endif - --#define SU_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S)))))) --#define SU_HAS_PERL_EXACT(R, V, S) ((PERL_REVISION == (R)) && (PERL_VERSION == (V)) && (PERL_SUBVERSION == (S))) -- --/* --- Threads and multiplicity -------------------------------------------- */ -- --#ifndef SU_MULTIPLICITY --# if defined(MULTIPLICITY) || defined(PERL_IMPLICIT_CONTEXT) --# define SU_MULTIPLICITY 1 --# else --# define SU_MULTIPLICITY 0 --# endif --#endif --#if SU_MULTIPLICITY && !defined(tTHX) --# define tTHX PerlInterpreter* --#endif -- --#if SU_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV)) --# define SU_THREADSAFE 1 --# ifndef MY_CXT_CLONE --# define MY_CXT_CLONE \ -- dMY_CXT_SV; \ -- my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1)); \ -- Copy(INT2PTR(my_cxt_t*, SvUV(my_cxt_sv)), my_cxtp, 1, my_cxt_t); \ -- sv_setuv(my_cxt_sv, PTR2UV(my_cxtp)) --# endif --#else --# define SU_THREADSAFE 0 --# undef dMY_CXT --# define dMY_CXT dNOOP --# undef MY_CXT --# define MY_CXT su_globaldata --# undef START_MY_CXT --# define START_MY_CXT static my_cxt_t MY_CXT; --# undef MY_CXT_INIT --# define MY_CXT_INIT NOOP --# undef MY_CXT_CLONE --# define MY_CXT_CLONE NOOP --#endif -- - /* --- Error messages ------------------------------------------------------ */ - - static const char su_stack_smash[] = "Cannot target a scope outside of the current stack"; -@@ -287,22 +223,14 @@ static su_uv_array su_uid_seq_counter; - - static perl_mutex su_uid_seq_counter_mutex; - --#define SU_LOCK(M) MUTEX_LOCK(M) --#define SU_UNLOCK(M) MUTEX_UNLOCK(M) -- --#else /* USE_ITHREADS */ -- --#define SU_LOCK(M) --#define SU_UNLOCK(M) -- --#endif /* !USE_ITHREADS */ -+#endif /* USE_ITHREADS */ - - static UV su_uid_seq_next(pTHX_ UV depth) { - #define su_uid_seq_next(D) su_uid_seq_next(aTHX_ (D)) - UV seq; - UV *seqs; - -- SU_LOCK(&su_uid_seq_counter_mutex); -+ XSH_LOCK(&su_uid_seq_counter_mutex); - - seqs = su_uid_seq_counter.seqs; - -@@ -319,7 +247,7 @@ static UV su_uid_seq_next(pTHX_ UV depth - - seq = ++seqs[depth]; - -- SU_UNLOCK(&su_uid_seq_counter_mutex); -+ XSH_UNLOCK(&su_uid_seq_counter_mutex); - - return seq; - } -@@ -415,7 +343,7 @@ typedef struct { - - /* --- uplevel() data tokens and global storage ---------------------------- */ - --#define SU_UPLEVEL_HIJACKS_RUNOPS SU_HAS_PERL(5, 8, 0) -+#define SU_UPLEVEL_HIJACKS_RUNOPS XSH_HAS_PERL(5, 8, 0) - - typedef struct { - void *next; -@@ -425,27 +353,39 @@ typedef struct { - - I32 cxix; - -- I32 target_depth; -- CV *target; -- - CV *callback; - CV *renamed; - -+#ifdef SU_HAS_NEW_CXT -+ U8 *cxtypes; /* array of saved context types */ -+ I32 gap; /* how many contexts have temporarily CXt_NULLed out */ -+ AV* argarray; /* the PL_curpad[0] of the uplevel sub */ -+#else -+ I32 target_depth; -+ CV *target; - PERL_SI *si; - PERL_SI *old_curstackinfo; - AV *old_mainstack; -+ OP *old_op; -+ bool old_catch; -+ bool died; -+#endif - - COP *old_curcop; - -- OP *old_op; - #if SU_UPLEVEL_HIJACKS_RUNOPS - runops_proc_t old_runops; - #endif -- bool old_catch; -- -- bool died; - } su_uplevel_ud; - -+#ifdef SU_HAS_NEW_CXT -+/* used to flag a context stack entry whose type has been temporarily -+ * set to CXt_NULL. It relies on perl not using this value for real -+ * CXt_NULL entries. -+ */ -+# define CXp_SU_UPLEVEL_NULLED 0x20 -+#endif -+ - static su_uplevel_ud *su_uplevel_ud_new(pTHX) { - #define su_uplevel_ud_new() su_uplevel_ud_new(aTHX) - su_uplevel_ud *sud; -@@ -458,24 +398,29 @@ static su_uplevel_ud *su_uplevel_ud_new( - sud->tmp_uid_storage.used = 0; - sud->tmp_uid_storage.alloc = 0; - -+ #ifndef SU_HAS_NEW_CXT - Newx(si, 1, PERL_SI); - si->si_stack = newAV(); - AvREAL_off(si->si_stack); - si->si_cxstack = NULL; -- si->si_cxmax = 0; -+ si->si_cxmax = -1; - - sud->si = si; -+#endif - - return sud; - } - - static void su_uplevel_ud_delete(pTHX_ su_uplevel_ud *sud) { - #define su_uplevel_ud_delete(S) su_uplevel_ud_delete(aTHX_ (S)) -+ -+#ifndef SU_HAS_NEW_CXT - PERL_SI *si = sud->si; - - Safefree(si->si_cxstack); - SvREFCNT_dec(si->si_stack); - Safefree(si); -+#endif - - Safefree(sud->tmp_uid_storage.map); - -@@ -496,60 +441,97 @@ typedef struct { - - /* --- Global data --------------------------------------------------------- */ - --#define MY_CXT_KEY __PACKAGE__ "::_guts" XS_VERSION -- - typedef struct { -- char *stack_placeholder; - su_unwind_storage unwind_storage; - su_yield_storage yield_storage; - su_uplevel_storage uplevel_storage; - su_uid_storage uid_storage; --} my_cxt_t; -+} xsh_user_cxt_t; - --START_MY_CXT -+#define XSH_THREADS_USER_CONTEXT 1 -+#define XSH_THREADS_USER_CLONE_NEEDS_DUP 0 -+#define XSH_THREADS_COMPILE_TIME_PROTECTION 0 -+ -+#if XSH_THREADSAFE -+ -+static void xsh_user_clone(pTHX_ const xsh_user_cxt_t *old_cxt, xsh_user_cxt_t *new_cxt) { -+ new_cxt->uplevel_storage.top = NULL; -+ new_cxt->uplevel_storage.root = NULL; -+ new_cxt->uplevel_storage.count = 0; -+ new_cxt->uid_storage.map = NULL; -+ new_cxt->uid_storage.used = 0; -+ new_cxt->uid_storage.alloc = 0; -+ -+ su_uid_storage_dup(&new_cxt->uid_storage, &old_cxt->uid_storage, -+ old_cxt->uid_storage.used); -+ -+ return; -+} -+ -+#endif /* XSH_THREADSAFE */ -+ -+#include "xsh/threads.h" - - /* --- Stack manipulations ------------------------------------------------- */ - --#define SU_SAVE_PLACEHOLDER() save_pptr(&MY_CXT.stack_placeholder) -+/* how many slots on the save stack various save types take up */ - --#define SU_SAVE_DESTRUCTOR_SIZE 3 --#define SU_SAVE_PLACEHOLDER_SIZE 3 -+#define SU_SAVE_DESTRUCTOR_SIZE 3 /* SAVEt_DESTRUCTOR_X */ -+#define SU_SAVE_SCALAR_SIZE 3 /* SAVEt_SV */ -+#define SU_SAVE_ARY_SIZE 3 /* SAVEt_AV */ -+#define SU_SAVE_AELEM_SIZE 4 /* SAVEt_AELEM */ -+#define SU_SAVE_HASH_SIZE 3 /* SAVEt_HV */ -+#define SU_SAVE_HELEM_SIZE 4 /* SAVEt_HELEM */ -+#define SU_SAVE_HDELETE_SIZE 4 /* SAVEt_DELETE */ - --#define SU_SAVE_SCALAR_SIZE 3 -+#define SU_SAVE_GVCV_SIZE SU_SAVE_DESTRUCTOR_SIZE -+ -+/* the overhead of save_alloc() but not including any elements, -+ * of which there must be at least 1 */ -+#if XSH_HAS_PERL(5, 14, 0) -+# define SU_SAVE_ALLOC_SIZE 1 /* SAVEt_ALLOC */ -+#else -+# define SU_SAVE_ALLOC_SIZE 2 /* SAVEt_ALLOC */ -+#endif - --#define SU_SAVE_ARY_SIZE 3 --#define SU_SAVE_AELEM_SIZE 4 - #ifdef SAVEADELETE --# define SU_SAVE_ADELETE_SIZE 3 -+# define SU_SAVE_ADELETE_SIZE 3 /* SAVEt_ADELETE */ - #else --# define SU_SAVE_ADELETE_SIZE SU_SAVE_DESTRUCTOR_SIZE -+# define SU_SAVE_ADELETE_SIZE SU_SAVE_DESTRUCTOR_SIZE -+#endif -+ -+/* (NB: it was 4 between 5.13.1 and 5.13.7) */ -+#if XSH_HAS_PERL(5, 8, 9) -+# define SU_SAVE_GP_SIZE 3 /* SAVEt_GP */ -+# else -+# define SU_SAVE_GP_SIZE 6 /* SAVEt_GP */ - #endif -+ -+/* sometimes we don't know in advance whether we're saving or deleting -+ * an array/hash element. So include enough room for a variable-sized -+ * save_alloc() to pad it to a fixed size. -+ */ -+ - #if SU_SAVE_AELEM_SIZE < SU_SAVE_ADELETE_SIZE --# define SU_SAVE_AELEM_OR_ADELETE_SIZE SU_SAVE_ADELETE_SIZE -+# define SU_SAVE_AELEM_OR_ADELETE_SIZE \ -+ (SU_SAVE_ADELETE_SIZE + SU_SAVE_ALLOC_SIZE + 1) -+#elif SU_SAVE_AELEM_SIZE > SU_SAVE_ADELETE_SIZE -+# define SU_SAVE_AELEM_OR_ADELETE_SIZE \ -+ (SU_SAVE_AELEM_SIZE + SU_SAVE_ALLOC_SIZE + 1) - #else - # define SU_SAVE_AELEM_OR_ADELETE_SIZE SU_SAVE_AELEM_SIZE - #endif - --#define SU_SAVE_HASH_SIZE 3 --#define SU_SAVE_HELEM_SIZE 4 --#define SU_SAVE_HDELETE_SIZE 4 - #if SU_SAVE_HELEM_SIZE < SU_SAVE_HDELETE_SIZE --# define SU_SAVE_HELEM_OR_HDELETE_SIZE SU_SAVE_HDELETE_SIZE -+# define SU_SAVE_HELEM_OR_HDELETE_SIZE \ -+ (SU_SAVE_HDELETE_SIZE + SU_SAVE_ALLOC_SIZE + 1) -+#elif SU_SAVE_HELEM_SIZE > SU_SAVE_HDELETE_SIZE -+# define SU_SAVE_HELEM_OR_HDELETE_SIZE \ -+ (SU_SAVE_HELEM_SIZE + SU_SAVE_ALLOC_SIZE + 1) - #else - # define SU_SAVE_HELEM_OR_HDELETE_SIZE SU_SAVE_HELEM_SIZE - #endif - --#define SU_SAVE_GVCV_SIZE SU_SAVE_DESTRUCTOR_SIZE -- --#if !SU_HAS_PERL(5, 8, 9) --# define SU_SAVE_GP_SIZE 6 --#elif !SU_HAS_PERL(5, 13, 0) || (SU_RELEASE && SU_HAS_PERL_EXACT(5, 13, 0)) --# define SU_SAVE_GP_SIZE 3 --#elif !SU_HAS_PERL(5, 13, 8) --# define SU_SAVE_GP_SIZE 4 --#else --# define SU_SAVE_GP_SIZE 3 --#endif - - #ifndef SvCANEXISTDELETE - # define SvCANEXISTDELETE(sv) \ -@@ -572,7 +554,7 @@ static I32 su_av_key2idx(pTHX_ AV *av, I - return key; - - /* Added by MJD in perl-5.8.1 with 6f12eb6d2a1dfaf441504d869b27d2e40ef4966a */ --#if SU_HAS_PERL(5, 8, 1) -+#if XSH_HAS_PERL(5, 8, 1) - if (SvRMAGICAL(av)) { - const MAGIC * const tied_magic = mg_find((SV *) av, PERL_MAGIC_tied); - if (tied_magic) { -@@ -693,7 +675,7 @@ static void su_save_helem(pTHX_ HV *hv, - - /* ... Saving code slots from a glob ....................................... */ - --#if !SU_HAS_PERL(5, 10, 0) && !defined(mro_method_changed_in) -+#if !XSH_HAS_PERL(5, 10, 0) && !defined(mro_method_changed_in) - # define mro_method_changed_in(G) PL_sub_generation++ - #endif - -@@ -731,17 +713,21 @@ static void su_save_gvcv(pTHX_ GV *gv) { - /* --- Actions ------------------------------------------------------------- */ - - typedef struct { -+ I32 orig_ix; /* original savestack_ix */ -+ I32 offset; /* how much we bumped this savestack index */ -+} su_ud_origin_elem; -+ -+typedef struct { - U8 type; - U8 private; -- U8 pad; - /* spare */ - I32 depth; -- I32 *origin; -+ su_ud_origin_elem *origin; - } su_ud_common; - -+ - #define SU_UD_TYPE(U) (((su_ud_common *) (U))->type) - #define SU_UD_PRIVATE(U) (((su_ud_common *) (U))->private) --#define SU_UD_PAD(U) (((su_ud_common *) (U))->pad) - #define SU_UD_DEPTH(U) (((su_ud_common *) (U))->depth) - #define SU_UD_ORIGIN(U) (((su_ud_common *) (U))->origin) - -@@ -756,7 +742,7 @@ typedef struct { - - /* ... Reap ................................................................ */ - --#define SU_SAVE_LAST_CX (!SU_HAS_PERL(5, 8, 4) || (SU_HAS_PERL(5, 9, 5) && !SU_HAS_PERL(5, 14, 0)) || SU_HAS_PERL(5, 15, 0)) -+#define SU_SAVE_LAST_CX (!XSH_HAS_PERL(5, 8, 4) || (XSH_HAS_PERL(5, 9, 5) && !XSH_HAS_PERL(5, 14, 0)) || XSH_HAS_PERL(5, 15, 0)) - - typedef struct { - su_ud_common ci; -@@ -773,8 +759,8 @@ static void su_call(pTHX_ SV *cb) { - - dSP; - -- SU_D(su_debug_log("@@@ call scope_ix=%2d save_ix=%2d\n", -- PL_scopestack_ix, PL_savestack_ix)); -+ XSH_D(su_debug_log("@@@ call scope_ix=%2d save_ix=%2d\n", -+ PL_scopestack_ix, PL_savestack_ix)); - - ENTER; - SAVETMPS; -@@ -919,6 +905,15 @@ static void su_localize(pTHX_ void *ud_) - if (SvTYPE(sv) >= SVt_PVGV) { - gv = (GV *) sv; - } else { -+ -+/* new perl context implementation frees savestack *before* restoring -+ * PL_curcop. Temporarily restore it prematurely to make gv_fetch* -+ * looks up unqualified var names in the caller's package */ -+#ifdef SU_HAS_NEW_CXT -+ COP *old_cop = PL_curcop; -+ PL_curcop = CX_CUR()->blk_oldcop; -+#endif -+ - #ifdef gv_fetchsv - gv = gv_fetchsv(sv, GV_ADDMULTI, t); - #else -@@ -926,13 +921,16 @@ static void su_localize(pTHX_ void *ud_) - const char *name = SvPV_const(sv, len); - gv = gv_fetchpvn_flags(name, len, GV_ADDMULTI, t); - #endif -+#ifdef SU_HAS_NEW_CXT -+ CX_CUR()->blk_oldcop = PL_curcop; -+#endif - } - -- SU_D({ -+ XSH_D({ - SV *z = newSV(0); - SvUPGRADE(z, t); -- su_debug_log("%p: === localize a %s\n",ud, sv_reftype(z, 0)); -- su_debug_log("%p: depth=%2d scope_ix=%2d save_ix=%2d\n", -+ su_debug_log("%p: === localize a %s\n",ud, sv_reftype(z, 0)); -+ su_debug_log("%p: depth=%2d scope_ix=%2d save_ix=%2d\n", - ud, SU_UD_DEPTH(ud), PL_scopestack_ix, PL_savestack_ix); - SvREFCNT_dec(z); - }); -@@ -972,7 +970,7 @@ static void su_localize(pTHX_ void *ud_) - - /* ... Unique context ID ................................................... */ - --/* We must pass the index because MY_CXT.uid_storage might be reallocated -+/* We must pass the index because XSH_CXT.uid_storage might be reallocated - * between the UID fetch and the invalidation at the end of scope. */ - - typedef struct { -@@ -982,9 +980,9 @@ typedef struct { - - static void su_uid_drop(pTHX_ void *ud_) { - su_ud_uid *ud = ud_; -- dMY_CXT; -+ dXSH_CXT; - -- MY_CXT.uid_storage.map[ud->idx].flags &= ~SU_UID_ACTIVE; -+ XSH_CXT.uid_storage.map[ud->idx].flags &= ~SU_UID_ACTIVE; - - SU_UD_FREE(ud); - -@@ -994,37 +992,50 @@ static void su_uid_drop(pTHX_ void *ud_) - /* --- Pop a context back -------------------------------------------------- */ - - #ifdef DEBUGGING --# define SU_CXNAME(C) PL_block_type[CxTYPE(C)] -+# define SU_CX_TYPENAME(T) PL_block_type[(T)] - #else --# if SU_HAS_PERL(5, 11, 0) -+# if XSH_HAS_PERL(5, 23, 8) - static const char *su_block_type[] = { - "NULL", - "WHEN", - "BLOCK", - "GIVEN", -- "LOOP_FOR", -- "LOOP_PLAIN", -+ "LOOP_ARY", - "LOOP_LAZYSV", - "LOOP_LAZYIV", -+ "LOOP_LIST", -+ "LOOP_PLAIN", - "SUB", - "FORMAT", - "EVAL", - "SUBST" - }; --# elif SU_HAS_PERL(5, 9, 3) -+# elif XSH_HAS_PERL(5, 11, 0) - static const char *su_block_type[] = { - "NULL", -- "SUB", -- "EVAL", - "WHEN", -- "SUBST", - "BLOCK", -- "FORMAT", - "GIVEN", - "LOOP_FOR", - "LOOP_PLAIN", - "LOOP_LAZYSV", -- "LOOP_LAZYIV" -+ "LOOP_LAZYIV", -+ "SUB", -+ "FORMAT", -+ "EVAL", -+ "SUBST" -+}; -+# elif XSH_HAS_PERL(5, 10, 0) -+static const char *su_block_type[] = { -+ "NULL", -+ "SUB", -+ "EVAL", -+ "LOOP", -+ "SUBST", -+ "BLOCK", -+ "FORMAT" -+ "WHEN", -+ "GIVEN" - }; - # else - static const char *su_block_type[] = { -@@ -1033,78 +1044,107 @@ static const char *su_block_type[] = { - "EVAL", - "LOOP", - "SUBST", -- "BLOCK" -+ "BLOCK", -+ "FORMAT" - }; - # endif --# define SU_CXNAME(C) su_block_type[CxTYPE(C)] -+# define SU_CX_TYPENAME(T) su_block_type[(T)] - #endif - -+#define SU_CXNAME(C) SU_CX_TYPENAME(CxTYPE(C)) -+ -+/* for debugging. These indicate how many ENTERs each context type -+ * does before the PUSHBLOCK */ -+ -+static const int su_cxt_enter_count[] = { -+# if XSH_HAS_PERL(5, 23, 8) -+ 0 /* context pushes no longer do ENTERs */ -+# elif XSH_HAS_PERL(5, 11, 0) -+ /* NULL WHEN BLOCK GIVEN LOOP_FOR LOOP_PLAIN LOOP_LAZYSV -+ * LOOP_LAZYIV SUB FORMAT EVAL SUBST */ -+ 0, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 0 -+# elif XSH_HAS_PERL(5, 10, 0) -+ /* NULL SUB EVAL LOOP SUBST BLOCK FORMAT WHEN GIVEN */ -+ 0, 1, 1, 2, 0, 1, 1, 1, 1 -+# else -+ /* NULL SUB EVAL LOOP SUBST BLOCK FORMAT */ -+ 0, 1, 1, 2, 0, 1, 1 -+# endif -+}; -+ -+ -+ -+/* push at least 'size' slots worth of padding onto the savestack */ -+ -+static void su_ss_push_padding(pTHX_ void *ud, I32 size) { -+ if (size <= 0) -+ return; -+ if (size < SU_SAVE_ALLOC_SIZE + 1) /* minimum possible SAVEt_ALLOC */ -+ size = SU_SAVE_ALLOC_SIZE + 1; -+ XSH_D(su_debug_log( -+ "%p: push %2d padding at save_ix=%d\n", -+ ud, size, PL_savestack_ix)); -+ save_alloc((size - SU_SAVE_ALLOC_SIZE)*sizeof(*PL_savestack), 0); -+} -+ -+ -+static void su_pop(pTHX_ void *ud); -+ -+ -+ -+/* push an su_pop destructor onto the savestack with suitable padding. -+ * first indicates that this is the first push of a destructor */ -+ -+static void su_ss_push_destructor(pTHX_ void *ud, I32 depth, bool first) { -+ su_ud_origin_elem *origin = SU_UD_ORIGIN(ud); -+ I32 pad; -+ -+ assert(first || origin[depth+1].orig_ix == PL_savestack_ix); -+ su_ss_push_padding(aTHX_ ud, -+ (origin[depth].orig_ix + origin[depth].offset) - PL_savestack_ix); -+ XSH_D(su_debug_log( -+ "%p: push destructor at save_ix=%d depth=%d scope_ix=%d\n", -+ ud, PL_savestack_ix, depth, PL_scopestack_ix)); -+ SAVEDESTRUCTOR_X(su_pop, ud); -+ assert(first || -+ PL_savestack_ix <= origin[depth+1].orig_ix + origin[depth+1].offset); -+} -+ -+ -+/* this is called during each leave_scope() via SAVEDESTRUCTOR_X */ -+ - static void su_pop(pTHX_ void *ud) { - #define su_pop(U) su_pop(aTHX_ (U)) -- I32 depth, base, mark, *origin; -- depth = SU_UD_DEPTH(ud); -- -- SU_D(su_debug_log( -- "%p: --- pop a %s\n" -- "%p: leave scope at depth=%2d scope_ix=%2d cur_top=%2d cur_base=%2d\n", -- ud, SU_CXNAME(cxstack + cxstack_ix), -- ud, depth, PL_scopestack_ix,PL_savestack_ix,PL_scopestack[PL_scopestack_ix] -- )); -+ I32 depth, base, mark; -+ su_ud_origin_elem *origin; - -+ depth = SU_UD_DEPTH(ud); - origin = SU_UD_ORIGIN(ud); -- mark = origin[depth]; -- base = origin[depth - 1]; - -- SU_D(su_debug_log("%p: original scope was %*c top=%2d base=%2d\n", -- ud, 24, ' ', mark, base)); -- -- if (base < mark) { --#if SU_HAS_PERL(5, 19, 4) -- I32 save = -1; -- PERL_CONTEXT *cx; --#endif -+ XSH_D(su_debug_log( "%p: ### su_pop: depth=%d\n", ud, depth)); - -- SU_D(su_debug_log("%p: clear leftovers\n", ud)); -+ depth--; -+ mark = PL_savestack_ix; -+ base = origin[depth].orig_ix; - --#if SU_HAS_PERL(5, 19, 4) -- cx = cxstack + cxstack_ix; -- if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT) -- save = PL_scopestack[cx->blk_oldscopesp - 1]; --#endif -+ XSH_D(su_debug_log("%p: residual savestack frame is %d(+%d)..%d\n", -+ ud, base, origin[depth].offset, mark)); - -- PL_savestack_ix = mark; -+ if (base < mark) { -+ XSH_D(su_debug_log("%p: clear leftovers at %d..%d\n", ud, base, mark)); - leave_scope(base); -- --#if SU_HAS_PERL(5, 19, 4) -- if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT) -- PL_scopestack[cx->blk_oldscopesp - 1] = save; --#endif - } -- PL_savestack_ix = base; -+ assert(PL_savestack_ix == base); - -- SU_UD_DEPTH(ud) = --depth; -+ SU_UD_DEPTH(ud) = depth; - - if (depth > 0) { -- U8 pad; -- -- if ((pad = SU_UD_PAD(ud)) > 0) { -- dMY_CXT; -- do { -- SU_D(su_debug_log( -- "%p: push a pad slot at depth=%2d scope_ix=%2d save_ix=%2d\n", -- ud, depth, PL_scopestack_ix, PL_savestack_ix)); -- SU_SAVE_PLACEHOLDER(); -- } while (--pad); -- } -- -- SU_D(su_debug_log( -- "%p: push destructor at depth=%2d scope_ix=%2d save_ix=%2d\n", -- ud, depth, PL_scopestack_ix, PL_savestack_ix)); -- SAVEDESTRUCTOR_X(su_pop, ud); -+ su_ss_push_destructor(aTHX_ ud, depth-1, 0); - } else { -+ I32 offset = origin[0].offset; /* grab value before origin is freed */ - switch (SU_UD_TYPE(ud)) { - case SU_UD_TYPE_REAP: { -- SU_D(su_debug_log("%p: === reap\n%p: depth=%2d scope_ix=%2d save_ix=%2d\n", -+ XSH_D(su_debug_log("%p: === reap\n%p: depth=%d scope_ix=%d save_ix=%d\n", - ud, ud, SU_UD_DEPTH(ud), PL_scopestack_ix, PL_savestack_ix)); - SAVEDESTRUCTOR_X(su_call, SU_UD_REAP_CB(ud)); - SU_UD_FREE(ud); -@@ -1118,112 +1158,193 @@ static void su_pop(pTHX_ void *ud) { - SAVEDESTRUCTOR_X(su_uid_drop, ud); - break; - } -+ /* perl 5.23.8 onwards is very fussy about the return from leave_scope() -+ * leaving PL_savestack_ix where it expects it to be */ -+ if (PL_savestack_ix < base + offset) { -+ I32 gap = (base + offset) - PL_savestack_ix; -+ assert(gap >= SU_SAVE_ALLOC_SIZE + 1); -+ su_ss_push_padding(aTHX_ ud, gap); -+ } -+ assert(PL_savestack_ix == base + offset); - } - -- SU_D(su_debug_log("%p: --- end pop: cur_top=%2d == cur_base=%2d\n", -- ud, PL_savestack_ix, PL_scopestack[PL_scopestack_ix])); -+ XSH_D(su_debug_log("%p: end pop: ss_ix=%d\n", ud, PL_savestack_ix)); - } - -+ - /* --- Initialize the stack and the action userdata ------------------------ */ - --static I32 su_init(pTHX_ void *ud, I32 cxix, I32 size) { -+static void su_init(pTHX_ void *ud, I32 cxix, I32 size) { - #define su_init(U, C, S) su_init(aTHX_ (U), (C), (S)) -- I32 i, depth, offset, base, *origin; -- U8 pad; -+ I32 i, depth, base; -+ su_ud_origin_elem *origin; -+ I32 cur_cx_ix; -+ I32 cur_scope_ix; - -- SU_D(su_debug_log("%p: ### init for cx %d\n", ud, cxix)); -+ XSH_D(su_debug_log("%p: ### su_init(cxix=%d, size=%d)\n", ud, cxix, size)); - -- /* su_pop() is going to be called from leave_scope(), so before pushing the -- * next callback, we'll want to flush the current scope stack slice first. -- * However, if we want the next callback not to be processed immediately by -- * the current leave_scope(), we'll need to hide it by artificially -- * incrementing the scope stack marker before. For the intermediate bumps, -- * we will only need a bump of SU_SAVE_DESTRUCTOR_SIZE items, but for the -- * last one we will need a bump of size items. However, in order to preserve -- * the natural ordering between scope stack markers, we cannot bump lower -- * markers more than higher ones. This is why we bump the intermediate markers -- * by the smallest multiple of SU_SAVE_PLACEHOLDER_SIZE greater or equal to -- * max(SU_SAVE_DESTRUCTOR_SIZE, size). */ -+ depth = PL_scopestack_ix - cxstack[cxix].blk_oldscopesp; -+#ifdef SU_HAS_NEW_CXT -+ depth += (cxstack_ix - cxix); /* each context frame holds 1 scope */ -+#endif -+ XSH_D(su_debug_log( -+ "%p: going down by depth=%d with scope_ix=%d save_ix=%d\n", -+ ud, depth, PL_scopestack_ix, PL_savestack_ix)); - -- if (size <= SU_SAVE_DESTRUCTOR_SIZE) { -- pad = 0; -- } else { -- I32 extra = size - SU_SAVE_DESTRUCTOR_SIZE; -- pad = extra / SU_SAVE_PLACEHOLDER_SIZE; -- if (extra % SU_SAVE_PLACEHOLDER_SIZE) -- ++pad; -- } -- offset = SU_SAVE_DESTRUCTOR_SIZE + SU_SAVE_PLACEHOLDER_SIZE * pad; -- SU_D(su_debug_log("%p: size=%d pad=%d offset=%d\n", ud, size, pad, offset)); -+ /* Artificially increase the position of each savestack frame boundary -+ * to make space to squeeze in a 'size' sized entry (first one) or a -+ * SU_SAVE_DESTRUCTOR_SIZE sized entry (higher ones). In addition, make -+ * sure that each boundary is higher than the previous, so that *every* -+ * scope exit triggers a call to leave_scope(). Each scope exit will call -+ * the su_pop() destructor, which is responsible for: freeing any -+ * savestack entries below the artificially raised floor; then pushing a -+ * new destructor in that space. On the final pop, the "real" savestack -+ * action is pushed rather than another destructor. -+ * -+ * On older perls, savestack frame boundaries are specified by a range of -+ * scopestack entries (one per ENTER). Each scope entry typically does -+ * one or two ENTERs followed by a PUSHBLOCK. Thus the -+ * cx->blku_oldscopesp field set by the PUSHBLOCK points to the next free -+ * slot, which is one above the last of the ENTERs. In the debugging -+ * output we indicate that by bracketing the ENTERs directly preceding -+ * that context push with dashes, e.g.: -+ * -+ * 13b98d8: ------------------ -+ * 13b98d8: ENTER origin[0] scope[3] savestack=3+3 -+ * 13b98d8: ENTER origin[1] scope[4] savestack=9+3 -+ * 13b98d8: cx=1 LOOP_LAZYIV -+ * 13b98d8: ------------------ -+ * -+ * In addition to context stack pushes, other activities can push ENTERs -+ * too, such as grep expr and XS sub calls. -+ * -+ * For newer perls (SU_HAS_NEW_CXT), a context push no longer does any -+ * ENTERs; instead the old savestack position is stored in the new -+ * cx->blk_oldsaveix field; thus this field specifies an additional -+ * savestack frame boundary point in addition to the scopestack entries, -+ * and will also need adjusting. -+ * -+ * We record the original and modified position of each boundary in the -+ * origin array. -+ * -+ * The passed cxix argument represents the scope we wish to inject into; -+ * we have to adjust all the savestack frame boundaries above (but not -+ * including) that context. -+ */ - -- depth = PL_scopestack_ix - cxstack[cxix].blk_oldscopesp; -- SU_D(su_debug_log("%p: going down to depth %d\n", ud, depth)); -+ Newx(origin, depth, su_ud_origin_elem); - -- /* We need to bump all the intermediary stack markers just in case an -- * exception is thrown before the target scope is reached. Indeed, in this -- * case there might be arbitrary many scope frames flushed at the same time, -- * and since we cannot know in advance whether this will happen or not, we -- * have to make sure the final frame is protected for the actual action. But -- * of course, in order to do that, we also need to bump all the previous stack -- * markers. If not for this, it should have been possible to just bump the two -- * next frames in su_pop(). */ -+ cur_cx_ix = cxix; -+ cur_scope_ix = cxstack[cxix].blk_oldscopesp; -+#ifdef SU_HAS_NEW_CXT -+ XSH_D(su_debug_log("%p: cx=%-2d %-11s\n", -+ ud, cur_cx_ix, SU_CXNAME(cxstack+cur_cx_ix))); -+ cur_cx_ix++; -+#endif - -- Newx(origin, depth + 1, I32); -- base = PL_scopestack_ix - depth; -- origin[0] = PL_scopestack[base]; -- PL_scopestack[base] += size; -- for (i = 1; i < depth; ++i) { -- I32 j = i + base; -- /* origin[depth - i] == PL_scopestack[PL_scopestack_ix - i] */ -- origin[i] = PL_scopestack[j]; -- PL_scopestack[j] += offset; -- } -- origin[depth] = PL_savestack_ix; -+ for (i = 0; cur_scope_ix < PL_scopestack_ix; i++) { -+ I32 *ixp; -+ I32 offset; - -- SU_UD_PAD(ud) = pad; -- SU_UD_DEPTH(ud) = depth; -- SU_UD_ORIGIN(ud) = origin; -+#ifdef SU_HAS_NEW_CXT - -- /* Make sure the first destructor fires by pushing enough fake slots on the -- * stack. */ -- if (PL_savestack_ix + SU_SAVE_DESTRUCTOR_SIZE -- <= PL_scopestack[PL_scopestack_ix - 1]) { -- dMY_CXT; -- do { -- SU_D(su_debug_log("%p: push a fake slot at scope_ix=%2d save_ix=%2d\n", -- ud, PL_scopestack_ix, PL_savestack_ix)); -- SU_SAVE_PLACEHOLDER(); -- } while (PL_savestack_ix + SU_SAVE_DESTRUCTOR_SIZE -- <= PL_scopestack[PL_scopestack_ix - 1]); -- } -- SU_D(su_debug_log("%p: push first destructor at scope_ix=%2d save_ix=%2d\n", -- ud, PL_scopestack_ix, PL_savestack_ix)); -- SAVEDESTRUCTOR_X(su_pop, ud); -+ if ( cur_cx_ix <= cxstack_ix -+ && cur_scope_ix == cxstack[cur_cx_ix].blk_oldscopesp -+ ) -+ ixp = &(cxstack[cur_cx_ix++].blk_oldsaveix); -+ else -+ ixp = &PL_scopestack[cur_scope_ix++]; /* an ENTER pushed after cur context */ - -- SU_D({ -- for (i = 0; i <= depth; ++i) { -- I32 j = PL_scopestack_ix - i; -- su_debug_log("%p: depth=%2d scope_ix=%2d saved_floor=%2d new_floor=%2d\n", -- ud, i, j, origin[depth - i], -- i == 0 ? PL_savestack_ix : PL_scopestack[j]); -+#else -+ -+ XSH_D({ -+ if (cur_cx_ix <= cxstack_ix) { -+ if (cur_scope_ix == cxstack[cur_cx_ix].blk_oldscopesp) { -+ su_debug_log( -+ "%p: cx=%-2d %s\n%p: ------------------\n", -+ ud, cur_cx_ix, SU_CXNAME(cxstack+cur_cx_ix), ud); -+ cur_cx_ix++; -+ } -+ else if (cur_scope_ix + su_cxt_enter_count[CxTYPE(cxstack+cur_cx_ix)] -+ == cxstack[cur_cx_ix].blk_oldscopesp) -+ su_debug_log("%p: ------------------\n", ud); -+ } -+ }); -+ ixp = &PL_scopestack[cur_scope_ix++]; -+ -+#endif -+ -+ if (i == 0) -+ offset = size; -+ else { -+ /* we have three constraints to satisfy: -+ * 1) Each adjusted offset must be at least SU_SAVE_DESTRUCTOR_SIZE -+ * above its unadjusted boundary, so that there is space to inject a -+ * destructor into the outer scope. -+ * 2) Each adjusted boundary must be at least SU_SAVE_DESTRUCTOR_SIZE -+ * higher than the previous adjusted boundary, so that a new -+ * destructor can be added below the Nth adjusted frame boundary, -+ * but be within the (N-1)th adjusted frame and so be triggered on -+ * the next scope exit; -+ * 3) If the adjustment needs to be greater than SU_SAVE_DESTRUCTOR_SIZE, -+ * then it should be greater by an amount of at least the minimum -+ * pad side, so a destructor and padding can be pushed. -+ */ -+ I32 pad; -+ offset = SU_SAVE_DESTRUCTOR_SIZE; /* rule 1 */ -+ pad = (origin[i-1].orig_ix + origin[i-1].offset) + offset - (*ixp + offset); -+ if (pad > 0) { /* rule 2 */ -+ if (pad < SU_SAVE_ALLOC_SIZE + 1) /* rule 3 */ -+ pad = SU_SAVE_ALLOC_SIZE + 1; -+ offset += pad; -+ } - } -- }); - -- return depth; -+ origin[i].offset = offset; -+ origin[i].orig_ix = *ixp; -+ *ixp += offset; -+ -+#ifdef SU_HAS_NEW_CXT -+ XSH_D({ -+ if (ixp == &PL_scopestack[cur_scope_ix-1]) -+ su_debug_log( -+ "%p: ENTER origin[%d] scope[%d] savestack=%d+%d\n", -+ ud, i, cur_scope_ix, origin[i].orig_ix, origin[i].offset); -+ else -+ su_debug_log( -+ "%p: cx=%-2d %-11s origin[%d] scope[%d] savestack=%d+%d\n", -+ ud, cur_cx_ix-1, SU_CXNAME(cxstack+cur_cx_ix-1), -+ i, cur_scope_ix, origin[i].orig_ix, origin[i].offset); -+ }); -+#else -+ XSH_D(su_debug_log( -+ "%p: ENTER origin[%d] scope[%d] savestack=%d+%d\n", -+ ud, i, cur_scope_ix, origin[i].orig_ix, origin[i].offset)); -+#endif -+ -+ } -+ -+ assert(i == depth); -+ -+ SU_UD_DEPTH(ud) = depth; -+ SU_UD_ORIGIN(ud) = origin; -+ -+ su_ss_push_destructor(aTHX_ ud, depth-1, 1); - } - -+ - /* --- Unwind stack -------------------------------------------------------- */ - - static void su_unwind(pTHX_ void *ud_) { -- dMY_CXT; -- I32 cxix = MY_CXT.unwind_storage.cxix; -- I32 items = MY_CXT.unwind_storage.items; -+ dXSH_CXT; -+ I32 cxix = XSH_CXT.unwind_storage.cxix; -+ I32 items = XSH_CXT.unwind_storage.items; - I32 mark; - - PERL_UNUSED_VAR(ud_); - -- PL_stack_sp = MY_CXT.unwind_storage.savesp; --#if SU_HAS_PERL(5, 19, 4) -+ PL_stack_sp = XSH_CXT.unwind_storage.savesp; -+#if XSH_HAS_PERL(5, 19, 4) - { - I32 i; - SV **sp = PL_stack_sp; -@@ -1237,28 +1358,28 @@ static void su_unwind(pTHX_ void *ud_) { - dounwind(cxix); - - mark = PL_markstack[cxstack[cxix].blk_oldmarksp]; -- *PL_markstack_ptr = PL_stack_sp - PL_stack_base - items; -+ PUSHMARK(PL_stack_sp - items); - -- SU_D({ -+ XSH_D({ - I32 gimme = GIMME_V; - su_debug_log("%p: cx=%d gimme=%s items=%d sp=%d oldmark=%d mark=%d\n", -- &MY_CXT, cxix, -+ &XSH_CXT, cxix, - gimme == G_VOID ? "void" : gimme == G_ARRAY ? "list" : "scalar", - items, PL_stack_sp - PL_stack_base, *PL_markstack_ptr, mark); - }); - -- PL_op = (OP *) &(MY_CXT.unwind_storage.return_op); -+ PL_op = (OP *) &(XSH_CXT.unwind_storage.return_op); - PL_op = PL_op->op_ppaddr(aTHX); - - *PL_markstack_ptr = mark; - -- MY_CXT.unwind_storage.proxy_op.op_next = PL_op; -- PL_op = &(MY_CXT.unwind_storage.proxy_op); -+ XSH_CXT.unwind_storage.proxy_op.op_next = PL_op; -+ PL_op = &(XSH_CXT.unwind_storage.proxy_op); - } - - /* --- Yield --------------------------------------------------------------- */ - --#if SU_HAS_PERL(5, 10, 0) -+#if XSH_HAS_PERL(5, 10, 0) - # define SU_RETOP_SUB(C) ((C)->blk_sub.retop) - # define SU_RETOP_EVAL(C) ((C)->blk_eval.retop) - # define SU_RETOP_LOOP(C) ((C)->blk_loop.my_op->op_lastop->op_next) -@@ -1270,11 +1391,11 @@ static void su_unwind(pTHX_ void *ud_) { - #endif - - static void su_yield(pTHX_ void *ud_) { -- dMY_CXT; -+ dXSH_CXT; - PERL_CONTEXT *cx; - const char *which = ud_; -- I32 cxix = MY_CXT.yield_storage.cxix; -- I32 items = MY_CXT.yield_storage.items; -+ I32 cxix = XSH_CXT.yield_storage.cxix; -+ I32 items = XSH_CXT.yield_storage.items; - opcode type = OP_NULL; - U8 flags = 0; - OP *next; -@@ -1288,7 +1409,7 @@ static void su_yield(pTHX_ void *ud_) { - OP *o = NULL; - /* Is this actually a given/when block? This may occur only when yield was - * called with HERE (or nothing) as the context. */ --#if SU_HAS_PERL(5, 10, 0) -+#if XSH_HAS_PERL(5, 10, 0) - if (cxix > 0) { - PERL_CONTEXT *prev = cx - 1; - U8 prev_type = CxTYPE(prev); -@@ -1327,8 +1448,13 @@ static void su_yield(pTHX_ void *ud_) { - case CXt_EVAL: - o = SU_RETOP_EVAL(cx2); - break; --#if SU_HAS_PERL(5, 11, 0) -+#if XSH_HAS_PERL(5, 11, 0) -+# if XSH_HAS_PERL(5, 23, 8) -+ case CXt_LOOP_ARY: -+ case CXt_LOOP_LIST: -+# else - case CXt_LOOP_FOR: -+# endif - case CXt_LOOP_PLAIN: - case CXt_LOOP_LAZYSV: - case CXt_LOOP_LAZYIV: -@@ -1368,8 +1494,13 @@ static void su_yield(pTHX_ void *ud_) { - type = CxTRYBLOCK(cx) ? OP_LEAVETRY : OP_LEAVEEVAL; - next = SU_RETOP_EVAL(cx); - break; --#if SU_HAS_PERL(5, 11, 0) -+#if XSH_HAS_PERL(5, 11, 0) -+# if XSH_HAS_PERL(5, 23, 8) -+ case CXt_LOOP_ARY: -+ case CXt_LOOP_LIST: -+# else - case CXt_LOOP_FOR: -+# endif - case CXt_LOOP_PLAIN: - case CXt_LOOP_LAZYSV: - case CXt_LOOP_LAZYIV: -@@ -1379,7 +1510,7 @@ static void su_yield(pTHX_ void *ud_) { - type = OP_LEAVELOOP; - next = SU_RETOP_LOOP(cx); - break; --#if SU_HAS_PERL(5, 10, 0) -+#if XSH_HAS_PERL(5, 10, 0) - case CXt_GIVEN: - cxt_given: - type = OP_LEAVEGIVEN; -@@ -1387,7 +1518,7 @@ cxt_given: - break; - case CXt_WHEN: - cxt_when: --#if SU_HAS_PERL(5, 15, 1) -+#if XSH_HAS_PERL(5, 15, 1) - type = OP_LEAVEWHEN; - #else - type = OP_BREAK; -@@ -1405,8 +1536,8 @@ cxt_when: - break; - } - -- PL_stack_sp = MY_CXT.yield_storage.savesp; --#if SU_HAS_PERL(5, 19, 4) -+ PL_stack_sp = XSH_CXT.yield_storage.savesp; -+#if XSH_HAS_PERL(5, 19, 4) - { - I32 i; - SV **sp = PL_stack_sp; -@@ -1427,16 +1558,16 @@ cxt_when: - - flags |= OP_GIMME_REVERSE(cx->blk_gimme); - -- MY_CXT.yield_storage.leave_op.op_type = type; -- MY_CXT.yield_storage.leave_op.op_ppaddr = PL_ppaddr[type]; -- MY_CXT.yield_storage.leave_op.op_flags = flags; -- MY_CXT.yield_storage.leave_op.op_next = next; -+ XSH_CXT.yield_storage.leave_op.op_type = type; -+ XSH_CXT.yield_storage.leave_op.op_ppaddr = PL_ppaddr[type]; -+ XSH_CXT.yield_storage.leave_op.op_flags = flags; -+ XSH_CXT.yield_storage.leave_op.op_next = next; - -- PL_op = (OP *) &(MY_CXT.yield_storage.leave_op); -+ PL_op = (OP *) &(XSH_CXT.yield_storage.leave_op); - PL_op = PL_op->op_ppaddr(aTHX); - -- MY_CXT.yield_storage.proxy_op.op_next = PL_op; -- PL_op = &(MY_CXT.yield_storage.proxy_op); -+ XSH_CXT.yield_storage.proxy_op.op_next = PL_op; -+ PL_op = &(XSH_CXT.yield_storage.proxy_op); - } - - /* --- Uplevel ------------------------------------------------------------- */ -@@ -1448,35 +1579,35 @@ static su_uplevel_ud *su_uplevel_storage - #define su_uplevel_storage_new(I) su_uplevel_storage_new(aTHX_ (I)) - su_uplevel_ud *sud; - UV depth; -- dMY_CXT; -+ dXSH_CXT; - -- sud = MY_CXT.uplevel_storage.root; -+ sud = XSH_CXT.uplevel_storage.root; - if (sud) { -- MY_CXT.uplevel_storage.root = sud->next; -- MY_CXT.uplevel_storage.count--; -+ XSH_CXT.uplevel_storage.root = sud->next; -+ XSH_CXT.uplevel_storage.count--; - } else { - sud = su_uplevel_ud_new(); - } - -- sud->next = MY_CXT.uplevel_storage.top; -- MY_CXT.uplevel_storage.top = sud; -+ sud->next = XSH_CXT.uplevel_storage.top; -+ XSH_CXT.uplevel_storage.top = sud; - - depth = su_uid_depth(cxix); -- su_uid_storage_dup(&sud->tmp_uid_storage, &MY_CXT.uid_storage, depth); -- sud->old_uid_storage = MY_CXT.uid_storage; -- MY_CXT.uid_storage = sud->tmp_uid_storage; -+ su_uid_storage_dup(&sud->tmp_uid_storage, &XSH_CXT.uid_storage, depth); -+ sud->old_uid_storage = XSH_CXT.uid_storage; -+ XSH_CXT.uid_storage = sud->tmp_uid_storage; - - return sud; - } - --#if SU_HAS_PERL(5, 13, 7) -+#if XSH_HAS_PERL(5, 13, 7) - - static void su_uplevel_storage_delete(pTHX_ su_uplevel_ud *sud) { - #define su_uplevel_storage_delete(S) su_uplevel_storage_delete(aTHX_ (S)) -- dMY_CXT; -+ dXSH_CXT; - -- sud->tmp_uid_storage = MY_CXT.uid_storage; -- MY_CXT.uid_storage = sud->old_uid_storage; -+ sud->tmp_uid_storage = XSH_CXT.uid_storage; -+ XSH_CXT.uid_storage = sud->old_uid_storage; - { - su_uid *map; - STRLEN i, alloc; -@@ -1485,14 +1616,14 @@ static void su_uplevel_storage_delete(pT - for (i = 0; i < alloc; ++i) - map[i].flags &= ~SU_UID_ACTIVE; - } -- MY_CXT.uplevel_storage.top = sud->next; -+ XSH_CXT.uplevel_storage.top = sud->next; - -- if (MY_CXT.uplevel_storage.count >= SU_UPLEVEL_STORAGE_SIZE) { -+ if (XSH_CXT.uplevel_storage.count >= SU_UPLEVEL_STORAGE_SIZE) { - su_uplevel_ud_delete(sud); - } else { -- sud->next = MY_CXT.uplevel_storage.root; -- MY_CXT.uplevel_storage.root = sud; -- MY_CXT.uplevel_storage.count++; -+ sud->next = XSH_CXT.uplevel_storage.root; -+ XSH_CXT.uplevel_storage.root = sud; -+ XSH_CXT.uplevel_storage.count++; - } - } - -@@ -1521,7 +1652,7 @@ static int su_uplevel_goto_static(const - return 0; - } - --#if SU_UPLEVEL_HIJACKS_RUNOPS -+#if !defined(SU_HAS_NEW_CXT) && SU_UPLEVEL_HIJACKS_RUNOPS - - static int su_uplevel_goto_runops(pTHX) { - #define su_uplevel_goto_runops() su_uplevel_goto_runops(aTHX) -@@ -1554,9 +1685,9 @@ static int su_uplevel_goto_runops(pTHX) - - done: - if (argarray) { -- dMY_CXT; -+ dXSH_CXT; - -- if (MY_CXT.uplevel_storage.top->cxix == cxix) { -+ if (XSH_CXT.uplevel_storage.top->cxix == cxix) { - AV *args = GvAV(PL_defgv); - I32 items = AvFILLp(args); - -@@ -1569,7 +1700,7 @@ done: - - PL_op = op = op->op_ppaddr(aTHX); - --#if !SU_HAS_PERL(5, 13, 0) -+#if !XSH_HAS_PERL(5, 13, 0) - PERL_ASYNC_CHECK(); - #endif - } while (op); -@@ -1583,7 +1714,53 @@ done: - - #define su_at_underscore(C) PadARRAY(PadlistARRAY(CvPADLIST(C))[CvDEPTH(C)])[0] - --static void su_uplevel_restore(pTHX_ void *sus_) { -+#ifdef SU_HAS_NEW_CXT -+ -+static void su_uplevel_restore_new(pTHX_ void *sus_) { -+ su_uplevel_ud *sud = sus_; -+ PERL_CONTEXT *cx; -+ I32 i; -+ U8 *saved_cxtypes = sud->cxtypes; -+ -+ for (i = 0; i < sud->gap; i++) { -+ PERL_CONTEXT *cx = cxstack + sud->cxix + i; -+ XSH_D(su_debug_log("su_uplevel_restore: i=%d cxix=%d type %s => %s\n", -+ i, cx-cxstack, SU_CX_TYPENAME(CxTYPE(cx)), -+ SU_CX_TYPENAME(saved_cxtypes[i] & CXTYPEMASK))); -+ cx->cx_type = saved_cxtypes[i]; -+ } -+ Safefree(saved_cxtypes); -+ -+ /* renamed is a copy of callback, but they share the same CvPADLIST. -+ * At this point any calls to renamed should have exited so that its -+ * depth is back to that of of callback. At this point its safe to free -+ * renamed, then undo the extra ref count that was ensuring that callback -+ * remains alive -+ */ -+ assert(sud->renamed); -+ assert(sud->callback); -+ -+ CvDEPTH(sud->callback)--; -+ assert(CvDEPTH(sud->callback) == CvDEPTH(sud->renamed)); -+ if (!CvISXSUB(sud->renamed)) { -+ CvDEPTH(sud->renamed) = 0; -+ CvPADLIST(sud->renamed) = NULL; -+ } -+ SvREFCNT_dec(sud->renamed); -+ SvREFCNT_dec(sud->callback); -+ -+ SU_UPLEVEL_RESTORE(curcop); -+ -+ su_uplevel_storage_delete(sud); -+ -+ return; -+} -+ -+#else -+ -+/* 5.23.7 and earlier */ -+ -+static void su_uplevel_restore_old(pTHX_ void *sus_) { - su_uplevel_ud *sud = sus_; - PERL_SI *cur = sud->old_curstackinfo; - PERL_SI *si = sud->si; -@@ -1689,7 +1866,7 @@ found_it: - CvDEPTH(target) = sud->target_depth - levels; - PL_curstackinfo->si_cxix = i - 1; - --#if !SU_HAS_PERL(5, 13, 1) -+#if !XSH_HAS_PERL(5, 13, 1) - /* Since $@ was maybe localized between the target frame and the uplevel - * call, we forcefully flush the save stack to get rid of it and then - * reset $@ to its proper value. Note that the the call to -@@ -1723,28 +1900,30 @@ found_it: - * pointer to the current context frame across this call. This means that we - * can't free the temporary context stack we used for the uplevel call right - * now, or that pointer upwards would point to garbage. */ --#if SU_HAS_PERL(5, 13, 7) -+#if XSH_HAS_PERL(5, 13, 7) - /* This issue has been fixed in perl with commit 8f89e5a9, which was made - * public in perl 5.13.7. */ - su_uplevel_storage_delete(sud); - #else - /* Otherwise, we just enqueue it back in the global storage list. */ - { -- dMY_CXT; -+ dXSH_CXT; - -- sud->tmp_uid_storage = MY_CXT.uid_storage; -- MY_CXT.uid_storage = sud->old_uid_storage; -+ sud->tmp_uid_storage = XSH_CXT.uid_storage; -+ XSH_CXT.uid_storage = sud->old_uid_storage; - -- MY_CXT.uplevel_storage.top = sud->next; -- sud->next = MY_CXT.uplevel_storage.root; -- MY_CXT.uplevel_storage.root = sud; -- MY_CXT.uplevel_storage.count++; -+ XSH_CXT.uplevel_storage.top = sud->next; -+ sud->next = XSH_CXT.uplevel_storage.root; -+ XSH_CXT.uplevel_storage.root = sud; -+ XSH_CXT.uplevel_storage.count++; - } - #endif - - return; - } - -+#endif -+ - static CV *su_cv_clone(pTHX_ CV *proto, GV *gv) { - #define su_cv_clone(P, G) su_cv_clone(aTHX_ (P), (G)) - dVAR; -@@ -1764,14 +1943,14 @@ static CV *su_cv_clone(pTHX_ CV *proto, - #endif - - CvGV_set(cv, gv); --#if SU_RELEASE && SU_HAS_PERL_EXACT(5, 21, 4) -+#if SU_RELEASE && XSH_HAS_PERL_EXACT(5, 21, 4) - CvNAMED_off(cv); - #endif - CvSTASH_set(cv, CvSTASH(proto)); - /* Commit 4c74a7df, publicized with perl 5.13.3, began to add backrefs to - * stashes. CvSTASH_set() started to do it as well with commit c68d95645 - * (which was part of perl 5.13.7). */ --#if SU_HAS_PERL(5, 13, 3) && !SU_HAS_PERL(5, 13, 7) -+#if XSH_HAS_PERL(5, 13, 3) && !XSH_HAS_PERL(5, 13, 7) - if (CvSTASH(proto)) - Perl_sv_add_backref(aTHX_ CvSTASH(proto), MUTABLE_SV(cv)); - #endif -@@ -1806,8 +1985,124 @@ static CV *su_cv_clone(pTHX_ CV *proto, - return cv; - } - --static I32 su_uplevel(pTHX_ CV *callback, I32 cxix, I32 args) { --#define su_uplevel(C, I, A) su_uplevel(aTHX_ (C), (I), (A)) -+ -+ -+#ifdef SU_HAS_NEW_CXT -+ -+/* this one-shot runops "loop" is designed to be called just before -+ * execution of the first op following an uplevel()'s entersub. It gets a -+ * chance to fix up the args as seen by caller(), before immediately -+ * falling through to the previous runops loop. Note that pp_entersub is -+ * called directly by call_sv() rather than being called from a runops -+ * loop. -+ */ -+ -+static int su_uplevel_runops_hook_entersub(pTHX) { -+ OP *op = PL_op; -+ dXSH_CXT; -+ su_uplevel_ud *sud = XSH_CXT.uplevel_storage.top; -+ -+ /* Create a new array containing a copy of the original sub's call args, -+ * then stick it in PL_curpad[0] of the current running sub so that -+ * thay will be seen by caller(). -+ */ -+ assert(sud); -+ if (sud->argarray) { -+ AV *av = newAV(); -+ AvREAL_off(av); -+ AvREIFY_on(av); -+ av_extend(av, AvMAX(sud->argarray)); -+ AvFILLp(av) = AvFILLp(sud->argarray); -+ Copy(AvARRAY(sud->argarray), AvARRAY(av), AvFILLp(av) + 1, SV *); -+ -+ /* should be referenced by PL_curpad[0] and *_ */ -+ assert(SvREFCNT(PL_curpad[0]) > 1); -+ SvREFCNT_dec(PL_curpad[0]); -+ -+ PL_curpad[0] = (SV*)av; -+ } -+ -+ /* undo the temporary runops hook and fall through to a real runops loop. */ -+ assert(sud->old_runops != su_uplevel_runops_hook_entersub); -+ PL_runops = sud->old_runops; -+ CALLRUNOPS(aTHX); -+ return 0; -+} -+ -+ -+ -+static I32 su_uplevel_new(pTHX_ CV *callback, I32 cxix, I32 args) { -+ su_uplevel_ud *sud; -+ U8 *saved_cxtypes; -+ I32 i, ret; -+ I32 gimme; -+ CV *base_cv = cxstack[cxix].blk_sub.cv; -+ dSP; -+ -+ assert(CxTYPE(&cxstack[cxix]) == CXt_SUB); -+ -+ ENTER; -+ -+ gimme = GIMME_V; -+ -+ /* At this point SP points to the top arg. -+ * Shuffle the args down by one, eliminating the CV slot */ -+ Move(SP - args + 1, SP - args, args, SV*); -+ SP--; -+ PUSHMARK(SP - args); -+ PUTBACK; -+ -+ sud = su_uplevel_storage_new(cxix); -+ -+ sud->cxix = cxix; -+ sud->callback = (CV*)SvREFCNT_inc_simple(callback); -+ sud->renamed = NULL; -+ sud->gap = cxstack_ix - cxix + 1; -+ sud->argarray = NULL; -+ -+ -+ Newx(saved_cxtypes, sud->gap, U8); -+ sud->cxtypes = saved_cxtypes; -+ -+ SAVEDESTRUCTOR_X(su_uplevel_restore_new, sud); -+ SU_UPLEVEL_SAVE(curcop, cxstack[cxix].blk_oldcop); -+ -+/* temporarily change the type of any contexts to NULL, so they're -+ * invisible to caller() etc. */ -+ for (i = 0; i < sud->gap; i++) { -+ PERL_CONTEXT *cx = cxstack + cxix + i; -+ saved_cxtypes[i] = cx->cx_type; /* save type and flags */ -+ XSH_D(su_debug_log("su_uplevel: i=%d cxix=%d type %-11s => %s\n", -+ i, cx-cxstack, SU_CX_TYPENAME(CxTYPE(cx)), SU_CX_TYPENAME(CXt_NULL))); -+ cx->cx_type = (CXt_NULL | CXp_SU_UPLEVEL_NULLED); -+ } -+ -+ /* create a copy of the callback with a doctored name (as seen by -+ * caller). It shares the padlist with callback */ -+ sud->renamed = su_cv_clone(callback, CvGV(base_cv)); -+ sud->old_runops = PL_runops; -+ -+ -+ if (!CvISXSUB(sud->renamed) && CxHASARGS(&cxstack[cxix])) { -+ sud->argarray = (AV*)su_at_underscore(base_cv); -+ assert(PL_runops != su_uplevel_runops_hook_entersub); -+ /* set up a one-shot runops hook so that we can fake up the -+ * args as seen by caller() on return from pp_entersub */ -+ PL_runops = su_uplevel_runops_hook_entersub; -+ } -+ -+ CvDEPTH(callback)++; /* match what CvDEPTH(sud->renamed) is about to become */ -+ -+ ret = call_sv((SV*)sud->renamed, gimme); -+ -+ LEAVE; -+ -+ return ret; -+} -+ -+#else -+ -+static I32 su_uplevel_old(pTHX_ CV *callback, I32 cxix, I32 args) { - su_uplevel_ud *sud; - const PERL_CONTEXT *cx = cxstack + cxix; - PERL_SI *si; -@@ -1835,7 +2130,7 @@ static I32 su_uplevel(pTHX_ CV *callback - sud->died = 1; - sud->callback = NULL; - sud->renamed = NULL; -- SAVEDESTRUCTOR_X(su_uplevel_restore, sud); -+ SAVEDESTRUCTOR_X(su_uplevel_restore_old, sud); - - si = sud->si; - -@@ -1850,7 +2145,7 @@ static I32 su_uplevel(pTHX_ CV *callback - * target context, plus the forthcoming arguments. */ - new_mark = cx->blk_oldsp; - av_extend(si->si_stack, new_mark + 1 + args + 1); -- Copy(PL_curstack, AvARRAY(si->si_stack), new_mark + 1, SV *); -+ Copy(AvARRAY(PL_curstack), AvARRAY(si->si_stack), new_mark + 1, SV *); - AvFILLp(si->si_stack) = new_mark; - SU_POISON(AvARRAY(si->si_stack) + new_mark + 1, args + 1, SV *); - -@@ -1920,6 +2215,7 @@ static I32 su_uplevel(pTHX_ CV *callback - - if ((PL_op = PL_ppaddr[OP_ENTERSUB](aTHX))) { - PERL_CONTEXT *sub_cx = cxstack + cxstack_ix; -+ AV *argarray = cx->blk_sub.argarray; - - /* If pp_entersub() returns a non-null OP, it means that the callback is not - * an XSUB. */ -@@ -1927,7 +2223,7 @@ static I32 su_uplevel(pTHX_ CV *callback - sud->callback = MUTABLE_CV(SvREFCNT_inc(callback)); - CvDEPTH(callback)++; - -- if (CxHASARGS(cx) && cx->blk_sub.argarray) { -+ if (CxHASARGS(cx) && argarray) { - /* The call to pp_entersub() has saved the current @_ (in XS terms, - * GvAV(PL_defgv)) in the savearray member, and has created a new argarray - * with what we put on the stack. But we want to fake up the same arguments -@@ -1936,9 +2232,9 @@ static I32 su_uplevel(pTHX_ CV *callback - AV *av = newAV(); - AvREAL_off(av); - AvREIFY_on(av); -- av_extend(av, AvMAX(cx->blk_sub.argarray)); -- AvFILLp(av) = AvFILLp(cx->blk_sub.argarray); -- Copy(AvARRAY(cx->blk_sub.argarray), AvARRAY(av), AvFILLp(av) + 1, SV *); -+ av_extend(av, AvMAX(argarray)); -+ AvFILLp(av) = AvFILLp(argarray); -+ Copy(AvARRAY(argarray), AvARRAY(av), AvFILLp(av) + 1, SV *); - sub_cx->blk_sub.argarray = av; - } else { - SvREFCNT_inc_simple_void(sub_cx->blk_sub.argarray); -@@ -1985,16 +2281,18 @@ static I32 su_uplevel(pTHX_ CV *callback - return ret; - } - -+#endif -+ - /* --- Unique context ID --------------------------------------------------- */ - - static su_uid *su_uid_storage_fetch(pTHX_ UV depth) { - #define su_uid_storage_fetch(D) su_uid_storage_fetch(aTHX_ (D)) - su_uid *map; - STRLEN alloc; -- dMY_CXT; -+ dXSH_CXT; - -- map = MY_CXT.uid_storage.map; -- alloc = MY_CXT.uid_storage.alloc; -+ map = XSH_CXT.uid_storage.map; -+ alloc = XSH_CXT.uid_storage.alloc; - - if (depth >= alloc) { - STRLEN i; -@@ -2005,12 +2303,12 @@ static su_uid *su_uid_storage_fetch(pTHX - map[i].flags = 0; - } - -- MY_CXT.uid_storage.map = map; -- MY_CXT.uid_storage.alloc = depth + 1; -+ XSH_CXT.uid_storage.map = map; -+ XSH_CXT.uid_storage.alloc = depth + 1; - } - -- if (depth >= MY_CXT.uid_storage.used) -- MY_CXT.uid_storage.used = depth + 1; -+ if (depth >= XSH_CXT.uid_storage.used) -+ XSH_CXT.uid_storage.used = depth + 1; - - return map + depth; - } -@@ -2018,12 +2316,12 @@ static su_uid *su_uid_storage_fetch(pTHX - static int su_uid_storage_check(pTHX_ UV depth, UV seq) { - #define su_uid_storage_check(D, S) su_uid_storage_check(aTHX_ (D), (S)) - su_uid *uid; -- dMY_CXT; -+ dXSH_CXT; - -- if (depth >= MY_CXT.uid_storage.used) -+ if (depth >= XSH_CXT.uid_storage.used) - return 0; - -- uid = MY_CXT.uid_storage.map + depth; -+ uid = XSH_CXT.uid_storage.map + depth; - - return (uid->seq == seq) && (uid->flags & SU_UID_ACTIVE); - } -@@ -2127,7 +2425,7 @@ static I32 su_context_skip_db(pTHX_ I32 - PERL_CONTEXT *cx = cxstack + i; - - switch (CxTYPE(cx)) { --#if SU_HAS_PERL(5, 17, 1) -+#if XSH_HAS_PERL(5, 17, 1) - case CXt_LOOP_PLAIN: - #endif - case CXt_BLOCK: -@@ -2151,6 +2449,57 @@ static I32 su_context_skip_db(pTHX_ I32 - } - - -+#ifdef SU_HAS_NEW_CXT -+ -+/* convert a physical context stack index into the logical equivalent: -+ * one that ignores all the context frames hidden by uplevel(). -+ * Perl-level functions use logical args (e.g. UP takes an optional logical -+ * value and returns a logical value), while we use and store *real* -+ * values internally. -+ */ -+ -+static I32 su_context_real2logical(pTHX_ I32 cxix) { -+# define su_context_real2logical(C) su_context_real2logical(aTHX_ (C)) -+ PERL_CONTEXT *cx; -+ I32 i, gaps = 0; -+ -+ for (i = 0; i <= cxix; i++) { -+ cx = cxstack + i; -+ if (cx->cx_type == (CXt_NULL | CXp_SU_UPLEVEL_NULLED)) -+ gaps++; -+ } -+ XSH_D(su_debug_log("su_context_real2logical: %d => %d\n", cxix, cxix - gaps)); -+ return cxix - gaps; -+} -+ -+/* convert a logical context stack index (one that ignores all the context -+ * frames hidden by uplevel) into the physical equivalent -+ */ -+ -+static I32 su_context_logical2real(pTHX_ I32 cxix) { -+# define su_context_logical2real(C) su_context_logical2real(aTHX_ (C)) -+ PERL_CONTEXT *cx; -+ I32 i, seen = -1; -+ -+ for (i = 0; i <= cxstack_ix; i++) { -+ PERL_CONTEXT *cx = cxstack + i; -+ if (cx->cx_type != (CXt_NULL | CXp_SU_UPLEVEL_NULLED)) -+ seen++; -+ if (seen >= cxix) -+ break; -+ } -+ XSH_D(su_debug_log("su_context_logical2real: %d => %d\n", cxix, i)); -+ if (i > cxstack_ix) -+ i = cxstack_ix; -+ return i; -+} -+ -+#else -+# define su_context_real2logical(C) (C) -+# define su_context_logical2real(C) (C) -+#endif -+ -+ - static I32 su_context_normalize_up(pTHX_ I32 cxix) { - #define su_context_normalize_up(C) su_context_normalize_up(aTHX_ (C)) - PERL_CONTEXT *cx; -@@ -2163,11 +2512,11 @@ static I32 su_context_normalize_up(pTHX_ - PERL_CONTEXT *prev = cx - 1; - - switch (CxTYPE(prev)) { --#if SU_HAS_PERL(5, 10, 0) -+#if XSH_HAS_PERL(5, 10, 0) - case CXt_GIVEN: - case CXt_WHEN: - #endif --#if SU_HAS_PERL(5, 11, 0) -+#if XSH_HAS_PERL(5, 11, 0) - /* That's the only subcategory that can cause an extra BLOCK context */ - case CXt_LOOP_PLAIN: - #else -@@ -2199,11 +2548,11 @@ static I32 su_context_normalize_down(pTH - PERL_CONTEXT *cx = next - 1; - - switch (CxTYPE(cx)) { --#if SU_HAS_PERL(5, 10, 0) -+#if XSH_HAS_PERL(5, 10, 0) - case CXt_GIVEN: - case CXt_WHEN: - #endif --#if SU_HAS_PERL(5, 11, 0) -+#if XSH_HAS_PERL(5, 11, 0) - /* That's the only subcategory that can cause an extra BLOCK context */ - case CXt_LOOP_PLAIN: - #else -@@ -2234,8 +2583,13 @@ static I32 su_context_gimme(pTHX_ I32 cx - - switch (CxTYPE(cx)) { - /* gimme is always G_ARRAY for loop contexts. */ --#if SU_HAS_PERL(5, 11, 0) -+#if XSH_HAS_PERL(5, 11, 0) -+# if XSH_HAS_PERL(5, 23, 8) -+ case CXt_LOOP_ARY: -+ case CXt_LOOP_LIST: -+# else - case CXt_LOOP_FOR: -+# endif - case CXt_LOOP_PLAIN: - case CXt_LOOP_LAZYSV: - case CXt_LOOP_LAZYIV: -@@ -2267,83 +2621,61 @@ static I32 su_context_gimme(pTHX_ I32 cx - return G_VOID; - } - --/* --- Global setup/teardown ----------------------------------------------- */ -- --static VOL U32 su_initialized = 0; -+/* --- Module setup/teardown ----------------------------------------------- */ - --static void su_global_teardown(pTHX_ void *root) { -- if (!su_initialized) -- return; -+static void xsh_user_global_setup(pTHX) { -+ HV *stash; - --#if SU_MULTIPLICITY -- if (aTHX != root) -- return; --#endif -+ MUTEX_INIT(&su_uid_seq_counter_mutex); - -- SU_LOCK(&su_uid_seq_counter_mutex); -- PerlMemShared_free(su_uid_seq_counter.seqs); -+ XSH_LOCK(&su_uid_seq_counter_mutex); -+ su_uid_seq_counter.seqs = NULL; - su_uid_seq_counter.size = 0; -- SU_UNLOCK(&su_uid_seq_counter_mutex); -- -- MUTEX_DESTROY(&su_uid_seq_counter_mutex); -+ XSH_UNLOCK(&su_uid_seq_counter_mutex); - -- su_initialized = 0; -+ stash = gv_stashpv(XSH_PACKAGE, 1); -+ newCONSTSUB(stash, "TOP", newSViv(0)); -+ newCONSTSUB(stash, "SU_THREADSAFE", newSVuv(XSH_THREADSAFE)); - - return; - } - --XS(XS_Scope__Upper_unwind); --XS(XS_Scope__Upper_yield); --XS(XS_Scope__Upper_leave); -- --#if SU_HAS_PERL(5, 9, 0) --# define SU_XS_FILE_TYPE const char --#else --# define SU_XS_FILE_TYPE char --#endif -- --static void su_global_setup(pTHX_ SU_XS_FILE_TYPE *file) { --#define su_global_setup(F) su_global_setup(aTHX_ (F)) -- HV *stash; -- -- if (su_initialized) -- return; -+static void xsh_user_local_setup(pTHX_ xsh_user_cxt_t *cxt) { - -- MUTEX_INIT(&su_uid_seq_counter_mutex); -+ /* NewOp() calls calloc() which just zeroes the memory with memset(). */ -+ Zero(&(cxt->unwind_storage.return_op), 1, LISTOP); -+ cxt->unwind_storage.return_op.op_type = OP_RETURN; -+ cxt->unwind_storage.return_op.op_ppaddr = PL_ppaddr[OP_RETURN]; - -- SU_LOCK(&su_uid_seq_counter_mutex); -- su_uid_seq_counter.seqs = NULL; -- su_uid_seq_counter.size = 0; -- SU_UNLOCK(&su_uid_seq_counter_mutex); -+ Zero(&(cxt->unwind_storage.proxy_op), 1, OP); -+ cxt->unwind_storage.proxy_op.op_type = OP_STUB; -+ cxt->unwind_storage.proxy_op.op_ppaddr = NULL; - -- stash = gv_stashpv(__PACKAGE__, 1); -- newCONSTSUB(stash, "TOP", newSViv(0)); -- newCONSTSUB(stash, "SU_THREADSAFE", newSVuv(SU_THREADSAFE)); -+ Zero(&(cxt->yield_storage.leave_op), 1, UNOP); -+ cxt->yield_storage.leave_op.op_type = OP_STUB; -+ cxt->yield_storage.leave_op.op_ppaddr = NULL; - -- newXSproto("Scope::Upper::unwind", XS_Scope__Upper_unwind, file, NULL); -- newXSproto("Scope::Upper::yield", XS_Scope__Upper_yield, file, NULL); -- newXSproto("Scope::Upper::leave", XS_Scope__Upper_leave, file, NULL); -+ Zero(&(cxt->yield_storage.proxy_op), 1, OP); -+ cxt->yield_storage.proxy_op.op_type = OP_STUB; -+ cxt->yield_storage.proxy_op.op_ppaddr = NULL; - --#if SU_MULTIPLICITY -- call_atexit(su_global_teardown, aTHX); --#else -- call_atexit(su_global_teardown, NULL); --#endif -+ cxt->uplevel_storage.top = NULL; -+ cxt->uplevel_storage.root = NULL; -+ cxt->uplevel_storage.count = 0; - -- su_initialized = 1; -+ cxt->uid_storage.map = NULL; -+ cxt->uid_storage.used = 0; -+ cxt->uid_storage.alloc = 0; - - return; - } - --/* --- Interpreter setup/teardown ------------------------------------------ */ -- --static void su_local_teardown(pTHX_ void *param) { -+static void xsh_user_local_teardown(pTHX_ xsh_user_cxt_t *cxt) { - su_uplevel_ud *cur; -- dMY_CXT; - -- Safefree(MY_CXT.uid_storage.map); -+ Safefree(cxt->uid_storage.map); - -- cur = MY_CXT.uplevel_storage.root; -+ cur = cxt->uplevel_storage.root; - if (cur) { - su_uplevel_ud *prev; - do { -@@ -2356,44 +2688,21 @@ static void su_local_teardown(pTHX_ void - return; - } - --static void su_local_setup(pTHX) { --#define su_local_setup() su_local_setup(aTHX) -- MY_CXT_INIT; -- -- MY_CXT.stack_placeholder = NULL; -- -- /* NewOp() calls calloc() which just zeroes the memory with memset(). */ -- Zero(&(MY_CXT.unwind_storage.return_op), 1, LISTOP); -- MY_CXT.unwind_storage.return_op.op_type = OP_RETURN; -- MY_CXT.unwind_storage.return_op.op_ppaddr = PL_ppaddr[OP_RETURN]; -- -- Zero(&(MY_CXT.unwind_storage.proxy_op), 1, OP); -- MY_CXT.unwind_storage.proxy_op.op_type = OP_STUB; -- MY_CXT.unwind_storage.proxy_op.op_ppaddr = NULL; -- -- Zero(&(MY_CXT.yield_storage.leave_op), 1, UNOP); -- MY_CXT.yield_storage.leave_op.op_type = OP_STUB; -- MY_CXT.yield_storage.leave_op.op_ppaddr = NULL; -- -- Zero(&(MY_CXT.yield_storage.proxy_op), 1, OP); -- MY_CXT.yield_storage.proxy_op.op_type = OP_STUB; -- MY_CXT.yield_storage.proxy_op.op_ppaddr = NULL; -- -- MY_CXT.uplevel_storage.top = NULL; -- MY_CXT.uplevel_storage.root = NULL; -- MY_CXT.uplevel_storage.count = 0; -- -- MY_CXT.uid_storage.map = NULL; -- MY_CXT.uid_storage.used = 0; -- MY_CXT.uid_storage.alloc = 0; -+static void xsh_user_global_teardown(pTHX) { -+ XSH_LOCK(&su_uid_seq_counter_mutex); -+ PerlMemShared_free(su_uid_seq_counter.seqs); -+ su_uid_seq_counter.size = 0; -+ XSH_UNLOCK(&su_uid_seq_counter_mutex); - -- call_atexit(su_local_teardown, NULL); -+ MUTEX_DESTROY(&su_uid_seq_counter_mutex); - - return; - } - - /* --- XS ------------------------------------------------------------------ */ - -+/* D is real; B is logical. Returns real. */ -+ - #define SU_GET_CONTEXT(A, B, D) \ - STMT_START { \ - if (items > A) { \ -@@ -2405,6 +2714,7 @@ static void su_local_setup(pTHX) { - cxix = 0; \ - else if (cxix > cxstack_ix) \ - goto default_cx; \ -+ cxix = su_context_logical2real(cxix); \ - } else { \ - default_cx: \ - cxix = (D); \ -@@ -2424,7 +2734,7 @@ default_cx: \ - } \ - } STMT_END - --#if SU_HAS_PERL(5, 10, 0) -+#if XSH_HAS_PERL(5, 10, 0) - # define SU_INFO_COUNT 11 - #else - # define SU_INFO_COUNT 10 -@@ -2436,7 +2746,7 @@ XS(XS_Scope__Upper_unwind) { - #else - dXSARGS; - #endif -- dMY_CXT; -+ dXSH_CXT; - I32 cxix; - - PERL_UNUSED_VAR(cv); /* -W */ -@@ -2451,12 +2761,12 @@ XS(XS_Scope__Upper_unwind) { - continue; - case CXt_EVAL: - case CXt_FORMAT: -- MY_CXT.unwind_storage.cxix = cxix; -- MY_CXT.unwind_storage.items = items; -- MY_CXT.unwind_storage.savesp = PL_stack_sp; -+ XSH_CXT.unwind_storage.cxix = cxix; -+ XSH_CXT.unwind_storage.items = items; -+ XSH_CXT.unwind_storage.savesp = PL_stack_sp; - if (items > 0) { -- MY_CXT.unwind_storage.items--; -- MY_CXT.unwind_storage.savesp--; -+ XSH_CXT.unwind_storage.items--; -+ XSH_CXT.unwind_storage.savesp--; - } - /* pp_entersub will want to sanitize the stack after returning from there - * Screw that, we're insane! -@@ -2480,19 +2790,19 @@ XS(XS_Scope__Upper_yield) { - #else - dXSARGS; - #endif -- dMY_CXT; -+ dXSH_CXT; - I32 cxix; - - PERL_UNUSED_VAR(cv); /* -W */ - PERL_UNUSED_VAR(ax); /* -Wall */ - - SU_GET_CONTEXT(0, items - 1, su_context_here()); -- MY_CXT.yield_storage.cxix = cxix; -- MY_CXT.yield_storage.items = items; -- MY_CXT.yield_storage.savesp = PL_stack_sp; -+ XSH_CXT.yield_storage.cxix = cxix; -+ XSH_CXT.yield_storage.items = items; -+ XSH_CXT.yield_storage.savesp = PL_stack_sp; - if (items > 0) { -- MY_CXT.yield_storage.items--; -- MY_CXT.yield_storage.savesp--; -+ XSH_CXT.yield_storage.items--; -+ XSH_CXT.yield_storage.savesp--; - } - /* See XS_Scope__Upper_unwind */ - if (GIMME_V == G_SCALAR) -@@ -2509,14 +2819,14 @@ XS(XS_Scope__Upper_leave) { - #else - dXSARGS; - #endif -- dMY_CXT; -+ dXSH_CXT; - - PERL_UNUSED_VAR(cv); /* -W */ - PERL_UNUSED_VAR(ax); /* -Wall */ - -- MY_CXT.yield_storage.cxix = su_context_here(); -- MY_CXT.yield_storage.items = items; -- MY_CXT.yield_storage.savesp = PL_stack_sp; -+ XSH_CXT.yield_storage.cxix = su_context_here(); -+ XSH_CXT.yield_storage.items = items; -+ XSH_CXT.yield_storage.savesp = PL_stack_sp; - /* See XS_Scope__Upper_unwind */ - if (GIMME_V == G_SCALAR) - PL_stack_sp = PL_stack_base + PL_markstack_ptr[1] + 1; -@@ -2530,35 +2840,22 @@ PROTOTYPES: ENABLE - - BOOT: - { -- su_global_setup(file); -- su_local_setup(); -+ xsh_setup(); -+ newXSproto("Scope::Upper::unwind", XS_Scope__Upper_unwind, file, NULL); -+ newXSproto("Scope::Upper::yield", XS_Scope__Upper_yield, file, NULL); -+ newXSproto("Scope::Upper::leave", XS_Scope__Upper_leave, file, NULL); - } - --#if SU_THREADSAFE -+#if XSH_THREADSAFE - - void - CLONE(...) - PROTOTYPE: DISABLE --PREINIT: -- su_uid_storage new_cxt; - PPCODE: -- { -- dMY_CXT; -- new_cxt.map = NULL; -- new_cxt.used = 0; -- new_cxt.alloc = 0; -- su_uid_storage_dup(&new_cxt, &MY_CXT.uid_storage, MY_CXT.uid_storage.used); -- } -- { -- MY_CXT_CLONE; -- MY_CXT.uplevel_storage.top = NULL; -- MY_CXT.uplevel_storage.root = NULL; -- MY_CXT.uplevel_storage.count = 0; -- MY_CXT.uid_storage = new_cxt; -- } -+ xsh_clone(); - XSRETURN(0); - --#endif /* SU_THREADSAFE */ -+#endif /* XSH_THREADSAFE */ - - void - HERE() -@@ -2566,7 +2863,7 @@ PROTOTYPE: - PREINIT: - I32 cxix; - PPCODE: -- cxix = su_context_here(); -+ cxix = su_context_real2logical(su_context_here()); - EXTEND(SP, 1); - mPUSHi(cxix); - XSRETURN(1); -@@ -2582,6 +2879,7 @@ PPCODE: - --cxix; - cxix = su_context_skip_db(cxix); - cxix = su_context_normalize_up(cxix); -+ cxix = su_context_real2logical(cxix); - } else { - warn(su_stack_smash); - } -@@ -2605,6 +2903,7 @@ PPCODE: - case CXt_SUB: - if (PL_DBsub && cx->blk_sub.cv == GvCV(PL_DBsub)) - continue; -+ cxix = su_context_real2logical(cxix); - mPUSHi(cxix); - XSRETURN(1); - } -@@ -2626,6 +2925,7 @@ PPCODE: - default: - continue; - case CXt_EVAL: -+ cxix = su_context_real2logical(cxix); - mPUSHi(cxix); - XSRETURN(1); - } -@@ -2649,6 +2949,7 @@ PPCODE: - --cxix; - cxix = su_context_skip_db(cxix); - cxix = su_context_normalize_up(cxix); -+ cxix = su_context_real2logical(cxix); - } - EXTEND(SP, 1); - mPUSHi(cxix); -@@ -2678,6 +2979,7 @@ done: - if (level >= 0) - warn(su_stack_smash); - EXTEND(SP, 1); -+ cxix = su_context_real2logical(cxix); - mPUSHi(cxix); - XSRETURN(1); - -@@ -2783,7 +3085,7 @@ PPCODE: - case CXt_EVAL: - if (CxOLD_OP_TYPE(cx) == OP_ENTEREVAL) { - /* eval STRING */ --#if SU_HAS_PERL(5, 17, 4) -+#if XSH_HAS_PERL(5, 17, 4) - PUSHs(newSVpvn_flags(SvPVX(cx->blk_eval.cur_text), - SvCUR(cx->blk_eval.cur_text)-2, - SvUTF8(cx->blk_eval.cur_text)|SVs_TEMP)); -@@ -2810,7 +3112,7 @@ PPCODE: - /* warnings (9) */ - { - SV *mask = NULL; --#if SU_HAS_PERL(5, 9, 4) -+#if XSH_HAS_PERL(5, 9, 4) - STRLEN *old_warnings = cop->cop_warnings; - #else - SV *old_warnings = cop->cop_warnings; -@@ -2819,20 +3121,20 @@ PPCODE: - if (PL_dowarn & G_WARN_ON) - goto context_info_warnings_on; - else --#if SU_HAS_PERL(5, 17, 4) -+#if XSH_HAS_PERL(5, 17, 4) - mask = &PL_sv_undef; - #else - goto context_info_warnings_off; - #endif - } else if (old_warnings == pWARN_NONE) { --#if !SU_HAS_PERL(5, 17, 4) -+#if !XSH_HAS_PERL(5, 17, 4) - context_info_warnings_off: - #endif - mask = su_newmortal_pvn(WARN_NONEstring, WARNsize); - } else if (old_warnings == pWARN_ALL) { - HV *bits; - context_info_warnings_on: --#if SU_HAS_PERL(5, 8, 7) -+#if XSH_HAS_PERL(5, 8, 7) - bits = get_hv("warnings::Bits", 0); - if (bits) { - SV **bits_all = hv_fetchs(bits, "all", FALSE); -@@ -2843,7 +3145,7 @@ context_info_warnings_on: - if (!mask) - mask = su_newmortal_pvn(WARN_ALLstring, WARNsize); - } else { --#if SU_HAS_PERL(5, 9, 4) -+#if XSH_HAS_PERL(5, 9, 4) - mask = su_newmortal_pvn((char *) (old_warnings + 1), old_warnings[0]); - #else - mask = sv_mortalcopy(old_warnings); -@@ -2851,7 +3153,7 @@ context_info_warnings_on: - } - PUSHs(mask); - } --#if SU_HAS_PERL(5, 10, 0) -+#if XSH_HAS_PERL(5, 10, 0) - /* hints hash (10) */ - { - COPHH *hints_hash = CopHINTHASH_get(cop); -@@ -2960,7 +3262,11 @@ PPCODE: - args = items - 2; - } - /* su_uplevel() takes care of extending the stack if needed. */ -- ret = su_uplevel((CV *) code, cxix, args); -+#ifdef SU_HAS_NEW_CXT -+ ret = su_uplevel_new(aTHX_ (CV *) code, cxix, args); -+#else -+ ret = su_uplevel_old(aTHX_ (CV *) code, cxix, args); -+#endif - XSRETURN(ret); - default: - break; diff --git a/devel/p5-Scope-Upper/files/patch-t_13-reap-ctl.t b/devel/p5-Scope-Upper/files/patch-t_13-reap-ctl.t deleted file mode 100644 index 309077e23cd..00000000000 --- a/devel/p5-Scope-Upper/files/patch-t_13-reap-ctl.t +++ /dev/null @@ -1,18 +0,0 @@ ---- t/13-reap-ctl.t.orig 2015-08-18 13:44:19 UTC -+++ t/13-reap-ctl.t -@@ -302,10 +302,12 @@ $y = undef; - reap { ++$y; die "reaped\n" } => HERE; - is $x, 3, 'die in reap at eval [not yet - x]'; - is $y, undef, 'die in reap at eval [not yet - y]'; -- }; # should trigger here, but the die isn't catched by this eval -- die "failed\n"; -+ }; # should trigger here, but the die isn't catched by this eval in -+ # ealier perls -+ die "inner\n"; - }; -- is $@, "reaped\n", 'die in reap at eval [ok - $@]'; -+ is $@, ($] >= 5.023008 ? "inner\n" : "reaped\n"), -+ 'die in reap at eval [ok - $@]'; - is $x, 1, 'die in reap at eval [ok - x]'; - is $y, 1, 'die in reap at eval [ok - y]'; - } diff --git a/devel/p5-Scope-Upper/files/patch-t_91-pod.t b/devel/p5-Scope-Upper/files/patch-t_91-pod.t deleted file mode 100644 index 0c8498333b0..00000000000 --- a/devel/p5-Scope-Upper/files/patch-t_91-pod.t +++ /dev/null @@ -1,16 +0,0 @@ ---- t/91-pod.t.orig 2016-06-04 20:01:09 UTC -+++ t/91-pod.t -@@ -0,0 +1,13 @@ -+#!perl -T -+ -+use strict; -+use warnings; -+ -+use Test::More; -+ -+use lib 't/lib'; -+use VPIT::TestHelpers; -+ -+load_or_skip_all('Test::Pod', '1.22', [ ]); -+ -+all_pod_files_ok(); diff --git a/devel/p5-Scope-Upper/files/patch-t_92-pod-coverage.t b/devel/p5-Scope-Upper/files/patch-t_92-pod-coverage.t deleted file mode 100644 index 3c66d0d7693..00000000000 --- a/devel/p5-Scope-Upper/files/patch-t_92-pod-coverage.t +++ /dev/null @@ -1,17 +0,0 @@ ---- t/92-pod-coverage.t.orig 2016-06-04 20:01:09 UTC -+++ t/92-pod-coverage.t -@@ -0,0 +1,14 @@ -+#!perl -T -+ -+use strict; -+use warnings; -+ -+use Test::More; -+ -+use lib 't/lib'; -+use VPIT::TestHelpers; -+ -+load_or_skip_all('Test::Pod::Coverage', '1.08', [ ]); -+load_or_skip_all('Pod::Coverage', '0.18' ); -+ -+all_pod_coverage_ok( { also_private => [ qr/^_/, qr/^CLONE(_SKIP)?$/ ] } ); diff --git a/devel/p5-Scope-Upper/files/patch-t_93-pod-spelling.t b/devel/p5-Scope-Upper/files/patch-t_93-pod-spelling.t deleted file mode 100644 index ec6fe204a08..00000000000 --- a/devel/p5-Scope-Upper/files/patch-t_93-pod-spelling.t +++ /dev/null @@ -1,16 +0,0 @@ ---- t/93-pod-spelling.t.orig 2016-06-04 20:01:09 UTC -+++ t/93-pod-spelling.t -@@ -0,0 +1,13 @@ -+#!perl -+ -+use strict; -+use warnings; -+ -+use Test::More; -+ -+use lib 't/lib'; -+use VPIT::TestHelpers; -+ -+load_or_skip_all('Test::Pod::Spelling::CommonMistakes', '1.0', [ ]); -+ -+all_pod_files_ok(); diff --git a/devel/p5-Scope-Upper/files/patch-t_95-portability-files.t b/devel/p5-Scope-Upper/files/patch-t_95-portability-files.t deleted file mode 100644 index c567073b5c3..00000000000 --- a/devel/p5-Scope-Upper/files/patch-t_95-portability-files.t +++ /dev/null @@ -1,16 +0,0 @@ ---- t/95-portability-files.t.orig 2016-06-04 20:01:09 UTC -+++ t/95-portability-files.t -@@ -0,0 +1,13 @@ -+#!perl -T -+ -+use strict; -+use warnings; -+ -+use Test::More; -+ -+use lib 't/lib'; -+use VPIT::TestHelpers; -+ -+load_or_skip_all('Test::Portability::Files', undef, [ ]); -+ -+run_tests(); diff --git a/devel/p5-Scope-Upper/files/patch-xsh_caps.h b/devel/p5-Scope-Upper/files/patch-xsh_caps.h deleted file mode 100644 index ff65133adc0..00000000000 --- a/devel/p5-Scope-Upper/files/patch-xsh_caps.h +++ /dev/null @@ -1,50 +0,0 @@ ---- xsh/caps.h.orig 2016-06-04 20:01:09 UTC -+++ xsh/caps.h -@@ -0,0 +1,47 @@ -+#ifndef XSH_CAPS_H -+#define XSH_CAPS_H 1 -+ -+#define XSH_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S)))))) -+ -+#define XSH_HAS_PERL_BRANCH(R, V, S) (PERL_REVISION == (R) && PERL_VERSION == (V) && PERL_SUBVERSION >= (S)) -+ -+#define XSH_HAS_PERL_EXACT(R, V, S) ((PERL_REVISION == (R)) && (PERL_VERSION == (V)) && (PERL_SUBVERSION == (S))) -+ -+#ifndef XSH_PERL_PATCHLEVEL -+# ifdef PERL_PATCHNUM -+# define XSH_PERL_PATCHLEVEL PERL_PATCHNUM -+# else -+# define XSH_PERL_PATCHLEVEL 0 -+# endif -+#endif -+ -+#define XSH_HAS_PERL_MAINT(R, V, S, P) (PERL_REVISION == (R) && PERL_VERSION == (V) && (XSH_PERL_PATCHLEVEL >= (P) || (!XSH_PERL_PATCHLEVEL && PERL_SUBVERSION >= (S)))) -+ -+#ifndef XSH_MULTIPLICITY -+# if defined(MULTIPLICITY) -+# define XSH_MULTIPLICITY 1 -+# else -+# define XSH_MULTIPLICITY 0 -+# endif -+#endif -+#if XSH_MULTIPLICITY -+# ifndef PERL_IMPLICIT_CONTEXT -+# error MULTIPLICITY builds must set PERL_IMPLICIT_CONTEXT -+# endif -+# ifndef tTHX -+# define tTHX PerlInterpreter* -+# endif -+#endif -+ -+#if XSH_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV)) -+# define XSH_THREADSAFE 1 -+#else -+# define XSH_THREADSAFE 0 -+#endif -+ -+/* Safe unless stated otherwise in Makefile.PL */ -+#ifndef XSH_FORKSAFE -+# define XSH_FORKSAFE 1 -+#endif -+ -+#endif /* XSH_CAPS_H */ diff --git a/devel/p5-Scope-Upper/files/patch-xsh_debug.h b/devel/p5-Scope-Upper/files/patch-xsh_debug.h deleted file mode 100644 index 9835a808b10..00000000000 --- a/devel/p5-Scope-Upper/files/patch-xsh_debug.h +++ /dev/null @@ -1,30 +0,0 @@ ---- xsh/debug.h.orig 2016-06-04 20:01:09 UTC -+++ xsh/debug.h -@@ -0,0 +1,27 @@ -+#ifndef XSH_DEBUG_H -+#define XSH_DEBUG_H 1 -+ -+#include "util.h" /* XSH_PACKAGE, STMT_* */ -+ -+#ifndef XSH_DEBUG -+# define XSH_DEBUG 0 -+#endif -+ -+#if XSH_DEBUG -+# define XSH_D(X) STMT_START X STMT_END -+static void su_debug_log(const char *fmt, ...) { -+ va_list va; -+ SV *sv; -+ dTHX; -+ va_start(va, fmt); -+ sv = get_sv(XSH_PACKAGE "::DEBUG", 0); -+ if (sv && SvTRUE(sv)) -+ PerlIO_vprintf(Perl_debug_log, fmt, va); -+ va_end(va); -+ return; -+} -+#else -+# define XSH_D(X) -+#endif -+ -+#endif /* XSH_DEBUG_H */ diff --git a/devel/p5-Scope-Upper/files/patch-xsh_threads.h b/devel/p5-Scope-Upper/files/patch-xsh_threads.h deleted file mode 100644 index b3b88bb11db..00000000000 --- a/devel/p5-Scope-Upper/files/patch-xsh_threads.h +++ /dev/null @@ -1,504 +0,0 @@ ---- xsh/threads.h.orig 2016-06-04 20:01:09 UTC -+++ xsh/threads.h -@@ -0,0 +1,501 @@ -+#ifndef XSH_THREADS_H -+#define XSH_THREADS_H 1 -+ -+#include "caps.h" /* XSH_HAS_PERL(), XSH_THREADSAFE */ -+#include "util.h" /* XSH_PACKAGE, dNOOP, NOOP */ -+ -+#ifndef XSH_THREADS_COMPILE_TIME_PROTECTION -+# define XSH_THREADS_COMPILE_TIME_PROTECTION 0 -+#endif -+ -+#ifndef XSH_THREADS_USER_CONTEXT -+# define XSH_THREADS_USER_CONTEXT 1 -+#endif -+ -+#ifndef XSH_THREADS_USER_GLOBAL_SETUP -+# define XSH_THREADS_USER_GLOBAL_SETUP 1 -+#endif -+ -+#ifndef XSH_THREADS_USER_LOCAL_SETUP -+# define XSH_THREADS_USER_LOCAL_SETUP 1 -+#endif -+ -+#ifndef XSH_THREADS_USER_LOCAL_TEARDOWN -+# define XSH_THREADS_USER_LOCAL_TEARDOWN 1 -+#endif -+ -+#ifndef XSH_THREADS_USER_GLOBAL_TEARDOWN -+# define XSH_THREADS_USER_GLOBAL_TEARDOWN 1 -+#endif -+ -+#ifndef XSH_THREADS_PEEP_CONTEXT -+# define XSH_THREADS_PEEP_CONTEXT 0 -+#endif -+ -+#ifndef XSH_THREADS_HINTS_CONTEXT -+# define XSH_THREADS_HINTS_CONTEXT 0 -+#endif -+ -+#ifndef XSH_THREADS_USER_CLONE_NEEDS_DUP -+# define XSH_THREADS_USER_CLONE_NEEDS_DUP 0 -+#endif -+ -+#if XSH_THREADSAFE && (XSH_THREADS_HINTS_CONTEXT || XSH_THREADS_USER_CLONE_NEEDS_DUP) -+# define XSH_THREADS_CLONE_NEEDS_DUP 1 -+#else -+# define XSH_THREADS_CLONE_NEEDS_DUP 0 -+#endif -+ -+#if defined(XSH_OPS_H) && (!XSH_THREADS_GLOBAL_SETUP || !XSH_THREADS_GLOBAL_TEARDOWN) -+# error settting up hook check functions require global setup/teardown -+#endif -+ -+#ifndef XSH_THREADS_NEED_TEARDOWN_LATE -+# define XSH_THREADS_NEED_TEARDOWN_LATE 0 -+#endif -+ -+#if XSH_THREADS_NEED_TEARDOWN_LATE && (!XSH_THREADS_USER_LOCAL_TEARDOWN || !XSH_THREADS_USER_GLOBAL_TEARDOWN) -+# error you need to declare local or global teardown handlers to use the late teardown feature -+#endif -+ -+#if XSH_THREADSAFE -+# ifndef MY_CXT_CLONE -+# define MY_CXT_CLONE \ -+ dMY_CXT_SV; \ -+ my_cxt_t *my_cxtp = (my_cxt_t*)SvPVX(newSV(sizeof(my_cxt_t)-1)); \ -+ Copy(INT2PTR(my_cxt_t*, SvUV(my_cxt_sv)), my_cxtp, 1, my_cxt_t); \ -+ sv_setuv(my_cxt_sv, PTR2UV(my_cxtp)) -+# endif -+#else -+# undef dMY_CXT -+# define dMY_CXT dNOOP -+# undef MY_CXT -+# define MY_CXT xsh_globaldata -+# undef START_MY_CXT -+# define START_MY_CXT static my_cxt_t MY_CXT; -+# undef MY_CXT_INIT -+# define MY_CXT_INIT NOOP -+# undef MY_CXT_CLONE -+# define MY_CXT_CLONE NOOP -+#endif -+ -+#if XSH_THREADSAFE -+/* We must use preexistent global mutexes or we will never be able to destroy -+ * them. */ -+# if XSH_HAS_PERL(5, 9, 3) -+# define XSH_LOADED_LOCK MUTEX_LOCK(&PL_my_ctx_mutex) -+# define XSH_LOADED_UNLOCK MUTEX_UNLOCK(&PL_my_ctx_mutex) -+# else -+# define XSH_LOADED_LOCK OP_REFCNT_LOCK -+# define XSH_LOADED_UNLOCK OP_REFCNT_UNLOCK -+# endif -+#else -+# define XSH_LOADED_LOCK NOOP -+# define XSH_LOADED_UNLOCK NOOP -+#endif -+ -+static I32 xsh_loaded = 0; -+ -+#if XSH_THREADSAFE && XSH_THREADS_COMPILE_TIME_PROTECTION -+ -+#define PTABLE_USE_DEFAULT 1 -+ -+#include "ptable.h" -+ -+#define ptable_loaded_store(T, K, V) ptable_default_store(aPTBL_ (T), (K), (V)) -+#define ptable_loaded_delete(T, K) ptable_default_delete(aPTBL_ (T), (K)) -+#define ptable_loaded_free(T) ptable_default_free(aPTBL_ (T)) -+ -+static ptable *xsh_loaded_cxts = NULL; -+ -+static int xsh_is_loaded(pTHX_ void *cxt) { -+#define xsh_is_loaded(C) xsh_is_loaded(aTHX_ (C)) -+ int res = 0; -+ -+ XSH_LOADED_LOCK; -+ if (xsh_loaded_cxts && ptable_fetch(xsh_loaded_cxts, cxt)) -+ res = 1; -+ XSH_LOADED_UNLOCK; -+ -+ return res; -+} -+ -+static int xsh_set_loaded_locked(pTHX_ void *cxt) { -+#define xsh_set_loaded_locked(C) xsh_set_loaded_locked(aTHX_ (C)) -+ int global_setup = 0; -+ -+ if (xsh_loaded <= 0) { -+ XSH_ASSERT(xsh_loaded == 0); -+ XSH_ASSERT(!xsh_loaded_cxts); -+ xsh_loaded_cxts = ptable_new(4); -+ global_setup = 1; -+ } -+ ++xsh_loaded; -+ XSH_ASSERT(xsh_loaded_cxts); -+ ptable_loaded_store(xsh_loaded_cxts, cxt, cxt); -+ -+ return global_setup; -+} -+ -+static int xsh_clear_loaded_locked(pTHX_ void *cxt) { -+#define xsh_clear_loaded_locked(C) xsh_clear_loaded_locked(aTHX_ (C)) -+ int global_teardown = 0; -+ -+ if (xsh_loaded > 1) { -+ XSH_ASSERT(xsh_loaded_cxts); -+ ptable_loaded_delete(xsh_loaded_cxts, cxt); -+ --xsh_loaded; -+ } else if (xsh_loaded_cxts) { -+ XSH_ASSERT(xsh_loaded == 1); -+ ptable_loaded_free(xsh_loaded_cxts); -+ xsh_loaded_cxts = NULL; -+ xsh_loaded = 0; -+ global_teardown = 1; -+ } -+ -+ return global_teardown; -+} -+ -+#else /* XSH_THREADS_COMPILE_TIME_PROTECTION */ -+ -+#define xsh_is_loaded_locked(C) (xsh_loaded > 0) -+#define xsh_set_loaded_locked(C) ((xsh_loaded++ <= 0) ? 1 : 0) -+#define xsh_clear_loaded_locked(C) ((--xsh_loaded <= 0) ? 1 : 0) -+ -+#if XSH_THREADSAFE -+ -+static int xsh_is_loaded(pTHX_ void *cxt) { -+#define xsh_is_loaded(C) xsh_is_loaded(aTHX_ (C)) -+ int res = 0; -+ -+ XSH_LOADED_LOCK; -+ res = xsh_is_loaded_locked(cxt); -+ XSH_LOADED_UNLOCK; -+ -+ return res; -+} -+ -+#else -+ -+#define xsh_is_loaded(C) xsh_is_loaded_locked(C) -+ -+#endif -+ -+#endif /* !XSH_THREADS_COMPILE_TIME_PROTECTION */ -+ -+#define MY_CXT_KEY XSH_PACKAGE "::_guts" XS_VERSION -+ -+typedef struct { -+#if XSH_THREADS_USER_CONTEXT -+ xsh_user_cxt_t cxt_user; -+#endif -+#if XSH_THREADS_PEEP_CONTEXT -+ xsh_peep_cxt_t cxt_peep; -+#endif -+#if XSH_THREADS_HINTS_CONTEXT -+ xsh_hints_cxt_t cxt_hints; -+#endif -+#if XSH_THREADS_CLONE_NEEDS_DUP -+ tTHX owner; -+#endif -+#if !(XSH_THREADS_USER_CONTEXT || XSH_THREADS_PEEP_CONTEXT || XSH_THREADS_HINTS_CONTEXT || XSH_THREADS_CLONE_NEEDS_DUP) -+ int dummy; -+#endif -+} my_cxt_t; -+ -+START_MY_CXT -+ -+#if XSH_THREADS_USER_CONTEXT -+# define dXSH_CXT dMY_CXT -+# define XSH_CXT (MY_CXT.cxt_user) -+#endif -+ -+#if XSH_THREADS_USER_GLOBAL_SETUP -+static void xsh_user_global_setup(pTHX); -+#endif -+ -+#if XSH_THREADS_USER_LOCAL_SETUP -+# if XSH_THREADS_USER_CONTEXT -+static void xsh_user_local_setup(pTHX_ xsh_user_cxt_t *cxt); -+# else -+static void xsh_user_local_setup(pTHX); -+# endif -+#endif -+ -+#if XSH_THREADS_USER_LOCAL_TEARDOWN -+# if XSH_THREADS_USER_CONTEXT -+static void xsh_user_local_teardown(pTHX_ xsh_user_cxt_t *cxt); -+# else -+static void xsh_user_local_teardown(pTHX); -+# endif -+#endif -+ -+#if XSH_THREADS_USER_GLOBAL_TEARDOWN -+static void xsh_user_global_teardown(pTHX); -+#endif -+ -+#if XSH_THREADSAFE && XSH_THREADS_USER_CONTEXT -+# if XSH_THREADS_USER_CLONE_NEEDS_DUP -+static void xsh_user_clone(pTHX_ const xsh_user_cxt_t *old_cxt, xsh_user_cxt_t *new_cxt, CLONE_PARAMS *params); -+# else -+static void xsh_user_clone(pTHX_ const xsh_user_cxt_t *old_cxt, xsh_user_cxt_t *new_cxt); -+# endif -+#endif -+ -+#if XSH_THREADS_PEEP_CONTEXT -+static xsh_peep_cxt_t *xsh_peep_get_cxt(pTHX) { -+ dMY_CXT; -+ XSH_ASSERT(xsh_is_loaded(&MY_CXT)); -+ return &MY_CXT.cxt_peep; -+} -+#endif -+ -+#if XSH_THREADS_HINTS_CONTEXT -+static xsh_hints_cxt_t *xsh_hints_get_cxt(pTHX) { -+ dMY_CXT; -+ XSH_ASSERT(xsh_is_loaded(&MY_CXT)); -+ return &MY_CXT.cxt_hints; -+} -+#endif -+ -+#if XSH_THREADS_NEED_TEARDOWN_LATE -+ -+typedef void (*xsh_teardown_late_cb)(pTHX_ void *ud); -+ -+static int xsh_teardown_late_simple_free(pTHX_ SV *sv, MAGIC *mg) { -+ xsh_teardown_late_cb cb; -+ -+ cb = DPTR2FPTR(xsh_teardown_late_cb, mg->mg_ptr); -+ -+ XSH_LOADED_LOCK; -+ if (xsh_loaded == 0) -+ cb(aTHX_ NULL); -+ XSH_LOADED_UNLOCK; -+ -+ return 0; -+} -+ -+static MGVTBL xsh_teardown_late_simple_vtbl = { -+ 0, -+ 0, -+ 0, -+ 0, -+ xsh_teardown_late_simple_free -+#if MGf_COPY -+ , 0 -+#endif -+#if MGf_DUP -+ , 0 -+#endif -+#if MGf_LOCAL -+ , 0 -+#endif -+}; -+ -+typedef struct { -+ xsh_teardown_late_cb cb; -+ void *ud; -+} xsh_teardown_late_token; -+ -+static int xsh_teardown_late_arg_free(pTHX_ SV *sv, MAGIC *mg) { -+ xsh_teardown_late_token *tok; -+ -+ tok = (xsh_teardown_late_token *) mg->mg_ptr; -+ -+ XSH_LOADED_LOCK; -+ if (xsh_loaded == 0) -+ tok->cb(aTHX_ tok->ud); -+ XSH_LOADED_UNLOCK; -+ -+ PerlMemShared_free(tok); -+ -+ return 0; -+} -+ -+static MGVTBL xsh_teardown_late_arg_vtbl = { -+ 0, -+ 0, -+ 0, -+ 0, -+ xsh_teardown_late_arg_free -+#if MGf_COPY -+ , 0 -+#endif -+#if MGf_DUP -+ , 0 -+#endif -+#if MGf_LOCAL -+ , 0 -+#endif -+}; -+ -+static void xsh_teardown_late_register(pTHX_ xsh_teardown_late_cb cb, void *ud){ -+#define xsh_teardown_late_register(CB, UD) xsh_teardown_late_register(aTHX_ (CB), (UD)) -+ void *ptr; -+ -+ if (!ud) { -+ ptr = FPTR2DPTR(void *, cb); -+ } else { -+ xsh_teardown_late_token *tok; -+ -+ tok = PerlMemShared_malloc(sizeof *tok); -+ tok->cb = cb; -+ tok->ud = ud; -+ -+ ptr = tok; -+ } -+ -+ if (!PL_strtab) -+ PL_strtab = newHV(); -+ -+ sv_magicext((SV *) PL_strtab, NULL, PERL_MAGIC_ext, -+ ud ? &xsh_teardown_late_arg_vtbl : &xsh_teardown_late_simple_vtbl, -+ ptr, 0); -+ -+ return; -+} -+ -+#endif /* XSH_THREADS_NEED_TEARDOWN_LATE */ -+ -+static void xsh_teardown(pTHX_ void *root) { -+ dMY_CXT; -+ -+#if XSH_THREADS_USER_LOCAL_TEARDOWN -+# if XSH_THREADS_USER_CONTEXT -+ xsh_user_local_teardown(aTHX_ &XSH_CXT); -+# else -+ xsh_user_local_teardown(aTHX); -+# endif -+#endif -+ -+#if XSH_THREADS_PEEP_CONTEXT -+ xsh_peep_local_teardown(aTHX_ &MY_CXT.cxt_peep); -+#endif -+ -+#if XSH_THREADS_HINTS_CONTEXT -+ xsh_hints_local_teardown(aTHX_ &MY_CXT.cxt_hints); -+#endif -+ -+ XSH_LOADED_LOCK; -+ -+ if (xsh_clear_loaded_locked(&MY_CXT)) { -+#if XSH_THREADS_USER_GLOBAL_TEARDOWN -+ xsh_user_global_teardown(aTHX); -+#endif -+ -+#if XSH_THREADS_HINTS_CONTEXT -+ xsh_hints_global_teardown(aTHX); -+#endif -+ } -+ -+ XSH_LOADED_UNLOCK; -+ -+ return; -+} -+ -+static void xsh_setup(pTHX) { -+#define xsh_setup() xsh_setup(aTHX) -+ MY_CXT_INIT; /* Takes/release PL_my_ctx_mutex */ -+ -+ XSH_LOADED_LOCK; -+ -+ if (xsh_set_loaded_locked(&MY_CXT)) { -+#if XSH_THREADS_HINTS_CONTEXT -+ xsh_hints_global_setup(aTHX); -+#endif -+ -+#if XSH_THREADS_USER_GLOBAL_SETUP -+ xsh_user_global_setup(aTHX); -+#endif -+ } -+ -+ XSH_LOADED_UNLOCK; -+ -+#if XSH_THREADS_CLONE_NEEDS_DUP -+ MY_CXT.owner = aTHX; -+#endif -+ -+#if XSH_THREADS_HINTS_CONTEXT -+ xsh_hints_local_setup(aTHX_ &MY_CXT.cxt_hints); -+#endif -+ -+#if XSH_THREADS_PEEP_CONTEXT -+ xsh_peep_local_setup(aTHX_ &MY_CXT.cxt_peep); -+#endif -+ -+#if XSH_THREADS_USER_LOCAL_SETUP -+# if XSH_THREADS_USER_CONTEXT -+ xsh_user_local_setup(aTHX_ &XSH_CXT); -+# else -+ xsh_user_local_setup(aTHX); -+# endif -+#endif -+ -+ call_atexit(xsh_teardown, NULL); -+ -+ return; -+} -+ -+#if XSH_THREADSAFE -+ -+static void xsh_clone(pTHX) { -+#define xsh_clone() xsh_clone(aTHX) -+ const my_cxt_t *old_cxt; -+ my_cxt_t *new_cxt; -+ -+ { -+ dMY_CXT; -+ old_cxt = &MY_CXT; -+ } -+ -+ { -+ int global_setup; -+ -+ MY_CXT_CLONE; -+ new_cxt = &MY_CXT; -+ -+ XSH_LOADED_LOCK; -+ global_setup = xsh_set_loaded_locked(new_cxt); -+ XSH_ASSERT(!global_setup); -+ XSH_LOADED_UNLOCK; -+ -+#if XSH_THREADS_CLONE_NEEDS_DUP -+ new_cxt->owner = aTHX; -+#endif -+ } -+ -+ { -+#if XSH_THREADS_CLONE_NEEDS_DUP -+ XSH_DUP_PARAMS_TYPE params; -+ xsh_dup_params_init(params, old_cxt->owner); -+#endif -+ -+#if XSH_THREADS_PEEP_CONTEXT -+ xsh_peep_clone(aTHX_ &old_cxt->cxt_peep, &new_cxt->cxt_peep); -+#endif -+ -+#if XSH_THREADS_HINTS_CONTEXT -+ xsh_hints_clone(aTHX_ &old_cxt->cxt_hints, &new_cxt->cxt_hints, -+ xsh_dup_params_ptr(params)); -+#endif -+ -+#if XSH_THREADS_USER_CONTEXT -+# if XSH_THREADS_USER_CLONE_NEEDS_DUP -+ xsh_user_clone(aTHX_ &old_cxt->cxt_user, &new_cxt->cxt_user, -+ xsh_dup_params_ptr(params)); -+# else -+ xsh_user_clone(aTHX_ &old_cxt->cxt_user, &new_cxt->cxt_user); -+# endif -+#endif -+ -+#if XSH_THREADS_CLONE_NEEDS_DUP -+ xsh_dup_params_deinit(params); -+#endif -+ } -+ -+ return; -+} -+ -+#endif /* XSH_THREADSAFE */ -+ -+#endif /* XSH_THREADS_H */ diff --git a/devel/p5-Scope-Upper/files/patch-xsh_util.h b/devel/p5-Scope-Upper/files/patch-xsh_util.h deleted file mode 100644 index 083f9044228..00000000000 --- a/devel/p5-Scope-Upper/files/patch-xsh_util.h +++ /dev/null @@ -1,100 +0,0 @@ ---- xsh/util.h.orig 2016-06-04 20:01:09 UTC -+++ xsh/util.h -@@ -0,0 +1,97 @@ -+#ifndef XSH_UTIL_H -+#define XSH_UTIL_H 1 -+ -+#include "caps.h" /* XSH_HAS_PERL() */ -+ -+#ifndef XSH_PACKAGE -+# error XSH_PACKAGE must be defined -+#endif -+ -+#define XSH_PACKAGE_LEN (sizeof(XSH_PACKAGE)-1) -+ -+#ifdef DEBUGGING -+# if XSH_HAS_PERL(5, 8, 9) || XSH_HAS_PERL(5, 9, 3) -+# define XSH_ASSERT(C) assert(C) -+# else -+# define XSH_ASSERT(C) PERL_DEB( \ -+ ((C) ? ((void) 0) \ -+ : (Perl_croak_nocontext("Assertion %s failed: file \"" __FILE__ \ -+ "\", line %d", STRINGIFY(C), __LINE__), \ -+ (void) 0))) -+# endif -+#else -+# define XSH_ASSERT(C) -+#endif -+ -+#undef VOID2 -+#ifdef __cplusplus -+# define VOID2(T, P) static_cast(P) -+#else -+# define VOID2(T, P) (P) -+#endif -+ -+#ifndef STMT_START -+# define STMT_START do -+#endif -+ -+#ifndef STMT_END -+# define STMT_END while (0) -+#endif -+ -+#ifndef dNOOP -+# define dNOOP -+#endif -+ -+#ifndef NOOP -+# define NOOP -+#endif -+ -+#if XSH_HAS_PERL(5, 13, 2) -+# define XSH_DUP_PARAMS_TYPE CLONE_PARAMS * -+# define xsh_dup_params_init(P, O) ((P) = Perl_clone_params_new((O), aTHX)) -+# define xsh_dup_params_deinit(P) Perl_clone_params_del(P) -+# define xsh_dup_params_ptr(P) (P) -+#else -+# define XSH_DUP_PARAMS_TYPE CLONE_PARAMS -+# define xsh_dup_params_init(P, O) \ -+ ((P).stashes = newAV()); (P).flags = 0; ((P).proto_perl = (O)) -+# define xsh_dup_params_deinit(P) SvREFCNT_dec((P).stashes) -+# define xsh_dup_params_ptr(P) &(P) -+#endif -+#define xsh_dup(S, P) sv_dup((S), (P)) -+#define xsh_dup_inc(S, P) SvREFCNT_inc(xsh_dup((S), (P))) -+ -+/* Context for PerlMemShared_*() functions */ -+#ifdef PERL_IMPLICIT_SYS -+# define pPMS pTHX -+# define pPMS_ pTHX_ -+# define aPMS aTHX -+# define aPMS_ aTHX_ -+#else -+# define pPMS void -+# define pPMS_ -+# define aPMS -+# define aPMS_ -+#endif -+ -+#ifdef USE_ITHREADS -+# define XSH_LOCK(M) MUTEX_LOCK(M) -+# define XSH_UNLOCK(M) MUTEX_UNLOCK(M) -+#else -+# define XSH_LOCK(M) NOOP -+# define XSH_UNLOCK(M) NOOP -+#endif -+ -+#ifndef PTR2nat -+# define PTR2nat(p) (PTRV)(p) -+#endif -+ -+#ifndef DPTR2FPTR -+# define DPTR2FPTR(t,p) ((t)PTR2nat(p)) -+#endif -+ -+#ifndef FPTR2DPTR -+# define FPTR2DPTR(t,p) ((t)PTR2nat(p)) -+#endif -+ -+#endif /* XSH_UTIL_H */ diff --git a/devel/p5-System-Command/Makefile b/devel/p5-System-Command/Makefile index 53f9b57aa2e..8e26b3c2dbe 100644 --- a/devel/p5-System-Command/Makefile +++ b/devel/p5-System-Command/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= System-Command -PORTVERSION= 1.117 +PORTVERSION= 1.118 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-System-Command/distinfo b/devel/p5-System-Command/distinfo index 8c2f84030a1..11ad3574daa 100644 --- a/devel/p5-System-Command/distinfo +++ b/devel/p5-System-Command/distinfo @@ -1,2 +1,3 @@ -SHA256 (System-Command-1.117.tar.gz) = 42d1e8f9ce39a4c0ce9a815b0de19eee0baa887c756eda99a4b3dc2b020004ba -SIZE (System-Command-1.117.tar.gz) = 29636 +TIMESTAMP = 1466511711 +SHA256 (System-Command-1.118.tar.gz) = 00c4dcc606aeea4d5d58ca027bfb484a7f59edfca882c84d01924c2af32f1ea7 +SIZE (System-Command-1.118.tar.gz) = 29939 diff --git a/devel/p5-Term-Clui/Makefile b/devel/p5-Term-Clui/Makefile index 60853eb430b..94bfcb941e4 100644 --- a/devel/p5-Term-Clui/Makefile +++ b/devel/p5-Term-Clui/Makefile @@ -14,7 +14,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= p5-Term-Size>=0:devel/p5-Term-Size \ p5-Term-ReadKey>=2.14:devel/p5-Term-ReadKey \ - p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu + p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-Term-ReadLine-Gnu/Makefile similarity index 79% rename from devel/p5-ReadLine-Gnu/Makefile rename to devel/p5-Term-ReadLine-Gnu/Makefile index fbd3e75014c..7bb33642ecf 100644 --- a/devel/p5-ReadLine-Gnu/Makefile +++ b/devel/p5-Term-ReadLine-Gnu/Makefile @@ -1,12 +1,11 @@ # Created by: Matthew Hunt # $FreeBSD$ -PORTNAME= ReadLine-Gnu -PORTVERSION= 1.31 +PORTNAME= Term-ReadLine-Gnu +PORTVERSION= 1.34 CATEGORIES= devel perl5 -MASTER_SITES= CPAN/Term +MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -DISTNAME= Term-${PORTNAME}-${PORTVERSION} MAINTAINER= perl@FreeBSD.org COMMENT= Allow Term::ReadLine to use GNU readline diff --git a/devel/p5-Term-ReadLine-Gnu/distinfo b/devel/p5-Term-ReadLine-Gnu/distinfo new file mode 100644 index 00000000000..d88974ed4e2 --- /dev/null +++ b/devel/p5-Term-ReadLine-Gnu/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1466515697 +SHA256 (Term-ReadLine-Gnu-1.34.tar.gz) = a965fd0601bea84cb65e0c5e6a1eb3469fe2d99772be235faccbc49c57edf6cd +SIZE (Term-ReadLine-Gnu-1.34.tar.gz) = 126841 diff --git a/devel/p5-ReadLine-Gnu/pkg-descr b/devel/p5-Term-ReadLine-Gnu/pkg-descr similarity index 100% rename from devel/p5-ReadLine-Gnu/pkg-descr rename to devel/p5-Term-ReadLine-Gnu/pkg-descr diff --git a/devel/p5-Term-ReadLine-Gnu/pkg-plist b/devel/p5-Term-ReadLine-Gnu/pkg-plist new file mode 100644 index 00000000000..a3da4b138c3 --- /dev/null +++ b/devel/p5-Term-ReadLine-Gnu/pkg-plist @@ -0,0 +1,44 @@ +bin/perlsh +%%SITE_ARCH%%/Term/ReadLine/Gnu.pm +%%SITE_ARCH%%/Term/ReadLine/Gnu/XS.pm +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/Gnu.so +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/Tk_getc.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/_ch_wrapper.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/_str2fn.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/_str2map.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/_tgetstrs.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/_trp_completion_function.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/autosplit.ix +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/change_ornaments.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/display_readline_version.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/get_history_event.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/hist_arg_extract.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/hist_list.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/history_expand_line.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/list_completion_function.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/operate_and_get_next.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/ornaments.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_add_funmap_entry.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_bind_key.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_bind_key_if_unbound.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_bind_keyseq.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_bind_keyseq_if_unbound.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_call_function.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_completion_mode.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_copy_keymap.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_discard_keymap.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_filename_list.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_generic_bind.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_invoking_keyseqs.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_macro_bind.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_message.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_set_key.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_set_keymap.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_tty_set_default_bindings.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/rl_tty_unset_default_bindings.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/shadow_redisplay.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/unbind_command.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/unbind_function.al +%%SITE_ARCH%%/auto/Term/ReadLine/Gnu/XS/unbind_key.al +%%PERL5_MAN1%%/perlsh.1.gz +%%PERL5_MAN3%%/Term::ReadLine::Gnu.3.gz diff --git a/devel/p5-Term-ReadLine-Perl/Makefile b/devel/p5-Term-ReadLine-Perl/Makefile index 7eb0f8e524d..da2a1c2ac36 100644 --- a/devel/p5-Term-ReadLine-Perl/Makefile +++ b/devel/p5-Term-ReadLine-Perl/Makefile @@ -8,7 +8,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= anes@anes.su +MAINTAINER= perl@FreeBSD.org COMMENT= Quick implementation of the minimal interface to Readline libraries BUILD_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey diff --git a/devel/p5-ReadLine-TTYtter/Makefile b/devel/p5-Term-ReadLine-TTYtter/Makefile similarity index 88% rename from devel/p5-ReadLine-TTYtter/Makefile rename to devel/p5-Term-ReadLine-TTYtter/Makefile index 69e27c3fa08..13448c37310 100644 --- a/devel/p5-ReadLine-TTYtter/Makefile +++ b/devel/p5-Term-ReadLine-TTYtter/Makefile @@ -1,13 +1,12 @@ # Created by: Sébastien Santoro # $FreeBSD$ -PORTNAME= ReadLine-TTYtter +PORTNAME= Term-ReadLine-TTYtter PORTVERSION= 1.4 PORTREVISION= 2 CATEGORIES= devel perl5 -MASTER_SITES= CPAN/Term +MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -DISTNAME= Term-${PORTNAME}-${PORTVERSION} MAINTAINER= dereckson@gmail.com COMMENT= Perl5 module for Term::ReadLine allowing rich editing diff --git a/devel/p5-ReadLine-TTYtter/distinfo b/devel/p5-Term-ReadLine-TTYtter/distinfo similarity index 100% rename from devel/p5-ReadLine-TTYtter/distinfo rename to devel/p5-Term-ReadLine-TTYtter/distinfo diff --git a/devel/p5-ReadLine-TTYtter/pkg-descr b/devel/p5-Term-ReadLine-TTYtter/pkg-descr similarity index 100% rename from devel/p5-ReadLine-TTYtter/pkg-descr rename to devel/p5-Term-ReadLine-TTYtter/pkg-descr diff --git a/devel/p5-ReadLine-TTYtter/pkg-plist b/devel/p5-Term-ReadLine-TTYtter/pkg-plist similarity index 100% rename from devel/p5-ReadLine-TTYtter/pkg-plist rename to devel/p5-Term-ReadLine-TTYtter/pkg-plist diff --git a/devel/p5-Test-Strict/Makefile b/devel/p5-Test-Strict/Makefile index f2499323146..3fe7a273416 100644 --- a/devel/p5-Test-Strict/Makefile +++ b/devel/p5-Test-Strict/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Test-Strict -PORTVERSION= 0.36 +PORTVERSION= 0.37 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Test-Strict/distinfo b/devel/p5-Test-Strict/distinfo index 354ce4448dd..26add355e74 100644 --- a/devel/p5-Test-Strict/distinfo +++ b/devel/p5-Test-Strict/distinfo @@ -1,2 +1,3 @@ -SHA256 (Test-Strict-0.36.tar.gz) = 105d751b67ca2203e5730f87865025c4cdd20cb6a6f2618cd07f776c9abe26d0 -SIZE (Test-Strict-0.36.tar.gz) = 19862 +TIMESTAMP = 1466516364 +SHA256 (Test-Strict-0.37.tar.gz) = d74e069160e00a89b6d42d0d42bb19a399ebde9a5ef6bea35e41139611b1f3e1 +SIZE (Test-Strict-0.37.tar.gz) = 20025 diff --git a/devel/p5-VCS/Makefile b/devel/p5-VCS/Makefile index a8960ca1bf6..8ce3dc66c4b 100644 --- a/devel/p5-VCS/Makefile +++ b/devel/p5-VCS/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= VCS -PORTVERSION= 0.24 -PORTREVISION= 1 +PORTVERSION= 0.25 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-VCS/distinfo b/devel/p5-VCS/distinfo index 12e5f626af7..b7e4e2fa2c9 100644 --- a/devel/p5-VCS/distinfo +++ b/devel/p5-VCS/distinfo @@ -1,2 +1,3 @@ -SHA256 (VCS-0.24.tar.gz) = e691b94f0aac15f3b34e080e04cbcd9613b94b67b94ab759988fb8150b2e163c -SIZE (VCS-0.24.tar.gz) = 22376 +TIMESTAMP = 1466516500 +SHA256 (VCS-0.25.tar.gz) = e91ba19f8e26044a78a8e985f84aa1a67ccf7611f7e45d5ea0d64d9f11972298 +SIZE (VCS-0.25.tar.gz) = 22106 diff --git a/devel/p5-constant-lexical/Makefile b/devel/p5-constant-lexical/Makefile index ead965dc8f3..bbd06241e33 100644 --- a/devel/p5-constant-lexical/Makefile +++ b/devel/p5-constant-lexical/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= constant-lexical -PORTVERSION= 2.0001 -PORTREVISION= 2 +PORTVERSION= 2.0003 CATEGORIES= devel perl5 -MASTER_SITES= CPAN +MASTER_SITES= CPAN/constant CPAN MASTER_SITE_SUBDIR= CPAN:SPROUT PKGNAMEPREFIX= p5- @@ -19,4 +18,12 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure -.include +.include + +.if ${PERL_LEVEL} >= 502200 +PLIST_SUB+= USEXS= NOXS="@comment " +.else +PLIST_SUB+= USEXS="@comment " NOXS= +.endif + +.include diff --git a/devel/p5-constant-lexical/distinfo b/devel/p5-constant-lexical/distinfo index 8b8d437d089..46bdc7bd53a 100644 --- a/devel/p5-constant-lexical/distinfo +++ b/devel/p5-constant-lexical/distinfo @@ -1,2 +1,3 @@ -SHA256 (constant-lexical-2.0001.tar.gz) = 0fac59f2844f638664754597d3f2b552ac4ea9956191aa12a6dc788279f1feb7 -SIZE (constant-lexical-2.0001.tar.gz) = 31660 +TIMESTAMP = 1466516579 +SHA256 (constant-lexical-2.0003.tar.gz) = a5d2c32693051221ae51b1d713318913530ddd7dc5c5336288f2448bcbf67375 +SIZE (constant-lexical-2.0003.tar.gz) = 33597 diff --git a/devel/p5-constant-lexical/pkg-plist b/devel/p5-constant-lexical/pkg-plist index 4378d4cb4c0..045b4bc9013 100644 --- a/devel/p5-constant-lexical/pkg-plist +++ b/devel/p5-constant-lexical/pkg-plist @@ -1,2 +1,4 @@ +%%USEXS%%%%SITE_ARCH%%/auto/constant/lexical/lexical.so +%%USEXS%%%%SITE_ARCH%%/constant/lexical.pm %%PERL5_MAN3%%/constant::lexical.3.gz -%%SITE_PERL%%/constant/lexical.pm +%%NOXS%%%%SITE_PERL%%/constant/lexical.pm diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile index c986f747fea..09ad67a4290 100644 --- a/devel/perlconsole/Makefile +++ b/devel/perlconsole/Makefile @@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= CPAN:SUKRIA MAINTAINER= jadawin@FreeBSD.org COMMENT= Light program that lets you evaluate Perl code interactively -RUN_DEPENDS= p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \ +RUN_DEPENDS= p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu \ p5-Module-Refresh>=0:devel/p5-Module-Refresh \ p5-Lexical-Persistence>=0:devel/p5-Lexical-Persistence \ p5-B-Keywords>=0:devel/p5-B-Keywords diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile index c64589d4e56..0a5ae0097e9 100644 --- a/devel/py-simpy/Makefile +++ b/devel/py-simpy/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= simpy -PORTVERSION= 3.0.8 +PORTVERSION= 3.0.9 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-simpy/distinfo b/devel/py-simpy/distinfo index 2c83825d68c..cbaa6ff9acb 100644 --- a/devel/py-simpy/distinfo +++ b/devel/py-simpy/distinfo @@ -1,2 +1,3 @@ -SHA256 (simpy-3.0.8.tar.gz) = e127921510773f7b6189ab3596362809a37b87b7c2ae298b29ba3a6cca03e677 -SIZE (simpy-3.0.8.tar.gz) = 402664 +TIMESTAMP = 1466476009 +SHA256 (simpy-3.0.9.tar.gz) = 0242cb9160995fd5410bf1b3353fd74734bbf6d3e5fbc4ea7912a6572738b2d2 +SIZE (simpy-3.0.9.tar.gz) = 388694 diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile index 1b1d82a9b15..4ecaae2f63a 100644 --- a/editors/codelite/Makefile +++ b/editors/codelite/Makefile @@ -3,6 +3,7 @@ PORTNAME= codelite PORTVERSION= 9.1 +PORTREVISION= 1 CATEGORIES= editors devel MAINTAINER= mokhi64@gmail.com @@ -16,13 +17,12 @@ USE_GITHUB= yes GH_ACCOUNT= eranif USES= cmake:outsource compiler:c++11-lib dos2unix execinfo gettext \ - shebangfix sqlite + pathfix shebangfix sqlite DOS2UNIX_GLOB= *.cpp *.txt SHEBANG_FILES= Runtime/codelite_xterm bash_CMD= /bin/sh USE_WX= 3.0 -CMAKE_ARGS= -DENABLE_LLDB:STRING=0 \ - -DPREFIX:STRING="${PREFIX}" \ +CMAKE_ARGS= -DPREFIX:STRING="${PREFIX}" \ -DIS_FREEBSD:STRING=1 \ -DCL_WX_CONFIG:STRING="${WX_CONFIG:T}" USE_LDCONFIG= ${PREFIX}/lib/codelite @@ -33,22 +33,8 @@ LDFLAGS+= ${EXECINFO_LDFLAGS} OPTIONS_DEFINE= CSCOPE SFTP OPTIONS_RADIO= CLANG -OPTIONS_RADIO_CLANG= CLANG34 CLANG35 CLANG36 CLANG37 OPTIONS_SUB= yes -CLANG_DESC= Clang code-completion -CLANG34_DESC= Clang 3.4.x -CLANG34_BUILD_DEPENDS= clang34>0:lang/clang34 -CLANG34_RUN_DEPENDS= clang34>0:lang/clang34 -CLANG35_DESC= Clang 3.5.x -CLANG35_BUILD_DEPENDS= clang35>0:lang/clang35 -CLANG35_RUN_DEPENDS= clang35>0:lang/clang35 -CLANG36_DESC= Clang 3.6.x -CLANG36_BUILD_DEPENDS= clang36>0:lang/clang36 -CLANG36_RUN_DEPENDS= clang36>0:lang/clang36 -CLANG37_DESC= Clang 3.7.x -CLANG37_BUILD_DEPENDS= clang37>0:lang/clang37 -CLANG37_RUN_DEPENDS= clang37>0:lang/clang37 CSCOPE_DESC= CScope integration CSCOPE_RUN_DEPENDS= cscope:devel/cscope SFTP_DESC= Secure FTP support via libssh @@ -56,12 +42,27 @@ SFTP_LIB_DEPENDS= libssh.so:security/libssh SFTP_CMAKE_OFF= -DENABLE_SFTP:STRING=0 SFTP_USES= localbase +CLANG_DESC= Clang code-completion + +.for v in 34 35 36 37 38 +OPTIONS_RADIO_CLANG+= CLANG$v +CLANG$v_DESC= Clang ${v:C/(.)(.)/\1.\2.x/} +CLANG$v_BUILD_DEPENDS= clang$v>0:lang/clang$v +CLANG$v_RUN_DEPENDS= clang$v>0:lang/clang$v + +post-patch-CLANG$v-on: + @${REINPLACE_CMD} -e \ + 's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm$v/|' \ + ${WRKSRC}/cmake/Modules/FindLibClang.cmake \ + ${WRKSRC}/cmake/Modules/FindLibLLDB.cmake +.endfor + .include -.if ${PORT_OPTIONS:MCLANG34} || ${PORT_OPTIONS:MCLANG35} || ${PORT_OPTIONS:MCLANG36} -CMAKE_ARGS+= -DENABLE_CLANG:STRING=1 +.if ${PORT_OPTIONS:MCLANG*} +CMAKE_ARGS+= -DENABLE_LLDB:STRING=1 -DENABLE_CLANG:STRING=1 .else -CMAKE_ARGS+= -DENABLE_CLANG:STRING=0 +CMAKE_ARGS+= -DENABLE_LLDB:STRING=0 -DENABLE_CLANG:STRING=0 .endif post-patch: @@ -83,20 +84,8 @@ post-patch: @${REINPLACE_CMD} -e \ '/ADDITIONAL_LIBRARIES/s|""|"-lexecinfo"|' \ ${WRKSRC}/sdk/codelite_cppcheck/CMakeLists.txt - -post-patch-CLANG34-on: @${REINPLACE_CMD} -e \ - 's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm34/|' \ - ${WRKSRC}/cmake/Modules/FindLibClang.cmake - -post-patch-CLANG35-on: - @${REINPLACE_CMD} -e \ - 's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm35/|' \ - ${WRKSRC}/cmake/Modules/FindLibClang.cmake - -post-patch-CLANG36-on: - @${REINPLACE_CMD} -e \ - 's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm36/|' \ + 's|/bin/grep|/usr/bin/grep|' \ ${WRKSRC}/cmake/Modules/FindLibClang.cmake .include diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile index a8728a23576..771a174931c 100644 --- a/emulators/qemu-sbruno/Makefile +++ b/emulators/qemu-sbruno/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qemu -PORTVERSION= 2.6.50.g20160611 -PORTREVISION= 1 +PORTVERSION= 2.6.50.g20160621 CATEGORIES= emulators MASTER_SITES= GH \ LOCAL/nox:dtc \ @@ -19,7 +18,7 @@ COMMENT?= QEMU CPU Emulator - github bsd-user branch USE_GITHUB= yes GH_ACCOUNT= seanbruno GH_PROJECT= ${PORTNAME}-bsd-user -GH_TAGNAME= 6c3484f +GH_TAGNAME= 711f104 HAS_CONFIGURE= yes USES= gmake pkgconfig bison perl5 python:2,build USE_PERL5= build diff --git a/emulators/qemu-sbruno/distinfo b/emulators/qemu-sbruno/distinfo index 58eacb28d6f..2106e49ee7c 100644 --- a/emulators/qemu-sbruno/distinfo +++ b/emulators/qemu-sbruno/distinfo @@ -1,4 +1,4 @@ -SHA256 (qemu/2.6.50.g20160611/seanbruno-qemu-bsd-user-2.6.50.g20160611-6c3484f_GH0.tar.gz) = c2c86fc978c22f75dfa4e6afc6c9b48f6d8649303b9b4cf77b756aa070e216ea -SIZE (qemu/2.6.50.g20160611/seanbruno-qemu-bsd-user-2.6.50.g20160611-6c3484f_GH0.tar.gz) = 12124512 -SHA256 (qemu/2.6.50.g20160611/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 +SHA256 (qemu/2.6.50.g20160621/seanbruno-qemu-bsd-user-2.6.50.g20160621-711f104_GH0.tar.gz) = adc60cbf7ec1f2da82c059e51de9ede555bea79001464b9a6073ac44affbf81f +SIZE (qemu/2.6.50.g20160621/seanbruno-qemu-bsd-user-2.6.50.g20160621-711f104_GH0.tar.gz) = 12124411 +SHA256 (qemu/2.6.50.g20160621/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3 SIZE (qemu/2.6.50.g201605/dtc-v1.4.0.tar.gz) = 131893 diff --git a/ftp/p5-Net-FTPSSL/Makefile b/ftp/p5-Net-FTPSSL/Makefile index 9fa5b970a9b..77c07431656 100644 --- a/ftp/p5-Net-FTPSSL/Makefile +++ b/ftp/p5-Net-FTPSSL/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Net-FTPSSL -PORTVERSION= 0.31 +PORTVERSION= 0.32 CATEGORIES= ftp perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/ftp/p5-Net-FTPSSL/distinfo b/ftp/p5-Net-FTPSSL/distinfo index ea95059d51b..bf2708cbde4 100644 --- a/ftp/p5-Net-FTPSSL/distinfo +++ b/ftp/p5-Net-FTPSSL/distinfo @@ -1,2 +1,3 @@ -SHA256 (Net-FTPSSL-0.31.tar.gz) = 594fc4c6a6cb19dab207b1c35558ef8128f540a49c19983b900e1e6c3e3fb34a -SIZE (Net-FTPSSL-0.31.tar.gz) = 89849 +TIMESTAMP = 1466517027 +SHA256 (Net-FTPSSL-0.32.tar.gz) = cf654c9ba68914a330be48e26fe3b4134af911d05fe071dddd0809d3218e9aaf +SIZE (Net-FTPSSL-0.32.tar.gz) = 90838 diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile index c2d01e32c0d..0c9297ccc89 100644 --- a/ftp/profxp/Makefile +++ b/ftp/profxp/Makefile @@ -13,7 +13,7 @@ COMMENT= FXP (server-to-server FTP) client RUN_DEPENDS= p5-SOCKS>=0:net/p5-Socks \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ - p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl + p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile index 8cd04705745..fd36f404944 100644 --- a/games/eduke32/Makefile +++ b/games/eduke32/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= eduke32 -PORTVERSION= 20160103 +PORTVERSION= 20160610 CATEGORIES= games MASTER_SITES= http://dukeworld.duke4.net/eduke32/synthesis/${PORTVERSION}-${SVNREVISION}/:eduke32 DISTFILES= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX}:eduke32 EXTRACT_ONLY= ${PORTNAME}_src_${PORTVERSION}-${SVNREVISION}${EXTRACT_SUFX} -MAINTAINER= pkubaj@riseup.net +MAINTAINER= pkubaj@anongoth.pl COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke LICENSE= GPLv2 @@ -25,7 +25,7 @@ USE_GL= gl glu USE_GNOME= gtk20 USE_SDL= sdl2 mixer2 WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}-${SVNREVISION} -SVNREVISION= 5506 +SVNREVISION= 5775 DATADIR= ${LOCALBASE}/share/duke3d SUB_FILES= pkg-message SUB_LIST= DATADIR=${DATADIR} @@ -54,6 +54,8 @@ TIMIDITY_RUN_DEPENDS= timidity:audio/timidity TIMIDITYPLUS_DESC= Use Timidity++ for music support TIMIDITYPLUS_RUN_DEPENDS= timidity:audio/timidity++ +CFLAGS+= -flax-vector-conversions + .include .if ${PORT_OPTIONS:MHRP} diff --git a/games/eduke32/distinfo b/games/eduke32/distinfo index 9afb8d43944..ac3c5c020a7 100644 --- a/games/eduke32/distinfo +++ b/games/eduke32/distinfo @@ -1,5 +1,5 @@ -SHA256 (eduke32_src_20160103-5506.tar.xz) = bdd4ea7100c3913981f1be0fc26285a433659bf83528cb2a93f0bcabd95aa34a -SIZE (eduke32_src_20160103-5506.tar.xz) = 14352508 +SHA256 (eduke32_src_20160610-5775.tar.xz) = ce75431ca0145f1c37934d5c934393982f27b6aa64619a4023ce54e4fd50c8f9 +SIZE (eduke32_src_20160610-5775.tar.xz) = 14532340 SHA256 (duke3d_hrp.zip) = f217df456b4f11055041731033e35e4402fada99253e714e37c4a27e6fdc78a5 SIZE (duke3d_hrp.zip) = 933440151 SHA256 (duke3d_xxx.zip) = c31713e6400a175a1bfa3bd369d132f8a8abce8915c113549f98262b9a84b534 diff --git a/games/eduke32/files/patch-Makefile.common b/games/eduke32/files/patch-Makefile.common index d379ba1916e..c68a8aca865 100644 --- a/games/eduke32/files/patch-Makefile.common +++ b/games/eduke32/files/patch-Makefile.common @@ -1,6 +1,6 @@ ---- Makefile.common.orig 2015-07-08 03:34:34 UTC +--- Makefile.common.orig 2016-06-03 04:50:55 UTC +++ Makefile.common -@@ -258,7 +258,6 @@ ifndef LTO +@@ -252,7 +252,6 @@ ifndef LTO endif endif @@ -8,13 +8,12 @@ COMPILERFLAGS= ifeq ($(PACKAGE_REPOSITORY),0) -@@ -278,8 +277,8 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10) - OPTIMIZATIONS += $(DEBUGFLAG) +@@ -273,7 +272,7 @@ ifneq ($(RELEASE)$(DEBUGANYWAY),10) endif CONLYFLAGS=-std=gnu99 -Wimplicit -Werror-implicit-function-declaration --CPPONLYFLAGS= -fno-exceptions -fno-rtti -Wno-write-strings -+CPPONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive -Wno-write-strings - ASFORMAT=elf$(SYSBITS) +-CXXONLYFLAGS= -fno-exceptions -fno-rtti ++CXXONLYFLAGS= -fno-exceptions -fno-rtti -fpermissive + ASFORMAT=elf$(BITS) ASFLAGS=-s -f $(ASFORMAT) #-g LINKERFLAGS= diff --git a/games/eduke32/files/patch-build_src_baselayer.c b/games/eduke32/files/patch-build_src_baselayer.c index 1961024a098..e07c72d89d7 100644 --- a/games/eduke32/files/patch-build_src_baselayer.c +++ b/games/eduke32/files/patch-build_src_baselayer.c @@ -1,11 +1,11 @@ ---- build/src/baselayer.c.orig 2015-07-25 17:23:17 UTC +--- build/src/baselayer.c.orig 2016-05-29 21:11:27 UTC +++ build/src/baselayer.c -@@ -219,7 +219,7 @@ void calc_ylookup(int32_t bpl, int32_t l +@@ -227,7 +227,7 @@ void calc_ylookup(int32_t bpl, int32_t l { Baligned_free(ylookup); - ylookup = (intptr_t *)Xaligned_alloc(16, lastyidx * sizeof(intptr_t)); -+ posix_memalign(&ylookup, 16, lastyidx * sizeof(intptr_t)); - #if !defined(NOASM) && !defined(GEKKO) && !defined(__ANDROID__) - nx_unprotect((intptr_t)ylookup, (intptr_t)ylookup + (lastyidx * sizeof(intptr_t))); - #endif ++ posix_memalign(&ylookup, 16, lastyidx * sizeof(intptr_t)); + ylookupsiz = lastyidx; + } + diff --git a/graphics/p5-Image-ExifTool-devel/Makefile b/graphics/p5-Image-ExifTool-devel/Makefile index eab211d5bb0..290e18f1753 100644 --- a/graphics/p5-Image-ExifTool-devel/Makefile +++ b/graphics/p5-Image-ExifTool-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Image-ExifTool -PORTVERSION= 10.19 +PORTVERSION= 10.20 CATEGORIES= graphics perl5 MASTER_SITES= http://www.sno.phy.queensu.ca/~phil/exiftool/ PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Image-ExifTool-devel/distinfo b/graphics/p5-Image-ExifTool-devel/distinfo index f8a92d84815..4bd3e049f8f 100644 --- a/graphics/p5-Image-ExifTool-devel/distinfo +++ b/graphics/p5-Image-ExifTool-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1465794650 -SHA256 (Image-ExifTool-10.19.tar.gz) = 217239067836f3e5ec166c46a3dfbc01928517d66eb8e1434cf842cb5617798f -SIZE (Image-ExifTool-10.19.tar.gz) = 4139870 +TIMESTAMP = 1466475967 +SHA256 (Image-ExifTool-10.20.tar.gz) = f06ae200950cd3f441f20f7532163365965aa45a91d96114672b0eb176b76d2a +SIZE (Image-ExifTool-10.20.tar.gz) = 4142166 diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile index 651ca575f55..e50afb60953 100644 --- a/lang/p5-Expect/Makefile +++ b/lang/p5-Expect/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Expect -PORTVERSION= 1.32 +PORTVERSION= 1.33 CATEGORIES= lang perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -18,4 +18,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure +WRKSRC= ${WRKDIR}/expect.pm-Expect-${PORTVERSION} + .include diff --git a/lang/p5-Expect/distinfo b/lang/p5-Expect/distinfo index 9a44a55d44d..1866b10856b 100644 --- a/lang/p5-Expect/distinfo +++ b/lang/p5-Expect/distinfo @@ -1,2 +1,3 @@ -SHA256 (Expect-1.32.tar.gz) = d1f96842a5c7dd8516b202b530d87a70b65e7054d3bf975c34f6a42084e54e25 -SIZE (Expect-1.32.tar.gz) = 61592 +TIMESTAMP = 1466517729 +SHA256 (Expect-1.33.tar.gz) = fddfea6980c4f6771d979472e3e084fb55ca9b92bd39ebabdb2522594bf05ff2 +SIZE (Expect-1.33.tar.gz) = 62268 diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile index d8c2a7c0de0..489b55cac4b 100644 --- a/lang/p5-ExtUtils-F77/Makefile +++ b/lang/p5-ExtUtils-F77/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ExtUtils-F77 -PORTVERSION= 1.19 +PORTVERSION= 1.20 CATEGORIES= lang perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/lang/p5-ExtUtils-F77/distinfo b/lang/p5-ExtUtils-F77/distinfo index 2cead590be5..70e78b3e72f 100644 --- a/lang/p5-ExtUtils-F77/distinfo +++ b/lang/p5-ExtUtils-F77/distinfo @@ -1,2 +1,3 @@ -SHA256 (ExtUtils-F77-1.19.tar.gz) = 09cec663fe1cfee57951b46f6433d6b4255a57ec4a1ae8cf5c81099cae84afa5 -SIZE (ExtUtils-F77-1.19.tar.gz) = 12057 +TIMESTAMP = 1466518162 +SHA256 (ExtUtils-F77-1.20.tar.gz) = c42ba548d4b274ffae1535d0ece163b3ba42dc175ee6bdc537071dc52ebbd19a +SIZE (ExtUtils-F77-1.20.tar.gz) = 12201 diff --git a/lang/p5-ExtUtils-F77/files/patch-F77.pm b/lang/p5-ExtUtils-F77/files/patch-F77.pm deleted file mode 100644 index 007bb295d5f..00000000000 --- a/lang/p5-ExtUtils-F77/files/patch-F77.pm +++ /dev/null @@ -1,65 +0,0 @@ ---- F77.pm.orig 2015-06-07 20:28:59 UTC -+++ F77.pm -@@ -343,9 +343,49 @@ $F77config{Aix}{DEFAULT} = 'F77'; - - ### FreeBSD ### - --$F77config{Freebsd}{F77}{Trail_} = 1; --$F77config{Freebsd}{F77}{Link} = '-L/usr/lib -lf2c -lm'; --$F77config{Freebsd}{DEFAULT} = 'F77'; -+if($^O =~ /Freebsd/i) { -+ $gfortran = 'gfortran44'; # requires rewrite -+ $fallback_compiler = 'G77'; -+} -+ -+$F77config{Freebsd}{G77}{Link} = sub { -+ $dir = `g77-34 -print-file-name=libg2c.a`; -+ chomp $dir; -+ # Note that -print-file-name returns just the library name -+ # if it cant be found - make sure that we only accept the -+ # directory if it returns a proper path (or matches a /) -+ -+ if( defined $dir ) { -+ $dir =~ s,/libg2c.a$,,; -+ } else { -+ $dir = "/usr/local/lib"; -+ } -+ return( "-L$dir -L/usr/lib -lg2c -lm" ); -+}; -+ -+$F77config{Freebsd}{GFortran}{Link} = sub { -+ $dir = `$gfortran -print-file-name=libgfortran.a`; -+ chomp $dir; -+ # Note that -print-file-name returns just the library name -+ # if it cant be found - make sure that we only accept the -+ # directory if it returns a proper path (or matches a /) -+ -+ if( defined $dir ) { -+ $dir =~ s,/libgfortran.a$,,; -+ } else { -+ $dir = "/usr/local/lib"; -+ } -+ return( "-L$dir -L/usr/lib -lgfortran -lm" ); -+}; -+ -+$F77config{Freebsd}{G77}{Trail_} = 1; -+$F77config{Freebsd}{GFortran}{Trail_} = 1; -+$F77config{Freebsd}{G77}{Compiler} = 'g77-34'; -+$F77config{Freebsd}{GFortran}{Compiler} = "$gfortran"; -+$F77config{Freebsd}{G77}{Cflags} = '-O2'; -+$F77config{Freebsd}{GFortran}{Cflags} = '-O2'; -+$F77config{Freebsd}{DEFAULT} = 'GFortran'; -+ - - ### VMS ### - -@@ -438,7 +478,8 @@ $Pkg: Will try system=Generic Compiler=$ - EOD - $system = - $Config{cc} =~ /\bgcc/ && $^O =~ /MSWin32/i ? "MinGW" -- :"Generic"; -+ : $^O =~ /Freebsd/i ? "Freebsd" -+ : "Generic"; - $compiler = $fallback_compiler; - my $flibs = get ($F77config{$system}{$compiler}{Link}); - $Runtime = $flibs ; #. gcclibs($flibs); # Note gcclibs appears to be no longer required. diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 372104fdf92..962fcb7d499 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -3,7 +3,7 @@ PORTNAME= fetchmail PORTVERSION= 6.3.26 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail ipv6 MASTER_SITES= SF/${PORTNAME}/branch_6.3/ \ http://mandree.home.pages.de/${PORTNAME}/ @@ -16,7 +16,6 @@ LICENSE_COMB= dual RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -# Note USERS can only contain a single word as parts below rely on that. USERS= ${PORTNAME} GROUPS= ${USERS} @@ -24,8 +23,7 @@ USES= cpe gmake shebangfix tar:xz SHEBANG_FILES= fetchmailconf.py USE_RC_SUBR= fetchmail -SUB_FILES= pkg-message pkg-install pkg-deinstall -SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS} PORTNAME=${PORTNAME} +SUB_FILES= pkg-message GNU_CONFIGURE= yes USE_OPENSSL= yes @@ -36,60 +34,42 @@ CONFIGURE_ENV= ac_cv_have_decl_SSLv2_client_method=no LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= X11 NLS NTLM GSSAPI POP2 DOCS -OPTIONS_DEFAULT= GSSAPI +OPTIONS_DEFINE= X11 NLS NTLM POP2 DOCS +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE +OPTIONS_DEFAULT= GSSAPI_BASE OPTIONS_SUB= yes + +GSSAPI_BASE_USES= gssapi +GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_MIT_USES= gssapi:mit +GSSAPI_MIT_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_NONE_CONFIGURE_ON= --without-gssapi + X11_DESC= Python/Tkinter dependencies for ``fetchmailconf'' POP2_DESC= POP2 Protocol support[obsolete] NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -NLS_CONFIGURE_ON= --enable-nls -NLS_CONFIGURE_OFF= --disable-nls + +NTLM_CONFIGURE_ENABLE= NTLM +NTLM_PORTDOCS= README.NTLM + +# POP2 is obsolete +POP2_CONFIGURE_ENABLE= POP2 + +X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter +X11_USES= python +X11_CONFIGURE_OFF= PYTHON=: +X11_SUB_FILES_OFF= fetchmailconf PORTDOCS= FAQ FEATURES NEWS NOTES README README.SSL \ design-notes.html fetchmail-FAQ.html fetchmail-features.html \ esrs-design-notes.html -.include - -# Pop2 is obsolete -.if ${PORT_OPTIONS:MPOP2} -CONFIGURE_ARGS+= --enable-POP2 -.endif - -.if ${PORT_OPTIONS:MX11} -USES+= python -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter -PLIST_SUB+= NOX11="@comment " -.else -CONFIGURE_ARGS+= PYTHON=: -SUB_FILES+= fetchmailconf -PLIST_SUB+= NOX11="" -.endif - -.if ${PORT_OPTIONS:MGSSAPI} -.if !defined(KRB5_HOME) -.if exists(${LOCALBASE}/lib/libkrb5.a) -KRB5_HOME= ${LOCALBASE} -.elif exists(/usr/lib/libkrb5.a) -KRB5_HOME= /usr -.endif -.endif - -.if defined(KRB5_HOME) && !exists(${KRB5_HOME}/lib/libkrb5.a) -BROKEN= KRB5_HOME is set but doesn\'t provide lib/libkrb5.a -.endif - -.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a) -CONFIGURE_ARGS+= --with-gssapi=${KRB5_HOME} -.endif -.endif - -.if ${PORT_OPTIONS:MNTLM} -CONFIGURE_ARGS+= --enable-NTLM -PORTDOCS+= README.NTLM -.endif +#.include post-patch: .if !exists(/usr/lib/libcom_err.so) @@ -99,7 +79,8 @@ post-patch: post-build: @${MAKE_CMD} -C ${WRKSRC} check -post-install: +post-stage: + ${INSTALL} -d ${STAGEDIR}/var/run/fetchmail ${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \ ${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample diff --git a/mail/fetchmail/files/patch-fetchmail.c b/mail/fetchmail/files/patch-fetchmail.c new file mode 100644 index 00000000000..03e505d4412 --- /dev/null +++ b/mail/fetchmail/files/patch-fetchmail.c @@ -0,0 +1,26 @@ +--- fetchmail.c.orig 2013-04-23 20:00:45 UTC ++++ fetchmail.c +@@ -50,6 +50,10 @@ + #include + #include + ++#ifdef SSL_ENABLE ++#include ++#endif ++ + #ifndef ENETUNREACH + #define ENETUNREACH 128 /* Interactive doesn't know this */ + #endif /* ENETUNREACH */ +@@ -263,6 +267,12 @@ int main(int argc, char **argv) + #ifdef SSL_ENABLE + "+SSL" + #endif ++#ifdef OPENSSL_NO_SSL2 ++ "-SSLv2" ++#endif ++#ifdef OPENSSL_NO_SSL3_METHOD ++ "-SSLv3" ++#endif + #ifdef OPIE_ENABLE + "+OPIE" + #endif /* OPIE_ENABLE */ diff --git a/mail/fetchmail/files/patch-socket.c b/mail/fetchmail/files/patch-socket.c new file mode 100644 index 00000000000..28a0b99caf2 --- /dev/null +++ b/mail/fetchmail/files/patch-socket.c @@ -0,0 +1,24 @@ +--- socket.c.orig 2013-04-23 20:00:45 UTC ++++ socket.c +@@ -907,14 +907,19 @@ int SSLOpen(int sock, char *mycert, char + _ssl_context[sock] = NULL; + if(myproto) { + if(!strcasecmp("ssl2",myproto)) { +-#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 ++#ifndef OPENSSL_NO_SSL2 + _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); + #else +- report(stderr, GT_("Your operating system does not support SSLv2.\n")); ++ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); + return -1; + #endif + } else if(!strcasecmp("ssl3",myproto)) { ++#ifndef OPENSSL_NO_SSL3_METHOD + _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); ++#else ++ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); ++ return -1; ++#endif + } else if(!strcasecmp("tls1",myproto)) { + _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); + } else if (!strcasecmp("ssl23",myproto)) { diff --git a/mail/fetchmail/files/pkg-deinstall.in b/mail/fetchmail/files/pkg-deinstall.in deleted file mode 100644 index b5db8a91f30..00000000000 --- a/mail/fetchmail/files/pkg-deinstall.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ x$2 != xPOST-DEINSTALL ]; then - exit -fi - -if [ -f /var/run/%%PORTNAME%%/fetchmail.pid ] ; then - /bin/rm -f /var/run/%%PORTNAME%%/fetchmail.pid -fi - -/bin/rmdir /var/run/%%PORTNAME%% - -exit diff --git a/mail/fetchmail/files/pkg-install.in b/mail/fetchmail/files/pkg-install.in deleted file mode 100644 index 2ff50020377..00000000000 --- a/mail/fetchmail/files/pkg-install.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ x$2 != xPOST-INSTALL ]; then - exit -fi - -/bin/mkdir -m 0755 -p /var/run/%%PORTNAME%% -/usr/sbin/chown "%%USERS%%:%%GROUPS%%" /var/run/%%PORTNAME%% -/usr/sbin/chown "%%USERS%%:%%GROUPS%%" %%PREFIX%%/etc/fetchmailrc* -/bin/chmod 0600 %%PREFIX%%/etc/fetchmailrc -/bin/chmod 0644 %%PREFIX%%/etc/fetchmailrc.sample - -exit diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist index 92ee28a7619..1a5fb7d3dba 100644 --- a/mail/fetchmail/pkg-plist +++ b/mail/fetchmail/pkg-plist @@ -2,7 +2,7 @@ bin/fetchmail bin/fetchmailconf man/man1/fetchmail.1.gz man/man1/fetchmailconf.1.gz -%%NOX11%%libexec/fetchmailconf.py +%%X11%%libexec/fetchmailconf.py %%NLS%%share/locale/ca/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/cs/LC_MESSAGES/fetchmail.mo %%NLS%%share/locale/da/LC_MESSAGES/fetchmail.mo @@ -30,4 +30,5 @@ man/man1/fetchmailconf.1.gz %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.py %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyc %%X11%%%%PYTHON_SITELIBDIR%%/fetchmailconf.pyo -@sample etc/fetchmailrc.sample +@sample(fetchmail,fetchmail,600) etc/fetchmailrc.sample +@dir(fetchmail,fetchmail,755) /var/run/fetchmail diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile index da7f8327847..c9a2a1d0700 100644 --- a/mail/rspamd-devel/Makefile +++ b/mail/rspamd-devel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 1.3.0.b1.22042016 +PORTVERSION= 1.3.0.b2.21062016 CATEGORIES= mail PKGNAMESUFFIX= -devel @@ -14,6 +14,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ libgmime-2.4.so:mail/gmime24 \ libevent.so:devel/libevent2 \ libluajit-5.1.so:lang/luajit +BUILD_DEPENDS= ragel:devel/ragel CONFLICTS_INSTALL= rspamd @@ -21,7 +22,7 @@ RSPAMD_VERSION= 1.3.0 USE_GITHUB= yes GH_ACCOUNT= vstakhov GH_PROJECT= rspamd -GH_TAGNAME= 31b9c69 +GH_TAGNAME= afb80e7 OPTIONS_DEFINE= GPERF REDIRECTOR HYPERSCAN GPERF_DESC= google perf-tools profiling @@ -43,7 +44,8 @@ CMAKE_ARGS+= -DCONFDIR=${PREFIX}/etc/rspamd \ -DFORCE_GMIME24=yes \ -DLIBDIR=${PREFIX}/lib/rspamd \ -DNO_SHARED=ON \ - -DDEBUG=ON + -DDEBUG=ON \ + -DGIT_ID=${GH_TAGNAME} USES= cmake:outsource gettext iconv pkgconfig tar:xz perl5 \ compiler:c11 sqlite diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo index 1353daae80b..d88a6203af1 100644 --- a/mail/rspamd-devel/distinfo +++ b/mail/rspamd-devel/distinfo @@ -1,2 +1,3 @@ -SHA256 (vstakhov-rspamd-1.3.0.b1.22042016-31b9c69_GH0.tar.gz) = b77b20741134eb9d28aeb36eb4b7ba8e0731fed16360794032acd0a72b741853 -SIZE (vstakhov-rspamd-1.3.0.b1.22042016-31b9c69_GH0.tar.gz) = 1827847 +TIMESTAMP = 1466495327 +SHA256 (vstakhov-rspamd-1.3.0.b2.21062016-afb80e7_GH0.tar.gz) = 1c5e8aa37c146bc2bacf9048a920ba0a6c06c2bc6d2dbbc014cc1d824d7ab527 +SIZE (vstakhov-rspamd-1.3.0.b2.21062016-afb80e7_GH0.tar.gz) = 1909658 diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist index e5b7f101087..955713b213e 100644 --- a/mail/rspamd-devel/pkg-plist +++ b/mail/rspamd-devel/pkg-plist @@ -34,6 +34,7 @@ bin/rspamc %%ETCDIR%%/modules.d/surbl.conf %%ETCDIR%%/modules.d/whitelist.conf @sample %%ETCDIR%%/options.inc.sample +%%ETCDIR%%/redirectors.inc @sample %%ETCDIR%%/rspamd.conf.sample @sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample @sample %%ETCDIR%%/statistic.conf.sample @@ -50,6 +51,7 @@ lib/rspamd/librspamd-actrie.so %%DATADIR%%/lua/fann_scores.lua %%DATADIR%%/lua/forged_recipients.lua %%DATADIR%%/lua/fun.lua +%%DATADIR%%/lua/greylist.lua %%DATADIR%%/lua/hfilter.lua %%DATADIR%%/lua/ip_score.lua %%DATADIR%%/lua/maillist.lua @@ -58,12 +60,14 @@ lib/rspamd/librspamd-actrie.so %%DATADIR%%/lua/once_received.lua %%DATADIR%%/lua/phishing.lua %%DATADIR%%/lua/ratelimit.lua +%%DATADIR%%/lua/replies.lua %%DATADIR%%/lua/rbl.lua %%DATADIR%%/lua/rspamd_update.lua %%DATADIR%%/lua/settings.lua %%DATADIR%%/lua/spamassassin.lua %%DATADIR%%/lua/trie.lua %%DATADIR%%/lua/whitelist.lua +%%DATADIR%%/rules/forwarding.lua %%DATADIR%%/rules/html.lua %%DATADIR%%/rules/http_headers.lua %%DATADIR%%/rules/misc.lua @@ -71,6 +75,7 @@ lib/rspamd/librspamd-actrie.so %%DATADIR%%/rules/regexp/fraud.lua %%DATADIR%%/rules/regexp/headers.lua %%DATADIR%%/rules/regexp/lotto.lua +%%DATADIR%%/rules/regexp/upstream_spam_filters.lua %%DATADIR%%/rules/rspamd.classifiers.lua %%DATADIR%%/rules/rspamd.lua %%DATADIR%%/www/README.md diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index fc8f556f4e3..a912fcef947 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rspamd -PORTVERSION= 1.2.7 +PORTVERSION= 1.2.8 CATEGORIES= mail MASTER_SITES= http://rspamd.com/downloads/ diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index 5084782958e..16e74f80928 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,2 +1,2 @@ -SHA256 (rspamd-1.2.7.tar.xz) = 7a19b2f49cb39d5839785d261a2d6d0d9cca24e760d5adb2b597b1eeb0831c3a -SIZE (rspamd-1.2.7.tar.xz) = 1423600 +SHA256 (rspamd-1.2.8.tar.xz) = 485438d8c38ada1a6e95c9ea1298d2c899d4ec618f1dd5f539663522c506eb2b +SIZE (rspamd-1.2.8.tar.xz) = 1423888 diff --git a/mail/rubygem-mail_room/Makefile b/mail/rubygem-mail_room/Makefile index 4bfebe5bcec..50adbaef38a 100644 --- a/mail/rubygem-mail_room/Makefile +++ b/mail/rubygem-mail_room/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mail_room -PORTVERSION= 0.6.1 +PORTVERSION= 0.7.0 CATEGORIES= mail rubygems MASTER_SITES= RG diff --git a/mail/rubygem-mail_room/distinfo b/mail/rubygem-mail_room/distinfo index d9d749b39e4..69b1b882c86 100644 --- a/mail/rubygem-mail_room/distinfo +++ b/mail/rubygem-mail_room/distinfo @@ -1,2 +1,3 @@ -SHA256 (rubygem/mail_room-0.6.1.gem) = 41bad356c7ed77566855181cb88729d2ca629be2766321c80325fac41f5cfe4a -SIZE (rubygem/mail_room-0.6.1.gem) = 20480 +TIMESTAMP = 1464598869 +SHA256 (rubygem/mail_room-0.7.0.gem) = 08a39b22b0cdcab61a9eabf740e11899be5fa43e27852649dacfc23394a55fc2 +SIZE (rubygem/mail_room-0.7.0.gem) = 21504 diff --git a/mail/sieve-connect/Makefile b/mail/sieve-connect/Makefile index 5474fac6f0a..2e689a15ba2 100644 --- a/mail/sieve-connect/Makefile +++ b/mail/sieve-connect/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= p5-Authen-SASL>=0:security/p5-Authen-SASL \ p5-Mozilla-PublicSuffix>=0:dns/p5-Mozilla-PublicSuffix \ p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-Net-SSLeay>=1.37:security/p5-Net-SSLeay \ - p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \ + p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey USES= perl5 tar:bzip2 shebangfix diff --git a/math/PDL/Makefile b/math/PDL/Makefile index 931e92a7cf0..bbd83f75b6e 100644 --- a/math/PDL/Makefile +++ b/math/PDL/Makefile @@ -66,8 +66,8 @@ FFTW_LIB_DEPENDS= libfftw.so:math/fftw GSL_LIB_DEPENDS= libgsl.so:math/gsl HDF_LIB_DEPENDS= libdf.so:science/hdf PROJ_LIB_DEPENDS= libproj.so:graphics/proj -READLINE_RUN_DEPENDS= p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu -READLINE_RUN_DEPENDS_OFF= p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl +READLINE_RUN_DEPENDS= p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu +READLINE_RUN_DEPENDS_OFF= p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl SINK_RUN_DEPENDS= ppmtogif:graphics/netpbm \ mpeg_encode:multimedia/mpeg_encode \ saoimage:astro/saoimage diff --git a/math/gap/Makefile b/math/gap/Makefile index 5e63065e386..ce5d65cf96f 100644 --- a/math/gap/Makefile +++ b/math/gap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gap -PORTVERSION= 4.8.3.${GAP_DISTDATE} +PORTVERSION= 4.8.4.${GAP_DISTDATE} CATEGORIES= math MASTER_SITES= ftp://ftp.gap-system.org/pub/gap/gap48/tar.bz2/ \ ftp://ftp.stack.nl/pub/users/johans/gap/ \ @@ -34,7 +34,7 @@ ALL_TARGET= default MAKE_JOBS_UNSAFE=yes GAP_VERSION= ${PORTNAME}${PORTVERSION:R:R:S/./r/} # gap4r5 -GAP_DISTTIME= 2016_03_19-22_17 +GAP_DISTTIME= 2016_06_04-12_41 GAP_DISTDATE= ${GAP_DISTTIME:C/-.*//:S/_//g} GAP_LIBDIR= ${PREFIX}/lib/${GAP_VERSION} WRKSRC= ${WRKDIR}/${GAP_VERSION} diff --git a/math/gap/distinfo b/math/gap/distinfo index 62d5e267b41..1989d7db765 100644 --- a/math/gap/distinfo +++ b/math/gap/distinfo @@ -1,2 +1,2 @@ -SHA256 (gap4r8p3_2016_03_19-22_17.tar.bz2) = 81d358109d87014eb10d1325c38ee94aa968b2a6365afd1a7411bfdd44f7a454 -SIZE (gap4r8p3_2016_03_19-22_17.tar.bz2) = 267703185 +SHA256 (gap4r8p4_2016_06_04-12_41.tar.bz2) = f394bb4c5f24c662ba5ef1674e6c3d7565e31e60fc7e37c7b0f7e5208e029828 +SIZE (gap4r8p4_2016_06_04-12_41.tar.bz2) = 268171790 diff --git a/math/p5-Math-Currency/Makefile b/math/p5-Math-Currency/Makefile index cb7983c4ca4..b39fdef9d45 100644 --- a/math/p5-Math-Currency/Makefile +++ b/math/p5-Math-Currency/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Math-Currency -PORTVERSION= 0.47 -PORTREVISION= 1 +PORTVERSION= 0.48 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -24,6 +23,5 @@ PORTDOCS= Changes post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .include diff --git a/math/p5-Math-Currency/distinfo b/math/p5-Math-Currency/distinfo index d38af781131..4daaf31630d 100644 --- a/math/p5-Math-Currency/distinfo +++ b/math/p5-Math-Currency/distinfo @@ -1,2 +1,3 @@ -SHA256 (Math-Currency-0.47.tar.gz) = 459f9689ebe6bfc13855d2cace279ce0b5df0bf6ccc37361076f10ff916aa209 -SIZE (Math-Currency-0.47.tar.gz) = 30985 +TIMESTAMP = 1466518879 +SHA256 (Math-Currency-0.48.tar.gz) = fc2c3cf24335bec74082aef7174bd5328c299ea98516333e6baba2db046648e6 +SIZE (Math-Currency-0.48.tar.gz) = 32478 diff --git a/misc/p5-Array-Compare/Makefile b/misc/p5-Array-Compare/Makefile index 1431b68c2b9..5d04f13ba8b 100644 --- a/misc/p5-Array-Compare/Makefile +++ b/misc/p5-Array-Compare/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= Array-Compare -PORTVERSION= 2.11 -PORTREVISION= 1 +PORTVERSION= 2.12 CATEGORIES= misc perl5 -MASTER_SITES= CPAN +MASTER_SITES= CPAN/Array CPAN MASTER_SITE_SUBDIR= CPAN:DAVECROSS PKGNAMEPREFIX= p5- diff --git a/misc/p5-Array-Compare/distinfo b/misc/p5-Array-Compare/distinfo index 7ecda947d97..046d55f9feb 100644 --- a/misc/p5-Array-Compare/distinfo +++ b/misc/p5-Array-Compare/distinfo @@ -1,2 +1,3 @@ -SHA256 (Array-Compare-2.11.tar.gz) = 9af158ef012186fd26ac58ffcbdd16c06472e93e9c470683ef5f967ca9783538 -SIZE (Array-Compare-2.11.tar.gz) = 9653 +TIMESTAMP = 1466519242 +SHA256 (Array-Compare-2.12.tar.gz) = 77bb9a9019a45ebd47bd7c5652d8583b9c7fcbf7d3bf635a8ac243489012fd81 +SIZE (Array-Compare-2.12.tar.gz) = 9312 diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile index 24ae74d9214..5351ad4a76e 100644 --- a/misc/p5-Business-ISBN/Makefile +++ b/misc/p5-Business-ISBN/Makefile @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= Business-ISBN -PORTVERSION= 2.010 +PORTVERSION= 2.011 CATEGORIES= misc perl5 -MASTER_SITES= CPAN +MASTER_SITES= CPAN/Business CPAN MASTER_SITE_SUBDIR= CPAN:BDFOY PKGNAMEPREFIX= p5- diff --git a/misc/p5-Business-ISBN/distinfo b/misc/p5-Business-ISBN/distinfo index addabe3b694..1aba3c6b89c 100644 --- a/misc/p5-Business-ISBN/distinfo +++ b/misc/p5-Business-ISBN/distinfo @@ -1,2 +1,3 @@ -SHA256 (Business-ISBN-2.010.tar.gz) = 247fbb93d31fcb9c2c7f72b541ebac4b5ed88f4a663f78506b93156350a9a991 -SIZE (Business-ISBN-2.010.tar.gz) = 361988 +TIMESTAMP = 1466519366 +SHA256 (Business-ISBN-2.011.tar.gz) = 22476441e0f3159542e80eb9ffec2d18725e1412def66e59a7de8caa347bf166 +SIZE (Business-ISBN-2.011.tar.gz) = 364175 diff --git a/misc/pfm/Makefile b/misc/pfm/Makefile index bde3dce8eb5..39759d07cf1 100644 --- a/misc/pfm/Makefile +++ b/misc/pfm/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 RUN_DEPENDS= p5-libwww>=5.827:www/p5-libwww \ p5-File-Stat-Bits>=1.01:sysutils/p5-File-Stat-Bits \ - p5-ReadLine-Gnu>=1.09:devel/p5-ReadLine-Gnu \ + p5-Term-ReadLine-Gnu>=1.09:devel/p5-Term-ReadLine-Gnu \ p5-Term-ScreenColor>=1.13:devel/p5-Term-ScreenColor USES= perl5 diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile index d05ada3449b..9dca799346a 100644 --- a/multimedia/gtk-youtube-viewer/Makefile +++ b/multimedia/gtk-youtube-viewer/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= p5-JSON>0:converters/p5-JSON \ p5-File-Path>0:devel/p5-File-Path \ p5-Getopt-Long>0:devel/p5-Getopt-Long \ p5-PathTools>0:devel/p5-PathTools \ - p5-ReadLine-Gnu>0:devel/p5-ReadLine-Gnu \ + p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \ p5-Term-ANSIColor>0:devel/p5-Term-ANSIColor \ p5-Term-ReadLine>0:devel/p5-Term-ReadLine \ p5-Thread-Queue>0:devel/p5-Thread-Queue \ diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 61949c8754b..5ee33339625 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -78,7 +78,9 @@ CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \ -DHAVE_SENDFILE=0 \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" -.if ${OSVERSION} < 1000000 && ${ARCH} == i386 +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ${ARCH} == i386 CFLAGS+= -msse .endif @@ -107,4 +109,4 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include +.include diff --git a/net-im/ttytter/Makefile b/net-im/ttytter/Makefile index 248371b0091..a75480889f6 100644 --- a/net-im/ttytter/Makefile +++ b/net-im/ttytter/Makefile @@ -36,11 +36,11 @@ PLIST_FILES= bin/${PORTNAME} .include .if ${PORT_OPTIONS:MREADLINE} -RUN_DEPENDS+= p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl +RUN_DEPENDS+= p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl .endif .if ${PORT_OPTIONS:MRLTTYTTER} -RUN_DEPENDS+= p5-ReadLine-TTYtter>=1.4:devel/p5-ReadLine-TTYtter +RUN_DEPENDS+= p5-Term-ReadLine-TTYtter>=1.4:devel/p5-Term-ReadLine-TTYtter .endif do-extract: diff --git a/net-mgmt/p5-Net-Abuse-Utils/Makefile b/net-mgmt/p5-Net-Abuse-Utils/Makefile index 00aa91db104..19bc38a9be5 100644 --- a/net-mgmt/p5-Net-Abuse-Utils/Makefile +++ b/net-mgmt/p5-Net-Abuse-Utils/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Net-Abuse-Utils -PORTVERSION= 0.24 +PORTVERSION= 0.25 CATEGORIES= net-mgmt perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/net-mgmt/p5-Net-Abuse-Utils/distinfo b/net-mgmt/p5-Net-Abuse-Utils/distinfo index d5f4b2e7f23..d47ec34223c 100644 --- a/net-mgmt/p5-Net-Abuse-Utils/distinfo +++ b/net-mgmt/p5-Net-Abuse-Utils/distinfo @@ -1,2 +1,3 @@ -SHA256 (Net-Abuse-Utils-0.24.tar.gz) = 1a358d92ffd2fbb4ad4c1f915cb82e404b08f658f12c0aced67e2405844fd519 -SIZE (Net-Abuse-Utils-0.24.tar.gz) = 23413 +TIMESTAMP = 1466519548 +SHA256 (Net-Abuse-Utils-0.25.tar.gz) = 9575a1f606d56a13f9621422908d3b0b005d08388b7b6fb55e79fc0cec3ce7e1 +SIZE (Net-Abuse-Utils-0.25.tar.gz) = 23737 diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile index 201673c6627..53e312d9ab1 100644 --- a/net/ldapscripts/Makefile +++ b/net/ldapscripts/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ldapscripts -PORTVERSION= 2.0.6 +PORTVERSION= 2.0.7 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://contribs.martymac.org/ldapscripts/ diff --git a/net/ldapscripts/distinfo b/net/ldapscripts/distinfo index def0f00be4d..b28b1fd2a67 100644 --- a/net/ldapscripts/distinfo +++ b/net/ldapscripts/distinfo @@ -1,2 +1,3 @@ -SHA256 (ldapscripts-2.0.6.tgz) = ff2e14d8fa16cc349a8b3caee34645cc7f207e4b0cc2631eb8eee1496e27af8e -SIZE (ldapscripts-2.0.6.tgz) = 37200 +TIMESTAMP = 1466503389 +SHA256 (ldapscripts-2.0.7.tgz) = ffaa4e31e706f240c61f770cc9da327fa4e07708aaea0456c44bedc4bd1804df +SIZE (ldapscripts-2.0.7.tgz) = 37121 diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile index fd6f969e474..3770042511f 100644 --- a/net/ldapsh/Makefile +++ b/net/ldapsh/Makefile @@ -13,7 +13,7 @@ MAINTAINER= flz@FreeBSD.org COMMENT= Interactive shell used to administer ldap directories BUILD_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ - p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl \ + p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl \ p5-perl-ldap>=0:net/p5-perl-ldap \ p5-Date-Manip>=0:devel/p5-Date-Manip \ p5-ParseLex>=0:devel/p5-ParseLex diff --git a/net/p5-Net-Address-Ethernet/Makefile b/net/p5-Net-Address-Ethernet/Makefile index 5cc16b2a5b8..d4950c39c54 100644 --- a/net/p5-Net-Address-Ethernet/Makefile +++ b/net/p5-Net-Address-Ethernet/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Net-Address-Ethernet -PORTVERSION= 1.123 +PORTVERSION= 1.124 CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/net/p5-Net-Address-Ethernet/distinfo b/net/p5-Net-Address-Ethernet/distinfo index 789cbe71786..35ef8f4de18 100644 --- a/net/p5-Net-Address-Ethernet/distinfo +++ b/net/p5-Net-Address-Ethernet/distinfo @@ -1,2 +1,3 @@ -SHA256 (Net-Address-Ethernet-1.123.tar.gz) = 0461a58d75a93052714e258590a770ded72a0631f819dd73f9936af4a15a33b0 -SIZE (Net-Address-Ethernet-1.123.tar.gz) = 23534 +TIMESTAMP = 1466519456 +SHA256 (Net-Address-Ethernet-1.124.tar.gz) = ee04bd41c84b7978ba5a46380733152c20e898fd35aa820bad38f8f0e8570e9f +SIZE (Net-Address-Ethernet-1.124.tar.gz) = 23842 diff --git a/net/p5-Net-Address-Ethernet/files/patch-Makefile.PL b/net/p5-Net-Address-Ethernet/files/patch-Makefile.PL deleted file mode 100644 index 3aed542d3a3..00000000000 --- a/net/p5-Net-Address-Ethernet/files/patch-Makefile.PL +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.PL.orig 2016-05-26 14:56:06 UTC -+++ Makefile.PL -@@ -33,11 +33,11 @@ if ($ENV{MTHURN_PERL_DEV}) - { - warn " EEE did not find DIRFILESEP in Makefile\n"; - } # if -- if ($s !~ s/(pm_to_blib\(){{\@ARGV}}/$1 . '{@ARGV}'/e) -+ if ($s !~ s/(pm_to_blib\()\{\{\@ARGV\}\}/$1 . '{@ARGV}'/e) - { - warn " EEE did not find pm_to_blib@ARGV in Makefile\n"; - } # if -- if ($s !~ s/(from_to\s+=>\s+){{\@ARGV}}/$1 . '{@ARGV}'/e) -+ if ($s !~ s/(from_to\s+=>\s+)\{\{\@ARGV\}\}/$1 . '{@ARGV}'/e) - { - warn " EEE did not find from_to@ARGV in Makefile\n"; - } # if diff --git a/net/shelldap/Makefile b/net/shelldap/Makefile index 8140fde3a85..fd382987c8f 100644 --- a/net/shelldap/Makefile +++ b/net/shelldap/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \ p5-perl-ldap>=0:net/p5-perl-ldap \ p5-Term-Shell>=0:devel/p5-Term-Shell \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ - p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \ + p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu \ p5-YAML-Syck>=0:textproc/p5-YAML-Syck USES= perl5 diff --git a/print/lyx/Makefile b/print/lyx/Makefile index 16f7c7d48ea..b4118c4a373 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libmythes-1.2.so:textproc/mythes MAJOR_VERSION= 2.1 -MINOR_VERSION= 4 +MINOR_VERSION= 5 USES= desktop-file-utils gmake iconv pkgconfig perl5 python:2 tar:xz USE_QT4= corelib gui moc_build uic_build rcc_build diff --git a/print/lyx/distinfo b/print/lyx/distinfo index d82c8f0c83e..298f78f4e8f 100644 --- a/print/lyx/distinfo +++ b/print/lyx/distinfo @@ -1,2 +1,3 @@ -SHA256 (lyx-2.1.4.tar.xz) = d13548cf183f2fc241df8121420933702491a7460c78a0ef6dba0e9e438ef32a -SIZE (lyx-2.1.4.tar.xz) = 10928716 +TIMESTAMP = 1466497255 +SHA256 (lyx-2.1.5.tar.xz) = 2e677591aebdd484efb7d2920357f1358f9525ab1feaa59a63a8cf92b7ee2cf3 +SIZE (lyx-2.1.5.tar.xz) = 10361112 diff --git a/print/lyx/pkg-plist b/print/lyx/pkg-plist index 1bf17af79ae..a9bf3f1140d 100644 --- a/print/lyx/pkg-plist +++ b/print/lyx/pkg-plist @@ -295,6 +295,7 @@ share/icons/hicolor/scalable/apps/lyx.svg %%DATADIR%%/examples/de/ItemizeBullets.lyx %%DATADIR%%/examples/de/Lebenslauf.lyx %%DATADIR%%/examples/de/MultilingualCaptions.lyx +%%DATADIR%%/examples/de/PDF-comment.lyx %%DATADIR%%/examples/de/beamer-article.lyx %%DATADIR%%/examples/de/beamer.lyx %%DATADIR%%/examples/de/beispiel_gelyxt.lyx @@ -2251,6 +2252,9 @@ share/icons/hicolor/scalable/apps/lyx.svg %%DATADIR%%/lyx2lyx/lyx_2_1.py %%DATADIR%%/lyx2lyx/lyx_2_1.pyc %%DATADIR%%/lyx2lyx/lyx_2_1.pyo +%%DATADIR%%/lyx2lyx/lyx_2_2.py +%%DATADIR%%/lyx2lyx/lyx_2_2.pyc +%%DATADIR%%/lyx2lyx/lyx_2_2.pyo %%DATADIR%%/lyx2lyx/parser_tools.py %%DATADIR%%/lyx2lyx/parser_tools.pyc %%DATADIR%%/lyx2lyx/parser_tools.pyo diff --git a/security/kpcli/Makefile b/security/kpcli/Makefile index 89cd69e7634..029f811e719 100644 --- a/security/kpcli/Makefile +++ b/security/kpcli/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= p5-Crypt-Rijndael>=1.08:security/p5-Crypt-Rijndael \ p5-Sort-Naturally>=1.02:textproc/p5-Sort-Naturally \ p5-File-KeePass>=2.03:security/p5-File-KeePass \ p5-Term-ShellUI>=0.9:shells/p5-Term-ShellUI \ - p5-ReadLine-Gnu>=1.19:devel/p5-ReadLine-Gnu \ + p5-Term-ReadLine-Gnu>=1.19:devel/p5-Term-ReadLine-Gnu \ p5-Data-Password>=0:security/p5-Data-Password \ p5-Clone>=0.31:devel/p5-Clone \ p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \ diff --git a/security/p5-Crypt-PBKDF2/Makefile b/security/p5-Crypt-PBKDF2/Makefile index a93b856ca92..e9a2437e595 100644 --- a/security/p5-Crypt-PBKDF2/Makefile +++ b/security/p5-Crypt-PBKDF2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Crypt-PBKDF2 -PORTVERSION= 0.160410 +PORTVERSION= 0.161520 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/security/p5-Crypt-PBKDF2/distinfo b/security/p5-Crypt-PBKDF2/distinfo index 9bff257282c..13f16735cc3 100644 --- a/security/p5-Crypt-PBKDF2/distinfo +++ b/security/p5-Crypt-PBKDF2/distinfo @@ -1,2 +1,3 @@ -SHA256 (Crypt-PBKDF2-0.160410.tar.gz) = 3a9a43ce8daa7f60ad25b2158ec20b58fa3fe13742a05418b1717c41f161473a -SIZE (Crypt-PBKDF2-0.160410.tar.gz) = 16995 +TIMESTAMP = 1466519620 +SHA256 (Crypt-PBKDF2-0.161520.tar.gz) = 97dfa79a309a086e184a4e61047f8a10ffb3db051025e7d222a25f19130ba417 +SIZE (Crypt-PBKDF2-0.161520.tar.gz) = 17163 diff --git a/security/p5-CryptX/Makefile b/security/p5-CryptX/Makefile index 74950e8f301..58e1858debf 100644 --- a/security/p5-CryptX/Makefile +++ b/security/p5-CryptX/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= CryptX -PORTVERSION= 0.036 +PORTVERSION= 0.037 CATEGORIES= security perl5 MASTER_SITES= CPAN/Crypt PKGNAMEPREFIX= p5- diff --git a/security/p5-CryptX/distinfo b/security/p5-CryptX/distinfo index cdd91fb5626..bbc2cccc21c 100644 --- a/security/p5-CryptX/distinfo +++ b/security/p5-CryptX/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1465564284 -SHA256 (CryptX-0.036.tar.gz) = 9b740a592843c48a437f5e2b434cee38382e93a9112d2331a76ed7b865d0d520 -SIZE (CryptX-0.036.tar.gz) = 1200463 +TIMESTAMP = 1466523360 +SHA256 (CryptX-0.037.tar.gz) = ae09e6449efb2a9bc661ffeba613c7452367bdcb13c1ee346af0f72c9803404d +SIZE (CryptX-0.037.tar.gz) = 1200419 diff --git a/security/p5-Digest-Bcrypt/Makefile b/security/p5-Digest-Bcrypt/Makefile index 3da58c8081d..4bd280b0f07 100644 --- a/security/p5-Digest-Bcrypt/Makefile +++ b/security/p5-Digest-Bcrypt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Digest-Bcrypt -PORTVERSION= 1.204 +PORTVERSION= 1.205 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/security/p5-Digest-Bcrypt/distinfo b/security/p5-Digest-Bcrypt/distinfo index f2d9e31ceb2..aa6a6c31572 100644 --- a/security/p5-Digest-Bcrypt/distinfo +++ b/security/p5-Digest-Bcrypt/distinfo @@ -1,2 +1,3 @@ -SHA256 (Digest-Bcrypt-1.204.tar.gz) = 7798906df5d9627bcdd34757cc4fc50c3045496f8fdf8550c5e52939b12bca11 -SIZE (Digest-Bcrypt-1.204.tar.gz) = 16903 +TIMESTAMP = 1466519666 +SHA256 (Digest-Bcrypt-1.205.tar.gz) = 3f44f96946d51ed8f7a1c8adedc64bd86951978464f5d3ed176e51687520c51b +SIZE (Digest-Bcrypt-1.205.tar.gz) = 23478 diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile index 7b6f10282a7..a13682abb10 100644 --- a/security/p5-Module-Signature/Makefile +++ b/security/p5-Module-Signature/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Module-Signature -PORTVERSION= 0.79 +PORTVERSION= 0.80 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/security/p5-Module-Signature/distinfo b/security/p5-Module-Signature/distinfo index 50d3e217d7e..39ffcee9b7e 100644 --- a/security/p5-Module-Signature/distinfo +++ b/security/p5-Module-Signature/distinfo @@ -1,2 +1,3 @@ -SHA256 (Module-Signature-0.79.tar.gz) = 22df2ce097fb5d176efa951c782633d8debe594924a25ca66666252512ce462c -SIZE (Module-Signature-0.79.tar.gz) = 94207 +TIMESTAMP = 1466519775 +SHA256 (Module-Signature-0.80.tar.gz) = 8ad0e5b1b2e5e4362a73b55aa35e4e8c4101b78011cbcc7d56a79d9ddf5915e0 +SIZE (Module-Signature-0.80.tar.gz) = 93072 diff --git a/shells/p5-Term-ShellUI/Makefile b/shells/p5-Term-ShellUI/Makefile index b29f6b95c8c..8988f3007a9 100644 --- a/shells/p5-Term-ShellUI/Makefile +++ b/shells/p5-Term-ShellUI/Makefile @@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Fully-featured shell-like command line environment -BUILD_DEPENDS= p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu +BUILD_DEPENDS= p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 shebangfix diff --git a/sysutils/backuppc-devel/Makefile b/sysutils/backuppc-devel/Makefile index fb4fd4c694d..85906a2a163 100644 --- a/sysutils/backuppc-devel/Makefile +++ b/sysutils/backuppc-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= backuppc DISTVERSION= 4.0.0alpha3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-beta/${DISTVERSION} PKGNAMESUFFIX= -devel diff --git a/sysutils/backuppc-devel/files/patch-lib_BackupPC_Xfer_Smb.pm b/sysutils/backuppc-devel/files/patch-lib_BackupPC_Xfer_Smb.pm new file mode 100644 index 00000000000..9a013abb855 --- /dev/null +++ b/sysutils/backuppc-devel/files/patch-lib_BackupPC_Xfer_Smb.pm @@ -0,0 +1,33 @@ +--- lib/BackupPC/Xfer/Smb.pm.orig 2013-12-01 20:58:20 UTC ++++ lib/BackupPC/Xfer/Smb.pm +@@ -216,7 +216,7 @@ sub readOutput + # This section is highly dependent on the version of smbclient. + # If you upgrade Samba, make sure that these regexp are still valid. + # +- if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ ) { ++ if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ || /^tar:(\d+)\s+\+\+\+ (.*)$/ ) { + my $sambaFileSize = $1; + my $pcFileName = $2; + (my $fileName = $pcFileName) =~ s/\\/\//g; +@@ -229,7 +229,9 @@ sub readOutput + $t->{byteCnt} += $2; + $t->{fileCnt}++; + $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 ); +- } elsif ( /^\s*tar: dumped \d+ files/ ) { ++ } elsif ( /^\s*tar: dumped \d+ files/ ++ || /Total bytes received: \d+/i ++ || /tar_process done, err = 0/ ) { + $t->{xferOK} = 1; + $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 ); + } elsif ( /^\s*tar: restored \d+ files/ ) { +@@ -269,6 +271,10 @@ sub readOutput + } elsif ( /^\s*directory \\/i ) { + $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 ); + } elsif ( /smb: \\>/ ++ || /^tar:\d+\s/ ++ || /^ NTLMSSP_/ ++ || /^GENSEC backend / ++ || /^doing parameter / + || /^\s*added interface/i + || /^\s*tarmode is now/i + || /^\s*Total bytes written/i diff --git a/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm b/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm index 0799a8575ac..3318ba50c63 100644 --- a/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm +++ b/sysutils/backuppc-devel/files/patch-lib__BackupPC__CGI__View.pm @@ -1,6 +1,6 @@ ---- ./lib/BackupPC/CGI/View.pm.orig 2014-09-03 14:15:03.000000000 +0400 -+++ ./lib/BackupPC/CGI/View.pm 2014-09-03 14:15:20.000000000 +0400 -@@ -102,7 +102,7 @@ +--- lib/BackupPC/CGI/View.pm.orig 2013-12-01 20:58:20 UTC ++++ lib/BackupPC/CGI/View.pm +@@ -102,7 +102,7 @@ sub action $file = $bpc->ConfDir() . "/hosts"; $linkHosts = 1; } elsif ( $type eq "docs" ) { @@ -9,3 +9,14 @@ } elsif ( $host ne "" ) { if ( !defined($In{num}) ) { # get the latest LOG file +@@ -148,6 +148,10 @@ sub action + } + $s =~ s/[\n\r]+//g; + if ( $s =~ /smb: \\>/ ++ || $s =~ /^tar:\d+\s/ ++ || $s =~ /^ NTLMSSP_/ ++ || $s =~ /^GENSEC backend / ++ || $s =~ /^doing parameter / + || $s =~ /^\s*(\d+) \(\s*\d+\.\d kb\/s\) (.*)$/ + || $s =~ /^tar: dumped \d+ files/ + || $s =~ /^\s*added interface/i diff --git a/sysutils/backuppc-devel/files/pkg-message.in b/sysutils/backuppc-devel/files/pkg-message.in index 5a3d8f4dbf6..45e12bcf3cb 100644 --- a/sysutils/backuppc-devel/files/pkg-message.in +++ b/sysutils/backuppc-devel/files/pkg-message.in @@ -13,4 +13,13 @@ This is where all the backup data is stored. This file system needs to be big enough to accommodate all the PCs you expect to backup. + + - Users of Samba 4 smbclient should change debug level for smbclient + restore command to 5 ('-d 5') in the main configuration, for instance + + $Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -'; + + and set in the each host's configuration + + $Conf{BackupZeroFilesIsFatal} = '0'; ========================================================================== diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile index 0f07a143bf7..5a57068c918 100644 --- a/sysutils/backuppc/Makefile +++ b/sysutils/backuppc/Makefile @@ -3,7 +3,7 @@ PORTNAME= backuppc PORTVERSION= 3.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= SF DISTNAME= BackupPC-${PORTVERSION} diff --git a/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm b/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm new file mode 100644 index 00000000000..f12b03731c6 --- /dev/null +++ b/sysutils/backuppc/files/patch-lib_BackupPC_Xfer_Smb.pm @@ -0,0 +1,33 @@ +--- lib/BackupPC/Xfer/Smb.pm.orig 2016-06-04 10:42:02 UTC ++++ lib/BackupPC/Xfer/Smb.pm +@@ -217,7 +217,7 @@ sub readOutput + # This section is highly dependent on the version of smbclient. + # If you upgrade Samba, make sure that these regexp are still valid. + # +- if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ ) { ++ if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ || /^tar:(\d+)\s+\+\+\+ (.*)$/ ) { + my $sambaFileSize = $1; + my $pcFileName = $2; + (my $fileName = $pcFileName) =~ s/\\/\//g; +@@ -230,7 +230,9 @@ sub readOutput + $t->{byteCnt} += $2; + $t->{fileCnt}++; + $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 ); +- } elsif ( /^\s*tar: dumped \d+ files/ ) { ++ } elsif ( /^\s*tar: dumped \d+ files/ ++ || /Total bytes received: \d+/i ++ || /tar_process done, err = 0/ ) { + $t->{xferOK} = 1; + $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 ); + } elsif ( /^\s*tar: restored \d+ files/ ) { +@@ -270,6 +272,10 @@ sub readOutput + } elsif ( /^\s*directory \\/i ) { + $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 ); + } elsif ( /smb: \\>/ ++ || /^tar:\d+\s/ ++ || /^ NTLMSSP_/ ++ || /^GENSEC backend / ++ || /^doing parameter / + || /^\s*added interface/i + || /^\s*tarmode is now/i + || /^\s*Total bytes written/i diff --git a/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm b/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm index 94ad75a787e..b3a15623d0f 100644 --- a/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm +++ b/sysutils/backuppc/files/patch-lib__BackupPC__CGI__View.pm @@ -1,6 +1,6 @@ ---- ./lib/BackupPC/CGI/View.pm.orig 2014-08-30 15:21:07.000000000 +0400 -+++ ./lib/BackupPC/CGI/View.pm 2014-08-30 15:21:18.000000000 +0400 -@@ -89,7 +89,7 @@ +--- lib/BackupPC/CGI/View.pm.orig 2015-01-12 00:19:53 UTC ++++ lib/BackupPC/CGI/View.pm +@@ -89,7 +89,7 @@ sub action $file = $bpc->ConfDir() . "/hosts"; $linkHosts = 1; } elsif ( $type eq "docs" ) { @@ -9,3 +9,14 @@ } elsif ( $host ne "" ) { if ( !defined($In{num}) ) { # get the latest LOG file +@@ -136,6 +136,10 @@ sub action + } + $s =~ s/[\n\r]+//g; + if ( $s =~ /smb: \\>/ ++ || $s =~ /^tar:\d+\s/ ++ || $s =~ /^ NTLMSSP_/ ++ || $s =~ /^GENSEC backend / ++ || $s =~ /^doing parameter / + || $s =~ /^\s*(\d+) \(\s*\d+\.\d kb\/s\) (.*)$/ + || $s =~ /^tar: dumped \d+ files/ + || $s =~ /^\s*added interface/i diff --git a/sysutils/backuppc/files/pkg-message.in b/sysutils/backuppc/files/pkg-message.in index 5a3d8f4dbf6..45e12bcf3cb 100644 --- a/sysutils/backuppc/files/pkg-message.in +++ b/sysutils/backuppc/files/pkg-message.in @@ -13,4 +13,13 @@ This is where all the backup data is stored. This file system needs to be big enough to accommodate all the PCs you expect to backup. + + - Users of Samba 4 smbclient should change debug level for smbclient + restore command to 5 ('-d 5') in the main configuration, for instance + + $Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName $I_option -U $userName -E -d 5 -c tarmode\\ full -Tx -'; + + and set in the each host's configuration + + $Conf{BackupZeroFilesIsFatal} = '0'; ========================================================================== diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index 57cbd3e0b25..1870fd95e0b 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= duplicity -PORTVERSION= 0.7.06 +PORTVERSION= 0.7.07.1 CATEGORIES= sysutils MASTER_SITES= http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/ MAINTAINER= jase@FreeBSD.org COMMENT= Backup tool that uses librsync and GnuPG -LIB_DEPENDS= librsync.so:net/librsync +LIB_DEPENDS= librsync.so:net/librsync1 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile USES= python:2 @@ -91,6 +91,7 @@ post-patch: .endif post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/duplicity/_librsync.so ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo index 58d97895f3a..9fff58ce0f3 100644 --- a/sysutils/duplicity/distinfo +++ b/sysutils/duplicity/distinfo @@ -1,2 +1,3 @@ -SHA256 (duplicity-0.7.06.tar.gz) = 0075595edb894399cf00fae9154aae93a07eaadc031fede5df4cc595436c7f8c -SIZE (duplicity-0.7.06.tar.gz) = 1417252 +TIMESTAMP = 1465747942 +SHA256 (duplicity-0.7.07.1.tar.gz) = 594c6d0e723e56f8a7114d57811c613622d535cafdef4a3643a4d4c89c1904f8 +SIZE (duplicity-0.7.07.1.tar.gz) = 1539310 diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile index fa0e1b321a1..6f88365e1cd 100644 --- a/sysutils/extipl/Makefile +++ b/sysutils/extipl/Makefile @@ -9,26 +9,29 @@ MASTER_SITES= SFJP/${PORTNAME}/2166 MAINTAINER= ports@FreeBSD.org COMMENT= Partition-selectable boot loader for IBM-PC/AT compatibles +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= nasm:devel/nasm ONLY_FOR_ARCHS= i386 amd64 -WRKSRC= ${WRKDIR}/${DISTNAME}/src +BUILD_WRKSRC= ${WRKSRC}/src + OPTIONS_DEFINE= DOCS post-patch: - cd ${WRKSRC}; \ - ${SED} -e 's|!!DOCDIR!!|${DOCSDIR}|g' \ - ${PORTNAME}.8.in > ${PORTNAME}.8; \ - ${REINPLACE_CMD} -e 's/^(CC)\t=/$$1?=/;' \ - -e 's/(DIR)[\t]*[?]=/$$1=/;' Makefile + @cd ${WRKSRC}/src && ${SED} -e 's|!!DOCDIR!!|${DOCSDIR}|g' \ + ${PORTNAME}.8.in > ${PORTNAME}.8 do-install: - ${INSTALL_PROGRAM} -m 700 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/English - ${INSTALL_DATA} ${WRKSRC}/../doc/English/*.txt ${STAGEDIR}${DOCSDIR}/English + ${INSTALL_DATA} ${WRKSRC}/doc/English/*.txt ${STAGEDIR}${DOCSDIR}/English @${MKDIR} ${STAGEDIR}${DOCSDIR}/Japanese - ${INSTALL_DATA} ${WRKSRC}/../doc/Japanese/*.txt ${STAGEDIR}${DOCSDIR}/Japanese + ${INSTALL_DATA} ${WRKSRC}/doc/Japanese/*.txt ${STAGEDIR}${DOCSDIR}/Japanese .include diff --git a/sysutils/p5-File-Next/Makefile b/sysutils/p5-File-Next/Makefile index 2f6b46168cd..775f262cec5 100644 --- a/sysutils/p5-File-Next/Makefile +++ b/sysutils/p5-File-Next/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= File-Next -PORTVERSION= 1.12 -PORTREVISION= 1 +PORTVERSION= 1.14 CATEGORIES= sysutils perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/sysutils/p5-File-Next/distinfo b/sysutils/p5-File-Next/distinfo index 6f01ebe245b..e1141330145 100644 --- a/sysutils/p5-File-Next/distinfo +++ b/sysutils/p5-File-Next/distinfo @@ -1,2 +1,3 @@ -SHA256 (File-Next-1.12.tar.gz) = cc3afd8eaf6294aba93b8152a269cc36a9df707c6dc2c149aaa04dabd869e60a -SIZE (File-Next-1.12.tar.gz) = 16842 +TIMESTAMP = 1466519902 +SHA256 (File-Next-1.14.tar.gz) = 90413333213018958503b3c0a4ba3108a8199d9ab13223dd25ef7124957a0437 +SIZE (File-Next-1.14.tar.gz) = 17640 diff --git a/sysutils/uptimed/Makefile b/sysutils/uptimed/Makefile index 845852bca92..a4a8cd44b38 100644 --- a/sysutils/uptimed/Makefile +++ b/sysutils/uptimed/Makefile @@ -2,18 +2,19 @@ # $FreeBSD$ PORTNAME= uptimed -PORTVERSION= 0.3.17 -PORTREVISION= 2 +PORTVERSION= 0.4.0 +DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= http://podgorny.cz/uptimed/releases/ \ - http://www.predatorlabs.net/dl/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= pkubaj@anongoth.pl COMMENT= Uptime daemon LICENSE= GPLv2 # only LICENSE_FILE= ${WRKSRC}/COPYING +USE_GITHUB= yes +GH_ACCOUNT= rpodgorny + USES= autoreconf gmake libtool tar:bzip2 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/sysutils/uptimed/distinfo b/sysutils/uptimed/distinfo index 953673c1698..2ea68571f38 100644 --- a/sysutils/uptimed/distinfo +++ b/sysutils/uptimed/distinfo @@ -1,2 +1,3 @@ -SHA256 (uptimed-0.3.17.tar.bz2) = 524ce8984c0d0a780a32025ba3ffb980e5eec3d78e65cf68c91edec7fe833a06 -SIZE (uptimed-0.3.17.tar.bz2) = 269102 +TIMESTAMP = 1466516687 +SHA256 (rpodgorny-uptimed-v0.4.0_GH0.tar.gz) = 26891965bb499065e34072cecd3eb8087102b1c05f530c8fe8504a07c722f9bf +SIZE (rpodgorny-uptimed-v0.4.0_GH0.tar.gz) = 55026 diff --git a/sysutils/uptimed/pkg-descr b/sysutils/uptimed/pkg-descr index 2396170d815..bc8a5fc98b3 100644 --- a/sysutils/uptimed/pkg-descr +++ b/sysutils/uptimed/pkg-descr @@ -3,4 +3,4 @@ a computer system ever had. It uses the system boot time to keep sessions apart from each other. Uptimed comes with a console front-end to parse the records, which can also easily be used to show your records on a web page. -WWW: http://podgorny.cz/moin/Uptimed +WWW: https://github.com/rpodgorny/uptimed diff --git a/textproc/p5-Lingua-EN-NameParse/Makefile b/textproc/p5-Lingua-EN-NameParse/Makefile index cac7e1ce69e..c72bcfa8fa8 100644 --- a/textproc/p5-Lingua-EN-NameParse/Makefile +++ b/textproc/p5-Lingua-EN-NameParse/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Lingua-EN-NameParse -PORTVERSION= 1.33 +PORTVERSION= 1.34 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Lingua-EN-NameParse/distinfo b/textproc/p5-Lingua-EN-NameParse/distinfo index d736a40afa0..bad4a65096b 100644 --- a/textproc/p5-Lingua-EN-NameParse/distinfo +++ b/textproc/p5-Lingua-EN-NameParse/distinfo @@ -1,2 +1,3 @@ -SHA256 (Lingua-EN-NameParse-1.33.tar.gz) = d7754295f6f878812f7489ec74aa1af743ab15cee8f22cb014cfa990828a6ae6 -SIZE (Lingua-EN-NameParse-1.33.tar.gz) = 27215 +TIMESTAMP = 1466519947 +SHA256 (Lingua-EN-NameParse-1.34.tar.gz) = 7633bae5f1c8727ba403ae286c303e5e08fa321bae37be2d8d2a2240eb885d82 +SIZE (Lingua-EN-NameParse-1.34.tar.gz) = 27304 diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile index 25736dff68e..5a47acd176d 100644 --- a/textproc/p5-PDF-API2/Makefile +++ b/textproc/p5-PDF-API2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= PDF-API2 -PORTVERSION= 2.027 +PORTVERSION= 2.028 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-PDF-API2/distinfo b/textproc/p5-PDF-API2/distinfo index 5a4b6e8367c..4ee0d9c5048 100644 --- a/textproc/p5-PDF-API2/distinfo +++ b/textproc/p5-PDF-API2/distinfo @@ -1,2 +1,3 @@ -SHA256 (PDF-API2-2.027.tar.gz) = d24db02d902198406270551857830633b289ad39f5a9ba5431246f8cd60e7599 -SIZE (PDF-API2-2.027.tar.gz) = 3500950 +TIMESTAMP = 1466519987 +SHA256 (PDF-API2-2.028.tar.gz) = a642b41362884b7005e421ec93c7d3a54f7adef7657540331e0d4ca89d106b04 +SIZE (PDF-API2-2.028.tar.gz) = 3501011 diff --git a/textproc/p5-Pod-Autopod/Makefile b/textproc/p5-Pod-Autopod/Makefile index 03e474314e1..4e3e7602252 100644 --- a/textproc/p5-Pod-Autopod/Makefile +++ b/textproc/p5-Pod-Autopod/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Pod-Autopod -PORTVERSION= 1.204 +PORTVERSION= 1.206 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Pod-Autopod/distinfo b/textproc/p5-Pod-Autopod/distinfo index 2f625514f2e..3884495d761 100644 --- a/textproc/p5-Pod-Autopod/distinfo +++ b/textproc/p5-Pod-Autopod/distinfo @@ -1,2 +1,3 @@ -SHA256 (Pod-Autopod-1.204.tar.gz) = aa71bef46e835d6058b49dcef9162fc1fa02944e9f6b21dc656752f0f93b6866 -SIZE (Pod-Autopod-1.204.tar.gz) = 31406 +TIMESTAMP = 1466520036 +SHA256 (Pod-Autopod-1.206.tar.gz) = 5d79730d82f3f005b1ddb53058c3a71dce9726f2f02e6ec08e1d62c6a41c0bc7 +SIZE (Pod-Autopod-1.206.tar.gz) = 31234 diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile index 773d1003896..ceef22fd3f6 100644 --- a/textproc/p5-Text-BibTeX/Makefile +++ b/textproc/p5-Text-BibTeX/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Text-BibTeX -PORTVERSION= 0.72 +PORTVERSION= 0.74 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Text-BibTeX/distinfo b/textproc/p5-Text-BibTeX/distinfo index effae769050..cec5254d2d0 100644 --- a/textproc/p5-Text-BibTeX/distinfo +++ b/textproc/p5-Text-BibTeX/distinfo @@ -1,2 +1,3 @@ -SHA256 (Text-BibTeX-0.72.tar.gz) = fc99855298233f677335dfec83172e04d3a008b368380d11bbd5cbf67c92d66d -SIZE (Text-BibTeX-0.72.tar.gz) = 286747 +TIMESTAMP = 1466520087 +SHA256 (Text-BibTeX-0.74.tar.gz) = d3788e6459c8e90d80770e103012627f8a95439a8324ba8db2611b0eb8fdf6ae +SIZE (Text-BibTeX-0.74.tar.gz) = 286958 diff --git a/textproc/p5-XML-LibXML/Makefile b/textproc/p5-XML-LibXML/Makefile index 84dec7d3f71..0ecb2852444 100644 --- a/textproc/p5-XML-LibXML/Makefile +++ b/textproc/p5-XML-LibXML/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= XML-LibXML -PORTVERSION= 2.0124 +PORTVERSION= 2.0125 PORTEPOCH= 1 CATEGORIES= textproc perl5 MASTER_SITES= CPAN diff --git a/textproc/p5-XML-LibXML/distinfo b/textproc/p5-XML-LibXML/distinfo index 0d9355073aa..69b8ca5ce39 100644 --- a/textproc/p5-XML-LibXML/distinfo +++ b/textproc/p5-XML-LibXML/distinfo @@ -1,2 +1,3 @@ -SHA256 (XML-LibXML-2.0124.tar.gz) = f053434d68d94586ba062c8ded33a448b2943f9ae9e46db4293a97673e755240 -SIZE (XML-LibXML-2.0124.tar.gz) = 465948 +TIMESTAMP = 1466520145 +SHA256 (XML-LibXML-2.0125.tar.gz) = 01407fe313893dabb138a817897277dbdabcd0cbcbaca4628a16b7cb6fd86bd7 +SIZE (XML-LibXML-2.0125.tar.gz) = 465206 diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile index d300f5afea4..12aceb14c9c 100644 --- a/textproc/p5-XML-XPath/Makefile +++ b/textproc/p5-XML-XPath/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= XML-XPath -PORTVERSION= 1.36 +PORTVERSION= 1.37 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-XML-XPath/distinfo b/textproc/p5-XML-XPath/distinfo index 3c15f595c18..219532bf59b 100644 --- a/textproc/p5-XML-XPath/distinfo +++ b/textproc/p5-XML-XPath/distinfo @@ -1,2 +1,3 @@ -SHA256 (XML-XPath-1.36.tar.gz) = 5391208078b4a7854ce3188d3493dc7877ee7ffc22279b19110f8bee419b1f46 -SIZE (XML-XPath-1.36.tar.gz) = 54662 +TIMESTAMP = 1466520190 +SHA256 (XML-XPath-1.37.tar.gz) = b8ae1196184f794528a9727988dce944ecec7155e6ee1c433b17e12737a22725 +SIZE (XML-XPath-1.37.tar.gz) = 54747 diff --git a/www/Makefile b/www/Makefile index 7735dd26c5e..6c732c4d0ca 100644 --- a/www/Makefile +++ b/www/Makefile @@ -60,6 +60,7 @@ SUBDIR += c-icap-modules SUBDIR += cadaver SUBDIR += calamaris + SUBDIR += calamaris-devel SUBDIR += caldavzap SUBDIR += calendarserver SUBDIR += castget diff --git a/www/asql/Makefile b/www/asql/Makefile index ad667a5b2eb..914eb501430 100644 --- a/www/asql/Makefile +++ b/www/asql/Makefile @@ -12,7 +12,7 @@ COMMENT= Query Apache logfiles via SQL RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \ p5-DBI>=0:databases/p5-DBI \ - p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl + p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl NO_BUILD= yes PLIST_FILES= bin/asql diff --git a/www/calamaris-devel/Makefile b/www/calamaris-devel/Makefile new file mode 100644 index 00000000000..4315d67f6cd --- /dev/null +++ b/www/calamaris-devel/Makefile @@ -0,0 +1,38 @@ +# Created by: Dmitry Sivachenko +# $FreeBSD$ + +PORTNAME= calamaris +PORTVERSION= 2.99.4.5 +CATEGORIES= www textproc +MASTER_SITES= http://cord.de/files/calamaris/ + +MAINTAINER= demon@FreeBSD.org +COMMENT= Perl script to produce statistics out of Squid log files + +LICENSE= GPLv2 + +RUN_DEPENDS= p5-GD-Graph>=0:graphics/p5-GD-Graph \ + p5-NetAddr-Ip>=0:net-mgmt/p5-NetAddr-IP + +CONFLICTS_INSTALL= calamaris-[0-9]* + +USES= shebangfix perl5 +NO_BUILD= yes +SHEBANG_FILES= calamaris calamaris-cache-convert + +OPTIONS_DEFINE= DOCS + +do-install: + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/calamaris-cache-convert ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} + ${INSTALL_DATA} ${WRKSRC}/calAxestype.pm ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} + ${INSTALL_DATA} ${WRKSRC}/calAxestype3d.pm ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} + ${INSTALL_DATA} ${WRKSRC}/calBars3d.pm ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL} + ${INSTALL_DATA} ${WRKSRC}/calamaris.conf ${STAGEDIR}${PREFIX}/etc/calamaris.conf.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + +.include diff --git a/www/calamaris-devel/distinfo b/www/calamaris-devel/distinfo new file mode 100644 index 00000000000..c0899b83b8f --- /dev/null +++ b/www/calamaris-devel/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1466511219 +SHA256 (calamaris-2.99.4.5.tar.gz) = 52576f75dc5321757ca1958130dd8b40803f0dfa1fdc41d48dd2c0beaa377474 +SIZE (calamaris-2.99.4.5.tar.gz) = 116893 diff --git a/www/calamaris-devel/pkg-descr b/www/calamaris-devel/pkg-descr new file mode 100644 index 00000000000..4ed76d78148 --- /dev/null +++ b/www/calamaris-devel/pkg-descr @@ -0,0 +1,6 @@ +Calamaris parses the Squid Native Log and generates reports +about Peak-usage, Request-Methods, Status-reports of incoming +and outgoing requests, second and Top-level destinations, +content-types and performance. + +WWW: http://Cord.de/tools/squid/calamaris/ diff --git a/www/calamaris-devel/pkg-plist b/www/calamaris-devel/pkg-plist new file mode 100644 index 00000000000..c6ed76b2c42 --- /dev/null +++ b/www/calamaris-devel/pkg-plist @@ -0,0 +1,10 @@ +bin/calamaris +bin/calamaris-cache-convert +man/man1/calamaris.1.gz +%%SITE_ARCH%%/calAxestype.pm +%%SITE_ARCH%%/calAxestype3d.pm +%%SITE_ARCH%%/calBars3d.pm +%%PORTDOCS%%share/doc/calamaris/EXAMPLES +%%PORTDOCS%%share/doc/calamaris/EXAMPLES.v3 +%%PORTDOCS%%share/doc/calamaris/README +@sample etc/calamaris.conf.sample diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile index 6ae120786ff..9f796736d93 100644 --- a/www/calamaris/Makefile +++ b/www/calamaris/Makefile @@ -5,11 +5,15 @@ PORTNAME= calamaris PORTVERSION= 2.59 PORTREVISION= 1 CATEGORIES= www textproc -MASTER_SITES= http://cord.de/tools/squid/calamaris/ +MASTER_SITES= http://cord.de/files/calamaris/ MAINTAINER= demon@FreeBSD.org COMMENT= Perl script to produce statistics out of Squid log files +LICENSE= GPLv2 + +CONFLICTS_INSTALL= calamaris-devel-[0-9]* + USES= shebangfix perl5 NO_BUILD= yes SHEBANG_FILES= calamaris diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 8182d1e3878..b5e6dd05d59 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 51.0.2704.84 -PORTREVISION= 1 +PORTVERSION= 51.0.2704.103 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on diff --git a/www/chromium/distinfo b/www/chromium/distinfo index ed8700a2526..8a5bd013e01 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1465247626 -SHA256 (chromium-51.0.2704.84.tar.xz) = 33a3fe1cb8fa5be7b35aa8ae00c8b0a6dc90975bfa9aea9865180b57b0a4dc6a -SIZE (chromium-51.0.2704.84.tar.xz) = 448556852 -SHA256 (chromium-51.0.2704.84-testdata.tar.xz) = f74796ad850f874df407dd624eeb3a887d6d4fff312c79d4269f370f179490a1 -SIZE (chromium-51.0.2704.84-testdata.tar.xz) = 121441480 +TIMESTAMP = 1466191227 +SHA256 (chromium-51.0.2704.103.tar.xz) = 76735b6dc4100e84c4dbcf5b2336bf8a2eb9cc6402c31e8865878a086971d72b +SIZE (chromium-51.0.2704.103.tar.xz) = 448638748 +SHA256 (chromium-51.0.2704.103-testdata.tar.xz) = 787ae4a7c30c3fecb605d0d362370977264938d6c8b0fa6a50a06b556b96e541 +SIZE (chromium-51.0.2704.103-testdata.tar.xz) = 121442840 diff --git a/www/elixir-phoenix_html/Makefile b/www/elixir-phoenix_html/Makefile index 1d2944ff941..a53baaf0929 100644 --- a/www/elixir-phoenix_html/Makefile +++ b/www/elixir-phoenix_html/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= phoenix_html -PORTVERSION= 2.5.1 +PORTVERSION= 2.6.0 DISTVERSIONPREFIX= v CATEGORIES= www PKGNAMEPREFIX= elixir- diff --git a/www/elixir-phoenix_html/distinfo b/www/elixir-phoenix_html/distinfo index 7a9bf313760..11f2d011342 100644 --- a/www/elixir-phoenix_html/distinfo +++ b/www/elixir-phoenix_html/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463615949 -SHA256 (phoenixframework-phoenix_html-v2.5.1_GH0.tar.gz) = d88e3102ec0e2e3b67f4067e788c4811327c43dee5f0ce2b1c9cc3749c60b54b -SIZE (phoenixframework-phoenix_html-v2.5.1_GH0.tar.gz) = 27975 +TIMESTAMP = 1466540850 +SHA256 (phoenixframework-phoenix_html-v2.6.0_GH0.tar.gz) = dee4653e97a85f2e4882ca79f16b89861e0619fe7feea819e28e64db8149fc3e +SIZE (phoenixframework-phoenix_html-v2.6.0_GH0.tar.gz) = 29022 diff --git a/www/elixir-phoenix_html/pkg-plist b/www/elixir-phoenix_html/pkg-plist index cb5559778a1..ae340801db2 100644 --- a/www/elixir-phoenix_html/pkg-plist +++ b/www/elixir-phoenix_html/pkg-plist @@ -6,9 +6,13 @@ lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Format.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Link.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.Atom.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.BitString.beam +lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.Date.beam +lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.DateTime.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.Float.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.Integer.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.List.beam +lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.NaiveDateTime.beam +lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.Time.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.Tuple.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Safe.beam lib/elixir/lib/phoenix_html/ebin/Elixir.Phoenix.HTML.Tag.beam diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 19a7df4f191..7ffc1c77275 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 8.7.5 +PORTVERSION= 8.8.5 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -23,8 +23,8 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \ rubygem-pg>=0.18.2:databases/rubygem-pg \ rubygem-devise-rails4>=3.5.4:devel/rubygem-devise-rails4 \ + rubygem-doorkeeper>=3.1:security/rubygem-doorkeeper \ rubygem-devise-async-rails4>=0.9.0:devel/rubygem-devise-async-rails4 \ - rubygem-doorkeeper>=2.2.0:security/rubygem-doorkeeper \ rubygem-omniauth>=1.3.1:security/rubygem-omniauth \ rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-oauth2>=0.0.6:net/rubygem-omniauth-azure-oauth2 \ @@ -39,6 +39,7 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \ rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \ rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \ + rubygem-jwt>=1.0:www/rubygem-jwt \ rubygem-recaptcha>=0:devel/rubygem-recaptcha \ rubygem-akismet>=2.0:devel/rubygem-akismet \ rubygem-devise-two-factor>=2.0.0:security/rubygem-devise-two-factor \ @@ -98,14 +99,14 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-asana>=0.4.0:www/rubygem-asana \ rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \ rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \ - rubygem-cal-heatmap-rails-rails4>=3.5.0:www/rubygem-cal-heatmap-rails-rails4 \ + rubygem-cal-heatmap-rails-rails4>=3.6.0:www/rubygem-cal-heatmap-rails-rails4 \ rubygem-underscore-rails>=1.8.0:www/rubygem-underscore-rails \ rubygem-sanitize>=2.0:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-loofah>=2.0.3:textproc/rubygem-loofah \ rubygem-licensee>=8.0:devel/rubygem-licensee \ rubygem-rack-attack>=4.3.1:www/rubygem-rack-attack \ - rubygem-ace-rails-ap>=2.0.1:www/rubygem-ace-rails-ap \ + rubygem-ace-rails-ap>=4.0.2:www/rubygem-ace-rails-ap \ rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \ rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \ rubygem-sass-rails5>=5.0.0:textproc/rubygem-sass-rails5 \ @@ -119,14 +120,14 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-gitlab_emoji>=0.3:graphics/rubygem-gitlab_emoji \ rubygem-gon>=6.0.1:www/rubygem-gon \ rubygem-jquery-atwho-rails-rails4>=1.3.2:www/rubygem-jquery-atwho-rails-rails4 \ - rubygem-jquery-rails4>=4.0.0:www/rubygem-jquery-rails4 \ - rubygem-jquery-scrollto-rails>=1.4.3:www/rubygem-jquery-scrollto-rails \ + rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \ rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \ rubygem-raphael-rails>=2.1.2:www/rubygem-raphael-rails \ rubygem-request_store>=1.3.0:devel/rubygem-request_store \ rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \ rubygem-virtus>=1.0.1:devel/rubygem-virtus \ rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \ + rubygem-base32>=0.3.2:converters/rubygem-base32 \ rubygem-sentry-raven>=0.15.4:devel/rubygem-sentry-raven \ rubygem-premailer-rails>=1.9.0:mail/rubygem-premailer-rails \ rubygem-gitlab_meta>=7.0:devel/rubygem-gitlab_meta \ @@ -134,13 +135,14 @@ RUN_DEPENDS= git>=2.7.4:devel/git \ rubygem-newrelic-grape>=0:devel/rubygem-newrelic-grape \ rubygem-newrelic_rpm>=3.14:devel/rubygem-newrelic_rpm \ rubygem-octokit>=4.3.0:net/rubygem-octokit \ - rubygem-mail_room>=0.6.1:mail/rubygem-mail_room \ + rubygem-mail_room>=0.7:mail/rubygem-mail_room \ rubygem-email_reply_parser>=0.5.8:mail/rubygem-email_reply_parser \ rubygem-activerecord-deprecated_finders>=1.0.3:devel/rubygem-activerecord-deprecated_finders \ rubygem-activerecord-session_store>=0.1.0:databases/rubygem-activerecord-session_store \ rubygem-nested_form>=0.3.2:www/rubygem-nested_form \ rubygem-oauth2>=1.0.0:net/rubygem-oauth2 \ rubygem-paranoia>=2.0:databases/rubygem-paranoia \ + rubygem-health_check>=1.5.1:devel/rubygem-health_check \ rubygem-rinku>=1.7.3:www/rubygem-rinku USE= pgsql=yes @@ -165,6 +167,7 @@ do-install: ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete + ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index f1fdc5d6449..65fb49bb253 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1463577356 -SHA256 (gitlabhq-gitlabhq-v8.7.5_GH0.tar.gz) = 170029e20425b070b1c96c0480f5a2dc09bc4bc361e487b6572f67b138d6f6cc -SIZE (gitlabhq-gitlabhq-v8.7.5_GH0.tar.gz) = 17642879 +TIMESTAMP = 1466158783 +SHA256 (gitlabhq-gitlabhq-v8.8.5_GH0.tar.gz) = 385fefd73ea70797ee2b1d9084c0b5a0f90917a7636926537746bd86143e0335 +SIZE (gitlabhq-gitlabhq-v8.8.5_GH0.tar.gz) = 18478664 diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in index 3c1f5dc7f67..01da466575a 100644 --- a/www/gitlab/files/gitlab.in +++ b/www/gitlab/files/gitlab.in @@ -2,8 +2,6 @@ # $FreeBSD$ -# $FreeBSD$ - ### BEGIN INIT INFO # Provides: gitlab # Required-Start: $local_fs $remote_fs $network $syslog redis-server diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 13828112580..c0c52969d65 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2016-04-27 09:47:33 UTC +--- Gemfile.orig 2016-06-15 01:41:18 UTC +++ Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" @@ -25,14 +25,13 @@ # Authentication libraries gem 'devise', '~> 3.5.4' + gem 'doorkeeper', '~> 3.1' -gem 'devise-async', '~> 0.9.0' --gem 'doorkeeper', '~> 2.2.0' +gem 'devise-async', '>= 0.9.0' -+gem 'doorkeeper', '>= 2.2.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' -@@ -29,25 +28,24 @@ gem 'omniauth-cas3', '~> 1.1.2' +@@ -29,13 +28,12 @@ gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' @@ -45,9 +44,10 @@ gem 'omniauth_crowd', '~> 2.2.0' -gem 'rack-oauth2', '~> 1.2.1' +gem 'rack-oauth2', '>= 1.2.1' + gem 'jwt' # Spam and anti-bot protection - gem 'recaptcha', require: 'recaptcha/rails' +@@ -43,12 +41,12 @@ gem 'recaptcha', require: 'recaptcha/rai gem 'akismet', '~> 2.0' # Two-factor authentication @@ -63,7 +63,7 @@ # Extracting information from a git repository # Provide access to Gitlab::Git library -@@ -60,15 +58,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', +@@ -61,15 +59,15 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', # Git Wiki # Required manually in config/initializers/gollum.rb to control load order @@ -83,7 +83,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination -@@ -78,13 +76,13 @@ gem "kaminari", "~> 0.16.3" +@@ -79,13 +77,13 @@ gem "kaminari", "~> 0.16.3" gem "haml-rails", '~> 0.9.0' # Files attachments @@ -99,7 +99,7 @@ gem "unf", '~> 0.1.4' # Authorization -@@ -96,13 +94,13 @@ gem "seed-fu", '~> 2.3.5' +@@ -97,13 +95,13 @@ gem "seed-fu", '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' @@ -116,7 +116,7 @@ gem 'asciidoctor', '~> 1.5.2' gem 'rouge', '~> 1.10.1' -@@ -111,11 +109,11 @@ gem 'rouge', '~> 1.10.1' +@@ -112,16 +110,16 @@ gem 'rouge', '~> 1.10.1' gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' # Diffs @@ -130,7 +130,13 @@ gem 'unicorn-worker-killer', '~> 0.4.2' end -@@ -166,10 +164,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. + # State machine +-gem "state_machines-activerecord", '~> 0.3.0' ++gem "state_machines-activerecord", '>= 0.3.0' + # Run events after state machine commits + gem 'after_commit_queue' + +@@ -167,10 +165,10 @@ gem "gitlab-flowdock-git-hook", "~> 1.0. gem "gemnasium-gitlab-service", "~> 0.2" # Slack integration @@ -143,7 +149,7 @@ # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' -@@ -184,7 +182,7 @@ gem 'cal-heatmap-rails', '~> 3.5.0' +@@ -185,17 +183,17 @@ gem 'cal-heatmap-rails', '~> 3.6.0' gem "underscore-rails", "~> 1.8.0" # Sanitize user input @@ -152,20 +158,19 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -@@ -194,10 +192,10 @@ gem "loofah", "~> 2.0.3" - gem 'licensee', '~> 8.0.0' + gem "loofah", "~> 2.0.3" + + # Working with license +-gem 'licensee', '~> 8.0.0' ++gem 'licensee', '>= 8.0.0' # Protect against bruteforcing -gem "rack-attack", '~> 4.3.1' +gem "rack-attack", '>= 4.3.1' # Ace editor --gem 'ace-rails-ap', '~> 2.0.1' -+gem 'ace-rails-ap', '>= 2.0.1' - - # Keyboard shortcuts - gem 'mousetrap-rails', '~> 1.4.6' -@@ -207,111 +205,30 @@ gem 'charlock_holmes', '~> 0.7.3' + gem 'ace-rails-ap', '~> 4.0.2' +@@ -208,11 +206,11 @@ gem 'charlock_holmes', '~> 0.7.3' gem "sass-rails", '~> 5.0.0' gem "coffee-rails", '~> 4.1.0' @@ -179,11 +184,8 @@ gem 'bootstrap-sass', '~> 3.3.0' gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.3.0' - gem 'gon', '~> 6.0.1' - gem 'jquery-atwho-rails', '~> 1.3.2' --gem 'jquery-rails', '~> 4.0.0' -+gem 'jquery-rails', '>= 4.0.0' - gem 'jquery-scrollto-rails', '~> 1.4.3' +@@ -221,10 +219,10 @@ gem 'jquery-atwho-rails', '~> 1.3.2' + gem 'jquery-rails', '~> 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' gem 'raphael-rails', '~> 2.1.2' -gem 'request_store', '~> 1.3.0' @@ -192,9 +194,10 @@ gem 'virtus', '~> 1.0.1' -gem 'net-ssh', '~> 3.0.1' +gem 'net-ssh', '>= 3.0.1' + gem 'base32', '~> 0.3.0' # Sentry integration - gem 'sentry-raven', '~> 0.15' +@@ -232,86 +230,6 @@ gem 'sentry-raven', '~> 0.15' gem 'premailer-rails', '~> 1.9.0' @@ -209,8 +212,7 @@ - gem "foreman" - gem 'brakeman', '~> 3.2.0', require: false - -- gem "annotate", "~> 2.7.0" -- gem "letter_opener", '~> 1.1.2' +- gem 'letter_opener_web', '~> 1.3.0' - gem 'quiet_assets', '~> 1.0.2' - gem 'rerun', '~> 0.11.0' - gem 'bullet', require: false @@ -237,7 +239,7 @@ - - gem 'database_cleaner', '~> 1.4.0' - gem 'factory_girl_rails', '~> 4.6.0' -- gem 'rspec-rails', '~> 3.3.0' +- gem 'rspec-rails', '~> 3.4.0' - gem 'rspec-retry' - gem 'spinach-rails', '~> 0.2.1' - gem 'spinach-rerun-reporter', '~> 0.0.2' @@ -282,7 +284,7 @@ group :production do gem "gitlab_meta", '7.0' end -@@ -330,7 +247,9 @@ gem 'activerecord-session_store', '~> 0. +@@ -329,10 +247,12 @@ gem 'activerecord-session_store', '~> 0. gem "nested_form", '~> 0.3.2' # OAuth @@ -291,5 +293,8 @@ # Soft deletion gem "paranoia", "~> 2.0" -+ + +gem "rinku" ++ + # Health check + gem 'health_check', '~> 1.5.1' diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 532cd364a1e..e2ab46bd4b5 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2016-04-22 10:01:37 UTC +--- config/gitlab.yml.example.orig 2016-06-15 01:41:18 UTC +++ config/gitlab.yml.example -@@ -437,11 +437,11 @@ production: &base +@@ -448,11 +448,11 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -8,13 +8,14 @@ + path: /usr/local/share/gitlab-shell/ # REPOS_PATH MUST NOT BE A SYMLINK!!! - repos_path: /home/git/repositories/ +- repos_path: /home/git/repositories/ - hooks_path: /home/git/gitlab-shell/hooks/ ++ repos_path: /usr/home/git/repositories/ + hooks_path: /usr/local/share/gitlab-shell/hooks/ # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -458,7 +458,7 @@ production: &base +@@ -469,7 +469,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb index c8472f45d3e..cbc3ca9a04c 100644 --- a/www/gitlab/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab/files/patch-config_initializers_1__settings.rb @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2016-04-22 10:01:37 UTC +--- config/initializers/1_settings.rb.orig 2016-06-15 01:41:18 UTC +++ config/initializers/1_settings.rb -@@ -167,11 +167,7 @@ Settings.gitlab['email_reply_to'] ||= EN +@@ -191,12 +191,8 @@ Settings.gitlab['email_reply_to'] ||= EN Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url) Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' @@ -9,7 +9,9 @@ -rescue ArgumentError # no user configured - '/home/' + Settings.gitlab['user'] -end -+Settings.gitlab['user_home'] ||= '/home/' + Settings.gitlab['user'] - Settings.gitlab['time_zone'] ||= nil +-Settings.gitlab['time_zone'] ||= nil ++Settings.gitlab['user_home'] ||= '/usr/home/' + Settings.gitlab['user'] ++Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil? + Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab b/www/gitlab/files/patch-lib_support_nginx_gitlab index 57360ce8ec8..5ab7a3d3883 100644 --- a/www/gitlab/files/patch-lib_support_nginx_gitlab +++ b/www/gitlab/files/patch-lib_support_nginx_gitlab @@ -1,4 +1,4 @@ ---- lib/support/nginx/gitlab.orig 2016-04-22 10:01:37 UTC +--- lib/support/nginx/gitlab.orig 2016-06-15 01:41:18 UTC +++ lib/support/nginx/gitlab @@ -17,7 +17,7 @@ ## See installation.md#using-https for additional HTTPS configuration details. @@ -9,10 +9,10 @@ } ## Normal HTTP host -@@ -62,7 +62,7 @@ server { - error_page 500 /500.html; +@@ -63,7 +63,7 @@ server { error_page 502 /502.html; - location ~ ^/(404|422|500|502)\.html$ { + error_page 503 /503.html; + location ~ ^/(404|422|500|502|503)\.html$ { - root /home/git/gitlab/public; + root /usr/local/www/gitlab/public; internal; diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl index 78f42d7dab3..304eefe52c0 100644 --- a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl +++ b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl @@ -1,4 +1,4 @@ ---- lib/support/nginx/gitlab-ssl.orig 2016-04-22 10:01:37 UTC +--- lib/support/nginx/gitlab-ssl.orig 2016-06-15 01:41:18 UTC +++ lib/support/nginx/gitlab-ssl @@ -21,7 +21,7 @@ ## See installation.md#using-https for additional HTTPS configuration details. @@ -9,12 +9,12 @@ } ## Redirects all HTTP traffic to the HTTPS host -@@ -106,7 +106,7 @@ server { - error_page 500 /500.html; +@@ -107,7 +107,7 @@ server { error_page 502 /502.html; - location ~ ^/(404|422|500|502)\.html$ { + error_page 503 /503.html; + location ~ ^/(404|422|500|502|503)\.html$ { - root /home/git/gitlab/public; -+ root /usr/local/www/gitlab/public; ++ root /home/git/gitlab/public; internal; } } diff --git a/www/gitlab/pkg-plist b/www/gitlab/pkg-plist index 7e83faf9956..bb46e0f3465 100644 --- a/www/gitlab/pkg-plist +++ b/www/gitlab/pkg-plist @@ -2,7 +2,6 @@ %%WWWDIR%%/.flayignore %%WWWDIR%%/.foreman %%WWWDIR%%/.gitattributes -%%WWWDIR%%/.gitignore %%WWWDIR%%/.gitlab-ci.yml %%WWWDIR%%/.hound.yml %%WWWDIR%%/.pkgr.yml @@ -59,12 +58,6 @@ %%WWWDIR%%/app/assets/images/bg-header.png %%WWWDIR%%/app/assets/images/bg_fallback.png %%WWWDIR%%/app/assets/images/chosen-sprite.png -%%WWWDIR%%/app/assets/images/ci/arch.jpg -%%WWWDIR%%/app/assets/images/ci/favicon.ico -%%WWWDIR%%/app/assets/images/ci/loader.gif -%%WWWDIR%%/app/assets/images/ci/no_avatar.png -%%WWWDIR%%/app/assets/images/ci/rails.png -%%WWWDIR%%/app/assets/images/ci/service_sample.png %%WWWDIR%%/app/assets/images/dark-scheme-preview.png %%WWWDIR%%/app/assets/images/diff_note_add.png %%WWWDIR%%/app/assets/images/emoji.png @@ -110,6 +103,7 @@ %%WWWDIR%%/app/assets/javascripts/behaviors/requires_input.js.coffee %%WWWDIR%%/app/assets/javascripts/behaviors/toggler_behavior.coffee %%WWWDIR%%/app/assets/javascripts/blob/blob_file_dropzone.js.coffee +%%WWWDIR%%/app/assets/javascripts/blob/blob_gitignore_selector.js.coffee %%WWWDIR%%/app/assets/javascripts/blob/blob_license_selector.js.coffee %%WWWDIR%%/app/assets/javascripts/blob/edit_blob.js.coffee %%WWWDIR%%/app/assets/javascripts/branch-graph.js.coffee @@ -155,6 +149,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/jquery.timeago.js %%WWWDIR%%/app/assets/javascripts/lib/md5.js %%WWWDIR%%/app/assets/javascripts/lib/notify.js.coffee +%%WWWDIR%%/app/assets/javascripts/lib/type_utility.js.coffee %%WWWDIR%%/app/assets/javascripts/lib/url_utility.js.coffee %%WWWDIR%%/app/assets/javascripts/lib/utf8_encode.js %%WWWDIR%%/app/assets/javascripts/line_highlighter.js.coffee @@ -184,6 +179,7 @@ %%WWWDIR%%/app/assets/javascripts/projects_list.js.coffee %%WWWDIR%%/app/assets/javascripts/protected_branches.js.coffee %%WWWDIR%%/app/assets/javascripts/right_sidebar.js.coffee +%%WWWDIR%%/app/assets/javascripts/search.js.coffee %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js.coffee %%WWWDIR%%/app/assets/javascripts/shortcuts.js.coffee %%WWWDIR%%/app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee @@ -209,6 +205,7 @@ %%WWWDIR%%/app/assets/stylesheets/application.scss %%WWWDIR%%/app/assets/stylesheets/behaviors.scss %%WWWDIR%%/app/assets/stylesheets/framework.scss +%%WWWDIR%%/app/assets/stylesheets/framework/animations.scss %%WWWDIR%%/app/assets/stylesheets/framework/avatar.scss %%WWWDIR%%/app/assets/stylesheets/framework/blocks.scss %%WWWDIR%%/app/assets/stylesheets/framework/buttons.scss @@ -232,6 +229,7 @@ %%WWWDIR%%/app/assets/stylesheets/framework/markdown_area.scss %%WWWDIR%%/app/assets/stylesheets/framework/mixins.scss %%WWWDIR%%/app/assets/stylesheets/framework/mobile.scss +%%WWWDIR%%/app/assets/stylesheets/framework/modal.scss %%WWWDIR%%/app/assets/stylesheets/framework/nav.scss %%WWWDIR%%/app/assets/stylesheets/framework/pagination.scss %%WWWDIR%%/app/assets/stylesheets/framework/panels.scss @@ -250,6 +248,7 @@ %%WWWDIR%%/app/assets/stylesheets/highlight/solarized_dark.scss %%WWWDIR%%/app/assets/stylesheets/highlight/solarized_light.scss %%WWWDIR%%/app/assets/stylesheets/highlight/white.scss +%%WWWDIR%%/app/assets/stylesheets/mailers/repository_push_email.scss %%WWWDIR%%/app/assets/stylesheets/notify.scss %%WWWDIR%%/app/assets/stylesheets/pages/admin.scss %%WWWDIR%%/app/assets/stylesheets/pages/appearances.scss @@ -281,11 +280,13 @@ %%WWWDIR%%/app/assets/stylesheets/pages/note_form.scss %%WWWDIR%%/app/assets/stylesheets/pages/notes.scss %%WWWDIR%%/app/assets/stylesheets/pages/notifications.scss +%%WWWDIR%%/app/assets/stylesheets/pages/pipelines.scss %%WWWDIR%%/app/assets/stylesheets/pages/profile.scss %%WWWDIR%%/app/assets/stylesheets/pages/profiles/preferences.scss %%WWWDIR%%/app/assets/stylesheets/pages/projects.scss %%WWWDIR%%/app/assets/stylesheets/pages/runners.scss %%WWWDIR%%/app/assets/stylesheets/pages/search.scss +%%WWWDIR%%/app/assets/stylesheets/pages/settings.scss %%WWWDIR%%/app/assets/stylesheets/pages/sherlock.scss %%WWWDIR%%/app/assets/stylesheets/pages/snippets.scss %%WWWDIR%%/app/assets/stylesheets/pages/stat_graph.scss @@ -309,6 +310,7 @@ %%WWWDIR%%/app/controllers/admin/dashboard_controller.rb %%WWWDIR%%/app/controllers/admin/deploy_keys_controller.rb %%WWWDIR%%/app/controllers/admin/groups_controller.rb +%%WWWDIR%%/app/controllers/admin/health_check_controller.rb %%WWWDIR%%/app/controllers/admin/hooks_controller.rb %%WWWDIR%%/app/controllers/admin/identities_controller.rb %%WWWDIR%%/app/controllers/admin/impersonations_controller.rb @@ -355,6 +357,7 @@ %%WWWDIR%%/app/controllers/groups/milestones_controller.rb %%WWWDIR%%/app/controllers/groups/notification_settings_controller.rb %%WWWDIR%%/app/controllers/groups_controller.rb +%%WWWDIR%%/app/controllers/health_check_controller.rb %%WWWDIR%%/app/controllers/help_controller.rb %%WWWDIR%%/app/controllers/import/base_controller.rb %%WWWDIR%%/app/controllers/import/bitbucket_controller.rb @@ -364,6 +367,7 @@ %%WWWDIR%%/app/controllers/import/gitorious_controller.rb %%WWWDIR%%/app/controllers/import/google_code_controller.rb %%WWWDIR%%/app/controllers/invites_controller.rb +%%WWWDIR%%/app/controllers/jwt_controller.rb %%WWWDIR%%/app/controllers/namespaces_controller.rb %%WWWDIR%%/app/controllers/oauth/applications_controller.rb %%WWWDIR%%/app/controllers/oauth/authorizations_controller.rb @@ -391,6 +395,7 @@ %%WWWDIR%%/app/controllers/projects/commit_controller.rb %%WWWDIR%%/app/controllers/projects/commits_controller.rb %%WWWDIR%%/app/controllers/projects/compare_controller.rb +%%WWWDIR%%/app/controllers/projects/container_registry_controller.rb %%WWWDIR%%/app/controllers/projects/deploy_keys_controller.rb %%WWWDIR%%/app/controllers/projects/find_file_controller.rb %%WWWDIR%%/app/controllers/projects/forks_controller.rb @@ -405,6 +410,7 @@ %%WWWDIR%%/app/controllers/projects/network_controller.rb %%WWWDIR%%/app/controllers/projects/notes_controller.rb %%WWWDIR%%/app/controllers/projects/notification_settings_controller.rb +%%WWWDIR%%/app/controllers/projects/pipelines_controller.rb %%WWWDIR%%/app/controllers/projects/project_members_controller.rb %%WWWDIR%%/app/controllers/projects/protected_branches_controller.rb %%WWWDIR%%/app/controllers/projects/raw_controller.rb @@ -445,6 +451,7 @@ %%WWWDIR%%/app/finders/milestones_finder.rb %%WWWDIR%%/app/finders/notes_finder.rb %%WWWDIR%%/app/finders/personal_projects_finder.rb +%%WWWDIR%%/app/finders/pipelines_finder.rb %%WWWDIR%%/app/finders/projects_finder.rb %%WWWDIR%%/app/finders/snippets_finder.rb %%WWWDIR%%/app/finders/todos_finder.rb @@ -458,7 +465,6 @@ %%WWWDIR%%/app/helpers/branches_helper.rb %%WWWDIR%%/app/helpers/broadcast_messages_helper.rb %%WWWDIR%%/app/helpers/button_helper.rb -%%WWWDIR%%/app/helpers/ci_badge_helper.rb %%WWWDIR%%/app/helpers/ci_status_helper.rb %%WWWDIR%%/app/helpers/commits_helper.rb %%WWWDIR%%/app/helpers/compare_helper.rb @@ -541,6 +547,7 @@ %%WWWDIR%%/app/models/concerns/participable.rb %%WWWDIR%%/app/models/concerns/referable.rb %%WWWDIR%%/app/models/concerns/sortable.rb +%%WWWDIR%%/app/models/concerns/statuseable.rb %%WWWDIR%%/app/models/concerns/strip_attribute.rb %%WWWDIR%%/app/models/concerns/subscribable.rb %%WWWDIR%%/app/models/concerns/taskable.rb @@ -565,6 +572,7 @@ %%WWWDIR%%/app/models/key.rb %%WWWDIR%%/app/models/label.rb %%WWWDIR%%/app/models/label_link.rb +%%WWWDIR%%/app/models/legacy_diff_note.rb %%WWWDIR%%/app/models/lfs_object.rb %%WWWDIR%%/app/models/lfs_objects_project.rb %%WWWDIR%%/app/models/member.rb @@ -633,8 +641,10 @@ %%WWWDIR%%/app/models/users_star_project.rb %%WWWDIR%%/app/models/wiki_page.rb %%WWWDIR%%/app/services/audit_event_service.rb +%%WWWDIR%%/app/services/auth/container_registry_authentication_service.rb %%WWWDIR%%/app/services/base_service.rb %%WWWDIR%%/app/services/ci/create_builds_service.rb +%%WWWDIR%%/app/services/ci/create_pipeline_service.rb %%WWWDIR%%/app/services/ci/create_trigger_request_service.rb %%WWWDIR%%/app/services/ci/image_for_build_service.rb %%WWWDIR%%/app/services/ci/register_build_service.rb @@ -674,6 +684,7 @@ %%WWWDIR%%/app/services/issues/move_service.rb %%WWWDIR%%/app/services/issues/reopen_service.rb %%WWWDIR%%/app/services/issues/update_service.rb +%%WWWDIR%%/app/services/merge_requests/add_todo_when_build_fails_service.rb %%WWWDIR%%/app/services/merge_requests/base_service.rb %%WWWDIR%%/app/services/merge_requests/build_service.rb %%WWWDIR%%/app/services/merge_requests/close_service.rb @@ -765,6 +776,7 @@ %%WWWDIR%%/app/views/admin/groups/index.html.haml %%WWWDIR%%/app/views/admin/groups/new.html.haml %%WWWDIR%%/app/views/admin/groups/show.html.haml +%%WWWDIR%%/app/views/admin/health_check/show.html.haml %%WWWDIR%%/app/views/admin/hooks/index.html.haml %%WWWDIR%%/app/views/admin/identities/_form.html.haml %%WWWDIR%%/app/views/admin/identities/_identity.html.haml @@ -1019,6 +1031,8 @@ %%WWWDIR%%/app/views/notify/note_issue_email.text.erb %%WWWDIR%%/app/views/notify/note_merge_request_email.html.haml %%WWWDIR%%/app/views/notify/note_merge_request_email.text.erb +%%WWWDIR%%/app/views/notify/note_snippet_email.html.haml +%%WWWDIR%%/app/views/notify/note_snippet_email.text.erb %%WWWDIR%%/app/views/notify/project_access_granted_email.html.haml %%WWWDIR%%/app/views/notify/project_access_granted_email.text.erb %%WWWDIR%%/app/views/notify/project_invite_accepted_email.html.haml @@ -1112,9 +1126,12 @@ %%WWWDIR%%/app/views/projects/buttons/_notifications.html.haml %%WWWDIR%%/app/views/projects/buttons/_star.html.haml %%WWWDIR%%/app/views/projects/ci/builds/_build.html.haml +%%WWWDIR%%/app/views/projects/ci/commits/_commit.html.haml %%WWWDIR%%/app/views/projects/commit/_builds.html.haml %%WWWDIR%%/app/views/projects/commit/_change.html.haml +%%WWWDIR%%/app/views/projects/commit/_ci_commit.html.haml %%WWWDIR%%/app/views/projects/commit/_ci_menu.html.haml +%%WWWDIR%%/app/views/projects/commit/_ci_stage.html.haml %%WWWDIR%%/app/views/projects/commit/_commit_box.html.haml %%WWWDIR%%/app/views/projects/commit/branches.html.haml %%WWWDIR%%/app/views/projects/commit/builds.html.haml @@ -1130,6 +1147,9 @@ %%WWWDIR%%/app/views/projects/compare/_form.html.haml %%WWWDIR%%/app/views/projects/compare/index.html.haml %%WWWDIR%%/app/views/projects/compare/show.html.haml +%%WWWDIR%%/app/views/projects/container_registry/_header_title.html.haml +%%WWWDIR%%/app/views/projects/container_registry/_tag.html.haml +%%WWWDIR%%/app/views/projects/container_registry/index.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/_deploy_key.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/_form.html.haml %%WWWDIR%%/app/views/projects/deploy_keys/index.html.haml @@ -1162,6 +1182,7 @@ %%WWWDIR%%/app/views/projects/graphs/languages.html.haml %%WWWDIR%%/app/views/projects/graphs/show.html.haml %%WWWDIR%%/app/views/projects/group_links/index.html.haml +%%WWWDIR%%/app/views/projects/hooks/_project_hook.html.haml %%WWWDIR%%/app/views/projects/hooks/index.html.haml %%WWWDIR%%/app/views/projects/imports/new.html.haml %%WWWDIR%%/app/views/projects/imports/show.html.haml @@ -1244,7 +1265,6 @@ %%WWWDIR%%/app/views/projects/network/show.json.erb %%WWWDIR%%/app/views/projects/new.html.haml %%WWWDIR%%/app/views/projects/no_repo.html.haml -%%WWWDIR%%/app/views/projects/notes/_commit_discussion.html.haml %%WWWDIR%%/app/views/projects/notes/_diff_notes_with_reply.html.haml %%WWWDIR%%/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml %%WWWDIR%%/app/views/projects/notes/_discussion.html.haml @@ -1255,10 +1275,13 @@ %%WWWDIR%%/app/views/projects/notes/_note.html.haml %%WWWDIR%%/app/views/projects/notes/_notes.html.haml %%WWWDIR%%/app/views/projects/notes/_notes_with_form.html.haml -%%WWWDIR%%/app/views/projects/notes/discussions/_active.html.haml -%%WWWDIR%%/app/views/projects/notes/discussions/_commit.html.haml -%%WWWDIR%%/app/views/projects/notes/discussions/_diff.html.haml -%%WWWDIR%%/app/views/projects/notes/discussions/_outdated.html.haml +%%WWWDIR%%/app/views/projects/notes/discussions/_diff_with_notes.html.haml +%%WWWDIR%%/app/views/projects/notes/discussions/_notes.html.haml +%%WWWDIR%%/app/views/projects/pipelines/_header_title.html.haml +%%WWWDIR%%/app/views/projects/pipelines/_info.html.haml +%%WWWDIR%%/app/views/projects/pipelines/index.html.haml +%%WWWDIR%%/app/views/projects/pipelines/new.html.haml +%%WWWDIR%%/app/views/projects/pipelines/show.html.haml %%WWWDIR%%/app/views/projects/project_members/_group_members.html.haml %%WWWDIR%%/app/views/projects/project_members/_header_title.html.haml %%WWWDIR%%/app/views/projects/project_members/_new_project_member.html.haml @@ -1275,6 +1298,7 @@ %%WWWDIR%%/app/views/projects/remove_fork.js.haml %%WWWDIR%%/app/views/projects/repositories/_download_archive.html.haml %%WWWDIR%%/app/views/projects/repositories/_feed.html.haml +%%WWWDIR%%/app/views/projects/runners/_form.html.haml %%WWWDIR%%/app/views/projects/runners/_runner.html.haml %%WWWDIR%%/app/views/projects/runners/_shared_runners.html.haml %%WWWDIR%%/app/views/projects/runners/_specific_runners.html.haml @@ -1311,6 +1335,10 @@ %%WWWDIR%%/app/views/projects/triggers/_trigger.html.haml %%WWWDIR%%/app/views/projects/triggers/index.html.haml %%WWWDIR%%/app/views/projects/update.js.haml +%%WWWDIR%%/app/views/projects/variables/_content.html.haml +%%WWWDIR%%/app/views/projects/variables/_form.html.haml +%%WWWDIR%%/app/views/projects/variables/_table.html.haml +%%WWWDIR%%/app/views/projects/variables/index.html.haml %%WWWDIR%%/app/views/projects/variables/show.html.haml %%WWWDIR%%/app/views/projects/wikis/_form.html.haml %%WWWDIR%%/app/views/projects/wikis/_header_title.html.haml @@ -1457,6 +1485,7 @@ @(git,,544) %%WWWDIR%%/bin/setup @(git,,544) %%WWWDIR%%/bin/spinach @(git,,544) %%WWWDIR%%/bin/spring +@(git,,544) %%WWWDIR%%/bin/teaspoon @(git,,544) %%WWWDIR%%/bin/upgrade.rb @(git,,544) %%WWWDIR%%/bin/web %%WWWDIR%%/config.ru @@ -1493,11 +1522,11 @@ %%WWWDIR%%/config/initializers/go_get.rb %%WWWDIR%%/config/initializers/gollum.rb %%WWWDIR%%/config/initializers/haml.rb +%%WWWDIR%%/config/initializers/health_check.rb %%WWWDIR%%/config/initializers/inflections.rb %%WWWDIR%%/config/initializers/kaminari_config.rb %%WWWDIR%%/config/initializers/metrics.rb %%WWWDIR%%/config/initializers/mime_types.rb -%%WWWDIR%%/config/initializers/monkey_patch.rb %%WWWDIR%%/config/initializers/mysql_ignore_postgresql_options.rb %%WWWDIR%%/config/initializers/omniauth.rb %%WWWDIR%%/config/initializers/postgresql_limit_fix.rb @@ -1852,21 +1881,42 @@ %%WWWDIR%%/db/migrate/20160329144452_add_index_on_pending_delete_projects.rb %%WWWDIR%%/db/migrate/20160331133914_remove_todos_for_deleted_merge_requests.rb %%WWWDIR%%/db/migrate/20160331223143_remove_twitter_sharing_enabled_from_application_settings.rb +%%WWWDIR%%/db/migrate/20160407120251_add_images_enabled_for_project.rb %%WWWDIR%%/db/migrate/20160412140240_add_repository_checks_enabled_setting.rb +%%WWWDIR%%/db/migrate/20160412173416_add_fields_to_ci_commit.rb +%%WWWDIR%%/db/migrate/20160412173417_update_ci_commit.rb +%%WWWDIR%%/db/migrate/20160412173418_add_ci_commit_indexes.rb +%%WWWDIR%%/db/migrate/20160413115152_add_token_to_web_hooks.rb %%WWWDIR%%/db/migrate/20160415133440_add_shared_runners_text_to_application_settings.rb %%WWWDIR%%/db/migrate/20160419120017_add_metrics_packet_size.rb %%WWWDIR%%/db/migrate/20160421130527_disable_repository_checks.rb +%%WWWDIR%%/db/migrate/20160504091942_add_disabled_oauth_sign_in_sources_to_application_settings.rb +%%WWWDIR%%/db/migrate/20160504112519_add_run_untagged_to_ci_runner.rb +%%WWWDIR%%/db/migrate/20160508194200_remove_wall_enabled_from_projects.rb +%%WWWDIR%%/db/migrate/20160508215820_add_type_to_notes.rb +%%WWWDIR%%/db/migrate/20160508221410_set_type_on_legacy_diff_notes.rb +%%WWWDIR%%/db/migrate/20160509201028_add_health_check_access_token_to_application_settings.rb +%%WWWDIR%%/db/migrate/20160516174813_add_send_user_confirmation_email_to_application_settings.rb +%%WWWDIR%%/db/migrate/20160530150109_add_container_registry_token_expire_delay_to_application_settings.rb %%WWWDIR%%/db/migrate/limits_to_mysql.rb %%WWWDIR%%/db/schema.rb %%WWWDIR%%/db/seeds.rb %%WWWDIR%%/doc/README.md %%WWWDIR%%/doc/administration/auth/README.md %%WWWDIR%%/doc/administration/auth/ldap.md +%%WWWDIR%%/doc/administration/container_registry.md %%WWWDIR%%/doc/administration/environment_variables.md +%%WWWDIR%%/doc/administration/high_availability/README.md +%%WWWDIR%%/doc/administration/high_availability/database.md +%%WWWDIR%%/doc/administration/high_availability/gitlab.md +%%WWWDIR%%/doc/administration/high_availability/load_balancer.md +%%WWWDIR%%/doc/administration/high_availability/nfs.md +%%WWWDIR%%/doc/administration/high_availability/redis.md %%WWWDIR%%/doc/administration/housekeeping.md %%WWWDIR%%/doc/administration/img/housekeeping_settings.png %%WWWDIR%%/doc/administration/repository_checks.md %%WWWDIR%%/doc/administration/restart_gitlab.md +%%WWWDIR%%/doc/administration/troubleshooting/sidekiq.md %%WWWDIR%%/doc/api/README.md %%WWWDIR%%/doc/api/branches.md %%WWWDIR%%/doc/api/build_triggers.md @@ -1903,12 +1953,12 @@ %%WWWDIR%%/doc/ci/build_artifacts/README.md %%WWWDIR%%/doc/ci/build_artifacts/img/build_artifacts_browser.png %%WWWDIR%%/doc/ci/build_artifacts/img/build_artifacts_browser_button.png -%%WWWDIR%%/doc/ci/deployment/README.md %%WWWDIR%%/doc/ci/docker/README.md %%WWWDIR%%/doc/ci/docker/using_docker_build.md %%WWWDIR%%/doc/ci/docker/using_docker_images.md %%WWWDIR%%/doc/ci/enable_or_disable_ci.md %%WWWDIR%%/doc/ci/examples/README.md +%%WWWDIR%%/doc/ci/examples/deployment/README.md %%WWWDIR%%/doc/ci/examples/php.md %%WWWDIR%%/doc/ci/examples/test-and-deploy-python-application-to-heroku.md %%WWWDIR%%/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md @@ -1940,6 +1990,9 @@ %%WWWDIR%%/doc/ci/triggers/img/triggers_page.png %%WWWDIR%%/doc/ci/variables/README.md %%WWWDIR%%/doc/ci/yaml/README.md +%%WWWDIR%%/doc/container_registry/README.md +%%WWWDIR%%/doc/container_registry/img/container_registry.png +%%WWWDIR%%/doc/container_registry/img/project_feature.png %%WWWDIR%%/doc/customization/branded_login_page.md %%WWWDIR%%/doc/customization/branded_login_page/appearance.png %%WWWDIR%%/doc/customization/branded_login_page/custom_sign_in.png @@ -1959,6 +2012,7 @@ %%WWWDIR%%/doc/development/instrumentation.md %%WWWDIR%%/doc/development/migration_style_guide.md %%WWWDIR%%/doc/development/omnibus.md +%%WWWDIR%%/doc/development/performance.md %%WWWDIR%%/doc/development/profiling.md %%WWWDIR%%/doc/development/rake_tasks.md %%WWWDIR%%/doc/development/scss_styleguide.md @@ -2050,6 +2104,7 @@ %%WWWDIR%%/doc/integration/gmail_action_buttons_for_gitlab.md %%WWWDIR%%/doc/integration/google.md %%WWWDIR%%/doc/integration/img/akismet_settings.png +%%WWWDIR%%/doc/integration/img/enabled-oauth-sign-in-sources.png %%WWWDIR%%/doc/integration/img/facebook_api_keys.png %%WWWDIR%%/doc/integration/img/facebook_app_settings.png %%WWWDIR%%/doc/integration/img/facebook_website_url.png @@ -2081,6 +2136,8 @@ %%WWWDIR%%/doc/markdown/img/logo.png %%WWWDIR%%/doc/markdown/markdown.md %%WWWDIR%%/doc/migrate_ci_to_ce/README.md +%%WWWDIR%%/doc/monitoring/health_check.md +%%WWWDIR%%/doc/monitoring/img/health_check_token.png %%WWWDIR%%/doc/monitoring/performance/gitlab_configuration.md %%WWWDIR%%/doc/monitoring/performance/grafana_configuration.md %%WWWDIR%%/doc/monitoring/performance/img/grafana_dashboard_dropdown.png @@ -2153,6 +2210,7 @@ %%WWWDIR%%/doc/security/rack_attack.md %%WWWDIR%%/doc/security/reset_root_password.md %%WWWDIR%%/doc/security/two_factor_authentication.md +%%WWWDIR%%/doc/security/user_email_confirmation.md %%WWWDIR%%/doc/security/user_file_uploads.md %%WWWDIR%%/doc/security/webhooks.md %%WWWDIR%%/doc/ssh/README.md @@ -2204,6 +2262,7 @@ %%WWWDIR%%/doc/update/8.4-to-8.5.md %%WWWDIR%%/doc/update/8.5-to-8.6.md %%WWWDIR%%/doc/update/8.6-to-8.7.md +%%WWWDIR%%/doc/update/8.7-to-8.8.md %%WWWDIR%%/doc/update/README.md %%WWWDIR%%/doc/update/mysql_to_postgresql.md %%WWWDIR%%/doc/update/patch_versions.md @@ -2403,7 +2462,6 @@ %%WWWDIR%%/features/project/commits/commits.feature %%WWWDIR%%/features/project/commits/diff_comments.feature %%WWWDIR%%/features/project/commits/revert.feature -%%WWWDIR%%/features/project/commits/tags.feature %%WWWDIR%%/features/project/commits/user_lookup.feature %%WWWDIR%%/features/project/create.feature %%WWWDIR%%/features/project/deploy_keys.feature @@ -2493,7 +2551,6 @@ %%WWWDIR%%/features/steps/project/commits/commits.rb %%WWWDIR%%/features/steps/project/commits/diff_comments.rb %%WWWDIR%%/features/steps/project/commits/revert.rb -%%WWWDIR%%/features/steps/project/commits/tags.rb %%WWWDIR%%/features/steps/project/commits/user_lookup.rb %%WWWDIR%%/features/steps/project/create.rb %%WWWDIR%%/features/steps/project/deploy_keys.rb @@ -2560,6 +2617,8 @@ %%WWWDIR%%/fixtures/emojis/digests.json %%WWWDIR%%/fixtures/emojis/generate_aliases.rb %%WWWDIR%%/fixtures/emojis/index.json +%%WWWDIR%%/generator_templates/active_record/migration/create_table_migration.rb +%%WWWDIR%%/generator_templates/active_record/migration/migration.rb %%WWWDIR%%/lib/api/api.rb %%WWWDIR%%/lib/api/api_guard.rb %%WWWDIR%%/lib/api/branches.rb @@ -2569,6 +2628,7 @@ %%WWWDIR%%/lib/api/deploy_keys.rb %%WWWDIR%%/lib/api/entities.rb %%WWWDIR%%/lib/api/files.rb +%%WWWDIR%%/lib/api/gitignores.rb %%WWWDIR%%/lib/api/group_members.rb %%WWWDIR%%/lib/api/groups.rb %%WWWDIR%%/lib/api/helpers.rb @@ -2590,6 +2650,7 @@ %%WWWDIR%%/lib/api/services.rb %%WWWDIR%%/lib/api/session.rb %%WWWDIR%%/lib/api/settings.rb +%%WWWDIR%%/lib/api/subscriptions.rb %%WWWDIR%%/lib/api/system_hooks.rb %%WWWDIR%%/lib/api/tags.rb %%WWWDIR%%/lib/api/triggers.rb @@ -2602,6 +2663,7 @@ %%WWWDIR%%/lib/backup/files.rb %%WWWDIR%%/lib/backup/lfs.rb %%WWWDIR%%/lib/backup/manager.rb +%%WWWDIR%%/lib/backup/registry.rb %%WWWDIR%%/lib/backup/repository.rb %%WWWDIR%%/lib/backup/uploads.rb %%WWWDIR%%/lib/banzai.rb @@ -2616,6 +2678,7 @@ %%WWWDIR%%/lib/banzai/filter/external_link_filter.rb %%WWWDIR%%/lib/banzai/filter/gollum_tags_filter.rb %%WWWDIR%%/lib/banzai/filter/image_link_filter.rb +%%WWWDIR%%/lib/banzai/filter/inline_diff_filter.rb %%WWWDIR%%/lib/banzai/filter/issue_reference_filter.rb %%WWWDIR%%/lib/banzai/filter/label_reference_filter.rb %%WWWDIR%%/lib/banzai/filter/markdown_filter.rb @@ -2666,8 +2729,13 @@ %%WWWDIR%%/lib/ci/gitlab_ci_yaml_processor.rb %%WWWDIR%%/lib/ci/model.rb %%WWWDIR%%/lib/ci/static_model.rb -%%WWWDIR%%/lib/ci/status.rb %%WWWDIR%%/lib/ci/version_info.rb +%%WWWDIR%%/lib/container_registry/blob.rb +%%WWWDIR%%/lib/container_registry/client.rb +%%WWWDIR%%/lib/container_registry/config.rb +%%WWWDIR%%/lib/container_registry/registry.rb +%%WWWDIR%%/lib/container_registry/repository.rb +%%WWWDIR%%/lib/container_registry/tag.rb %%WWWDIR%%/lib/disable_email_interceptor.rb %%WWWDIR%%/lib/event_filter.rb %%WWWDIR%%/lib/extracts_path.rb @@ -2701,6 +2769,7 @@ %%WWWDIR%%/lib/gitlab/contributor.rb %%WWWDIR%%/lib/gitlab/current_settings.rb %%WWWDIR%%/lib/gitlab/database.rb +%%WWWDIR%%/lib/gitlab/database/migration_helpers.rb %%WWWDIR%%/lib/gitlab/devise_failure.rb %%WWWDIR%%/lib/gitlab/diff/file.rb %%WWWDIR%%/lib/gitlab/diff/highlight.rb @@ -2731,8 +2800,10 @@ %%WWWDIR%%/lib/gitlab/git_post_receive.rb %%WWWDIR%%/lib/gitlab/git_ref_validator.rb %%WWWDIR%%/lib/gitlab/github_import/base_formatter.rb +%%WWWDIR%%/lib/gitlab/github_import/branch_formatter.rb %%WWWDIR%%/lib/gitlab/github_import/client.rb %%WWWDIR%%/lib/gitlab/github_import/comment_formatter.rb +%%WWWDIR%%/lib/gitlab/github_import/hook_formatter.rb %%WWWDIR%%/lib/gitlab/github_import/importer.rb %%WWWDIR%%/lib/gitlab/github_import/issue_formatter.rb %%WWWDIR%%/lib/gitlab/github_import/label_formatter.rb @@ -2740,6 +2811,7 @@ %%WWWDIR%%/lib/gitlab/github_import/project_creator.rb %%WWWDIR%%/lib/gitlab/github_import/pull_request_formatter.rb %%WWWDIR%%/lib/gitlab/github_import/wiki_formatter.rb +%%WWWDIR%%/lib/gitlab/gitignore.rb %%WWWDIR%%/lib/gitlab/gitlab_import/client.rb %%WWWDIR%%/lib/gitlab/gitlab_import/importer.rb %%WWWDIR%%/lib/gitlab/gitlab_import/project_creator.rb @@ -2757,7 +2829,6 @@ %%WWWDIR%%/lib/gitlab/identifier.rb %%WWWDIR%%/lib/gitlab/import_formatter.rb %%WWWDIR%%/lib/gitlab/import_sources.rb -%%WWWDIR%%/lib/gitlab/import_url.rb %%WWWDIR%%/lib/gitlab/incoming_email.rb %%WWWDIR%%/lib/gitlab/issues_labels.rb %%WWWDIR%%/lib/gitlab/key_fingerprint.rb @@ -2806,6 +2877,8 @@ %%WWWDIR%%/lib/gitlab/saml/auth_hash.rb %%WWWDIR%%/lib/gitlab/saml/config.rb %%WWWDIR%%/lib/gitlab/saml/user.rb +%%WWWDIR%%/lib/gitlab/sanitizers/svg.rb +%%WWWDIR%%/lib/gitlab/sanitizers/svg/whitelist.rb %%WWWDIR%%/lib/gitlab/search_results.rb %%WWWDIR%%/lib/gitlab/seeder.rb %%WWWDIR%%/lib/gitlab/sherlock.rb @@ -2826,12 +2899,15 @@ %%WWWDIR%%/lib/gitlab/upgrader.rb %%WWWDIR%%/lib/gitlab/uploads_transfer.rb %%WWWDIR%%/lib/gitlab/url_builder.rb +%%WWWDIR%%/lib/gitlab/url_sanitizer.rb %%WWWDIR%%/lib/gitlab/user_access.rb %%WWWDIR%%/lib/gitlab/utils.rb %%WWWDIR%%/lib/gitlab/version_info.rb %%WWWDIR%%/lib/gitlab/visibility_level.rb %%WWWDIR%%/lib/gitlab/workhorse.rb %%WWWDIR%%/lib/gt_one_coercion.rb +%%WWWDIR%%/lib/json_web_token/rsa_token.rb +%%WWWDIR%%/lib/json_web_token/token.rb %%WWWDIR%%/lib/omni_auth/request_forgery_protection.rb %%WWWDIR%%/lib/repository_cache.rb %%WWWDIR%%/lib/rouge/formatters/html_gitlab.rb @@ -2842,6 +2918,7 @@ %%WWWDIR%%/lib/support/logrotate/gitlab %%WWWDIR%%/lib/support/nginx/gitlab %%WWWDIR%%/lib/support/nginx/gitlab-ssl +%%WWWDIR%%/lib/support/nginx/registry-ssl %%WWWDIR%%/lib/tasks/brakeman.rake %%WWWDIR%%/lib/tasks/cache.rake %%WWWDIR%%/lib/tasks/ci/cleanup.rake @@ -2866,6 +2943,7 @@ %%WWWDIR%%/lib/tasks/gitlab/test.rake %%WWWDIR%%/lib/tasks/gitlab/two_factor.rake %%WWWDIR%%/lib/tasks/gitlab/update_commit_count.rake +%%WWWDIR%%/lib/tasks/gitlab/update_gitignore.rake %%WWWDIR%%/lib/tasks/gitlab/web_hook.rake %%WWWDIR%%/lib/tasks/grape.rake %%WWWDIR%%/lib/tasks/migrate/add_limits_mysql.rake @@ -2886,6 +2964,7 @@ %%WWWDIR%%/public/422.html %%WWWDIR%%/public/500.html %%WWWDIR%%/public/502.html +%%WWWDIR%%/public/503.html %%WWWDIR%%/public/apple-touch-icon-precomposed.png %%WWWDIR%%/public/apple-touch-icon.png %%WWWDIR%%/public/ci/build-canceled.svg @@ -2918,6 +2997,7 @@ %%WWWDIR%%/spec/controllers/groups/milestones_controller_spec.rb %%WWWDIR%%/spec/controllers/groups/notification_settings_controller_spec.rb %%WWWDIR%%/spec/controllers/groups_controller_spec.rb +%%WWWDIR%%/spec/controllers/health_check_controller_spec.rb %%WWWDIR%%/spec/controllers/help_controller_spec.rb %%WWWDIR%%/spec/controllers/import/bitbucket_controller_spec.rb %%WWWDIR%%/spec/controllers/import/fogbugz_controller_spec.rb @@ -2956,6 +3036,7 @@ %%WWWDIR%%/spec/controllers/projects/tree_controller_spec.rb %%WWWDIR%%/spec/controllers/projects/uploads_controller_spec.rb %%WWWDIR%%/spec/controllers/projects_controller_spec.rb +%%WWWDIR%%/spec/controllers/registrations_controller_spec.rb %%WWWDIR%%/spec/controllers/root_controller_spec.rb %%WWWDIR%%/spec/controllers/sent_notifications_controller_spec.rb %%WWWDIR%%/spec/controllers/sessions_controller_spec.rb @@ -3015,6 +3096,7 @@ %%WWWDIR%%/spec/factories_spec.rb %%WWWDIR%%/spec/features/admin/admin_builds_spec.rb %%WWWDIR%%/spec/features/admin/admin_disables_two_factor_spec.rb +%%WWWDIR%%/spec/features/admin/admin_health_check_spec.rb %%WWWDIR%%/spec/features/admin/admin_hooks_spec.rb %%WWWDIR%%/spec/features/admin/admin_projects_spec.rb %%WWWDIR%%/spec/features/admin/admin_runners_spec.rb @@ -3027,7 +3109,9 @@ %%WWWDIR%%/spec/features/builds_spec.rb %%WWWDIR%%/spec/features/ci_lint_spec.rb %%WWWDIR%%/spec/features/commits_spec.rb -%%WWWDIR%%/spec/features/dashboard_filter_spec.rb +%%WWWDIR%%/spec/features/container_registry_spec.rb +%%WWWDIR%%/spec/features/dashboard/label_filter_spec.rb +%%WWWDIR%%/spec/features/dashboard/user_filters_projects_spec.rb %%WWWDIR%%/spec/features/dashboard_issues_spec.rb %%WWWDIR%%/spec/features/dashboard_milestones_spec.rb %%WWWDIR%%/spec/features/gitlab_flavored_markdown_spec.rb @@ -3047,18 +3131,26 @@ %%WWWDIR%%/spec/features/markdown_spec.rb %%WWWDIR%%/spec/features/merge_requests/cherry_pick_spec.rb %%WWWDIR%%/spec/features/merge_requests/create_new_mr_spec.rb +%%WWWDIR%%/spec/features/merge_requests/created_from_fork_spec.rb %%WWWDIR%%/spec/features/merge_requests/edit_mr_spec.rb %%WWWDIR%%/spec/features/merge_requests/filter_by_milestone_spec.rb %%WWWDIR%%/spec/features/merge_requests/merge_when_build_succeeds_spec.rb +%%WWWDIR%%/spec/features/merge_requests/toggle_whitespace_changes.rb %%WWWDIR%%/spec/features/merge_requests/user_lists_merge_requests_spec.rb +%%WWWDIR%%/spec/features/milestone_spec.rb %%WWWDIR%%/spec/features/notes_on_merge_requests_spec.rb %%WWWDIR%%/spec/features/participants_autocomplete_spec.rb %%WWWDIR%%/spec/features/password_reset_spec.rb +%%WWWDIR%%/spec/features/pipelines_spec.rb %%WWWDIR%%/spec/features/profile_spec.rb %%WWWDIR%%/spec/features/profiles/oauth_applications_spec.rb %%WWWDIR%%/spec/features/profiles/preferences_spec.rb +%%WWWDIR%%/spec/features/project/shortcuts_spec.rb %%WWWDIR%%/spec/features/projects/badges/list_spec.rb +%%WWWDIR%%/spec/features/projects/commit/builds_spec.rb %%WWWDIR%%/spec/features/projects/commits/cherry_pick_spec.rb +%%WWWDIR%%/spec/features/projects/developer_views_empty_project_instructions_spec.rb +%%WWWDIR%%/spec/features/projects/files/gitignore_dropdown_spec.rb %%WWWDIR%%/spec/features/projects/files/project_owner_creates_license_file_spec.rb %%WWWDIR%%/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb %%WWWDIR%%/spec/features/projects/members/anonymous_user_sees_members_spec.rb @@ -3080,6 +3172,10 @@ %%WWWDIR%%/spec/features/security/project/snippet/private_access_spec.rb %%WWWDIR%%/spec/features/security/project/snippet/public_access_spec.rb %%WWWDIR%%/spec/features/signup_spec.rb +%%WWWDIR%%/spec/features/tags/master_creates_tag_spec.rb +%%WWWDIR%%/spec/features/tags/master_deletes_tag_spec.rb +%%WWWDIR%%/spec/features/tags/master_updates_tag_spec.rb +%%WWWDIR%%/spec/features/tags/master_views_tags_spec.rb %%WWWDIR%%/spec/features/task_lists_spec.rb %%WWWDIR%%/spec/features/todos/todos_spec.rb %%WWWDIR%%/spec/features/triggers_spec.rb @@ -3100,6 +3196,8 @@ %%WWWDIR%%/spec/fixtures/banana_sample.gif %%WWWDIR%%/spec/fixtures/ci_build_artifacts.zip %%WWWDIR%%/spec/fixtures/ci_build_artifacts_metadata.gz +%%WWWDIR%%/spec/fixtures/container_registry/config_blob.json +%%WWWDIR%%/spec/fixtures/container_registry/tag_manifest.json %%WWWDIR%%/spec/fixtures/dk.png %%WWWDIR%%/spec/fixtures/doc_sample.txt %%WWWDIR%%/spec/fixtures/emails/android_gmail.eml @@ -3126,6 +3224,8 @@ %%WWWDIR%%/spec/fixtures/markdown.md.erb %%WWWDIR%%/spec/fixtures/parallel_diff_result.yml %%WWWDIR%%/spec/fixtures/rails_sample.jpg +%%WWWDIR%%/spec/fixtures/sanitized.svg +%%WWWDIR%%/spec/fixtures/unsanitized.svg %%WWWDIR%%/spec/helpers/application_helper_spec.rb %%WWWDIR%%/spec/helpers/auth_helper_spec.rb %%WWWDIR%%/spec/helpers/blob_helper_spec.rb @@ -3200,6 +3300,7 @@ %%WWWDIR%%/spec/lib/banzai/filter/external_link_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/gollum_tags_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/image_link_filter_spec.rb +%%WWWDIR%%/spec/lib/banzai/filter/inline_diff_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/issue_reference_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/label_reference_filter_spec.rb %%WWWDIR%%/spec/lib/banzai/filter/merge_request_reference_filter_spec.rb @@ -3223,7 +3324,10 @@ %%WWWDIR%%/spec/lib/ci/ansi2html_spec.rb %%WWWDIR%%/spec/lib/ci/charts_spec.rb %%WWWDIR%%/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb -%%WWWDIR%%/spec/lib/ci/status_spec.rb +%%WWWDIR%%/spec/lib/container_registry/blob_spec.rb +%%WWWDIR%%/spec/lib/container_registry/registry_spec.rb +%%WWWDIR%%/spec/lib/container_registry/repository_spec.rb +%%WWWDIR%%/spec/lib/container_registry/tag_spec.rb %%WWWDIR%%/spec/lib/disable_email_interceptor_spec.rb %%WWWDIR%%/spec/lib/extracts_path_spec.rb %%WWWDIR%%/spec/lib/file_size_validator_spec.rb @@ -3243,6 +3347,7 @@ %%WWWDIR%%/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb %%WWWDIR%%/spec/lib/gitlab/closing_issue_extractor_spec.rb %%WWWDIR%%/spec/lib/gitlab/color_schemes_spec.rb +%%WWWDIR%%/spec/lib/gitlab/database/migration_helpers_spec.rb %%WWWDIR%%/spec/lib/gitlab/database_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/file_spec.rb %%WWWDIR%%/spec/lib/gitlab/diff/highlight_spec.rb @@ -3260,14 +3365,17 @@ %%WWWDIR%%/spec/lib/gitlab/gfm/uploads_rewriter_spec.rb %%WWWDIR%%/spec/lib/gitlab/git_access_spec.rb %%WWWDIR%%/spec/lib/gitlab/git_access_wiki_spec.rb +%%WWWDIR%%/spec/lib/gitlab/github_import/branch_formatter_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/client_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/comment_formatter_spec.rb +%%WWWDIR%%/spec/lib/gitlab/github_import/hook_formatter_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/issue_formatter_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/label_formatter_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/milestone_formatter_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/project_creator_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb %%WWWDIR%%/spec/lib/gitlab/github_import/wiki_formatter_spec.rb +%%WWWDIR%%/spec/lib/gitlab/gitignore_spec.rb %%WWWDIR%%/spec/lib/gitlab/gitlab_import/client_spec.rb %%WWWDIR%%/spec/lib/gitlab/gitlab_import/project_creator_spec.rb %%WWWDIR%%/spec/lib/gitlab/gitorious_import/project_creator_spec.rb @@ -3275,7 +3383,6 @@ %%WWWDIR%%/spec/lib/gitlab/google_code_import/importer_spec.rb %%WWWDIR%%/spec/lib/gitlab/google_code_import/project_creator_spec.rb %%WWWDIR%%/spec/lib/gitlab/highlight_spec.rb -%%WWWDIR%%/spec/lib/gitlab/import_url_spec.rb %%WWWDIR%%/spec/lib/gitlab/incoming_email_spec.rb %%WWWDIR%%/spec/lib/gitlab/key_fingerprint_spec.rb %%WWWDIR%%/spec/lib/gitlab/ldap/access_spec.rb @@ -3323,9 +3430,12 @@ %%WWWDIR%%/spec/lib/gitlab/upgrader_spec.rb %%WWWDIR%%/spec/lib/gitlab/uploads_transfer_spec.rb %%WWWDIR%%/spec/lib/gitlab/url_builder_spec.rb +%%WWWDIR%%/spec/lib/gitlab/url_sanitizer_spec.rb %%WWWDIR%%/spec/lib/gitlab/version_info_spec.rb %%WWWDIR%%/spec/lib/gitlab/workhorse_spec.rb %%WWWDIR%%/spec/lib/gitlab_spec.rb +%%WWWDIR%%/spec/lib/json_web_token/rsa_token_spec.rb +%%WWWDIR%%/spec/lib/json_web_token/token_spec.rb %%WWWDIR%%/spec/lib/repository_cache_spec.rb %%WWWDIR%%/spec/mailers/abuse_report_mailer_spec.rb %%WWWDIR%%/spec/mailers/emails/builds_spec.rb @@ -3352,6 +3462,7 @@ %%WWWDIR%%/spec/models/concerns/issuable_spec.rb %%WWWDIR%%/spec/models/concerns/mentionable_spec.rb %%WWWDIR%%/spec/models/concerns/milestoneish_spec.rb +%%WWWDIR%%/spec/models/concerns/statuseable_spec.rb %%WWWDIR%%/spec/models/concerns/strip_attribute_spec.rb %%WWWDIR%%/spec/models/concerns/subscribable_spec.rb %%WWWDIR%%/spec/models/concerns/token_authenticatable_spec.rb @@ -3374,6 +3485,7 @@ %%WWWDIR%%/spec/models/key_spec.rb %%WWWDIR%%/spec/models/label_link_spec.rb %%WWWDIR%%/spec/models/label_spec.rb +%%WWWDIR%%/spec/models/legacy_diff_note_spec.rb %%WWWDIR%%/spec/models/member_spec.rb %%WWWDIR%%/spec/models/members/group_member_spec.rb %%WWWDIR%%/spec/models/members/project_member_spec.rb @@ -3429,11 +3541,12 @@ %%WWWDIR%%/spec/requests/api/api_helpers_spec.rb %%WWWDIR%%/spec/requests/api/branches_spec.rb %%WWWDIR%%/spec/requests/api/builds_spec.rb -%%WWWDIR%%/spec/requests/api/commit_status_spec.rb +%%WWWDIR%%/spec/requests/api/commit_statuses_spec.rb %%WWWDIR%%/spec/requests/api/commits_spec.rb %%WWWDIR%%/spec/requests/api/doorkeeper_access_spec.rb %%WWWDIR%%/spec/requests/api/files_spec.rb %%WWWDIR%%/spec/requests/api/fork_spec.rb +%%WWWDIR%%/spec/requests/api/gitignores_spec.rb %%WWWDIR%%/spec/requests/api/group_members_spec.rb %%WWWDIR%%/spec/requests/api/groups_spec.rb %%WWWDIR%%/spec/requests/api/internal_spec.rb @@ -3462,10 +3575,12 @@ %%WWWDIR%%/spec/requests/ci/api/builds_spec.rb %%WWWDIR%%/spec/requests/ci/api/runners_spec.rb %%WWWDIR%%/spec/requests/ci/api/triggers_spec.rb +%%WWWDIR%%/spec/requests/jwt_controller_spec.rb %%WWWDIR%%/spec/routing/admin_routing_spec.rb %%WWWDIR%%/spec/routing/notifications_routing_spec.rb %%WWWDIR%%/spec/routing/project_routing_spec.rb %%WWWDIR%%/spec/routing/routing_spec.rb +%%WWWDIR%%/spec/services/auth/container_registry_authentication_service_spec.rb %%WWWDIR%%/spec/services/ci/create_builds_service_spec.rb %%WWWDIR%%/spec/services/ci/create_trigger_request_service_spec.rb %%WWWDIR%%/spec/services/ci/image_for_build_service_spec.rb @@ -3473,6 +3588,7 @@ %%WWWDIR%%/spec/services/create_commit_builds_service_spec.rb %%WWWDIR%%/spec/services/create_release_service_spec.rb %%WWWDIR%%/spec/services/create_snippet_service_spec.rb +%%WWWDIR%%/spec/services/create_tag_service_spec.rb %%WWWDIR%%/spec/services/delete_tag_service_spec.rb %%WWWDIR%%/spec/services/delete_user_service_spec.rb %%WWWDIR%%/spec/services/destroy_group_service_spec.rb @@ -3487,6 +3603,8 @@ %%WWWDIR%%/spec/services/issues/create_service_spec.rb %%WWWDIR%%/spec/services/issues/move_service_spec.rb %%WWWDIR%%/spec/services/issues/update_service_spec.rb +%%WWWDIR%%/spec/services/merge_requests/add_todo_when_build_fails_service_spec.rb +%%WWWDIR%%/spec/services/merge_requests/build_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/close_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/create_service_spec.rb %%WWWDIR%%/spec/services/merge_requests/merge_service_spec.rb @@ -3592,9 +3710,9 @@ %%WWWDIR%%/vendor/assets/javascripts/jquery.endless-scroll.js %%WWWDIR%%/vendor/assets/javascripts/jquery.highlight.js %%WWWDIR%%/vendor/assets/javascripts/jquery.nicescroll.js +%%WWWDIR%%/vendor/assets/javascripts/jquery.scrollTo.js %%WWWDIR%%/vendor/assets/javascripts/jquery.waitforimages.js %%WWWDIR%%/vendor/assets/javascripts/latinise.js -%%WWWDIR%%/vendor/assets/stylesheets/animate.css %%WWWDIR%%/vendor/assets/stylesheets/cropper.css @owner git @group www @@ -3611,11 +3729,15 @@ @dir %%WWWDIR%%/shared/artifacts/tmp/cache @dir %%WWWDIR%%/shared/artifacts/tmp/uploads @dir %%WWWDIR%%/shared/lfs-objects +@dir %%WWWDIR%%/shared/registry @dir %%WWWDIR%%/tmp @dir %%WWWDIR%%/tmp/cache @dir %%WWWDIR%%/tmp/pids @dir %%WWWDIR%%/tmp/sessions @dir %%WWWDIR%%/tmp/sockets +@dir %%WWWDIR%%/vendor/gitignore/Global +@owner root +@group wheel @dir /home @dir(git,git,) /home/git @dir(,git,2770) /home/git/repositories diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile index 0026ebc90ba..4e99618c85a 100644 --- a/www/p5-CGI/Makefile +++ b/www/p5-CGI/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= CGI -PORTVERSION= 4.28 +PORTVERSION= 4.31 CATEGORIES= www perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:LEEJO diff --git a/www/p5-CGI/distinfo b/www/p5-CGI/distinfo index 83c509b9ed4..cca4b70d993 100644 --- a/www/p5-CGI/distinfo +++ b/www/p5-CGI/distinfo @@ -1,2 +1,3 @@ -SHA256 (CGI-4.28.tar.gz) = 1297d3ed6616cacb4eb57860e3e743f3890111e7a63ca08849930f42f1360532 -SIZE (CGI-4.28.tar.gz) = 195800 +TIMESTAMP = 1466520223 +SHA256 (CGI-4.31.tar.gz) = dee34f45525efb698d02c56ba2458a72acc34c4dcb05344706b587840b4e8c99 +SIZE (CGI-4.31.tar.gz) = 197018 diff --git a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile index c20b3b62a65..9aead107f82 100644 --- a/www/p5-Catalyst-Controller-HTML-FormFu/Makefile +++ b/www/p5-Catalyst-Controller-HTML-FormFu/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Catalyst-Controller-HTML-FormFu -PORTVERSION= 1.00 -PORTREVISION= 1 +PORTVERSION= 2.00 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-Catalyst-Controller-HTML-FormFu/distinfo b/www/p5-Catalyst-Controller-HTML-FormFu/distinfo index 42dad4268c9..d5c46323471 100644 --- a/www/p5-Catalyst-Controller-HTML-FormFu/distinfo +++ b/www/p5-Catalyst-Controller-HTML-FormFu/distinfo @@ -1,2 +1,3 @@ -SHA256 (Catalyst-Controller-HTML-FormFu-1.00.tar.gz) = 84329b287716cdc6d3c5a9ee185458cd2ce7abd9d902eac1c6240ef17572f12c -SIZE (Catalyst-Controller-HTML-FormFu-1.00.tar.gz) = 30694 +TIMESTAMP = 1466520275 +SHA256 (Catalyst-Controller-HTML-FormFu-2.00.tar.gz) = 54cab2a5fcb20119c23b2c803e4c6f551ac921ed286ef3b12bf2dbe1b751c66f +SIZE (Catalyst-Controller-HTML-FormFu-2.00.tar.gz) = 31711 diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile index 1dea0e8346d..e3718ef31c9 100644 --- a/www/p5-Catalyst-Runtime/Makefile +++ b/www/p5-Catalyst-Runtime/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Catalyst-Runtime -PORTVERSION= 5.90104 +PORTVERSION= 5.90105 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-Catalyst-Runtime/distinfo b/www/p5-Catalyst-Runtime/distinfo index 3ef0a446f54..491eafe5f5c 100644 --- a/www/p5-Catalyst-Runtime/distinfo +++ b/www/p5-Catalyst-Runtime/distinfo @@ -1,2 +1,3 @@ -SHA256 (Catalyst-Runtime-5.90104.tar.gz) = 91d551944beb3a0ae8635c78d5f2e1583ef1e7873d5c8ee407e2f64380ad870b -SIZE (Catalyst-Runtime-5.90104.tar.gz) = 385656 +TIMESTAMP = 1466520335 +SHA256 (Catalyst-Runtime-5.90105.tar.gz) = 61b4fb20f95a45ae737180cc6cb063e1ad9e8980554ffc38c646cd612fe9ecb3 +SIZE (Catalyst-Runtime-5.90105.tar.gz) = 387613 diff --git a/www/p5-HTML-FormFu/Makefile b/www/p5-HTML-FormFu/Makefile index 862074ca925..0c5a9690d5b 100644 --- a/www/p5-HTML-FormFu/Makefile +++ b/www/p5-HTML-FormFu/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= HTML-FormFu -PORTVERSION= 2.01 -PORTREVISION= 1 +PORTVERSION= 2.02 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-HTML-FormFu/distinfo b/www/p5-HTML-FormFu/distinfo index 15ad18f9c71..7b574f38763 100644 --- a/www/p5-HTML-FormFu/distinfo +++ b/www/p5-HTML-FormFu/distinfo @@ -1,2 +1,3 @@ -SHA256 (HTML-FormFu-2.01.tar.gz) = 5cffd87addca1cf940d0421e0a15ace374486e3d1d25a4ec2d86f1829ea5713b -SIZE (HTML-FormFu-2.01.tar.gz) = 337865 +TIMESTAMP = 1466520399 +SHA256 (HTML-FormFu-2.02.tar.gz) = 731329e0840cfae92ea4978afd03e70927cd5e38ea3a523c6f7e14579ec469a0 +SIZE (HTML-FormFu-2.02.tar.gz) = 300479 diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile index d1dea035568..7183a70d2c6 100644 --- a/www/p5-WWW-Search/Makefile +++ b/www/p5-WWW-Search/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= WWW-Search -PORTVERSION= 2.515 +PORTVERSION= 2.516 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/www/p5-WWW-Search/distinfo b/www/p5-WWW-Search/distinfo index 0350122466e..eeacc73b811 100644 --- a/www/p5-WWW-Search/distinfo +++ b/www/p5-WWW-Search/distinfo @@ -1,2 +1,3 @@ -SHA256 (WWW-Search-2.515.tar.gz) = ce5b7ff792f1ccccda27f3d8a566d0cd7dd7a304c45d5b178fcdab615f93a24b -SIZE (WWW-Search-2.515.tar.gz) = 94715 +TIMESTAMP = 1466520443 +SHA256 (WWW-Search-2.516.tar.gz) = f9d680c065346fafc1f9317caf12ddefee01289926244bbac9f33139729622ed +SIZE (WWW-Search-2.516.tar.gz) = 94761 diff --git a/www/p5-WWW-Search/files/patch-Makefile.PL b/www/p5-WWW-Search/files/patch-Makefile.PL deleted file mode 100644 index 9863a365553..00000000000 --- a/www/p5-WWW-Search/files/patch-Makefile.PL +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.PL.orig 2015-11-28 15:17:09 UTC -+++ Makefile.PL -@@ -116,11 +116,11 @@ if (0 && $ENV{MTHURN_PERL_DEV}) - { - print " EEE did not find DIRFILESEP in Makefile\n"; - } # if -- if ($s !~ s/(pm_to_blib\(){{\@ARGV}}/$1 . '{@ARGV}'/e) -+ if ($s !~ s/(pm_to_blib\()\{\{\@ARGV\}\}/$1 . '{@ARGV}'/e) - { - print " EEE did not find pm_to_blib@ARGV in Makefile\n"; - } # if -- if ($s !~ s/(from_to\s+=>\s+){{\@ARGV}}/$1 . '{@ARGV}'/e) -+ if ($s !~ s/(from_to\s+=>\s+)\{\{\@ARGV\}\}/$1 . '{@ARGV}'/e) - { - print " EEE did not find from_to@ARGV in Makefile\n"; - } # if diff --git a/www/redmine/Makefile b/www/redmine/Makefile index e285d9e1ee7..181e9f0e0c3 100644 --- a/www/redmine/Makefile +++ b/www/redmine/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= redmine -PORTVERSION= 2.6.9 -PORTREVISION= 2 +PORTVERSION= 3.2.3 CATEGORIES= www MASTER_SITES= http://www.redmine.org/releases/ @@ -13,21 +12,23 @@ COMMENT= Flexible project management web application LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING -RUN_DEPENDS= rubygem-builder>=3.0.0:devel/rubygem-builder \ - rubygem-bundler>=0:sysutils/rubygem-bundler \ - rubygem-coderay>=1.0.9:textproc/rubygem-coderay \ - rubygem-i18n>=0.7.0:devel/rubygem-i18n \ - rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \ +RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \ + rubygem-rails4>=4.2.5:www/rubygem-rails4 \ + rubygem-jquery-rails4>=3.1.4:www/rubygem-jquery-rails4 \ + rubygem-coderay>=1.1.0:textproc/rubygem-coderay \ + rubygem-builder>=3.0.4:devel/rubygem-builder \ + rubygem-request_store>=1.0.5:devel/rubygem-request_store \ rubygem-mime-types>=0:misc/rubygem-mime-types \ - rubygem-net-ldap>=0.3.1:net/rubygem-net-ldap \ - rubygem-rack-openid>=0:www/rubygem-rack-openid \ - rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \ - rubygem-rails>=3.2.22:www/rubygem-rails \ + rubygem-mimemagic>=0:misc/rubygem-mimemagic \ + rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \ + rubygem-actionpack-action_caching>=0:devel/rubygem-actionpack-action_caching \ + rubygem-actionpack-xml_parser>=0:textproc/rubygem-actionpack-xml_parser \ + rubygem-roadie-rails>=0:mail/rubygem-roadie-rails \ + rubygem-rbpdf>=1.19.0:print/rubygem-rbpdf \ rubygem-rake>=0:devel/rubygem-rake \ - rubygem-rbpdf>=0:print/rubygem-rbpdf \ - rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet \ - rubygem-request_store>=1.1.0:devel/rubygem-request_store \ - rubygem-rubytree>=0:devel/rubygem-rubytree + rubygem-ruby-openid>=2.3.0:net/rubygem-ruby-openid \ + rubygem-rack-openid>=0:www/rubygem-rack-openid \ + rubygem-net-ldap>=0.3.1:net/rubygem-net-ldap NO_ARCH= yes NO_BUILD= yes @@ -39,22 +40,24 @@ GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} SUB_LIST= RUBY_NAME=${RUBY_NAME} -OPTIONS_DEFINE= MYSQL MYSQL2 POSTGRESQL RMAGIC -OPTIONS_DEFAULT=MYSQL2 RMAGIC THIN +OPTIONS_DEFINE= MYSQL POSTGRESQL LDAP MARKDOWN RMAGIC +OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN OPTIONS_SINGLE= WWWSERVER OPTIONS_SINGLE_WWWSERVER= THIN PASSENGER OPTIONS_SUB= yes -POSTGRESQL_DESC=Enable PostgreSQL support +POSTGRESQL_DESC= Enable PostgreSQL support +LDAP_DESC= Enable LDAP Authentification +MARKDOWN_DESC= Enable Markdown support RMAGIC_DESC= Enable Gantt charts support THIN_DESC= Use Thin WEB server PASSENGER_DESC= Use Apache/Nginx WEB server -MYSQL2_DESC= MySQL database support (via mysql2 rubygem) -NO_OPTIONS_SORT=yes +MYSQL_DESC= MySQL database support (via mysql2 rubygem) +NO_OPTIONS_SORT= yes -MYSQL_RUN_DEPENDS= rubygem-mysql>=2.8.1:databases/rubygem-mysql -MYSQL2_RUN_DEPENDS= rubygem-mysql2>=0:databases/rubygem-mysql2 +MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.3.11:databases/rubygem-mysql2 PASSENGER_RUN_DEPENDS= passenger-config:www/rubygem-passenger -POSTGRESQL_RUN_DEPENDS= rubygem-pg>=0:databases/rubygem-pg +POSTGRESQL_RUN_DEPENDS= rubygem-pg>=0.18.1:databases/rubygem-pg +MARKDOWN_RUN_DEPENDS= rubygem-redcarpet>=3.3.2:textproc/rubygem-redcarpet RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.13.4:graphics/rubygem-rmagick THIN_RUN_DEPENDS= thin:www/rubygem-thin THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} @@ -63,9 +66,11 @@ THIN_VARS= USE_RC_SUBR=redmine post-extract: @${RM} ${WRKSRC}/.hgignore ${WRKSRC}/.travis.yml @${MV} ${WRKSRC}/config/settings.yml ${WRKSRC}/config/settings.yml.sample + @${MV} ${WRKSRC}/config/database.yml.example ${WRKSRC}/config/database.yml.sample + @${TOUCH} ${WRKSRC}/log/development.log post-patch: - @${FIND} ${WRKSRC} -name '*.bak' -o -name '*.orig' -delete + @${FIND} ${WRKSRC} -name '*.bak' -delete pre-install: ${MKDIR} ${WRKSRC}/public/plugin_assets @@ -76,6 +81,21 @@ do-install: ${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} +do-install-MYSQL-on: + ${CP} ${FILESDIR}/mysql.rb ${STAGEDIR}${WWWDIR}/bundler.d + +do-install-POSTGRESQL-on: + ${CP} ${FILESDIR}/pg.rb ${STAGEDIR}${WWWDIR}/bundler.d + +do-install-LDAP-on: + ${CP} ${FILESDIR}/ldap.rb ${STAGEDIR}${WWWDIR}/bundler.d + +do-install-OPENID-on: + ${CP} ${FILESDIR}/openid.rb ${STAGEDIR}${WWWDIR}/bundler.d + +do-install-MARKDOWN-on: + ${CP} ${FILESDIR}/markdown.rb ${STAGEDIR}${WWWDIR}/bundler.d + do-install-RMAGIC-on: ${CP} ${FILESDIR}/rmagic.rb ${STAGEDIR}${WWWDIR}/bundler.d diff --git a/www/redmine/distinfo b/www/redmine/distinfo index 0ec2d298586..bfc70c4310d 100644 --- a/www/redmine/distinfo +++ b/www/redmine/distinfo @@ -1,2 +1,3 @@ -SHA256 (redmine-2.6.9.tar.gz) = 15cafc3983e0520c3ecc6105ef33031f55b1dc2b21270d092938562b47362d4c -SIZE (redmine-2.6.9.tar.gz) = 2127454 +TIMESTAMP = 1466169440 +SHA256 (redmine-3.2.3.tar.gz) = 570f039ce72112297c915d2f7e78228a4750020f1633fe479f23f6fdb5f8fa24 +SIZE (redmine-3.2.3.tar.gz) = 2311713 diff --git a/www/redmine/files/ldap.rb b/www/redmine/files/ldap.rb new file mode 100644 index 00000000000..e5f4b2222a0 --- /dev/null +++ b/www/redmine/files/ldap.rb @@ -0,0 +1 @@ +gem "net-ldap", ">= 0.12.0" diff --git a/www/redmine/files/markdown.rb b/www/redmine/files/markdown.rb new file mode 100644 index 00000000000..c86871c3085 --- /dev/null +++ b/www/redmine/files/markdown.rb @@ -0,0 +1 @@ +gem "redcarpet", ">= 3.3.2" diff --git a/www/redmine/files/mysql.rb b/www/redmine/files/mysql.rb new file mode 100644 index 00000000000..818abca39e5 --- /dev/null +++ b/www/redmine/files/mysql.rb @@ -0,0 +1 @@ +gem "mysql2", "~> 0.3.11" diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile index f9963427904..fab160b278d 100644 --- a/www/redmine/files/patch-Gemfile +++ b/www/redmine/files/patch-Gemfile @@ -1,28 +1,35 @@ ---- Gemfile.orig 2015-12-05 08:47:22 UTC -+++ Gemfile -@@ -1,37 +1,29 @@ - source 'https://rubygems.org' +--- Gemfile.orig 2016-05-05 18:39:09.000000000 +0000 ++++ Gemfile 2016-06-06 19:49:50.462089000 +0000 +@@ -4,11 +4,11 @@ + abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." + end --gem "rails", "3.2.22" -+gem "rails", "~> 3.2" - gem "rack-cache", "1.2" if RUBY_VERSION < "1.9.3" - gem "jquery-rails", "~> 3.1.4" +-gem "rails", "4.2.5.2" +-gem "jquery-rails", "~> 3.1.4" ++gem "rails", ">= 4.2.5.2" ++gem "jquery-rails" gem "coderay", "~> 1.1.0" - gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby] gem "builder", ">= 3.0.4" -gem "request_store", "1.0.5" +gem "request_store", ">= 1.0.5" - gem "mime-types" --gem "rbpdf", "~> 1.18.7" -+gem "rbpdf", ">= 1.18.7" + gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99") + gem "protected_attributes" + gem "actionpack-action_caching" +@@ -17,7 +17,7 @@ + gem "mimemagic" --gem "i18n", "~> 0.6.11" -+gem "i18n", ">= 0.6.11" + # Request at least nokogiri 1.6.7.2 because of security advisories +-gem "nokogiri", ">= 1.6.7.2" ++gem "nokogiri" + + # Request at least rails-html-sanitizer 1.0.3 because of security advisories + gem "rails-html-sanitizer", ">= 1.0.3" +@@ -28,27 +28,15 @@ # Optional gem for LDAP authentication group :ldap do -- gem "net-ldap", "~> 0.3.1" -+ gem "net-ldap", ">= 0.3.1" +- gem "net-ldap", "~> 0.12.0" ++ gem "net-ldap" end # Optional gem for OpenID authentication @@ -32,28 +39,22 @@ gem "rack-openid" end - platforms :mri, :mingw do +-platforms :mri, :mingw, :x64_mingw do - # Optional gem for exporting the gantt to a PNG file, not supported with jruby - group :rmagick do -- # RMagick 2 supports ruby 1.9 -- # RMagick 1 would be fine for ruby 1.8 but Bundler does not support -- # different requirements for the same gem on different platforms -- gem "rmagick", (RUBY_VERSION < "1.9" ? "2.13.3" : "~> 2.13.4") +- gem "rmagick", ">= 2.14.0" - end - - # Optional Markdown support, not for JRuby - group :markdown do - gem "redcarpet", (RUBY_VERSION < "1.9" ? "~> 2.3.0" : "~> 3.3.2") -@@ -62,7 +54,7 @@ if File.exist?(database_file) - gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] - gem "activerecord-jdbcmysql-adapter", :platforms => :jruby - when /postgresql/ -- gem "pg", "~> 0.17.1", :platforms => [:mri, :mingw] -+ gem "pg", "~> 0.18.4", :platforms => [:mri, :mingw] - gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby - when /sqlite3/ - gem "sqlite3", :platforms => [:mri, :mingw] -@@ -82,23 +74,6 @@ else +- # Optional Markdown support, not for JRuby +- group :markdown do +- gem "redcarpet", "~> 3.3.2" +- end +-end +- + platforms :jruby do + # jruby-openssl is bundled with JRuby 1.7.0 + gem "jruby-openssl" if Object.const_defined?(:JRUBY_VERSION) && JRUBY_VERSION < '1.7.0' +@@ -92,21 +80,6 @@ warn("Please configure your config/database.yml first") end @@ -64,22 +65,20 @@ - -group :test do - gem "minitest" -- gem "test-unit", "~> 3.0" -- gem "shoulda", "~> 3.3.2" -- gem "shoulda-matchers", "1.4.1" -- gem "mocha", "~> 1.0.0", :require => 'mocha/api' -- if RUBY_VERSION >= '1.9.3' -- gem "capybara" -- gem "selenium-webdriver" -- end +- gem "rails-dom-testing" +- gem "mocha" +- gem "simplecov", "~> 0.9.1", :require => false +- # For running UI tests +- gem "capybara" +- gem "selenium-webdriver" -end - local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) - puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v` -@@ -111,3 +86,7 @@ Dir.glob File.expand_path("../plugins/*/ - #TODO: switch to "eval_gemfile file" when bundler >= 1.2.0 will be required (rails 4) - instance_eval File.read(file), file + eval_gemfile local_gemfile +@@ -116,3 +89,7 @@ + Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| + eval_gemfile file end + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| diff --git a/www/redmine/files/pg.rb b/www/redmine/files/pg.rb new file mode 100644 index 00000000000..ccd06db0c56 --- /dev/null +++ b/www/redmine/files/pg.rb @@ -0,0 +1 @@ +gem "pg", "~> 0.18.1" diff --git a/www/redmine/files/rmagic.rb b/www/redmine/files/rmagic.rb index f9849be1b15..8b50a86e3e6 100644 --- a/www/redmine/files/rmagic.rb +++ b/www/redmine/files/rmagic.rb @@ -1 +1 @@ -gem "rmagick", ">= 2.13.4" +gem "rmagick", ">= 2.14.0" diff --git a/www/redmine/pkg-plist b/www/redmine/pkg-plist index 053d59efc62..3b1f9ffb1bf 100644 --- a/www/redmine/pkg-plist +++ b/www/redmine/pkg-plist @@ -18,12 +18,15 @@ %%WWWDIR%%/app/controllers/calendars_controller.rb %%WWWDIR%%/app/controllers/comments_controller.rb %%WWWDIR%%/app/controllers/context_menus_controller.rb +%%WWWDIR%%/app/controllers/custom_field_enumerations_controller.rb %%WWWDIR%%/app/controllers/custom_fields_controller.rb %%WWWDIR%%/app/controllers/documents_controller.rb +%%WWWDIR%%/app/controllers/email_addresses_controller.rb %%WWWDIR%%/app/controllers/enumerations_controller.rb %%WWWDIR%%/app/controllers/files_controller.rb %%WWWDIR%%/app/controllers/gantts_controller.rb %%WWWDIR%%/app/controllers/groups_controller.rb +%%WWWDIR%%/app/controllers/imports_controller.rb %%WWWDIR%%/app/controllers/issue_categories_controller.rb %%WWWDIR%%/app/controllers/issue_relations_controller.rb %%WWWDIR%%/app/controllers/issue_statuses_controller.rb @@ -35,6 +38,7 @@ %%WWWDIR%%/app/controllers/my_controller.rb %%WWWDIR%%/app/controllers/news_controller.rb %%WWWDIR%%/app/controllers/previews_controller.rb +%%WWWDIR%%/app/controllers/principal_memberships_controller.rb %%WWWDIR%%/app/controllers/project_enumerations_controller.rb %%WWWDIR%%/app/controllers/projects_controller.rb %%WWWDIR%%/app/controllers/queries_controller.rb @@ -64,9 +68,11 @@ %%WWWDIR%%/app/helpers/context_menus_helper.rb %%WWWDIR%%/app/helpers/custom_fields_helper.rb %%WWWDIR%%/app/helpers/documents_helper.rb +%%WWWDIR%%/app/helpers/email_addresses_helper.rb %%WWWDIR%%/app/helpers/enumerations_helper.rb %%WWWDIR%%/app/helpers/gantt_helper.rb %%WWWDIR%%/app/helpers/groups_helper.rb +%%WWWDIR%%/app/helpers/imports_helper.rb %%WWWDIR%%/app/helpers/issue_categories_helper.rb %%WWWDIR%%/app/helpers/issue_relations_helper.rb %%WWWDIR%%/app/helpers/issue_statuses_helper.rb @@ -77,6 +83,7 @@ %%WWWDIR%%/app/helpers/messages_helper.rb %%WWWDIR%%/app/helpers/my_helper.rb %%WWWDIR%%/app/helpers/news_helper.rb +%%WWWDIR%%/app/helpers/principal_memberships_helper.rb %%WWWDIR%%/app/helpers/projects_helper.rb %%WWWDIR%%/app/helpers/queries_helper.rb %%WWWDIR%%/app/helpers/reports_helper.rb @@ -102,11 +109,14 @@ %%WWWDIR%%/app/models/changeset.rb %%WWWDIR%%/app/models/comment.rb %%WWWDIR%%/app/models/custom_field.rb +%%WWWDIR%%/app/models/custom_field_enumeration.rb %%WWWDIR%%/app/models/custom_field_value.rb %%WWWDIR%%/app/models/custom_value.rb %%WWWDIR%%/app/models/document.rb %%WWWDIR%%/app/models/document_category.rb %%WWWDIR%%/app/models/document_category_custom_field.rb +%%WWWDIR%%/app/models/document_custom_field.rb +%%WWWDIR%%/app/models/email_address.rb %%WWWDIR%%/app/models/enabled_module.rb %%WWWDIR%%/app/models/enumeration.rb %%WWWDIR%%/app/models/group.rb @@ -114,9 +124,12 @@ %%WWWDIR%%/app/models/group_builtin.rb %%WWWDIR%%/app/models/group_custom_field.rb %%WWWDIR%%/app/models/group_non_member.rb +%%WWWDIR%%/app/models/import.rb +%%WWWDIR%%/app/models/import_item.rb %%WWWDIR%%/app/models/issue.rb %%WWWDIR%%/app/models/issue_category.rb %%WWWDIR%%/app/models/issue_custom_field.rb +%%WWWDIR%%/app/models/issue_import.rb %%WWWDIR%%/app/models/issue_priority.rb %%WWWDIR%%/app/models/issue_priority_custom_field.rb %%WWWDIR%%/app/models/issue_query.rb @@ -180,6 +193,7 @@ %%WWWDIR%%/app/views/attachments/_links.html.erb %%WWWDIR%%/app/views/attachments/destroy.js.erb %%WWWDIR%%/app/views/attachments/diff.html.erb +%%WWWDIR%%/app/views/attachments/edit.html.erb %%WWWDIR%%/app/views/attachments/file.html.erb %%WWWDIR%%/app/views/attachments/show.api.rsb %%WWWDIR%%/app/views/attachments/upload.api.rsb @@ -206,11 +220,15 @@ %%WWWDIR%%/app/views/common/feed.atom.builder %%WWWDIR%%/app/views/context_menus/issues.html.erb %%WWWDIR%%/app/views/context_menus/time_entries.html.erb +%%WWWDIR%%/app/views/custom_field_enumerations/create.js.erb +%%WWWDIR%%/app/views/custom_field_enumerations/destroy.html.erb +%%WWWDIR%%/app/views/custom_field_enumerations/index.html.erb %%WWWDIR%%/app/views/custom_fields/_form.html.erb %%WWWDIR%%/app/views/custom_fields/_index.html.erb %%WWWDIR%%/app/views/custom_fields/edit.html.erb %%WWWDIR%%/app/views/custom_fields/formats/_bool.html.erb %%WWWDIR%%/app/views/custom_fields/formats/_date.html.erb +%%WWWDIR%%/app/views/custom_fields/formats/_enumeration.erb %%WWWDIR%%/app/views/custom_fields/formats/_link.html.erb %%WWWDIR%%/app/views/custom_fields/formats/_list.html.erb %%WWWDIR%%/app/views/custom_fields/formats/_numeric.html.erb @@ -230,6 +248,9 @@ %%WWWDIR%%/app/views/documents/index.html.erb %%WWWDIR%%/app/views/documents/new.html.erb %%WWWDIR%%/app/views/documents/show.html.erb +%%WWWDIR%%/app/views/email_addresses/_index.html.erb +%%WWWDIR%%/app/views/email_addresses/index.html.erb +%%WWWDIR%%/app/views/email_addresses/index.js.erb %%WWWDIR%%/app/views/enumerations/_form.html.erb %%WWWDIR%%/app/views/enumerations/destroy.html.erb %%WWWDIR%%/app/views/enumerations/edit.html.erb @@ -242,6 +263,8 @@ %%WWWDIR%%/app/views/groups/_form.html.erb %%WWWDIR%%/app/views/groups/_general.html.erb %%WWWDIR%%/app/views/groups/_memberships.html.erb +%%WWWDIR%%/app/views/groups/_new_users_form.html.erb +%%WWWDIR%%/app/views/groups/_new_users_modal.html.erb %%WWWDIR%%/app/views/groups/_users.html.erb %%WWWDIR%%/app/views/groups/add_users.js.erb %%WWWDIR%%/app/views/groups/autocomplete_for_user.js.erb @@ -251,9 +274,19 @@ %%WWWDIR%%/app/views/groups/index.api.rsb %%WWWDIR%%/app/views/groups/index.html.erb %%WWWDIR%%/app/views/groups/new.html.erb +%%WWWDIR%%/app/views/groups/new_users.html.erb +%%WWWDIR%%/app/views/groups/new_users.js.erb %%WWWDIR%%/app/views/groups/remove_user.js.erb %%WWWDIR%%/app/views/groups/show.api.rsb %%WWWDIR%%/app/views/groups/show.html.erb +%%WWWDIR%%/app/views/imports/_fields_mapping.html.erb +%%WWWDIR%%/app/views/imports/mapping.html.erb +%%WWWDIR%%/app/views/imports/mapping.js.erb +%%WWWDIR%%/app/views/imports/new.html.erb +%%WWWDIR%%/app/views/imports/run.html.erb +%%WWWDIR%%/app/views/imports/run.js.erb +%%WWWDIR%%/app/views/imports/settings.html.erb +%%WWWDIR%%/app/views/imports/show.html.erb %%WWWDIR%%/app/views/issue_categories/_form.html.erb %%WWWDIR%%/app/views/issue_categories/_new_modal.html.erb %%WWWDIR%%/app/views/issue_categories/create.js.erb @@ -289,12 +322,15 @@ %%WWWDIR%%/app/views/issues/bulk_edit.js.erb %%WWWDIR%%/app/views/issues/destroy.html.erb %%WWWDIR%%/app/views/issues/edit.html.erb +%%WWWDIR%%/app/views/issues/edit.js.erb %%WWWDIR%%/app/views/issues/index.api.rsb %%WWWDIR%%/app/views/issues/index.html.erb +%%WWWDIR%%/app/views/issues/index.pdf.erb %%WWWDIR%%/app/views/issues/new.html.erb +%%WWWDIR%%/app/views/issues/new.js.erb %%WWWDIR%%/app/views/issues/show.api.rsb %%WWWDIR%%/app/views/issues/show.html.erb -%%WWWDIR%%/app/views/issues/update_form.js.erb +%%WWWDIR%%/app/views/issues/show.pdf.erb %%WWWDIR%%/app/views/journals/_notes_form.html.erb %%WWWDIR%%/app/views/journals/diff.html.erb %%WWWDIR%%/app/views/journals/edit.js.erb @@ -305,6 +341,7 @@ %%WWWDIR%%/app/views/layouts/base.html.erb %%WWWDIR%%/app/views/layouts/mailer.html.erb %%WWWDIR%%/app/views/layouts/mailer.text.erb +%%WWWDIR%%/app/views/mail_handler/new.html.erb %%WWWDIR%%/app/views/mailer/_issue.html.erb %%WWWDIR%%/app/views/mailer/_issue.text.erb %%WWWDIR%%/app/views/mailer/account_activated.html.erb @@ -339,10 +376,14 @@ %%WWWDIR%%/app/views/mailer/wiki_content_added.text.erb %%WWWDIR%%/app/views/mailer/wiki_content_updated.html.erb %%WWWDIR%%/app/views/mailer/wiki_content_updated.text.erb +%%WWWDIR%%/app/views/members/_new_form.html.erb +%%WWWDIR%%/app/views/members/_new_modal.html.erb %%WWWDIR%%/app/views/members/autocomplete.js.erb %%WWWDIR%%/app/views/members/create.js.erb %%WWWDIR%%/app/views/members/destroy.js.erb %%WWWDIR%%/app/views/members/index.api.rsb +%%WWWDIR%%/app/views/members/new.html.erb +%%WWWDIR%%/app/views/members/new.js.erb %%WWWDIR%%/app/views/members/show.api.rsb %%WWWDIR%%/app/views/members/update.js.erb %%WWWDIR%%/app/views/messages/_form.html.erb @@ -364,6 +405,8 @@ %%WWWDIR%%/app/views/my/page.html.erb %%WWWDIR%%/app/views/my/page_layout.html.erb %%WWWDIR%%/app/views/my/password.html.erb +%%WWWDIR%%/app/views/my/show_api_key.html.erb +%%WWWDIR%%/app/views/my/show_api_key.js.erb %%WWWDIR%%/app/views/news/_form.html.erb %%WWWDIR%%/app/views/news/_news.html.erb %%WWWDIR%%/app/views/news/edit.html.erb @@ -372,6 +415,14 @@ %%WWWDIR%%/app/views/news/new.html.erb %%WWWDIR%%/app/views/news/show.html.erb %%WWWDIR%%/app/views/previews/issue.html.erb +%%WWWDIR%%/app/views/principal_memberships/_index.html.erb +%%WWWDIR%%/app/views/principal_memberships/_new_form.html.erb +%%WWWDIR%%/app/views/principal_memberships/_new_modal.html.erb +%%WWWDIR%%/app/views/principal_memberships/create.js.erb +%%WWWDIR%%/app/views/principal_memberships/destroy.js.erb +%%WWWDIR%%/app/views/principal_memberships/new.html.erb +%%WWWDIR%%/app/views/principal_memberships/new.js.erb +%%WWWDIR%%/app/views/principal_memberships/update.js.erb %%WWWDIR%%/app/views/projects/_edit.html.erb %%WWWDIR%%/app/views/projects/_form.html.erb %%WWWDIR%%/app/views/projects/_members_box.html.erb @@ -380,7 +431,6 @@ %%WWWDIR%%/app/views/projects/destroy.html.erb %%WWWDIR%%/app/views/projects/index.api.rsb %%WWWDIR%%/app/views/projects/index.html.erb -%%WWWDIR%%/app/views/projects/list_members.html.erb %%WWWDIR%%/app/views/projects/new.html.erb %%WWWDIR%%/app/views/projects/settings.html.erb %%WWWDIR%%/app/views/projects/settings/_activities.html.erb @@ -435,6 +485,8 @@ %%WWWDIR%%/app/views/roles/permissions.html.erb %%WWWDIR%%/app/views/roles/show.api.rsb %%WWWDIR%%/app/views/search/index.html.erb +%%WWWDIR%%/app/views/settings/_api.html.erb +%%WWWDIR%%/app/views/settings/_attachments.html.erb %%WWWDIR%%/app/views/settings/_authentication.html.erb %%WWWDIR%%/app/views/settings/_display.html.erb %%WWWDIR%%/app/views/settings/_general.html.erb @@ -445,6 +497,9 @@ %%WWWDIR%%/app/views/settings/_repositories.html.erb %%WWWDIR%%/app/views/settings/edit.html.erb %%WWWDIR%%/app/views/settings/plugin.html.erb +%%WWWDIR%%/app/views/sudo_mode/_new_modal.html.erb +%%WWWDIR%%/app/views/sudo_mode/new.html.erb +%%WWWDIR%%/app/views/sudo_mode/new.js.erb %%WWWDIR%%/app/views/timelog/_date_range.html.erb %%WWWDIR%%/app/views/timelog/_form.html.erb %%WWWDIR%%/app/views/timelog/_list.html.erb @@ -454,6 +509,7 @@ %%WWWDIR%%/app/views/timelog/index.api.rsb %%WWWDIR%%/app/views/timelog/index.html.erb %%WWWDIR%%/app/views/timelog/new.html.erb +%%WWWDIR%%/app/views/timelog/new.js.erb %%WWWDIR%%/app/views/timelog/report.html.erb %%WWWDIR%%/app/views/timelog/show.api.rsb %%WWWDIR%%/app/views/trackers/_form.html.erb @@ -507,6 +563,7 @@ %%WWWDIR%%/app/views/wiki/diff.html.erb %%WWWDIR%%/app/views/wiki/edit.html.erb %%WWWDIR%%/app/views/wiki/export.html.erb +%%WWWDIR%%/app/views/wiki/export.pdf.erb %%WWWDIR%%/app/views/wiki/export_multiple.html.erb %%WWWDIR%%/app/views/wiki/history.html.erb %%WWWDIR%%/app/views/wiki/index.api.rsb @@ -514,6 +571,7 @@ %%WWWDIR%%/app/views/wiki/rename.html.erb %%WWWDIR%%/app/views/wiki/show.api.rsb %%WWWDIR%%/app/views/wiki/show.html.erb +%%WWWDIR%%/app/views/wiki/show.pdf.erb %%WWWDIR%%/app/views/wikis/destroy.html.erb %%WWWDIR%%/app/views/wikis/edit.js.erb %%WWWDIR%%/app/views/workflows/_action_menu.html.erb @@ -522,12 +580,17 @@ %%WWWDIR%%/app/views/workflows/edit.html.erb %%WWWDIR%%/app/views/workflows/index.html.erb %%WWWDIR%%/app/views/workflows/permissions.html.erb +%%WWWDIR%%/appveyor.yml +%%WWWDIR%%/bin/about +%%WWWDIR%%/bin/bundle +%%WWWDIR%%/bin/rails +%%WWWDIR%%/bin/rake %%WWWDIR%%/config.ru %%WWWDIR%%/config/additional_environment.rb.example %%WWWDIR%%/config/application.rb %%WWWDIR%%/config/boot.rb %%WWWDIR%%/config/configuration.yml.example -%%WWWDIR%%/config/database.yml.example +@sample %%WWWDIR%%/config/database.yml.sample %%WWWDIR%%/config/environment.rb %%WWWDIR%%/config/environments/development.rb %%WWWDIR%%/config/environments/production.rb @@ -551,6 +614,7 @@ %%WWWDIR%%/config/locales/el.yml %%WWWDIR%%/config/locales/en-GB.yml %%WWWDIR%%/config/locales/en.yml +%%WWWDIR%%/config/locales/es-PA.yml %%WWWDIR%%/config/locales/es.yml %%WWWDIR%%/config/locales/et.yml %%WWWDIR%%/config/locales/eu.yml @@ -588,7 +652,6 @@ %%WWWDIR%%/config/locales/vi.yml %%WWWDIR%%/config/locales/zh-TW.yml %%WWWDIR%%/config/locales/zh.yml -%%WWWDIR%%/config/preinitializer.rb %%WWWDIR%%/config/routes.rb %%WWWDIR%%/db/migrate/001_setup.rb %%WWWDIR%%/db/migrate/002_issue_move.rb @@ -827,6 +890,34 @@ %%WWWDIR%%/db/migrate/20140228130325_change_changesets_comments_limit.rb %%WWWDIR%%/db/migrate/20140903143914_add_password_changed_at_to_user.rb %%WWWDIR%%/db/migrate/20140920094058_insert_builtin_groups.rb +%%WWWDIR%%/db/migrate/20141029181752_add_trackers_default_status_id.rb +%%WWWDIR%%/db/migrate/20141029181824_remove_issue_statuses_is_default.rb +%%WWWDIR%%/db/migrate/20141109112308_add_roles_users_visibility.rb +%%WWWDIR%%/db/migrate/20141122124142_add_wiki_redirects_redirects_to_wiki_id.rb +%%WWWDIR%%/db/migrate/20150113194759_create_email_addresses.rb +%%WWWDIR%%/db/migrate/20150113211532_populate_email_addresses.rb +%%WWWDIR%%/db/migrate/20150113213922_remove_users_mail.rb +%%WWWDIR%%/db/migrate/20150113213955_add_email_addresses_user_id_index.rb +%%WWWDIR%%/db/migrate/20150208105930_replace_move_issues_permission.rb +%%WWWDIR%%/db/migrate/20150510083747_change_documents_title_limit.rb +%%WWWDIR%%/db/migrate/20150525103953_clear_estimated_hours_on_parent_issues.rb +%%WWWDIR%%/db/migrate/20150526183158_add_roles_time_entries_visibility.rb +%%WWWDIR%%/db/migrate/20150528084820_add_roles_all_roles_managed.rb +%%WWWDIR%%/db/migrate/20150528092912_create_roles_managed_roles.rb +%%WWWDIR%%/db/migrate/20150528093249_add_unique_index_on_roles_managed_roles.rb +%%WWWDIR%%/db/migrate/20150725112753_insert_allowed_statuses_for_new_issues.rb +%%WWWDIR%%/db/migrate/20150730122707_create_imports.rb +%%WWWDIR%%/db/migrate/20150730122735_create_import_items.rb +%%WWWDIR%%/db/migrate/20150921204850_change_time_entries_comments_limit_to_1024.rb +%%WWWDIR%%/db/migrate/20150921210243_change_wiki_contents_comments_limit_to_1024.rb +%%WWWDIR%%/db/migrate/20151020182334_change_attachments_filesize_limit_to_8.rb +%%WWWDIR%%/db/migrate/20151020182731_fix_comma_in_user_format_setting_value.rb +%%WWWDIR%%/db/migrate/20151021184614_change_issue_categories_name_limit_to_60.rb +%%WWWDIR%%/db/migrate/20151021185456_change_auth_sources_filter_to_text.rb +%%WWWDIR%%/db/migrate/20151021190616_change_user_preferences_hide_mail_default_to_true.rb +%%WWWDIR%%/db/migrate/20151024082034_add_tokens_updated_on.rb +%%WWWDIR%%/db/migrate/20151025072118_create_custom_field_enumerations.rb +%%WWWDIR%%/db/migrate/20151031095005_add_projects_default_version_id.rb %%WWWDIR%%/doc/CHANGELOG %%WWWDIR%%/doc/COPYING %%WWWDIR%%/doc/INSTALL @@ -931,47 +1022,6 @@ %%WWWDIR%%/lib/plugins/acts_as_versioned/test/versioned_test.rb %%WWWDIR%%/lib/plugins/acts_as_watchable/init.rb %%WWWDIR%%/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/.autotest -%%WWWDIR%%/lib/plugins/awesome_nested_set/.gitignore -%%WWWDIR%%/lib/plugins/awesome_nested_set/.travis.yml -%%WWWDIR%%/lib/plugins/awesome_nested_set/CHANGELOG -%%WWWDIR%%/lib/plugins/awesome_nested_set/CONTRIBUTING.md -%%WWWDIR%%/lib/plugins/awesome_nested_set/Gemfile -%%WWWDIR%%/lib/plugins/awesome_nested_set/MIT-LICENSE -%%WWWDIR%%/lib/plugins/awesome_nested_set/README.md -%%WWWDIR%%/lib/plugins/awesome_nested_set/Rakefile -%%WWWDIR%%/lib/plugins/awesome_nested_set/awesome_nested_set.gemspec -%%WWWDIR%%/lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.0.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.1.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.2.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/init.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/columns.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/helper.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/iterator.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/movable.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/prunable.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/rebuildable.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/relatable.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/transactable.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/validatable.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/move.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/set_validator.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/tree.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/lib/awesome_nested_set/version.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/awesome_nested_set/helper_spec.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/awesome_nested_set_spec.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/db/database.yml -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/db/schema.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/fixtures/brokens.yml -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/fixtures/categories.yml -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/fixtures/departments.yml -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/fixtures/notes.yml -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/fixtures/things.yml -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/spec_helper.rb -%%WWWDIR%%/lib/plugins/awesome_nested_set/spec/support/models.rb %%WWWDIR%%/lib/plugins/gravatar/.gitignore %%WWWDIR%%/lib/plugins/gravatar/MIT-LICENSE %%WWWDIR%%/lib/plugins/gravatar/README.rdoc @@ -1017,19 +1067,29 @@ %%WWWDIR%%/lib/redmine/core_ext/string.rb %%WWWDIR%%/lib/redmine/core_ext/string/conversions.rb %%WWWDIR%%/lib/redmine/core_ext/string/inflections.rb +%%WWWDIR%%/lib/redmine/database.rb %%WWWDIR%%/lib/redmine/default_data/loader.rb +%%WWWDIR%%/lib/redmine/export/csv.rb %%WWWDIR%%/lib/redmine/export/pdf.rb +%%WWWDIR%%/lib/redmine/export/pdf/issues_pdf_helper.rb +%%WWWDIR%%/lib/redmine/export/pdf/wiki_pdf_helper.rb %%WWWDIR%%/lib/redmine/field_format.rb %%WWWDIR%%/lib/redmine/helpers/calendar.rb %%WWWDIR%%/lib/redmine/helpers/diff.rb %%WWWDIR%%/lib/redmine/helpers/gantt.rb %%WWWDIR%%/lib/redmine/helpers/time_report.rb +%%WWWDIR%%/lib/redmine/helpers/url.rb %%WWWDIR%%/lib/redmine/hook.rb +%%WWWDIR%%/lib/redmine/hook/listener.rb +%%WWWDIR%%/lib/redmine/hook/view_listener.rb %%WWWDIR%%/lib/redmine/i18n.rb %%WWWDIR%%/lib/redmine/imap.rb %%WWWDIR%%/lib/redmine/info.rb %%WWWDIR%%/lib/redmine/menu_manager.rb %%WWWDIR%%/lib/redmine/mime_type.rb +%%WWWDIR%%/lib/redmine/nested_set/issue_nested_set.rb +%%WWWDIR%%/lib/redmine/nested_set/project_nested_set.rb +%%WWWDIR%%/lib/redmine/nested_set/traversing.rb %%WWWDIR%%/lib/redmine/notifiable.rb %%WWWDIR%%/lib/redmine/pagination.rb %%WWWDIR%%/lib/redmine/platform.rb @@ -1050,6 +1110,7 @@ %%WWWDIR%%/lib/redmine/scm/base.rb %%WWWDIR%%/lib/redmine/search.rb %%WWWDIR%%/lib/redmine/subclass_factory.rb +%%WWWDIR%%/lib/redmine/sudo_mode.rb %%WWWDIR%%/lib/redmine/syntax_highlighting.rb %%WWWDIR%%/lib/redmine/themes.rb %%WWWDIR%%/lib/redmine/thumbnail.rb @@ -1065,11 +1126,14 @@ %%WWWDIR%%/lib/redmine/views/my_page/block.rb %%WWWDIR%%/lib/redmine/views/other_formats_builder.rb %%WWWDIR%%/lib/redmine/wiki_formatting.rb +%%WWWDIR%%/lib/redmine/wiki_formatting/html_parser.rb %%WWWDIR%%/lib/redmine/wiki_formatting/macros.rb %%WWWDIR%%/lib/redmine/wiki_formatting/markdown/formatter.rb %%WWWDIR%%/lib/redmine/wiki_formatting/markdown/helper.rb +%%WWWDIR%%/lib/redmine/wiki_formatting/markdown/html_parser.rb %%WWWDIR%%/lib/redmine/wiki_formatting/textile/formatter.rb %%WWWDIR%%/lib/redmine/wiki_formatting/textile/helper.rb +%%WWWDIR%%/lib/redmine/wiki_formatting/textile/html_parser.rb %%WWWDIR%%/lib/tasks/ci.rake %%WWWDIR%%/lib/tasks/ciphering.rake %%WWWDIR%%/lib/tasks/deprecated.rake @@ -1092,102 +1156,202 @@ %%WWWDIR%%/public/500.html %%WWWDIR%%/public/dispatch.fcgi.example %%WWWDIR%%/public/favicon.ico -%%WWWDIR%%/public/help/ar/wiki_syntax.html -%%WWWDIR%%/public/help/ar/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/az/wiki_syntax.html -%%WWWDIR%%/public/help/az/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/bg/wiki_syntax.html -%%WWWDIR%%/public/help/bg/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/bs/wiki_syntax.html -%%WWWDIR%%/public/help/bs/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/ca/wiki_syntax.html -%%WWWDIR%%/public/help/ca/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/cs/wiki_syntax.html -%%WWWDIR%%/public/help/cs/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/da/wiki_syntax.html -%%WWWDIR%%/public/help/da/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/de/wiki_syntax.html -%%WWWDIR%%/public/help/de/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/el/wiki_syntax.html -%%WWWDIR%%/public/help/el/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/en-gb/wiki_syntax.html -%%WWWDIR%%/public/help/en-gb/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/en/wiki_syntax.html -%%WWWDIR%%/public/help/en/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/es/wiki_syntax.html -%%WWWDIR%%/public/help/es/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/et/wiki_syntax.html -%%WWWDIR%%/public/help/et/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/eu/wiki_syntax.html -%%WWWDIR%%/public/help/eu/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/fa/wiki_syntax.html -%%WWWDIR%%/public/help/fa/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/fi/wiki_syntax.html -%%WWWDIR%%/public/help/fi/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/fr/wiki_syntax.html -%%WWWDIR%%/public/help/fr/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/gl/wiki_syntax.html -%%WWWDIR%%/public/help/gl/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/he/wiki_syntax.html -%%WWWDIR%%/public/help/he/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/hr/wiki_syntax.html -%%WWWDIR%%/public/help/hr/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/hu/wiki_syntax.html -%%WWWDIR%%/public/help/hu/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/id/wiki_syntax.html -%%WWWDIR%%/public/help/id/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/it/wiki_syntax.html -%%WWWDIR%%/public/help/it/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/ja/wiki_syntax.html -%%WWWDIR%%/public/help/ja/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/ko/wiki_syntax.html -%%WWWDIR%%/public/help/ko/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/lt/wiki_syntax.html -%%WWWDIR%%/public/help/lt/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/lv/wiki_syntax.html -%%WWWDIR%%/public/help/lv/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/mk/wiki_syntax.html -%%WWWDIR%%/public/help/mk/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/mn/wiki_syntax.html -%%WWWDIR%%/public/help/mn/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/nl/wiki_syntax.html -%%WWWDIR%%/public/help/nl/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/no/wiki_syntax.html -%%WWWDIR%%/public/help/no/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/pl/wiki_syntax.html -%%WWWDIR%%/public/help/pl/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/pt-br/wiki_syntax.html -%%WWWDIR%%/public/help/pt-br/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/pt/wiki_syntax.html -%%WWWDIR%%/public/help/pt/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/ro/wiki_syntax.html -%%WWWDIR%%/public/help/ro/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/ru/wiki_syntax.html -%%WWWDIR%%/public/help/ru/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/sk/wiki_syntax.html -%%WWWDIR%%/public/help/sk/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/sl/wiki_syntax.html -%%WWWDIR%%/public/help/sl/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/sq/wiki_syntax.html -%%WWWDIR%%/public/help/sq/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/sr-yu/wiki_syntax.html -%%WWWDIR%%/public/help/sr-yu/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/sr/wiki_syntax.html -%%WWWDIR%%/public/help/sr/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/sv/wiki_syntax.html -%%WWWDIR%%/public/help/sv/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/th/wiki_syntax.html -%%WWWDIR%%/public/help/th/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/tr/wiki_syntax.html -%%WWWDIR%%/public/help/tr/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/uk/wiki_syntax.html -%%WWWDIR%%/public/help/uk/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/vi/wiki_syntax.html -%%WWWDIR%%/public/help/vi/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/zh-tw/wiki_syntax.html -%%WWWDIR%%/public/help/zh-tw/wiki_syntax_detailed.html -%%WWWDIR%%/public/help/zh/wiki_syntax.html -%%WWWDIR%%/public/help/zh/wiki_syntax_detailed.html +%%WWWDIR%%/public/help/ar/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/ar/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/ar/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/ar/wiki_syntax_textile.html +%%WWWDIR%%/public/help/az/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/az/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/az/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/az/wiki_syntax_textile.html +%%WWWDIR%%/public/help/bg/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/bg/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/bg/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/bg/wiki_syntax_textile.html +%%WWWDIR%%/public/help/bs/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/bs/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/bs/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/bs/wiki_syntax_textile.html +%%WWWDIR%%/public/help/ca/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/ca/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/ca/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/ca/wiki_syntax_textile.html +%%WWWDIR%%/public/help/cs/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/cs/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/cs/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/cs/wiki_syntax_textile.html +%%WWWDIR%%/public/help/da/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/da/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/da/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/da/wiki_syntax_textile.html +%%WWWDIR%%/public/help/de/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/de/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/de/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/de/wiki_syntax_textile.html +%%WWWDIR%%/public/help/el/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/el/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/el/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/el/wiki_syntax_textile.html +%%WWWDIR%%/public/help/en-gb/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/en-gb/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/en-gb/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/en-gb/wiki_syntax_textile.html +%%WWWDIR%%/public/help/en/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/en/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/en/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/en/wiki_syntax_textile.html +%%WWWDIR%%/public/help/es-pa/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/es-pa/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/es-pa/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/es-pa/wiki_syntax_textile.html +%%WWWDIR%%/public/help/es/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/es/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/es/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/es/wiki_syntax_textile.html +%%WWWDIR%%/public/help/et/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/et/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/et/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/et/wiki_syntax_textile.html +%%WWWDIR%%/public/help/eu/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/eu/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/eu/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/eu/wiki_syntax_textile.html +%%WWWDIR%%/public/help/fa/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/fa/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/fa/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/fa/wiki_syntax_textile.html +%%WWWDIR%%/public/help/fi/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/fi/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/fi/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/fi/wiki_syntax_textile.html +%%WWWDIR%%/public/help/fr/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/fr/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/fr/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/fr/wiki_syntax_textile.html +%%WWWDIR%%/public/help/gl/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/gl/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/gl/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/gl/wiki_syntax_textile.html +%%WWWDIR%%/public/help/he/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/he/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/he/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/he/wiki_syntax_textile.html +%%WWWDIR%%/public/help/hr/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/hr/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/hr/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/hr/wiki_syntax_textile.html +%%WWWDIR%%/public/help/hu/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/hu/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/hu/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/hu/wiki_syntax_textile.html +%%WWWDIR%%/public/help/id/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/id/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/id/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/id/wiki_syntax_textile.html +%%WWWDIR%%/public/help/it/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/it/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/it/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/it/wiki_syntax_textile.html +%%WWWDIR%%/public/help/ja/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/ja/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/ja/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/ja/wiki_syntax_textile.html +%%WWWDIR%%/public/help/ko/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/ko/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/ko/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/ko/wiki_syntax_textile.html +%%WWWDIR%%/public/help/lt/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/lt/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/lt/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/lt/wiki_syntax_textile.html +%%WWWDIR%%/public/help/lv/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/lv/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/lv/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/lv/wiki_syntax_textile.html +%%WWWDIR%%/public/help/mk/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/mk/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/mk/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/mk/wiki_syntax_textile.html +%%WWWDIR%%/public/help/mn/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/mn/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/mn/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/mn/wiki_syntax_textile.html +%%WWWDIR%%/public/help/nl/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/nl/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/nl/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/nl/wiki_syntax_textile.html +%%WWWDIR%%/public/help/no/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/no/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/no/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/no/wiki_syntax_textile.html +%%WWWDIR%%/public/help/pl/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/pl/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/pl/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/pl/wiki_syntax_textile.html +%%WWWDIR%%/public/help/pt-br/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/pt-br/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/pt-br/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/pt-br/wiki_syntax_textile.html +%%WWWDIR%%/public/help/pt/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/pt/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/pt/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/pt/wiki_syntax_textile.html +%%WWWDIR%%/public/help/ro/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/ro/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/ro/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/ro/wiki_syntax_textile.html +%%WWWDIR%%/public/help/ru/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/ru/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/ru/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/ru/wiki_syntax_textile.html +%%WWWDIR%%/public/help/sk/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/sk/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/sk/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/sk/wiki_syntax_textile.html +%%WWWDIR%%/public/help/sl/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/sl/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/sl/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/sl/wiki_syntax_textile.html +%%WWWDIR%%/public/help/sq/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/sq/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/sq/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/sq/wiki_syntax_textile.html +%%WWWDIR%%/public/help/sr-yu/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/sr-yu/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/sr-yu/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/sr-yu/wiki_syntax_textile.html +%%WWWDIR%%/public/help/sr/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/sr/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/sr/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/sr/wiki_syntax_textile.html +%%WWWDIR%%/public/help/sv/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/sv/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/sv/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/sv/wiki_syntax_textile.html +%%WWWDIR%%/public/help/th/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/th/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/th/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/th/wiki_syntax_textile.html +%%WWWDIR%%/public/help/tr/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/tr/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/tr/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/tr/wiki_syntax_textile.html +%%WWWDIR%%/public/help/uk/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/uk/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/uk/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/uk/wiki_syntax_textile.html +%%WWWDIR%%/public/help/vi/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/vi/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/vi/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/vi/wiki_syntax_textile.html +%%WWWDIR%%/public/help/zh-tw/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/zh-tw/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/zh-tw/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/zh-tw/wiki_syntax_textile.html +%%WWWDIR%%/public/help/zh/wiki_syntax_detailed_markdown.html +%%WWWDIR%%/public/help/zh/wiki_syntax_detailed_textile.html +%%WWWDIR%%/public/help/zh/wiki_syntax_markdown.html +%%WWWDIR%%/public/help/zh/wiki_syntax_textile.html %%WWWDIR%%/public/htaccess.fcgi.example %%WWWDIR%%/public/images/1downarrow.png %%WWWDIR%%/public/images/1uparrow.png @@ -1225,6 +1389,9 @@ %%WWWDIR%%/public/images/draft.png %%WWWDIR%%/public/images/duplicate.png %%WWWDIR%%/public/images/edit.png +%%WWWDIR%%/public/images/email.png +%%WWWDIR%%/public/images/email_add.png +%%WWWDIR%%/public/images/email_disabled.png %%WWWDIR%%/public/images/exclamation.png %%WWWDIR%%/public/images/external.png %%WWWDIR%%/public/images/false.png @@ -1319,7 +1486,6 @@ %%WWWDIR%%/public/javascripts/application.js %%WWWDIR%%/public/javascripts/attachments.js %%WWWDIR%%/public/javascripts/context_menu.js -%%WWWDIR%%/public/javascripts/datepicker.js %%WWWDIR%%/public/javascripts/gantt.js %%WWWDIR%%/public/javascripts/i18n/datepicker-ar.js %%WWWDIR%%/public/javascripts/i18n/datepicker-az.js @@ -1379,6 +1545,7 @@ %%WWWDIR%%/public/javascripts/jstoolbar/lang/jstoolbar-de.js %%WWWDIR%%/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js %%WWWDIR%%/public/javascripts/jstoolbar/lang/jstoolbar-en.js +%%WWWDIR%%/public/javascripts/jstoolbar/lang/jstoolbar-es-pa.js %%WWWDIR%%/public/javascripts/jstoolbar/lang/jstoolbar-es.js %%WWWDIR%%/public/javascripts/jstoolbar/lang/jstoolbar-et.js %%WWWDIR%%/public/javascripts/jstoolbar/lang/jstoolbar-eu.js @@ -1421,8 +1588,8 @@ %%WWWDIR%%/public/javascripts/project_identifier.js %%WWWDIR%%/public/javascripts/raphael.js %%WWWDIR%%/public/javascripts/repository_navigation.js +%%WWWDIR%%/public/javascripts/responsive.js %%WWWDIR%%/public/javascripts/revision_graph.js -%%WWWDIR%%/public/javascripts/select_list_move.js @(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/public/plugin_assets/empty %%WWWDIR%%/public/stylesheets/application.css %%WWWDIR%%/public/stylesheets/context_menu.css @@ -1443,6 +1610,7 @@ %%WWWDIR%%/public/stylesheets/jquery/images/ui-icons_ffffff_256x240.png %%WWWDIR%%/public/stylesheets/jquery/jquery-ui-1.11.0.css %%WWWDIR%%/public/stylesheets/jstoolbar.css +%%WWWDIR%%/public/stylesheets/responsive.css %%WWWDIR%%/public/stylesheets/rtl.css %%WWWDIR%%/public/stylesheets/scm.css %%WWWDIR%%/public/themes/README @@ -1452,8 +1620,11 @@ %%WWWDIR%%/public/themes/classic/stylesheets/application.css @(,,755) %%WWWDIR%%/script/about @(,,755) %%WWWDIR%%/script/rails -%%WWWDIR%%/test/extra/redmine_pm/repository_git_test.rb -%%WWWDIR%%/test/extra/redmine_pm/repository_subversion_test.rb +%%WWWDIR%%/test/coverage/html_formatter.rb +%%WWWDIR%%/test/coverage/views/index.erb +%%WWWDIR%%/test/coverage/views/source.erb +%%WWWDIR%%/test/extra/redmine_pm/repository_git_test_pm.rb +%%WWWDIR%%/test/extra/redmine_pm/repository_subversion_test_pm.rb %%WWWDIR%%/test/extra/redmine_pm/test_case.rb %%WWWDIR%%/test/fixtures/attachments.yml %%WWWDIR%%/test/fixtures/auth_sources.yml @@ -1479,6 +1650,7 @@ %%WWWDIR%%/test/fixtures/diffs/partials.diff %%WWWDIR%%/test/fixtures/diffs/subversion.diff %%WWWDIR%%/test/fixtures/documents.yml +%%WWWDIR%%/test/fixtures/email_addresses.yml %%WWWDIR%%/test/fixtures/enabled_modules.yml %%WWWDIR%%/test/fixtures/encoding/iso-8859-1.txt %%WWWDIR%%/test/fixtures/enumerations.yml @@ -1489,6 +1661,9 @@ %%WWWDIR%%/test/fixtures/files/2010/11/101123161450_testfile_1.png %%WWWDIR%%/test/fixtures/files/2010/12/101223161450_testfile_2.png %%WWWDIR%%/test/fixtures/files/hg-export.diff +%%WWWDIR%%/test/fixtures/files/import_dates.csv +%%WWWDIR%%/test/fixtures/files/import_iso8859-1.csv +%%WWWDIR%%/test/fixtures/files/import_issues.csv %%WWWDIR%%/test/fixtures/files/iso8859-1.txt %%WWWDIR%%/test/fixtures/files/japanese-utf-8.txt %%WWWDIR%%/test/fixtures/files/testfile.txt @@ -1499,7 +1674,9 @@ %%WWWDIR%%/test/fixtures/issues.yml %%WWWDIR%%/test/fixtures/journal_details.yml %%WWWDIR%%/test/fixtures/journals.yml +%%WWWDIR%%/test/fixtures/ldap/slapd.centos6.conf %%WWWDIR%%/test/fixtures/ldap/slapd.conf +%%WWWDIR%%/test/fixtures/ldap/slapd.ubuntu.12.04.conf %%WWWDIR%%/test/fixtures/ldap/test-ldap.ldif %%WWWDIR%%/test/fixtures/mail_handler/apple_mail_with_attachment.eml %%WWWDIR%%/test/fixtures/mail_handler/body_ks_c_5601-1987.eml @@ -1514,6 +1691,8 @@ %%WWWDIR%%/test/fixtures/mail_handler/message_reply_by_subject.eml %%WWWDIR%%/test/fixtures/mail_handler/multiple_text_parts.eml %%WWWDIR%%/test/fixtures/mail_handler/no_subject_header.eml +%%WWWDIR%%/test/fixtures/mail_handler/outlook_2010_html_only.eml +%%WWWDIR%%/test/fixtures/mail_handler/outlook_web_access_2010_html_only.eml %%WWWDIR%%/test/fixtures/mail_handler/quoted_printable_utf8.eml %%WWWDIR%%/test/fixtures/mail_handler/subject_as_iso-8859-1.eml %%WWWDIR%%/test/fixtures/mail_handler/subject_japanese_1.eml @@ -1525,6 +1704,7 @@ %%WWWDIR%%/test/fixtures/mail_handler/ticket_from_emission_address.eml %%WWWDIR%%/test/fixtures/mail_handler/ticket_html_only.eml %%WWWDIR%%/test/fixtures/mail_handler/ticket_on_given_project.eml +%%WWWDIR%%/test/fixtures/mail_handler/ticket_on_project_given_by_to_header.eml %%WWWDIR%%/test/fixtures/mail_handler/ticket_reply.eml %%WWWDIR%%/test/fixtures/mail_handler/ticket_reply_with_status.eml %%WWWDIR%%/test/fixtures/mail_handler/ticket_with_attachment.eml @@ -1578,12 +1758,15 @@ %%WWWDIR%%/test/functional/calendars_controller_test.rb %%WWWDIR%%/test/functional/comments_controller_test.rb %%WWWDIR%%/test/functional/context_menus_controller_test.rb +%%WWWDIR%%/test/functional/custom_field_enumerations_controller_test.rb %%WWWDIR%%/test/functional/custom_fields_controller_test.rb %%WWWDIR%%/test/functional/documents_controller_test.rb +%%WWWDIR%%/test/functional/email_addresses_controller_test.rb %%WWWDIR%%/test/functional/enumerations_controller_test.rb %%WWWDIR%%/test/functional/files_controller_test.rb %%WWWDIR%%/test/functional/gantts_controller_test.rb %%WWWDIR%%/test/functional/groups_controller_test.rb +%%WWWDIR%%/test/functional/imports_controller_test.rb %%WWWDIR%%/test/functional/issue_categories_controller_test.rb %%WWWDIR%%/test/functional/issue_relations_controller_test.rb %%WWWDIR%%/test/functional/issue_statuses_controller_test.rb @@ -1597,6 +1780,7 @@ %%WWWDIR%%/test/functional/my_controller_test.rb %%WWWDIR%%/test/functional/news_controller_test.rb %%WWWDIR%%/test/functional/previews_controller_test.rb +%%WWWDIR%%/test/functional/principal_memberships_controller_test.rb %%WWWDIR%%/test/functional/project_enumerations_controller_test.rb %%WWWDIR%%/test/functional/projects_controller_test.rb %%WWWDIR%%/test/functional/queries_controller_test.rb @@ -1612,7 +1796,7 @@ %%WWWDIR%%/test/functional/roles_controller_test.rb %%WWWDIR%%/test/functional/search_controller_test.rb %%WWWDIR%%/test/functional/search_custom_fields_visibility_test.rb -%%WWWDIR%%/test/functional/sessions_test.rb +%%WWWDIR%%/test/functional/sessions_controller_test.rb %%WWWDIR%%/test/functional/settings_controller_test.rb %%WWWDIR%%/test/functional/sys_controller_test.rb %%WWWDIR%%/test/functional/time_entry_reports_controller_test.rb @@ -1628,6 +1812,7 @@ %%WWWDIR%%/test/functional/workflows_controller_test.rb %%WWWDIR%%/test/integration/account_test.rb %%WWWDIR%%/test/integration/admin_test.rb +%%WWWDIR%%/test/integration/api_test/api_routing_test.rb %%WWWDIR%%/test/integration/api_test/api_test.rb %%WWWDIR%%/test/integration/api_test/attachments_test.rb %%WWWDIR%%/test/integration/api_test/authentication_test.rb @@ -1636,8 +1821,6 @@ %%WWWDIR%%/test/integration/api_test/disabled_rest_api_test.rb %%WWWDIR%%/test/integration/api_test/enumerations_test.rb %%WWWDIR%%/test/integration/api_test/groups_test.rb -%%WWWDIR%%/test/integration/api_test/http_basic_login_test.rb -%%WWWDIR%%/test/integration/api_test/http_basic_login_with_api_token_test.rb %%WWWDIR%%/test/integration/api_test/issue_categories_test.rb %%WWWDIR%%/test/integration/api_test/issue_relations_test.rb %%WWWDIR%%/test/integration/api_test/issue_statuses_test.rb @@ -1649,7 +1832,6 @@ %%WWWDIR%%/test/integration/api_test/queries_test.rb %%WWWDIR%%/test/integration/api_test/roles_test.rb %%WWWDIR%%/test/integration/api_test/time_entries_test.rb -%%WWWDIR%%/test/integration/api_test/token_authentication_test.rb %%WWWDIR%%/test/integration/api_test/trackers_test.rb %%WWWDIR%%/test/integration/api_test/users_test.rb %%WWWDIR%%/test/integration/api_test/versions_test.rb @@ -1680,6 +1862,7 @@ %%WWWDIR%%/test/integration/routing/files_test.rb %%WWWDIR%%/test/integration/routing/gantts_test.rb %%WWWDIR%%/test/integration/routing/groups_test.rb +%%WWWDIR%%/test/integration/routing/imports_test.rb %%WWWDIR%%/test/integration/routing/issue_categories_test.rb %%WWWDIR%%/test/integration/routing/issue_relations_test.rb %%WWWDIR%%/test/integration/routing/issue_statuses_test.rb @@ -1691,6 +1874,7 @@ %%WWWDIR%%/test/integration/routing/my_test.rb %%WWWDIR%%/test/integration/routing/news_test.rb %%WWWDIR%%/test/integration/routing/previews_test.rb +%%WWWDIR%%/test/integration/routing/principal_memberships_test.rb %%WWWDIR%%/test/integration/routing/project_enumerations_test.rb %%WWWDIR%%/test/integration/routing/projects_test.rb %%WWWDIR%%/test/integration/routing/queries_test.rb @@ -1709,12 +1893,17 @@ %%WWWDIR%%/test/integration/routing/wiki_test.rb %%WWWDIR%%/test/integration/routing/wikis_test.rb %%WWWDIR%%/test/integration/routing/workflows_test.rb +%%WWWDIR%%/test/integration/sessions_test.rb +%%WWWDIR%%/test/integration/sudo_mode_test.rb %%WWWDIR%%/test/integration/users_test.rb %%WWWDIR%%/test/mocks/open_id_authentication_mock.rb %%WWWDIR%%/test/object_helpers.rb %%WWWDIR%%/test/test_helper.rb %%WWWDIR%%/test/ui/base.rb -%%WWWDIR%%/test/ui/issues_test.rb +%%WWWDIR%%/test/ui/custom_fields_test_ui.rb +%%WWWDIR%%/test/ui/issues_test_ui.rb +%%WWWDIR%%/test/ui/sudo_mode_test_ui.rb +%%WWWDIR%%/test/ui/timelog_test_ui.rb %%WWWDIR%%/test/unit/activity_test.rb %%WWWDIR%%/test/unit/attachment_test.rb %%WWWDIR%%/test/unit/auth_source_ldap_test.rb @@ -1734,23 +1923,32 @@ %%WWWDIR%%/test/unit/helpers/activities_helper_test.rb %%WWWDIR%%/test/unit/helpers/application_helper_test.rb %%WWWDIR%%/test/unit/helpers/custom_fields_helper_test.rb +%%WWWDIR%%/test/unit/helpers/groups_helper_test.rb %%WWWDIR%%/test/unit/helpers/issues_helper_test.rb +%%WWWDIR%%/test/unit/helpers/journals_helper_test.rb +%%WWWDIR%%/test/unit/helpers/members_helper_test.rb +%%WWWDIR%%/test/unit/helpers/my_helper_test.rb %%WWWDIR%%/test/unit/helpers/projects_helper_test.rb %%WWWDIR%%/test/unit/helpers/queries_helper_test.rb %%WWWDIR%%/test/unit/helpers/routes_helper_test.rb %%WWWDIR%%/test/unit/helpers/search_helper_test.rb +%%WWWDIR%%/test/unit/helpers/settings_helper_test.rb %%WWWDIR%%/test/unit/helpers/sort_helper_test.rb %%WWWDIR%%/test/unit/helpers/timelog_helper_test.rb %%WWWDIR%%/test/unit/helpers/version_helper_test.rb %%WWWDIR%%/test/unit/helpers/watchers_helper_test.rb +%%WWWDIR%%/test/unit/helpers/wiki_helper_test.rb %%WWWDIR%%/test/unit/initializers/patches_test.rb %%WWWDIR%%/test/unit/issue_category_test.rb %%WWWDIR%%/test/unit/issue_custom_field_test.rb +%%WWWDIR%%/test/unit/issue_import_test.rb +%%WWWDIR%%/test/unit/issue_nested_set_concurrency_test.rb %%WWWDIR%%/test/unit/issue_nested_set_test.rb %%WWWDIR%%/test/unit/issue_priority_test.rb %%WWWDIR%%/test/unit/issue_relation_test.rb %%WWWDIR%%/test/unit/issue_scopes_test.rb %%WWWDIR%%/test/unit/issue_status_test.rb +%%WWWDIR%%/test/unit/issue_subtasking_test.rb %%WWWDIR%%/test/unit/issue_test.rb %%WWWDIR%%/test/unit/issue_transaction_test.rb %%WWWDIR%%/test/unit/journal_observer_test.rb @@ -1759,8 +1957,10 @@ %%WWWDIR%%/test/unit/lib/redmine/ciphering_test.rb %%WWWDIR%%/test/unit/lib/redmine/codeset_util_test.rb %%WWWDIR%%/test/unit/lib/redmine/configuration_test.rb +%%WWWDIR%%/test/unit/lib/redmine/export/csv_test.rb %%WWWDIR%%/test/unit/lib/redmine/export/pdf_test.rb %%WWWDIR%%/test/unit/lib/redmine/field_format/bool_format_test.rb +%%WWWDIR%%/test/unit/lib/redmine/field_format/enumeration_format_test.rb %%WWWDIR%%/test/unit/lib/redmine/field_format/field_format_test.rb %%WWWDIR%%/test/unit/lib/redmine/field_format/link_format_test.rb %%WWWDIR%%/test/unit/lib/redmine/field_format/list_format_test.rb @@ -1795,9 +1995,13 @@ %%WWWDIR%%/test/unit/lib/redmine/utils/date_calculation.rb %%WWWDIR%%/test/unit/lib/redmine/views/builders/json_test.rb %%WWWDIR%%/test/unit/lib/redmine/views/builders/xml_test.rb +%%WWWDIR%%/test/unit/lib/redmine/views/labelled_form_builder_test.rb +%%WWWDIR%%/test/unit/lib/redmine/wiki_formatting/html_parser_test.rb %%WWWDIR%%/test/unit/lib/redmine/wiki_formatting/macros_test.rb -%%WWWDIR%%/test/unit/lib/redmine/wiki_formatting/markdown_formatter.rb +%%WWWDIR%%/test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb +%%WWWDIR%%/test/unit/lib/redmine/wiki_formatting/markdown_html_parser_test.rb %%WWWDIR%%/test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb +%%WWWDIR%%/test/unit/lib/redmine/wiki_formatting/textile_html_parser_test.rb %%WWWDIR%%/test/unit/lib/redmine/wiki_formatting_test.rb %%WWWDIR%%/test/unit/lib/redmine_test.rb %%WWWDIR%%/test/unit/mail_handler_test.rb @@ -1808,6 +2012,7 @@ %%WWWDIR%%/test/unit/principal_test.rb %%WWWDIR%%/test/unit/project_copy_test.rb %%WWWDIR%%/test/unit/project_members_inheritance_test.rb +%%WWWDIR%%/test/unit/project_nested_set_concurrency_test.rb %%WWWDIR%%/test/unit/project_nested_set_test.rb %%WWWDIR%%/test/unit/project_test.rb %%WWWDIR%%/test/unit/query_test.rb @@ -1838,19 +2043,23 @@ %%WWWDIR%%/test/unit/wiki_test.rb %%WWWDIR%%/test/unit/workflow_test.rb %%WWWDIR%%/test/unit/workflow_transition_test.rb +%%MYSQL%%%%WWWDIR%%/bundler.d/mysql.rb +%%POSTGRESQL%%%%WWWDIR%%/bundler.d/pg.rb +%%LDAP%%%%WWWDIR%%/bundler.d/ldap.rb +%%MARKDOWN%%%%WWWDIR%%/bundler.d/markdown.rb %%RMAGIC%%%%WWWDIR%%/bundler.d/rmagic.rb %%THIN%%%%WWWDIR%%/bundler.d/thin.rb @sample %%WWWDIR%%/config/settings.yml.sample @(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/pdf/empty @(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/test/empty @(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/thumbnails/empty -@dir %%WWWDIR%%/app/sweepers -@dir %%WWWDIR%%/lib/vendor @dir %%WWWDIR%%/test/fixtures/mailer @dir %%WWWDIR%%/test/mocks/development @dir %%WWWDIR%%/test/mocks/test @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/cache +@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/imports @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/pids @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/sessions @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/tmp/sockets +@(%%WWWOWN%%,%%WWWGRP%%,0664) %%WWWDIR%%/log/development.log @dir %%WWWDIR%%/vendor diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile index 040d27330d8..9869a1290ac 100644 --- a/x11-toolkits/p5-Prima/Makefile +++ b/x11-toolkits/p5-Prima/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Prima -PORTVERSION= 1.46 +PORTVERSION= 1.47 CATEGORIES= x11-toolkits graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,6 +14,8 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libgif.so:graphics/giflib \ libpng.so:graphics/png \ + libfreetype.so:print/freetype2 \ + libfontconfig.so:x11-fonts/fontconfig \ libtiff.so:graphics/tiff OPTIONS_DEFINE= GTK2 ICONV XFT @@ -21,7 +23,7 @@ OPTIONS_DEFAULT=ICONV XFT USES= jpeg perl5 pkgconfig USE_PERL5= configure -USE_XORG= x11 xext xpm xrender +USE_XORG= x11 xext xpm xrender xrandr MAKE_JOBS_UNSAFE= yes GTK2_CONFIGURE_OFF= WITH_GTK2=0 @@ -36,5 +38,7 @@ XFT_USE= XORG=xft post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Prima/Prima.so + ${REINPLACE_CMD} -i '' -e 's|${STAGEDIR}||' \ + ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/Prima/Config.pm .include diff --git a/x11-toolkits/p5-Prima/distinfo b/x11-toolkits/p5-Prima/distinfo index cb3bb161a4d..5bdee8b04bf 100644 --- a/x11-toolkits/p5-Prima/distinfo +++ b/x11-toolkits/p5-Prima/distinfo @@ -1,2 +1,3 @@ -SHA256 (Prima-1.46.tar.gz) = 0661c68a8303a94115f1b67e9c470d6c61fe45ea1dad7b50e0b4ae656ec43cd9 -SIZE (Prima-1.46.tar.gz) = 1407717 +TIMESTAMP = 1466520561 +SHA256 (Prima-1.47.tar.gz) = 46567771b6e06376a55fc0ed5efbbd680502f4a441bbc4be88076551efc13f59 +SIZE (Prima-1.47.tar.gz) = 1418231 diff --git a/x11-toolkits/p5-Prima/pkg-plist b/x11-toolkits/p5-Prima/pkg-plist index 3c6c6d5ba95..02465a0e92d 100644 --- a/x11-toolkits/p5-Prima/pkg-plist +++ b/x11-toolkits/p5-Prima/pkg-plist @@ -47,6 +47,7 @@ bin/tmlink %%SITE_ARCH%%/Prima/DockManager.pm %%SITE_ARCH%%/Prima/Docks.pm %%SITE_ARCH%%/Prima/Drawable.pod +%%SITE_ARCH%%/Prima/Drawable/Basic.pm %%SITE_ARCH%%/Prima/Drawable/CurvedText.pm %%SITE_ARCH%%/Prima/Drawable/Subcanvas.pm %%SITE_ARCH%%/Prima/Edit.pm @@ -178,6 +179,8 @@ bin/tmlink %%SITE_ARCH%%/Prima/Window.pod %%SITE_ARCH%%/Prima/X11.pod %%SITE_ARCH%%/Prima/codecs.pod +%%SITE_ARCH%%/Prima/conversions.gif +%%SITE_ARCH%%/Prima/curvedtext.gif %%SITE_ARCH%%/Prima/examples/Hand.gif %%SITE_ARCH%%/Prima/examples/amba.pl %%SITE_ARCH%%/Prima/examples/animate.pl @@ -234,14 +237,19 @@ bin/tmlink %%SITE_ARCH%%/Prima/examples/transparent.pl %%SITE_ARCH%%/Prima/examples/triangle.pl %%SITE_ARCH%%/Prima/faq.pod +%%SITE_ARCH%%/Prima/fills.gif %%SITE_ARCH%%/Prima/fontabc.gif %%SITE_ARCH%%/Prima/gettextbox.gif %%SITE_ARCH%%/Prima/gp-problems.pod %%SITE_ARCH%%/Prima/image-load.pod %%SITE_ARCH%%/Prima/internals.pod %%SITE_ARCH%%/Prima/leadings.gif +%%SITE_ARCH%%/Prima/lineends.gif +%%SITE_ARCH%%/Prima/linejoins.gif +%%SITE_ARCH%%/Prima/linepats.gif %%SITE_ARCH%%/Prima/noARGV.pm %%SITE_ARCH%%/Prima/noX11.pm +%%SITE_ARCH%%/Prima/scalings.gif %%SITE_ARCH%%/Prima/sys/gtk2/FileDialog.pm %%SITE_ARCH%%/Prima/sys/win32/FileDialog.pm %%SITE_ARCH%%/Prima/sys/win32/sysimage.gif @@ -260,6 +268,7 @@ bin/tmlink %%SITE_ARCH%%/Prima/tutorial/menu1.gif %%SITE_ARCH%%/Prima/tutorial/menu2.gif %%SITE_ARCH%%/Prima/tutorial/menu3.gif +%%SITE_ARCH%%/Prima/windings.gif %%SITE_ARCH%%/auto/Prima/Prima.so %%SITE_ARCH%%/gencls.pod %%PERL5_MAN1%%/VB.1.gz @@ -283,6 +292,7 @@ bin/tmlink %%PERL5_MAN3%%/Prima::DetailedOutline.3.gz %%PERL5_MAN3%%/Prima::DockManager.3.gz %%PERL5_MAN3%%/Prima::Docks.3.gz +%%PERL5_MAN3%%/Prima::Drawable::Basic.3.gz %%PERL5_MAN3%%/Prima::Drawable::CurvedText.3.gz %%PERL5_MAN3%%/Prima::Drawable::Subcanvas.3.gz %%PERL5_MAN3%%/Prima::Edit.3.gz