Attachment #43783 for bug #67902

View | Details | Raw Unified | Return to bug 67902
Collapse All | Expand All





PORTNAME=	xpdf
PORTVERSION=	3.00
PORTREVISION=	2
CATEGORIES=	graphics print
MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/ \
		${MASTER_SITE_TEX_CTAN}

USE_MOTIF=	yes

USE_GMAKE=	yes
USE_AUTOCONF_VER=	257
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"

		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)
	@${MKDIR} ${DOCSDIR}




--- 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)




--- splash/Splash.cc.orig	Thu Jan 22 10:26:44 2004
+++ splash/Splash.cc	Fri May  7 20:20:08 2004
@@ -952,7 +952,7 @@
 }
 

   }
   err = fillGlyph(x, y, &glyph);
--- splash/Splash.h.orig	Thu Jan 22 10:26:44 2004
+++ splash/Splash.h	Fri May  7 20:20:08 2004
@@ -104,7 +104,7 @@
   SplashError xorFill(SplashPath *path, GBool eo);
 

   // 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 May  7 20:20:08 2004
@@ -125,12 +125,12 @@
 }
 

     return NULL;
   }
--- splash/SplashFTFont.h.orig	Thu Jan 22 10:26:44 2004
+++ 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,

 private:
 
--- splash/SplashFTFontEngine.cc.orig	Thu Jan 22 10:26:44 2004
+++ splash/SplashFTFontEngine.cc	Fri May  7 20:20:08 2004
@@ -107,7 +107,12 @@
   SplashFontFile *ret;
 

   tmpFileName = NULL;
   if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) {
--- splash/SplashFTFontFile.cc.orig	Thu Jan 22 10:26:44 2004
+++ splash/SplashFTFontFile.cc	Fri May  7 20:20:08 2004
@@ -43,7 +43,7 @@
   }
 

 
 SplashFTFontFile::~SplashFTFontFile() {
--- splash/SplashFTFontFile.h.orig	Thu Jan 22 10:26:44 2004
+++ 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,

   friend class SplashFTFont;
 };
--- splash/SplashFont.cc.orig	Thu Jan 22 10:26:44 2004
+++ splash/SplashFont.cc	Fri May  7 20:20:08 2004
@@ -89,7 +89,7 @@
 }
 

   }
 
--- splash/SplashFont.h.orig	Thu Jan 22 10:26:44 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.

 protected:
 
--- splash/SplashT1Font.cc.orig	Thu Jan 22 10:26:44 2004
+++ splash/SplashT1Font.cc	Fri May  7 20:20:08 2004
@@ -171,12 +171,12 @@
 }
 

   T1_OUTLINE *outline;
   T1_PATHSEGMENT *seg;
--- splash/SplashT1Font.h.orig	Thu Jan 22 10:26:44 2004
+++ splash/SplashT1Font.h	Fri May  7 20:20:08 2004
@@ -30,15 +30,15 @@
 
   // Munge xFrac and yFrac before calling SplashFont::getGlyph.

 private:
 
--- splash/SplashTypes.h.orig	Thu Jan 22 10:26:44 2004
+++ splash/SplashTypes.h	Fri May  7 20:20:08 2004
@@ -9,6 +9,7 @@
 
 #include <aconf.h>

 
 //------------------------------------------------------------------------
 // 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 May  7 20:20:08 2004
@@ -823,12 +823,12 @@
 
   // fill

Return to bug 67902

Lines 1-5 Link Here

