Index: chinese/xpdf/Makefile
===================================================================
RCS file: /home/pcvs/ports/chinese/xpdf/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- chinese/xpdf/Makefile	2 May 2011 12:44:28 -0000	1.21
+++ chinese/xpdf/Makefile	9 Aug 2011 23:25:36 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	chinese graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
@@ -15,8 +15,8 @@
 		http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	support/xpdf
 PKGNAMESUFFIX=	-zhfont
-DISTFILES=	xpdf-chinese-simplified-2004-jul-27.tar.gz \
-		xpdf-chinese-traditional-2004-jul-27.tar.gz
+DISTFILES=	xpdf-chinese-simplified-2011-jun-29.tar.gz \
+		xpdf-chinese-traditional-2011-jun-29.tar.gz
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Chinese font support for xpdf
Index: chinese/xpdf/distinfo
===================================================================
RCS file: /home/pcvs/ports/chinese/xpdf/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- chinese/xpdf/distinfo	19 Mar 2011 12:29:54 -0000	1.7
+++ chinese/xpdf/distinfo	9 Aug 2011 23:25:36 -0000
@@ -1,4 +1,4 @@
-SHA256 (xpdf-chinese-simplified-2004-jul-27.tar.gz) = ac886f7bccdc7c70fcfcbd9916ea907a93f0fe698ff7ca81da8f312c7fab07d7
-SIZE (xpdf-chinese-simplified-2004-jul-27.tar.gz) = 835960
-SHA256 (xpdf-chinese-traditional-2004-jul-27.tar.gz) = 49269682ac4b5af2b54763dd2fe7f539ba0ec2452f0545980f4927ffa2a5f2ed
-SIZE (xpdf-chinese-traditional-2004-jul-27.tar.gz) = 794604
+SHA256 (xpdf-chinese-simplified-2011-jun-29.tar.gz) = d59a8f08b954c33ceff5fbee790f44b687aa79313d84967ad86c5e58eec2e424
+SIZE (xpdf-chinese-simplified-2011-jun-29.tar.gz) = 904312
+SHA256 (xpdf-chinese-traditional-2011-jun-29.tar.gz) = c4b5e6d10b8349b8f328ef4a8d60797678524bda439868c1e89f49059fb9d879
+SIZE (xpdf-chinese-traditional-2011-jun-29.tar.gz) = 907154
Index: graphics/xpdf/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/xpdf/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- graphics/xpdf/Makefile	5 Aug 2011 15:39:21 -0000	1.99
+++ graphics/xpdf/Makefile	9 Aug 2011 23:25:36 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -22,8 +22,7 @@
 COMMENT=	Display PDF files, and convert them to other formats
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
 
 CONFLICTS=	poppler-utils-0.*
@@ -33,8 +32,7 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-opi \
-		--with-t1-library="${LOCALBASE}/lib" \
-		--with-t1-includes="${LOCALBASE}/include" \
+		--with-t1-library=no \
 		--with-freetype2-library="${LOCALBASE}/lib" \
 		--with-freetype2-includes="${LOCALBASE}/include/freetype2"
 
Index: graphics/xpdf/files/patch-splash_Makefile.in
===================================================================
RCS file: graphics/xpdf/files/patch-splash_Makefile.in
diff -N graphics/xpdf/files/patch-splash_Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ graphics/xpdf/files/patch-splash_Makefile.in	9 Aug 2011 23:25:36 -0000
@@ -0,0 +1,11 @@
+--- splash/Makefile.in.orig	2007-02-27 17:05:52.000000000 -0500
++++ splash/Makefile.in	2011-08-09 17:56:32.000000000 -0400
+@@ -16,7 +16,7 @@
+ FOFISRCDIR = $(srcdir)/../fofi
+ FOFILIBDIR = ../fofi
+ 
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
++CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(srcdir) @t1_CFLAGS@ @freetype2_CFLAGS@
+ 
+ CXX = @CXX@
+ AR = @AR@
Index: japanese/xpdf/Makefile
===================================================================
RCS file: /home/pcvs/ports/japanese/xpdf/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- japanese/xpdf/Makefile	2 May 2011 12:44:39 -0000	1.19
+++ japanese/xpdf/Makefile	9 Aug 2011 23:25:36 -0000
@@ -7,11 +7,11 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 PKGNAMESUFFIX=	-jafont
-DISTNAME=	xpdf-japanese
+DISTNAME=	xpdf-japanese-2011-jun-29
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Japanese font support for xpdf
@@ -21,6 +21,7 @@
 		${FONTSDIR}/Ryumin-Light:${PORTSDIR}/japanese/font-std \
 		${FONTSDIR}/GothicBBB-Medium:${PORTSDIR}/japanese/font-std
 
