Date: Tue, 5 Jan 2021 00:31:04 +0000 (UTC) From: Guangyuan Yang <ygy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560358 - in head/print/fontforge: . files Message-ID: <202101050031.1050V4cr073090@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ygy (doc committer) Date: Tue Jan 5 00:31:03 2021 New Revision: 560358 URL: https://svnweb.freebsd.org/changeset/ports/560358 Log: print/fontforge: Update to 20201107 - Update WWW - Move build from autotools to CMake Changelogs: - https://github.com/fontforge/fontforge/releases/tag/20200314 - https://github.com/fontforge/fontforge/releases/tag/20201107 PR: 252343 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) Approved by: lwhsu Deleted: head/print/fontforge/files/ Modified: head/print/fontforge/Makefile head/print/fontforge/distinfo head/print/fontforge/pkg-descr head/print/fontforge/pkg-plist Modified: head/print/fontforge/Makefile ============================================================================== --- head/print/fontforge/Makefile Mon Jan 4 23:29:21 2021 (r560357) +++ head/print/fontforge/Makefile Tue Jan 5 00:31:03 2021 (r560358) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fontforge -PORTVERSION= 20190801 -PORTREVISION= 2 +PORTVERSION= 20201107 CATEGORIES= print MAINTAINER= cyberbotx@cyberbotx.com @@ -14,93 +13,104 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= autoreconf compiler:c++11-lang gettext gmake gnome iconv:wchar_t libtool \ - localbase pkgconfig +USES= compiler:c++11-lang cmake desktop-file-utils gettext gnome \ + iconv:wchar_t pkgconfig shared-mime-info USE_GITHUB= yes -USE_GNOME= glib20 libxml2 +USE_GNOME= cairo glib20 libxml2 +CMAKE_ARGS= -DIconv_INCLUDE_DIR=${ICONV_INCLUDE_PATH} \ + -DIconv_LIBRARY=${ICONV_LIB_PATH} -# It seems that iconv is required regardless of this setting, so forcing it on -CONFIGURE_ARGS= --with-iconv - USE_LDCONFIG= yes -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip INSTALLS_ICONS= yes -PORTDOCS= * .htaccess +PORTDOCS= * -OPTIONS_DEFINE= CAIRO DOCS FREETYPE GIF JPEG PNG PYTHON READLINE SPIRO TIFF \ +OPTIONS_DEFINE= DOCS FREETYPE GIF JPEG PNG PYTHON READLINE SPIRO TIFF \ TILEPATH UNINAMESLIST WOFF2 WRITEPFM -OPTIONS_GROUP= GUI -OPTIONS_GROUP_GUI= GTK3 X11 +OPTIONS_RADIO= GUI +OPTIONS_RADIO_GUI= GTK3 X11 OPTIONS_SINGLE= THEME OPTIONS_SINGLE_THEME= TANGO 2012 -OPTIONS_DEFAULT=CAIRO GIF GTK3 JPEG PNG PYTHON READLINE SPIRO TANGO TIFF \ +OPTIONS_DEFAULT=GIF GTK3 JPEG PNG PYTHON READLINE SPIRO TANGO TIFF \ TILEPATH UNINAMESLIST WOFF2 OPTIONS_SUB= yes 2012_DESC= Old theme that was used until 2012 -2012_CONFIGURE_ENABLE= theme-2012 +2012_CMAKE_ON= -DTHEME:ENUM=2012 -CAIRO_USE= gnome=cairo,pango -CAIRO_CONFIGURE_WITH= cairo -CAIRO_IMPLIES= PNG +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} +DOCS_CMAKE_BOOL=ENABLE_DOCS FREETYPE_DESC= Include freetype's internal debugger FREETYPE_PATCH_DEPENDS= ${NONEXISTENT}:print/freetype2:extract -FREETYPE_CONFIGURE_ENABLE= freetype-debugger=${WRKSRC}/freetype +FREETYPE_CMAKE_ON= -DENABLE_FREETYPE_DEBUGGER:PATH=${WRKSRC}/freetype GIF_LIB_DEPENDS= libgif.so:graphics/giflib -GIF_CONFIGURE_WITH= giflib +GIF_CMAKE_BOOL= ENABLE_LIBGIF GTK3_USE= gnome=gtk30 -GTK3_CONFIGURE_ENABLE= gdk -GTK3_IMPLIES= CAIRO X11 JPEG_USES= jpeg -JPEG_CONFIGURE_WITH= libjpeg +JPEG_CMAKE_BOOL=ENABLE_LIBJPEG PNG_LIB_DEPENDS=libpng.so:graphics/png -PNG_CONFIGURE_WITH= libpng +PNG_CMAKE_BOOL= ENABLE_LIBPNG -PYTHON_USES= python:3.5-3.7 -PYTHON_USES_OFF=python:3.5-3.7,build -PYTHON_CONFIGURE_ENABLE= python-scripting python-extension +PYTHON_USES= python:3.5+ +PYTHON_USES_OFF=python:3.5+,build +PYTHON_CMAKE_BOOL= ENABLE_PYTHON_SCRIPTING ENABLE_PYTHON_EXTENSION READLINE_USES= readline:port -READLINE_CONFIGURE_WITH= libreadline +READLINE_CMAKE_BOOL= ENABLE_LIBREADLINE SPIRO_DESC= Use libspiro to edit with clothoid splines SPIRO_LIB_DEPENDS= libspiro.so:graphics/libspiro -SPIRO_CONFIGURE_WITH= libspiro +SPIRO_CMAKE_BOOL= ENABLE_LIBSPIRO TANGO_DESC= Default theme based on the Tango Desktop Project +TANGO_CMAKE_ON= -DTHEME:ENUM=tango TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_CONFIGURE_WITH= libtiff +TIFF_CMAKE_BOOL=ENABLE_LIBTIFF +# This is disabled by default in fontforge's CMakeLists.txt, but it was +# previously enabled in this port when it was using GNU configure, so I've +# defaulted it to enabled TILEPATH_DESC= Enable a 'tile path' command (a variant of 'expand stroke') -TILEPATH_CONFIGURE_ENABLE= tile-path +TILEPATH_CMAKE_BOOL= ENABLE_TILE_PATH UNINAMESLIST_DESC= Use libuninameslist for Unicode attribute data UNINAMESLIST_LIB_DEPENDS= libuninameslist.so:textproc/libuninameslist -UNINAMESLIST_CONFIGURE_WITH= libuninameslist +UNINAMESLIST_CMAKE_BOOL= ENABLE_LIBUNINAMESLIST WOFF2_DESC= WOFF2 web font support WOFF2_LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ libwoff2dec.so:devel/woff2 -WOFF2_CONFIGURE_ENABLE= woff2 +WOFF2_CMAKE_BOOL= ENABLE_WOFF2 WRITEPFM_DESC= Add ability to save PFM file w/o creating associated font file -WRITEPFM_CONFIGURE_ENABLE= write-pfm +WRITEPFM_CMAKE_BOOL= ENABLE_WRITE_PFM -X11_USES= desktop-file-utils shared-mime-info xorg -X11_USE= gnome=pango xorg=ice,sm,x11,xft,xi +X11_USES= xorg +X11_USE= gnome=pango xorg=ice,sm,x11,xext,xft,xi X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig X11_RUN_DEPENDS= ${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont -X11_CONFIGURE_WITH= x +X11_CMAKE_BOOL= ENABLE_X11 post-patch-FREETYPE-on: - @${LN} -s $$(${MAKE} -C ${PORTSDIR}/print/freetype2 -V WRKSRC) ${WRKSRC}/freetype + @${LN} -s $$(${MAKE} -C ${PORTSDIR}/print/freetype2 -V WRKSRC) \ + ${WRKSRC}/freetype + +post-stage-DOCS-on: + @${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo \ + ${STAGEDIR}${DOCSDIR}/.nojekyll + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MX11} +CMAKE_ARGS+= -DENABLE_GUI:BOOL=true +.else +CMAKE_ARGS+= -DENABLE_GUI:BOOL=false +.endif .include <bsd.port.mk> Modified: head/print/fontforge/distinfo ============================================================================== --- head/print/fontforge/distinfo Mon Jan 4 23:29:21 2021 (r560357) +++ head/print/fontforge/distinfo Tue Jan 5 00:31:03 2021 (r560358) @@ -1,3 +1,3 @@ -TIMESTAMP = 1567124778 -SHA256 (fontforge-fontforge-20190801_GH0.tar.gz) = e4501de5bd8e7f6c68fe7d3abd4667bf44a07b981d342ffa00e8f42e155ce633 -SIZE (fontforge-fontforge-20190801_GH0.tar.gz) = 21082347 +TIMESTAMP = 1609352128 +SHA256 (fontforge-fontforge-20201107_GH0.tar.gz) = 274f8c8cbd7b6a1c77d2a1c03d4d6cd3c9319db62be8b8c88fabbf597f7e863c +SIZE (fontforge-fontforge-20201107_GH0.tar.gz) = 19485522 Modified: head/print/fontforge/pkg-descr ============================================================================== --- head/print/fontforge/pkg-descr Mon Jan 4 23:29:21 2021 (r560357) +++ head/print/fontforge/pkg-descr Tue Jan 5 00:31:03 2021 (r560358) @@ -10,6 +10,4 @@ FontForge with FONTFORGE_NO_MULTILAYER defined will sa If you have installed AutoTrace or Potrace, you can generate outlines from imported bitmap images. -For more information, see - -WWW: http://fontforge.sourceforge.net/ +WWW: https://fontforge.org/ Modified: head/print/fontforge/pkg-plist ============================================================================== --- head/print/fontforge/pkg-plist Mon Jan 4 23:29:21 2021 (r560357) +++ head/print/fontforge/pkg-plist Tue Jan 5 00:31:03 2021 (r560358) @@ -2,104 +2,14 @@ bin/fontforge bin/fontimage bin/fontlint bin/sfddiff -include/fontforge/PfEd.h -include/fontforge/autowidth.h -include/fontforge/autowidth2.h -include/fontforge/baseviews.h -include/fontforge/basics.h -include/fontforge/bezctx_ff.h -include/fontforge/bitmapcontrol.h -include/fontforge/carbon.h -include/fontforge/chardata.h -include/fontforge/charset.h -include/fontforge/delta.h -include/fontforge/dlist.h -include/fontforge/edgelist.h -include/fontforge/edgelist2.h -include/fontforge/encoding.h -include/fontforge/fffreetype.h -include/fontforge/ffgdk.h -include/fontforge/ffglib.h -include/fontforge/ffpython.h -include/fontforge/flaglist.h -include/fontforge/fontforge-config.h -include/fontforge/fontforge-version-extras.h -include/fontforge/fontforge.h -include/fontforge/fontforgevw.h -include/fontforge/fvmetrics.h -include/fontforge/gdraw.h -include/fontforge/gfile.h -include/fontforge/ggadget.h -include/fontforge/gicons.h -include/fontforge/gimage.h -include/fontforge/gio.h -include/fontforge/gkeysym.h -include/fontforge/glif_name_hash.h -include/fontforge/glyphcomp.h -include/fontforge/gprogress.h -include/fontforge/gresedit.h -include/fontforge/gresource.h -include/fontforge/groups.h -include/fontforge/gutils.h -include/fontforge/gwidget.h -include/fontforge/gwwiconv.h -include/fontforge/hotkeys.h -include/fontforge/intl.h -include/fontforge/lookups.h -include/fontforge/mem.h -include/fontforge/mm.h -include/fontforge/namehash.h -include/fontforge/nonlineartrans.h -include/fontforge/ofl.h -include/fontforge/prefs.h -include/fontforge/print.h -include/fontforge/psfont.h -include/fontforge/savefont.h -include/fontforge/scriptfuncs.h -include/fontforge/scripting.h -include/fontforge/sd.h -include/fontforge/search.h -include/fontforge/sfd1.h -include/fontforge/sflayoutP.h -include/fontforge/splinefont.h -include/fontforge/stemdb.h -include/fontforge/ttf.h -include/fontforge/ttfinstrs.h -include/fontforge/uiinterface.h -include/fontforge/unicodelibinfo.h -include/fontforge/unicoderange.h -include/fontforge/ustring.h -include/fontforge/utype.h -include/fontforge/views.h -lib/libfontforge.a lib/libfontforge.so -lib/libfontforge.so.3 -lib/libfontforge.so.3.0.0 -lib/libfontforgeexe.a -lib/libfontforgeexe.so -lib/libfontforgeexe.so.3 -lib/libfontforgeexe.so.3.0.0 -%%X11%%lib/libgdraw.a -%%X11%%lib/libgdraw.so -%%X11%%lib/libgdraw.so.6 -%%X11%%lib/libgdraw.so.6.0.0 -lib/libgunicode.a -lib/libgunicode.so -lib/libgunicode.so.5 -lib/libgunicode.so.5.0.0 -lib/libgutils.a -lib/libgutils.so -lib/libgutils.so.3 -lib/libgutils.so.3.0.1 +lib/libfontforge.so.4 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fontforge.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/psMat.so -libdata/pkgconfig/libfontforge.pc -libdata/pkgconfig/libfontforgeexe.pc man/man1/fontforge.1.gz man/man1/fontimage.1.gz man/man1/fontlint.1.gz man/man1/sfddiff.1.gz -%%X11%%share/appdata/org.fontforge.FontForge.appdata.xml %%X11%%share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/hotkeys/default %%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Bold.ttf @@ -391,6 +301,8 @@ man/man1/sfddiff.1.gz %%DATADIR%%/pixmaps/selectyellow.png %%DATADIR%%/pixmaps/shadow.png %%DATADIR%%/pixmaps/skew.png +%%TANGO%%%%DATADIR%%/pixmaps/splash2019.png +%%TANGO%%%%DATADIR%%/pixmaps/splash2020.png %%DATADIR%%/pixmaps/styleschangeweight.png %%DATADIR%%/pixmaps/styleschangexheight.png %%DATADIR%%/pixmaps/stylesextendcondense.png @@ -456,9 +368,6 @@ man/man1/sfddiff.1.gz %%DATADIR%%/pixmaps/wireframe.png %%DATADIR%%/prefs %%PYTHON%%%%DATADIR%%/python/excepthook.py -%%PYTHON%%%%DATADIR%%/python/simple/expand-a.py -%%PYTHON%%%%DATADIR%%/python/simple/load-font-and-show-name.py -%%PYTHON%%%%DATADIR%%/python/test.sfd %%X11%%share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png %%X11%%share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png %%X11%%share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png @@ -483,13 +392,12 @@ share/locale/ml/LC_MESSAGES/FontForge.mo share/locale/pl/LC_MESSAGES/FontForge.mo share/locale/pt/LC_MESSAGES/FontForge.mo share/locale/ru/LC_MESSAGES/FontForge.mo +share/locale/tr_TR/LC_MESSAGES/FontForge.mo share/locale/uk/LC_MESSAGES/FontForge.mo share/locale/vi/LC_MESSAGES/FontForge.mo share/locale/zh_CN/LC_MESSAGES/FontForge.mo share/locale/zh_TW/LC_MESSAGES/FontForge.mo %%X11%%share/metainfo/org.fontforge.FontForge.appdata.xml -%%X11%%share/metainfo/org.fontforge.FontForge.metainfo.xml %%X11%%share/mime/packages/fontforge.xml %%X11%%share/pixmaps/org.fontforge.FontForge.png %%X11%%share/pixmaps/org.fontforge.FontForge.xpm -%%NO_PYTHON%%@dir %%DATADIR%%/python
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101050031.1050V4cr073090>