From owner-svn-ports-head@freebsd.org Fri Jul 31 14:14:21 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 29B1037ABB8; Fri, 31 Jul 2020 14:14:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BJ8RK0JXGz4q3v; Fri, 31 Jul 2020 14:14:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1E2622F2A; Fri, 31 Jul 2020 14:14:20 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06VEEKeV038205; Fri, 31 Jul 2020 14:14:20 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06VEEJ1q038199; Fri, 31 Jul 2020 14:14:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202007311414.06VEEJ1q038199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 31 Jul 2020 14:14:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543867 - in head/graphics/ftgl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/graphics/ftgl: . files X-SVN-Commit-Revision: 543867 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jul 2020 14:14:21 -0000 Author: amdmi3 Date: Fri Jul 31 14:14:19 2020 New Revision: 543867 URL: https://svnweb.freebsd.org/changeset/ports/543867 Log: - Update to 2.4.0 PR: 248272 Submitted by: jbeich Added: head/graphics/ftgl/files/patch-m4_font.m4 - copied, changed from r543866, head/graphics/ftgl/files/patch-configure Deleted: head/graphics/ftgl/files/patch-configure Modified: head/graphics/ftgl/Makefile head/graphics/ftgl/distinfo head/graphics/ftgl/pkg-descr head/graphics/ftgl/pkg-plist Modified: head/graphics/ftgl/Makefile ============================================================================== --- head/graphics/ftgl/Makefile Fri Jul 31 14:01:49 2020 (r543866) +++ head/graphics/ftgl/Makefile Fri Jul 31 14:14:19 2020 (r543867) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= ftgl -DISTVERSION= 2.1.3-rc5 -PORTREVISION= 6 +DISTVERSIONPREFIX= v +DISTVERSION= 2.4.0 PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= SF/${PORTNAME}/FTGL%20Source/2.1.3%7Erc5 MAINTAINER= amdmi3@FreeBSD.org COMMENT= OpenGL FreeType fonts rendering library @@ -16,21 +15,20 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 +USE_GITHUB= yes +GH_ACCOUNT= frankheckenbach + +USES= autoreconf gl pathfix gmake libtool pkgconfig xorg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gl-inc="${LOCALBASE}/include" \ --without-glut-inc -USES= gl pathfix gmake libtool xorg USE_GL= gl glu -USE_XORG= x11 xext xmu +USE_XORG= ice sm x11 xext xmu USE_LDCONFIG= yes +INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-/~/} - post-patch: @${REINPLACE_CMD} -e '/SUBDIRS/ s|docs||; /SUBDIRS/ s|demo||' \ - ${WRKSRC}/Makefile.in - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libftgl.so + ${WRKSRC}/Makefile.am .include Modified: head/graphics/ftgl/distinfo ============================================================================== --- head/graphics/ftgl/distinfo Fri Jul 31 14:01:49 2020 (r543866) +++ head/graphics/ftgl/distinfo Fri Jul 31 14:14:19 2020 (r543867) @@ -1,2 +1,3 @@ -SHA256 (ftgl-2.1.3-rc5.tar.gz) = 5458d62122454869572d39f8aa85745fc05d5518001bcefa63bd6cbb8d26565b -SIZE (ftgl-2.1.3-rc5.tar.gz) = 841597 +TIMESTAMP = 1475810942 +SHA256 (frankheckenbach-ftgl-v2.4.0_GH0.tar.gz) = aa97da1c3442a8fd3941037655df18016d70b5266381c81d81e8b5335f196ea8 +SIZE (frankheckenbach-ftgl-v2.4.0_GH0.tar.gz) = 630803 Copied and modified: head/graphics/ftgl/files/patch-m4_font.m4 (from r543866, head/graphics/ftgl/files/patch-configure) ============================================================================== --- head/graphics/ftgl/files/patch-configure Fri Jul 31 14:01:49 2020 (r543866, copy source) +++ head/graphics/ftgl/files/patch-m4_font.m4 Fri Jul 31 14:14:19 2020 (r543867) @@ -1,11 +1,11 @@ ---- configure.orig 2019-09-25 00:59:19 UTC -+++ configure -@@ -23739,7 +23739,7 @@ GLUT_X_LIBS= - { echo "$as_me:$LINENO: checking for a TrueType font on the system" >&5 - echo $ECHO_N "checking for a TrueType font on the system... $ECHO_C" >&6; } +--- m4/font.m4.orig 2019-02-07 21:39:58 UTC ++++ m4/font.m4 +@@ -11,7 +11,7 @@ AC_DEFUN([FTGL_CHECK_FONT], + AC_MSG_CHECKING(for a TrueType font on the system) --FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*\file:[^"]*"\([^"]*\)".*/\1/p' | sed q`" -+FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*file:[^"]*"\([^"]*\)".*/\1/p' | sed q`" + dnl First try: fontconfig +-FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*\file:@<:@^"@:>@*"\(@<:@^"@:>@*\)".*/\1/p' | sed q`" ++FONT_FILE="`fc-match -sv serif 2>/dev/null| sed -ne 's/.*file:@<:@^"@:>@*"\(@<:@^"@:>@*\)".*/\1/p' | sed q`" + dnl Second try: look into known paths if test "$FONT_FILE" = ""; then - for font in \ Modified: head/graphics/ftgl/pkg-descr ============================================================================== --- head/graphics/ftgl/pkg-descr Fri Jul 31 14:01:49 2020 (r543866) +++ head/graphics/ftgl/pkg-descr Fri Jul 31 14:14:19 2020 (r543867) @@ -6,4 +6,4 @@ format. FTGL uses the Freetype (www.freetype.org) font 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering. -WWW: https://sourceforge.net/projects/ftgl/ +WWW: https://github.com/frankheckenbach/ftgl Modified: head/graphics/ftgl/pkg-plist ============================================================================== --- head/graphics/ftgl/pkg-plist Fri Jul 31 14:01:49 2020 (r543866) +++ head/graphics/ftgl/pkg-plist Fri Jul 31 14:14:19 2020 (r543867) @@ -11,17 +11,20 @@ include/FTGL/FTGLOutlineFont.h include/FTGL/FTGLPixmapFont.h include/FTGL/FTGLPolygonFont.h include/FTGL/FTGLTextureFont.h +include/FTGL/FTGLTriangleExtractorFont.h include/FTGL/FTGlyph.h include/FTGL/FTLayout.h +include/FTGL/FTLibrary.h include/FTGL/FTOutlineGlyph.h include/FTGL/FTPixmapGlyph.h include/FTGL/FTPoint.h include/FTGL/FTPolyGlyph.h include/FTGL/FTSimpleLayout.h include/FTGL/FTTextureGlyph.h +include/FTGL/FTTriangleExtractorGlyph.h include/FTGL/ftgl.h lib/libftgl.a lib/libftgl.so lib/libftgl.so.2 -lib/libftgl.so.2.1.3 +lib/libftgl.so.2.4.0 libdata/pkgconfig/ftgl.pc