(-)files/patch-truetype.patch (-15 / +47 lines)
1	--- splash/Splash.cc.orig Thu Jan 22 10:26:44 2004	1	--- splash/Splash.cc.orig Thu Jan 22 10:26:44 2004
2	+++ splash/Splash.cc Fri Mar 5 21:37:59 2004	2	+++ splash/Splash.cc Fri May 7 20:20:08 2004
3	@@ -952,7 +952,7 @@	3	@@ -952,7 +952,7 @@
4	}	4	}
5		5
Lines 19-25 Link Here
19	}	19	}
20	err = fillGlyph(x, y, &glyph);	20	err = fillGlyph(x, y, &glyph);
21	--- splash/Splash.h.orig Thu Jan 22 10:26:44 2004	21	--- splash/Splash.h.orig Thu Jan 22 10:26:44 2004
22	+++ splash/Splash.h Fri Mar 5 21:37:59 2004	22	+++ splash/Splash.h Fri May 7 20:20:08 2004
23	@@ -104,7 +104,7 @@	23	@@ -104,7 +104,7 @@
24	SplashError xorFill(SplashPath *path, GBool eo);	24	SplashError xorFill(SplashPath *path, GBool eo);
25		25
Lines 30-36 Link Here
30	// Draw a glyph, using the current fill pattern. This function does	30	// Draw a glyph, using the current fill pattern. This function does
31	// not free any data, i.e., it ignores glyph->freeData.	31	// not free any data, i.e., it ignores glyph->freeData.
32	--- splash/SplashFTFont.cc.orig Thu Jan 22 10:26:44 2004	32	--- splash/SplashFTFont.cc.orig Thu Jan 22 10:26:44 2004
33	+++ splash/SplashFTFont.cc Fri Mar 5 21:37:59 2004	33	+++ splash/SplashFTFont.cc Fri May 7 20:20:08 2004
34	@@ -125,12 +125,12 @@	34	@@ -125,12 +125,12 @@
35	}	35	}
36		36
Lines 101-108 Link Here
101	return NULL;	101	return NULL;
102	}	102	}
103	--- splash/SplashFTFont.h.orig Thu Jan 22 10:26:44 2004	103	--- splash/SplashFTFont.h.orig Thu Jan 22 10:26:44 2004
104	+++ splash/SplashFTFont.h Fri Mar 5 21:37:59 2004	104	+++ splash/SplashFTFont.h Fri May 7 22:53:52 2004
105	@@ -33,15 +33,15 @@	105	@@ -15,7 +15,8 @@
		106	#pragma interface
		107	#endif
		108
		109	-#include <freetype/freetype.h>
		110	+#include <ft2build.h>
		111	+#include FT_FREETYPE_H
		112	#include "SplashFont.h"
		113
		114	class SplashFTFontFile;
		115	@@ -33,15 +34,15 @@
