From nobody@FreeBSD.org  Sun Aug 26 10:28:26 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8BC8216A468
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Aug 2007 10:28:26 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DA3F13C468
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Aug 2007 10:28:26 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.1/8.14.1) with ESMTP id l7QASQf2054185
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 Aug 2007 10:28:26 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.1/8.14.1/Submit) id l7QASQBm054184;
	Sun, 26 Aug 2007 10:28:26 GMT
	(envelope-from nobody)
Message-Id: <200708261028.l7QASQBm054184@www.freebsd.org>
Date: Sun, 26 Aug 2007 10:28:26 GMT
From: vittorio de martino <vdemart1@tin.it>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Updating R to version 2.5.1
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: eric+fbports@vangyzen.net

>Number:         115826
>Category:       ports
>Synopsis:       Updating math/R to version 2.5.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rafan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 26 10:30:01 GMT 2007
>Closed-Date:    Mon Aug 27 12:38:36 GMT 2007
>Last-Modified:  Mon Aug 27 12:40:06 GMT 2007
>Originator:     vittorio de martino
>Release:        freebsd 6.2 i386 - p4
>Organization:
>Environment:
>Description:
I updated the R distribution from version 2.5.0 to 2.5.1.
In so doing I'm suggesting to add a patch file and some modification in Makefile to fix the directories in which man pages are kept (from /usr/local/share/man/man1 to /usr/local/man/man1). I noticed that those modifications fixed a problem also when preparing a package via 'make package'.
 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN R-old/Makefile R/Makefile
--- R-old/Makefile	Fri Aug 24 11:45:31 2007
+++ R/Makefile	Sun Aug 26 10:59:18 2007
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	R
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.1
 CATEGORIES=	math lang
 MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
 		ftp://cran.r-project.org/pub/R/src/base/R-2/ \
@@ -166,10 +166,12 @@
 CONFIGURE_ENV+=	MAKEINFO_CMD=${LOCALBASE}/bin/makeinfo
 BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
 .endif
-
+	
 post-install:
 	${MV} ${PREFIX}/lib/libR.so ${PREFIX}/lib/libR.so.0
 	${LN} -sf ${PREFIX}/lib/libR.so.0 ${PREFIX}/lib/libR.so
