[Midnightbsd-cvs] mports [15771] trunk/x11-fonts/fontconfig/Makefile: update

[laffer1 at midnightbsd.org]

Revision: 15771
          http://svnweb.midnightbsd.org/mports/?rev=15771
Author:   laffer1
Date:     2013-12-22 15:47:54 -0500 (Sun, 22 Dec 2013)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/x11-fonts/fontconfig/Makefile

Modified: trunk/x11-fonts/fontconfig/Makefile
===================================================================
--- trunk/x11-fonts/fontconfig/Makefile	2013-12-22 20:43:29 UTC (rev 15770)
+++ trunk/x11-fonts/fontconfig/Makefile	2013-12-22 20:47:54 UTC (rev 15771)
@@ -7,28 +7,32 @@
 MASTER_SITES=	http://www.freedesktop.org/software/fontconfig/release/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	An XML-based font configuration API for X Windows
+COMMENT=	XML-based font configuration API for X Windows
+
 LICENSE=	mit
 
+USE_BZIP2=	yes
+
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig ltverhack
-CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
+USES=		gmake pathfix pkgconfig
+USE_GNOME=	ltverhack
+CONFIGURE_ARGS=	--with-configdir=${PREFIX}/etc/fonts/conf.d \
+		--with-templatedir=${PREFIX}/etc/fonts/conf.avail \
+		--with-xmldir=${PREFIX}/etc/fonts \
 		--with-expat-includes=${LOCALBASE}/include \
 		--with-expat-lib=${LOCALBASE}/lib \
 		--with-default-fonts=${PREFIX}/share/fonts \
 		--with-add-fonts=${LOCALBASE}/lib/X11/fonts \
 		--with-cache-dir=/var/db/fontconfig \
+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--disable-docs
 MAKE_ENV=	LC_ALL=C
-MAKE_JOBS_SAFE=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 
 MAN1=		fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
@@ -35,10 +39,10 @@
 MAN5=		fonts-conf.5
 PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 .endif
@@ -56,6 +60,6 @@
 		s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif