[Midnightbsd-cvs] mports [22350] trunk/print/fontforge: at least update to latest.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Feb 25 12:40:19 EST 2017 

Revision: 22350
          http://svnweb.midnightbsd.org/mports/?rev=22350
Author:   laffer1
Date:     2017-02-25 12:40:19 -0500 (Sat, 25 Feb 2017)
Log Message:
-----------
at least update to latest.

Modified Paths:
--------------
    trunk/print/fontforge/Makefile
    trunk/print/fontforge/distinfo
    trunk/print/fontforge/files/patch-fontforge_splinefont.h
    trunk/print/fontforge/pkg-descr
    trunk/print/fontforge/pkg-plist

Removed Paths:
-------------
    trunk/print/fontforge/files/patch-configure.ac

Modified: trunk/print/fontforge/Makefile
===================================================================
--- trunk/print/fontforge/Makefile	2017-02-25 17:34:40 UTC (rev 22349)
+++ trunk/print/fontforge/Makefile	2017-02-25 17:40:19 UTC (rev 22350)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	fontforge
-PORTVERSION=	20150824
+PORTVERSION=	20161005
 PORTREVISION=	0
 CATEGORIES=	print
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -12,24 +12,26 @@
 LICENSE=	gpl3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:${PORTSDIR}/devel/uthash \
-		${LOCALBASE}/bin/gnulib-tool:${PORTSDIR}/devel/gnulib
-LIB_DEPENDS=	libuninameslist.so:${PORTSDIR}/textproc/libuninameslist \
-		libtiff.so:${PORTSDIR}/graphics/tiff \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libgif.so:${PORTSDIR}/graphics/giflib \
-		libspiro.so:${PORTSDIR}/graphics/libspiro \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libltdl.so:${PORTSDIR}/devel/libltdl
+BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
+		${LOCALBASE}/bin/gnulib-tool:devel/gnulib
+LIB_DEPENDS=	libuninameslist.so:textproc/libuninameslist \
+		libtiff.so:graphics/tiff \
+		libpng.so:graphics/png \
+		libgif.so:graphics/giflib \
+		libspiro.so:graphics/libspiro \
+		libfreetype.so:print/freetype2 \
+		libltdl.so:devel/libltdl \
+		libfontconfig.so:x11-fonts/fontconfig
 
 USE_GITHUB=	yes
 
-USES=		autoreconf:build desktop-file-utils execinfo gettext gmake iconv \
-		jpeg libtool pkgconfig python shared-mime-info shebangfix
+USES=		autoreconf:build compiler desktop-file-utils execinfo gettext \
+		gmake iconv jpeg libtool pkgconfig python readline:port \
+		shared-mime-info shebangfix
 SHEBANG_FILES=	pycontrib/gdraw/__init__.py \
 		pycontrib/gdraw/gdraw.py
-USE_XORG=	ice x11 xi xkbui
-USE_GNOME=	glib20 gtk20 libxml2 pango
+USE_XORG=	ice sm x11 xi xkbui xft
+USE_GNOME=	cairo glib20 gtk20 libxml2 pango
 
 CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -48,7 +50,6 @@
 
 PYTHON_CONFIGURE_ENABLE=	python-scripting python-extension
 
-CAIRO_USE=	GNOME=cairo
 CAIRO_CONFIGURE_WITH=	cairo
 
 .include <bsd.mport.options.mk>
@@ -60,7 +61,7 @@
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \
 		ftp://ftp.freetype.org/freetype/freetype2/:freetype
-FREETYPE_VERSION=	2.6.2
+FREETYPE_VERSION=	2.6.3
 FREETYPE_SRC=	freetype-${FREETYPE_VERSION}.tar.bz2
 DISTFILES+=	${FREETYPE_SRC:C/$/:freetype/}
 CONFIGURE_ARGS+=	--enable-freetype-debugger=${WRKDIR}/freetype-${FREETYPE_VERSION}
@@ -77,6 +78,16 @@
 		${SH} -c '. ./bootstrap.conf ; \
 		${LOCALBASE}/bin/libtoolize -i -c -q ; \
 		${LOCALBASE}/bin/gnulib-tool --aux-dir=config --m4-base=m4 --libtool --symlink --import $${gnulib_modules}' ; \
-		export LIBTOOLIZE=true ; ${LOCALBASE}/bin/autoreconf -s -i)
+		export LIBTOOLIZE=true ; ${AUTORECONF} -f -i)
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# waiting for the llvm bug to fix. http://llvm.org/bugs/show_bug.cgi?id=21903
+.if ${ARCH} == i386 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} > 36
+BUILD_DEPENDS+=	clang36:lang/clang36
+CPP=		clang-cpp36
+CC=		clang36
+CXX=		clang++36
+.endif
+
+.include <bsd.port.post.mk>

