CVS commit: pkgsrc/devel/phabricator

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Fri Mar 17 21:16:38 UTC 2017

Modified Files:
        pkgsrc/devel/phabricator: Makefile distinfo
Added Files:
        pkgsrc/devel/phabricator/patches:
            patch-src_applications_differential_render_DifferentialChangesetRenderer.php
            patch-src_applications_diffusion_controller_DiffusionBrowseController.php

Log Message:
Leave tab stops alone.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/phabricator/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/phabricator/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/phabricator/patches/patch-src_applications_differential_render_DifferentialChangesetRenderer.php \
    pkgsrc/devel/phabricator/patches/patch-src_applications_diffusion_controller_DiffusionBrowseController.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/phabricator/Makefile
diff -u pkgsrc/devel/phabricator/Makefile:1.4 pkgsrc/devel/phabricator/Makefile:1.5
--- pkgsrc/devel/phabricator/Makefile:1.4       Fri Mar 17 12:40:58 2017
+++ pkgsrc/devel/phabricator/Makefile   Fri Mar 17 21:16:38 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/03/17 12:40:58 roy Exp $
+# $NetBSD: Makefile,v 1.5 2017/03/17 21:16:38 roy Exp $
 
 DISTNAME=              phabricator-20170316
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=phacility/}
 GITHUB_PROJECT=                phabricator
@@ -85,7 +86,8 @@ post-extract:
 
 do-install:
                        cd ${WRKSRC} && \
-                       ${PAX} -rw * ${DESTDIR}${PREFIX}/${PHABRICATOR_DIR}
+                       ${PAX} -rw * -s',.*\.orig$$,,' \
+                               ${DESTDIR}${PREFIX}/${PHABRICATOR_DIR}
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/phabricator/distinfo
diff -u pkgsrc/devel/phabricator/distinfo:1.2 pkgsrc/devel/phabricator/distinfo:1.3
--- pkgsrc/devel/phabricator/distinfo:1.2       Fri Mar 17 12:40:58 2017
+++ pkgsrc/devel/phabricator/distinfo   Fri Mar 17 21:16:38 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2017/03/17 12:40:58 roy Exp $
+$NetBSD: distinfo,v 1.3 2017/03/17 21:16:38 roy Exp $
 
 SHA1 (phabricator-20170316-6f879559707c57006a1a95d839e2e2e6c64a5ff6.tar.gz) = 6f8c35df74649cb2b207754f0aec7aa71c1f3a68
 RMD160 (phabricator-20170316-6f879559707c57006a1a95d839e2e2e6c64a5ff6.tar.gz) = 8f31cbeec4f36ca5a9f88283201c3ed9fb3c0c31
 SHA512 (phabricator-20170316-6f879559707c57006a1a95d839e2e2e6c64a5ff6.tar.gz) = 
fe53cd945e1ee5b75db478ae3496d2d3fc3326cc52e2704fde7f393f9bae329d5e454ce16dcaf97e77a124b7a317770e069ee0d8e9ea24c10e59bc45c253548c
 Size (phabricator-20170316-6f879559707c57006a1a95d839e2e2e6c64a5ff6.tar.gz) = 9253359 bytes
+SHA1 (patch-src_applications_differential_render_DifferentialChangesetRenderer.php) = 0067d3f0ee6513396a40c98c231cf53e1179e160
+SHA1 (patch-src_applications_diffusion_controller_DiffusionBrowseController.php) = 3e028a90593b50610488583f2e064e06f8a6aed0

Added files:

Index: pkgsrc/devel/phabricator/patches/patch-src_applications_differential_render_DifferentialChangesetRenderer.php
diff -u /dev/null pkgsrc/devel/phabricator/patches/patch-src_applications_differential_render_DifferentialChangesetRenderer.php:1.1
--- /dev/null   Fri Mar 17 21:16:38 2017
+++ pkgsrc/devel/phabricator/patches/patch-src_applications_differential_render_DifferentialChangesetRenderer.php       Fri Mar 17 21:16:38 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_applications_differential_render_DifferentialChangesetRenderer.php,v 1.1 2017/03/17 21:16:38 roy Exp $
+
+Leave tab stops alone.
+
+--- src/applications/differential/render/DifferentialChangesetRenderer.php.orig        2017-03-17 19:59:28.971453778 +0000
++++ src/applications/differential/render/DifferentialChangesetRenderer.php
+@@ -366,7 +366,7 @@ abstract class DifferentialChangesetRend
+     // TODO: Let the user customize their tab width / display style.
+     // TODO: We should possibly post-process "\r" as well.
+     // TODO: Both these steps should happen earlier.
+-    $result = str_replace("\t", '  ', $result);
++    // $result = str_replace("\t", '  ', $result);
+ 
+     return phutil_safe_html($result);
+   }
Index: pkgsrc/devel/phabricator/patches/patch-src_applications_diffusion_controller_DiffusionBrowseController.php
diff -u /dev/null pkgsrc/devel/phabricator/patches/patch-src_applications_diffusion_controller_DiffusionBrowseController.php:1.1
--- /dev/null   Fri Mar 17 21:16:38 2017
+++ pkgsrc/devel/phabricator/patches/patch-src_applications_diffusion_controller_DiffusionBrowseController.php  Fri Mar 17 21:16:38 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_applications_diffusion_controller_DiffusionBrowseController.php,v 1.1 2017/03/17 21:16:38 roy Exp $
+
+Leave tab stops alone.
+
+--- src/applications/diffusion/controller/DiffusionBrowseController.php.orig   2017-03-16 16:52:01.000000000 +0000
++++ src/applications/diffusion/controller/DiffusionBrowseController.php
+@@ -1289,7 +1289,7 @@ final class DiffusionBrowseController ex
+           "\xE2\x80\x8B",
+ 
+           // TODO: [HTML] Not ideal.
+-          phutil_safe_html(str_replace("\t", '  ', $line['data'])),
++          // phutil_safe_html(str_replace("\t", '  ', $line['data'])),
+         ));
+ 
+       if ($this->coverage) {