Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Dec 2015 21:47:15 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r403817 - head/misc/magicpoint
Message-ID:  <201512152147.tBFLlFKA001266@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Tue Dec 15 21:47:15 2015
New Revision: 403817
URL: https://svnweb.freebsd.org/changeset/ports/403817

Log:
  - remove BROKEN
  - fix dependecies
  - option FREETYPE is no longer default
  - option FREETYPE and XFT now conflicting

Modified:
  head/misc/magicpoint/Makefile

Modified: head/misc/magicpoint/Makefile
==============================================================================
--- head/misc/magicpoint/Makefile	Tue Dec 15 21:37:15 2015	(r403816)
+++ head/misc/magicpoint/Makefile	Tue Dec 15 21:47:15 2015	(r403817)
@@ -10,8 +10,6 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/f
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	X11-based presentation tool
 
-BROKEN=		Doesn't build with freetype2 2.6.1 or higher
-
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
@@ -46,13 +44,15 @@ EMACS_LISPS_MGP=COPYING README mgp.el mg
 SAMPLE_SCRIPTS=	eqn2eps.sh tex2eps.sh mgp2html.pl mgp2latex.pl
 
 OPTIONS_DEFINE=	FREETYPE XFT GIF DOCS
-OPTIONS_DEFAULT=FREETYPE XFT GIF
+OPTIONS_DEFAULT=XFT GIF
 NO_OPTIONS_SORT=yes
 
+FREETYPE_PREVENTS=	XFT
 FREETYPE_CONFIGURE_ENABLE=	freetype
+FREETYPE_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
+XFT_PREVENTS=	FREETYPE
 XFT_USES=	iconv
 XFT_USE=	XORG=xft
-XFT_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
 XFT_CONFIGURE_ENABLE=	xft2
 XFT_CONFIGURE_ON=	--enable-freetype-charset16
 GIF_CONFIGURE_ENABLE=	gif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512152147.tBFLlFKA001266>