Attachment #160326 for bug #202639

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




# $FreeBSD$

PORTNAME=	fontforge
DISTVERSION=	20150824
PORTREVISION=	2
CATEGORIES=	print
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}


		jpeg libtool pkgconfig python 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

CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use


.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 \

Lines 1-4 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (fontforge-fontforge-20150612_GH0.tar.gz) = af4997a07c96f7057f08cb5c7d71b19a0e8ac6336e0c48476471b471c0574247	1	SHA256 (fontforge-fontforge-20150824_GH0.tar.gz) = 28ab2471cb010c1fa75b8ab8191a1dded81fe1e9490aa5ff6ab4706a4c78ff27
2	SIZE (fontforge-fontforge-20150612_GH0.tar.gz) = 24784438	2	SIZE (fontforge-fontforge-20150824_GH0.tar.gz) = 25030387
3	SHA256 (freetype-2.6.tar.bz2) = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e	3	SHA256 (freetype-2.6.tar.bz2) = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e
4	SIZE (freetype-2.6.tar.bz2) = 1726219	4	SIZE (freetype-2.6.tar.bz2) = 1726219




--- 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 _WIN32
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#endif
+
+#if defined(_WIN32) || (defined(__FreeBSD__) && __FreeBSD_version < 900506)
 #define BAD_LOCALE_HACK
 typedef char* locale_t;
 #define LC_GLOBAL_LOCALE ((locale_t)-1)

Lines 476-481 Link Here

(-)pkg-plist (+1 lines)
476	share/locale/fr/LC_MESSAGES/FontForge.mo	476	share/locale/fr/LC_MESSAGES/FontForge.mo
477	share/locale/it/LC_MESSAGES/FontForge.mo	477	share/locale/it/LC_MESSAGES/FontForge.mo
478	share/locale/ja/LC_MESSAGES/FontForge.mo	478	share/locale/ja/LC_MESSAGES/FontForge.mo
		479	share/locale/ko/LC_MESSAGES/FontForge.mo
479	share/locale/ml/LC_MESSAGES/FontForge.mo	480	share/locale/ml/LC_MESSAGES/FontForge.mo
480	share/locale/pl/LC_MESSAGES/FontForge.mo	481	share/locale/pl/LC_MESSAGES/FontForge.mo
481	share/locale/pt/LC_MESSAGES/FontForge.mo	482	share/locale/pt/LC_MESSAGES/FontForge.mo

Return to bug 202639

Lines 2-9 Link Here

(-)Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= fontforge	4	PORTNAME= fontforge
5	DISTVERSION= 20150612	5	DISTVERSION= 20150824
6	PORTREVISION= 2
7	CATEGORIES= print	6	CATEGORIES= print
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	7	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9		8
Lines 29-35 Link Here
29	jpeg libtool pkgconfig python shared-mime-info shebangfix	28	jpeg libtool pkgconfig python shared-mime-info shebangfix
30	SHEBANG_FILES= pycontrib/gdraw/__init__.py \	29	SHEBANG_FILES= pycontrib/gdraw/__init__.py \
31	pycontrib/gdraw/gdraw.py	30	pycontrib/gdraw/gdraw.py
32	USE_XORG= x11 xi ice xkbui	31	USE_XORG= ice x11 xi xkbui
33	USE_GNOME= glib20 gtk20 libxml2 pango	32	USE_GNOME= glib20 gtk20 libxml2 pango
34		33
35	CONFIGURE_ARGS= --enable-tile-path --enable-gtk2-use	34	CONFIGURE_ARGS= --enable-tile-path --enable-gtk2-use
Lines 56-62 Link Here
56		55
57	.if ${PORT_OPTIONS:MFREETYPE}	56	.if ${PORT_OPTIONS:MFREETYPE}
58	MASTER_SITES+= http://savannah.nongnu.org/download/freetype/:freetype \	57	MASTER_SITES+= http://savannah.nongnu.org/download/freetype/:freetype \
59	SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/:freetype \	58	SF/freetype/freetype2/${FREETYPE_VERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/:freetype \
60	http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/:freetype \	59	http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/:freetype \
61	http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \	60	http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \
62	http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \	61	http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \

Lines 1-15 Link Here

(-)files/patch-fontforge_splinefont.h (-3 / +3 lines)
1	--- fontforge/splinefont.h.orig 2015-06-12 20:48:13 UTC	1	--- fontforge/splinefont.h.orig 2015-08-20 03:39:10 UTC
2	+++ fontforge/splinefont.h	2	+++ fontforge/splinefont.h
3	@@ -3548,7 +3548,11 @@ char * delimit_null(const char * input,	3	@@ -3548,7 +3548,11 @@ char * delimit_null(const char * input,
4		4
5	#include "ustring.h"	5	#include "ustring.h"
6		6
7	-#ifdef __MINGW32__	7	-#ifdef _WIN32
8	+#ifdef __FreeBSD__	8	+#ifdef __FreeBSD__
9	+#include <osreldate.h>	9	+#include <osreldate.h>
10	+#endif	10	+#endif
11	+	11	+
12	+#if defined(__MINGW32__) \|\| (defined(__FreeBSD__) && __FreeBSD_version < 900506)	12	+#if defined(_WIN32) \|\| (defined(__FreeBSD__) && __FreeBSD_version < 900506)
13	#define BAD_LOCALE_HACK	13	#define BAD_LOCALE_HACK
14	typedef char* locale_t;	14	typedef char* locale_t;
15	#define LC_GLOBAL_LOCALE ((locale_t)-1)	15	#define LC_GLOBAL_LOCALE ((locale_t)-1)