From owner-svn-ports-all@FreeBSD.ORG Thu Oct 31 23:56:01 2013 Return-Path: Delivered-To: svn-ports-all@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 ESMTP id 6BEA8E4E; Thu, 31 Oct 2013 23:56:01 +0000 (UTC) (envelope-from garga@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 40E6C2D22; Thu, 31 Oct 2013 23:56:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VNu13N020112; Thu, 31 Oct 2013 23:56:01 GMT (envelope-from garga@svn.freebsd.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VNu0fO020109; Thu, 31 Oct 2013 23:56:00 GMT (envelope-from garga@svn.freebsd.org) Message-Id: <201310312356.r9VNu0fO020109@svn.freebsd.org> From: Renato Botelho Date: Thu, 31 Oct 2013 23:56:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332332 - in head/x11-fonts/artwiz-fonts: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 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: Thu, 31 Oct 2013 23:56:01 -0000 Author: garga Date: Thu Oct 31 23:56:00 2013 New Revision: 332332 URL: http://svnweb.freebsd.org/changeset/ports/332332 Log: . Support STAGE . Simplify Makefile . Move pkg-message to files/pkg-message.in and use SUB_FILES Added: head/x11-fonts/artwiz-fonts/files/pkg-message.in (contents, props changed) - copied, changed from r332116, head/x11-fonts/artwiz-fonts/pkg-message Deleted: head/x11-fonts/artwiz-fonts/pkg-message Modified: head/x11-fonts/artwiz-fonts/Makefile (contents, props changed) Modified: head/x11-fonts/artwiz-fonts/Makefile ============================================================================== --- head/x11-fonts/artwiz-fonts/Makefile Thu Oct 31 23:55:01 2013 (r332331) +++ head/x11-fonts/artwiz-fonts/Makefile Thu Oct 31 23:56:00 2013 (r332332) @@ -20,18 +20,14 @@ WRKSRC= ${WRKDIR}/fluxbox-${PORTNAME} FONTS= anorexia aqui cure cursor drift edges gelly glisp-bold \ glisp lime mints-mild mints-strong nu snap FONTDIR= ${LOCALBASE}/lib/X11/fonts/${PORTNAME}/ -FILES= ${FONTS:S,$,.pcf.gz,} ${FILESDIR}/fonts.dir -NO_STAGE= yes -.include +SUB_FILES= pkg-message do-install: - @${MKDIR} ${FONTDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR} + @${MKDIR} ${STAGEDIR}${FONTDIR} +.for f in ${FONTS} + ${INSTALL_DATA} ${WRKSRC}/${f}.pcf.gz ${STAGEDIR}${FONTDIR} +.endfor + ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${STAGEDIR}${FONTDIR} -post-install: - @${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \ - ${PKGDIR}/pkg-message >${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} - -.include +.include Copied and modified: head/x11-fonts/artwiz-fonts/files/pkg-message.in (from r332116, head/x11-fonts/artwiz-fonts/pkg-message) ============================================================================== --- head/x11-fonts/artwiz-fonts/pkg-message Wed Oct 30 14:24:19 2013 (r332116, copy source) +++ head/x11-fonts/artwiz-fonts/files/pkg-message.in Thu Oct 31 23:56:00 2013 (r332332) @@ -6,6 +6,6 @@ Add the following line to the "Files" section and restart XFree86. - FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-fonts" + FontPath "%%LOCALBASE%%/lib/X11/fonts/artwiz-fonts" ------------------------------------------------------------------