svn commit: r403474 - in head: audio/lmms/files graphics/libprojectm/files graphics/xpaint graphics/xpaint/files misc/magicpoint multimedia/ffmpeg0 print/freetype2 print/freetype2/files www/firefox...

Koop Mast kwm at FreeBSD.org
Thu Dec 10 22:14:00 UTC 2015 

Author: kwm
Date: Thu Dec 10 22:13:58 2015
New Revision: 403474
URL: https://svnweb.freebsd.org/changeset/ports/403474

Log:
  Update freetype2 to 2.6.2. [1]
  
  Mark magicpoint broken, maintainer is notified.
  
  Exp-runs run by antoine@
  
  This version also fixes shadowing of TYPEOF in ftconfig.h [2]
  
  PR:		203554 [1], 202083 [2]
  Submitted by:	rhurlin at gwdg.de [2]

Added:
  head/graphics/xpaint/files/patch-configure   (contents, props changed)
  head/graphics/xpaint/files/patch-rw_configure   (contents, props changed)
  head/www/firefox/files/patch-1194520   (contents, props changed)
  head/www/seamonkey/files/patch-1194520   (contents, props changed)
  head/x11-fm/xfe/files/patch-configure   (contents, props changed)
Deleted:
  head/print/freetype2/files/patch-5cd2155
Modified:
  head/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt
  head/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake
  head/graphics/xpaint/Makefile
  head/misc/magicpoint/Makefile
  head/multimedia/ffmpeg0/Makefile
  head/print/freetype2/Makefile
  head/print/freetype2/distinfo
  head/print/freetype2/files/patch-builds_unix_detect.mk
  head/print/freetype2/pkg-plist
  head/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake

Modified: head/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt
==============================================================================
--- head/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt	Thu Dec 10 22:13:58 2015	(r403474)
@@ -1,11 +1,11 @@
---- plugins/zynaddsubfx/fltk/CMakeLists.txt.orig	2013-12-24 21:48:53.000000000 +0200
-+++ plugins/zynaddsubfx/fltk/CMakeLists.txt	2013-12-24 21:49:16.000000000 +0200
-@@ -165,7 +165,7 @@
- mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H)
- 
- # where to find freetype headers
--find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2)
-+find_path(FREETYPE_PATH config/ftheader.h PATH_SUFFIXES freetype2)
- if(FREETYPE_PATH)
-    include_directories(${FREETYPE_PATH})
- endif(FREETYPE_PATH)
+--- plugins/zynaddsubfx/fltk/CMakeLists.txt.orig	2013-06-11 17:46:42.000000000 +0200
++++ plugins/zynaddsubfx/fltk/CMakeLists.txt	2015-10-21 10:24:19.901416000 +0200
+@@ -139,7 +139,7 @@
+ find_file(HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h)
+ find_file(HAVE_DIRENT_H dirent.h)
+ find_file(HAVE_DLFCN_H dlfcn.h)
+-find_file(HAVE_FREETYPE_H freetype.h PATH_SUFFIXES freetype2)
++find_file(HAVE_FREETYPE_H ft2build.h PATH_SUFFIXES freetype2)
+ find_file(HAVE_GL_GL_H GL/gl.h)
+ find_file(HAVE_GL_GLU_H GL/glu.h)
+ find_file(HAVE_LIBPNG_PNG_H libpng/png.h)

Modified: head/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake
==============================================================================
--- head/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake	Thu Dec 10 22:13:58 2015	(r403474)
@@ -1,14 +1,5 @@
 --- cmake/FindFreetype2.cmake.orig	2013-12-24 19:02:55.000000000 +0100
 +++ cmake/FindFreetype2.cmake	2013-12-24 19:03:21.000000000 +0100
