From 7ae7b018ccf7760013f368fcb83aad9ecd8982a8 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 20 Jun 2016 16:23:28 +0000
Subject: With the power of USES=dos2unix, get rid of most patches and files
 with CRLF.

While there, run make makepatch, rename patches to use the new scheme,
and various fixes.

With hat:	portmgr
Sponsored by:	Absolight
---
 devel/itext/files/patch-ant_.ant.properties        |  6 +--
 devel/itext/files/patch-ant_compile.xml            |  4 +-
 devel/itext/files/patch-ant_site.xml               |  4 +-
 ...atch-core_com_lowagie_text_pdf_PRTokeniser.java |  6 +--
 .../patch-core_com_lowagie_text_pdf_PdfReader.java |  6 +--
 ...ch-core_com_lowagie_text_pdf_PdfStamperImp.java |  6 +--
 ...ch-core_com_lowagie_text_xml_xmp_XmpReader.java | 46 +++++++++++-----------
 7 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'devel/itext/files')

diff --git a/devel/itext/files/patch-ant_.ant.properties b/devel/itext/files/patch-ant_.ant.properties
index 485a242a2fd7..b4a724d540e9 100644
--- a/devel/itext/files/patch-ant_.ant.properties
+++ b/devel/itext/files/patch-ant_.ant.properties
@@ -1,6 +1,6 @@
---- ant/.ant.properties.orig	2010-01-12 10:03:11.000000000 +0100
-+++ ant/.ant.properties	2010-01-12 10:05:47.000000000 +0100
-@@ -3,7 +3,7 @@
+--- ant/.ant.properties.orig	2009-11-27 12:59:39 UTC
++++ ant/.ant.properties
+@@ -3,7 +3,7 @@ releasedate=2009-11-27
  
  itext.home=../..
  
diff --git a/devel/itext/files/patch-ant_compile.xml b/devel/itext/files/patch-ant_compile.xml
index a2e382df3e07..66c2e586c740 100644
--- a/devel/itext/files/patch-ant_compile.xml
+++ b/devel/itext/files/patch-ant_compile.xml
@@ -1,5 +1,5 @@
---- ant/compile.xml.orig	2009-06-08 02:50:15.000000000 +0200
-+++ ant/compile.xml	2011-11-24 20:55:01.000000000 +0100
+--- ant/compile.xml.orig	2009-06-08 00:50:15 UTC
++++ ant/compile.xml
 @@ -92,11 +92,17 @@
                  <include name="**/*.html"/>
              </fileset>
diff --git a/devel/itext/files/patch-ant_site.xml b/devel/itext/files/patch-ant_site.xml
index 74941b60a43c..feaa67895591 100644
--- a/devel/itext/files/patch-ant_site.xml
+++ b/devel/itext/files/patch-ant_site.xml
@@ -1,5 +1,5 @@
---- ant/site.xml.orig	2014-06-05 07:50:18.377016755 +0000
-+++ ant/site.xml	2014-06-05 07:49:27.026098152 +0000
+--- ant/site.xml.orig	2009-06-08 00:50:15 UTC
++++ ant/site.xml
 @@ -65,7 +65,7 @@
          <javadoc
              destdir="${itext.docs}"
diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java
index b9d3044f4773..15ae507fe6ae 100644
--- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java
+++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java
@@ -1,6 +1,6 @@
---- core/com/lowagie/text/pdf/PRTokeniser.java.orig	2012-07-03 16:02:24.000000000 +0200
-+++ core/com/lowagie/text/pdf/PRTokeniser.java	2012-07-03 16:03:30.000000000 +0200
-@@ -281,6 +281,12 @@
+--- core/com/lowagie/text/pdf/PRTokeniser.java.orig	2016-06-20 15:02:42 UTC
++++ core/com/lowagie/text/pdf/PRTokeniser.java
+@@ -281,6 +281,12 @@ public class PRTokeniser {
                  }
              }
          }
diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java
index 270aa60a4876..3ea8d60aaabe 100644
--- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java
+++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java
@@ -1,6 +1,6 @@
---- core/com/lowagie/text/pdf/PdfReader.java.orig	2012-01-27 11:27:08.000000000 +0100
-+++ core/com/lowagie/text/pdf/PdfReader.java	2012-01-27 11:27:41.000000000 +0100
-@@ -1464,7 +1464,7 @@
+--- core/com/lowagie/text/pdf/PdfReader.java.orig	2016-06-20 15:02:42 UTC
++++ core/com/lowagie/text/pdf/PdfReader.java
+@@ -1464,7 +1464,7 @@ public class PdfReader implements PdfVie
              }
          }
          thisStream *= 2;
diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java
index 611d5122a57b..4a831740f244 100644
--- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java
+++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java
@@ -1,6 +1,6 @@
---- core/com/lowagie/text/pdf/PdfStamperImp.java.orig	2009-11-16 13:48:42.000000000 +0100
-+++ core/com/lowagie/text/pdf/PdfStamperImp.java	2012-07-12 10:27:01.000000000 +0200
-@@ -208,8 +208,17 @@
+--- core/com/lowagie/text/pdf/PdfStamperImp.java.orig	2016-06-20 15:02:42 UTC
++++ core/com/lowagie/text/pdf/PdfStamperImp.java
+@@ -208,8 +208,17 @@ class PdfStamperImp extends PdfWriter {
          }
          // metadata
          int skipInfo = -1;
diff --git a/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java b/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java
index f4fee55a92de..865385e5d65e 100644
--- a/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java
+++ b/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java
@@ -1,23 +1,23 @@
---- core/com/lowagie/text/xml/xmp/XmpReader.java.orig	2011-11-24 16:34:23.000000000 +0100
-+++ core/com/lowagie/text/xml/xmp/XmpReader.java	2011-11-24 16:41:54.000000000 +0100
-@@ -103,8 +103,19 @@
- 	public boolean replace(String namespaceURI, String localName, String value) {
- 		NodeList nodes = domDocument.getElementsByTagNameNS(namespaceURI, localName);
- 		Node node;
--		if (nodes.getLength() == 0)
-+		if (nodes.getLength() == 0) {
-+			nodes = domDocument.getElementsByTagNameNS("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "Description");
-+			if (nodes.getLength() == 0) return false;
-+			for (int i = 0; i < nodes.getLength(); i++) {
-+				node = nodes.item(i);
-+				Node attribute = node.getAttributes().getNamedItemNS(namespaceURI, localName);
-+				if (attribute != null) {
-+					attribute.setNodeValue(value);
-+					return true;
-+				}
-+			}
- 			return false;
-+		}
- 		for (int i = 0; i < nodes.getLength(); i++) {
- 			node = nodes.item(i);
- 			setNodeText(domDocument, node, value);
+--- core/com/lowagie/text/xml/xmp/XmpReader.java.orig	2016-06-20 15:02:42 UTC
++++ core/com/lowagie/text/xml/xmp/XmpReader.java
+@@ -103,8 +103,19 @@ public class XmpReader {
+ 	public boolean replace(String namespaceURI, String localName, String value) {
+ 		NodeList nodes = domDocument.getElementsByTagNameNS(namespaceURI, localName);
+ 		Node node;
+-		if (nodes.getLength() == 0)
++		if (nodes.getLength() == 0) {
++			nodes = domDocument.getElementsByTagNameNS("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "Description");
++			if (nodes.getLength() == 0) return false;
++			for (int i = 0; i < nodes.getLength(); i++) {
++				node = nodes.item(i);
++				Node attribute = node.getAttributes().getNamedItemNS(namespaceURI, localName);
++				if (attribute != null) {
++					attribute.setNodeValue(value);
++					return true;
++				}
++			}
+ 			return false;
++		}
+ 		for (int i = 0; i < nodes.getLength(); i++) {
+ 			node = nodes.item(i);
+ 			setNodeText(domDocument, node, value);
-- 
cgit v1.2.3