From owner-ports-jp@jp.FreeBSD.org Fri May  7 23:20:33 2004
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id i47EKXb27271;
	Fri, 7 May 2004 23:20:33 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from pcat.heimat.gr.jp ([2001:3e0:a84::1])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet6 id i47EKX927265
	for <ports-jp@jp.freebsd.org>; Fri, 7 May 2004 23:20:33 +0900 (JST)
	(envelope-from nakaji@tutrp.tut.ac.jp)
Received: from xa12.heimat.gr.jp (xa12.heimat.gr.jp [202.216.136.35])
	by pcat.heimat.gr.jp (8.12.11/8.12.11) with ESMTP id i47EKOcl007377
	for <ports-jp@jp.freebsd.org>; Fri, 7 May 2004 23:20:24 +0900 (JST)
	(envelope-from nakaji@tutrp.tut.ac.jp)
To: FreeBSD Ports JP <ports-jp@jp.FreeBSD.org>
References: <20040507.171959.41626933.kuwa@labs.fujitsu.com>
 <040507174444.M0165721@pelsia.ensure-tech.co.jp>
 <86fzac8hz3.fsf@xa12.heimat.gr.jp>
From: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=ISO-2022-JP
In-Reply-To: <86fzac8hz3.fsf@xa12.heimat.gr.jp> (NAKAJI Hiroyuki's message of "Fri, 07 May 2004 22:49:52 +0900")
Message-ID: <86brl08gk8.fsf@xa12.heimat.gr.jp>
User-Agent: T-gnus/6.17.3 (based on No Gnus v0.3) SEMI/1.14.6 (Maruoka) FLIM/1.14.6 (Marutamachi) APEL/10.6 Emacs/21.3 (i386--freebsd) MULE/5.0 (SAKAKI)
X-Virus-Scanned: by AMaViS-perl11-milter (http://amavis.org/)
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Fri, 07 May 2004 23:20:23 +0900
X-Sequence: ports-jp 14693
Subject: [ports-jp 14693] Re: japanese/xpdf error
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: nakaji@tutrp.tut.ac.jp
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+040430

$BCf<#$G$9!#(B

>>>>>	NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp> wrote:

> $B$H$$$&%(%i!<$,;D$j$^$9!#$3$l$O(B(*2)$B$r9T$($P2r>C$5$l$k$s$8$c$J$$$+$H;W$$(B
> $B$^$9$,!"$=$&$$$&J}8~@-$G$h$$$s$G$7$g$&$+!)(B

$B$h$$$N$+$I$&$+$O$5$F$*$-!"7,B<$5$s$H(B nork $B$5$s$N%R%s%H$r$b$H$K(B 
configure $B$rJQ99$7$?$H$3$m!"Ev=i$NKM$NLdBj$O2r7h$5$l$^$7$?!#(B

$B!&(Bconfigure.in $B$rJQ99$7$F(B autoconf257 $B$r<B9T(B
$B!&$=$lAjEv$N(B configure $B$KJQ99(B

$B$N$I$C$A$,%*%9%9%a$J$N$+$o$+$C$F$^$;$s$,!"A0<T$K$7$F$_$^$7$?!#(B

$B<j85$G$O!"(BpLaTeX + dvipdfmx $B$G:n$C$?F|K\8l$r4^$`(B PDF file $B$rLdBj$J$/I=(B
$B<($G$-$^$7$?!#(B

diff -urN --exclude CVS --exclude work* /usr/ports/graphics/xpdf/Makefile ./Makefile
--- /usr/ports/graphics/xpdf/Makefile	Tue Apr 20 01:22:37 2004
+++ ./Makefile	Fri May  7 23:08:51 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpdf
 PORTVERSION=	3.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
 		${MASTER_SITE_TEX_CTAN}
@@ -24,7 +24,7 @@
 USE_MOTIF=	yes
 
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF_VER=	257
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -45,11 +45,6 @@
 		pdftotext.1 \
 		xpdf.1
 MAN5=		xpdfrc.5
-
-post-patch:
-	@${CP} ${WRKSRC}/configure ${WRKSRC}/configure.orig
-	@${SED} -e "s#freetype.h#ft2build.h#" ${WRKSRC}/configure.orig > \
-		${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -urN --exclude CVS --exclude work* /usr/ports/graphics/xpdf/files/patch-configure.in ./files/patch-configure.in
--- /usr/ports/graphics/xpdf/files/patch-configure.in	Thu Jan  1 09:00:00 1970
+++ ./files/patch-configure.in	Fri May  7 22:57:11 2004
@@ -0,0 +1,18 @@
+--- configure.in.orig	Fri May  7 22:54:35 2004
++++ configure.in	Fri May  7 22:33:28 2004
+@@ -306,10 +306,13 @@
+ dnl ##### (Note: FT_Get_Name_Index was added in FT 2.0.5, and is
+ dnl ##### the reason that Xpdf requires 2.0.5+.)
+ smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
+-              FT_Get_Name_Index, freetype/freetype.h, -lm)
++              FT_Get_Name_Index, freetype/ft2build.h, -lm)
+ if test x"$freetype2_LIBS" = x; then
+   smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
+-                FT_Get_Name_Index, freetype.h, -lm)
++                FT_Get_Name_Index, ft2build.h, -lm)
++  if test "x$smr_have_freetype2_library" = xyes; then
++    AC_DEFINE(HAVE_FREETYPE_H)
++  fi
+ fi
+ AC_SUBST(freetype2_LIBS)
+ AC_SUBST(freetype2_CFLAGS)
diff -urN --exclude CVS --exclude work* /usr/ports/graphics/xpdf/files/patch-truetype.patch ./files/patch-truetype.patch
--- /usr/ports/graphics/xpdf/files/patch-truetype.patch	Mon Apr 19 19:55:30 2004
+++ ./files/patch-truetype.patch	Fri May  7 22:56:52 2004
@@ -1,5 +1,5 @@
 --- splash/Splash.cc.orig	Thu Jan 22 10:26:44 2004
-+++ splash/Splash.cc	Fri Mar  5 21:37:59 2004
++++ splash/Splash.cc	Fri May  7 20:20:08 2004
 @@ -952,7 +952,7 @@
  }
  
@@ -19,7 +19,7 @@
    }
    err = fillGlyph(x, y, &glyph);
 --- splash/Splash.h.orig	Thu Jan 22 10:26:44 2004
-+++ splash/Splash.h	Fri Mar  5 21:37:59 2004
++++ splash/Splash.h	Fri May  7 20:20:08 2004
 @@ -104,7 +104,7 @@
    SplashError xorFill(SplashPath *path, GBool eo);
  
@@ -30,7 +30,7 @@
    // Draw a glyph, using the current fill pattern.  This function does
    // not free any data, i.e., it ignores glyph->freeData.
 --- splash/SplashFTFont.cc.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashFTFont.cc	Fri Mar  5 21:37:59 2004
++++ splash/SplashFTFont.cc	Fri May  7 20:20:08 2004
 @@ -125,12 +125,12 @@
  }
  
@@ -101,8 +101,18 @@
      return NULL;
    }
 --- splash/SplashFTFont.h.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashFTFont.h	Fri Mar  5 21:37:59 2004
-@@ -33,15 +33,15 @@
++++ splash/SplashFTFont.h	Fri May  7 22:53:52 2004
+@@ -15,7 +15,8 @@
+ #pragma interface
+ #endif
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include "SplashFont.h"
+ 
+ class SplashFTFontFile;
+@@ -33,15 +34,15 @@
  
    // Munge xFrac and yFrac before calling SplashFont::getGlyph.
    virtual GBool getGlyph(int c, int xFrac, int yFrac,
@@ -122,7 +132,7 @@
  private:
  
 --- splash/SplashFTFontEngine.cc.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashFTFontEngine.cc	Fri Mar  5 21:38:00 2004
++++ splash/SplashFTFontEngine.cc	Fri May  7 20:20:08 2004
 @@ -107,7 +107,12 @@
    SplashFontFile *ret;
  
@@ -138,7 +148,7 @@
    tmpFileName = NULL;
    if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) {
 --- splash/SplashFTFontFile.cc.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashFTFontFile.cc	Fri Mar  5 21:38:00 2004
++++ splash/SplashFTFontFile.cc	Fri May  7 20:20:08 2004
 @@ -43,7 +43,7 @@
    }
  
@@ -208,8 +218,18 @@
  
  SplashFTFontFile::~SplashFTFontFile() {
 --- splash/SplashFTFontFile.h.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashFTFontFile.h	Fri Mar  5 21:38:00 2004
-@@ -53,13 +53,14 @@
++++ splash/SplashFTFontFile.h	Fri May  7 22:51:30 2004
+@@ -15,7 +15,8 @@
+ #pragma interface
+ #endif
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include "SplashFontFile.h"
+ 
+ class SplashFontFileID;
+@@ -53,13 +54,14 @@
    SplashFTFontFile(SplashFTFontEngine *engineA,
  		   SplashFontFileID *idA,
  		   char *fileNameA, GBool deleteFileA,
@@ -226,7 +246,7 @@
    friend class SplashFTFont;
  };
 --- splash/SplashFont.cc.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashFont.cc	Fri Mar  5 21:38:00 2004
++++ splash/SplashFont.cc	Fri May  7 20:20:08 2004
 @@ -89,7 +89,7 @@
  }
  
@@ -246,7 +266,7 @@
    }
  
 --- splash/SplashFont.h.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashFont.h	Fri Mar  5 21:38:00 2004
++++ splash/SplashFont.h	Fri May  7 20:20:08 2004
 @@ -61,15 +61,15 @@
    // should override this to zero out xFrac and/or yFrac if they don't
    // support fractional coordinates.
@@ -267,7 +287,7 @@
  protected:
  
 --- splash/SplashT1Font.cc.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashT1Font.cc	Fri Mar  5 21:38:00 2004
++++ splash/SplashT1Font.cc	Fri May  7 20:20:08 2004
 @@ -171,12 +171,12 @@
  }
  
