From owner-svn-ports-head@FreeBSD.ORG Fri Jul 18 18:41:54 2014 Return-Path: Delivered-To: svn-ports-head@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 83A0CC33; Fri, 18 Jul 2014 18:41:54 +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 700BF2284; Fri, 18 Jul 2014 18:41:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6IIfslm019054; Fri, 18 Jul 2014 18:41:54 GMT (envelope-from leeym@svn.freebsd.org) Received: (from leeym@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6IIfr9x019051; Fri, 18 Jul 2014 18:41:53 GMT (envelope-from leeym@svn.freebsd.org) Message-Id: <201407181841.s6IIfr9x019051@svn.freebsd.org> From: Yen-Ming Lee Date: Fri, 18 Jul 2014 18:41:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362223 - in head/chinese: fireflyttf opendesktop-fonts ttfm 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.18 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: Fri, 18 Jul 2014 18:41:54 -0000 Author: leeym Date: Fri Jul 18 18:41:53 2014 New Revision: 362223 URL: http://svnweb.freebsd.org/changeset/ports/362223 QAT: https://qat.redports.org/buildarchive/r362223/ Log: - disable X11 by default - remove local.conf which is obsoleted - properly stage Deleted: head/chinese/fireflyttf/pkg-plist head/chinese/opendesktop-fonts/pkg-plist Modified: head/chinese/fireflyttf/Makefile head/chinese/opendesktop-fonts/Makefile head/chinese/ttfm/Makefile.ttf Modified: head/chinese/fireflyttf/Makefile ============================================================================== --- head/chinese/fireflyttf/Makefile Fri Jul 18 18:34:17 2014 (r362222) +++ head/chinese/fireflyttf/Makefile Fri Jul 18 18:41:53 2014 (r362223) @@ -16,13 +16,17 @@ CONFLICTS= zh-opendesktop-fonts-* NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME} -OPTIONS_DEFINE= LGJ_FONT X11 -OPTIONS_DEFAULT= LGJ_FONT X11 -LGJ_FONT_DESC= Patch for Taiwan horn TTF= fireflysung.ttf +PLIST_FILES= ${FONTSDIR_REL}/local.conf-sung + +OPTIONS_DEFAULT+=LGJ_FONT .include +.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" + +OPTIONS_DEFINE+=LGJ_FONT +LGJ_FONT_DESC= Patch for Taiwan horn .if ${PORT_OPTIONS:MLGJ_FONT} PKGNAMESUFFIX+= -LGJ @@ -30,12 +34,6 @@ MASTER_SITES= http://edt1023.sayya.org/f DISTNAME= fireflysung-1.3.0p1 .endif -.if ${PORT_OPTIONS:MX11} -PLIST_SUB+= X11="" -.else -PLIST_SUB+= X11="@comment " -.endif - post-extract: .if ${PORT_OPTIONS:MLGJ_FONT} @${TAR} -C ${WRKSRC} -zxf ${DISTDIR}/fireflysung-1.3.0p1.tar.gz \ @@ -47,12 +45,8 @@ post-extract: .endif do-install: - ${MKDIR} ${STAGEDIR}${FONTSDIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/${TTF} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${STAGEDIR}${FONTSDIR} -.if ${PORT_OPTIONS:MX11} - ${INSTALL_DATA} ${FILESDIR}/local.conf-sung ${LOCALBASE}/etc/fonts/local.conf -.endif -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" .include Modified: head/chinese/opendesktop-fonts/Makefile ============================================================================== --- head/chinese/opendesktop-fonts/Makefile Fri Jul 18 18:34:17 2014 (r362222) +++ head/chinese/opendesktop-fonts/Makefile Fri Jul 18 18:41:53 2014 (r362223) @@ -16,14 +16,10 @@ DIST_SUBDIR= OpenFonts NO_BUILD= yes TTF= odokai-ExtB.ttf odokai.ttf odosung-ExtB.ttf odosung.ttc +PLIST_FILES= ${FONTSDIR_REL}/local.conf-odo .include - -.if !defined(WITHOUT_X11) -PLIST_SUB+= X11="" -.else -PLIST_SUB+= X11="@comment " -.endif +.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" post-extract: @${CHMOD} 0755 ${WRKSRC}/license @@ -35,15 +31,10 @@ post-patch: @${FIND} ${WRKSRC} -name "*.bak" -delete do-install: - ${MKDIR} ${STAGEDIR}${FONTSDIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} .for i in ${TTF} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${FONTSDIR} .endfor ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${FONTSDIR} -.if !defined(WITHOUT_X11) - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts - ${INSTALL_DATA} ${FILESDIR}/local.conf-odo ${STAGEDIR}${PREFIX}/etc/fonts/local.conf -.endif -.include "${PORTSDIR}/chinese/ttfm/Makefile.ttf" .include Modified: head/chinese/ttfm/Makefile.ttf ============================================================================== --- head/chinese/ttfm/Makefile.ttf Fri Jul 18 18:34:17 2014 (r362222) +++ head/chinese/ttfm/Makefile.ttf Fri Jul 18 18:41:53 2014 (r362223) @@ -8,8 +8,7 @@ # TTF - Name(s) of font file(s) installed in FONTSDIR. Mandatory. # -OPTIONS_DEFINE+= GHOSTSCRIPT X11 -OPTIONS_DEFAULT+= X11 +OPTIONS_DEFINE+=GHOSTSCRIPT X11 .include @@ -42,8 +41,8 @@ check-makefile-ttf: .else @${ECHO_CMD} "" @${ECHO_CMD} "You may use the following options:" - @${ECHO_CMD} " ${OPTIONS_NAME}_SET=GHOSTSCRIPT - if you want Ghostscript support" - @${ECHO_CMD} " ${OPTIONS_NAME}_UNSET=X11 - if you DON'T want X Window support" + @${ECHO_CMD} " ${OPTIONS_NAME}_SET+=GHOSTSCRIPT - if you want Ghostscript support" + @${ECHO_CMD} " ${OPTIONS_NAME}_SET+=X11 - if you want X Window support" @${ECHO_CMD} "" .endif .if !defined(TTF)