From turutani@scphys.kyoto-u.ac.jp  Sat Feb  1 04:26:01 2014
Return-Path: <turutani@scphys.kyoto-u.ac.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 33FDF5C0
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  1 Feb 2014 04:26:01 +0000 (UTC)
Received: from smtp-auth.kuins.kyoto-u.ac.jp (smtp-auth.kuins.kyoto-u.ac.jp [133.3.248.237])
	by mx1.freebsd.org (Postfix) with ESMTP id CF0661984
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  1 Feb 2014 04:26:00 +0000 (UTC)
Received: from smtp-auth.kuins.kyoto-u.ac.jp (smtp-auth.kuins.kyoto-u.ac.jp [127.0.0.1])
	by postfix.imss70 (Postfix) with ESMTP id 4351D2EC003;
	Sat,  1 Feb 2014 13:26:00 +0900 (JST)
Received: from h120.65.226.10.32118.vlan.kuins.net (p17154-ipngn100402kyoto.kyoto.ocn.ne.jp [180.10.96.154])
	by smtp-auth.kuins.kyoto-u.ac.jp (Postfix) with ESMTP id 1E97D2EC001;
	Sat,  1 Feb 2014 13:26:00 +0900 (JST)
Received: from h120.65.226.10.32118.vlan.kuins.net (localhost [127.0.0.1])
	by h120.65.226.10.32118.vlan.kuins.net (8.14.6/8.14.6/20071004-1) with ESMTP id s114PuEE025599;
	Sat, 1 Feb 2014 13:25:56 +0900 (JST)
	(envelope-from turutani@h120.65.226.10.32118.vlan.kuins.net)
Received: (from turutani@localhost)
	by h120.65.226.10.32118.vlan.kuins.net (8.14.6/8.14.6/Submit) id s114PuZS025598;
	Sat, 1 Feb 2014 13:25:56 +0900 (JST)
	(envelope-from turutani)
Message-Id: <201402010425.s114PuZS025598@h120.65.226.10.32118.vlan.kuins.net>
Date: Sat, 1 Feb 2014 13:25:56 +0900 (JST)
From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Reply-To: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: turutani@scphys.kyoto-u.ac.jp
Subject: stagify japanese/mikachan-ttfonts
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         186322
>Category:       ports
>Synopsis:       stagify japanese/mikachan-ttfonts
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 01 04:30:00 UTC 2014
>Closed-Date:    Sun Feb 02 14:27:51 UTC 2014
>Last-Modified:  Sun Feb  2 14:30:01 UTC 2014
>Originator:     Tsurutani Naoki
>Release:        FreeBSD 8.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 8.4-PRERELEASE FreeBSD 8.4-PRERELEASE #26 r249149: Fri Apr 5 22:13:25 JST 2013 turutani@h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386


	
>Description:
	stagify.
	also fix LEGAL statement, just to fit to ports/LEGAL file.
	
>How-To-Repeat:
	
>Fix:

diff -urN mikachan-ttfonts.orig/Makefile mikachan-ttfonts/Makefile
--- mikachan-ttfonts.orig/Makefile	2013-09-21 03:47:54.000000000 +0900
+++ mikachan-ttfonts/Makefile	2014-01-27 10:53:04.000000000 +0900
@@ -13,7 +13,7 @@
 
 EXTRACT_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
-NO_CDROM=	Don't sell distfile
+NO_CDROM=	Do not sell distfile
 EXTRACT_CMD=	lha
 EXTRACT_BEFORE_ARGS=	pq
 EXTRACT_AFTER_ARGS=	> ${WRKSRC}/mika.ttf
@@ -25,12 +25,11 @@
 
 FONTSDIR=	lib/X11/fonts/TrueType
 
-NO_STAGE=	yes
 do-install:
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	${INSTALL_DATA} \
 		${WRKDIR}/mika.ttf ${FILESDIR}/fonts.dir.mika \
-		${PREFIX}/${FONTSDIR}
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+		${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff -urN mikachan-ttfonts.orig/pkg-install mikachan-ttfonts/pkg-install
--- mikachan-ttfonts.orig/pkg-install	2014-01-23 00:52:06.000000000 +0900
+++ mikachan-ttfonts/pkg-install	2014-01-27 10:52:23.000000000 +0900
@@ -4,7 +4,7 @@
   if [ ! -d ${FONTDIR} ]; then
     echo "*********************************************************"
     echo "Please add ${FONTDIR} to your font path"
-    echo "and load 'xtt' module in /etc/XF86Config."
+    echo "and load 'xtt' module in /etc/X11/xorg.conf ."
     echo "*********************************************************"
     mkdir $FONTDIR
   fi
	


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Sun Feb 2 14:17:07 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186322 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Sun Feb 2 14:27:50 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186322 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186322: commit references a PR
Date: Sun,  2 Feb 2014 14:27:45 +0000 (UTC)

 Author: pawel
 Date: Sun Feb  2 14:27:37 2014
 New Revision: 342298
 URL: http://svnweb.freebsd.org/changeset/ports/342298
 QAT: https://qat.redports.org/buildarchive/r342298/
 
 Log:
   - Stage support
   - Fix legal statement, xorg.conf path
   
   PR:		ports/186322
   Submitted by:	maintainer
 
 Modified:
   head/japanese/mikachan-ttfonts/Makefile
   head/japanese/mikachan-ttfonts/pkg-install
 
 Modified: head/japanese/mikachan-ttfonts/Makefile
 ==============================================================================
 --- head/japanese/mikachan-ttfonts/Makefile	Sun Feb  2 14:09:50 2014	(r342297)
 +++ head/japanese/mikachan-ttfonts/Makefile	Sun Feb  2 14:27:37 2014	(r342298)
 @@ -13,7 +13,7 @@ COMMENT=	Handwritten Japanese TrueType f
  
  EXTRACT_DEPENDS=	lha:${PORTSDIR}/archivers/lha
  
 -NO_CDROM=	Don't sell distfile
 +NO_CDROM=	Do not sell distfile
  EXTRACT_CMD=	lha
  EXTRACT_BEFORE_ARGS=	pq
  EXTRACT_AFTER_ARGS=	> ${WRKSRC}/mika.ttf
 @@ -25,12 +25,11 @@ PLIST_SUB=	FONTSDIR=${FONTSDIR}
  
  FONTSDIR=	lib/X11/fonts/TrueType
  
 -NO_STAGE=	yes
  do-install:
 -	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 +	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
  	${INSTALL_DATA} \
  		${WRKDIR}/mika.ttf ${FILESDIR}/fonts.dir.mika \
 -		${PREFIX}/${FONTSDIR}
 -	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 +		${STAGEDIR}${PREFIX}/${FONTSDIR}
 +	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
  
  .include <bsd.port.mk>
 
 Modified: head/japanese/mikachan-ttfonts/pkg-install
 ==============================================================================
 --- head/japanese/mikachan-ttfonts/pkg-install	Sun Feb  2 14:09:50 2014	(r342297)
 +++ head/japanese/mikachan-ttfonts/pkg-install	Sun Feb  2 14:27:37 2014	(r342298)
 @@ -4,7 +4,7 @@ if [ "$2" = "PRE-INSTALL" ]; then
    if [ ! -d ${FONTDIR} ]; then
      echo "*********************************************************"
      echo "Please add ${FONTDIR} to your font path"
 -    echo "and load 'xtt' module in /etc/XF86Config."
 +    echo "and load 'xtt' module in /etc/X11/xorg.conf ."
      echo "*********************************************************"
      mkdir $FONTDIR
    fi
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
