ports/84347: [patch] fix pkg-plist for arm-elf-binutils / arm-elf-gcc295

[James E. Flemer]

>Number:         84347
>Category:       ports
>Synopsis:       [patch] fix pkg-plist for arm-elf-binutils / arm-elf-gcc295
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 30 17:20:15 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     James E. Flemer
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
n/a
>Environment:
System: FreeBSD psi.speednaked.com 6.0-CURRENT FreeBSD 6.0-CURRENT #1: Sat Jul 23 22:42:39 MDT 2005 jflemer at psi.speednaked.com:/usr/src/sys/i386/compile/PSI6-CAM i386

>Description:
	The arm-elf-gcc295 is scheduled for removal due to an incorrect
	pkg-plist.  The arm-elf-binutils is not reported as having a bad
	pkg-plist, but it creates/removes a directory that should really
	be in arm-elf-gcc295.
>How-To-Repeat:
	See pointyhat.
>Fix:

	The attached patch fixes up the pkg-plist for both of these
	tightly coupled ports.  The patch moves the responsibilty for
		${PREFIX}/arm-elf/include
	into the arm-elf-gcc295, since arm-elf-binutils does not
	actually put any files there.

--- arm-elf-gcc.diff begins here ---
Index: devel/arm-elf-binutils/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/arm-elf-binutils/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- devel/arm-elf-binutils/Makefile	9 Jul 2004 17:42:06 -0000	1.13
+++ devel/arm-elf-binutils/Makefile	30 Jul 2005 17:09:17 -0000
@@ -41,7 +41,6 @@
 .endfor
 	cd ${PREFIX}/lib ; ${MV} libiberty.a \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/lib
-	${MKDIR} ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/include
 	${RM} ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info/*
 	${RMDIR} ${PREFIX}/${PKGNAMEPREFIX:S/-$//}/info
 
Index: devel/arm-elf-binutils/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/arm-elf-binutils/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- devel/arm-elf-binutils/pkg-plist	11 Jul 2003 08:54:05 -0000	1.4
+++ devel/arm-elf-binutils/pkg-plist	30 Jul 2005 17:09:17 -0000
@@ -12,7 +12,6 @@
 arm-elf/bin/size
 arm-elf/bin/strings
 arm-elf/bin/strip
- at comment arm-elf/include/symcat.h
 arm-elf/lib/ldscripts/armelf.x
 arm-elf/lib/ldscripts/armelf.xbn
 arm-elf/lib/ldscripts/armelf.xc
@@ -67,7 +66,6 @@
 share/locale/zh_CN/LC_MESSAGES/bfd.mo
 share/locale/zh_CN/LC_MESSAGES/binutils.mo
 @dirrm arm-elf/bin
- at dirrm arm-elf/include
 @dirrm arm-elf/lib/ldscripts
 @dirrm arm-elf/lib
 @dirrm arm-elf
Index: devel/arm-elf-gcc295/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/arm-elf-gcc295/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- devel/arm-elf-gcc295/Makefile	23 Jul 2005 02:53:19 -0000	1.18
+++ devel/arm-elf-gcc295/Makefile	30 Jul 2005 17:09:17 -0000
@@ -24,10 +24,6 @@
 RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	"${BROKEN}"
-EXPIRATION_DATE=2005-09-22
-
 ONLY_FOR_ARCHS=	i386
 
 GCC_REV=	${DISTNAME:S/gcc-//g}
Index: devel/arm-elf-gcc295/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/arm-elf-gcc295/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- devel/arm-elf-gcc295/pkg-plist	29 May 2001 12:57:40 -0000	1.5
+++ devel/arm-elf-gcc295/pkg-plist	30 Jul 2005 17:09:17 -0000
@@ -1,10 +1,10 @@
-arm-elf/bin/gcc
 arm-elf/bin/g++
+arm-elf/bin/gcc
 arm-elf/include/assert.h
 bin/arm-elf-c++
+bin/arm-elf-cpp
 bin/arm-elf-g++
 bin/arm-elf-gcc
-bin/arm-elf-cpp
 bin/arm-elf-gcov
 bin/arm-elf-protoize
 bin/arm-elf-unprotoize
@@ -57,3 +57,4 @@
 @dirrm lib/gcc-lib/arm-elf/%%GCC_REV%%
 @dirrm lib/gcc-lib/arm-elf
 @dirrm lib/gcc-lib
+ at dirrm arm-elf/include
--- arm-elf-gcc.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: