summaryrefslogtreecommitdiff
path: root/print/fontforge
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2015-08-27 16:51:59 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2015-08-27 16:51:59 +0000
commit1b6bbf9e648ef24a523d10cfa8af35340bbaaeda (patch)
tree97508895d6890400ddb7e54330bfb5345fcf2019 /print/fontforge
parent- Use proper installation commands (diff)
- Update to 20150824
PR: 202639 Submitted by: cyberbotx@cyberbotx.com (maintainer)
Notes
Notes: svn path=/head/; revision=395433
Diffstat (limited to 'print/fontforge')
-rw-r--r--print/fontforge/Makefile7
-rw-r--r--print/fontforge/distinfo4
-rw-r--r--print/fontforge/files/patch-fontforge_splinefont.h6
-rw-r--r--print/fontforge/pkg-plist1
4 files changed, 9 insertions, 9 deletions
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 9ddf0a59c771..4ffae065b31d 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= fontforge
-DISTVERSION= 20150612
-PORTREVISION= 2
+PORTVERSION= 20150824
CATEGORIES= print
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -29,7 +28,7 @@ USES= autoreconf:build desktop-file-utils execinfo gettext gmake iconv \
jpeg libtool pkgconfig python shared-mime-info shebangfix
SHEBANG_FILES= pycontrib/gdraw/__init__.py \
pycontrib/gdraw/gdraw.py
-USE_XORG= x11 xi ice xkbui
+USE_XORG= ice x11 xi xkbui
USE_GNOME= glib20 gtk20 libxml2 pango
CONFIGURE_ARGS= --enable-tile-path --enable-gtk2-use
@@ -56,7 +55,7 @@ CAIRO_CONFIGURE_WITH= cairo
.if ${PORT_OPTIONS:MFREETYPE}
MASTER_SITES+= http://savannah.nongnu.org/download/freetype/:freetype \
- SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/: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 \
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index fc46dcffd090..29b1e785da7f 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fontforge-fontforge-20150612_GH0.tar.gz) = af4997a07c96f7057f08cb5c7d71b19a0e8ac6336e0c48476471b471c0574247
-SIZE (fontforge-fontforge-20150612_GH0.tar.gz) = 24784438
+SHA256 (fontforge-fontforge-20150824_GH0.tar.gz) = 28ab2471cb010c1fa75b8ab8191a1dded81fe1e9490aa5ff6ab4706a4c78ff27
+SIZE (fontforge-fontforge-20150824_GH0.tar.gz) = 25030387
SHA256 (freetype-2.6.tar.bz2) = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e
SIZE (freetype-2.6.tar.bz2) = 1726219
diff --git a/print/fontforge/files/patch-fontforge_splinefont.h b/print/fontforge/files/patch-fontforge_splinefont.h
index a1db8734a271..7fc41a7ececf 100644
--- a/print/fontforge/files/patch-fontforge_splinefont.h
+++ b/print/fontforge/files/patch-fontforge_splinefont.h
@@ -1,15 +1,15 @@
---- fontforge/splinefont.h.orig 2015-06-12 20:48:13 UTC
+--- fontforge/splinefont.h.orig 2015-08-20 03:39:10 UTC
+++ fontforge/splinefont.h
@@ -3548,7 +3548,11 @@ char * delimit_null(const char * input,
#include "ustring.h"
--#ifdef __MINGW32__
+-#ifdef _WIN32
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#endif
+
-+#if defined(__MINGW32__) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
++#if defined(_WIN32) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
#define BAD_LOCALE_HACK
typedef char* locale_t;
#define LC_GLOBAL_LOCALE ((locale_t)-1)
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index 787a4488fd4f..be9f4f974b02 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -476,6 +476,7 @@ share/locale/es/LC_MESSAGES/FontForge.mo
share/locale/fr/LC_MESSAGES/FontForge.mo
share/locale/it/LC_MESSAGES/FontForge.mo
share/locale/ja/LC_MESSAGES/FontForge.mo
+share/locale/ko/LC_MESSAGES/FontForge.mo
share/locale/ml/LC_MESSAGES/FontForge.mo
share/locale/pl/LC_MESSAGES/FontForge.mo
share/locale/pt/LC_MESSAGES/FontForge.mo