+	${GZIP_CMD} ${PREFIX}/man/man1/R.1
+	${GZIP_CMD} ${PREFIX}/man/man1/Rscript.1
 .if !defined(WITHOUT_INFO_MANUALS)
 	(cd ${WRKSRC}/doc/manual; \
 	for infofile in ${INFO}; do \
diff -ruN R-old/distinfo R/distinfo
--- R-old/distinfo	Fri Aug 24 11:45:32 2007
+++ R/distinfo	Fri Aug 24 11:52:29 2007
@@ -1,3 +1,3 @@
-MD5 (R-2.5.0.tar.gz) = b9088663fc539c059acfaf19d6d90a69
-SHA256 (R-2.5.0.tar.gz) = 52504c7700f8f880891b34622f73a41dde66e0752a8552d2b8df5c85756a8eef
-SIZE (R-2.5.0.tar.gz) = 15117375
+MD5 (R-2.5.1.tar.gz) = 162f6d5a1bd7c60fd652145e050f3f3c
+SHA256 (R-2.5.1.tar.gz) = 8d915327b37f38e742c247bbe6a653417eabf3dadc5880f3a81507924a1df682
+SIZE (R-2.5.1.tar.gz) = 15224643
diff -ruN R-old/files/patch-configure R/files/patch-configure
--- R-old/files/patch-configure	Thu Jan  1 00:00:00 1970
+++ R/files/patch-configure	Sat Aug 25 19:59:24 2007
@@ -0,0 +1,11 @@
+--- configure.orig	Sat Aug 25 19:54:04 2007
++++ configure	Sat Aug 25 19:55:15 2007
+@@ -1140,7 +1140,7 @@
+ psdir='${docdir}'
+ libdir='${exec_prefix}/lib'
+ localedir='${datarootdir}/locale'
+-mandir='${datarootdir}/man'
++mandir='${prefix}/man'
+ 
+ ac_prev=
+ ac_dashdash=
diff -ruN R-old/pkg-plist R/pkg-plist
--- R-old/pkg-plist	Fri Aug 24 13:16:09 2007
+++ R/pkg-plist	Sun Aug 26 10:28:40 2007
@@ -4679,6 +4679,7 @@
 lib/R/library/mgcv/R-ex/magic.R
 lib/R/library/mgcv/R-ex/mgcv-package.R
 lib/R/library/mgcv/R-ex/mgcv.R
+lib/R/library/mgcv/R-ex/model.matrix.gam.R
 lib/R/library/mgcv/R-ex/mono.con.R
 lib/R/library/mgcv/R-ex/mroot.R
 lib/R/library/mgcv/R-ex/new.name.R
@@ -4741,6 +4742,7 @@
 lib/R/library/mgcv/help/mgcv
 lib/R/library/mgcv/help/mgcv-package
 lib/R/library/mgcv/help/mgcv.control
+lib/R/library/mgcv/help/model.matrix.gam
 lib/R/library/mgcv/help/mono.con
 lib/R/library/mgcv/help/mroot
 lib/R/library/mgcv/help/new.name
@@ -4803,6 +4805,7 @@
 lib/R/library/mgcv/html/mgcv-package.html
 lib/R/library/mgcv/html/mgcv.control.html
 lib/R/library/mgcv/html/mgcv.html
+lib/R/library/mgcv/html/model.matrix.gam.html
 lib/R/library/mgcv/html/mono.con.html
 lib/R/library/mgcv/html/mroot.html
 lib/R/library/mgcv/html/new.name.html
@@ -4864,6 +4867,7 @@
 lib/R/library/mgcv/latex/mgcv-package.tex
 lib/R/library/mgcv/latex/mgcv.control.tex
 lib/R/library/mgcv/latex/mgcv.tex
+lib/R/library/mgcv/latex/model.matrix.gam.tex
 lib/R/library/mgcv/latex/mono.con.tex
 lib/R/library/mgcv/latex/mroot.tex
 lib/R/library/mgcv/latex/new.name.tex
@@ -8651,12 +8655,10 @@
 share/doc/R/manual/R-intro.html
 share/doc/R/manual/R-ints.html
 share/doc/R/manual/R-lang.html
-share/man/man1/R.1
-share/man/man1/Rscript.1
+man/man1/R.1.gz
+man/man1/Rscript.1.gz
 @dirrm share/nls/en_US.US-ASCII
 @dirrm share/nls/POSIX
-@dirrm share/man/man1
-@dirrm share/man
 @dirrm share/doc/R/manual
 @dirrm share/doc/R/html/search
 @dirrm share/doc/R/html


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Aug 26 12:10:12 UTC 2007 
State-Changed-Why:  
Awaiting maintainers feedback 

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

From: bf <bf2006a@yahoo.com>
To: bug-followup@FreeBSD.org, vdemart1@tin.it
Cc:  
Subject: Re: ports/115826: Updating R to version 2.5.1
Date: Sun, 26 Aug 2007 05:27:48 -0700 (PDT)

 Thanks for your submission; it had been so long since
 the last update, I was I was waiting for 2.6.0 to put
 one in...    ;)
 
 You shouldn't have to tinker with the source like you
 did in your patch: just issue
 "--mandir=${MANPREFIX}/man"
 as part of the CONFIGURE_ARGS in the port Makefile. 
 Since the existing port Makefile already has
 GNU_CONFIGURE=yes, this should be issued
 automatically, but for some reason in line 58 of the
 existing Makefile, the author used "CONFIGURE_ARGS="
 instead of "CONFIGURE_ARGS+=", wiping out the default
 CONFIGURE_ARGS.  I think this should be changed to
 "CONFIGURE_ARGS+=".   
 
 By setting MANCOMPRESSED to the appropriate value in
 the Makefile, you should obviate the need for
 explicitly issuing commands to compress manpages. 
 See:
 
 http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-manpages.html
 
 
 bf
 
 
 
 
 
        
 ____________________________________________________________________________________
 Looking for a deal? Find great prices on flights and hotels with Yahoo! FareChase.
 http://farechase.yahoo.com/
Responsible-Changed-From-To: freebsd-ports-bugs->rafan 
Responsible-Changed-By: rafan 
Responsible-Changed-When: Sun Aug 26 13:04:07 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

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

