From e1cb9f334a4b11e27e0cb54cf891b4d1405a4706 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Mon, 2 Feb 2004 14:19:01 +0000 Subject: XFree86 meta-package can be now installed with or without xpkgwedge, installation prefix is ${X11PREFIX}/X11R6. Bump PKGREVISION. --- fonts/XFree86-fontsCyrillic/Makefile | 22 ++--- fonts/XFree86-fontsCyrillic/PLIST | 174 +++++++++++++++++------------------ 2 files changed, 98 insertions(+), 98 deletions(-) (limited to 'fonts/XFree86-fontsCyrillic') diff --git a/fonts/XFree86-fontsCyrillic/Makefile b/fonts/XFree86-fontsCyrillic/Makefile index 97e80935fab..136e3f83eff 100644 --- a/fonts/XFree86-fontsCyrillic/Makefile +++ b/fonts/XFree86-fontsCyrillic/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2004/01/29 06:21:36 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/02/02 14:19:01 xtraeme Exp $ DISTNAME= X430src-4 PKGNAME= XFree86-fontsCyrillic-${XF_VER} -WRKSRC= ${WRKDIR}/xc/fonts/bdf/cyrillic +PKGREVISION= 1 CATEGORIES= fonts x11 MASTER_SITES= ${MASTER_SITE_XFREE} EXTRACT_SUFX= .tgz @@ -15,27 +15,29 @@ DEPENDS+= XFree86-fontsEncodings>=4.3.0:../../fonts/XFree86-fontsEncodings USE_BUILDLINK2= yes NO_XFREE86_TARGETS= # defined +WRKSRC= ${WRKDIR}/xc/fonts/bdf/cyrillic FILESDIR= ${.CURDIR}/../../fonts/XFree86-fontsEncodings/files post-extract: @${SED} \ - -e "s|@PREFIX@|${X11PREFIX}|g" \ + -e "s|@PREFIX@|${X11ROOT}|g" \ -e "s|@MAKE@|${MAKE_PROGRAM}|g" \ -e "s|@IMAKE@|${IMAKE}|g" \ ${FILESDIR}/host.def > ${WRKSRC}/host.def - @${LN} -sf ${WRKSRC}/host.def ${WRKDIR}/xc/fonts/encodings - @${LN} -sf ${WRKSRC}/host.def ${WRKDIR}/xc/fonts/encodings/large +.for f in encodings encodings/large + @${LN} -sf ${WRKSRC}/host.def ${WRKDIR}/xc/fonts/${f} +.endfor do-configure: (cd ${WRKDIR}/xc/fonts/encodings && \ - ${IMAKE} -DUseInstalled -I${PREFIX}/lib/X11/config \ + ${IMAKE} -DUseInstalled -I${X11ROOT}/lib/X11/config \ -DTOPDIR=../../.. -DCURDIR=.; \ ${MAKE} Makefiles ; \ ${MAKE} includes ; \ ${MAKE} depend) (cd ${WRKSRC} && \ - ${IMAKE} -DUseInstalled -I${PREFIX}/lib/X11/config \ + ${IMAKE} -DUseInstalled -I${X11ROOT}/lib/X11/config \ -DTOPDIR=../../.. -DCURDIR=.; \ ${MAKE} Makefiles ; \ ${MAKE} includes ; \ @@ -44,13 +46,11 @@ do-configure: pre-build: @${MV} ${WRKDIR}/xc/fonts/encodings/large/Makefile \ ${WRKDIR}/xc/fonts/encodings/large/Makefile.in - @${SED} -e "s|/usr/X11R6|${PREFIX}|g" \ + @${SED} -e "s|/usr/X11R6|${X11ROOT}|g" \ < ${WRKDIR}/xc/fonts/encodings/large/Makefile.in > \ ${WRKDIR}/xc/fonts/encodings/large/Makefile - (cd ${WRKDIR}/xc/fonts/encodings && \ - ${MAKE} all) + (cd ${WRKDIR}/xc/fonts/encodings && ${MAKE} all) .include "../../meta-pkgs/XFree86/Makefile.common" - .include "../../mk/bsd.pkg.mk" diff --git a/fonts/XFree86-fontsCyrillic/PLIST b/fonts/XFree86-fontsCyrillic/PLIST index f313235130c..b57620d9d75 100644 --- a/fonts/XFree86-fontsCyrillic/PLIST +++ b/fonts/XFree86-fontsCyrillic/PLIST @@ -1,87 +1,87 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/24 08:56:54 xtraeme Exp $ -lib/X11/fonts/cyrillic/crox1c.pcf.gz -lib/X11/fonts/cyrillic/crox1cb.pcf.gz -lib/X11/fonts/cyrillic/crox1cbo.pcf.gz -lib/X11/fonts/cyrillic/crox1co.pcf.gz -lib/X11/fonts/cyrillic/crox1h.pcf.gz -lib/X11/fonts/cyrillic/crox1hb.pcf.gz -lib/X11/fonts/cyrillic/crox1hbo.pcf.gz -lib/X11/fonts/cyrillic/crox1ho.pcf.gz -lib/X11/fonts/cyrillic/crox1t.pcf.gz -lib/X11/fonts/cyrillic/crox1tb.pcf.gz -lib/X11/fonts/cyrillic/crox1tbo.pcf.gz -lib/X11/fonts/cyrillic/crox1to.pcf.gz -lib/X11/fonts/cyrillic/crox2c.pcf.gz -lib/X11/fonts/cyrillic/crox2cb.pcf.gz -lib/X11/fonts/cyrillic/crox2cbo.pcf.gz -lib/X11/fonts/cyrillic/crox2co.pcf.gz -lib/X11/fonts/cyrillic/crox2h.pcf.gz -lib/X11/fonts/cyrillic/crox2hb.pcf.gz -lib/X11/fonts/cyrillic/crox2hbo.pcf.gz -lib/X11/fonts/cyrillic/crox2ho.pcf.gz -lib/X11/fonts/cyrillic/crox2t.pcf.gz -lib/X11/fonts/cyrillic/crox2tb.pcf.gz -lib/X11/fonts/cyrillic/crox2tbo.pcf.gz -lib/X11/fonts/cyrillic/crox2to.pcf.gz -lib/X11/fonts/cyrillic/crox3c.pcf.gz -lib/X11/fonts/cyrillic/crox3cb.pcf.gz -lib/X11/fonts/cyrillic/crox3cbo.pcf.gz -lib/X11/fonts/cyrillic/crox3co.pcf.gz -lib/X11/fonts/cyrillic/crox3h.pcf.gz -lib/X11/fonts/cyrillic/crox3hb.pcf.gz -lib/X11/fonts/cyrillic/crox3hbo.pcf.gz -lib/X11/fonts/cyrillic/crox3ho.pcf.gz -lib/X11/fonts/cyrillic/crox3t.pcf.gz -lib/X11/fonts/cyrillic/crox3tb.pcf.gz -lib/X11/fonts/cyrillic/crox3tbo.pcf.gz -lib/X11/fonts/cyrillic/crox3to.pcf.gz -lib/X11/fonts/cyrillic/crox4h.pcf.gz -lib/X11/fonts/cyrillic/crox4hb.pcf.gz -lib/X11/fonts/cyrillic/crox4hbo.pcf.gz -lib/X11/fonts/cyrillic/crox4ho.pcf.gz -lib/X11/fonts/cyrillic/crox4t.pcf.gz -lib/X11/fonts/cyrillic/crox4tb.pcf.gz -lib/X11/fonts/cyrillic/crox4tbo.pcf.gz -lib/X11/fonts/cyrillic/crox4to.pcf.gz -lib/X11/fonts/cyrillic/crox5h.pcf.gz -lib/X11/fonts/cyrillic/crox5hb.pcf.gz -lib/X11/fonts/cyrillic/crox5hbo.pcf.gz -lib/X11/fonts/cyrillic/crox5ho.pcf.gz -lib/X11/fonts/cyrillic/crox5t.pcf.gz -lib/X11/fonts/cyrillic/crox5tb.pcf.gz -lib/X11/fonts/cyrillic/crox5tbo.pcf.gz -lib/X11/fonts/cyrillic/crox5to.pcf.gz -lib/X11/fonts/cyrillic/crox6h.pcf.gz -lib/X11/fonts/cyrillic/crox6hb.pcf.gz -lib/X11/fonts/cyrillic/crox6hbo.pcf.gz -lib/X11/fonts/cyrillic/crox6ho.pcf.gz -lib/X11/fonts/cyrillic/crox6t.pcf.gz -lib/X11/fonts/cyrillic/crox6tb.pcf.gz -lib/X11/fonts/cyrillic/crox6tbo.pcf.gz -lib/X11/fonts/cyrillic/crox6to.pcf.gz -lib/X11/fonts/cyrillic/encodings.dir -lib/X11/fonts/cyrillic/fonts.alias -lib/X11/fonts/cyrillic/fonts.dir -lib/X11/fonts/cyrillic/koi10x16b.pcf.gz -lib/X11/fonts/cyrillic/koi10x20.pcf.gz -lib/X11/fonts/cyrillic/koi12x24.pcf.gz -lib/X11/fonts/cyrillic/koi12x24b.pcf.gz -lib/X11/fonts/cyrillic/koi5x8.pcf.gz -lib/X11/fonts/cyrillic/koi6x10.pcf.gz -lib/X11/fonts/cyrillic/koi6x13.pcf.gz -lib/X11/fonts/cyrillic/koi6x13b.pcf.gz -lib/X11/fonts/cyrillic/koi6x9.pcf.gz -lib/X11/fonts/cyrillic/koi7x14.pcf.gz -lib/X11/fonts/cyrillic/koi7x14b.pcf.gz -lib/X11/fonts/cyrillic/koi8x13.pcf.gz -lib/X11/fonts/cyrillic/koi8x16.pcf.gz -lib/X11/fonts/cyrillic/koi8x16b.pcf.gz -lib/X11/fonts/cyrillic/koi9x15.pcf.gz -lib/X11/fonts/cyrillic/koi9x15b.pcf.gz -lib/X11/fonts/cyrillic/koi9x18.pcf.gz -lib/X11/fonts/cyrillic/koi9x18b.pcf.gz -lib/X11/fonts/cyrillic/koinil2.pcf.gz -lib/X11/fonts/cyrillic/proof9x16.pcf.gz -lib/X11/fonts/cyrillic/screen8x16.pcf.gz -lib/X11/fonts/cyrillic/screen8x16b.pcf.gz -@unexec ${RM} %D/lib/X11/fonts/cyrillic 2>/dev/null || true +@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:19:01 xtraeme Exp $ +X11R6/lib/X11/fonts/cyrillic/crox1c.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1cb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1cbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1co.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1h.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1hb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1hbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1ho.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1t.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1tb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1tbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox1to.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2c.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2cb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2cbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2co.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2h.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2hb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2hbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2ho.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2t.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2tb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2tbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox2to.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3c.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3cb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3cbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3co.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3h.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3hb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3hbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3ho.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3t.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3tb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3tbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox3to.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox4h.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox4hb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox4hbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox4ho.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox4t.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox4tb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox4tbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox4to.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox5h.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox5hb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox5hbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox5ho.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox5t.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox5tb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox5tbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox5to.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox6h.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox6hb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox6hbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox6ho.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox6t.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox6tb.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox6tbo.pcf.gz +X11R6/lib/X11/fonts/cyrillic/crox6to.pcf.gz +X11R6/lib/X11/fonts/cyrillic/encodings.dir +X11R6/lib/X11/fonts/cyrillic/fonts.alias +X11R6/lib/X11/fonts/cyrillic/fonts.dir +X11R6/lib/X11/fonts/cyrillic/koi10x16b.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi10x20.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi12x24.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi12x24b.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi5x8.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi6x10.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi6x13.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi6x13b.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi6x9.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi7x14.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi7x14b.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi8x13.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi8x16.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi8x16b.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi9x15.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi9x15b.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi9x18.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koi9x18b.pcf.gz +X11R6/lib/X11/fonts/cyrillic/koinil2.pcf.gz +X11R6/lib/X11/fonts/cyrillic/proof9x16.pcf.gz +X11R6/lib/X11/fonts/cyrillic/screen8x16.pcf.gz +X11R6/lib/X11/fonts/cyrillic/screen8x16b.pcf.gz +@unexec ${RM} %D/X11R6/lib/X11/fonts/cyrillic 2>/dev/null || true -- cgit v1.2.3