From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 2 17:20:20 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1B3E1106567A for ; Sun, 2 May 2010 17:20:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id D319B8FC1D for ; Sun, 2 May 2010 17:20:19 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o42HKJb2083263 for ; Sun, 2 May 2010 17:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o42HKJPb083259; Sun, 2 May 2010 17:20:19 GMT (envelope-from gnats) Resent-Date: Sun, 2 May 2010 17:20:19 GMT Resent-Message-Id: <201005021720.o42HKJPb083259@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Anonymous Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D441B106566C for ; Sun, 2 May 2010 17:19:48 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-bw0-f216.google.com (mail-bw0-f216.google.com [209.85.218.216]) by mx1.freebsd.org (Postfix) with ESMTP id 60EDB8FC17 for ; Sun, 2 May 2010 17:19:48 +0000 (UTC) Received: by bwz8 with SMTP id 8so1021428bwz.3 for ; Sun, 02 May 2010 10:19:38 -0700 (PDT) Received: by 10.204.74.77 with SMTP id t13mr9045015bkj.7.1272820777981; Sun, 02 May 2010 10:19:37 -0700 (PDT) Received: from localhost (95-26-245-70.broadband.corbina.ru [95.26.245.70]) by mx.google.com with ESMTPS id 13sm1376408bwz.7.2010.05.02.10.19.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 02 May 2010 10:19:37 -0700 (PDT) Message-Id: <86ocgyrzol.fsf@gmail.com> Date: Sun, 02 May 2010 21:17:14 +0400 From: Anonymous To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/146247: [patch] japanese/font-mplus: fix plist and non-LOCALBASE installation X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2010 17:20:20 -0000 >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 -@exec ln -s -f ../conf.avail/20-unhint-mplus.conf %D/etc/fonts/conf.d/20-unhint-mplust.conf -@exec ln -s -f ../conf.avail/62-fonts-mplus.conf %D/etc/fonts/conf.d/62-fonts-mplus.conf -@unexec rm -f %D/etc/fonts/conf.d/20-unhint-mplus.conf -@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: