Date: Thu, 8 Feb 2007 02:00:09 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/108882: Update port: graphics/swftools Message-ID: <20070208020009.8a19043a.tkato432@yahoo.com> Resent-Message-ID: <200702071710.l17HAKpu085523@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 108882 >Category: ports >Synopsis: Update port: graphics/swftools >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: Wed Feb 07 17:10:20 GMT 2007 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p26 i386 >Organization: >Environment: >Description: - Fix LIB_DEPENDS - Add common patch for Xpdf library New file: files/patch-Makefile.in files/patch-lib__pdf__xpdf__gmem.c files/patch-lib__pdf__xpdf__gmem.h >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/swftools/Makefile graphics/swftools/Makefile --- /usr/ports/graphics/swftools/Makefile Tue Feb 6 13:42:06 2007 +++ graphics/swftools/Makefile Thu Feb 8 01:22:41 2007 @@ -8,6 +8,7 @@ PORTNAME= swftools PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.swftools.org/ @@ -17,28 +18,31 @@ LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \ jpeg.9:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ - freetype.9:${PORTSDIR}/print/freetype2 \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig + freetype.9:${PORTSDIR}/print/freetype2 -USE_BISON= yes -USE_GNOME= pkgconfig +USE_GNOME= gnometarget pkgconfig +USE_GCC= 3.4+ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --mandir=${MANPREFIX}/man -CPPFLAGS= `pkg-config --cflags-only-I fontconfig freetype2` \ - -I${LOCALBASE}/include -LDFLAGS= `pkg-config --libs-only-L fontconfig freetype2` \ - -L${LOCALBASE}/lib MAN1= font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 png2swf.1 \ swfbbox.1 swfc.1 swfcombine.1 swfdump.1 swfextract.1 \ swfstrings.1 wav2swf.1 +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib + .if defined(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.a) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame .else CONFIGURE_ARGS+= --disable-lame .endif + +post-patch: + @${REINPLACE_CMD} -e 's| -O | |g ; \ + s|/usr/local/include|${LOCALBASE}/include|g ; \ + s|/usr/local/lib|${LOCALBASE}/lib|g' ${WRKSRC}/configure .include <bsd.port.mk> diff -urN /usr/ports/graphics/swftools/files/patch-Makefile.in graphics/swftools/files/patch-Makefile.in --- /usr/ports/graphics/swftools/files/patch-Makefile.in Thu Jan 1 09:00:00 1970 +++ graphics/swftools/files/patch-Makefile.in Mon Jan 22 12:51:27 2007 @@ -0,0 +1,17 @@ +--- Makefile.in.orig Mon Jan 22 06:12:53 2007 ++++ Makefile.in Mon Jan 22 12:51:20 2007 +@@ -8,14 +8,10 @@ + cd m4;$(MAKE) $@ + @echo making $@ in lib... + cd lib;$(MAKE) $@ +- @echo making $@ in lib/python... +- cd lib/python;$(MAKE) $@ + @echo making $@ in src... + cd src;$(MAKE) $@ + @echo making $@ in pdf2swf... + cd pdf2swf/fonts;$(MAKE) $@ +- @echo making $@ in avi2swf... +- cd avi2swf;$(MAKE) $@ + @echo making $@ in swfs... + cd swfs;$(MAKE) $@ + @$(MAKE) $@-local diff -urN /usr/ports/graphics/swftools/files/patch-lib__pdf__xpdf__gmem.c graphics/swftools/files/patch-lib__pdf__xpdf__gmem.c --- /usr/ports/graphics/swftools/files/patch-lib__pdf__xpdf__gmem.c Thu Jan 1 09:00:00 1970 +++ graphics/swftools/files/patch-lib__pdf__xpdf__gmem.c Mon Jan 22 13:07:01 2007 @@ -0,0 +1,50 @@ +--- lib/pdf/xpdf/gmem.c.orig Wed Oct 11 02:54:28 2006 ++++ lib/pdf/xpdf/gmem.c Mon Jan 22 13:06:47 2007 +@@ -47,9 +47,9 @@ + + #endif /* DEBUG_MEM */ + +-void *gmalloc(int size) { ++void *gmalloc(size_t size) { + #ifdef DEBUG_MEM +- int size1; ++ size_t size1; + char *mem; + GMemHdr *hdr; + void *data; +@@ -98,11 +98,11 @@ + #endif + } + +-void *grealloc(void *p, int size) { ++void *grealloc(void *p, size_t size) { + #ifdef DEBUG_MEM + GMemHdr *hdr; + void *q; +- int oldSize; ++ size_t oldSize; + + if (size <= 0) { + if (p) { +@@ -142,8 +142,8 @@ + #endif + } + +-void *gmallocn(int nObjs, int objSize) { +- int n; ++void *gmallocn(int nObjs, size_t objSize) { ++ size_t n; + + if (nObjs == 0) { + return NULL; +@@ -156,8 +156,8 @@ + return gmalloc(n); + } + +-void *greallocn(void *p, int nObjs, int objSize) { +- int n; ++void *greallocn(void *p, int nObjs, size_t objSize) { ++ size_t n; + + if (nObjs == 0) { + if (p) { diff -urN /usr/ports/graphics/swftools/files/patch-lib__pdf__xpdf__gmem.h graphics/swftools/files/patch-lib__pdf__xpdf__gmem.h --- /usr/ports/graphics/swftools/files/patch-lib__pdf__xpdf__gmem.h Thu Jan 1 09:00:00 1970 +++ graphics/swftools/files/patch-lib__pdf__xpdf__gmem.h Mon Jan 22 13:08:07 2007 @@ -0,0 +1,29 @@ +--- lib/pdf/xpdf/gmem.h.orig Wed Oct 11 02:54:28 2006 ++++ lib/pdf/xpdf/gmem.h Mon Jan 22 13:07:59 2007 +@@ -19,13 +19,13 @@ + * Same as malloc, but prints error message and exits if malloc() + * returns NULL. + */ +-extern void *gmalloc(int size); ++extern void *gmalloc(size_t size); + + /* + * Same as realloc, but prints error message and exits if realloc() + * returns NULL. If <p> is NULL, calls malloc instead of realloc(). + */ +-extern void *grealloc(void *p, int size); ++extern void *grealloc(void *p, size_t size); + + /* + * These are similar to gmalloc and grealloc, but take an object count +@@ -33,8 +33,8 @@ + * bytes, but there is an additional error check that the total size + * doesn't overflow an int. + */ +-extern void *gmallocn(int nObjs, int objSize); +-extern void *greallocn(void *p, int nObjs, int objSize); ++extern void *gmallocn(int nObjs, size_t objSize); ++extern void *greallocn(void *p, int nObjs, size_t objSize); + + /* + * Same as free, but checks for and ignores NULL pointers. >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070208020009.8a19043a.tkato432>