Update to 0.92. MAINTAINER hasn't replied for two weeks, so I

think it's legitimate to do the upgrade job.

PR:		ports/24169, ports/24285
Submitted by:	Michael Harnois, and Ports Fury(with patches)

graphics/xpdf/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xpdf
-PORTVERSION=	0.91
+PORTVERSION=	0.92
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/  \
 		${MASTER_SITE_TEX_CTAN}
@@ -15,18 +15,19 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	chuckr@FreeBSD.org
 
-LIB_DEPENDS=	t1.1:${PORTSDIR}/devel/t1lib \
-		ttf.4:${PORTSDIR}/print/freetype
+LIB_DEPENDS=	t1.1:${PORTSDIR}/devel/t1lib
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_FREETYPE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-gzip --enable-opi		\
-		--enable-japanese --enable-chinese	\
+		--enable-japanese 	\
+		--enable-chinese-cns --enable-chinese-gb	\
 		--with-t1-library=${LOCALBASE}/lib	\
 		--with-t1-includes=${LOCALBASE}/include	\
 		--with-freetype-library=${LOCALBASE}/lib \
-		--with-freetype-includes=${LOCALBASE}/include
+		--with-freetype-includes=${LOCALBASE}/include/freetype
 .if defined(A4)
 CONFIGURE_ARGS+=	--enable-a4-paper
 .endif

graphics/xpdf/distinfo

@@ -1 +1 @@
-MD5 (xpdf-0.91.tgz) = dd675fe691ba7341f2f581e67d724bcb
+MD5 (xpdf-0.92.tgz) = 2d6e9fb157db928bd0cca4214ddd2c80

graphics/xpdf/files/patch-aa

@@ -1,39 +1,19 @@
---- configure.in.org	Fri Sep  1 14:35:10 2000
-+++ configure.in	Fri Sep  1 14:21:53 2000
-@@ -75,6 +75,7 @@
- dnl ##### Checks for header files.
- AC_PATH_XTRA
- AC_HEADER_DIRENT
-+AC_CHECK_HEADERS(unistd.h)
- 
- dnl ##### Switch over to C++.  This will make the checks below a little
- dnl ##### bit stricter (requiring function prototypes in include files).
-@@ -173,11 +174,27 @@
- dnl # include file (e.g., in cygwin 1.1.2).
- AC_CACHE_CHECK([for mkstemp],
- xpdf_cv_func_mkstemp,
--[AC_TRY_COMPILE([#include <stdlib.h>],
-+[AC_TRY_COMPILE([#include <stdlib.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+],
- [mkstemp("foo");],
- xpdf_cv_func_mkstemp=yes, xpdf_cv_func_mkstemp=no)])
+--- configure.in.orig	Mon Dec  4 13:28:07 2000
++++ configure.in	Thu Jan 11 21:05:07 2001
+@@ -183,6 +183,16 @@
  if test "$xpdf_cv_func_mkstemp" = yes; then
    AC_DEFINE(HAVE_MKSTEMP)
-+fi
+ fi
 +dnl # Ditto mkstemps()
 +AC_CACHE_CHECK([for mkstemps],
 +xpdf_cv_func_mkstemps,
-+[AC_TRY_COMPILE([#include <stdlib.h>
-+#ifdef HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif],
++[AC_TRY_LINK([#include <stdlib.h>
++#include <unistd.h>],     
 +[mkstemps("foo", 0);],
 +xpdf_cv_func_mkstemps=yes, xpdf_cv_func_mkstemps=no)])
 +if test "$xpdf_cv_func_mkstemps" = yes; then
 +  AC_DEFINE(HAVE_MKSTEMPS)
- fi
++fi
  
  dnl ##### Check select argument type: on HP-UX before version 10, select
+ dnl ##### takes (int *) instead of (fd_set *).