From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 03:36:24 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 B6B4F81C; Fri, 27 Jun 2014 03:36:24 +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 A2C5C28F7; Fri, 27 Jun 2014 03:36:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5R3aOTj003863; Fri, 27 Jun 2014 03:36:24 GMT (envelope-from daichi@svn.freebsd.org) Received: (from daichi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5R3aNxi003859; Fri, 27 Jun 2014 03:36:23 GMT (envelope-from daichi@svn.freebsd.org) Message-Id: <201406270336.s5R3aNxi003859@svn.freebsd.org> From: Daichi GOTO Date: Fri, 27 Jun 2014 03:36:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359444 - in head/japanese/font-ricty: . 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.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, 27 Jun 2014 03:36:24 -0000 Author: daichi Date: Fri Jun 27 03:36:23 2014 New Revision: 359444 URL: http://svnweb.freebsd.org/changeset/ports/359444 QAT: https://qat.redports.org/buildarchive/r359444/ Log: - Stagify - maintainership to submitter - Update to 3.2.3 - Fix the build when DISCORD options is OFF - Provide ricty-discord as a separated port PR: 190967 Submitted by: Koichiro IWAO Modified: head/japanese/font-ricty/Makefile head/japanese/font-ricty/distinfo head/japanese/font-ricty/files/pkg-install.in head/japanese/font-ricty/pkg-plist Modified: head/japanese/font-ricty/Makefile ============================================================================== --- head/japanese/font-ricty/Makefile Fri Jun 27 03:34:45 2014 (r359443) +++ head/japanese/font-ricty/Makefile Fri Jun 27 03:36:23 2014 (r359444) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= ricty -PORTVERSION= 3.2.1b -PORTREVISION= 1 +PORTVERSION= 3.2.3 CATEGORIES= japanese x11-fonts PKGNAMEPREFIX= ja-font- -MAINTAINER= ports@FreeBSD.org -COMMENT= Ricty - fonts for programming +MAINTAINER?= meta+ports@vmeta.jp +COMMENT?= Ricty - fonts for programming RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig BUILD_DEPENDS= ${LOCALBASE}/${X_FONTSDIR}/OTF/Inconsolata.otf:${PORTSDIR}/x11-fonts/inconsolata-ttf \ @@ -20,7 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= yascentur GH_COMMIT= ${GH_TAGNAME} GH_PROJECT= Ricty -GH_TAGNAME= dfd3637 +GH_TAGNAME= 0fd7047 NO_PACKAGE= redistribution is not allowed PKGINSTALL= ${WRKDIR}/pkg-install @@ -29,25 +28,29 @@ SUB_FILES= pkg-install SUB_LIST= X_FONTSDIR=${PREFIX}/${X_FONTSDIR} PLIST_SUB= X_FONTSDIR=${X_FONTSDIR} \ LOCAL_FONTSDIR=${LOCAL_FONTSDIR} -PORTDOCS= README.md LOCAL_FONTSDIR= share/fonts X_FONTSDIR= lib/X11/fonts +.if !defined(PKGNAMESUFFIX) OPTIONS_DEFINE= DISCORD DOCS DISCORD_DESC= Install Ricty-Discord - OPTIONS_DEFAULT= DISCORD +PORTDOCS= README.md +.endif -NO_STAGE= yes .include +.if !defined(PKGNAMESUFFIX) +PLIST_SUB+= DISCORD="@comment " RICTY="" +SUB_LIST+= DISCORD=\# RICTY="" +.elif ${PKGNAMESUFFIX:S,-,,} == "discord" +PLIST_SUB+= DISCORD="" RICTY="@comment " +SUB_LIST+= DISCORD="" RICTY=\# +.endif + .if ${PORT_OPTIONS:MDISCORD} -PLIST_SUB+= DISCORD="" -SUB_LIST+= DISCORD="" -.else -PLIST_SUB+= DISCORD="@comment " -SUB_LIST+= DISCORD="#" +RUN_DEPENDS+= ${DATADIR}/RictyDiscord-Regular.ttf:${PORTSDIR}/japanese/font-ricty-discord .endif do-build: @@ -58,42 +61,45 @@ do-build: ${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-bold.ttf do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/Ricty-*.ttf ${DATADIR} -.if ${PORT_OPTIONS:MDISCORD} - ${INSTALL_DATA} ${WRKSRC}/RictyDiscord-*.ttf ${DATADIR} -.endif - ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/*.ttf \ - ${PREFIX}/${LOCAL_FONTSDIR}/TTF/ - ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF - ${LN} -s -f \ - ${DATADIR}/*.ttf \ - ${PREFIX}/${X_FONTSDIR}/TTF/ - ${INSTALL_DATA} ${FILESDIR}/20-unhint-ricty.conf \ - ${FILESDIR}/62-fonts-ricty.conf \ - ${PREFIX}/etc/fonts/conf.avail - ${LN} -s -f ../conf.avail/20-unhint-ricty.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-ricty.conf - ${LN} -s -f ../conf.avail/62-fonts-ricty.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-ricty.conf -.if ${PORT_OPTIONS:MDISCORD} - ${INSTALL_DATA} ${FILESDIR}/20-unhint-rictydiscord.conf \ - ${FILESDIR}/62-fonts-rictydiscord.conf \ - ${PREFIX}/etc/fonts/conf.avail - ${LN} -s -f ../conf.avail/20-unhint-rictydiscord.conf \ - ${PREFIX}/etc/fonts/conf.d/20-unhint-rictydiscord.conf - ${LN} -s -f ../conf.avail/62-fonts-rictydiscord.conf \ - ${PREFIX}/etc/fonts/conf.d/62-fonts-rictydiscord.conf + ${MKDIR} ${STAGEDIR}${DATADIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF + ${MKDIR} ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d +.if !defined(PKGNAMESUFFIX) + ${INSTALL_DATA} ${WRKSRC}/Ricty-*.ttf ${STAGEDIR}${DATADIR} + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Ricty-*.ttf . + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/Ricty-*.ttf . + ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \ + ${FILESDIR}/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail + ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf + ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf +.elif ${PKGNAMESUFFIX:S,-,,} == "discord" + ${INSTALL_DATA} ${WRKSRC}/RictyDiscord-*.ttf ${STAGEDIR}${DATADIR} + cd ${STAGEDIR}${PREFIX}/${LOCAL_FONTSDIR}/TTF && ${LN} -s -f \ + ../${LOCAL_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/RictyDiscord-*.ttf . + cd ${STAGEDIR}${PREFIX}/${X_FONTSDIR}/TTF && ${LN} -s -f \ + ../${X_FONTSDIR:C,[^/]+,..,g}/${DATADIR_REL}/RictyDiscord-*.ttf . + ${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}discord.conf \ + ${FILESDIR}/62-fonts-${PORTNAME}discord.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail + ${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}discord.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}discord.conf + ${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}discord.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}discord.conf .endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} && defined(PORTDOCS) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif post-install: ${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Modified: head/japanese/font-ricty/distinfo ============================================================================== --- head/japanese/font-ricty/distinfo Fri Jun 27 03:34:45 2014 (r359443) +++ head/japanese/font-ricty/distinfo Fri Jun 27 03:36:23 2014 (r359444) @@ -1,2 +1,2 @@ -SHA256 (ricty-3.2.1b.tar.gz) = b31ba25e53af2f2aff2030e96521c31b2a59f5c9ae1387a8875767bb3d4eef0a -SIZE (ricty-3.2.1b.tar.gz) = 13763 +SHA256 (ricty-3.2.3.tar.gz) = cd51e941c59a13a5b42302e5b135db7fead06ddf69ca700453bf16a4eeadb95d +SIZE (ricty-3.2.3.tar.gz) = 14708 Modified: head/japanese/font-ricty/files/pkg-install.in ============================================================================== --- head/japanese/font-ricty/files/pkg-install.in Fri Jun 27 03:34:45 2014 (r359443) +++ head/japanese/font-ricty/files/pkg-install.in Fri Jun 27 03:36:23 2014 (r359444) @@ -70,8 +70,8 @@ addentries () { for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0 do - make_xlfd $ENC Ricty-Regular.ttf ipa "Ricty" p medium - make_xlfd $ENC Ricty-Bold.ttf ipa "Ricty" p bold + %%RICTY%%make_xlfd $ENC Ricty-Regular.ttf ipa "Ricty" p medium + %%RICTY%%make_xlfd $ENC Ricty-Bold.ttf ipa "Ricty" p bold %%DISCORD%%make_xlfd $ENC RictyDiscord-Regular.ttf ipa "Ricty Discord" p medium %%DISCORD%%make_xlfd $ENC RictyDiscord-Bold.ttf ipa "Ricty Discord" p bold Modified: head/japanese/font-ricty/pkg-plist ============================================================================== --- head/japanese/font-ricty/pkg-plist Fri Jun 27 03:34:45 2014 (r359443) +++ head/japanese/font-ricty/pkg-plist Fri Jun 27 03:36:23 2014 (r359444) @@ -1,24 +1,24 @@ -%%DATADIR%%/Ricty-Bold.ttf -%%DATADIR%%/Ricty-Regular.ttf +%%RICTY%%%%DATADIR%%/Ricty-Bold.ttf +%%RICTY%%%%DATADIR%%/Ricty-Regular.ttf %%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf %%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf @dirrm %%DATADIR%% -%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf -%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf +%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf +%%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf %%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf %%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf @dirrmtry %%LOCAL_FONTSDIR%%/TTF @dirrmtry %%LOCAL_FONTSDIR%% -etc/fonts/conf.avail/20-unhint-ricty.conf -etc/fonts/conf.avail/62-fonts-ricty.conf -etc/fonts/conf.d/20-unhint-ricty.conf -etc/fonts/conf.d/62-fonts-ricty.conf +%%RICTY%%etc/fonts/conf.avail/20-unhint-ricty.conf +%%RICTY%%etc/fonts/conf.avail/62-fonts-ricty.conf +%%RICTY%%etc/fonts/conf.d/20-unhint-ricty.conf +%%RICTY%%etc/fonts/conf.d/62-fonts-ricty.conf %%DISCORD%%etc/fonts/conf.avail/20-unhint-rictydiscord.conf %%DISCORD%%etc/fonts/conf.avail/62-fonts-rictydiscord.conf %%DISCORD%%etc/fonts/conf.d/20-unhint-rictydiscord.conf %%DISCORD%%etc/fonts/conf.d/62-fonts-rictydiscord.conf -%%X_FONTSDIR%%/TTF/Ricty-Bold.ttf -%%X_FONTSDIR%%/TTF/Ricty-Regular.ttf +%%RICTY%%%%X_FONTSDIR%%/TTF/Ricty-Bold.ttf +%%RICTY%%%%X_FONTSDIR%%/TTF/Ricty-Regular.ttf %%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf %%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf @exec %%LOCALBASE%%/bin/fc-cache -s -f -v %D/%%X_FONTSDIR%%/TTF || true