@@ -294,7 +314,7 @@
    T1_OUTLINE *outline;
    T1_PATHSEGMENT *seg;
 --- splash/SplashT1Font.h.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashT1Font.h	Fri Mar  5 21:38:00 2004
++++ splash/SplashT1Font.h	Fri May  7 20:20:08 2004
 @@ -30,15 +30,15 @@
  
    // Munge xFrac and yFrac before calling SplashFont::getGlyph.
@@ -315,7 +335,7 @@
  private:
  
 --- splash/SplashTypes.h.orig	Thu Jan 22 10:26:44 2004
-+++ splash/SplashTypes.h	Fri Mar  5 21:38:00 2004
++++ splash/SplashTypes.h	Fri May  7 20:20:08 2004
 @@ -9,6 +9,7 @@
  
  #include <aconf.h>
@@ -324,8 +344,20 @@
  
  //------------------------------------------------------------------------
  // coordinates
+--- splash/SplashFTFontEngine.h.orig	Fri May  7 22:52:10 2004
++++ splash/SplashFTFontEngine.h	Fri May  7 22:52:41 2004
+@@ -15,7 +15,8 @@
+ #pragma interface
+ #endif
+ 
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include "gtypes.h"
+ 
+ class SplashFontFile;
 --- xpdf/SplashOutputDev.cc.orig	Thu Jan 22 10:26:45 2004
-+++ xpdf/SplashOutputDev.cc	Fri Mar  5 21:38:00 2004
++++ xpdf/SplashOutputDev.cc	Fri May  7 20:20:08 2004
 @@ -823,12 +823,12 @@
  
    // fill
-- 
NAKAJI Hiroyuki ($BCf<#(B $B909T(B)
