svn commit: r336569 - head/misc/magicpoint

[Dirk Meyer]

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 at 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}/