-@@ -52,7 +52,7 @@
- #
- 
- 
--FIND_PATH(FREETYPE2_INCLUDE_DIR freetype/config/ftheader.h
-+FIND_PATH(FREETYPE2_INCLUDE_DIR config/ftheader.h
-        ${ADDITIONAL_INCLUDE_PATH}
-       /usr/include
-       /usr/include/freetype2
 @@ -67,7 +67,7 @@
        NO_DEFAULT_PATH
  )

Modified: head/graphics/xpaint/Makefile
==============================================================================
--- head/graphics/xpaint/Makefile	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/graphics/xpaint/Makefile	Thu Dec 10 22:13:58 2015	(r403474)
@@ -23,18 +23,17 @@ RUN_DEPENDS=	psselect:${PORTSDIR}/print/
 
 USE_XORG=	xft xmu xpm
 GNU_CONFIGURE=	yes
-USES=		ghostscript:run jpeg libtool:build shebangfix tar:bzip2
+USES=		ghostscript:run jpeg libtool:build pkgconfig shebangfix \
+		tar:bzip2
 SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
-		-I${LOCALBASE}/include/freetype2/freetype
+CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 MAKE_ENV+=	RM="${RM} -f"
 
 post-patch:
 	@${RM} -f ${WRKSRC}/XPaint.ad
 	@${REINPLACE_CMD} -e 's/-ldl //' \
-		-e 's|freetype/||g' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
 	@${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \
 		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \

Added: head/graphics/xpaint/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/xpaint/files/patch-configure	Thu Dec 10 22:13:58 2015	(r403474)
@@ -0,0 +1,11 @@
+--- configure.orig	2015-12-03 20:52:59.771668000 +0100
++++ configure	2015-12-03 20:53:09.226361000 +0100
+@@ -5611,7 +5611,7 @@
+ $as_echo_n "checking location of freetype2 headers... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <freetype2/config/ftheader.h>
++#include <freetype2/freetype/config/ftheader.h>
+ int
+ main ()
+ {

Added: head/graphics/xpaint/files/patch-rw_configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/xpaint/files/patch-rw_configure	Thu Dec 10 22:13:58 2015	(r403474)
@@ -0,0 +1,11 @@
+--- rw/configure.orig	2015-12-03 20:56:32.251228000 +0100
++++ rw/configure	2015-12-03 20:56:55.905547000 +0100
+@@ -11691,7 +11691,7 @@
+ $as_echo_n "checking location of freetype2 headers... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-#include <freetype2/config/ftheader.h>
++#include <freetype2/freetype/config/ftheader.h>
+ int
+ main ()
+ {

Modified: head/misc/magicpoint/Makefile
==============================================================================
--- head/misc/magicpoint/Makefile	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/misc/magicpoint/Makefile	Thu Dec 10 22:13:58 2015	(r403474)
@@ -10,6 +10,8 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/f
 MAINTAINER=	dinoex at FreeBSD.org
 COMMENT=	X11-based presentation tool
 
+BROKEN=		Doesn't build with freetype2 2.6.1 or higher
+
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \

Modified: head/multimedia/ffmpeg0/Makefile
==============================================================================
--- head/multimedia/ffmpeg0/Makefile	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/multimedia/ffmpeg0/Makefile	Thu Dec 10 22:13:58 2015	(r403474)
@@ -321,7 +321,6 @@ post-patch:
 		${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' \

Modified: head/print/freetype2/Makefile
==============================================================================
--- head/print/freetype2/Makefile	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/print/freetype2/Makefile	Thu Dec 10 22:13:58 2015	(r403474)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freetype2
-PORTVERSION=	2.6
-PORTREVISION=	1
+PORTVERSION=	2.6.2
 CATEGORIES=	print
 MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
 		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \

Modified: head/print/freetype2/distinfo
==============================================================================
--- head/print/freetype2/distinfo	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/print/freetype2/distinfo	Thu Dec 10 22:13:58 2015	(r403474)
@@ -1,2 +1,2 @@
-SHA256 (freetype-2.6.tar.bz2) = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e
-SIZE (freetype-2.6.tar.bz2) = 1726219
+SHA256 (freetype-2.6.2.tar.bz2) = baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892
+SIZE (freetype-2.6.2.tar.bz2) = 1767940

Modified: head/print/freetype2/files/patch-builds_unix_detect.mk
==============================================================================
--- head/print/freetype2/files/patch-builds_unix_detect.mk	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/print/freetype2/files/patch-builds_unix_detect.mk	Thu Dec 10 22:13:58 2015	(r403474)
@@ -1,5 +1,5 @@
---- builds/unix/detect.mk.orig	2015-03-11 01:47:10.000000000 -0400
-+++ builds/unix/detect.mk	2015-06-16 05:45:17.176216000 -0400
+--- builds/unix/detect.mk.orig	2015-09-25 07:58:57.000000000 +0200
++++ builds/unix/detect.mk	2015-10-04 12:35:05.733855000 +0200
 @@ -22,6 +22,9 @@
                       $(wildcard /usr/sbin/init) \
                       $(wildcard /dev/null) \
@@ -10,21 +10,17 @@
    ifneq ($(is_unix),)
  
      PLATFORM := unix
-@@ -81,12 +84,12 @@
+@@ -80,10 +83,10 @@
    ifdef must_configure
      ifneq ($(have_Makefile),)
        # we are building FT2 not in the src tree
--	      CONFIG_SHELL="$(CONFIG_SHELL)" \
--	        $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
-+#	      CONFIG_SHELL="$(CONFIG_SHELL)" \
-+#	        $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
+-	        $(TOP_DIR)/builds/unix/configure $(value CFG)
++#	        $(TOP_DIR)/builds/unix/configure $(value CFG)
      else
 -	      cd builds/unix; \
--	      CONFIG_SHELL="$(CONFIG_SHELL)" \
--	        $(CONFIG_SHELL) ./configure $(value CFG)
+-	        ./configure $(value CFG)
 +#	      cd builds/unix; \
-+#	      CONFIG_SHELL="$(CONFIG_SHELL)" \
-+#	        $(CONFIG_SHELL) ./configure $(value CFG)
++#	        ./configure $(value CFG)
      endif
    endif
  

Modified: head/print/freetype2/pkg-plist
==============================================================================
--- head/print/freetype2/pkg-plist	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/print/freetype2/pkg-plist	Thu Dec 10 22:13:58 2015	(r403474)
@@ -1,59 +1,59 @@
 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/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/ftfntfmt.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/fttrigon.h
+include/freetype2/freetype/ftttdrv.h
+include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/ftwinfnt.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/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/ftfntfmt.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/fttrigon.h
-include/freetype2/ftttdrv.h
-include/freetype2/fttypes.h
-include/freetype2/ftwinfnt.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.so
 lib/libfreetype.so.6
-lib/libfreetype.so.6.12.0
+lib/libfreetype.so.6.12.2
 libdata/pkgconfig/freetype2.pc
 man/man1/freetype-config.1.gz
 share/aclocal/freetype2.m4

Added: head/www/firefox/files/patch-1194520
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/firefox/files/patch-1194520	Thu Dec 10 22:13:58 2015	(r403474)
@@ -0,0 +1,35 @@
+From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh+mozilla at glandium.org>
+Date: Fri, 14 Aug 2015 08:50:38 +0900
+Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
+ <freetype/ftfntfmt.h>
+
+---
+ config/system-headers | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/system-headers b/config/system-headers
+index bee35da..ad1f88d 100644
+--- config/system-headers
++++ config/system-headers
+@@ -450,16 +450,17 @@ foundation/base64.h
+ foundation/hexdump.h
+ #endif
+ fp.h
+ fpieee.h
+ frame/log.h
+ frame/req.h
+ freetype/freetype.h
+ freetype/ftcache.h
++freetype/ftfntfmt.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
+ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+-- 
+2.5.0.3.ge81d485
+

Added: head/www/seamonkey/files/patch-1194520
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/seamonkey/files/patch-1194520	Thu Dec 10 22:13:58 2015	(r403474)
@@ -0,0 +1,35 @@
+From bb146548c7846ba5d14f070f4be985797d83d5ca Mon Sep 17 00:00:00 2001
+From: Mike Hommey <mh+mozilla at glandium.org>
+Date: Fri, 14 Aug 2015 08:50:38 +0900
+Subject: [PATCH] Bug 1194520 - Add a system header wrapper for
+ <freetype/ftfntfmt.h>
+
+---
+ config/system-headers | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/config/system-headers b/config/system-headers
+index bee35da..ad1f88d 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -450,16 +450,17 @@ foundation/base64.h
+ foundation/hexdump.h
+ #endif
+ fp.h
+ fpieee.h
+ frame/log.h
+ frame/req.h
+ freetype/freetype.h
+ freetype/ftcache.h
++freetype/ftfntfmt.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
+ freetype/ftoutln.h
+ freetype/ttnameid.h
+ freetype/tttables.h
+ freetype/t1tables.h
+ freetype/ftlcdfil.h
+ freetype/ftsizes.h
+-- 
+2.5.0.3.ge81d485
+

Added: head/x11-fm/xfe/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/xfe/files/patch-configure	Thu Dec 10 22:13:58 2015	(r403474)
@@ -0,0 +1,11 @@
+--- configure.orig	2015-10-21 16:59:07.344253000 +0200
++++ configure	2015-10-21 16:59:18.245643000 +0200
+@@ -14940,7 +14940,7 @@
+ 	  LIBS="$LIBS $freetype_libs"
+ 	  CPPFLAGS="$freetype_cflags $CPPFLAGS"
+ 	fi
+-	ac_fn_cxx_check_header_mongrel "$LINENO" "config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default"
++	ac_fn_cxx_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default"
+ if test "x$ac_cv_header_config_ftheader_h" = xyes; then :
+ 
+ else

Modified: head/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake
==============================================================================
--- head/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake	Thu Dec 10 21:50:14 2015	(r403473)
+++ head/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake	Thu Dec 10 22:13:58 2015	(r403474)
@@ -1,6 +1,6 @@
---- cmake/modules/FREETYPEConfig.cmake.orig	2008-04-07 23:45:10.000000000 +0300
-+++ cmake/modules/FREETYPEConfig.cmake	2013-12-23 19:53:13.000000000 +0200
-@@ -1,14 +1,14 @@
+--- cmake/modules/FREETYPEConfig.cmake.orig	2008-04-07 22:45:10.000000000 +0200
++++ cmake/modules/FREETYPEConfig.cmake	2015-12-02 14:40:47.871063000 +0100
+@@ -1,10 +1,10 @@
  #
  # Find the native FREETYPE includes and library
  # (from Scribus)
@@ -15,8 +15,3 @@
      NO_CMAKE_SYSTEM_PATH
    )
  
--  FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
-+  FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
-     /usr/include/freetype2
-     /usr/local/include/freetype2
-     /usr/X11R6/include/freetype2

More information about the svn-ports-head mailing list