106		116
107	// Munge xFrac and yFrac before calling SplashFont::getGlyph.	117	// Munge xFrac and yFrac before calling SplashFont::getGlyph.
108	virtual GBool getGlyph(int c, int xFrac, int yFrac,	118	virtual GBool getGlyph(int c, int xFrac, int yFrac,
Lines 122-128 Link Here
122	private:	132	private:
123		133
124	--- splash/SplashFTFontEngine.cc.orig Thu Jan 22 10:26:44 2004	134	--- splash/SplashFTFontEngine.cc.orig Thu Jan 22 10:26:44 2004
125	+++ splash/SplashFTFontEngine.cc Fri Mar 5 21:38:00 2004	135	+++ splash/SplashFTFontEngine.cc Fri May 7 20:20:08 2004
126	@@ -107,7 +107,12 @@	136	@@ -107,7 +107,12 @@
127	SplashFontFile *ret;	137	SplashFontFile *ret;
128		138
Lines 138-144 Link Here
138	tmpFileName = NULL;	148	tmpFileName = NULL;
139	if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) {	149	if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) {
140	--- splash/SplashFTFontFile.cc.orig Thu Jan 22 10:26:44 2004	150	--- splash/SplashFTFontFile.cc.orig Thu Jan 22 10:26:44 2004
141	+++ splash/SplashFTFontFile.cc Fri Mar 5 21:38:00 2004	151	+++ splash/SplashFTFontFile.cc Fri May 7 20:20:08 2004
142	@@ -43,7 +43,7 @@	152	@@ -43,7 +43,7 @@
143	}	153	}
144		154
Lines 208-215 Link Here
208		218
209	SplashFTFontFile::~SplashFTFontFile() {	219	SplashFTFontFile::~SplashFTFontFile() {
210	--- splash/SplashFTFontFile.h.orig Thu Jan 22 10:26:44 2004	220	--- splash/SplashFTFontFile.h.orig Thu Jan 22 10:26:44 2004
211	+++ splash/SplashFTFontFile.h Fri Mar 5 21:38:00 2004	221	+++ splash/SplashFTFontFile.h Fri May 7 22:51:30 2004
212	@@ -53,13 +53,14 @@	222	@@ -15,7 +15,8 @@
		223	#pragma interface
		224	#endif
		225
		226	-#include <freetype/freetype.h>
		227	+#include <ft2build.h>
		228	+#include FT_FREETYPE_H
		229	#include "SplashFontFile.h"
		230
		231	class SplashFontFileID;
		232	@@ -53,13 +54,14 @@
213	SplashFTFontFile(SplashFTFontEngine *engineA,	233	SplashFTFontFile(SplashFTFontEngine *engineA,
214	SplashFontFileID *idA,	234	SplashFontFileID *idA,
215	char *fileNameA, GBool deleteFileA,	235	char *fileNameA, GBool deleteFileA,
Lines 226-232 Link Here
226	friend class SplashFTFont;	246	friend class SplashFTFont;
227	};	247	};
228	--- splash/SplashFont.cc.orig Thu Jan 22 10:26:44 2004	248	--- splash/SplashFont.cc.orig Thu Jan 22 10:26:44 2004
229	+++ splash/SplashFont.cc Fri Mar 5 21:38:00 2004	249	+++ splash/SplashFont.cc Fri May 7 20:20:08 2004
230	@@ -89,7 +89,7 @@	250	@@ -89,7 +89,7 @@
231	}	251	}
232		252
Lines 246-252 Link Here
246	}	266	}
247		267
248	--- splash/SplashFont.h.orig Thu Jan 22 10:26:44 2004	268	--- splash/SplashFont.h.orig Thu Jan 22 10:26:44 2004
249	+++ splash/SplashFont.h Fri Mar 5 21:38:00 2004	269	+++ splash/SplashFont.h Fri May 7 20:20:08 2004
250	@@ -61,15 +61,15 @@	270	@@ -61,15 +61,15 @@
251	// should override this to zero out xFrac and/or yFrac if they don't	271	// should override this to zero out xFrac and/or yFrac if they don't
252	// support fractional coordinates.	272	// support fractional coordinates.
Lines 267-273 Link Here
267	protected:	287	protected:
268		288
269	--- splash/SplashT1Font.cc.orig Thu Jan 22 10:26:44 2004	289	--- splash/SplashT1Font.cc.orig Thu Jan 22 10:26:44 2004
270	+++ splash/SplashT1Font.cc Fri Mar 5 21:38:00 2004	290	+++ splash/SplashT1Font.cc Fri May 7 20:20:08 2004
271	@@ -171,12 +171,12 @@	291	@@ -171,12 +171,12 @@
272	}	292	}
273		293
Lines 294-300 Link Here
294	T1_OUTLINE *outline;	314	T1_OUTLINE *outline;
295	T1_PATHSEGMENT *seg;	315	T1_PATHSEGMENT *seg;
296	--- splash/SplashT1Font.h.orig Thu Jan 22 10:26:44 2004	316	--- splash/SplashT1Font.h.orig Thu Jan 22 10:26:44 2004
297	+++ splash/SplashT1Font.h Fri Mar 5 21:38:00 2004	317	+++ splash/SplashT1Font.h Fri May 7 20:20:08 2004
298	@@ -30,15 +30,15 @@	318	@@ -30,15 +30,15 @@
299		319
300	// Munge xFrac and yFrac before calling SplashFont::getGlyph.	320	// Munge xFrac and yFrac before calling SplashFont::getGlyph.
Lines 315-321 Link Here
315	private:	335	private:
316		336
317	--- splash/SplashTypes.h.orig Thu Jan 22 10:26:44 2004	337	--- splash/SplashTypes.h.orig Thu Jan 22 10:26:44 2004
318	+++ splash/SplashTypes.h Fri Mar 5 21:38:00 2004	338	+++ splash/SplashTypes.h Fri May 7 20:20:08 2004
319	@@ -9,6 +9,7 @@	339	@@ -9,6 +9,7 @@
320		340
321	#include <aconf.h>	341	#include <aconf.h>
Lines 324-331 Link Here
324		344
325	//------------------------------------------------------------------------	345	//------------------------------------------------------------------------
326	// coordinates	346	// coordinates
		347	--- splash/SplashFTFontEngine.h.orig Fri May 7 22:52:10 2004
		348	+++ splash/SplashFTFontEngine.h Fri May 7 22:52:41 2004
		349	@@ -15,7 +15,8 @@
		350	#pragma interface
		351	#endif
		352
		353	-#include <freetype/freetype.h>
		354	+#include <ft2build.h>
		355	+#include FT_FREETYPE_H
		356	#include "gtypes.h"
		357
		358	class SplashFontFile;
