CVS commit: [pkgsrc-2017Q1] pkgsrc/devel/rt3

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Apr 29 11:56:26 UTC 2017

Modified Files:
        pkgsrc/devel/rt3 [pkgsrc-2017Q1]: Makefile distinfo
Added Files:
        pkgsrc/devel/rt3/patches [pkgsrc-2017Q1]: patch-bin_rt.in
            patch-share_html_REST_1.0_Forms_ticket_default

Log Message:
Pullup ticket #5319 - requested by sevan
devel/rt3: build fix

Revisions pulled up:
- devel/rt3/Makefile                                            1.64
- devel/rt3/distinfo                                            1.28
- devel/rt3/patches/patch-bin_rt.in                             1.1
- devel/rt3/patches/patch-share_html_REST_1.0_Forms_ticket_default 1.1

---
   Module Name:    pkgsrc
   Committed By:   spz
   Date:           Wed Apr 19 06:34:10 UTC 2017

   Modified Files:
           pkgsrc/devel/rt3: Makefile distinfo
   Added Files:
           pkgsrc/devel/rt3/patches: patch-bin_rt.in
               patch-share_html_REST_1.0_Forms_ticket_default

   Log Message:
   add perl24 updates that escaped me - from leot@


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.2.1 pkgsrc/devel/rt3/Makefile
cvs rdiff -u -r1.27 -r1.27.2.1 pkgsrc/devel/rt3/distinfo
cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/devel/rt3/patches/patch-bin_rt.in \
    pkgsrc/devel/rt3/patches/patch-share_html_REST_1.0_Forms_ticket_default

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

Modified files:

Index: pkgsrc/devel/rt3/Makefile
diff -u pkgsrc/devel/rt3/Makefile:1.63 pkgsrc/devel/rt3/Makefile:1.63.2.1
--- pkgsrc/devel/rt3/Makefile:1.63      Sun Mar 12 19:55:49 2017
+++ pkgsrc/devel/rt3/Makefile   Sat Apr 29 11:56:26 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2017/03/12 19:55:49 spz Exp $
+# $NetBSD: Makefile,v 1.63.2.1 2017/04/29 11:56:26 bsiegert Exp $
 
 DISTNAME=              rt-3.8.17
-PKGREVISION=           8
+PKGREVISION=           9
 CATEGORIES=            devel
 MASTER_SITES=          http://download.bestpractical.com/pub/rt/release/
 

Index: pkgsrc/devel/rt3/distinfo
diff -u pkgsrc/devel/rt3/distinfo:1.27 pkgsrc/devel/rt3/distinfo:1.27.2.1
--- pkgsrc/devel/rt3/distinfo:1.27      Sun Mar 12 19:55:49 2017
+++ pkgsrc/devel/rt3/distinfo   Sat Apr 29 11:56:26 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2017/03/12 19:55:49 spz Exp $
+$NetBSD: distinfo,v 1.27.2.1 2017/04/29 11:56:26 bsiegert Exp $
 
 SHA1 (rt-3.8.17.tar.gz) = 4765c68f91a0e8e21ed0fd39397cd8e3970ca992
 RMD160 (rt-3.8.17.tar.gz) = 6da8fca56976233417bd47b26e1a7326fde5d2d0
@@ -6,6 +6,7 @@ SHA512 (rt-3.8.17.tar.gz) = 8ea1069c5457
 Size (rt-3.8.17.tar.gz) = 5728368 bytes
 SHA1 (patch-aa) = 6f78710f4460a25c75afbdf7128c0fe34914927c
 SHA1 (patch-ab) = ee455dd683c84d3a745a29a132e28903ba03144d
+SHA1 (patch-bin_rt.in) = 19464de8c541bb7bd23c5bdb0ffafd1161be3342
 SHA1 (patch-lib_RT.pm) = 6544ae59a8da37b1fe41df69ab459c85e67756d0
 SHA1 (patch-lib_RT_CustomFieldValues_External.pm) = 4404ca98c9e50687323892df1aa95c8b5a6dedd9
 SHA1 (patch-lib_RT_Date.pm) = 09d454c7ee81baa49b7c0452e52df4dba839c78c
