diff options
| author | marcus <marcus@FreeBSD.org> | 2003-04-05 00:01:55 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-04-05 00:01:55 +0800 |
| commit | 5997c15b4e522232ccc7860f0cf26922b52de8aa (patch) | |
| tree | 8542a08af87a5c37255f6098f96f838d143d5d66 /x11-fonts | |
| parent | 7791d01b7521af021b6abacf07c3798717b8bac4 (diff) | |
| download | freebsd-ports-gnome-5997c15b4e522232ccc7860f0cf26922b52de8aa.tar.gz freebsd-ports-gnome-5997c15b4e522232ccc7860f0cf26922b52de8aa.tar.zst freebsd-ports-gnome-5997c15b4e522232ccc7860f0cf26922b52de8aa.zip | |
Revert previous commit since it caused an infinite recursion loop
in XFree86-clients. I'll commit this to pango instead.
Requested by: will
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/Xft/Makefile | 12 | ||||
| -rw-r--r-- | x11-fonts/Xft/files/pkg-install.in | 9 | ||||
| -rw-r--r-- | x11-fonts/libXft/Makefile | 12 | ||||
| -rw-r--r-- | x11-fonts/libXft/files/pkg-install.in | 9 |
4 files changed, 2 insertions, 40 deletions
diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile index 37eba1d6c816..013f972ea8d4 100644 --- a/x11-fonts/Xft/Makefile +++ b/x11-fonts/Xft/Makefile @@ -7,7 +7,7 @@ PORTNAME= Xft PORTVERSION= 2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} @@ -16,11 +16,6 @@ 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 @@ -48,10 +43,5 @@ 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 deleted file mode 100644 index a45989535273..000000000000 --- a/x11-fonts/Xft/files/pkg-install.in +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 37eba1d6c816..013f972ea8d4 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -7,7 +7,7 @@ PORTNAME= Xft PORTVERSION= 2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} @@ -16,11 +16,6 @@ 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 @@ -48,10 +43,5 @@ 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 deleted file mode 100644 index a45989535273..000000000000 --- a/x11-fonts/libXft/files/pkg-install.in +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 |