aboutsummaryrefslogtreecommitdiff
path: root/print/ft2demos
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2017-04-08 20:16:43 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2017-04-08 20:16:43 +0000
commite64cef943aa83497ba84dd71666c9bbd856a2907 (patch)
tree483de4566b8d41796f14fd15a1f129730b6f35c3 /print/ft2demos
parentd36308d07d7eacce59a927f10932ab273ab8a123 (diff)
downloadports-e64cef943aa83497ba84dd71666c9bbd856a2907.tar.gz
ports-e64cef943aa83497ba84dd71666c9bbd856a2907.zip
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
Notes
Notes: svn path=/head/; revision=438065
Diffstat (limited to 'print/ft2demos')
-rw-r--r--print/ft2demos/Makefile11
-rw-r--r--print/ft2demos/distinfo5
-rw-r--r--print/ft2demos/files/patch-Makefile14
3 files changed, 23 insertions, 7 deletions
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index 136bb2457d62..23ed7d187b08 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -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 && \
diff --git a/print/ft2demos/distinfo b/print/ft2demos/distinfo
index d079279d9a2d..c322adf7a545 100644
--- a/print/ft2demos/distinfo
+++ b/print/ft2demos/distinfo
@@ -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
diff --git a/print/ft2demos/files/patch-Makefile b/print/ft2demos/files/patch-Makefile
new file mode 100644
index 000000000000..d4fdf71abe9c
--- /dev/null
+++ b/print/ft2demos/files/patch-Makefile
@@ -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
+