Attachment #173124 for bug #211463

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




# $FreeBSD$

PORTNAME=	fontforge
PORTVERSION=	20160404
PORTREVISION=	2
CATEGORIES=	print
DISTFILES=	# Empty but needed because of the freetype distfile

MAINTAINER=	cyberbotx@cyberbotx.com
COMMENT=	Type 1/TrueType/OpenType/bitmap font editor

		libgif.so:graphics/giflib \
		libspiro.so:graphics/libspiro \
		libfreetype.so:print/freetype2 \
		libltdl.so:devel/libltdl \
		libfontconfig.so:x11-fonts/fontconfig

USE_GITHUB=	yes

USES=		autoreconf:build compiler desktop-file-utils execinfo gettext \
		gmake iconv jpeg libtool pkgconfig python readline:port \
		shared-mime-info shebangfix
SHEBANG_FILES=	pycontrib/gdraw/__init__.py \
		pycontrib/gdraw/gdraw.py
USE_XORG=	ice sm x11 xi xkbui xft
USE_GNOME=	cairo glib20 gtk20 libxml2 pango

CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
CPPFLAGS+=	-I${LOCALBASE}/include


PYTHON_CONFIGURE_ENABLE=	python-scripting python-extension

CAIRO_USE=	GNOME=cairo
CAIRO_CONFIGURE_WITH=	cairo

.include <bsd.port.options.mk>

		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \
		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \
		ftp://ftp.freetype.org/freetype/freetype2/:freetype
FREETYPE_VERSION=	2.6.3
FREETYPE_SRC=	freetype-${FREETYPE_VERSION}.tar.bz2
DISTFILES+=	${FREETYPE_SRC:C/$/:freetype/}
CONFIGURE_ARGS+=	--enable-freetype-debugger=${WRKDIR}/freetype-${FREETYPE_VERSION}

Lines 1-4 Link Here

(-)distinfo (-4 / +5 lines)
1	SHA256 (fontforge-fontforge-20150824_GH0.tar.gz) = 28ab2471cb010c1fa75b8ab8191a1dded81fe1e9490aa5ff6ab4706a4c78ff27	1	TIMESTAMP = 1467049926
2	SIZE (fontforge-fontforge-20150824_GH0.tar.gz) = 25030387	2	SHA256 (freetype-2.6.3.tar.bz2) = 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2
3	SHA256 (freetype-2.6.2.tar.bz2) = baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892	3	SIZE (freetype-2.6.3.tar.bz2) = 1753083
4	SIZE (freetype-2.6.2.tar.bz2) = 1767940	4	SHA256 (fontforge-fontforge-20160404_GH0.tar.gz) = 1cc5646fccba2e5af8f1b6c1d0d6d7b6082d9546aefed2348d6c0ed948324796
		5	SIZE (fontforge-fontforge-20160404_GH0.tar.gz) = 25056793




--- configure.ac.orig	2014-11-27 00:40:08 UTC
+++ configure.ac
@@ -327,9 +327,6 @@ dnl AC_SEARCH_LIBS([dlopen], [dl dld])
 
 FONTFORGE_CONFIG_X_LIBRARIES
 
-# zlib is a requirement. It is too commonly available to bother
-# leaving out.
-PKG_CHECK_MODULES([ZLIB],[zlib])
 PKG_CHECK_MODULES([GLIB],[glib-2.0 >= 2.6 gio-2.0])
 
 if test x"${i_do_have_gui}" = xyes; then
@@ -549,7 +546,6 @@ if test x"${i_do_have_freetype_debugger}
    my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/include"
    my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/include/freetype"
 fi
-my_cflags="${my_cflags} ${ZLIB_CFLAGS}"
 my_cflags="${my_cflags} ${GLIB_CFLAGS}"
 my_cflags="${my_cflags} ${CAIRO_CFLAGS}"
 my_cflags="${my_cflags} ${PANGO_CFLAGS}"
@@ -590,7 +586,6 @@ test x"${i_do_have_libspiro}" = xyes && 
 my_libs="${my_libs} ${LIBSPIRO_LIBS}"
 my_libs="${my_libs} ${FREETYPE_LIBS}"
 my_libs="${my_libs} ${PTHREAD_LIBS}"
-my_libs="${my_libs} ${ZLIB_LIBS}"
 my_libs="${my_libs} ${GLIB_LIBS}"
 my_libs="${my_libs} ${LIBXML_LIBS}"
 AC_SUBST([MY_LIBS],[${my_libs}])

Return to bug 211463

Lines 2-11 Link Here

