ports/163337: [patch] japanese/font-mona-ipa: install only fonts

Fri Dec 16 14:30:16 UTC 2011

>Number:         163337
>Category:       ports
>Synopsis:       [patch] japanese/font-mona-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:10 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/CHMOD lines, prefer INSTALL_DATA/COPYTREE_SHARE
- move fonts from DATADIR/fonts to DATADIR
- move docs to DOCSDIR & respect NOPORTDOCS
>How-To-Repeat:
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.10.20111207031942/ja-font-mona-ipa-1.0.8_1.log
>Fix:

--- gc.diff begins here ---
Index: japanese/font-mona-ipa/Makefile
===================================================================
RCS file: /a/.csup/ports/japanese/font-mona-ipa/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- japanese/font-mona-ipa/Makefile	23 Aug 2011 17:34:16 -0000	1.5
+++ japanese/font-mona-ipa/Makefile	16 Dec 2011 14:00:35 -0000
@@ -31,17 +31,14 @@ X_FONTSDIR=	lib/X11/fonts
 
 do-install:
 	${MKDIR} ${DATADIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}
-	${FIND} ${WRKSRC} -type d -print0 | ${XARGS} -0 ${CHMOD} 0555
-	${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${CHMOD} 0444
-	${CP} -R ${WRKSRC}/* ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${DATADIR}
 	${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
 	${LN} -s -f \
-		${DATADIR}/fonts/ipa*-mona.ttf \
+		${DATADIR}/ipa*-mona.ttf \
 		${PREFIX}/${LOCAL_FONTSDIR}/TTF/
 	${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
 	${LN} -s -f \
-		${DATADIR}/fonts/ipa*-mona.ttf \
+		${DATADIR}/ipa*-mona.ttf \
 		${PREFIX}/${X_FONTSDIR}/TTF/
 	${INSTALL_DATA} ${FILESDIR}/20-unhint-mona-ipa.conf \
 		${FILESDIR}/62-fonts-mona-ipa.conf \
@@ -53,6 +50,7 @@ do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/fonts && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	cd ${WRKSRC}/fonts/doc && ${COPYTREE_SHARE} \* ${DOCSDIR}
 .endif
 
 post-install:
Index: japanese/font-mona-ipa/pkg-plist
===================================================================
RCS file: /a/.csup/ports/japanese/font-mona-ipa/pkg-plist,v
retrieving revision 1.2
diff -u -p -r1.2 pkg-plist
--- japanese/font-mona-ipa/pkg-plist	30 Sep 2010 19:40:16 -0000	1.2
+++ japanese/font-mona-ipa/pkg-plist	16 Dec 2011 14:01:46 -0000
@@ -1,90 +1,31 @@
 @comment $FreeBSD: ports/japanese/font-mona-ipa/pkg-plist,v 1.2 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-mona.ttf
-%%DATADIR%%/fonts/ipam-mona.ttf
-%%DATADIR%%/fonts/ipagui-mona.ttf
-%%DATADIR%%/fonts/ipagp-mona.ttf
-%%DATADIR%%/fonts/ipag-mona.ttf
-%%DATADIR%%/fonts/Makefile.in
-%%DATADIR%%/fonts/Makefile.am
-%%DATADIR%%/fonts/COPYING.font.ja
-%%DATADIR%%/fonts/doc/sazanami/doc/shinonome/LICENSE
- at dirrm %%DATADIR%%/fonts/doc/sazanami/doc/shinonome
-%%DATADIR%%/fonts/doc/sazanami/doc/oradano/README.txt
- at dirrm %%DATADIR%%/fonts/doc/sazanami/doc/oradano
-%%DATADIR%%/fonts/doc/sazanami/doc/mplus/LICENSE_J
- at dirrm %%DATADIR%%/fonts/doc/sazanami/doc/mplus
-%%DATADIR%%/fonts/doc/sazanami/doc/misaki/misakib8.txt
- at dirrm %%DATADIR%%/fonts/doc/sazanami/doc/misaki
-%%DATADIR%%/fonts/doc/sazanami/doc/kappa/README
- at dirrm %%DATADIR%%/fonts/doc/sazanami/doc/kappa
-%%DATADIR%%/fonts/doc/sazanami/doc/ayu/README.txt
- at dirrm %%DATADIR%%/fonts/doc/sazanami/doc/ayu
- at dirrm %%DATADIR%%/fonts/doc/sazanami/doc
-%%DATADIR%%/fonts/doc/sazanami/README
- at dirrm %%DATADIR%%/fonts/doc/sazanami
-%%DATADIR%%/fonts/doc/mplus/README_J
-%%DATADIR%%/fonts/doc/mplus/README_E
-%%DATADIR%%/fonts/doc/mplus/LICENSE_J
-%%DATADIR%%/fonts/doc/mplus/LICENSE_E
- at dirrm %%DATADIR%%/fonts/doc/mplus
-%%DATADIR%%/fonts/doc/mona/README.euc
- at dirrm %%DATADIR%%/fonts/doc/mona
- at dirrm %%DATADIR%%/fonts/doc
-%%DATADIR%%/fonts/README_ipamona.txt
-%%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
- at dirrm %%DATADIR%%/ppd
- at dirrm %%DATADIR%%/opvp
- at dirrm %%DATADIR%%/libopvp/doc
- at dirrm %%DATADIR%%/libopvp
- at dirrm %%DATADIR%%/fonts
- at dirrm %%DATADIR%%/doc
+%%DATADIR%%/ipamp-mona.ttf
+%%DATADIR%%/ipam-mona.ttf
+%%DATADIR%%/ipagui-mona.ttf
+%%DATADIR%%/ipagp-mona.ttf
+%%DATADIR%%/ipag-mona.ttf
+%%PORTDOCS%%%%DOCSDIR%%/sazanami/doc/shinonome/LICENSE
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sazanami/doc/shinonome
+%%PORTDOCS%%%%DOCSDIR%%/sazanami/doc/oradano/README.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sazanami/doc/oradano
+%%PORTDOCS%%%%DOCSDIR%%/sazanami/doc/mplus/LICENSE_J
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sazanami/doc/mplus
+%%PORTDOCS%%%%DOCSDIR%%/sazanami/doc/misaki/misakib8.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sazanami/doc/misaki
+%%PORTDOCS%%%%DOCSDIR%%/sazanami/doc/kappa/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sazanami/doc/kappa
+%%PORTDOCS%%%%DOCSDIR%%/sazanami/doc/ayu/README.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sazanami/doc/ayu
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sazanami/doc
+%%PORTDOCS%%%%DOCSDIR%%/sazanami/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sazanami
+%%PORTDOCS%%%%DOCSDIR%%/mplus/README_J
+%%PORTDOCS%%%%DOCSDIR%%/mplus/README_E
+%%PORTDOCS%%%%DOCSDIR%%/mplus/LICENSE_J
+%%PORTDOCS%%%%DOCSDIR%%/mplus/LICENSE_E
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/mplus
+%%PORTDOCS%%%%DOCSDIR%%/mona/README.euc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/mona
 @dirrm %%DATADIR%%
 %%LOCAL_FONTSDIR%%/TTF/ipag-mona.ttf
 %%LOCAL_FONTSDIR%%/TTF/ipagp-mona.ttf
--- gc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

