diff options
author | jmz <jmz@FreeBSD.org> | 2001-01-08 14:29:08 +0000 |
---|---|---|
committer | jmz <jmz@FreeBSD.org> | 2001-01-08 14:29:08 +0000 |
commit | 0208aa934910d2c0197d96f2059a51b6e090acad (patch) | |
tree | 89fc980f863c473a2dccf71cb06feaeccf785b86 /x11/XFree86-4/Makefile | |
parent | 0c2c1f6b0e5976b3d01aacd147a32a3430838c2a (diff) | |
download | FreeBSD-ports-0208aa934910d2c0197d96f2059a51b6e090acad.zip FreeBSD-ports-0208aa934910d2c0197d96f2059a51b6e090acad.tar.gz |
Don't build freetype2 from the XFree sources and add a dependency on
print/freetype2.
I only got negative feedback with the previous version.
Diffstat (limited to 'x11/XFree86-4/Makefile')
-rw-r--r-- | x11/XFree86-4/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 36f5b9f..4a328e5 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -7,7 +7,7 @@ PORTNAME= XFree86 PORTVERSION= 4.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -15,6 +15,8 @@ DISTFILES= X402src-1.tgz X402src-2.tgz MAINTAINER= jmz@FreeBSD.org +LIB_DEPENDS= freetype.6:${PORTSDIR}/print/freetype2 + WRKSRC= ${WRKDIR}/${DIST_SUBDIR} .if (${MACHINE} != "alpha") #NO_PACKAGE= package available from XFree86 @@ -85,16 +87,10 @@ post-patch: ${WRKSRC}/include/Xarch.h; fi .endif -pre-build: - @cd ${WRKSRC}/extras/freetype2 && make -f Makefile.freetype pre-install: ${MKDIR} ${PREFIX} post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/extras/freetype2/lib/libfreetype.a ${PREFIX}/lib - ${INSTALL_PROGRAM} ${WRKSRC}/extras/freetype2/lib/libfreetype.so.6 ${PREFIX}/lib - ln -sf ${PREFIX}/lib/libfreetype.so.6 ${PREFIX}/lib/libfreetype.so - .ifndef DISTRIB ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .endif |