From: Rong-En Fan <rafan@FreeBSD.org>
To: bug-followup@FreeBSD.org, vdemart1@tin.it, eric+fbports@vangyzen.net
Cc:  
Subject: Re: ports/115826: Updating math/R to version 2.5.1
Date: Mon, 27 Aug 2007 10:16:59 +0800

 --nzri8VXeXB/g5ayr
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Enclosed please find the patch I intend to commit.
 It's tested in my tinderbox. The path for manual page
 is correct, no need to patch.
 
 --nzri8VXeXB/g5ayr
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="R.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/math/R/Makefile,v
 retrieving revision 1.63
 diff -u -r1.63 Makefile
 --- Makefile	23 Jul 2007 09:36:10 -0000	1.63
 +++ Makefile	27 Aug 2007 02:15:06 -0000
 @@ -7,7 +7,7 @@
  #
  
  PORTNAME=	R
 -PORTVERSION=	2.5.0
 +PORTVERSION=	2.5.1
  CATEGORIES=	math lang
  MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
  		ftp://cran.r-project.org/pub/R/src/base/R-2/ \
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/math/R/distinfo,v
 retrieving revision 1.31
 diff -u -r1.31 distinfo
 --- distinfo	30 May 2007 14:10:18 -0000	1.31
 +++ distinfo	27 Aug 2007 02:15:06 -0000
 @@ -1,3 +1,3 @@
 -MD5 (R-2.5.0.tar.gz) = b9088663fc539c059acfaf19d6d90a69
 -SHA256 (R-2.5.0.tar.gz) = 52504c7700f8f880891b34622f73a41dde66e0752a8552d2b8df5c85756a8eef
 -SIZE (R-2.5.0.tar.gz) = 15117375
 +MD5 (R-2.5.1.tar.gz) = 162f6d5a1bd7c60fd652145e050f3f3c
 +SHA256 (R-2.5.1.tar.gz) = 8d915327b37f38e742c247bbe6a653417eabf3dadc5880f3a81507924a1df682
 +SIZE (R-2.5.1.tar.gz) = 15224643
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/math/R/pkg-plist,v
 retrieving revision 1.35
 diff -u -r1.35 pkg-plist
 --- pkg-plist	30 May 2007 14:10:18 -0000	1.35
 +++ pkg-plist	27 Aug 2007 02:15:07 -0000
 @@ -1,5 +1,3 @@
 -
 -
  bin/R
  bin/Rscript
  lib/R/COPYING
 @@ -4672,6 +4670,7 @@
  lib/R/library/mgcv/R-ex/magic.R
  lib/R/library/mgcv/R-ex/mgcv-package.R
  lib/R/library/mgcv/R-ex/mgcv.R
 +lib/R/library/mgcv/R-ex/model.matrix.gam.R
  lib/R/library/mgcv/R-ex/mono.con.R
  lib/R/library/mgcv/R-ex/mroot.R
  lib/R/library/mgcv/R-ex/new.name.R
 @@ -4734,6 +4733,7 @@
  lib/R/library/mgcv/help/mgcv
  lib/R/library/mgcv/help/mgcv-package
  lib/R/library/mgcv/help/mgcv.control
 +lib/R/library/mgcv/help/model.matrix.gam
  lib/R/library/mgcv/help/mono.con
  lib/R/library/mgcv/help/mroot
  lib/R/library/mgcv/help/new.name
 @@ -4796,6 +4796,7 @@
  lib/R/library/mgcv/html/mgcv-package.html
  lib/R/library/mgcv/html/mgcv.control.html
  lib/R/library/mgcv/html/mgcv.html
 +lib/R/library/mgcv/html/model.matrix.gam.html
  lib/R/library/mgcv/html/mono.con.html
  lib/R/library/mgcv/html/mroot.html
  lib/R/library/mgcv/html/new.name.html
 @@ -4857,6 +4858,7 @@
  lib/R/library/mgcv/latex/mgcv-package.tex
  lib/R/library/mgcv/latex/mgcv.control.tex
  lib/R/library/mgcv/latex/mgcv.tex
 +lib/R/library/mgcv/latex/model.matrix.gam.tex
  lib/R/library/mgcv/latex/mono.con.tex
  lib/R/library/mgcv/latex/mroot.tex
  lib/R/library/mgcv/latex/new.name.tex
 
 --nzri8VXeXB/g5ayr--

From: vittorio de martino <vdemart1@tin.it>
To: bug-followup@freebsd.org,
 vdemart1@tin.it