327	--- xpdf/SplashOutputDev.cc.orig Thu Jan 22 10:26:45 2004	359	--- xpdf/SplashOutputDev.cc.orig Thu Jan 22 10:26:45 2004
328	+++ xpdf/SplashOutputDev.cc Fri Mar 5 21:38:00 2004	360	+++ xpdf/SplashOutputDev.cc Fri May 7 20:20:08 2004
329	@@ -823,12 +823,12 @@	361	@@ -823,12 +823,12 @@
330		362
331	// fill	363	// fill

Lines 7-13 Link Here

(-)Makefile (-7 / +2 lines)
7		7
8	PORTNAME= xpdf	8	PORTNAME= xpdf
9	PORTVERSION= 3.00	9	PORTVERSION= 3.00
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= graphics print	11	CATEGORIES= graphics print
12	MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \	12	MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/ \
13	${MASTER_SITE_TEX_CTAN}	13	${MASTER_SITE_TEX_CTAN}
Lines 24-30 Link Here
24	USE_MOTIF= yes	24	USE_MOTIF= yes
25		25
26	USE_GMAKE= yes	26	USE_GMAKE= yes
27	GNU_CONFIGURE= yes	27	USE_AUTOCONF_VER= 257
28	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	28	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
30	LDFLAGS="-L${LOCALBASE}/lib"	30	LDFLAGS="-L${LOCALBASE}/lib"
Lines 46-56 Link Here
46	xpdf.1	46	xpdf.1
47	MAN5= xpdfrc.5	47	MAN5= xpdfrc.5
48		48
49	post-patch:
50	@${CP} ${WRKSRC}/configure ${WRKSRC}/configure.orig
51	@${SED} -e "s#freetype.h#ft2build.h#" ${WRKSRC}/configure.orig > \
52	${WRKSRC}/configure
53
54	post-install:	49	post-install:
55	.if !defined(NOPORTDOCS)	50	.if !defined(NOPORTDOCS)
56	@${MKDIR} ${DOCSDIR}	51	@${MKDIR} ${DOCSDIR}

Added Link Here

(-)files/patch-configure.in (+18 lines)
1	--- configure.in.orig Fri May 7 22:54:35 2004
2	+++ configure.in Fri May 7 22:33:28 2004
3	@@ -306,10 +306,13 @@
4	dnl ##### (Note: FT_Get_Name_Index was added in FT 2.0.5, and is
5	dnl ##### the reason that Xpdf requires 2.0.5+.)
6	smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
7	- FT_Get_Name_Index, freetype/freetype.h, -lm)
8	+ FT_Get_Name_Index, freetype/ft2build.h, -lm)
9	if test x"$freetype2_LIBS" = x; then
10	smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
11	- FT_Get_Name_Index, freetype.h, -lm)
12	+ FT_Get_Name_Index, ft2build.h, -lm)
13	+ if test "x$smr_have_freetype2_library" = xyes; then
14	+ AC_DEFINE(HAVE_FREETYPE_H)
15	+ fi
16	fi
17	AC_SUBST(freetype2_LIBS)
18	AC_SUBST(freetype2_CFLAGS)