From mjl@luckie.org.nz  Sun Nov  6 08:33:15 2005
Return-Path: <mjl@luckie.org.nz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 60AB516A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  6 Nov 2005 08:33:15 +0000 (GMT)
	(envelope-from mjl@luckie.org.nz)
Received: from grunt7.ihug.co.nz (grunt7.ihug.co.nz [203.109.254.47])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B937443D45
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  6 Nov 2005 08:33:14 +0000 (GMT)
	(envelope-from mjl@luckie.org.nz)
Received: from 203-173-150-148.bliink.ihug.co.nz (latex.plunket.luckie.org.nz) [203.173.150.148] 
	by grunt7.ihug.co.nz with esmtp (Exim 3.35 #1 (Debian))
	id 1EYfxg-0006BX-00; Sun, 06 Nov 2005 21:33:12 +1300
Received: from mylar.plunket.luckie.org.nz ([192.168.1.6])
	by latex.plunket.luckie.org.nz with esmtp (Exim 4.54 (FreeBSD))
	id 1EYfxf-00026f-TW
	for FreeBSD-gnats-submit@freebsd.org; Sun, 06 Nov 2005 21:33:11 +1300
Received: from mjl by mylar.plunket.luckie.org.nz with local (Exim 4.54 (FreeBSD))
	id 1EYfxf-0000DP-LI
	for FreeBSD-gnats-submit@freebsd.org; Sun, 06 Nov 2005 21:33:11 +1300
Message-Id: <E1EYfxf-0000DP-LI@mylar.plunket.luckie.org.nz>
Date: Sun, 06 Nov 2005 21:33:11 +1300
From: Matthew Luckie <mjl@luckie.org.nz>
Sender: Matthew Luckie <mjl@luckie.org.nz>
Reply-To: Matthew Luckie <mjl@luckie.org.nz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] lang/gcc28 pkg-plist is different between 5.X and 6.X
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         88544
>Category:       ports
>Synopsis:       [patch] lang/gcc28 pkg-plist is different between 5.X and 6.X
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 06 08:40:15 GMT 2005
>Closed-Date:    Sat Nov 26 01:27:17 GMT 2005
>Last-Modified:  Sat Nov 26 01:27:17 GMT 2005
>Originator:     Matthew Luckie
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
University of Waikato
>Environment:
System: FreeBSD mylar.plunket.luckie.org.nz 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Sat Nov 5 11:48:43 NZDT 2005 root@mylar.plunket.luckie.org.nz:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
gcc28 installs lib/gcc-lib/%%GNUHOST%%/2.8.1/include/float.h
on 4.X and 5.X, but not on 6.X

this patch conditionally includes the float.h file if it is found to be
installed in the port's post-install target.  there's probably a better
way of getting this done, but this worked for me.

this patch also quietens two portlint warnings with NO_CDROM and DEPRECATED.
	
>How-To-Repeat:
install lang/gcc28, then pkg_create a package.  it will complain that
float.h is not on the system.
>Fix:
diff -uNr gcc28.orig/Makefile gcc28/Makefile
--- gcc28.orig/Makefile Mon Sep  5 18:27:12 2005
+++ gcc28/Makefile      Sun Nov  6 20:03:30 2005
@@ -17,11 +17,11 @@
 COMMENT=       GNU Compiler Collection 2.8
 
 NOT_FOR_ARCHS= amd64 sparc64 ia64
-NO_CDROM=      'old version, not worth the cost in real estate'
+NO_CDROM=      "old version, not worth the cost in real estate"
 
 LATEST_LINK=   gcc28
 
-DEPRECATED=    "This port is no longer in use by anything in the ports collecti
on.  Use a later release instead"
+DEPRECATED=    This port is no longer in use by anything in the ports collectio
n.  Use a later release instead
 
 .include <bsd.port.pre.mk>
 
@@ -85,5 +85,11 @@
        @${MV} ${PREFIX}/man/man1/cccp.1 ${PREFIX}/man/man1/cccp28.1
        @${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/g++28.1
        @${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/gcc28.1
+       @${MV} ${TMPPLIST} ${TMPPLIST}.tmp
+.if exists(${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/2.8.1/include/float.h)
+       ${SED} -e "s:%%FLOAT%%::" ${TMPPLIST}.tmp > ${TMPPLIST}
+.else
+       ${SED} -e "s:%%FLOAT%%:@comment :" ${TMPPLIST}.tmp > ${TMPPLIST}
+.endif
 
 .include <bsd.port.post.mk>
diff -uNr gcc28.orig/pkg-plist gcc28/pkg-plist
--- gcc28.orig/pkg-plist        Mon Sep  5 18:27:12 2005
+++ gcc28/pkg-plist     Sun Nov  6 13:50:16 2005
@@ -5,7 +5,7 @@
 bin/protoize
 bin/unprotoize
 bin/%%GNUHOST%%-gcc
-lib/gcc-lib/%%GNUHOST%%/2.8.1/include/float.h
+%%FLOAT%%lib/gcc-lib/%%GNUHOST%%/2.8.1/include/float.h
 lib/gcc-lib/%%GNUHOST%%/2.8.1/include/syslimits.h
 lib/gcc-lib/%%GNUHOST%%/2.8.1/include/typeinfo
 lib/gcc-lib/%%GNUHOST%%/2.8.1/include/exception
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Nov 9 19:05:56 GMT 2005 
Responsible-Changed-Why:  
Poking submitter; can't reproduce the problem. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=88544 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sat Nov 26 01:27:04 GMT 2005 
State-Changed-Why:  
Won't fix - not a problem 

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