Remove the symlink in ${PREFIX}/lib/X11/fonts.

ok ajacoutot@ (during p2k9)
This commit is contained in:
kili 2009-10-21 14:19:01 +00:00
parent bc58b3885a
commit 5d5711efef
3 changed files with 4 additions and 9 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2008/03/31 12:49:58 wcmaier Exp $ # $OpenBSD: Makefile,v 1.10 2009/10/21 14:19:01 kili Exp $
COMMENT= 35 standard PostScript fonts with Adobe name aliases COMMENT= 35 standard PostScript fonts with Adobe name aliases
DISTNAME= ghostscript-fonts-std-8.11 DISTNAME= ghostscript-fonts-std-8.11
PKGNAME= ${DISTNAME:S,-std-,-,}p0 PKGNAME= ${DISTNAME:S,-std-,-,}p1
CATEGORIES= x11 print CATEGORIES= x11 print
HOMEPAGE= http://www.cs.wisc.edu/~ghost/doc/cvs/Fonts.htm HOMEPAGE= http://www.cs.wisc.edu/~ghost/doc/cvs/Fonts.htm
@ -21,13 +21,10 @@ NO_BUILD= Yes
NO_REGRESS= Yes NO_REGRESS= Yes
PKG_ARCH= * PKG_ARCH= *
FONTDIR= ${PREFIX}/share/ghostscript/fonts FONTDIR= ${PREFIX}/share/ghostscript/fonts
X11FONTDIR= ${PREFIX}/lib/X11/fonts
do-install: do-install:
${INSTALL_DATA_DIR} ${FONTDIR} ${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKDIST}/fonts/*.{afm,pfm,pfb} ${FONTDIR} ${INSTALL_DATA} ${WRKDIST}/fonts/*.{afm,pfm,pfb} ${FONTDIR}
${INSTALL_DATA} ${FILESDIR}/fonts.alias ${FONTDIR}/fonts.alias-gs ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${FONTDIR}/fonts.alias-gs
${INSTALL_DATA_DIR} ${X11FONTDIR}
cd ${X11FONTDIR} && ln -s ../../../share/ghostscript/fonts ghostscript
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -8,6 +8,6 @@ scaled. Below is the relevant section from a typical xorg.conf file.
FontPath "/usr/X11R6/lib/X11/fonts/misc/" FontPath "/usr/X11R6/lib/X11/fonts/misc/"
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled" FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled" FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
FontPath "${PREFIX}/lib/X11/fonts/ghostscript/" FontPath "${PREFIX}/share/ghostscript/fonts/"
FontPath "/usr/X11R6/lib/X11/fonts/Type1/" FontPath "/usr/X11R6/lib/X11/fonts/Type1/"

View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2007/08/03 15:15:20 kili Exp $ @comment $OpenBSD: PLIST,v 1.5 2009/10/21 14:19:01 kili Exp $
lib/X11/fonts/
lib/X11/fonts/ghostscript
share/ghostscript/ share/ghostscript/
@fontdir share/ghostscript/fonts/ @fontdir share/ghostscript/fonts/
share/ghostscript/fonts/a010013l.afm share/ghostscript/fonts/a010013l.afm