View | Details | Raw Unified | Return to bug 237855
Collapse All | Expand All

(-)Makefile (-24 / +11 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	fontforge
4
PORTNAME=	fontforge
5
PORTVERSION=	20170731
5
PORTVERSION=	20190413
6
PORTREVISION=	1
7
CATEGORIES=	print
6
CATEGORIES=	print
8
DISTFILES=	# Empty but needed because of the freetype distfile
9
7
10
MAINTAINER=	cyberbotx@cyberbotx.com
8
MAINTAINER=	cyberbotx@cyberbotx.com
11
COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
9
COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
Lines 24-38 Link Here
24
		libltdl.so:devel/libltdl \
22
		libltdl.so:devel/libltdl \
25
		libfontconfig.so:x11-fonts/fontconfig
23
		libfontconfig.so:x11-fonts/fontconfig
26
24
25
USES=		autoreconf:build compiler desktop-file-utils gettext \
26
		gmake gnome iconv jpeg libtool pkgconfig python \
27
		readline:port shared-mime-info shebangfix
27
USE_GITHUB=	yes
28
USE_GITHUB=	yes
29
USE_XORG=	ice sm x11 xi xkbui xft
30
USE_GNOME=	cairo glib20 gtk20 libxml2 pango
28
31
29
USES=		autoreconf:build compiler desktop-file-utils gettext \
30
		gmake iconv jpeg libtool pkgconfig python readline:port \
31
		shared-mime-info shebangfix
32
SHEBANG_FILES=	pycontrib/gdraw/__init__.py \
32
SHEBANG_FILES=	pycontrib/gdraw/__init__.py \
33
		pycontrib/gdraw/gdraw.py
33
		pycontrib/gdraw/gdraw.py
34
USE_XORG=	ice sm x11 xi xkbui xft
35
USE_GNOME=	cairo glib20 gtk20 libxml2 pango
36
34
37
CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
35
CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
38
CPPFLAGS+=	-I${LOCALBASE}/include
36
CPPFLAGS+=	-I${LOCALBASE}/include
Lines 49-74 Link Here
49
OPTIONS_SUB=	yes
47
OPTIONS_SUB=	yes
50
FREETYPE_DESC=	Include freetype's internal debugger
48
FREETYPE_DESC=	Include freetype's internal debugger
51
49
52
PYTHON_CONFIGURE_ENABLE=	python-scripting python-extension
50
FREETYPE_PATCH_DEPENDS=	${NONEXISTENT}:print/freetype2:extract
51
FREETYPE_CONFIGURE_ENABLE=	freetype-debugger=${WRKSRC}/freetype
53
52
54
CAIRO_CONFIGURE_WITH=	cairo
53
CAIRO_CONFIGURE_WITH=	cairo
55
54
56
.include <bsd.port.options.mk>
55
PYTHON_CONFIGURE_ENABLE=	python-scripting python-extension
57
56
58
.if ${PORT_OPTIONS:MFREETYPE}
57
post-patch-FREETYPE-on:
59
MASTER_SITES+=	http://savannah.nongnu.org/download/freetype/:freetype \
58
	@${LN} -s $$(${MAKE} -C ${PORTSDIR}/print/freetype2 -V WRKSRC) ${WRKSRC}/freetype
60
		SF/freetype/freetype2/${FREETYPE_VERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/:freetype \
61
		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/:freetype \
62
		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \
63
		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \
64
		ftp://ftp.freetype.org/freetype/freetype2/:freetype
65
FREETYPE_VERSION=	2.8
66
FREETYPE_SRC=	freetype-${FREETYPE_VERSION}.tar.bz2
67
DISTFILES+=	${FREETYPE_SRC:C/$/:freetype/}
68
CONFIGURE_ARGS+=	--enable-freetype-debugger=${WRKDIR}/freetype-${FREETYPE_VERSION}
69
.else
70
CONFIGURE_ARGS+=	--disable-freetype-debugger
71
.endif
72
59
73
# This is to get around calling fontforge's bootstrap script, as that script fails
60
# This is to get around calling fontforge's bootstrap script, as that script fails
74
# if git isn't installed on a system DESPITE there being a --skip-git argument that
61
# if git isn't installed on a system DESPITE there being a --skip-git argument that
(-)distinfo (-5 / +3 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1501649554
1
TIMESTAMP = 1558768709
2
SHA256 (freetype-2.8.tar.bz2) = a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b
2
SHA256 (fontforge-fontforge-20190413_GH0.tar.gz) = d3b60f22d7a52fc2b11e1bd515ab7ba3176f8a3228330d2aea4d076896fe025d
3
SIZE (freetype-2.8.tar.bz2) = 1873526
3
SIZE (fontforge-fontforge-20190413_GH0.tar.gz) = 24380527
4
SHA256 (fontforge-fontforge-20170731_GH0.tar.gz) = 3f53d06caba2a96dc498df81717e35504815046b3178e811c85c4cc135492d8c
5
SIZE (fontforge-fontforge-20170731_GH0.tar.gz) = 25125022
(-)files/patch-Makefile.am (-5 / +5 lines)
Lines 1-6 Link Here
1
--- Makefile.am.orig	2014-11-27 00:40:08 UTC
1
--- Makefile.am.orig	2019-04-13 07:38:39 UTC
2
+++ Makefile.am
2
+++ Makefile.am
3
@@ -43,7 +43,7 @@ GITIGNOREFILES = \
3
@@ -46,7 +46,7 @@ GITIGNOREFILES = \
4
 AM_CPPFLAGS =
4
 AM_CPPFLAGS =
5
 AM_LDFLAGS =
5
 AM_LDFLAGS =
6
 
6
 
Lines 9-23 Link Here
9
 EXTRA_DIST =
9
 EXTRA_DIST =
10
 CLEANFILES =
10
 CLEANFILES =
11
 MOSTLYCLEANFILES =
11
 MOSTLYCLEANFILES =
12
@@ -113,7 +113,6 @@ EXTRA_DIST += \
12
@@ -116,7 +116,6 @@ EXTRA_DIST += \
13
 	Packaging/FontForge-doc.spec \
14
 	Packaging/FontForge.spec \
13
 	Packaging/FontForge.spec \
15
 	Packaging/FontForge.static.spec \
14
 	Packaging/FontForge.static.spec \
15
 	README \
16
-	uthash/src \
16
-	uthash/src \
17
 	$(NULL)
17
 	$(NULL)
18
 
18
 
19
 #--------------------------------------------------------------------------
19
 #--------------------------------------------------------------------------
20
@@ -129,11 +128,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-the
20
@@ -132,11 +131,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-theme-2012 --enab
21
 
21
 
22
 
22
 
23
 #--------------------------------------------------------------------------
23
 #--------------------------------------------------------------------------
(-)files/patch-fontforge_cvexport.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- fontforge/cvexport.c.orig	2014-11-27 00:40:08 UTC
1
--- fontforge/cvexport.c.orig	2019-04-13 07:38:39 UTC
2
+++ fontforge/cvexport.c
2
+++ fontforge/cvexport.c
3
@@ -213,20 +213,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc,
3
@@ -232,20 +232,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc,int layer) {
4
     fprintf( pdf, "    /CreationDate (D:%04d%02d%02d%02d%02d%02d",
4
     fprintf( pdf, "    /CreationDate (D:%04d%02d%02d%02d%02d%02d",
5
 	    1900+tm->tm_year, tm->tm_mon+1, tm->tm_mday,
5
 	    1900+tm->tm_year, tm->tm_mon+1, tm->tm_mday,
6
 	    tm->tm_hour, tm->tm_min, tm->tm_sec );
6
 	    tm->tm_hour, tm->tm_min, tm->tm_sec );
Lines 8-14 Link Here
8
     fprintf( pdf, "Z)\n" );
8
     fprintf( pdf, "Z)\n" );
9
-#else
9
-#else
10
-    tzset();
10
-    tzset();
11
-    if ( timezone==0 )
11
-    if ( timezone==0  || getenv("SOURCE_DATE_EPOCH") )
12
-	fprintf( pdf, "Z)\n" );
12
-	fprintf( pdf, "Z)\n" );
13
-    else {
13
-    else {
14
-	if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */
14
-	if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */
(-)files/patch-fontforge_print.c (-4 / +4 lines)
Lines 1-13 Link Here
1
--- fontforge/print.c.orig	2014-11-27 00:40:08 UTC
1
--- fontforge/print.c.orig	2019-04-13 07:38:39 UTC
2
+++ fontforge/print.c
2
+++ fontforge/print.c
3
@@ -1148,19 +1148,7 @@ static void dump_pdfprologue(PI *pi) {
3
@@ -1164,19 +1164,7 @@ static void dump_pdfprologue(PI *pi) {
4
     tm = localtime(&now);
4
     }
5
     fprintf( pi->out, "    /CreationDate (D:%04d%02d%02d%02d%02d%02d",
5
     fprintf( pi->out, "    /CreationDate (D:%04d%02d%02d%02d%02d%02d",
6
 	    tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec );
6
 	    tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec );
7
-#ifdef _NO_TZSET
7
-#ifdef _NO_TZSET
8
     fprintf( pi->out, "Z)\n" );
8
     fprintf( pi->out, "Z)\n" );
9
-#else
9
-#else
10
-    if ( timezone==0 )
10
-    if ( timezone==0 || getenv("SOURCE_DATE_EPOCH") )
11
-	fprintf( pi->out, "Z)\n" );
11
-	fprintf( pi->out, "Z)\n" );
12
-    else {
12
-    else {
13
-	if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */
13
-	if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */
(-)files/patch-fontforge_splinefont.h (-15 lines)
Lines 1-15 Link Here
1
--- fontforge/splinefont.h.orig	2015-08-20 03:39:10 UTC
2
+++ fontforge/splinefont.h
3
@@ -3548,7 +3548,11 @@ char * delimit_null(const char * input, 
4
 
5
 #include "ustring.h"
6
 
7
-#ifdef _WIN32
8
+#ifdef __FreeBSD__
9
+#include <osreldate.h>
10
+#endif
11
+
12
+#if defined(_WIN32) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
13
 #define BAD_LOCALE_HACK
14
 typedef char* locale_t;
15
 #define LC_GLOBAL_LOCALE ((locale_t)-1)
(-)pkg-plist (-32 / +30 lines)
Lines 21-28 Link Here
21
include/fontforge/edgelist2.h
21
include/fontforge/edgelist2.h
22
include/fontforge/encoding.h
22
include/fontforge/encoding.h
23
include/fontforge/fffreetype.h
23
include/fontforge/fffreetype.h
24
include/fontforge/ffgdk.h
24
include/fontforge/ffglib.h
25
include/fontforge/ffglib.h
25
include/fontforge/ffpython.h
26
include/fontforge/ffpython.h
27
include/fontforge/flaglist.h
26
include/fontforge/fileutil.h
28
include/fontforge/fileutil.h
27
include/fontforge/fontforge-config.h
29
include/fontforge/fontforge-config.h
28
include/fontforge/fontforge.h
30
include/fontforge/fontforge.h
Lines 36-41 Link Here
36
include/fontforge/gio.h
38
include/fontforge/gio.h
37
include/fontforge/gkeysym.h
39
include/fontforge/gkeysym.h
38
include/fontforge/glif_name_hash.h
40
include/fontforge/glif_name_hash.h
41
include/fontforge/glyphcomp.h
39
include/fontforge/gnetwork.h
42
include/fontforge/gnetwork.h
40
include/fontforge/gprogress.h
43
include/fontforge/gprogress.h
41
include/fontforge/gresedit.h
44
include/fontforge/gresedit.h
Lines 52-58 Link Here
52
include/fontforge/namehash.h
55
include/fontforge/namehash.h
53
include/fontforge/nonlineartrans.h
56
include/fontforge/nonlineartrans.h
54
include/fontforge/ofl.h
57
include/fontforge/ofl.h
55
include/fontforge/plugins.h
56
include/fontforge/print.h
58
include/fontforge/print.h
57
include/fontforge/psfont.h
59
include/fontforge/psfont.h
58
include/fontforge/savefont.h
60
include/fontforge/savefont.h
Lines 71-100 Link Here
71
include/fontforge/usermenu.h
73
include/fontforge/usermenu.h
72
include/fontforge/ustring.h
74
include/fontforge/ustring.h
73
include/fontforge/utype.h
75
include/fontforge/utype.h
76
include/fontforge/views.h
74
lib/libfontforge.a
77
lib/libfontforge.a
75
lib/libfontforge.so
78
lib/libfontforge.so
76
lib/libfontforge.so.2
79
lib/libfontforge.so.3
77
lib/libfontforge.so.2.0.0
80
lib/libfontforge.so.3.0.0
78
lib/libfontforgeexe.a
81
lib/libfontforgeexe.a
79
lib/libfontforgeexe.so
82
lib/libfontforgeexe.so
80
lib/libfontforgeexe.so.2
83
lib/libfontforgeexe.so.3
81
lib/libfontforgeexe.so.2.0.0
84
lib/libfontforgeexe.so.3.0.0
82
lib/libgdraw.a
85
lib/libgdraw.a
83
lib/libgdraw.so
86
lib/libgdraw.so
84
lib/libgdraw.so.5
87
lib/libgdraw.so.6
85
lib/libgdraw.so.5.0.0
88
lib/libgdraw.so.6.0.0
86
lib/libgioftp.a
87
lib/libgioftp.so
88
lib/libgioftp.so.2
89
lib/libgioftp.so.2.0.0
90
lib/libgunicode.a
89
lib/libgunicode.a
91
lib/libgunicode.so
90
lib/libgunicode.so
92
lib/libgunicode.so.4
91
lib/libgunicode.so.5
93
lib/libgunicode.so.4.0.0
92
lib/libgunicode.so.5.0.0
94
lib/libgutils.a
93
lib/libgutils.a
95
lib/libgutils.so
94
lib/libgutils.so
96
lib/libgutils.so.2
95
lib/libgutils.so.3
97
lib/libgutils.so.2.0.0
96
lib/libgutils.so.3.0.1
98
%%PYTHON%%%%PYTHON_SITELIBDIR%%/fontforge.so
97
%%PYTHON%%%%PYTHON_SITELIBDIR%%/fontforge.so
99
%%PYTHON%%%%PYTHON_SITELIBDIR%%/psMat.so
98
%%PYTHON%%%%PYTHON_SITELIBDIR%%/psMat.so
100
libdata/pkgconfig/libfontforge.pc
99
libdata/pkgconfig/libfontforge.pc
Lines 103-116 Link Here
103
man/man1/fontimage.1.gz
102
man/man1/fontimage.1.gz
104
man/man1/fontlint.1.gz
103
man/man1/fontlint.1.gz
105
man/man1/sfddiff.1.gz
104
man/man1/sfddiff.1.gz
106
share/applications/fontforge.desktop
105
share/appdata/org.fontforge.FontForge.appdata.xml
107
%%DATADIR%%/Adobe-CNS1-6.cidmap
106
share/applications/org.fontforge.FontForge.desktop
108
%%DATADIR%%/Adobe-GB1-5.cidmap
109
%%DATADIR%%/Adobe-Identity-0.cidmap
110
%%DATADIR%%/Adobe-Japan1-5.cidmap
111
%%DATADIR%%/Adobe-Japan1-6.cidmap
112
%%DATADIR%%/Adobe-Japan2-0.cidmap
113
%%DATADIR%%/Adobe-Korea1-2.cidmap
114
%%DATADIR%%/hotkeys/default
107
%%DATADIR%%/hotkeys/default
115
%%DATADIR%%/nodejs/collabwebview/client.html
108
%%DATADIR%%/nodejs/collabwebview/client.html
116
%%DATADIR%%/nodejs/collabwebview/css/print.css
109
%%DATADIR%%/nodejs/collabwebview/css/print.css
Lines 494-508 Link Here
494
%%PYTHON%%%%DATADIR%%/python/simple/expand-a.py
487
%%PYTHON%%%%DATADIR%%/python/simple/expand-a.py
495
%%PYTHON%%%%DATADIR%%/python/simple/load-font-and-show-name.py
488
%%PYTHON%%%%DATADIR%%/python/simple/load-font-and-show-name.py
496
%%PYTHON%%%%DATADIR%%/python/test.sfd
489
%%PYTHON%%%%DATADIR%%/python/test.sfd
497
share/icons/hicolor/128x128/apps/fontforge.png
490
share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png
498
share/icons/hicolor/16x16/apps/fontforge.png
491
share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png
499
share/icons/hicolor/22x22/apps/fontforge.png
492
share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png
500
share/icons/hicolor/24x24/apps/fontforge.png
493
share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png
501
share/icons/hicolor/256x256/apps/fontforge.png
494
share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png
502
share/icons/hicolor/32x32/apps/fontforge.png
495
share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png
503
share/icons/hicolor/48x48/apps/fontforge.png
496
share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png
504
share/icons/hicolor/64x64/apps/fontforge.png
497
share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png
505
share/icons/hicolor/scalable/apps/fontforge.svg
498
share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png
499
share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg
506
share/locale/ca/LC_MESSAGES/FontForge.mo
500
share/locale/ca/LC_MESSAGES/FontForge.mo
507
share/locale/de/LC_MESSAGES/FontForge.mo
501
share/locale/de/LC_MESSAGES/FontForge.mo
508
share/locale/el/LC_MESSAGES/FontForge.mo
502
share/locale/el/LC_MESSAGES/FontForge.mo
Lines 520-523 Link Here
520
share/locale/vi/LC_MESSAGES/FontForge.mo
514
share/locale/vi/LC_MESSAGES/FontForge.mo
521
share/locale/zh_CN/LC_MESSAGES/FontForge.mo
515
share/locale/zh_CN/LC_MESSAGES/FontForge.mo
522
share/locale/zh_TW/LC_MESSAGES/FontForge.mo
516
share/locale/zh_TW/LC_MESSAGES/FontForge.mo
517
share/metainfo/org.fontforge.FontForge.appdata.xml
518
share/metainfo/org.fontforge.FontForge.metainfo.xml
523
share/mime/packages/fontforge.xml
519
share/mime/packages/fontforge.xml
520
share/pixmaps/org.fontforge.FontForge.png
521
share/pixmaps/org.fontforge.FontForge.xpm

Return to bug 237855