Revert previous commit since it caused an infinite recursion loop

in XFree86-clients.  I'll commit this to pango instead.

Requested by:	will
This commit is contained in:
Joe Marcus Clarke 2003-04-04 16:01:55 +00:00
parent a26e046c14
commit 259996651f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=78181
4 changed files with 2 additions and 40 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= Xft PORTNAME= Xft
PORTVERSION= 2.1 PORTVERSION= 2.1
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= x11-fonts CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/fontconfig/release/ MASTER_SITES= http://fontconfig.org/fontconfig/release/
DISTNAME= fcpackage.${PORTVERSION:S/./_/} DISTNAME= fcpackage.${PORTVERSION:S/./_/}
@ -16,11 +16,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A client-sided font API for X applications COMMENT= A client-sided font API for X applications
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig 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_GMAKE= yes
USE_X_PREFIX= yes USE_X_PREFIX= yes
@ -48,10 +43,5 @@ pre-install:
post-install: post-install:
@${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3 @${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> .include <bsd.port.post.mk>

View file

@ -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

View file

@ -7,7 +7,7 @@
PORTNAME= Xft PORTNAME= Xft
PORTVERSION= 2.1 PORTVERSION= 2.1
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= x11-fonts CATEGORIES= x11-fonts
MASTER_SITES= http://fontconfig.org/fontconfig/release/ MASTER_SITES= http://fontconfig.org/fontconfig/release/
DISTNAME= fcpackage.${PORTVERSION:S/./_/} DISTNAME= fcpackage.${PORTVERSION:S/./_/}
@ -16,11 +16,6 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A client-sided font API for X applications COMMENT= A client-sided font API for X applications
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig 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_GMAKE= yes
USE_X_PREFIX= yes USE_X_PREFIX= yes
@ -48,10 +43,5 @@ pre-install:
post-install: post-install:
@${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3 @${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> .include <bsd.port.post.mk>

View file

@ -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