diff -up xpdf-4.00/doc/sample-xpdfrc.new xpdf-4.00/doc/sample-xpdfrc
--- xpdf-4.00/doc/sample-xpdfrc.new 2017-08-08 19:22:50.000000000 -0400
+++ xpdf-4.00/doc/sample-xpdfrc 2017-08-16 17:55:27.293145138 -0400
@@ -56,7 +56,7 @@
# Set the default PostScript file or command.
-#psFile "|lpr -Pmyprinter"
+psFile "|lpr"
# Set the default PostScript paper size -- this can be letter, legal,
# A4, or A3. You can also specify a paper size as width and height
@@ -88,4 +88,19 @@
# clicked.
#launchCommand viewer-script
-#urlCommand "netscape -remote 'openURL(%s)'"
+urlCommand "xdg-open '%s'"
+
+# CJK
+include /etc/xpdf/add-to-xpdfrc.japanese
+include /etc/xpdf/add-to-xpdfrc.korean
+include /etc/xpdf/add-to-xpdfrc.chinese-simplified
+include /etc/xpdf/add-to-xpdfrc.chinese-traditional
+# Others
+include /etc/xpdf/add-to-xpdfrc.arabic
+include /etc/xpdf/add-to-xpdfrc.cyrillic
+include /etc/xpdf/add-to-xpdfrc.greek
+include /etc/xpdf/add-to-xpdfrc.hebrew
+include /etc/xpdf/add-to-xpdfrc.latin2
+include /etc/xpdf/add-to-xpdfrc.thai
+include /etc/xpdf/add-to-xpdfrc.turkish
+
diff -up xpdf-4.00/doc/xpdfrc.5.new xpdf-4.00/doc/xpdfrc.5
--- xpdf-4.00/doc/xpdfrc.5.new 2017-08-08 19:22:50.000000000 -0400
+++ xpdf-4.00/doc/xpdfrc.5 2017-08-16 17:49:01.852839167 -0400
@@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf
.I .xpdfrc
file in your home directory, it will be read. Otherwise, a
system-wide configuration file will be read from
-.IR /usr/local/etc/xpdfrc ,
+.IR /etc/xpdfrc ,
if it exists. (This is its default location; depending on build
options, it may be placed elsewhere.) On Win32 systems, the
.I xpdfrc
@@ -731,7 +731,7 @@ urlCommand "netscape \-remote 'open
.fi
.SH FILES
.TP
-.B /usr/local/etc/xpdfrc
+.B /etc/xpdfrc
This is the default location for the system-wide configuration file.
Depending on build options, it may be placed elsewhere.
.TP
diff -up xpdf-4.00/xpdf-arabic/add-to-xpdfrc.new xpdf-4.00/xpdf-arabic/add-to-xpdfrc
--- xpdf-4.00/xpdf-arabic/add-to-xpdfrc.new 2017-08-16 17:52:28.453655573 -0400
+++ xpdf-4.00/xpdf-arabic/add-to-xpdfrc 2017-08-16 17:52:35.275483522 -0400
@@ -1,3 +1,3 @@
#----- begin Arabic support package (2011-aug-15)
-unicodeMap ISO-8859-6 /usr/local/share/xpdf/arabic/ISO-8859-6.unicodeMap
+unicodeMap ISO-8859-6 /usr/share/xpdf/arabic/ISO-8859-6.unicodeMap
#----- end Arabic support package
diff -up xpdf-4.00/xpdf-chinese-simplified/add-to-xpdfrc.new xpdf-4.00/xpdf-chinese-simplified/add-to-xpdfrc
--- xpdf-4.00/xpdf-chinese-simplified/add-to-xpdfrc.new 2017-08-16 17:49:01.852839167 -0400
+++ xpdf-4.00/xpdf-chinese-simplified/add-to-xpdfrc 2017-08-16 17:50:45.754245711 -0400
@@ -1,9 +1,9 @@
#----- begin Chinese Simplified support package (2011-sep-02)
-cidToUnicode Adobe-GB1 /usr/local/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
-unicodeMap ISO-2022-CN /usr/local/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
-unicodeMap EUC-CN /usr/local/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
-unicodeMap GBK /usr/local/share/xpdf/chinese-simplified/GBK.unicodeMap
-cMapDir Adobe-GB1 /usr/local/share/xpdf/chinese-simplified/CMap
-toUnicodeDir /usr/local/share/xpdf/chinese-simplified/CMap
+cidToUnicode Adobe-GB1 /usr/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
+unicodeMap ISO-2022-CN /usr/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
+unicodeMap EUC-CN /usr/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
+unicodeMap GBK /usr/share/xpdf/chinese-simplified/GBK.unicodeMap
+cMapDir Adobe-GB1 /usr/share/xpdf/chinese-simplified/CMap
+toUnicodeDir /usr/share/xpdf/chinese-simplified/CMap
#fontFileCC Adobe-GB1 /usr/..../NotoSansCJKsc-Regular.otf
#----- end Chinese Simplified support package
diff -up xpdf-4.00/xpdf-chinese-traditional/add-to-xpdfrc.new xpdf-4.00/xpdf-chinese-traditional/add-to-xpdfrc
--- xpdf-4.00/xpdf-chinese-traditional/add-to-xpdfrc.new 2017-08-16 17:49:01.852839167 -0400
+++ xpdf-4.00/xpdf-chinese-traditional/add-to-xpdfrc 2017-08-16 17:51:00.657869833 -0400
@@ -1,8 +1,8 @@
#----- begin Chinese Traditional support package (2011-sep-02)
-cidToUnicode Adobe-CNS1 /usr/local/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
-unicodeMap Big5 /usr/local/share/xpdf/chinese-traditional/Big5.unicodeMap
-unicodeMap Big5ascii /usr/local/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
-cMapDir Adobe-CNS1 /usr/local/share/xpdf/chinese-traditional/CMap
-toUnicodeDir /usr/local/share/xpdf/chinese-traditional/CMap
+cidToUnicode Adobe-CNS1 /usr/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
+unicodeMap Big5 /usr/share/xpdf/chinese-traditional/Big5.unicodeMap
+unicodeMap Big5ascii /usr/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
+cMapDir Adobe-CNS1 /usr/share/xpdf/chinese-traditional/CMap
+toUnicodeDir /usr/share/xpdf/chinese-traditional/CMap
#fontFileCC Adobe-CNS1 /usr/..../NotoSansCJKtc-Regular.otf"
#----- end Chinese Traditional support package
diff -up xpdf-4.00/xpdf-cyrillic/add-to-xpdfrc.new xpdf-4.00/xpdf-cyrillic/add-to-xpdfrc
--- xpdf-4.00/xpdf-cyrillic/add-to-xpdfrc.new 2011-08-15 17:24:29.000000000 -0400
+++ xpdf-4.00/xpdf-cyrillic/add-to-xpdfrc 2017-08-16 17:49:01.852839167 -0400
@@ -1,4 +1,4 @@
#----- begin Cyrillic support package (2011-aug-15)
-nameToUnicode /usr/local/share/xpdf/cyrillic/Bulgarian.nameToUnicode
-unicodeMap KOI8-R /usr/local/share/xpdf/cyrillic/KOI8-R.unicodeMap
+nameToUnicode /usr/share/xpdf/cyrillic/Bulgarian.nameToUnicode
+unicodeMap KOI8-R /usr/share/xpdf/cyrillic/KOI8-R.unicodeMap
#----- end Cyrillic support package
diff -up xpdf-4.00/xpdf-greek/add-to-xpdfrc.new xpdf-4.00/xpdf-greek/add-to-xpdfrc
--- xpdf-4.00/xpdf-greek/add-to-xpdfrc.new 2017-08-16 17:52:59.677868080 -0400
+++ xpdf-4.00/xpdf-greek/add-to-xpdfrc 2017-08-16 17:53:08.733639688 -0400
@@ -1,4 +1,4 @@
#----- begin Greek support package (2011-aug-15)
-nameToUnicode /usr/local/share/xpdf/greek/Greek.nameToUnicode
-unicodeMap ISO-8859-7 /usr/local/share/xpdf/greek/ISO-8859-7.unicodeMap
+nameToUnicode /usr/share/xpdf/greek/Greek.nameToUnicode
+unicodeMap ISO-8859-7 /usr/share/xpdf/greek/ISO-8859-7.unicodeMap
#----- end Greek support package
diff -up xpdf-4.00/xpdf-hebrew/add-to-xpdfrc.new xpdf-4.00/xpdf-hebrew/add-to-xpdfrc
--- xpdf-4.00/xpdf-hebrew/add-to-xpdfrc.new 2017-08-16 17:52:08.484159215 -0400
+++ xpdf-4.00/xpdf-hebrew/add-to-xpdfrc 2017-08-16 17:52:19.940870269 -0400
@@ -1,4 +1,4 @@
#----- begin Hebrew support package (2011-aug-15)
-unicodeMap ISO-8859-8 /usr/local/share/xpdf/hebrew/ISO-8859-8.unicodeMap
-unicodeMap Windows-1255 /usr/local/share/xpdf/hebrew/Windows-1255.unicodeMap
+unicodeMap ISO-8859-8 /usr/share/xpdf/hebrew/ISO-8859-8.unicodeMap
+unicodeMap Windows-1255 /usr/share/xpdf/hebrew/Windows-1255.unicodeMap
#----- end Hebrew support package
diff -up xpdf-4.00/xpdf-japanese/add-to-xpdfrc.new xpdf-4.00/xpdf-japanese/add-to-xpdfrc
--- xpdf-4.00/xpdf-japanese/add-to-xpdfrc.new 2017-08-16 17:49:01.852839167 -0400
+++ xpdf-4.00/xpdf-japanese/add-to-xpdfrc 2017-08-16 17:50:00.990367958 -0400
@@ -1,9 +1,9 @@
#----- begin Japanese support package (2011-sep-02)
-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
-unicodeMap ISO-2022-JP /usr/local/share/xpdf/japanese/ISO-2022-JP.unicodeMap
-unicodeMap EUC-JP /usr/local/share/xpdf/japanese/EUC-JP.unicodeMap
-unicodeMap Shift-JIS /usr/local/share/xpdf/japanese/Shift-JIS.unicodeMap
-cMapDir Adobe-Japan1 /usr/local/share/xpdf/japanese/CMap
-toUnicodeDir /usr/local/share/xpdf/japanese/CMap
+cidToUnicode Adobe-Japan1 /usr/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
+unicodeMap ISO-2022-JP /usr/share/xpdf/japanese/ISO-2022-JP.unicodeMap
+unicodeMap EUC-JP /usr/share/xpdf/japanese/EUC-JP.unicodeMap
+unicodeMap Shift-JIS /usr/share/xpdf/japanese/Shift-JIS.unicodeMap
+cMapDir Adobe-Japan1 /usr/share/xpdf/japanese/CMap
+toUnicodeDir /usr/share/xpdf/japanese/CMap
#fontFileCC Adobe-Japan1 /usr/..../NotoSansCJKjp-Regular.otf
#----- end Japanese support package
diff -up xpdf-4.00/xpdf-korean/add-to-xpdfrc.new xpdf-4.00/xpdf-korean/add-to-xpdfrc
--- xpdf-4.00/xpdf-korean/add-to-xpdfrc.new 2017-08-16 17:49:01.853839142 -0400
+++ xpdf-4.00/xpdf-korean/add-to-xpdfrc 2017-08-16 17:50:22.453833361 -0400
@@ -1,7 +1,7 @@
#----- begin Korean support package (2011-sep-02)
-cidToUnicode Adobe-Korea1 /usr/local/share/xpdf/korean/Adobe-Korea1.cidToUnicode
-unicodeMap ISO-2022-KR /usr/local/share/xpdf/korean/ISO-2022-KR.unicodeMap
-cMapDir Adobe-Korea1 /usr/local/share/xpdf/korean/CMap
-toUnicodeDir /usr/local/share/xpdf/korean/CMap
+cidToUnicode Adobe-Korea1 /usr/share/xpdf/korean/Adobe-Korea1.cidToUnicode
+unicodeMap ISO-2022-KR /usr/share/xpdf/korean/ISO-2022-KR.unicodeMap
+cMapDir Adobe-Korea1 /usr/share/xpdf/korean/CMap
+toUnicodeDir /usr/share/xpdf/korean/CMap
#fontFileCC Adobe-Korea1 /usr/..../NotoSansCJKkr-Regular.otf
#----- end Korean support package
diff -up xpdf-4.00/xpdf-latin2/add-to-xpdfrc.new xpdf-4.00/xpdf-latin2/add-to-xpdfrc
--- xpdf-4.00/xpdf-latin2/add-to-xpdfrc.new 2017-08-16 17:52:45.862216519 -0400
+++ xpdf-4.00/xpdf-latin2/add-to-xpdfrc 2017-08-16 17:52:51.658070344 -0400
@@ -1,3 +1,3 @@
#----- begin Latin2 support package (2011-aug-15)
-unicodeMap Latin2 /usr/local/share/xpdf/latin2/Latin2.unicodeMap
+unicodeMap Latin2 /usr/share/xpdf/latin2/Latin2.unicodeMap
#----- end Latin2 support package
diff -up xpdf-4.00/xpdf-thai/add-to-xpdfrc.new xpdf-4.00/xpdf-thai/add-to-xpdfrc
--- xpdf-4.00/xpdf-thai/add-to-xpdfrc.new 2011-08-15 17:24:29.000000000 -0400
+++ xpdf-4.00/xpdf-thai/add-to-xpdfrc 2017-08-16 17:49:01.853839142 -0400
@@ -1,4 +1,4 @@
#----- begin Thai support package (2011-aug-15)
-nameToUnicode /usr/local/share/xpdf/thai/Thai.nameToUnicode
-unicodeMap TIS-620 /usr/local/share/xpdf/thai/TIS-620.unicodeMap
+nameToUnicode /usr/share/xpdf/thai/Thai.nameToUnicode
+unicodeMap TIS-620 /usr/share/xpdf/thai/TIS-620.unicodeMap
#----- end Thai support package
diff -up xpdf-4.00/xpdf-turkish/add-to-xpdfrc.new xpdf-4.00/xpdf-turkish/add-to-xpdfrc
--- xpdf-4.00/xpdf-turkish/add-to-xpdfrc.new 2017-08-16 17:53:20.954331475 -0400
+++ xpdf-4.00/xpdf-turkish/add-to-xpdfrc 2017-08-16 17:53:28.037152842 -0400
@@ -1,3 +1,3 @@
#----- begin Turkish support package (2011-aug-15)
-unicodeMap ISO-8859-9 /usr/local/share/xpdf/turkish/ISO-8859-9.unicodeMap
+unicodeMap ISO-8859-9 /usr/share/xpdf/turkish/ISO-8859-9.unicodeMap
#----- end Turkish support package