Index: head/print/fontforge/Makefile =================================================================== --- head/print/fontforge/Makefile (revision 419417) +++ head/print/fontforge/Makefile (revision 419418) @@ -1,94 +1,93 @@ # Created by: KANOU Hiroki # $FreeBSD$ PORTNAME= fontforge -PORTVERSION= 20150824 -PORTREVISION= 2 +PORTVERSION= 20160404 CATEGORIES= print -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DISTFILES= # Empty but needed because of the freetype distfile MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Type 1/TrueType/OpenType/bitmap font editor LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE 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 + 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 \ - compiler +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 LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip INSTALLS_ICONS= yes PORTDOCS= * .htaccess OPTIONS_DEFINE= DOCS FREETYPE CAIRO PYTHON OPTIONS_SUB= yes FREETYPE_DESC= Include freetype's internal debugger PYTHON_CONFIGURE_ENABLE= python-scripting python-extension -CAIRO_USE= GNOME=cairo CAIRO_CONFIGURE_WITH= cairo .include .if ${PORT_OPTIONS:MFREETYPE} MASTER_SITES+= http://savannah.nongnu.org/download/freetype/:freetype \ SF/freetype/freetype2/${FREETYPE_VERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/:freetype \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/:freetype \ 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} .else CONFIGURE_ARGS+= --disable-freetype-debugger .endif # This is to get around calling fontforge's bootstrap script, as that script fails # if git isn't installed on a system DESPITE there being a --skip-git argument that # can be passed into it. autoreconf is called here because I want to run it without # libtoolize being run along with it. pre-configure: (cd ${WRKSRC} && \ ${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 ; ${AUTORECONF} -f -i) .include # 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 Index: head/print/fontforge/distinfo =================================================================== --- head/print/fontforge/distinfo (revision 419417) +++ head/print/fontforge/distinfo (revision 419418) @@ -1,4 +1,5 @@ -SHA256 (fontforge-fontforge-20150824_GH0.tar.gz) = 28ab2471cb010c1fa75b8ab8191a1dded81fe1e9490aa5ff6ab4706a4c78ff27 -SIZE (fontforge-fontforge-20150824_GH0.tar.gz) = 25030387 -SHA256 (freetype-2.6.2.tar.bz2) = baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892 -SIZE (freetype-2.6.2.tar.bz2) = 1767940 +TIMESTAMP = 1467049926 +SHA256 (freetype-2.6.3.tar.bz2) = 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2 +SIZE (freetype-2.6.3.tar.bz2) = 1753083 +SHA256 (fontforge-fontforge-20160404_GH0.tar.gz) = 1cc5646fccba2e5af8f1b6c1d0d6d7b6082d9546aefed2348d6c0ed948324796 +SIZE (fontforge-fontforge-20160404_GH0.tar.gz) = 25056793 Index: head/print/fontforge/files/patch-configure.ac =================================================================== --- head/print/fontforge/files/patch-configure.ac (revision 419417) +++ head/print/fontforge/files/patch-configure.ac (nonexistent) @@ -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}]) Property changes on: head/print/fontforge/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property