From owner-svn-ports-all@FreeBSD.ORG Thu Jun 27 18:31:08 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CDCF583B; Thu, 27 Jun 2013 18:31:08 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AFD09185E; Thu, 27 Jun 2013 18:31:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RIV8Iq035764; Thu, 27 Jun 2013 18:31:08 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5RIV7fN035753; Thu, 27 Jun 2013 18:31:07 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201306271831.r5RIV7fN035753@svn.freebsd.org> From: Antoine Brodin Date: Thu, 27 Jun 2013 18:31:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321898 - in head: japanese/font-ricty japanese/font-ricty/files japanese/monafonts-ttf x11-fonts/cyberbit-ttfonts 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, 27 Jun 2013 18:31:08 -0000 Author: antoine Date: Thu Jun 27 18:31:06 2013 New Revision: 321898 URL: http://svnweb.freebsd.org/changeset/ports/321898 Log: Fix some fonts.dir leftovers reported by poudriere While here, trim Makefile header and finish PORT_OPTIONS conversion Approved by: portmgr (miwi) Modified: head/japanese/font-ricty/Makefile head/japanese/font-ricty/files/pkg-install.in head/japanese/monafonts-ttf/Makefile head/japanese/monafonts-ttf/pkg-deinstall head/japanese/monafonts-ttf/pkg-plist head/x11-fonts/cyberbit-ttfonts/Makefile head/x11-fonts/cyberbit-ttfonts/pkg-deinstall head/x11-fonts/cyberbit-ttfonts/pkg-plist Modified: head/japanese/font-ricty/Makefile ============================================================================== --- head/japanese/font-ricty/Makefile Thu Jun 27 16:12:44 2013 (r321897) +++ head/japanese/font-ricty/Makefile Thu Jun 27 18:31:06 2013 (r321898) @@ -1,12 +1,9 @@ -# New ports collection makefile for: font-ricty -# Date created: 24 April 2012 -# Whom: masaki -# +# Created by: masaki # $FreeBSD$ -# PORTNAME= ricty PORTVERSION= 3.2.1b +PORTREVISION= 1 CATEGORIES= japanese x11-fonts PKGNAMEPREFIX= ja-font- @@ -37,7 +34,7 @@ PORTDOCS= README.md LOCAL_FONTSDIR= share/fonts X_FONTSDIR= lib/X11/fonts -OPTIONS_DEFINE= DISCORD +OPTIONS_DEFINE= DISCORD DOCS DISCORD_DESC= Install Ricty-Discord OPTIONS_DEFAULT= DISCORD @@ -62,7 +59,7 @@ do-build: do-install: ${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/Ricty-*.ttf ${DATADIR} -.if defined(WITH_DISCORD) +.if ${PORT_OPTIONS:MDISCORD} ${INSTALL_DATA} ${WRKSRC}/RictyDiscord-*.ttf ${DATADIR} .endif ${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF @@ -80,7 +77,7 @@ do-install: ${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 defined(WITH_DISCORD) +.if ${PORT_OPTIONS:MDISCORD} ${INSTALL_DATA} ${FILESDIR}/20-unhint-rictydiscord.conf \ ${FILESDIR}/62-fonts-rictydiscord.conf \ ${PREFIX}/etc/fonts/conf.avail @@ -89,7 +86,7 @@ do-install: ${LN} -s -f ../conf.avail/62-fonts-rictydiscord.conf \ ${PREFIX}/etc/fonts/conf.d/62-fonts-rictydiscord.conf .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif Modified: head/japanese/font-ricty/files/pkg-install.in ============================================================================== --- head/japanese/font-ricty/files/pkg-install.in Thu Jun 27 16:12:44 2013 (r321897) +++ head/japanese/font-ricty/files/pkg-install.in Thu Jun 27 18:31:06 2013 (r321898) @@ -87,14 +87,14 @@ case "$2" in POST-INSTALL) cd ${X_FONTSDIR} touch fonts.dir - (catfontsdir < fonts.dir; addentries) > fonts.dir.tmp + (sed 1d fonts.dir | catfontsdir; addentries) > fonts.dir.tmp nfonts < fonts.dir.tmp > fonts.dir cat fonts.dir.tmp >> fonts.dir rm -f fonts.dir.tmp ;; POST-DEINSTALL) cd ${X_FONTSDIR} - catfontsdir < fonts.dir > fonts.dir.tmp + sed 1d fonts.dir | catfontsdir > fonts.dir.tmp nfonts < fonts.dir.tmp > fonts.dir cat fonts.dir.tmp >> fonts.dir rm -f fonts.dir.tmp Modified: head/japanese/monafonts-ttf/Makefile ============================================================================== --- head/japanese/monafonts-ttf/Makefile Thu Jun 27 16:12:44 2013 (r321897) +++ head/japanese/monafonts-ttf/Makefile Thu Jun 27 18:31:06 2013 (r321898) @@ -1,13 +1,9 @@ -# New ports collection makefile for: Mona TrueType fonts -# Date created: 14 October 2003 -# Whom: MANTANI Nobutaka -# +# Created by: MANTANI Nobutaka # $FreeBSD$ -# PORTNAME= monafonts-ttf PORTVERSION= 2.90 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese x11-fonts MASTER_SITES= SF/monafont/monafont/monafont-${PORTVERSION} DISTNAME= monafont-ttf-${PORTVERSION} Modified: head/japanese/monafonts-ttf/pkg-deinstall ============================================================================== --- head/japanese/monafonts-ttf/pkg-deinstall Thu Jun 27 16:12:44 2013 (r321897) +++ head/japanese/monafonts-ttf/pkg-deinstall Thu Jun 27 18:31:06 2013 (r321898) @@ -6,6 +6,10 @@ FONTDIR=${PKG_PREFIX}/lib/X11/fonts/True cd ${FONTDIR} sed -e '/-mona-/d' fonts.dir > fonts.dir.tmp numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc) +if [ ${numfonts} != "0" ]; then echo ${numfonts} > fonts.dir sed -e 1d fonts.dir.tmp >> fonts.dir rm -f fonts.dir.tmp +else +rm -f fonts.dir fonts.dir.tmp +fi Modified: head/japanese/monafonts-ttf/pkg-plist ============================================================================== --- head/japanese/monafonts-ttf/pkg-plist Thu Jun 27 16:12:44 2013 (r321897) +++ head/japanese/monafonts-ttf/pkg-plist Thu Jun 27 18:31:06 2013 (r321898) @@ -1,2 +1,3 @@ %%FONTSDIR%%/fonts.dir.mona %%FONTSDIR%%/mona.ttf +@dirrmtry %%FONTSDIR%% Modified: head/x11-fonts/cyberbit-ttfonts/Makefile ============================================================================== --- head/x11-fonts/cyberbit-ttfonts/Makefile Thu Jun 27 16:12:44 2013 (r321897) +++ head/x11-fonts/cyberbit-ttfonts/Makefile Thu Jun 27 18:31:06 2013 (r321898) @@ -9,10 +9,6 @@ MASTER_SITES= http://ftp.netscape.com/pu http://aol-4.vo.llnwd.net/pub/communicator/extras/fonts/windows/ \ ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/ DISTFILES= Cyberbit.ZIP -.if !defined(NOPORTDOCS) -DISTFILES+= 97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \ - CYBERBIT.DOC CYBERCJK.DOC READMEfirst.txt ReadMe.htm -.endif DIST_SUBDIR= cyberbit EXTRACT_ONLY= Cyberbit.ZIP @@ -29,6 +25,15 @@ MAKE_ENV= FONTSDIR=${FONTSDIR} PLIST_SUB= FONTSDIR=${FONTSDIR} WRKSRC= ${WRKDIR} +OPTIONS_DEFINE= DOCS + +.include + +.if ${PORT_OPTIONS:MDOCS} +DISTFILES+= 97CyberBase.Doc 97CyberBit.Doc 97CyberCJK.Doc \ + CYBERBIT.DOC CYBERCJK.DOC READMEfirst.txt ReadMe.htm +.endif + do-install: .if !exists(${PREFIX}/${FONTSDIR}) @${ECHO} "*********************************************************" @@ -40,7 +45,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/*.ttf \ ${FILESDIR}/fonts.dir.cyberbit \ ${PREFIX}/${FONTSDIR} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/97CyberBase.Doc ${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/97CyberBit.Doc ${DOCSDIR} Modified: head/x11-fonts/cyberbit-ttfonts/pkg-deinstall ============================================================================== --- head/x11-fonts/cyberbit-ttfonts/pkg-deinstall Thu Jun 27 16:12:44 2013 (r321897) +++ head/x11-fonts/cyberbit-ttfonts/pkg-deinstall Thu Jun 27 18:31:06 2013 (r321898) @@ -7,6 +7,10 @@ FONTDIR=${PKG_PREFIX}/lib/X11/fonts/True cd ${FONTDIR} sed -e "/${XFLDNAME}/d" fonts.dir > fonts.dir.tmp numfonts=$(echo $(cat fonts.dir.tmp | wc -l) - 1 | bc) +if [ ${numfonts} != "0" ]; then echo ${numfonts} > fonts.dir sed -e 1d fonts.dir.tmp >> fonts.dir rm -f fonts.dir.tmp +else +rm -f fonts.dir fonts.dir.tmp +fi Modified: head/x11-fonts/cyberbit-ttfonts/pkg-plist ============================================================================== --- head/x11-fonts/cyberbit-ttfonts/pkg-plist Thu Jun 27 16:12:44 2013 (r321897) +++ head/x11-fonts/cyberbit-ttfonts/pkg-plist Thu Jun 27 18:31:06 2013 (r321898) @@ -1,5 +1,6 @@ %%FONTSDIR%%/fonts.dir.cyberbit %%FONTSDIR%%/Cyberbit.ttf +@dirrmtry %%FONTSDIR%% %%PORTDOCS%%%%DOCSDIR%%/97CyberBase.Doc %%PORTDOCS%%%%DOCSDIR%%/97CyberBit.Doc %%PORTDOCS%%%%DOCSDIR%%/97CyberCJK.Doc