@@ -15,6 +16,7 @@ SHA1 (patch-lib_RT_Interface_Web.pm) = 4
 SHA1 (patch-sbin_rt-attributes-viewer) = e1c963800b76282cda4ca46e006f30d9abfc29c9
 SHA1 (patch-sbin_rt-attributes-viewer.in) = 99a15cca9a394b5743edc3929f43593f1384c8da
 SHA1 (patch-share_html_Helpers_CalPopup.html) = 3920ac6448d1d21c7ff32ef67344b19aa53616a4
+SHA1 (patch-share_html_REST_1.0_Forms_ticket_default) = 5cb5e35a02824d4a04005251dfd824a1debf59a1
 SHA1 (patch-share_html_Search_Elements_ResultsRSSView) = 62eeea9f4bea1bb98fd3509748123ecca3256185
 SHA1 (patch-t_approval_admincc.t) = 4fddf5fa844d15e8698e00fe6863daaafa661315
 SHA1 (patch-t_approval_basic.t) = 209303cc34370518a2600e28570627e1dc7e698b

Added files:

Index: pkgsrc/devel/rt3/patches/patch-bin_rt.in
diff -u /dev/null pkgsrc/devel/rt3/patches/patch-bin_rt.in:1.1.2.2
--- /dev/null   Sat Apr 29 11:56:26 2017
+++ pkgsrc/devel/rt3/patches/patch-bin_rt.in    Sat Apr 29 11:56:26 2017
@@ -0,0 +1,26 @@
+$NetBSD: patch-bin_rt.in,v 1.1.2.2 2017/04/29 11:56:26 bsiegert Exp $
+
+Properly escape braces to make it compatible with Perl >=5.24.
+
+--- bin/rt.in.orig     2013-05-22 19:03:04.000000000 +0000
++++ bin/rt.in
+@@ -1531,15 +1531,15 @@ sub vsplit {
+                 }
+                 push @words, $s;
+             }
+-            elsif ( $a =~ /^q{/ ) {
++            elsif ( $a =~ /^q\{/ ) {
+                 my $s = $a;
+-                while ( $a !~ /}$/ ) {
++                while ( $a !~ /\}$/ ) {
+                     ( $a, $b ) =
+                       split /\s*,\s*/, $b, 2;
+                     $s .= ',' . $a;
+                 }
+-                $s =~ s/^q{/'/;
+-                $s =~ s/}/'/;
++                $s =~ s/^q\{/'/;
++                $s =~ s/\}/'/;
+                 push @words, $s;
+             }
+             else {
Index: pkgsrc/devel/rt3/patches/patch-share_html_REST_1.0_Forms_ticket_default
diff -u /dev/null pkgsrc/devel/rt3/patches/patch-share_html_REST_1.0_Forms_ticket_default:1.1.2.2
--- /dev/null   Sat Apr 29 11:56:26 2017
+++ pkgsrc/devel/rt3/patches/patch-share_html_REST_1.0_Forms_ticket_default     Sat Apr 29 11:56:26 2017
@@ -0,0 +1,25 @@
+$NetBSD: patch-share_html_REST_1.0_Forms_ticket_default,v 1.1.2.2 2017/04/29 11:56:26 bsiegert Exp $
+
+Properly escape braces to make it compatible with Perl >=5.24.
+
+--- share/html/REST/1.0/Forms/ticket/default.orig      2013-05-22 19:03:04.000000000 +0000
++++ share/html/REST/1.0/Forms/ticket/default
+@@ -383,14 +383,14 @@ else {
+                             $s =~ s/\\'/'/g;
+                             push @new, $s;
+                         }
+-                        elsif ( $a =~ /^q{/ ) {
++                        elsif ( $a =~ /^q\{/ ) {
+                             my $s = $a;
+-                            while ( $a !~ /}$/ ) {
++                            while ( $a !~ /\}$/ ) {
+                                 ( $a, $b ) = split /\s*,\s*/, $b, 2;
+                                 $s .= ',' . $a;
+                             }
+-                            $s =~ s/^q{//;
+-                            $s =~ s/}//;
++                            $s =~ s/^q\{//;
++                            $s =~ s/\}//;
+                             push @new, $s;
+                         }
+                         else {