Update to 2.1.1

Changelog:
2.1.1

- Tiny bug fix to make sure that the help file is in the right language.

2.1.0

- Dragging and and dropping files from Windows Explorer, Thunar, etc.,
  now works (at least for me, on Windows 7 and Xubuntu).

- Updated Czech translation from Pavel Fric.

- French translation from Pierre-Alain Bandinelli.

- German translation (and many suggestions) from Rainer Krachten.

- Translations should "just work"; i.e., if you use a French locale then
  the user interface and help text should appear in French. However, you
  can force DiffPDF to use any language it supports by using the
  --language command line option (e.g., --language=fr). If an
  unsupported locale or --language option is used, DiffPDF will fall
  back to English.

- Now support -h as a synonym for --help.

- Initial path defaults to home directory instead of DiffPDF's
  installation directory.

- Improved the Options dialog's layout.

- A subtle bugfix to the --words command line option.

- Fixed a crash: clicking to set a margin when there're no PDFs loaded
  now safely does nothing.


2.0.0

- Can now have comparisons exclude text that's outside user-specified
  margins. This feature was sponsored by a company that prefers to
  remain anonymous.

- Save As can now save images as well as PDFs.

- Minor bug fixes and improvements.

- Command line help (--help) will no longer work on Windows. This is to
  avoid a spurious console window appearing. I've put the output in the
  online help though.

- Improved dock window handling so that docks can now be stacked on top
  of each other (useful for small screens).

3 files changed, 21 insertions, 22 deletions

diff --git a/print/diffpdf/Makefile b/print/diffpdf/Makefile
index 25bf810bd79..b9043cb6578 100644
--- a/print/diffpdf/Makefile
+++ b/print/diffpdf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2012/07/04 20:34:36 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2012/08/11 17:57:39 ryoon Exp $
 #
 
-DISTNAME=	diffpdf-1.9.2
-PKGREVISION=	1
+DISTNAME=	diffpdf-2.1.1
 CATEGORIES=	print
 MASTER_SITES=	http://www.qtrac.eu/
 
diff --git a/print/diffpdf/distinfo b/print/diffpdf/distinfo
index cc2916d6c5f..ab137064186 100644
--- a/print/diffpdf/distinfo
+++ b/print/diffpdf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2012/04/11 17:20:45 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2012/08/11 17:57:39 ryoon Exp $
 
-SHA1 (diffpdf-1.9.2.tar.gz) = f9c22c4b1b07c25e9a8973ad07a6b78a1270255f
-RMD160 (diffpdf-1.9.2.tar.gz) = 4041ba877eea5f1f62f96033d023a5f0ea68f04c
-Size (diffpdf-1.9.2.tar.gz) = 51045 bytes
-SHA1 (patch-aa) = 2f893d32bc18e72d0189addd89bacdff8287b4af
+SHA1 (diffpdf-2.1.1.tar.gz) = 70cb8746f777eebb7982313b6fdd6c9965a10638
+RMD160 (diffpdf-2.1.1.tar.gz) = df82720aed071b821f1f4a01e5d3cd26b8044a56
+Size (diffpdf-2.1.1.tar.gz) = 86866 bytes
+SHA1 (patch-aa) = 022a47501dd7db183e0ad5c2ee75032ecf146473
diff --git a/print/diffpdf/patches/patch-aa b/print/diffpdf/patches/patch-aa
index f40e792281a..d940e94f238 100644
--- a/print/diffpdf/patches/patch-aa
+++ b/print/diffpdf/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2012/04/11 17:20:45 ryoon Exp $
+$NetBSD: patch-aa,v 1.6 2012/08/11 17:57:39 ryoon Exp $
 
---- diffpdf.pro.orig	2012-02-28 09:36:12.000000000 +0000
+--- diffpdf.pro.orig	2012-06-04 11:20:17.000000000 +0000
 +++ diffpdf.pro
-@@ -33,9 +33,9 @@ exists($(HOME)/opt/poppler018/) {
-     INCLUDEPATH += $(HOME)/opt/poppler018/include/poppler/qt4
-     LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler018/lib -Wl,-L$(HOME)/opt/poppler018/lib
- } else {
--    exists(/usr/include/poppler/qt4) {
--	INCLUDEPATH += /usr/include/poppler/cpp
--	INCLUDEPATH += /usr/include/poppler/qt4
-+    exists($(LOCALBASE)/include/poppler/qt4) {
-+	INCLUDEPATH += $(LOCALBASE)/include/poppler/cpp
-+	INCLUDEPATH += $(LOCALBASE)/include/poppler/qt4
+@@ -46,9 +46,9 @@ exists($(HOME)/opt/poppler020/) {
+ 	INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
+ 	LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
      } else {
- 	INCLUDEPATH += /usr/local/include/poppler/cpp
- 	INCLUDEPATH += /usr/local/include/poppler/qt4
+-	exists(/usr/include/poppler/qt4) {
+-	    INCLUDEPATH += /usr/include/poppler/cpp
+-	    INCLUDEPATH += /usr/include/poppler/qt4
++	exists($(LOCALBASE)/include/poppler/qt4) {
++	    INCLUDEPATH += $(LOCALBASE)/include/poppler/cpp
++	    INCLUDEPATH += $(LOCALBASE)/include/poppler/qt4
+ 	} else {
+ 	    INCLUDEPATH += /usr/local/include/poppler/cpp
+ 	    INCLUDEPATH += /usr/local/include/poppler/qt4