ports/146247: [patch] japanese/font-mplus: fix plist and non-LOCALBASE installation
Anonymous
swell.k at gmail.com
Sun May 2 17:20:20 UTC 2010
>Number: 146247
>Category: ports
>Synopsis: [patch] japanese/font-mplus: fix plist and non-LOCALBASE installation
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun May 02 17:20:19 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
>Description:
- don't writing outside PREFIX, it breaks `make install PREFIX=/blah'
- remove exec/unexec nonsense, it confuses `pkg_info -W file'
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: japanese/font-mplus/Makefile
===================================================================
RCS file: /a/.cvsup/ports/japanese/font-mplus/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- japanese/font-mplus/Makefile 28 Apr 2010 13:46:54 -0000 1.25
+++ japanese/font-mplus/Makefile 2 May 2010 16:53:10 -0000
@@ -55,16 +55,16 @@ do-install-bitmap:
${SH} ${WRKDIR}/mplus_bitmap_fonts-2.2.4/install_mplus_fonts
${INSTALL_DATA} ${WRKDIR}/fonts.alias ${DATADIR}/bitmap
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/mplus
- ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${LOCALBASE}/${LOCAL_FONTSDIR}/mplus/
+ ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${LOCAL_FONTSDIR}/mplus/
${MKDIR} ${PREFIX}/${X_FONTSDIR}/misc
- ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${LOCALBASE}/${X_FONTSDIR}/misc/
+ ${LN} -s -f ${DATADIR}/bitmap/*.pcf.gz ${PREFIX}/${X_FONTSDIR}/misc/
do-install-outline:
${INSTALL_DATA} ${WRKDIR}/mplus-TESTFLIGHT-030/*.ttf ${DATADIR}/TTF
${MKDIR} ${PREFIX}/${LOCAL_FONTSDIR}/TTF
- ${LN} -s -f ${DATADIR}/TTF/*.ttf ${LOCALBASE}/${LOCAL_FONTSDIR}/TTF/
- ${MKDIR} ${LOCALBASE}/${X_FONTSDIR}/TTF
- ${LN} -s -f ${DATADIR}/TTF/*.ttf ${LOCALBASE}/${X_FONTSDIR}/TTF/
+ ${LN} -s -f ${DATADIR}/TTF/*.ttf ${PREFIX}/${LOCAL_FONTSDIR}/TTF/
+ ${MKDIR} ${PREFIX}/${X_FONTSDIR}/TTF
+ ${LN} -s -f ${DATADIR}/TTF/*.ttf ${PREFIX}/${X_FONTSDIR}/TTF/
${INSTALL_DATA} ${FILESDIR}/20-unhint-mplus.conf \
${FILESDIR}/62-fonts-mplus.conf \
${PREFIX}/etc/fonts/conf.avail
Index: japanese/font-mplus/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/japanese/font-mplus/pkg-plist,v
retrieving revision 1.7
diff -u -p -r1.7 pkg-plist
--- japanese/font-mplus/pkg-plist 31 May 2009 09:15:42 -0000 1.7
+++ japanese/font-mplus/pkg-plist 2 May 2010 16:57:28 -0000
@@ -170,10 +170,8 @@
@dirrmtry %%LOCAL_FONTSDIR%%
etc/fonts/conf.avail/20-unhint-mplus.conf
etc/fonts/conf.avail/62-fonts-mplus.conf
- at exec ln -s -f ../conf.avail/20-unhint-mplus.conf %D/etc/fonts/conf.d/20-unhint-mplust.conf
- at exec ln -s -f ../conf.avail/62-fonts-mplus.conf %D/etc/fonts/conf.d/62-fonts-mplus.conf
- at unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus.conf
- at unexec rm -f %D/etc/fonts/conf.d/62-fonts-mplus.conf
+etc/fonts/conf.d/20-unhint-mplus.conf
+etc/fonts/conf.d/62-fonts-mplus.conf
%%X_FONTSDIR%%/misc/mplus_f10b-euro.pcf.gz
%%X_FONTSDIR%%/misc/mplus_f10b.pcf.gz
%%X_FONTSDIR%%/misc/mplus_f10r-euro.pcf.gz
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list