Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/fontconfig/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	21 Jan 2003 16:19:47 -0000	1.6
+++ Makefile	24 Jan 2003 04:54:03 -0000
@@ -20,7 +20,7 @@
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
@@ -30,6 +30,13 @@
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 WRKSRC=	${WRKDIR}/${DISTNAME}/fontconfig
 
+.include <bsd.port.pre.mk>
+.if ${XFREE86_VERSION} == 3
+MTREE_FILE=     /etc/mtree/BSD.x11.dist
+.else
+MTREE_FILE=     /etc/mtree/BSD.x11-4.dist
+.endif
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
 
@@ -38,4 +45,4 @@
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>