Modified: trunk/print/fontforge/distinfo
===================================================================
--- trunk/print/fontforge/distinfo	2017-02-25 17:34:40 UTC (rev 22349)
+++ trunk/print/fontforge/distinfo	2017-02-25 17:40:19 UTC (rev 22350)
@@ -1,2 +1,5 @@
-SHA256 (fontforge-20150824_GH0.tar.gz) = 28ab2471cb010c1fa75b8ab8191a1dded81fe1e9490aa5ff6ab4706a4c78ff27
-SIZE (fontforge-20150824_GH0.tar.gz) = 25030387
+TIMESTAMP = 1488041282
+SHA256 (fontforge-20161005_GH0.tar.gz) = faf5e911a634b6931060858b093b22f1c5bf549969e7dbf4c4ee6f7372fc1c75
+SIZE (fontforge-20161005_GH0.tar.gz) = 25097261
+SHA256 (freetype-2.6.3.tar.bz2) = 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2
+SIZE (freetype-2.6.3.tar.bz2) = 1753083

Deleted: trunk/print/fontforge/files/patch-configure.ac
===================================================================
--- trunk/print/fontforge/files/patch-configure.ac	2017-02-25 17:34:40 UTC (rev 22349)
+++ trunk/print/fontforge/files/patch-configure.ac	2017-02-25 17:40:19 UTC (rev 22350)
@@ -1,28 +0,0 @@
---- configure.ac.orig	2014-11-27 00:40:08 UTC
-+++ configure.ac
-@@ -327,9 +327,6 @@ dnl AC_SEARCH_LIBS([dlopen], [dl dld])
- 
- FONTFORGE_CONFIG_X_LIBRARIES
- 
--# zlib is a requirement. It is too commonly available to bother
--# leaving out.
--PKG_CHECK_MODULES([ZLIB],[zlib])
- PKG_CHECK_MODULES([GLIB],[glib-2.0 >= 2.6 gio-2.0])
- 
- if test x"${i_do_have_gui}" = xyes; then
-@@ -549,7 +546,6 @@ if test x"${i_do_have_freetype_debugger}
-    my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/include"
-    my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/include/freetype"
- fi
--my_cflags="${my_cflags} ${ZLIB_CFLAGS}"
- my_cflags="${my_cflags} ${GLIB_CFLAGS}"
- my_cflags="${my_cflags} ${CAIRO_CFLAGS}"
- my_cflags="${my_cflags} ${PANGO_CFLAGS}"
-@@ -590,7 +586,6 @@ test x"${i_do_have_libspiro}" = xyes && 
- my_libs="${my_libs} ${LIBSPIRO_LIBS}"
- my_libs="${my_libs} ${FREETYPE_LIBS}"
- my_libs="${my_libs} ${PTHREAD_LIBS}"
--my_libs="${my_libs} ${ZLIB_LIBS}"
- my_libs="${my_libs} ${GLIB_LIBS}"
- my_libs="${my_libs} ${LIBXML_LIBS}"
- AC_SUBST([MY_LIBS],[${my_libs}])

Modified: trunk/print/fontforge/files/patch-fontforge_splinefont.h
===================================================================
--- trunk/print/fontforge/files/patch-fontforge_splinefont.h	2017-02-25 17:34:40 UTC (rev 22349)
+++ trunk/print/fontforge/files/patch-fontforge_splinefont.h	2017-02-25 17:40:19 UTC (rev 22350)
@@ -9,7 +9,7 @@
 +#include <osreldate.h>
 +#endif
 +
-+#if defined(_WIN32) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
++#if defined(_WIN32) || defined(__MidnightBSD__) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
  #define BAD_LOCALE_HACK
  typedef char* locale_t;
  #define LC_GLOBAL_LOCALE ((locale_t)-1)

Modified: trunk/print/fontforge/pkg-descr
===================================================================
--- trunk/print/fontforge/pkg-descr	2017-02-25 17:34:40 UTC (rev 22349)
+++ trunk/print/fontforge/pkg-descr	2017-02-25 17:40:19 UTC (rev 22350)
@@ -1,7 +1,7 @@
-FontForge (formerly called PfaEdit) is a PostScript font editor which can 
-create and modify outline fonts in Type 1, CID-Keyed, TrueType, OpenType 
+FontForge (formerly called PfaEdit) is a PostScript font editor which can
+create and modify outline fonts in Type 1, CID-Keyed, TrueType, OpenType
 format. It can generate bitmaps and save in BDF format or embedded bitmaps
-in TrueType/OpenType fonts. 
+in TrueType/OpenType fonts.
 
 It can generate Type3 and SVG fonts if built with multilayer feature.
 If you feel the shortage of memory, rebuilding multilayer-disabled
@@ -8,8 +8,8 @@
 FontForge with FONTFORGE_NO_MULTILAYER defined will save some memory.
 
 If you have installed AutoTrace or Potrace, you can generate outlines
-from imported bitmap images. 
+from imported bitmap images.
 
-For more information, see 
+For more information, see
 
 WWW: http://fontforge.sourceforge.net/

