diff options
| -rw-r--r-- | x11-fonts/XFree86-4-fontCyrillic/Makefile | 22 | ||||
| -rw-r--r-- | x11-fonts/XFree86-4-fontCyrillic/distinfo | 2 | ||||
| -rw-r--r-- | x11-fonts/XFree86-4-fontCyrillic/pkg-plist | 14 |
3 files changed, 24 insertions, 14 deletions
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile index 980ae3b6ad38..17c4b1dfbc76 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/Makefile +++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile @@ -7,16 +7,13 @@ PORTNAME= fontCyrillic PORTVERSION= 4.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts -MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITES= ${MASTER_SITE_XFREE} \ + http://koi8.pp.ru/dist/ MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz - -# koi8-u commented out until will be implemented as addition, not replacement -#PATCHFILES= cronyx-4.2.0.koi8-u.diff.gz -#PATCH_SITES= http://people.FreeBSD.org/~sobomax/ +DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz xrus-2.3.1-xf4-bdf.tgz MAINTAINER= anholt@freebsd.org @@ -27,9 +24,14 @@ XFREE86_VERSION= 4 USE_IMAKE= YES PROJECTROOT= -DProjectRoot=${PREFIX} DIST_SUBDIR= xc +EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-2.tgz EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/fonts WRKSRC= ${WRKDIR}/xc/fonts/bdf/cyrillic +post-extract: + cd ${WRKSRC} && \ + ${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/xrus-2.3.1-xf4-bdf.tgz + do-configure: (cd ${WRKDIR}/xc/fonts/encodings && \ imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \ @@ -48,10 +50,4 @@ pre-build: (cd ${WRKDIR}/xc/fonts/encodings && \ ${MAKE} all) -#post-build: -# @for line in `${TAIL} -n +2 ${WRKSRC}/fonts.dir | ${AWK} '{print $$2}'`; do \ -# ${ECHO_CMD} `${ECHO_CMD} $$line | ${SED} 's|koi8-r|koi8-u|'` $$line >> \ -# ${WRKSRC}/fonts.alias; \ -# done - .include <bsd.port.mk> diff --git a/x11-fonts/XFree86-4-fontCyrillic/distinfo b/x11-fonts/XFree86-4-fontCyrillic/distinfo index 1224ece3e546..320af09e20f9 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/distinfo +++ b/x11-fonts/XFree86-4-fontCyrillic/distinfo @@ -1,2 +1,2 @@ MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e -MD5 (xc/cronyx-4.2.0.koi8-u.diff.gz) = 03f724ee72645ec3c202d72da0b5afcc +MD5 (xc/xrus-2.3.1-xf4-bdf.tgz) = af43b304e206217d43f97f5c1b8ccb9e diff --git a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist index 0cbe34efeeab..ced97bb2130a 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist +++ b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist @@ -64,8 +64,22 @@ 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 |