From owner-svn-ports-all@FreeBSD.ORG  Sun Dec 15 19:24:24 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C3C74EA8;
 Sun, 15 Dec 2013 19:24:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B00D91AF1;
 Sun, 15 Dec 2013 19:24:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJOOm9050244;
 Sun, 15 Dec 2013 19:24:24 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJOOLD050243;
 Sun, 15 Dec 2013 19:24:24 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201312151924.rBFJOOLD050243@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 15 Dec 2013 19:24:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336569 - head/misc/magicpoint
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Dec 2013 19:24:24 -0000

Author: dinoex
Date: Sun Dec 15 19:24:24 2013
New Revision: 336569
URL: http://svnweb.freebsd.org/changeset/ports/336569

Log:
  - update LIB_DEPENDS
  - use OPT_USE

Modified:
  head/misc/magicpoint/Makefile

Modified: head/misc/magicpoint/Makefile
==============================================================================
--- head/misc/magicpoint/Makefile	Sun Dec 15 19:19:19 2013	(r336568)
+++ head/misc/magicpoint/Makefile	Sun Dec 15 19:24:24 2013	(r336569)
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/f
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An X11-based presentation tool
 
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png \
-		mng:${PORTSDIR}/graphics/libmng
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png \
+		libmng.so:${PORTSDIR}/graphics/libmng
 RUN_DEPENDS+=	pnmscale:${PORTSDIR}/graphics/netpbm
 
 MAKE_JOBS_UNSAFE=	yes
@@ -46,24 +46,18 @@ NO_OPTIONS_SORT=yes
 
 FREETYPE_CONFIGURE_ENABLE=	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
 GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
 GIF_CPPFLAGS=		-I${LOCALBASE}/include
+IMLIB_USE=	GNOME=imlib
 IMLIB_CONFIGURE_ENABLE=	imlib
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MXFT}
-USE_XORG+=	xft
-.endif
-
-.if ${PORT_OPTIONS:MIMLIB}
-USE_GNOME+=	imlib
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|-lungif|-lgif|' \
 		-e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
@@ -84,7 +78,7 @@ post-install:
 		${STAGEDIR}${MANPREFIX}/man/man1/
 	${INSTALL} ${WRKSRC}/contrib/xmindpath/xmindpath \
 		${STAGEDIR}${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/