Modified: trunk/print/fontforge/pkg-plist
===================================================================
--- trunk/print/fontforge/pkg-plist	2017-02-25 17:34:40 UTC (rev 22349)
+++ trunk/print/fontforge/pkg-plist	2017-02-25 17:40:19 UTC (rev 22350)
@@ -292,27 +292,47 @@
 %%DATADIR%%/pixmaps/overlapintersection.png
 %%DATADIR%%/pixmaps/overlaprm.png
 %%DATADIR%%/pixmaps/palette3drotate.png
+%%DATADIR%%/pixmaps/palette3drotate-selected.png
 %%DATADIR%%/pixmaps/palettecorner.png
+%%DATADIR%%/pixmaps/palettecorner-selected.png
 %%DATADIR%%/pixmaps/palettecurve.png
+%%DATADIR%%/pixmaps/palettecurve-selected.png
 %%DATADIR%%/pixmaps/paletteelipse.png
+%%DATADIR%%/pixmaps/paletteelipse-selected.png
 %%DATADIR%%/pixmaps/paletteflip.png
+%%DATADIR%%/pixmaps/paletteflip-selected.png
 %%DATADIR%%/pixmaps/palettefreehand.png
+%%DATADIR%%/pixmaps/palettefreehand-selected.png
 %%DATADIR%%/pixmaps/palettehand.png
+%%DATADIR%%/pixmaps/palettehand-selected.png
 %%DATADIR%%/pixmaps/palettehvcurve.png
+%%DATADIR%%/pixmaps/palettehvcurve-selected.png
 %%DATADIR%%/pixmaps/paletteknife.png
+%%DATADIR%%/pixmaps/paletteknife-selected.png
 %%DATADIR%%/pixmaps/paletteline.png
 %%DATADIR%%/pixmaps/palettemagnify.png
+%%DATADIR%%/pixmaps/palettemagnify-selected.png
 %%DATADIR%%/pixmaps/palettepen.png
+%%DATADIR%%/pixmaps/palettepen-selected.png
 %%DATADIR%%/pixmaps/palettepencil.png
 %%DATADIR%%/pixmaps/paletteperspective.png
+%%DATADIR%%/pixmaps/paletteperspective-selected.png
 %%DATADIR%%/pixmaps/palettepointer.png
+%%DATADIR%%/pixmaps/palettepointer-selected.png
 %%DATADIR%%/pixmaps/palettepoly.png
+%%DATADIR%%/pixmaps/palettepoly-selected.png
 %%DATADIR%%/pixmaps/paletterect.png
+%%DATADIR%%/pixmaps/paletterect-selected.png
 %%DATADIR%%/pixmaps/paletterotate.png
+%%DATADIR%%/pixmaps/paletterotate-selected.png
 %%DATADIR%%/pixmaps/paletteruler.png
+%%DATADIR%%/pixmaps/paletteruler-selected.png
 %%DATADIR%%/pixmaps/palettescale.png
+%%DATADIR%%/pixmaps/palettescale-selected.png
+%%DATADIR%%/pixmaps/paletteselectedbg.png
 %%DATADIR%%/pixmaps/paletteshift.png
 %%DATADIR%%/pixmaps/paletteskew.png
+%%DATADIR%%/pixmaps/paletteskew-selected.png
 %%DATADIR%%/pixmaps/palettesmall3drotate.png
 %%DATADIR%%/pixmaps/palettesmallcorner.png
 %%DATADIR%%/pixmaps/palettesmallcurve.png
@@ -340,15 +360,23 @@
 %%DATADIR%%/pixmaps/palettesmallstar.png
 %%DATADIR%%/pixmaps/palettesmalltangent.png
 %%DATADIR%%/pixmaps/palettespirocorner.png
+%%DATADIR%%/pixmaps/palettespirocorner-selected.png
 %%DATADIR%%/pixmaps/palettespirocurve.png
+%%DATADIR%%/pixmaps/palettespirocurve-selected.png
 %%DATADIR%%/pixmaps/palettespirodisabled.png
 %%DATADIR%%/pixmaps/palettespirodown.png
 %%DATADIR%%/pixmaps/palettespirog2curve.png
+%%DATADIR%%/pixmaps/palettespirog2curve-selected.png
 %%DATADIR%%/pixmaps/palettespiroleft.png
+%%DATADIR%%/pixmaps/palettespiroleft-selected.png
 %%DATADIR%%/pixmaps/palettespiroright.png
+%%DATADIR%%/pixmaps/palettespiroright-selected.png
 %%DATADIR%%/pixmaps/palettespiroup.png
+%%DATADIR%%/pixmaps/palettespiroup-selected.png
 %%DATADIR%%/pixmaps/palettestar.png
+%%DATADIR%%/pixmaps/palettestar-selected.png
 %%DATADIR%%/pixmaps/palettetangent.png
+%%DATADIR%%/pixmaps/palettetangent-selected.png
 %%DATADIR%%/pixmaps/pointsG2curve.png
 %%DATADIR%%/pixmaps/pointsaddanchor.png
 %%DATADIR%%/pixmaps/pointscorner.png

More information about the Midnightbsd-cvs mailing list