From owner-svn-ports-all@FreeBSD.ORG Sat Jul 19 08:47: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 1D99E8A1; Sat, 19 Jul 2014 08:47: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 0A4B126C2; Sat, 19 Jul 2014 08:47: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 s6J8lwg6019144; Sat, 19 Jul 2014 08:47:58 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6J8lwc8019143; Sat, 19 Jul 2014 08:47:58 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407190847.s6J8lwc8019143@svn.freebsd.org> From: John Marino Date: Sat, 19 Jul 2014 08:47:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362239 - head/chinese/moettf 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: Sat, 19 Jul 2014 08:47:59 -0000 Author: marino Date: Sat Jul 19 08:47:58 2014 New Revision: 362239 URL: http://svnweb.freebsd.org/changeset/ports/362239 QAT: https://qat.redports.org/buildarchive/r362239/ Log: chinese/moettf: Unbreak, stage, restore public distfiles This port was in bad shape! 1) It had a MASTER_SITES definition pointing to a FreeBSD mirror. This was a circular dependency that broke when the "real" master site domain disappeared. Fix this by hosting at LOCAL/MARINO 2) The kai-pc ttf font was never installed (always broken) 3) It broke (more) with recent chinese font work 4) It included makefile.tty by absolute ${PORTDIR} instead of correct ${.CURDIR}, which also unnecessarily required 
, 
  
  5) It wasn't staged
  
  So fix all that. Also improve efficiency of staging by copying directly
  from distfiles to stage directory instead of first copying to WRKSRC then
  STAGEDIR.  The post-install target is no longer needed, nor is the
  pkg-plist file.

Deleted:
  head/chinese/moettf/pkg-plist
Modified:
  head/chinese/moettf/Makefile

Modified: head/chinese/moettf/Makefile
==============================================================================
--- head/chinese/moettf/Makefile	Sat Jul 19 04:22:37 2014	(r362238)
+++ head/chinese/moettf/Makefile	Sat Jul 19 08:47:58 2014	(r362239)
@@ -3,56 +3,47 @@
 
 PORTNAME=	moettf
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	chinese x11-fonts
-MASTER_SITES=	http://ftp.riken.go.jp/pub/FreeBSD/distfiles/zh-moettf/ \
-		http://ftp.math.uni-bielefeld.de/pub/unix/FreeBSD/distfiles/zh-moettf/
-DISTFILES=	moe_kai.ttf moe_sung.ttf edustds1.exe edustds2.exe \
-		edustd-15.exe kai-pc.ttf
+MASTER_SITES=	LOCAL/MARINO
+DISTFILES=	edustds1.exe edustds2.exe edustd-15.exe \
+		kai-pc.ttf moe_kai.ttf moe_sung.ttf
+DIST_SUBDIR=	zh-moettf
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Three Chinese BIG5 TrueType fonts: Kai LiShu Sung SungExt
 
-EXTRACT_DEPENDS=unrar:${PORTSDIR}/archivers/unrar
-
-DIST_SUBDIR=	zh-moettf
+EXTRACT_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
 
-NO_CDROM=	Contact Taiwan's Ministry of Education for commercial use
+NO_CDROM=	Contact Ministry of Education of Taiwan for commercial use
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 TTF_DEFAULT=	moe_sung.ttf
 TTF_DEFAULTKAI=	moe_kai.ttf
-TTF=		moe_lishu.ttf moe_kai.ttf moe_sung.ttf moe_sungext.ttf moe_sungsym.ttf
+EXE_TTF=	moe_lishu.ttf moe_sungext.ttf moe_sungsym.ttf
+REG_TTF=	kai-pc.ttf moe_kai.ttf moe_sung.ttf
+TTF=		${EXE_TTF} ${REG_TTF}
 
-NO_STAGE=	yes
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustd-15.exe ${WRKSRC}
-	@${MV} ${WRKSRC}/Edustd-15.TTF ${WRKSRC}/moe_lishu.ttf
 	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustds1.exe ${WRKSRC}
-	@${MV} ${WRKSRC}/edustds1.ttf ${WRKSRC}/moe_sungext.ttf
 	@unrar x ${DISTDIR}/${DIST_SUBDIR}/edustds2.exe ${WRKSRC}
-	@${MV} ${WRKSRC}/edustds2.ttf ${WRKSRC}/moe_sungsym.ttf
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/moe_kai.ttf ${WRKSRC}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/moe_sung.ttf ${WRKSRC}
+	@(cd ${WRKSRC}; \
+		${MV} Edustd-15.TTF moe_lishu.ttf ; \
+		${MV} edustds1.ttf moe_sungext.ttf ; \
+		${MV} edustds2.ttf moe_sungsym.ttf )
 
 do-install:
-	@${MKDIR} ${FONTSDIR}
-.for ttf in ${TTF}
-	${INSTALL_DATA} ${WRKSRC}/${ttf} ${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+.for ttf in ${EXE_TTF}
+	${INSTALL_DATA} ${WRKSRC}/${ttf} ${STAGEDIR}${FONTSDIR}/${ttf}
 .endfor
-
-post-install:
-.if !defined(WITHOUT_X11)
-.for f in fonts.dir fonts.alias
-	${SED} -e "s/ t w m o e _ k a i/twmoe_kai/g" \
-		-e "s/ ° ê ¦ r ¼ Ð · Ç § º Å é/twmoe_sung/g" \
-		${XFONTSDIR}/${f} > ${XFONTSDIR}/${f}.$$ && \
-		${MV} ${XFONTSDIR}/${f}.$$ ${XFONTSDIR}/${f}
+.for ttf in ${REG_TTF}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${ttf} \
+		${STAGEDIR}${FONTSDIR}/${ttf}
 .endfor
-.endif
 
-.include 
-.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf"
-.include 
+.include "${.CURDIR}/../ttfm/Makefile.ttf"
+.include