From owner-svn-ports-all@FreeBSD.ORG Fri May 9 22:28:59 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 208C5CA4; Fri, 9 May 2014 22:28:59 +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 02071CDB; Fri, 9 May 2014 22:28:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s49MSwH1012629; Fri, 9 May 2014 22:28:58 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s49MSw51012627; Fri, 9 May 2014 22:28:58 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405092228.s49MSw51012627@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 9 May 2014 22:28:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353531 - head/x11-fonts/intlfonts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2014 22:28:59 -0000 Author: bapt Date: Fri May 9 22:28:58 2014 New Revision: 353531 URL: http://svnweb.freebsd.org/changeset/ports/353531 QAT: https://qat.redports.org/buildarchive/r353531/ Log: Support stage Remove deprecated and useless pkg-req Deleted: head/x11-fonts/intlfonts/pkg-req Modified: head/x11-fonts/intlfonts/Makefile head/x11-fonts/intlfonts/pkg-plist Modified: head/x11-fonts/intlfonts/Makefile ============================================================================== --- head/x11-fonts/intlfonts/Makefile Fri May 9 22:08:26 2014 (r353530) +++ head/x11-fonts/intlfonts/Makefile Fri May 9 22:28:58 2014 (r353531) @@ -3,7 +3,7 @@ PORTNAME= intlfonts PORTVERSION= 1.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= intlfonts @@ -16,6 +16,8 @@ BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale RUN_DEPENDS= type1inst:${PORTSDIR}/x11-fonts/p5-type1inst +OPTIONS_DEFINE= DOCS + USE_XORG= x11 PLIST_SUB+= FONTSDIR=${FONTSDIR} T1_FONTSDIR=${T1_FONTSDIR} \ TT_FONTSDIR=${TT_FONTSDIR} @@ -37,7 +39,6 @@ TT_FONTSDIR= lib/X11/fonts/TrueType PKGINSTALL= ${WRKDIR}/INSTALL PKGDEINSTALL= ${WRKDIR}/DEINSTALL -NO_STAGE= yes do-build: cd ${WRKSRC}; \ for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \ @@ -56,29 +57,20 @@ do-build: < ${FILESDIR}/$${f}.tmpl > ${WRKDIR}/$${f}; \ done -pre-install: - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGREQ} ${PKGNAME} INSTALL do-install: (cd ${WRKSRC}; \ - ${MKDIR} ${PREFIX}/${FONTSDIR}; \ + ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}; \ for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \ - ${INSTALL_DATA} $$dir/*.pcf.gz ${PREFIX}/${FONTSDIR} ; \ + ${INSTALL_DATA} $$dir/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTSDIR} ; \ done; \ - ${MKDIR} ${PREFIX}/${T1_FONTSDIR}; \ - ${INSTALL_DATA} Type1/*.* ${PREFIX}/${T1_FONTSDIR} ; \ - ${MKDIR} ${PREFIX}/${TT_FONTSDIR}; \ - ${INSTALL_DATA} TrueType/*.ttf ${PREFIX}/${TT_FONTSDIR} ; \ + ${MKDIR} ${STAGEDIR}${PREFIX}/${T1_FONTSDIR}; \ + ${INSTALL_DATA} Type1/*.* ${STAGEDIR}${PREFIX}/${T1_FONTSDIR} ; \ + ${MKDIR} ${STAGEDIR}${PREFIX}/${TT_FONTSDIR}; \ + ${INSTALL_DATA} TrueType/*.ttf ${STAGEDIR}${PREFIX}/${TT_FONTSDIR} ; \ ) - -post-install: - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/Emacs.ap ${WRKSRC}/NEWS \ - ${DOCSDIR} -.endif + ${STAGEDIR}${DOCSDIR} .include Modified: head/x11-fonts/intlfonts/pkg-plist ============================================================================== --- head/x11-fonts/intlfonts/pkg-plist Fri May 9 22:08:26 2014 (r353530) +++ head/x11-fonts/intlfonts/pkg-plist Fri May 9 22:28:58 2014 (r353531) @@ -225,3 +225,4 @@ %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%TT_FONTSDIR%% +@dirrmtry %%T1_FONTSDIR%%