(-)Makefile (-11 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= fontforge	4	PORTNAME= fontforge
5	PORTVERSION= 20150824	5	PORTVERSION= 20160404
6	PORTREVISION= 2
7	CATEGORIES= print	6	CATEGORIES= print
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	7	DISTFILES= # Empty but needed because of the freetype distfile
9		8
10	MAINTAINER= cyberbotx@cyberbotx.com	9	MAINTAINER= cyberbotx@cyberbotx.com
11	COMMENT= Type 1/TrueType/OpenType/bitmap font editor	10	COMMENT= Type 1/TrueType/OpenType/bitmap font editor
Lines 21-37 Link Here
21	libgif.so:graphics/giflib \	20	libgif.so:graphics/giflib \
22	libspiro.so:graphics/libspiro \	21	libspiro.so:graphics/libspiro \
23	libfreetype.so:print/freetype2 \	22	libfreetype.so:print/freetype2 \
24	libltdl.so:devel/libltdl	23	libltdl.so:devel/libltdl \
		24	libfontconfig.so:x11-fonts/fontconfig
25		25
26	USE_GITHUB= yes	26	USE_GITHUB= yes
27		27
28	USES= autoreconf:build desktop-file-utils execinfo gettext gmake iconv \	28	USES= autoreconf:build compiler desktop-file-utils execinfo gettext \
29	jpeg libtool pkgconfig python shared-mime-info shebangfix \	29	gmake iconv jpeg libtool pkgconfig python readline:port \
30	compiler	30	shared-mime-info shebangfix
31	SHEBANG_FILES= pycontrib/gdraw/__init__.py \	31	SHEBANG_FILES= pycontrib/gdraw/__init__.py \
32	pycontrib/gdraw/gdraw.py	32	pycontrib/gdraw/gdraw.py
33	USE_XORG= ice x11 xi xkbui	33	USE_XORG= ice sm x11 xi xkbui xft
34	USE_GNOME= glib20 gtk20 libxml2 pango	34	USE_GNOME= cairo glib20 gtk20 libxml2 pango
35		35
36	CONFIGURE_ARGS= --enable-tile-path --enable-gtk2-use	36	CONFIGURE_ARGS= --enable-tile-path --enable-gtk2-use
37	CPPFLAGS+= -I${LOCALBASE}/include	37	CPPFLAGS+= -I${LOCALBASE}/include
Lines 50-56 Link Here
50		50
51	PYTHON_CONFIGURE_ENABLE= python-scripting python-extension	51	PYTHON_CONFIGURE_ENABLE= python-scripting python-extension
52		52
53	CAIRO_USE= GNOME=cairo
54	CAIRO_CONFIGURE_WITH= cairo	53	CAIRO_CONFIGURE_WITH= cairo
55		54
56	.include <bsd.port.options.mk>	55	.include <bsd.port.options.mk>
Lines 62-68 Link Here
62	http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \	61	http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \
63	http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \	62	http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \
64	ftp://ftp.freetype.org/freetype/freetype2/:freetype	63	ftp://ftp.freetype.org/freetype/freetype2/:freetype
65	FREETYPE_VERSION= 2.6.2	64	FREETYPE_VERSION= 2.6.3
66	FREETYPE_SRC= freetype-${FREETYPE_VERSION}.tar.bz2	65	FREETYPE_SRC= freetype-${FREETYPE_VERSION}.tar.bz2
67	DISTFILES+= ${FREETYPE_SRC:C/$/:freetype/}	66	DISTFILES+= ${FREETYPE_SRC:C/$/:freetype/}
68	CONFIGURE_ARGS+= --enable-freetype-debugger=${WRKDIR}/freetype-${FREETYPE_VERSION}	67	CONFIGURE_ARGS+= --enable-freetype-debugger=${WRKDIR}/freetype-${FREETYPE_VERSION}

Lines 1-28 Link Here

(-)files/patch-configure.ac (-28 lines)
1	--- configure.ac.orig 2014-11-27 00:40:08 UTC
2	+++ configure.ac
3	@@ -327,9 +327,6 @@ dnl AC_SEARCH_LIBS([dlopen], [dl dld])
4
5	FONTFORGE_CONFIG_X_LIBRARIES
6
7	-# zlib is a requirement. It is too commonly available to bother
8	-# leaving out.
9	-PKG_CHECK_MODULES([ZLIB],[zlib])
10	PKG_CHECK_MODULES([GLIB],[glib-2.0 >= 2.6 gio-2.0])
11
12	if test x"${i_do_have_gui}" = xyes; then
13	@@ -549,7 +546,6 @@ if test x"${i_do_have_freetype_debugger}
14	my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/include"
15	my_cflags="${my_cflags} -I${FREETYPE_SOURCE}/include/freetype"
16	fi
17	-my_cflags="${my_cflags} ${ZLIB_CFLAGS}"
18	my_cflags="${my_cflags} ${GLIB_CFLAGS}"
19	my_cflags="${my_cflags} ${CAIRO_CFLAGS}"
20	my_cflags="${my_cflags} ${PANGO_CFLAGS}"
21	@@ -590,7 +586,6 @@ test x"${i_do_have_libspiro}" = xyes &&
22	my_libs="${my_libs} ${LIBSPIRO_LIBS}"
23	my_libs="${my_libs} ${FREETYPE_LIBS}"
24	my_libs="${my_libs} ${PTHREAD_LIBS}"
25	-my_libs="${my_libs} ${ZLIB_LIBS}"
26	my_libs="${my_libs} ${GLIB_LIBS}"
27	my_libs="${my_libs} ${LIBXML_LIBS}"
28	AC_SUBST([MY_LIBS],[${my_libs}])