Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Apr 2017 20:16:43 +0000 (UTC)
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r438065 - in head/print/ft2demos: . files
Message-ID:  <201704082016.v38KGhGO034939@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bofh
Date: Sat Apr  8 20:16:43 2017
New Revision: 438065
URL: https://svnweb.freebsd.org/changeset/ports/438065

Log:
  print/ft2demos: Update version 2.6.3=>2.7.1
  
  - Fix variable assignment(!=) by symlink to freetype source
  - Add one more master site
  - Fix clang warning
  
  PR:		218216
  Submitted by:	citrin+pr@citrin.ru

Added:
  head/print/ft2demos/files/
  head/print/ft2demos/files/patch-Makefile   (contents, props changed)
Modified:
  head/print/ft2demos/Makefile
  head/print/ft2demos/distinfo

Modified: head/print/ft2demos/Makefile
==============================================================================
--- head/print/ft2demos/Makefile	Sat Apr  8 20:01:57 2017	(r438064)
+++ head/print/ft2demos/Makefile	Sat Apr  8 20:16:43 2017	(r438065)
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	ft2demos
-PORTVERSION=	2.6.3
+PORTVERSION=	2.7.1
 CATEGORIES=	print
-MASTER_SITES=	SF/freetype/freetype-demos/${PORTVERSION}
+MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
+		SF/freetype/freetype-demos/${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Demo programs for FreeType2
@@ -12,12 +13,11 @@ COMMENT=	Demo programs for FreeType2
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	${FREETYPE_WRKSRC}/config.mk:print/freetype2:build
+BUILD_DEPENDS=	${NONEXISTENT}:print/freetype2:build
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 USES=		gmake tar:bzip2
 USE_XORG=	x11
-MAKE_ENV=	TOP_DIR="${FREETYPE_WRKSRC}"
 MAKE_ARGS=	EXES="${FT_PROGRAMS}" X11_PATH="${LOCALBASE}"
 
 PLIST_FILES=	${FT_PROGRAMS:S,^,bin/,}
@@ -25,7 +25,8 @@ PLIST_FILES=	${FT_PROGRAMS:S,^,bin/,}
 FT_PROGRAMS=	ftbench ftchkwd ftdiff ftdump ftgamma ftgrid ftlint ftmemchk \
 		ftmulti ftpatchk ftstring fttimer ftvalid ftview
 
-FREETYPE_WRKSRC!=	${MAKE} -C ${.CURDIR}/../../print/freetype2 -V WRKSRC
+post-extract:
+	${LN} -sf `${MAKE} -C ${.CURDIR}/../../print/freetype2 -V WRKSRC` ${WRKDIR}/freetype2
 
 do-install:
 	@(cd ${WRKSRC}/bin/.libs && \

Modified: head/print/ft2demos/distinfo
==============================================================================
--- head/print/ft2demos/distinfo	Sat Apr  8 20:01:57 2017	(r438064)
+++ head/print/ft2demos/distinfo	Sat Apr  8 20:16:43 2017	(r438065)
@@ -1,2 +1,3 @@
-SHA256 (ft2demos-2.6.3.tar.bz2) = b076ac52465e912d035f111ede78b88bf3dd186f91a56a54ff83ffdf862e84e4
-SIZE (ft2demos-2.6.3.tar.bz2) = 193412
+TIMESTAMP = 1490746947
+SHA256 (ft2demos-2.7.1.tar.bz2) = d3f8a0d5a3f0d58701133458a8c1d3f97f658869f3c904b1fda447ed3b290ecd
+SIZE (ft2demos-2.7.1.tar.bz2) = 222288

Added: head/print/ft2demos/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/ft2demos/files/patch-Makefile	Sat Apr  8 20:16:43 2017	(r438065)
@@ -0,0 +1,14 @@
+--- Makefile.orig	2017-03-29 16:20:30 UTC
++++ Makefile
+@@ -136,11 +136,9 @@ else
+   # Enable C99 for gcc to avoid warnings.
+   # Note that clang++ aborts with an error if we use `-std=C99',
+   # so check for `++' in $(CC) also.
+-  ifneq ($(findstring -pedantic,$(COMPILE)),)
+     ifeq ($(findstring ++,$(CC)),)
+       COMPILE += -std=c99
+     endif
+-  endif
+ 
+   FTLIB := $(LIB_DIR)/$(LIBRARY).$A
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704082016.v38KGhGO034939>