+WRKSRC=		${WRKDIR}/xpdf-japanese
 NO_BUILD=	yes
 SUB_FILES=	dot.xpdfrc
 SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
@@ -37,8 +38,9 @@
 
 do-install:
 	${MKDIR} ${DATADIR}/japanese
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${INSTALL_FILES} ${DATADIR}/japanese
+.for f in ${INSTALL_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/japanese
+.endfor
 
 post-install:
 	exec < ${LOCALBASE}/etc/xpdfrc; \
Index: japanese/xpdf/distinfo
===================================================================
RCS file: /home/pcvs/ports/japanese/xpdf/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- japanese/xpdf/distinfo	18 Mar 2011 17:59:49 -0000	1.6
+++ japanese/xpdf/distinfo	9 Aug 2011 23:25:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (xpdf-japanese.tar.gz) = b7419fc10d078628a407e5966146450acbe81d9a5e7f63448916536f0ac6432f
-SIZE (xpdf-japanese.tar.gz) = 494803
+SHA256 (xpdf-japanese-2011-jun-29.tar.gz) = 4f75ad21b25287e9d8886bf220ddfd769c77e7c14c879e3400f9eea777b34db9
+SIZE (xpdf-japanese-2011-jun-29.tar.gz) = 988504
Index: korean/xpdf/Makefile
===================================================================
RCS file: /home/pcvs/ports/korean/xpdf/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- korean/xpdf/Makefile	2 May 2011 12:44:41 -0000	1.10
+++ korean/xpdf/Makefile	9 Aug 2011 23:25:36 -0000
@@ -7,19 +7,20 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.02
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/
 PKGNAMESUFFIX=	-kofont
-DISTNAME=	xpdf-korean
+DISTNAME=	xpdf-korean-2011-jun-29
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Korean font support for xpdf
 
 RUN_DEPENDS=	xpdf:${PORTSDIR}/graphics/xpdf \
 		${ADOBECMAPDIR}/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps \
-		${FONTSDIR}/UnBatang.ttf:${PORTSDIR}/korean/unfonts-ttf
+		${FONTSDIR}/UnBatang.ttf:${PORTSDIR}/korean/unfonts-core
 
+WRKSRC=		${WRKDIR}/xpdf-korean
 NO_BUILD=	yes
 SUB_FILES=	dot.xpdfrc
 SUB_LIST=	ADOBECMAPDIR=${ADOBECMAPDIR} \
@@ -27,7 +28,7 @@
 PLIST_SUB=	EXTRARC=${EXTRARC}
 DATADIR=	${PREFIX}/share/xpdf
 
-FONTSDIR=	${LOCALBASE}/lib/X11/fonts/TrueType
+FONTSDIR=	${LOCALBASE}/lib/X11/fonts/unfonts-core
 EXTRARC=	${DATADIR}/korean/dot.xpdfrc
 ADOBECMAPDIR=	${LOCALBASE}/share/fonts/adobe-cmaps
 INSTALL_FILES=	Adobe-Korea1.cidToUnicode ISO-2022-KR.unicodeMap \
@@ -35,8 +36,9 @@
 
 do-install:
 	${MKDIR} ${DATADIR}/korean
-	cd ${WRKSRC} && \
-		${INSTALL_DATA} ${INSTALL_FILES} ${DATADIR}/korean
+.for f in ${INSTALL_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}/korean
+.endfor
 
 post-install:
 	exec < ${LOCALBASE}/etc/xpdfrc; \
Index: korean/xpdf/distinfo
===================================================================
RCS file: /home/pcvs/ports/korean/xpdf/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- korean/xpdf/distinfo	19 Mar 2011 12:30:43 -0000	1.3
+++ korean/xpdf/distinfo	9 Aug 2011 23:25:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (xpdf-korean.tar.gz) = ee8ae069ae613a24c7f500666a1a50cc5783f253feba61ebdbe2ef458232974f
-SIZE (xpdf-korean.tar.gz) = 470455
+SHA256 (xpdf-korean-2011-jun-29.tar.gz) = dc93549351cf9548eee2efd94468f5c8ad9d4c3c9b633ebd8ba1f93db2fd1354
+SIZE (xpdf-korean-2011-jun-29.tar.gz) = 519000