diff options
| -rw-r--r-- | fonts/fontforge/Makefile | 11 | ||||
| -rw-r--r-- | fonts/fontforge/PLIST | 30 | ||||
| -rw-r--r-- | fonts/fontforge/distinfo | 11 | ||||
| -rw-r--r-- | fonts/fontforge/hacks.mk | 6 | ||||
| -rw-r--r-- | fonts/fontforge/patches/patch-fontforgeexe_Makefile.in | 15 |
5 files changed, 57 insertions, 16 deletions
diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile index 0b3e8e145b4..65754f0890e 100644 --- a/fonts/fontforge/Makefile +++ b/fonts/fontforge/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.99 2017/02/12 06:25:19 ryoon Exp $ +# $NetBSD: Makefile,v 1.100 2017/05/04 19:23:18 adam Exp $ -DISTNAME= fontforge-dist-20160404 +DISTNAME= fontforge-dist-20161004 PKGNAME= ${DISTNAME:S/-dist-/-/} -PKGREVISION= 2 CATEGORIES= fonts editors MASTER_SITES= ${MASTER_SITE_GITHUB:=fontforge/} GITHUB_PROJECT= fontforge -GITHUB_RELEASE= ${PKGVERSION_NOREV} +GITHUB_RELEASE= 20161005 MAINTAINER= adam@NetBSD.org HOMEPAGE= http://fontforge.github.io/ @@ -14,7 +13,7 @@ COMMENT= Postscript font editor LICENSE= modified-bsd EXTRACT_USING= bsdtar -WRKSRC= ${WRKDIR}/fontforge-2.0.20140101 +WRKSRC= ${WRKDIR}/fontforge-2.0.${PKGVERSION_NOREV} USE_LANGUAGES= c USE_LIBTOOL= yes @@ -44,7 +43,9 @@ PY_PATCHPLIST= yes .include "../../graphics/giflib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/libspiro/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../graphics/potrace/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST index 5f7ab568cc8..c174dd40554 100644 --- a/fonts/fontforge/PLIST +++ b/fonts/fontforge/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.33 2016/02/07 15:53:31 adam Exp $ +@comment $NetBSD: PLIST,v 1.34 2017/05/04 19:23:18 adam Exp $ bin/fontforge bin/fontimage bin/fontlint @@ -1015,27 +1015,47 @@ share/fontforge/pixmaps/overlapexclude.png share/fontforge/pixmaps/overlapfindinter.png share/fontforge/pixmaps/overlapintersection.png share/fontforge/pixmaps/overlaprm.png +share/fontforge/pixmaps/palette3drotate-selected.png share/fontforge/pixmaps/palette3drotate.png +share/fontforge/pixmaps/palettecorner-selected.png share/fontforge/pixmaps/palettecorner.png +share/fontforge/pixmaps/palettecurve-selected.png share/fontforge/pixmaps/palettecurve.png +share/fontforge/pixmaps/paletteelipse-selected.png share/fontforge/pixmaps/paletteelipse.png +share/fontforge/pixmaps/paletteflip-selected.png share/fontforge/pixmaps/paletteflip.png +share/fontforge/pixmaps/palettefreehand-selected.png share/fontforge/pixmaps/palettefreehand.png +share/fontforge/pixmaps/palettehand-selected.png share/fontforge/pixmaps/palettehand.png +share/fontforge/pixmaps/palettehvcurve-selected.png share/fontforge/pixmaps/palettehvcurve.png +share/fontforge/pixmaps/paletteknife-selected.png share/fontforge/pixmaps/paletteknife.png share/fontforge/pixmaps/paletteline.png +share/fontforge/pixmaps/palettemagnify-selected.png share/fontforge/pixmaps/palettemagnify.png +share/fontforge/pixmaps/palettepen-selected.png share/fontforge/pixmaps/palettepen.png share/fontforge/pixmaps/palettepencil.png +share/fontforge/pixmaps/paletteperspective-selected.png share/fontforge/pixmaps/paletteperspective.png +share/fontforge/pixmaps/palettepointer-selected.png share/fontforge/pixmaps/palettepointer.png +share/fontforge/pixmaps/palettepoly-selected.png share/fontforge/pixmaps/palettepoly.png +share/fontforge/pixmaps/paletterect-selected.png share/fontforge/pixmaps/paletterect.png +share/fontforge/pixmaps/paletterotate-selected.png share/fontforge/pixmaps/paletterotate.png +share/fontforge/pixmaps/paletteruler-selected.png share/fontforge/pixmaps/paletteruler.png +share/fontforge/pixmaps/palettescale-selected.png share/fontforge/pixmaps/palettescale.png +share/fontforge/pixmaps/paletteselectedbg.png share/fontforge/pixmaps/paletteshift.png +share/fontforge/pixmaps/paletteskew-selected.png share/fontforge/pixmaps/paletteskew.png share/fontforge/pixmaps/palettesmall3drotate.png share/fontforge/pixmaps/palettesmallcorner.png @@ -1063,15 +1083,23 @@ share/fontforge/pixmaps/palettesmallspiroleft.png share/fontforge/pixmaps/palettesmallspiroright.png share/fontforge/pixmaps/palettesmallstar.png share/fontforge/pixmaps/palettesmalltangent.png +share/fontforge/pixmaps/palettespirocorner-selected.png share/fontforge/pixmaps/palettespirocorner.png +share/fontforge/pixmaps/palettespirocurve-selected.png share/fontforge/pixmaps/palettespirocurve.png share/fontforge/pixmaps/palettespirodisabled.png share/fontforge/pixmaps/palettespirodown.png +share/fontforge/pixmaps/palettespirog2curve-selected.png share/fontforge/pixmaps/palettespirog2curve.png +share/fontforge/pixmaps/palettespiroleft-selected.png share/fontforge/pixmaps/palettespiroleft.png +share/fontforge/pixmaps/palettespiroright-selected.png share/fontforge/pixmaps/palettespiroright.png +share/fontforge/pixmaps/palettespiroup-selected.png share/fontforge/pixmaps/palettespiroup.png +share/fontforge/pixmaps/palettestar-selected.png share/fontforge/pixmaps/palettestar.png +share/fontforge/pixmaps/palettetangent-selected.png share/fontforge/pixmaps/palettetangent.png share/fontforge/pixmaps/pointsG2curve.png share/fontforge/pixmaps/pointsaddanchor.png diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo index f4663be9ab0..700e383dbd8 100644 --- a/fonts/fontforge/distinfo +++ b/fonts/fontforge/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.64 2016/09/27 10:24:56 taca Exp $ +$NetBSD: distinfo,v 1.65 2017/05/04 19:23:18 adam Exp $ -SHA1 (fontforge-dist-20160404.tar.gz) = e7c235f3d0ef59196df30707e18ad1198ff7baae -RMD160 (fontforge-dist-20160404.tar.gz) = e72662db3a00a9da6a2639d36f8f0b9890cda936 -SHA512 (fontforge-dist-20160404.tar.gz) = be94f04881b12ed3b1a34d0d7cc9149321db17d51458f135b2683ea600401e4fa55647ced4b4e014555ba1c900a684b9d5d6f2e2812ce03c432d23ca72f5c363 -Size (fontforge-dist-20160404.tar.gz) = 20906256 bytes +SHA1 (fontforge-dist-20161004.tar.gz) = bafb76ccbfcb37f94cf71f32c79cc120d8102683 +RMD160 (fontforge-dist-20161004.tar.gz) = fc3e3823bb06835b280109bd7928a3e092aec70d +SHA512 (fontforge-dist-20161004.tar.gz) = 274ab26859b3691bd9c9c3b639157753bd5cd5d909e90309b6f4c8b68aedfd49b3e7c88fe45bc0f8090d3a3e946a409d131d3d191299f14a153f3c95b36c35c2 +Size (fontforge-dist-20161004.tar.gz) = 20987883 bytes SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9 SHA1 (patch-configure) = d85d82bed7ee84c5b8282afd1310872eca39a3dd SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1 +SHA1 (patch-fontforgeexe_Makefile.in) = d44e00cd4aaa816ab0916a0bcd33f7b7a2bf8785 SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b diff --git a/fonts/fontforge/hacks.mk b/fonts/fontforge/hacks.mk index caab93039f5..527a7f562ed 100644 --- a/fonts/fontforge/hacks.mk +++ b/fonts/fontforge/hacks.mk @@ -1,5 +1,4 @@ -# $NetBSD: hacks.mk,v 1.1 2016/03/07 04:43:55 dholland Exp $ -# +# $NetBSD: hacks.mk,v 1.2 2017/05/04 19:23:18 adam Exp $ # On NetBSD 7.x for a while a version of freetype2 that was supposed # to have ftttdrv.h was shipped without actually installing that @@ -16,7 +15,4 @@ buildlink-freetype2-ftttdrv.h: ${ECHO_BUILDLINK_MSG} "Hacking around missing ftttdrv.h"; \ ${ECHO} '#define TT_INTERPRETER_VERSION_35 35' >> "$$dest"; \ ${ECHO} '#define TT_INTERPRETER_VERSION_38 38' >> "$$dest" - .endif - - diff --git a/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in new file mode 100644 index 00000000000..cb3cc6a5f5b --- /dev/null +++ b/fonts/fontforge/patches/patch-fontforgeexe_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-fontforgeexe_Makefile.in,v 1.1 2017/05/04 19:23:18 adam Exp $ + +Fix linking Objective-C code. + +--- fontforgeexe/Makefile.in.orig 2017-05-04 17:59:40.000000000 +0000 ++++ fontforgeexe/Makefile.in +@@ -380,7 +380,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent + am__v_lt_1 = + libfontforgeexe_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ +- $(LIBTOOLFLAGS) --mode=link $(OBJCLD) \ ++ $(LIBTOOLFLAGS) --tag=CC --mode=link $(OBJCLD) \ + $(libfontforgeexe_la_OBJCFLAGS) $(OBJCFLAGS) \ + $(libfontforgeexe_la_LDFLAGS) $(LDFLAGS) -o $@ + PROGRAMS = $(bin_PROGRAMS) |