diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-04 06:55:23 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-04 06:55:23 +0000 |
| commit | 042ccee8b82ef7c43c0c3dfb9adf2405528fe8af (patch) | |
| tree | 105b079dc60c6ef860edc42b5309c4187919a3b9 /x11-fonts | |
| parent | 0e0d4691b58f901664f6c7fa661e4ad3eeb5fa93 (diff) | |
| download | ports-042ccee8b82ef7c43c0c3dfb9adf2405528fe8af.tar.gz ports-042ccee8b82ef7c43c0c3dfb9adf2405528fe8af.zip | |
Notes
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/Xft/Makefile | 16 | ||||
| -rw-r--r-- | x11-fonts/Xft/files/pkg-install.in | 9 | ||||
| -rw-r--r-- | x11-fonts/libXft/Makefile | 16 | ||||
| -rw-r--r-- | x11-fonts/libXft/files/pkg-install.in | 9 |
4 files changed, 42 insertions, 8 deletions
diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile index 48c87b152d5d..37eba1d6c816 100644 --- a/x11-fonts/Xft/Makefile +++ b/x11-fonts/Xft/Makefile @@ -7,7 +7,7 @@ PORTNAME= Xft PORTVERSION= 2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} @@ -16,13 +16,18 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A client-sided font API for X applications LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig +RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ + ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings + +FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf +FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_REINPLACE= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/Xft @@ -31,8 +36,6 @@ MAN3= Xft.3 .include <bsd.port.pre.mk> -# TODO Add a check to make sure we're not using XFree86 4.3.x which will -# have Xft2 included by default. .if ${XFREE86_VERSION} == 3 BROKEN= Xft2 requires XFree86 4.x to build. .endif @@ -45,5 +48,10 @@ pre-install: post-install: @${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3 + @${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ + > ${PKGINSTALL} +.if !defined(PACKAGE_BUILDING) + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif .include <bsd.port.post.mk> diff --git a/x11-fonts/Xft/files/pkg-install.in b/x11-fonts/Xft/files/pkg-install.in new file mode 100644 index 000000000000..a45989535273 --- /dev/null +++ b/x11-fonts/Xft/files/pkg-install.in @@ -0,0 +1,9 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%X11BASE%%/bin +export PATH + +if [ "$2" = "POST-INSTALL" ]; then + echo "Running fc-cache to build fontconfig caches..." + fc-cache -f -v +fi diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index 48c87b152d5d..37eba1d6c816 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -7,7 +7,7 @@ PORTNAME= Xft PORTVERSION= 2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} @@ -16,13 +16,18 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A client-sided font API for X applications LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig +RUN_DEPENDS= ${FONTSCALE}:${PORTSDIR}/x11-fonts/XFree86-4-fontScalable \ + ${FONTENCOD}:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings + +FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf +FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_REINPLACE= yes -CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/Xft @@ -31,8 +36,6 @@ MAN3= Xft.3 .include <bsd.port.pre.mk> -# TODO Add a check to make sure we're not using XFree86 4.3.x which will -# have Xft2 included by default. .if ${XFREE86_VERSION} == 3 BROKEN= Xft2 requires XFree86 4.x to build. .endif @@ -45,5 +48,10 @@ pre-install: post-install: @${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3 + @${SED} -e 's|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \ + > ${PKGINSTALL} +.if !defined(PACKAGE_BUILDING) + @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.endif .include <bsd.port.post.mk> diff --git a/x11-fonts/libXft/files/pkg-install.in b/x11-fonts/libXft/files/pkg-install.in new file mode 100644 index 000000000000..a45989535273 --- /dev/null +++ b/x11-fonts/libXft/files/pkg-install.in @@ -0,0 +1,9 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%X11BASE%%/bin +export PATH + +if [ "$2" = "POST-INSTALL" ]; then + echo "Running fc-cache to build fontconfig caches..." + fc-cache -f -v +fi |