From koma2@ksta.ms.u-tokyo.ac.jp  Tue Mar  8 19:24:19 2005
Return-Path: <koma2@ksta.ms.u-tokyo.ac.jp>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5761316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Mar 2005 19:24:19 +0000 (GMT)
Received: from ksta.ms.u-tokyo.ac.jp (ksta.ms.u-tokyo.ac.jp [157.82.17.219])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E07ED43D5C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Mar 2005 19:24:18 +0000 (GMT)
	(envelope-from koma2@ksta.ms.u-tokyo.ac.jp)
Received: by ksta.ms.u-tokyo.ac.jp (Postfix, from userid 1003)
	id 3A5C95650D; Wed,  9 Mar 2005 04:24:17 +0900 (JST)
Message-Id: <20050308192417.3A5C95650D@ksta.ms.u-tokyo.ac.jp>
Date: Wed,  9 Mar 2005 04:24:17 +0900 (JST)
From: KOMATSU Shinichiro <koma2@ms.u-tokyo.ac.jp>
Reply-To: KOMATSU Shinichiro <koma2@ms.u-tokyo.ac.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: japanese/kterm: use MASTER_SITES_n and PATCH_SITES_n
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         78601
>Category:       ports
>Synopsis:       japanese/kterm: use MASTER_SITES_n and PATCH_SITES_n
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 08 19:30:02 GMT 2005
>Closed-Date:    Fri Mar 11 21:02:51 GMT 2005
>Last-Modified:  Fri Mar 11 21:02:51 GMT 2005
>Originator:     KOMATSU Shinichiro
>Release:        FreeBSD 5.3-RELEASE-p5 amd64
>Organization:
>Environment:
FreeBSD 5.3-RELEASE-p5 amd64


	
>Description:

Use MASTER_SITES_n and PATCH_SITES_n.

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/kterm/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- Makefile	6 Mar 2005 22:06:12 -0000	1.39
+++ Makefile	8 Mar 2005 18:11:45 -0000
@@ -9,12 +9,12 @@
 PORTVERSION=	6.2.0
 PORTREVISION=	6
 CATEGORIES=	japanese x11
-MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
+MASTER_SITES=	${MASTER_SITE_PORTS_JP}:wp_jp \
 		${MASTER_SITE_XCONTRIB} \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	applications kterm shige/kterm
+		${MASTER_SITE_LOCAL}:wp_local
+MASTER_SITE_SUBDIR=	applications kterm/:wp_jp shige/kterm/:wp_local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		README.wallpaper.ja
+		README.wallpaper.ja:wp_local,wp_jp
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xterm that speaks Japanese
@@ -23,17 +23,17 @@
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	kterm
-PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/ \
-		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/ \
-		http://straycat.ms.u-tokyo.ac.jp/distfiles/ \
-		${MASTER_SITE_PORTS_JP} \
-		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	shige/kterm
-PATCHFILES=	${DISTNAME}.NFS-xauth.patch \
-		${DISTNAME}-wpi.patch.gz \
-		${DISTNAME}-jisx0213.patch.gz \
-		${DISTNAME}-color16.patch.gz \
-		${DISTNAME}-termios-0.2.patch.gz
+PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/:nfs \
+		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/:wpi \
+		http://straycat.ms.u-tokyo.ac.jp/distfiles/:termios \
+		${MASTER_SITE_LOCAL}:jisx0213,color16,termios
+PATCH_SITE_SUBDIR=	shige/kterm/:jisx0213,color16 \
+       			nork/:termios
+PATCHFILES=	${DISTNAME}.NFS-xauth.patch:nfs \
+		${DISTNAME}-wpi.patch.gz:wpi \
+		${DISTNAME}-jisx0213.patch.gz:jisx0213 \
+		${DISTNAME}-color16.patch.gz:color16 \
+		${DISTNAME}-termios-0.2.patch.gz:termios
 PATCH_DIST_STRIP= -p1
 
 USE_IMAKE=	yes
>Release-Note:
>Audit-Trail:

From: KOMATSU Shinichiro <koma2@ms.u-tokyo.ac.jp>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/78601: japanese/kterm: use MASTER_SITES_n and PATCH_SITES_n
Date: Wed, 9 Mar 2005 05:20:59 +0900

 Please throw my previous patch away, and just use this one, instead.
 
 Pointed out by: ume
 Suggested by: hrs
 
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/japanese/kterm/Makefile,v
 retrieving revision 1.39
 diff -u -r1.39 Makefile
 --- Makefile	6 Mar 2005 22:06:12 -0000	1.39
 +++ Makefile	8 Mar 2005 19:56:47 -0000
 @@ -9,12 +9,12 @@
  PORTVERSION=	6.2.0
  PORTREVISION=	6
  CATEGORIES=	japanese x11
 -MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 +MASTER_SITES=	${MASTER_SITE_PORTS_JP:S/$/:wp_jp/} \
  		${MASTER_SITE_XCONTRIB} \
 -		${MASTER_SITE_LOCAL}
 -MASTER_SITE_SUBDIR=	applications kterm shige/kterm
 +		${MASTER_SITE_LOCAL:S/$/:wp_local/}
 +MASTER_SITE_SUBDIR=	applications kterm/:wp_jp shige/kterm/:wp_local
  DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 -		README.wallpaper.ja
 +		README.wallpaper.ja:wp_local,wp_jp
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	An xterm that speaks Japanese
 @@ -23,17 +23,17 @@
  
  EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
  DIST_SUBDIR=	kterm
 -PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/ \
 -		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/ \
 -		http://straycat.ms.u-tokyo.ac.jp/distfiles/ \
 -		${MASTER_SITE_PORTS_JP} \
 -		${MASTER_SITE_LOCAL}
 -PATCH_SITE_SUBDIR=	shige/kterm
 -PATCHFILES=	${DISTNAME}.NFS-xauth.patch \
 -		${DISTNAME}-wpi.patch.gz \
 -		${DISTNAME}-jisx0213.patch.gz \
 -		${DISTNAME}-color16.patch.gz \
 -		${DISTNAME}-termios-0.2.patch.gz
 +PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/:nfs \
 +		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/:wpi \
 +		http://straycat.ms.u-tokyo.ac.jp/distfiles/:termios \
 +		${MASTER_SITE_LOCAL:S/$/:jisx0213,color16,termios/}
 +PATCH_SITE_SUBDIR=	shige/kterm/:jisx0213,color16 \
 +       			nork/:termios
 +PATCHFILES=	${DISTNAME}.NFS-xauth.patch:nfs \
 +		${DISTNAME}-wpi.patch.gz:wpi \
 +		${DISTNAME}-jisx0213.patch.gz:jisx0213 \
 +		${DISTNAME}-color16.patch.gz:color16 \
 +		${DISTNAME}-termios-0.2.patch.gz:termios
  PATCH_DIST_STRIP= -p1
  
  USE_IMAKE=	yes
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Mar 11 21:02:44 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=78601 
>Unformatted:
