From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 7 23:10:06 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0BDD66B for ; Sat, 7 Dec 2013 23:10:06 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D96D81091 for ; Sat, 7 Dec 2013 23:10:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7NA5RF011479 for ; Sat, 7 Dec 2013 23:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB7NA5a4011478; Sat, 7 Dec 2013 23:10:05 GMT (envelope-from gnats) Resent-Date: Sat, 7 Dec 2013 23:10:05 GMT Resent-Message-Id: <201312072310.rB7NA5a4011478@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Koop Mast Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB3D1D10 for ; Sat, 7 Dec 2013 23:03:29 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9BCF3104D for ; Sat, 7 Dec 2013 23:03:29 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7N3TM7010851 for ; Sat, 7 Dec 2013 23:03:29 GMT (envelope-from kwm@freefall.freebsd.org) Received: (from kwm@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB7N3Tpx010850; Sat, 7 Dec 2013 23:03:29 GMT (envelope-from kwm) Message-Id: <201312072303.rB7N3Tpx010850@freefall.freebsd.org> Date: Sat, 7 Dec 2013 23:03:29 GMT From: Koop Mast To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/184587: [exp-run] freetype 2.5.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Koop Mast List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 23:10:06 -0000 >Number: 184587 >Category: ports >Synopsis: [exp-run] freetype 2.5.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 07 23:10:05 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Koop Mast >Release: FreeBSD 11.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r258818: Sun Dec 1 23:20:44 UTC 2013 peter@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64 >Description: Exp-run for freetype 2.5.1 which reordered the headers (oh joy). Fix a few major inpact ports already, now to find the rest. >How-To-Repeat: >Fix: --- freetype-2.5.1.diff begins here --- Index: multimedia/ffmpeg/Makefile =================================================================== --- multimedia/ffmpeg/Makefile (revision 335855) +++ multimedia/ffmpeg/Makefile (working copy) @@ -349,6 +349,7 @@ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ + -e 's|freetype/freetype.h|freetype.h|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ ${WRKSRC}/doc/texi2pod.pl Index: multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c =================================================================== --- multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c (revision 0) +++ multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c (working copy) @@ -0,0 +1,10 @@ +--- libavfilter/vf_drawtext.c.orig 2013-11-20 03:28:56.000000000 +0100 ++++ libavfilter/vf_drawtext.c 2013-12-06 18:26:57.000000000 +0100 +@@ -48,7 +48,6 @@ + #include "video.h" + + #include +-#include + #include FT_FREETYPE_H + #include FT_GLYPH_H + #if CONFIG_FONTCONFIG Property changes on: multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: mcom:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: multimedia/ffmpeg0/Makefile =================================================================== --- multimedia/ffmpeg0/Makefile (revision 335855) +++ multimedia/ffmpeg0/Makefile (working copy) @@ -413,6 +413,7 @@ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ + -e 's|freetype/freetype.h|freetype.h|g' \ -e 's|check_ldflags -Wl,--as-needed||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ Index: multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c =================================================================== --- multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c (revision 0) +++ multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c (working copy) @@ -0,0 +1,10 @@ +--- libavfilter/vf_drawtext.c.orig 2013-12-06 18:18:29.000000000 +0100 ++++ libavfilter/vf_drawtext.c 2013-12-06 18:18:49.000000000 +0100 +@@ -41,7 +41,6 @@ + #undef time + + #include +-#include + #include FT_FREETYPE_H + #include FT_GLYPH_H + Property changes on: multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: print/freetype2/Makefile =================================================================== --- print/freetype2/Makefile (revision 335855) +++ print/freetype2/Makefile (working copy) @@ -3,7 +3,7 @@ # $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $ PORTNAME= freetype2 -PORTVERSION= 2.5.0.1 +PORTVERSION= 2.5.1 CATEGORIES= print MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \ @@ -16,7 +16,6 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Free and portable TrueType font rendering engine -USE_AUTOTOOLS= libtool USE_BZIP2= yes USES= gmake MAKE_ENV= TOP="" @@ -23,7 +22,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= ltverhack:9 -LIBTOOLFILES= builds/unix/configure +ltverhack_PATCH_FILES= builds/unix/ltmain.sh CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix OPTIONS_DEFINE= LCD_FILTERING PNG @@ -30,7 +29,6 @@ LCD_FILTERING_DESC?= Sub-pixel rendering (patented) PNG_DESC= Png compressed OpenType embedded bitmaps support -NO_STAGE= yes .include .if ${PORT_OPTIONS:MLCD_FILTERING} @@ -47,12 +45,11 @@ @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/builds/unix/install.mk -pre-configure: - @${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL := $$(FT_LIBTOOL_DIR)/libtool|LIBTOOL := ${WRKDIR}/gnome-libtool|' \ - ${WRKSRC}/builds/unix/unix-cc.in - post-configure: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup) +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.9 + .include Index: print/freetype2/distinfo =================================================================== --- print/freetype2/distinfo (revision 335855) +++ print/freetype2/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (freetype-2.5.0.1.tar.bz2) = 57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5 -SIZE (freetype-2.5.0.1.tar.bz2) = 1607037 +SHA256 (freetype-2.5.1.tar.bz2) = d715faa92b37980280c857ce9d356fff4361c5a7bd9b5c3f867fc24f598d8f45 +SIZE (freetype-2.5.1.tar.bz2) = 1677282 Index: print/freetype2/files/patch-builds::unix::freetype-config.in =================================================================== --- print/freetype2/files/patch-builds::unix::freetype-config.in (revision 335855) +++ print/freetype2/files/patch-builds::unix::freetype-config.in (working copy) @@ -1,17 +0,0 @@ ---- builds/unix/freetype-config.in.orig 2009-12-21 18:23:42.000000000 -0500 -+++ builds/unix/freetype-config.in 2010-02-21 15:51:17.000000000 -0500 -@@ -131,12 +131,8 @@ if test "$echo_ft_version" = "yes" ; the - fi - - if test "$echo_cflags" = "yes" ; then -- cflags="-I${SYSROOT}$includedir/freetype2" -- if test "${SYSROOT}$includedir" != "/usr/include" ; then -- echo $cflags -I${SYSROOT}$includedir -- else -- echo $cflags -- fi -+ cflags="-I$includedir/freetype2 -I$includedir" -+ echo $cflags - fi - - if test "$echo_libs" = "yes" ; then Index: print/freetype2/pkg-plist =================================================================== --- print/freetype2/pkg-plist (revision 335855) +++ print/freetype2/pkg-plist (working copy) @@ -1,55 +1,55 @@ bin/freetype-config -include/freetype2/freetype/config/ftconfig.h -include/freetype2/freetype/config/ftheader.h -include/freetype2/freetype/config/ftmodule.h -include/freetype2/freetype/config/ftoption.h -include/freetype2/freetype/config/ftstdlib.h -include/freetype2/freetype/freetype.h -include/freetype2/freetype/ftadvanc.h -include/freetype2/freetype/ftautoh.h -include/freetype2/freetype/ftbbox.h -include/freetype2/freetype/ftbdf.h -include/freetype2/freetype/ftbitmap.h -include/freetype2/freetype/ftbzip2.h -include/freetype2/freetype/ftcache.h -include/freetype2/freetype/ftcffdrv.h -include/freetype2/freetype/ftchapters.h -include/freetype2/freetype/ftcid.h -include/freetype2/freetype/fterrdef.h -include/freetype2/freetype/fterrors.h -include/freetype2/freetype/ftgasp.h -include/freetype2/freetype/ftglyph.h -include/freetype2/freetype/ftgxval.h -include/freetype2/freetype/ftgzip.h -include/freetype2/freetype/ftimage.h -include/freetype2/freetype/ftincrem.h -include/freetype2/freetype/ftlcdfil.h -include/freetype2/freetype/ftlist.h -include/freetype2/freetype/ftlzw.h -include/freetype2/freetype/ftmac.h -include/freetype2/freetype/ftmm.h -include/freetype2/freetype/ftmodapi.h -include/freetype2/freetype/ftmoderr.h -include/freetype2/freetype/ftotval.h -include/freetype2/freetype/ftoutln.h -include/freetype2/freetype/ftpfr.h -include/freetype2/freetype/ftrender.h -include/freetype2/freetype/ftsizes.h -include/freetype2/freetype/ftsnames.h -include/freetype2/freetype/ftstroke.h -include/freetype2/freetype/ftsynth.h -include/freetype2/freetype/ftsystem.h -include/freetype2/freetype/ftttdrv.h -include/freetype2/freetype/fttrigon.h -include/freetype2/freetype/fttypes.h -include/freetype2/freetype/ftwinfnt.h -include/freetype2/freetype/ftxf86.h -include/freetype2/freetype/t1tables.h -include/freetype2/freetype/ttnameid.h -include/freetype2/freetype/tttables.h -include/freetype2/freetype/tttags.h -include/freetype2/freetype/ttunpat.h -include/ft2build.h +include/freetype2/config/ftconfig.h +include/freetype2/config/ftheader.h +include/freetype2/config/ftmodule.h +include/freetype2/config/ftoption.h +include/freetype2/config/ftstdlib.h +include/freetype2/freetype.h +include/freetype2/ft2build.h +include/freetype2/ftadvanc.h +include/freetype2/ftautoh.h +include/freetype2/ftbbox.h +include/freetype2/ftbdf.h +include/freetype2/ftbitmap.h +include/freetype2/ftbzip2.h +include/freetype2/ftcache.h +include/freetype2/ftcffdrv.h +include/freetype2/ftchapters.h +include/freetype2/ftcid.h +include/freetype2/fterrdef.h +include/freetype2/fterrors.h +include/freetype2/ftgasp.h +include/freetype2/ftglyph.h +include/freetype2/ftgxval.h +include/freetype2/ftgzip.h +include/freetype2/ftimage.h +include/freetype2/ftincrem.h +include/freetype2/ftlcdfil.h +include/freetype2/ftlist.h +include/freetype2/ftlzw.h +include/freetype2/ftmac.h +include/freetype2/ftmm.h +include/freetype2/ftmodapi.h +include/freetype2/ftmoderr.h +include/freetype2/ftotval.h +include/freetype2/ftoutln.h +include/freetype2/ftpfr.h +include/freetype2/ftrender.h +include/freetype2/ftsizes.h +include/freetype2/ftsnames.h +include/freetype2/ftstroke.h +include/freetype2/ftsynth.h +include/freetype2/ftsystem.h +include/freetype2/ftttdrv.h +include/freetype2/fttrigon.h +include/freetype2/fttypes.h +include/freetype2/ftwinfnt.h +include/freetype2/ftxf86.h +include/freetype2/t1tables.h +include/freetype2/ttnameid.h +include/freetype2/tttables.h +include/freetype2/tttags.h +include/freetype2/ttunpat.h lib/libfreetype.a lib/libfreetype.la lib/libfreetype.so @@ -56,6 +56,5 @@ lib/libfreetype.so.9 libdata/pkgconfig/freetype2.pc share/aclocal/freetype2.m4 -@dirrm include/freetype2/freetype/config -@dirrm include/freetype2/freetype +@dirrm include/freetype2/config @dirrm include/freetype2 --- freetype-2.5.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: