From owner-svn-ports-head@FreeBSD.ORG Sat Mar 29 14:05:39 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09A33B87; Sat, 29 Mar 2014 14:05:39 +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 D0EA23EC; Sat, 29 Mar 2014 14:05:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2TE5cnc004962; Sat, 29 Mar 2014 14:05:38 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2TE5ceQ004960; Sat, 29 Mar 2014 14:05:38 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201403291405.s2TE5ceQ004960@svn.freebsd.org> From: Dmitry Marakasov Date: Sat, 29 Mar 2014 14:05:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349514 - in head/x11-fonts/cyr-rfx: . files 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.17 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: Sat, 29 Mar 2014 14:05:39 -0000 Author: amdmi3 Date: Sat Mar 29 14:05:38 2014 New Revision: 349514 URL: http://svnweb.freebsd.org/changeset/ports/349514 QAT: https://qat.redports.org/buildarchive/r349514/ Log: - Support staging - Install into PREFIX, not LOCALBASE - Fix pkg-message displaying PR: 187344 Submitted by: amdmi3 Approved by: maintainer timeout, portmgr (blanket) Added: head/x11-fonts/cyr-rfx/files/pkg-message.in - copied, changed from r349506, head/x11-fonts/cyr-rfx/pkg-message Deleted: head/x11-fonts/cyr-rfx/pkg-message Modified: head/x11-fonts/cyr-rfx/Makefile Modified: head/x11-fonts/cyr-rfx/Makefile ============================================================================== --- head/x11-fonts/cyr-rfx/Makefile Sat Mar 29 14:04:00 2014 (r349513) +++ head/x11-fonts/cyr-rfx/Makefile Sat Mar 29 14:05:38 2014 (r349514) @@ -3,7 +3,7 @@ PORTNAME= cyr-rfx-${CYR_RFX_ENCODING} PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts ukrainian russian MASTER_SITES= ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/%SUBDIR%/ \ ftp://ftp.inp.nsk.su/%SUBDIR%/ @@ -26,12 +26,10 @@ CYR_RFX_ENCODING?= koi8-o WRKSRC= ${WRKDIR}/${CYR_RFX_ENCODING} MAKEFILE= ${FILESDIR}/Makefile.bdf2pcf INST_DIR= "lib/X11/fonts/${PORTNAME}" -MAKE_ENV+= INST_DIR="${LOCALBASE}/${INST_DIR}" MKDIR="${MKDIR}" -PLIST_SUB+= INST_DIR="${INST_DIR}" +MAKE_ENV+= INST_DIR="${STAGEDIR}${PREFIX}/${INST_DIR}" MKDIR="${MKDIR}" +PLIST_SUB= INST_DIR="${INST_DIR}" -NO_STAGE= yes -post-install: - @${SED} -e 's,/usr/X11R6,${LOCALBASE},g' -e \ - 's,koi8-o,${CYR_RFX_ENCODING},g' < ${PKGMESSAGE} +SUB_LIST= CYR_RFX_ENCODING="${CYR_RFX_ENCODING}" +SUB_FILES= pkg-message .include Copied and modified: head/x11-fonts/cyr-rfx/files/pkg-message.in (from r349506, head/x11-fonts/cyr-rfx/pkg-message) ============================================================================== --- head/x11-fonts/cyr-rfx/pkg-message Sat Mar 29 13:19:27 2014 (r349506, copy source) +++ head/x11-fonts/cyr-rfx/files/pkg-message.in Sat Mar 29 14:05:38 2014 (r349514) @@ -1,10 +1,10 @@ This port provides Cyrillic replacements for most of the standard - /usr/X11R6/lib/X11/fonts/misc + %%PREFIX%%/lib/X11/fonts/misc and - /usr/X11R6/lib/X11/fonts/75dpi + %%PREFIX%%/lib/X11/fonts/75dpi fonts. You may want to make sure, the - /usr/X11R6/lib/X11/fonts/cyr-rfx-koi8-o + %%PREFIX%%/lib/X11/fonts/cyr-rfx-%%CYR_RFX_ENCODING%% is listed in your fontpath before those two paths.