Attachment #138579 for bug #184587

Lines 349-354 Link Here

(-)multimedia/ffmpeg/Makefile (+1 lines)
349	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	349	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
350	@${REINPLACE_CMD} -e 's\|-ldl\|\|' \	350	@${REINPLACE_CMD} -e 's\|-ldl\|\|' \
351	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \	351	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \
		352	-e 's\|freetype/freetype.h\|freetype.h\|g' \
352	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	353	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
353	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \	354	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \
354	${WRKSRC}/doc/texi2pod.pl	355	${WRKSRC}/doc/texi2pod.pl

Line 0 Link Here

(-)multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c (+10 lines)
	1	--- libavfilter/vf_drawtext.c.orig 2013-11-20 03:28:56.000000000 +0100
	2	+++ libavfilter/vf_drawtext.c 2013-12-06 18:26:57.000000000 +0100
	3	@@ -48,7 +48,6 @@
	4	#include "video.h"
	5
	6	#include <ft2build.h>
	7	-#include <freetype/config/ftheader.h>
	8	#include FT_FREETYPE_H
	9	#include FT_GLYPH_H
	10	#if CONFIG_FONTCONFIG

Lines 413-418 Link Here

(-)multimedia/ffmpeg0/Makefile (+1 lines)
413	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	413	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
414	@${REINPLACE_CMD} -e 's\|-ldl\|\|; s\|$$(LIBMAJOR)\|${SHLIB_VER}\|g;' \	414	@${REINPLACE_CMD} -e 's\|-ldl\|\|; s\|$$(LIBMAJOR)\|${SHLIB_VER}\|g;' \
415	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \	415	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \
		416	-e 's\|freetype/freetype.h\|freetype.h\|g' \
416	-e 's\|check_ldflags -Wl,--as-needed\|\|' \	417	-e 's\|check_ldflags -Wl,--as-needed\|\|' \
417	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	418	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
418	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \	419	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \

Line 0 Link Here

(-)multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c (+10 lines)
	1	--- libavfilter/vf_drawtext.c.orig 2013-12-06 18:18:29.000000000 +0100
	2	+++ libavfilter/vf_drawtext.c 2013-12-06 18:18:49.000000000 +0100
	3	@@ -41,7 +41,6 @@
	4	#undef time
	5
	6	#include <ft2build.h>
	7	-#include <freetype/config/ftheader.h>
	8	#include FT_FREETYPE_H
	9	#include FT_GLYPH_H
	10




#   $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $

PORTNAME=	freetype2
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/ \

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Free and portable TrueType font rendering engine

USE_AUTOTOOLS=	libtool
USE_BZIP2=	yes
USES=		gmake
MAKE_ENV=	TOP=""

USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USE_GNOME=	ltverhack:9
ltverhack_PATCH_FILES=	builds/unix/ltmain.sh
CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix

OPTIONS_DEFINE=		LCD_FILTERING PNG

LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
PNG_DESC=		Png compressed OpenType embedded bitmaps support

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MLCD_FILTERING}

	@${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 <bsd.port.mk>

Lines 1-2 Link Here

(-)print/freetype2/distinfo (-2 / +2 lines)
1	SHA256 (freetype-2.5.0.1.tar.bz2) = 57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5	1	SHA256 (freetype-2.5.1.tar.bz2) = d715faa92b37980280c857ce9d356fff4361c5a7bd9b5c3f867fc24f598d8f45
2	SIZE (freetype-2.5.0.1.tar.bz2) = 1607037	2	SIZE (freetype-2.5.1.tar.bz2) = 1677282




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




bin/freetype-config
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

lib/libfreetype.so.9
libdata/pkgconfig/freetype2.pc
share/aclocal/freetype2.m4
@dirrm include/freetype2/config
@dirrm include/freetype2/freetype
@dirrm include/freetype2

Return to bug 184587

Lines 3-9 Link Here

(-)print/freetype2/Makefile (-8 / +5 lines)
3	# $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $	3	# $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $
4		4
5	PORTNAME= freetype2	5	PORTNAME= freetype2
6	PORTVERSION= 2.5.0.1	6	PORTVERSION= 2.5.1
7	CATEGORIES= print	7	CATEGORIES= print
8	MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \	8	MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
9	http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \	9	http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
Lines 16-22 Link Here
16	MAINTAINER= gnome@FreeBSD.org	16	MAINTAINER= gnome@FreeBSD.org
17	COMMENT= Free and portable TrueType font rendering engine	17	COMMENT= Free and portable TrueType font rendering engine
18		18
19	USE_AUTOTOOLS= libtool
20	USE_BZIP2= yes	19	USE_BZIP2= yes
21	USES= gmake	20	USES= gmake
22	MAKE_ENV= TOP=""	21	MAKE_ENV= TOP=""
Lines 23-29 Link Here
23	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25	USE_GNOME= ltverhack:9	24	USE_GNOME= ltverhack:9
26	LIBTOOLFILES= builds/unix/configure	25	ltverhack_PATCH_FILES= builds/unix/ltmain.sh
27	CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix	26	CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix
28		27
29	OPTIONS_DEFINE= LCD_FILTERING PNG	28	OPTIONS_DEFINE= LCD_FILTERING PNG
Lines 30-36 Link Here
30	LCD_FILTERING_DESC?= Sub-pixel rendering (patented)	29	LCD_FILTERING_DESC?= Sub-pixel rendering (patented)
31	PNG_DESC= Png compressed OpenType embedded bitmaps support	30	PNG_DESC= Png compressed OpenType embedded bitmaps support
32		31
33	NO_STAGE= yes
34	.include <bsd.port.options.mk>	32	.include <bsd.port.options.mk>
35		33
36	.if ${PORT_OPTIONS:MLCD_FILTERING}	34	.if ${PORT_OPTIONS:MLCD_FILTERING}
Lines 47-58 Link Here
47	@${REINPLACE_CMD} -e 's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g' \	45	@${REINPLACE_CMD} -e 's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g' \
48	${WRKSRC}/builds/unix/install.mk	46	${WRKSRC}/builds/unix/install.mk
49		47
50	pre-configure:
51	@${REINPLACE_CMD} -e '/^LIBTOOL/s\|LIBTOOL := $$(FT_LIBTOOL_DIR)/libtool\|LIBTOOL := ${WRKDIR}/gnome-libtool\|' \
52	${WRKSRC}/builds/unix/unix-cc.in
53
54	post-configure:	48	post-configure:
55	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \	49	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
56	${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)	50	${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
57		51
		52	post-install:
		53	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.9
		54
58	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-17 Link Here

(-)print/freetype2/files/patch-builds::unix::freetype-config.in (-17 lines)
1	--- builds/unix/freetype-config.in.orig 2009-12-21 18:23:42.000000000 -0500
2	+++ builds/unix/freetype-config.in 2010-02-21 15:51:17.000000000 -0500
3	@@ -131,12 +131,8 @@ if test "$echo_ft_version" = "yes" ; the
4	fi
5
6	if test "$echo_cflags" = "yes" ; then
7	- cflags="-I${SYSROOT}$includedir/freetype2"
8	- if test "${SYSROOT}$includedir" != "/usr/include" ; then
9	- echo $cflags -I${SYSROOT}$includedir
10	- else
11	- echo $cflags
12	- fi
13	+ cflags="-I$includedir/freetype2 -I$includedir"
14	+ echo $cflags
15	fi
16
17	if test "$echo_libs" = "yes" ; then

Lines 1-55 Link Here

(-)print/freetype2/pkg-plist (-53 / +52 lines)
1	bin/freetype-config	1	bin/freetype-config
2	include/freetype2/freetype/config/ftconfig.h	2	include/freetype2/config/ftconfig.h
3	include/freetype2/freetype/config/ftheader.h	3	include/freetype2/config/ftheader.h
4	include/freetype2/freetype/config/ftmodule.h	4	include/freetype2/config/ftmodule.h
5	include/freetype2/freetype/config/ftoption.h	5	include/freetype2/config/ftoption.h
6	include/freetype2/freetype/config/ftstdlib.h	6	include/freetype2/config/ftstdlib.h
7	include/freetype2/freetype/freetype.h	7	include/freetype2/freetype.h
8	include/freetype2/freetype/ftadvanc.h	8	include/freetype2/ft2build.h
9	include/freetype2/freetype/ftautoh.h	9	include/freetype2/ftadvanc.h
10	include/freetype2/freetype/ftbbox.h	10	include/freetype2/ftautoh.h
11	include/freetype2/freetype/ftbdf.h	11	include/freetype2/ftbbox.h
12	include/freetype2/freetype/ftbitmap.h	12	include/freetype2/ftbdf.h
13	include/freetype2/freetype/ftbzip2.h	13	include/freetype2/ftbitmap.h
14	include/freetype2/freetype/ftcache.h	14	include/freetype2/ftbzip2.h
15	include/freetype2/freetype/ftcffdrv.h	15	include/freetype2/ftcache.h
16	include/freetype2/freetype/ftchapters.h	16	include/freetype2/ftcffdrv.h
17	include/freetype2/freetype/ftcid.h	17	include/freetype2/ftchapters.h
18	include/freetype2/freetype/fterrdef.h	18	include/freetype2/ftcid.h
19	include/freetype2/freetype/fterrors.h	19	include/freetype2/fterrdef.h
20	include/freetype2/freetype/ftgasp.h	20	include/freetype2/fterrors.h
21	include/freetype2/freetype/ftglyph.h	21	include/freetype2/ftgasp.h
22	include/freetype2/freetype/ftgxval.h	22	include/freetype2/ftglyph.h
23	include/freetype2/freetype/ftgzip.h	23	include/freetype2/ftgxval.h
24	include/freetype2/freetype/ftimage.h	24	include/freetype2/ftgzip.h
25	include/freetype2/freetype/ftincrem.h	25	include/freetype2/ftimage.h
26	include/freetype2/freetype/ftlcdfil.h	26	include/freetype2/ftincrem.h
27	include/freetype2/freetype/ftlist.h	27	include/freetype2/ftlcdfil.h
28	include/freetype2/freetype/ftlzw.h	28	include/freetype2/ftlist.h
29	include/freetype2/freetype/ftmac.h	29	include/freetype2/ftlzw.h
30	include/freetype2/freetype/ftmm.h	30	include/freetype2/ftmac.h
31	include/freetype2/freetype/ftmodapi.h	31	include/freetype2/ftmm.h
32	include/freetype2/freetype/ftmoderr.h	32	include/freetype2/ftmodapi.h
33	include/freetype2/freetype/ftotval.h	33	include/freetype2/ftmoderr.h
34	include/freetype2/freetype/ftoutln.h	34	include/freetype2/ftotval.h
35	include/freetype2/freetype/ftpfr.h	35	include/freetype2/ftoutln.h
36	include/freetype2/freetype/ftrender.h	36	include/freetype2/ftpfr.h
37	include/freetype2/freetype/ftsizes.h	37	include/freetype2/ftrender.h
38	include/freetype2/freetype/ftsnames.h	38	include/freetype2/ftsizes.h
39	include/freetype2/freetype/ftstroke.h	39	include/freetype2/ftsnames.h
40	include/freetype2/freetype/ftsynth.h	40	include/freetype2/ftstroke.h
41	include/freetype2/freetype/ftsystem.h	41	include/freetype2/ftsynth.h
42	include/freetype2/freetype/ftttdrv.h	42	include/freetype2/ftsystem.h
43	include/freetype2/freetype/fttrigon.h	43	include/freetype2/ftttdrv.h
44	include/freetype2/freetype/fttypes.h	44	include/freetype2/fttrigon.h
45	include/freetype2/freetype/ftwinfnt.h	45	include/freetype2/fttypes.h
46	include/freetype2/freetype/ftxf86.h	46	include/freetype2/ftwinfnt.h
47	include/freetype2/freetype/t1tables.h	47	include/freetype2/ftxf86.h
48	include/freetype2/freetype/ttnameid.h	48	include/freetype2/t1tables.h
49	include/freetype2/freetype/tttables.h	49	include/freetype2/ttnameid.h
50	include/freetype2/freetype/tttags.h	50	include/freetype2/tttables.h
51	include/freetype2/freetype/ttunpat.h	51	include/freetype2/tttags.h
52	include/ft2build.h	52	include/freetype2/ttunpat.h
53	lib/libfreetype.a	53	lib/libfreetype.a
54	lib/libfreetype.la	54	lib/libfreetype.la
55	lib/libfreetype.so	55	lib/libfreetype.so
Lines 56-61 Link Here
56	lib/libfreetype.so.9	56	lib/libfreetype.so.9
57	libdata/pkgconfig/freetype2.pc	57	libdata/pkgconfig/freetype2.pc
58	share/aclocal/freetype2.m4	58	share/aclocal/freetype2.m4
59	@dirrm include/freetype2/freetype/config	59	@dirrm include/freetype2/config
60	@dirrm include/freetype2/freetype
61	@dirrm include/freetype2	60	@dirrm include/freetype2