From owner-svn-ports-all@FreeBSD.ORG Sun Jul 20 09:02:15 2014 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 ESMTPS id E153E6FB; Sun, 20 Jul 2014 09:02:15 +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 CCB7D215E; Sun, 20 Jul 2014 09:02:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6K92FBr027512; Sun, 20 Jul 2014 09:02:15 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6K92ELr027502; Sun, 20 Jul 2014 09:02:14 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407200902.s6K92ELr027502@svn.freebsd.org> From: John Marino Date: Sun, 20 Jul 2014 09:02:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362305 - in head/chinese: CJKUnifonts CNS11643-font arphicttf cwtexttf fireflyttf opendesktop-fonts 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: Sun, 20 Jul 2014 09:02:16 -0000 Author: marino Date: Sun Jul 20 09:02:14 2014 New Revision: 362305 URL: http://svnweb.freebsd.org/changeset/ports/362305 QAT: https://qat.redports.org/buildarchive/r362305/ Log: Convert 6 chinese font ponts to include with .CURDIR These ports were including chinese/ttfm/Makefile.ttf using an absolute path using PORTSDIR instead of a relative one using .CURDIR. In specific use cases, PORTSDIR will fail but .CURDIR always works. As a bonus, this allows 
 &  inclusions to be removed as well.
  Covered by an old blanket permission (bapt) but only two of these ports
  have maintainers anyway.

Modified:
  head/chinese/CJKUnifonts/Makefile
  head/chinese/CNS11643-font/Makefile
  head/chinese/arphicttf/Makefile
  head/chinese/cwtexttf/Makefile
  head/chinese/fireflyttf/Makefile
  head/chinese/opendesktop-fonts/Makefile

Modified: head/chinese/CJKUnifonts/Makefile
==============================================================================
--- head/chinese/CJKUnifonts/Makefile	Sun Jul 20 08:15:16 2014	(r362304)
+++ head/chinese/CJKUnifonts/Makefile	Sun Jul 20 09:02:14 2014	(r362305)
@@ -26,6 +26,5 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/ukai.ttc ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKDIR}/uming.ttc ${STAGEDIR}${FONTSDIR}
 
-.include 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
-.include 
+.include "${.CURDIR}/../ttfm/Makefile.ttf"
+.include 

Modified: head/chinese/CNS11643-font/Makefile
==============================================================================
--- head/chinese/CNS11643-font/Makefile	Sun Jul 20 08:15:16 2014	(r362304)
+++ head/chinese/CNS11643-font/Makefile	Sun Jul 20 09:02:14 2014	(r362305)
@@ -35,6 +35,5 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} "*******************************************************************************"
 
-.include 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
-.include 
+.include "${.CURDIR}/../ttfm/Makefile.ttf"
+.include 

Modified: head/chinese/arphicttf/Makefile
==============================================================================
--- head/chinese/arphicttf/Makefile	Sun Jul 20 08:15:16 2014	(r362304)
+++ head/chinese/arphicttf/Makefile	Sun Jul 20 09:02:14 2014	(r362305)
@@ -25,6 +25,5 @@ do-install:
 	${CP} -fr ${WRKSRC}/license ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/logo.gif ${WRKSRC}/release.txt ${STAGEDIR}${DATADIR}
 
-.include 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
-.include 
+.include "${.CURDIR}/../ttfm/Makefile.ttf"
+.include 

Modified: head/chinese/cwtexttf/Makefile
==============================================================================
--- head/chinese/cwtexttf/Makefile	Sun Jul 20 08:15:16 2014	(r362304)
+++ head/chinese/cwtexttf/Makefile	Sun Jul 20 09:02:14 2014	(r362305)
@@ -24,6 +24,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FONTSDIR}
 .endfor
 
-.include 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
-.include 
+.include "${.CURDIR}/../ttfm/Makefile.ttf"
+.include 

Modified: head/chinese/fireflyttf/Makefile
==============================================================================
--- head/chinese/fireflyttf/Makefile	Sun Jul 20 08:15:16 2014	(r362304)
+++ head/chinese/fireflyttf/Makefile	Sun Jul 20 09:02:14 2014	(r362305)
@@ -22,8 +22,7 @@ PLIST_FILES=	${FONTSDIR_REL}/local.conf-
 
 OPTIONS_DEFAULT+=LGJ_FONT
 
-.include 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
+.include "${.CURDIR}/../ttfm/Makefile.ttf"
 
 OPTIONS_DEFINE+=LGJ_FONT
 LGJ_FONT_DESC=	Patch for Taiwan horn
@@ -49,4 +48,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${TTF} ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${STAGEDIR}${FONTSDIR}
 
-.include 
+.include 

Modified: head/chinese/opendesktop-fonts/Makefile
==============================================================================
--- head/chinese/opendesktop-fonts/Makefile	Sun Jul 20 08:15:16 2014	(r362304)
+++ head/chinese/opendesktop-fonts/Makefile	Sun Jul 20 09:02:14 2014	(r362305)
@@ -18,8 +18,7 @@ NO_BUILD=	yes
 TTF=		odokai-ExtB.ttf odokai.ttf odosung-ExtB.ttf odosung.ttc
 PLIST_FILES=	${FONTSDIR_REL}/local.conf-odo
 
-.include 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
+.include "${.CURDIR}/../ttfm/Makefile.ttf"
 
 post-extract:
 	@${CHMOD} 0755 ${WRKSRC}/license
@@ -37,4 +36,4 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${FONTSDIR}
 
-.include 
+.include