Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Dec 2011 21:21:50 +0700
From:      Jan Beich <jbeich@tormail.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/163338: [patch] japanese/font-mplus-ipa: install only fonts
Message-ID:  <1RbYgf-000He5-5c@internal.tormail.net>
Resent-Message-ID: <201112161430.pBGEUBrm094745@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         163338
>Category:       ports
>Synopsis:       [patch] japanese/font-mplus-ipa: install only fonts
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 16 14:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jan Beich
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- garbage collect non-font files (also fixes plist on 10.0)
- remove CHOWN line, prefer INSTALL_DATA
- move fonts from DATADIR/fonts to DATADIR
>How-To-Repeat:
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.10.20111207031942/ja-font-mplus-ipa-1.0.20060520.p1_1.log
>Fix:
--- gc.diff begins here ---
Index: japanese/font-mplus-ipa/Makefile
===================================================================
RCS file: /a/.csup/ports/japanese/font-mplus-ipa/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- japanese/font-mplus-ipa/Makefile	30 Sep 2010 19:40:16 -0000	1.21
+++ japanese/font-mplus-ipa/Makefile	16 Dec 2011 13:49:07 -0000
@@ -36,14 +36,13 @@ X_FONTSDIR=	lib/X11/fonts
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
-	${CP} -R ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/* \
+	${INSTALL_DATA} ${WRKSRC}/opfc-ModuleHP-1.1.1_withIPAFonts_and_Mplus/fonts/*.ttf \
 		${DATADIR}
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
-	${LN} -s -f ${DATADIR}/fonts/M+*.ttf \
+	${LN} -s -f ${DATADIR}/M+*.ttf \
 		${PREFIX}/${LOCAL_FONTSDIR}/TTF/
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
-	${LN} -s -f ${DATADIR}/fonts/M+*.ttf \
+	${LN} -s -f ${DATADIR}/M+*.ttf \
 			${PREFIX}/${X_FONTSDIR}/TTF/
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus-ipa.conf \
 		${FILESDIR}/62-fonts-mplus-ipa.conf \
Index: japanese/font-mplus-ipa/pkg-plist
===================================================================
RCS file: /a/.csup/ports/japanese/font-mplus-ipa/pkg-plist,v
retrieving revision 1.14
diff -u -p -r1.14 pkg-plist
--- japanese/font-mplus-ipa/pkg-plist	30 Sep 2010 19:40:16 -0000	1.14
+++ japanese/font-mplus-ipa/pkg-plist	16 Dec 2011 13:49:52 -0000
@@ -1,72 +1,15 @@
 @comment $FreeBSD: ports/japanese/font-mplus-ipa/pkg-plist,v 1.14 2010/09/30 19:40:16 hrs Exp $
-%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_5500.ppd
-%%DATADIR%%/ppd/OPVP-HP-Color_LaserJet_4600.ppd
-%%DATADIR%%/ppd/Makefile.in
-%%DATADIR%%/ppd/Makefile.am
-%%DATADIR%%/opvp/Makefile.in
-%%DATADIR%%/opvp/Makefile.am
-%%DATADIR%%/opvp/HPPageColor.c
-%%DATADIR%%/opfc-ModuleHP.spec
-%%DATADIR%%/mkinstalldirs
-%%DATADIR%%/missing
-%%DATADIR%%/ltmain.sh
-%%DATADIR%%/libopvp/pdapi.h
-%%DATADIR%%/libopvp/opvp_rpc_server.h
-%%DATADIR%%/libopvp/opvp_rpc_server.c
-%%DATADIR%%/libopvp/opvp_rpc_reqno.h
-%%DATADIR%%/libopvp/opvp_rpc_core.h
-%%DATADIR%%/libopvp/opvp_rpc_core.c
-%%DATADIR%%/libopvp/opvp_driver.h
-%%DATADIR%%/libopvp/opvp_common.h
-%%DATADIR%%/libopvp/doc/rpc040223.pdf
-%%DATADIR%%/libopvp/doc/Makefile.in
-%%DATADIR%%/libopvp/doc/Makefile.am
-%%DATADIR%%/libopvp/README.jp
-%%DATADIR%%/libopvp/Makefile.in
-%%DATADIR%%/libopvp/Makefile.am
-%%DATADIR%%/libopvp/COPYING
-%%DATADIR%%/install-sh
-%%DATADIR%%/fonts/ipamp.ttf
-%%DATADIR%%/fonts/ipam.ttf
-%%DATADIR%%/fonts/ipagui.ttf
-%%DATADIR%%/fonts/ipagp.ttf
-%%DATADIR%%/fonts/ipag.ttf
-%%DATADIR%%/fonts/Makefile.in
-%%DATADIR%%/fonts/Makefile.am
-%%DATADIR%%/fonts/M+2VM+IPAG-circle.ttf
-%%DATADIR%%/fonts/M+2P+IPAG.ttf
-%%DATADIR%%/fonts/M+2P+IPAG-circle.ttf
-%%DATADIR%%/fonts/M+1VM+IPAG-circle.ttf
-%%DATADIR%%/fonts/M+1P+IPAG.ttf
-%%DATADIR%%/fonts/M+1P+IPAG-circle.ttf
-%%DATADIR%%/fonts/COPYING.font.ja
-%%DATADIR%%/doc/ProjectOverview.pdf
-%%DATADIR%%/doc/Makefile.in
-%%DATADIR%%/doc/Makefile.am
-%%DATADIR%%/depcomp
-%%DATADIR%%/configure.in
-%%DATADIR%%/configure
-%%DATADIR%%/config.sub
-%%DATADIR%%/config.h.in
-%%DATADIR%%/config.guess
-%%DATADIR%%/compile
-%%DATADIR%%/aclocal.m4
-%%DATADIR%%/VERSION
-%%DATADIR%%/README.jp
-%%DATADIR%%/README
-%%DATADIR%%/NEWS
-%%DATADIR%%/Makefile.in
-%%DATADIR%%/Makefile.am
-%%DATADIR%%/INSTALL
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/COPYING
-%%DATADIR%%/AUTHORS
-@dirrm %%DATADIR%%/ppd
-@dirrm %%DATADIR%%/opvp
-@dirrm %%DATADIR%%/libopvp/doc
-@dirrm %%DATADIR%%/libopvp
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/doc
+%%DATADIR%%/ipamp.ttf
+%%DATADIR%%/ipam.ttf
+%%DATADIR%%/ipagui.ttf
+%%DATADIR%%/ipagp.ttf
+%%DATADIR%%/ipag.ttf
+%%DATADIR%%/M+2VM+IPAG-circle.ttf
+%%DATADIR%%/M+2P+IPAG.ttf
+%%DATADIR%%/M+2P+IPAG-circle.ttf
+%%DATADIR%%/M+1VM+IPAG-circle.ttf
+%%DATADIR%%/M+1P+IPAG.ttf
+%%DATADIR%%/M+1P+IPAG-circle.ttf
 @dirrm %%DATADIR%%
 %%LOCAL_FONTSDIR%%/TTF/M+2VM+IPAG-circle.ttf
 %%LOCAL_FONTSDIR%%/TTF/M+2P+IPAG.ttf
--- gc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1RbYgf-000He5-5c>