ports/72530: Update port: graphics/swftools to 0.6.2
KATO Tsuguru
tkato432 at yahoo.com
Mon Oct 11 17:10:34 UTC 2004
>Number: 72530
>Category: ports
>Synopsis: Update port: graphics/swftools to 0.6.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 11 17:10:32 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 0.6.2
Remove file:
files/patch-configure
files/patch-lib::modules::swffont.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/swftools/Makefile graphics/swftools/Makefile
--- /usr/ports/graphics/swftools/Makefile Sun Aug 22 12:47:30 2004
+++ graphics/swftools/Makefile Sun Oct 10 10:35:00 2004
@@ -7,7 +7,7 @@
#
PORTNAME= swftools
-PORTVERSION= 0.6.1
+PORTVERSION= 0.6.2
CATEGORIES= graphics
MASTER_SITES= http://www.quiss.org/swftools/
@@ -17,26 +17,37 @@
LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \
t1.5:${PORTSDIR}/devel/t1lib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- freetype.9:${PORTSDIR}/print/freetype2
-
-FREETYPE_CONFIG?= ${LOCALBASE}/bin/freetype-config
+ freetype.9:${PORTSDIR}/print/freetype2 \
+ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
USE_REINPLACE= yes
USE_BISON= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- FREETYPE_CONFIG="${FREETYPE_CONFIG}"
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+MAN1= font2swf.1 jpeg2swf.1 pdf2swf.1 png2swf.1 swfbbox.1 swfc.1 \
+ swfcombine.1 swfdump.1 swfextract.1 swfstrings.1 wav2swf.1
-MAN1= font2swf.1 jpeg2swf.1 pdf2swf.1 png2swf.1 swfbbox.1 swfc.1 \
- swfcombine.1 swfdump.1 swfextract.1 swfstrings.1 wav2swf.1
+CPPFLAGS= `pkg-config --cflags-only-I fontconfig freetype2` \
+ -I${LOCALBASE}/include
+LDFLAGS= `pkg-config --libs-only-L fontconfig freetype2` \
+ -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} -e 's| -O | |g ; \
s|/usr/local/include|${LOCALBASE}/include|g ; \
- s|/usr/local/lib|${LOCALBASE}/lib|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|;make|;\$$\(MAKE\)|g' ${WRKSRC}/lib/Makefile.in
+ s|/usr/local/lib|${LOCALBASE}/lib|g ; \
+ s|HAVE_FONTCONFIG_H|HAVE_FONTCONFIG_FONTCONFIG_H|g ; \
+ s| fontconfig\.h| fontconfig/fontconfig.h|g ; \
+ s|<fontconfig\.h>|<fontconfig/fontconfig.h>|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|HAVE_FONTCONFIG_H|HAVE_FONTCONFIG_FONTCONFIG_H|g' ${WRKSRC}/config.h.in
+ @${REINPLACE_CMD} -e \
+ 's|;make|;\$$\(MAKE\)|g' ${WRKSRC}/lib/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|HAVE_FONTCONFIG_H|HAVE_FONTCONFIG_FONTCONFIG_H|g ; \
+ s|<fontconfig\.h>|<fontconfig/fontconfig.h>|g' ${WRKSRC}/pdf2swf/SWFOutputDev.cc
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/swftools/distinfo graphics/swftools/distinfo
--- /usr/ports/graphics/swftools/distinfo Sun Aug 22 12:47:30 2004
+++ graphics/swftools/distinfo Sun Oct 10 08:55:48 2004
@@ -1,2 +1,2 @@
-MD5 (swftools-0.6.1.tar.gz) = ed12cdf72deed5b67fc2dc64b9f5330a
-SIZE (swftools-0.6.1.tar.gz) = 1410115
+MD5 (swftools-0.6.2.tar.gz) = 40286d8fac4c3b03e3a009d27d41f1ae
+SIZE (swftools-0.6.2.tar.gz) = 1482362
diff -urN /usr/ports/graphics/swftools/files/patch-configure graphics/swftools/files/patch-configure
--- /usr/ports/graphics/swftools/files/patch-configure Sun Aug 22 12:47:30 2004
+++ graphics/swftools/files/patch-configure Thu Jan 1 09:00:00 1970
@@ -1,76 +0,0 @@
---- configure.orig Sat Aug 21 03:34:59 2004
-+++ configure Sat Aug 21 12:46:50 2004
-@@ -10247,7 +10247,7 @@
- fi
-
-
--for ac_header in freetype/freetype.h
-+for ac_header in ft2build.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -10413,45 +10413,26 @@
- echo $ECHO_N "checking whether we can compile the freetype test program... $ECHO_C" >&6
-
- cat > conftest.c << EOF
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftsnames.h>
--#include <freetype/ttnameid.h>
--#include <freetype/ftoutln.h>
--
--int main()
--{
-- FT_Library ftlibrary;
-- FT_Face face;
-- FT_Error error;
-- FT_ULong charcode;
-- FT_UInt gindex;
-- FT_Glyph glyph;
-- FT_BBox bbox;
-- FT_Matrix matrix;
-- FT_UInt i;
-- char* name = 0;
-- char italic, bold;
--
-- FT_Init_FreeType(&ftlibrary);
-- FT_New_Face(ftlibrary, "filename", 0, &face);
-- i = face->num_glyphs - 1;
-- italic = face->style_flags&FT_STYLE_FLAG_ITALIC;
-- bold = face->style_flags&FT_STYLE_FLAG_BOLD;
-- FT_Get_Postscript_Name(face);
-- FT_Get_Char_Index(face, 33);
-- FT_Get_First_Char(face, &i);
-- FT_Get_Next_Char(face, 33, &i);
-- if(FT_HAS_GLYPH_NAMES(face)) {
-- FT_Get_Glyph_Name(face, 33, name, 127);
-- }
-- FT_Load_Glyph(face, 33, FT_LOAD_NO_BITMAP|FT_LOAD_NO_SCALE);
-- FT_Get_Glyph(face->glyph, &glyph);
-- FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
-- FT_Done_Glyph(glyph);
-- FT_Done_Face(face);
-- FT_Done_FreeType(ftlibrary);
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+int
-+main()
-+{
-+ FT_Library library;
-+ FT_Error error;
-+
-+ error = FT_Init_FreeType(&library);
-+
-+ if (error)
-+ return 1;
-+ else
-+ {
-+ FT_Done_FreeType(library);
- return 0;
-+ }
- }
- EOF
-
diff -urN /usr/ports/graphics/swftools/files/patch-lib::modules::swffont.c graphics/swftools/files/patch-lib::modules::swffont.c
--- /usr/ports/graphics/swftools/files/patch-lib::modules::swffont.c Sun Aug 22 10:18:33 2004
+++ graphics/swftools/files/patch-lib::modules::swffont.c Thu Jan 1 09:00:00 1970
@@ -1,12 +0,0 @@
---- lib/modules/swffont.c.orig Sat Aug 14 16:19:02 2004
-+++ lib/modules/swffont.c Sun Aug 15 02:16:02 2004
-@@ -32,7 +32,8 @@
-
- #ifdef HAVE_FREETYPE
-
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <freetype/ftglyph.h>
- #include <freetype/ftsizes.h>
- #include <freetype/ftsnames.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list