Cc:  
Subject: Re: ports/115826: Updating math/R to version 2.5.1
Date: Mon, 27 Aug 2007 09:26:53 +0000

 --Boundary-00=_ejp0GtPpe5prehe
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 I took into account all your observations. In my box 
 FreeBSD hpbsd.vic 6.2-RELEASE-p6 FreeBSD 6.2-RELEASE-p6 #1 I I had some 
 problems with the man pages that where installed always under 
 ${PREFIX}/share/man/man1 and uncompressed.
 
 Now the following patch seems to fix this and some other minor faults in 
 pkg-plist.
 
 Ciao from Rome
 Vittorio
 
 --Boundary-00=_ejp0GtPpe5prehe
 Content-Type: text/x-diff;
   charset="us-ascii";
   name="R.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="R.diff"
 
 diff -ruN R-old/Makefile R/Makefile
 --- R-old/Makefile	Fri Aug 24 11:45:31 2007
 +++ R/Makefile	Sun Aug 26 23:36:26 2007
 @@ -7,7 +7,7 @@
  #
  
  PORTNAME=	R
 -PORTVERSION=	2.5.0
 +PORTVERSION=	2.5.1
  CATEGORIES=	math lang
  MASTER_SITES=	http://cran.r-project.org/src/base/R-2/ \
  		ftp://cran.r-project.org/pub/R/src/base/R-2/ \
 @@ -43,8 +43,7 @@
  		INFO_MANUALS "Install GNU info manuals"                   on  \
  		LETTER_PAPER "Use US Letter paper"                        off
  
 -MAN1=		R.1
 -
 +MAN1=		R.1 Rscript.1
  USE_LDCONFIG=	yes
  INSTALL_TARGET=	install install-libR
  ALL_TARGET=	all
 @@ -55,8 +54,8 @@
  USE_PERL5=	yes
  
  CONFIGURE_ENV=	INSTALL_DATA="${INSTALL} ${COPY} ${_SHROWNGRP} -m 644" F77="${F77}" FC="${FC}"
 -CONFIGURE_ARGS=	--enable-R-shlib --with-system-bzlib --with-system-zlib \
 -		rdocdir=${DOCSDIR}
 +CONFIGURE_ARGS+=--enable-R-shlib --with-system-bzlib --with-system-zlib \
 +		rdocdir=${DOCSDIR} --mandir="${MANPREFIX}/man"
  
  .include <bsd.port.pre.mk>
  
 @@ -166,7 +165,7 @@
  CONFIGURE_ENV+=	MAKEINFO_CMD=${LOCALBASE}/bin/makeinfo
  BUILD_DEPENDS+=	${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo
  .endif
 -
 +	
  post-install:
  	${MV} ${PREFIX}/lib/libR.so ${PREFIX}/lib/libR.so.0
  	${LN} -sf ${PREFIX}/lib/libR.so.0 ${PREFIX}/lib/libR.so
 diff -ruN R-old/distinfo R/distinfo
 --- R-old/distinfo	Fri Aug 24 11:45:32 2007
 +++ R/distinfo	Fri Aug 24 11:52:29 2007
 @@ -1,3 +1,3 @@
 -MD5 (R-2.5.0.tar.gz) = b9088663fc539c059acfaf19d6d90a69
 -SHA256 (R-2.5.0.tar.gz) = 52504c7700f8f880891b34622f73a41dde66e0752a8552d2b8df5c85756a8eef
 -SIZE (R-2.5.0.tar.gz) = 15117375
 +MD5 (R-2.5.1.tar.gz) = 162f6d5a1bd7c60fd652145e050f3f3c
 +SHA256 (R-2.5.1.tar.gz) = 8d915327b37f38e742c247bbe6a653417eabf3dadc5880f3a81507924a1df682
 +SIZE (R-2.5.1.tar.gz) = 15224643
 diff -ruN R-old/pkg-plist R/pkg-plist
 --- R-old/pkg-plist	Fri Aug 24 13:16:09 2007
 +++ R/pkg-plist	Mon Aug 27 00:22:17 2007
 @@ -1,14 +1,5 @@
  bin/R
  bin/Rscript
 -info/R-FAQ.info
 -info/R-admin.info
 -info/R-data.info
 -info/R-exts.info
 -info/R-exts.info-1
 -info/R-exts.info-2
 -info/R-intro.info
 -info/R-lang.info
 -info/dir
  lib/R/COPYING
  lib/R/NEWS
  lib/R/SVN-REVISION
 @@ -4679,6 +4670,7 @@
  lib/R/library/mgcv/R-ex/magic.R
  lib/R/library/mgcv/R-ex/mgcv-package.R
  lib/R/library/mgcv/R-ex/mgcv.R
 +lib/R/library/mgcv/R-ex/model.matrix.gam.R
  lib/R/library/mgcv/R-ex/mono.con.R
  lib/R/library/mgcv/R-ex/mroot.R
  lib/R/library/mgcv/R-ex/new.name.R
 @@ -4741,6 +4733,7 @@
  lib/R/library/mgcv/help/mgcv
  lib/R/library/mgcv/help/mgcv-package
  lib/R/library/mgcv/help/mgcv.control
 +lib/R/library/mgcv/help/model.matrix.gam
  lib/R/library/mgcv/help/mono.con
  lib/R/library/mgcv/help/mroot
  lib/R/library/mgcv/help/new.name
 @@ -4803,6 +4796,7 @@
  lib/R/library/mgcv/html/mgcv-package.html
  lib/R/library/mgcv/html/mgcv.control.html
  lib/R/library/mgcv/html/mgcv.html
 +lib/R/library/mgcv/html/model.matrix.gam.html
  lib/R/library/mgcv/html/mono.con.html
  lib/R/library/mgcv/html/mroot.html
  lib/R/library/mgcv/html/new.name.html
 @@ -4864,6 +4858,7 @@
  lib/R/library/mgcv/latex/mgcv-package.tex
  lib/R/library/mgcv/latex/mgcv.control.tex
  lib/R/library/mgcv/latex/mgcv.tex
 +lib/R/library/mgcv/latex/model.matrix.gam.tex
  lib/R/library/mgcv/latex/mono.con.tex
  lib/R/library/mgcv/latex/mroot.tex
  lib/R/library/mgcv/latex/new.name.tex
 @@ -8651,12 +8646,8 @@
  share/doc/R/manual/R-intro.html
  share/doc/R/manual/R-ints.html
  share/doc/R/manual/R-lang.html
 -share/man/man1/R.1
 -share/man/man1/Rscript.1
  @dirrm share/nls/en_US.US-ASCII
  @dirrm share/nls/POSIX
 -@dirrm share/man/man1
 -@dirrm share/man
  @dirrm share/doc/R/manual
  @dirrm share/doc/R/html/search
  @dirrm share/doc/R/html
 
 --Boundary-00=_ejp0GtPpe5prehe--

From: Rong-En Fan <rafan@freebsd.org>
To: vittorio de martino <vdemart1@tin.it>, bug-followup@freebsd.org
Cc: rafan@freebsd.org
Subject: Re: ports/115826: Updating math/R to version 2.5.1
Date: Mon, 27 Aug 2007 16:20:39 +0800

 It seems your ports tree is out-of-date.
 
 Please make sure your Makefile is 
 
 # $FreeBSD: ports/math/R/Makefile,v 1.63 2007/07/23 09:36:10 rafan Exp $

From: Eric van Gyzen <eric+fbports@vangyzen.net>
To: Rong-En Fan <rafan@FreeBSD.org>
Cc: bug-followup@FreeBSD.org,  vdemart1@tin.it
Subject: Re: ports/115826: Updating math/R to version 2.5.1
Date: Mon, 27 Aug 2007 06:36:16 -0500

 Rong-En Fan wrote:
 > Enclosed please find the patch I intend to commit.
 > It's tested in my tinderbox. The path for manual page
 > is correct, no need to patch.
 
 Wow, that's a very small diff!  Please commit it.
 
 Thank you for your work.
 
 Eric
State-Changed-From-To: feedback->closed 
State-Changed-By: rafan 
State-Changed-When: Mon Aug 27 12:38:34 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/115826: commit references a PR
Date: Mon, 27 Aug 2007 12:38:30 +0000 (UTC)

 rafan       2007-08-27 12:38:22 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/R               Makefile distinfo pkg-plist 
   Log:
   - Update to 2.5.1
   
   PR:             ports/115826 (based on)
   Submitted by:   vittorio de martino <vdemart1 at tin.it>
   Approved by:    Eric van Gyzen <eric+fbports at vangyzen.net> (maintainer)
   
   Revision  Changes    Path
   1.64      +1 -1      ports/math/R/Makefile
   1.32      +3 -3      ports/math/R/distinfo
   1.36      +4 -2      ports/math/R/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
