From ade@lovett.com Tue Oct 12 09:15:33 1999
Return-Path: <ade@lovett.com>
Received: from anaconda.lovett.com (anaconda.lovett.com [216.60.121.168])
	by hub.freebsd.org (Postfix) with ESMTP id 183CD15A58
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Oct 1999 09:15:27 -0700 (PDT)
	(envelope-from ade@lovett.com)
Received: from ade by anaconda.lovett.com with local (Exim 3.03 #1)
	id 11b4aF-000OGR-00
	for FreeBSD-gnats-submit@freebsd.org; Tue, 12 Oct 1999 11:15:27 -0500
Message-Id: <E11b4aF-000OGR-00@anaconda.lovett.com>
Date: Tue, 12 Oct 1999 11:15:27 -0500
From: Ade Lovett <ade@lovett.com>
Reply-To: ade@lovett.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: Clean up print/pkfonts* and japanese/vfxdvi*
X-Send-Pr-Version: 3.2

>Number:         14286
>Category:       ports
>Synopsis:       Clean up print/pkfonts* and japanese/vfxdvi*
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 12 09:20:00 PDT 1999
>Closed-Date:    Mon Oct 18 11:09:17 PDT 1999
>Last-Modified:  Mon Oct 18 11:09:40 PDT 1999
>Originator:     Ade Lovett
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
Lovett Network Consultancy
>Environment:

	Up to date ports tree.  Distfile survey.

>Description:

	print/pkfonts* and japanese/vfxdvi* are in a bit of a mess.

	600dpi resolution files are no longer available on the
	master site, and the MASTER_SITE for print/pkfonts* is
	broken.

>How-To-Repeat:

	cd print/pkfonts300; make fetch

	for one example.  Look at the distfiles survey for the
	whole story.

>Fix:
	
	Three things need to be done:

	1.  Kill print/pkfonts600 and japanese/vfxdvi600 (the
	    only thing that depends on pkfonts600)

	2.  Update print/pkfonts300 as follows (first patch):

	    Remove:	pkg/600.list
	    Update:	Makefile files/md5

	3.  Update japanese/vfxdvi300 as follows (second patch):

	    Update:	Makefile files/customize.sh

	    Note that the other japanese/vfxdvi* ports still
	    have problems with the distfile survey, but I'll
	    leave that (for now) to the MAINTAINER.

--------------------------------------------------
First Patch	(print/pkfonts300)
--------------------------------------------------
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/print/pkfonts300/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	1999/10/09 15:22:57	1.18
+++ Makefile	1999/10/12 15:55:21
@@ -9,8 +9,8 @@
 DISTNAME=	pkfonts
 PKGNAME=	pkfonts${RESOLUTION}-1.0
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.univ-evry.fr/.04/system/OpenBSD/distfiles/pkfonts/ \
-		${MASTER_SITE_PORTS_JP}/pkfonts/
+MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITE_SUBDIR= pkfonts
 DISTFILES=	pk${RESOLUTION}.tar.gz
 # see below for RESOLUTION definition
 
@@ -24,10 +24,10 @@
 .else
 .if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
 	${RESOLUTION} != 300 && ${RESOLUTION} != 360 && \
-	${RESOLUTION} != 400 && ${RESOLUTION} != 600
+	${RESOLUTION} != 400
 .BEGIN:
 	@${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
-	@${ECHO} "Possible values are: 118, 240, 300, 360, 400 and 600."
+	@${ECHO} "Possible values are: 118, 240, 300, 360 and 400."
 	@${FALSE}
 .endif
 .endif
Index: files/md5
===================================================================
RCS file: /home/ncvs/ports/print/pkfonts300/files/md5,v
retrieving revision 1.3
diff -u -r1.3 md5
--- md5	1996/11/30 10:50:04	1.3
+++ md5	1999/10/12 16:00:10
@@ -3,4 +3,3 @@
 MD5 (pkfonts/pk300.tar.gz) = a9ccd40d543924937bcefdef3e2080ea
 MD5 (pkfonts/pk360.tar.gz) = 330339a36d3c58f4baf3d87fab967bbf
 MD5 (pkfonts/pk400.tar.gz) = 0657e6e7437d875f96e1f6a07a72c6f0
-MD5 (pkfonts/pk600.tar.gz) = 25b2c1f9635ecf7d8250d9d1b0487168


--------------------------------------------------
Second Patch	(japanese/vfxdvi300)
--------------------------------------------------
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/vfxdvi300/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile	1999/09/04 23:39:29	1.20
+++ Makefile	1999/10/12 16:04:47
@@ -33,10 +33,10 @@
 .else
 .if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
 	${RESOLUTION} != 300 && ${RESOLUTION} != 360 && \
-	${RESOLUTION} != 400  && ${RESOLUTION} != 600
+	${RESOLUTION} != 400
 .BEGIN:
 	@${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
-	@${ECHO} "Possible values are: 118, 240, 300, 360, 400 and 600."
+	@${ECHO} "Possible values are: 118, 240, 300, 360 and 400."
 	@${FALSE}
 .endif
 .endif
Index: files/customize.sh
===================================================================
RCS file: /home/ncvs/ports/japanese/vfxdvi300/files/customize.sh,v
retrieving revision 1.5
diff -u -r1.5 customize.sh
--- customize.sh	1999/01/21 06:32:50	1.5
+++ customize.sh	1999/10/12 16:05:10
@@ -43,7 +43,7 @@
 > Imakefile
 rm Imakefile.tmp
 
-if [ $1 = "360" ] || [ $1 = "400" ] || [ $1 = "600" ] ; then
+if [ $1 = "360" ] || [ $1 = "400" ] ; then
 	echo "Default shrink level is set to 5."
 cp Imakefile Imakefile.tmp
 cat Imakefile.tmp \

>Release-Note:
>Audit-Trail:

From: sanpei@sanpei.org (MIHIRA Yoshiro)
To: ade@lovett.com
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/14286: Clean up print/pkfonts* and japanese/vfxdvi*
Date: Sat, 16 Oct 1999 21:45:41 +0900 (JST)

 >> 	print/pkfonts* and japanese/vfxdvi* are in a bit of a mess.
 >> 
 >> 	600dpi resolution files are no longer available on the
 >> 	master site, and the MASTER_SITE for print/pkfonts* is
 >> 	broken.
 
   I'm one of the MASTER_SITE_JP Maintainer.
   I put pkfonts to ${MASTER_SITE_JP}/pkfonts last week by
 asami-san's request.
   But I forgot to put pk600.tar.gz. I put it just now.
 
   Would you like to re-check Distfile survey.
 
 Thank you
 MIHIRA Sanpei Yoshiro
 sanpei@sanpei.org
 sanpei@jp.FreeBSD.org
 

From: Ade Lovett <ade@lovett.com>
To: MIHIRA Yoshiro <sanpei@sanpei.org>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/14286: Clean up print/pkfonts* and japanese/vfxdvi*
Date: Sun, 17 Oct 1999 16:34:27 -0500

 On Sat, Oct 16, 1999 at 09:45:41PM +0900, MIHIRA Yoshiro wrote:
 > 
 >   I'm one of the MASTER_SITE_JP Maintainer.
 >   I put pkfonts to ${MASTER_SITE_JP}/pkfonts last week by
 > asami-san's request.
 >   But I forgot to put pk600.tar.gz. I put it just now.
 > 
 >   Would you like to re-check Distfile survey.
 
 Ok.  Next time the survey rolls around, I'll go back and take a
 peek to see what's improved.
 
 At the very least, the following patch will need to be applied
 to print/pkfonts300/Makefile:
 
 --- Makefile.orig	Sun Oct 17 16:32:41 1999
 +++ Makefile	Sun Oct 17 16:33:32 1999
 @@ -9,8 +9,8 @@
  DISTNAME=	pkfonts
  PKGNAME=	pkfonts${RESOLUTION}-1.0
  CATEGORIES=	print
 -MASTER_SITES=	ftp://ftp.univ-evry.fr/.04/system/OpenBSD/distfiles/pkfonts/ \
 -		${MASTER_SITE_PORTS_JP}/pkfonts/
 +MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 +MASTER_SITE_SUBDIR= pkfonts
  DISTFILES=	pk${RESOLUTION}.tar.gz
  # see below for RESOLUTION definition
  
 That will need to be committed before the distfile survey results will
 be accurate for the pkfonts* ports.
 
 -aDe
 
 -- 
 Ade Lovett, Austin, TX.
 

From: MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>
To: ade@lovett.com
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/14286: Clean up print/pkfonts* and japanese/vfxdvi*
Date: Mon, 18 Oct 1999 13:05:28 +0900

 >--- Makefile.orig	Sun Oct 17 16:32:41 1999
 >+++ Makefile	Sun Oct 17 16:33:32 1999
 >@@ -9,8 +9,8 @@
 > DISTNAME=	pkfonts
 > PKGNAME=	pkfonts${RESOLUTION}-1.0
 > CATEGORIES=	print
 >-MASTER_SITES=	ftp://ftp.univ-evry.fr/.04/system/OpenBSD/distfiles/pkfonts/ \
 >-		${MASTER_SITE_PORTS_JP}/pkfonts/
 >+MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 >+MASTER_SITE_SUBDIR= pkfonts
 > DISTFILES=	pk${RESOLUTION}.tar.gz
 > # see below for RESOLUTION definition
 > 
 >That will need to be committed before the distfile survey results will
 >be accurate for the pkfonts* ports.
 
   Yes, that's right. I hope to **commit** above change.
 
 MIHIRA Yoshiro
 Yokohama, Japan.
 

From: Ade Lovett <ade@lovett.com>
To: MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/14286: Clean up print/pkfonts* and japanese/vfxdvi*
Date: Mon, 18 Oct 1999 12:08:10 -0500

 On Mon, Oct 18, 1999 at 01:05:28PM +0900, MIHIRA Sanpei Yoshiro wrote:
 > >--- Makefile.orig	Sun Oct 17 16:32:41 1999
 > >+++ Makefile	Sun Oct 17 16:33:32 1999
 > >@@ -9,8 +9,8 @@
 > > DISTNAME=	pkfonts
 > > PKGNAME=	pkfonts${RESOLUTION}-1.0
 > > CATEGORIES=	print
 > >-MASTER_SITES=	ftp://ftp.univ-evry.fr/.04/system/OpenBSD/distfiles/pkfonts/ \
 > >-		${MASTER_SITE_PORTS_JP}/pkfonts/
 > >+MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 > >+MASTER_SITE_SUBDIR= pkfonts
 > > DISTFILES=	pk${RESOLUTION}.tar.gz
 > > # see below for RESOLUTION definition
 > > 
 > >That will need to be committed before the distfile survey results will
 > >be accurate for the pkfonts* ports.
 > 
 >   Yes, that's right. I hope to **commit** above change.
 
 Ok.  Can we have this committed, close the PR, and then wait for
 the next distfile survey to clean up any remaining issues.
 
 Thanks,
 	-aDe
 
 -- 
 Ade Lovett, Austin, TX.
 
State-Changed-From-To: open->closed  
State-Changed-By: cpiazza 
State-Changed-When: Mon Oct 18 11:09:17 PDT 1999 
State-Changed-Why:  
Patch applied to pkfonts300/Makefile, thanks! 
>Unformatted:
