From owner-svn-ports-head@FreeBSD.ORG Wed Nov 19 00:13:32 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24CE7F62; Wed, 19 Nov 2014 00:13:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EBC3C9CB; Wed, 19 Nov 2014 00:13:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ0DVYO054491; Wed, 19 Nov 2014 00:13:31 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ0DVX4054490; Wed, 19 Nov 2014 00:13:31 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201411190013.sAJ0DVX4054490@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Wed, 19 Nov 2014 00:13:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372758 - head/russian/koi8r-ps X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Nov 2014 00:13:32 -0000 Author: mi Date: Wed Nov 19 00:13:31 2014 New Revision: 372758 URL: https://svnweb.freebsd.org/changeset/ports/372758 QAT: https://qat.redports.org/buildarchive/r372758/ Log: Fix the generation of Fontmap.diff, which I broke earlier, when trying to support staging... Modified: head/russian/koi8r-ps/Makefile Modified: head/russian/koi8r-ps/Makefile ============================================================================== --- head/russian/koi8r-ps/Makefile Tue Nov 18 23:54:17 2014 (r372757) +++ head/russian/koi8r-ps/Makefile Wed Nov 19 00:13:31 2014 (r372758) @@ -3,17 +3,17 @@ PORTNAME= koi8rPS PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= russian print MASTER_SITES= ftp://ftp.redcom.ru/pub/X/psfonts/ \ ftp://ftp.kapella.gpi.ru/pub/cyrillic/psfonts/ DISTFILES= gs-type1_koi8_fonts.tgz gs-type1_koi8_afm.tgz \ XFree86-Type1_fonts.dir.scale.gz +EXTRACT_ONLY= MAINTAINER= mi@aldan.algebra.com COMMENT= Add Russian (KOI8) fonts to your PostScript fonts collection -EXTRACT_ONLY= - DIST_SUBDIR= koi8r-ps .include @@ -25,7 +25,7 @@ FONTMAP!= ${SH} ${FILESDIR}/find-fontmap NO_PACKAGE= Nothing to build, configurations only NO_WRKSUBDIR= Yes -CPS_DIR= ${STAGEDIR}${PREFIX}/share/koi8r-ps +CPS_DIR= ${PREFIX}/share/koi8r-ps do-extract: ${MKDIR} ${WRKSRC} @@ -43,10 +43,10 @@ do-configure: < ${FILESDIR}/Fontmap.diff > ${WRKSRC}/Fontmap.diff do-install: - ${MKDIR} ${CPS_DIR} - ${TAR} -C ${CPS_DIR} -xzpf \ + ${MKDIR} ${STAGEDIR}${CPS_DIR} + ${TAR} -C ${STAGEDIR}${CPS_DIR} -xzpf \ ${DISTDIR}/${DIST_SUBDIR}/gs-type1_koi8_fonts.tgz - ${TAR} -C ${CPS_DIR} -xzpf \ + ${TAR} -C ${STAGEDIR}${CPS_DIR} -xzpf \ ${DISTDIR}/${DIST_SUBDIR}/gs-type1_koi8_afm.tgz .if !exists(${FONTMAP}) ################################################################# @@ -57,7 +57,6 @@ do-install: ### ${PREFIX}/share/ghostscript/5.50/Fontmap ### for GhostScript to use cyrillic fonts. ################################################################# - @test -t 0 && test -t 1 && ${ECHO} -n "Press enter" && read junk || ${TRUE} .else @if ${GREP} -q ArialCyrMT-BoldItalic "${FONTMAP}" ; then \ ${ECHO} Apparently, Fontmap already lists this fonts. Ok. \ @@ -69,10 +68,10 @@ do-install: ${RM} -f "${FONTMAP}".CyrPS ; \ fi .endif - ${ECHO_CMD} ${FONTMAP} > ${CPS_DIR}/fontmap.path - ${INSTALL_DATA} ${WRKSRC}/Fontmap.diff ${CPS_DIR} - ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${CPS_DIR} - ${LN} -s fonts.dir ${CPS_DIR}/fonts.scale + ${ECHO_CMD} ${FONTMAP} > ${STAGEDIR}${CPS_DIR}/fontmap.path + ${INSTALL_DATA} ${WRKSRC}/Fontmap.diff ${STAGEDIR}${CPS_DIR} + ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${STAGEDIR}${CPS_DIR} + ${LN} -s fonts.dir ${STAGEDIR}${CPS_DIR}/fonts.scale ${CAT} ${PKGMESSAGE} .include