39 files changed, 18 insertions, 66 deletions

diff --git a/devel/arm-rtems-binutils/Makefile b/devel/arm-rtems-binutils/Makefile
index 2af080ad779b..246c0e36ffea 100644
--- a/devel/arm-rtems-binutils/Makefile
+++ b/devel/arm-rtems-binutils/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	binutils
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	arm
diff --git a/devel/arm-rtems-g77/Makefile b/devel/arm-rtems-g77/Makefile
index 6ba679a21ec8..627a17dceb88 100644
--- a/devel/arm-rtems-g77/Makefile
+++ b/devel/arm-rtems-g77/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use arm-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/arm-rtems-gcc/Makefile b/devel/arm-rtems-gcc/Makefile
index 194368e91a8f..72c50e0eae85 100644
--- a/devel/arm-rtems-gcc/Makefile
+++ b/devel/arm-rtems-gcc/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	arm
diff --git a/devel/arm-rtems-gdb/Makefile b/devel/arm-rtems-gdb/Makefile
index 392e71ba8360..0fa74ce07a16 100644
--- a/devel/arm-rtems-gdb/Makefile
+++ b/devel/arm-rtems-gdb/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdb
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	arm
diff --git a/devel/arm-rtems-objc/Makefile b/devel/arm-rtems-objc/Makefile
index 0a600c2213a5..7113009a3bdf 100644
--- a/devel/arm-rtems-objc/Makefile
+++ b/devel/arm-rtems-objc/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use arm-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/cross-gcc/Makefile b/devel/cross-gcc/Makefile
index f6efdf808460..9648d23a29e0 100644
--- a/devel/cross-gcc/Makefile
+++ b/devel/cross-gcc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
+PORTNAME?=	gcc
 PORTVERSION=	4.2.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GCC:S,$,:gcc,} \
diff --git a/devel/i386-rtems-binutils/Makefile b/devel/i386-rtems-binutils/Makefile
index 555b6566b4da..e44e008866af 100644
--- a/devel/i386-rtems-binutils/Makefile
+++ b/devel/i386-rtems-binutils/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	binutils
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	i386
diff --git a/devel/i386-rtems-g77/Makefile b/devel/i386-rtems-g77/Makefile
index 9880615f3f68..132440a79365 100644
--- a/devel/i386-rtems-g77/Makefile
+++ b/devel/i386-rtems-g77/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use i386-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/i386-rtems-gcc/Makefile b/devel/i386-rtems-gcc/Makefile
index 753a7fb62950..636dfe13cb9b 100644
--- a/devel/i386-rtems-gcc/Makefile
+++ b/devel/i386-rtems-gcc/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	i386
diff --git a/devel/i386-rtems-gdb/Makefile b/devel/i386-rtems-gdb/Makefile
index e920ec26833d..4309de79de6e 100644
--- a/devel/i386-rtems-gdb/Makefile
+++ b/devel/i386-rtems-gdb/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdb
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	i386
diff --git a/devel/i386-rtems-objc/Makefile b/devel/i386-rtems-objc/Makefile
index 90943dee39ab..5cced27e7dbe 100644
--- a/devel/i386-rtems-objc/Makefile
+++ b/devel/i386-rtems-objc/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use i386-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/i960-rtems-binutils/Makefile b/devel/i960-rtems-binutils/Makefile
index cd466bff24d0..630b96222295 100644
--- a/devel/i960-rtems-binutils/Makefile
+++ b/devel/i960-rtems-binutils/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	binutils
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	i960
@@ -14,7 +12,7 @@ TGTABI=		rtems
 
 IGNORE=		abandoned by mainstream
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-binutils
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/i960-rtems-gcc/Makefile b/devel/i960-rtems-gcc/Makefile
index 8e021dcf15f1..9172826d580f 100644
--- a/devel/i960-rtems-gcc/Makefile
+++ b/devel/i960-rtems-gcc/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	i960
@@ -14,7 +12,7 @@ TGTABI=		rtems
 
 IGNORE=		abandoned by mainstream
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/i960-rtems-gdb/Makefile b/devel/i960-rtems-gdb/Makefile
index c37e10fa16d1..603c1c1f32e9 100644
--- a/devel/i960-rtems-gdb/Makefile
+++ b/devel/i960-rtems-gdb/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdb
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	i960
@@ -14,7 +12,7 @@ TGTABI=		rtems
 
 IGNORE=		abandoned by mainstream                                                                                                                     
 DEPRECIATED=	${IGNORE}                                                                                                                                   
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MAN1=		${LCLTARGET}-run.1
 
diff --git a/devel/m68k-rtems-binutils/Makefile b/devel/m68k-rtems-binutils/Makefile
index 055993c3e035..9ba65a85332a 100644
--- a/devel/m68k-rtems-binutils/Makefile
+++ b/devel/m68k-rtems-binutils/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	binutils
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	m68k
diff --git a/devel/m68k-rtems-g77/Makefile b/devel/m68k-rtems-g77/Makefile
index 9120f13b4809..6080b93e2dfc 100644
--- a/devel/m68k-rtems-g77/Makefile
+++ b/devel/m68k-rtems-g77/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use m68k-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/m68k-rtems-gcc/Makefile b/devel/m68k-rtems-gcc/Makefile
index f96436bd3de2..e295ed1493ac 100644
--- a/devel/m68k-rtems-gcc/Makefile
+++ b/devel/m68k-rtems-gcc/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	m68k
diff --git a/devel/m68k-rtems-gdb/Makefile b/devel/m68k-rtems-gdb/Makefile
index f5c0dbe95a76..fd6373450108 100644
--- a/devel/m68k-rtems-gdb/Makefile
+++ b/devel/m68k-rtems-gdb/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdb
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	m68k
diff --git a/devel/m68k-rtems-objc/Makefile b/devel/m68k-rtems-objc/Makefile
index 8fa642711f69..d11af1a91b9f 100644
--- a/devel/m68k-rtems-objc/Makefile
+++ b/devel/m68k-rtems-objc/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use m68k-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/mips-rtems-binutils/Makefile b/devel/mips-rtems-binutils/Makefile
index 4307dc395942..17b7958346d1 100644
--- a/devel/mips-rtems-binutils/Makefile
+++ b/devel/mips-rtems-binutils/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	binutils
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	mips
diff --git a/devel/mips-rtems-g77/Makefile b/devel/mips-rtems-g77/Makefile
index f8807b92de0b..45ab1f06566b 100644
--- a/devel/mips-rtems-g77/Makefile
+++ b/devel/mips-rtems-g77/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use mips-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/mips-rtems-gcc/Makefile b/devel/mips-rtems-gcc/Makefile
index 9852d54d5a1b..28ef71038285 100644
--- a/devel/mips-rtems-gcc/Makefile
+++ b/devel/mips-rtems-gcc/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	mips
diff --git a/devel/mips-rtems-gdb/Makefile b/devel/mips-rtems-gdb/Makefile
index ac0f44c095c5..7b5bc93d0a76 100644
--- a/devel/mips-rtems-gdb/Makefile
+++ b/devel/mips-rtems-gdb/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdb
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	mips
diff --git a/devel/mips-rtems-objc/Makefile b/devel/mips-rtems-objc/Makefile
index 9cfd4f1c979d..2ee02be2d34a 100644
--- a/devel/mips-rtems-objc/Makefile
+++ b/devel/mips-rtems-objc/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use mips-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/powerpc-rtems-binutils/Makefile b/devel/powerpc-rtems-binutils/Makefile
index eca45e7f945c..1b784cebf39a 100644
--- a/devel/powerpc-rtems-binutils/Makefile
+++ b/devel/powerpc-rtems-binutils/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	binutils
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	powerpc
diff --git a/devel/powerpc-rtems-g77/Makefile b/devel/powerpc-rtems-g77/Makefile
index db075f71f804..3193ae9895dc 100644
--- a/devel/powerpc-rtems-g77/Makefile
+++ b/devel/powerpc-rtems-g77/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use powerpc-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/powerpc-rtems-gcc/Makefile b/devel/powerpc-rtems-gcc/Makefile
index 6c0e865cba20..66fa49a75a2b 100644
--- a/devel/powerpc-rtems-gcc/Makefile
+++ b/devel/powerpc-rtems-gcc/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	powerpc
diff --git a/devel/powerpc-rtems-gdb/Makefile b/devel/powerpc-rtems-gdb/Makefile
index 9abb93c379e5..ad0d8e03d600 100644
--- a/devel/powerpc-rtems-gdb/Makefile
+++ b/devel/powerpc-rtems-gdb/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdb
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	powerpc
diff --git a/devel/powerpc-rtems-objc/Makefile b/devel/powerpc-rtems-objc/Makefile
index 5c6c2eed19eb..a6512d44b54c 100644
--- a/devel/powerpc-rtems-objc/Makefile
+++ b/devel/powerpc-rtems-objc/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use powerpc-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/sh-rtems-binutils/Makefile b/devel/sh-rtems-binutils/Makefile
index 0cb6970ebaf5..c4e1569b6352 100644
--- a/devel/sh-rtems-binutils/Makefile
+++ b/devel/sh-rtems-binutils/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	binutils
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	sh
diff --git a/devel/sh-rtems-g77/Makefile b/devel/sh-rtems-g77/Makefile
index 6ae6fe6f1f35..d73371c63caf 100644
--- a/devel/sh-rtems-g77/Makefile
+++ b/devel/sh-rtems-g77/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use sh-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/sh-rtems-gcc/Makefile b/devel/sh-rtems-gcc/Makefile
index 62c2b2ab19f6..1897ddbb505d 100644
--- a/devel/sh-rtems-gcc/Makefile
+++ b/devel/sh-rtems-gcc/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	sh
diff --git a/devel/sh-rtems-gdb/Makefile b/devel/sh-rtems-gdb/Makefile
index 11c5573ce2da..9f40cd803ac3 100644
--- a/devel/sh-rtems-gdb/Makefile
+++ b/devel/sh-rtems-gdb/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdb
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	sh
diff --git a/devel/sh-rtems-objc/Makefile b/devel/sh-rtems-objc/Makefile
index 0f759fcc7fe1..12e3fd176d26 100644
--- a/devel/sh-rtems-objc/Makefile
+++ b/devel/sh-rtems-objc/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use sh-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/sparc-rtems-binutils/Makefile b/devel/sparc-rtems-binutils/Makefile
index b0c4d04f59c7..44171a6fdbf5 100644
--- a/devel/sparc-rtems-binutils/Makefile
+++ b/devel/sparc-rtems-binutils/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	binutils
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	sparc
diff --git a/devel/sparc-rtems-g77/Makefile b/devel/sparc-rtems-g77/Makefile
index 2c335c90abb0..82b1645d173e 100644
--- a/devel/sparc-rtems-g77/Makefile
+++ b/devel/sparc-rtems-g77/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use sparc-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/sparc-rtems-gcc/Makefile b/devel/sparc-rtems-gcc/Makefile
index c6c17c224b95..429a56f85788 100644
--- a/devel/sparc-rtems-gcc/Makefile
+++ b/devel/sparc-rtems-gcc/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gcc
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	sparc
diff --git a/devel/sparc-rtems-gdb/Makefile b/devel/sparc-rtems-gdb/Makefile
index a9ad859d0776..fa0ff3045fa9 100644
--- a/devel/sparc-rtems-gdb/Makefile
+++ b/devel/sparc-rtems-gdb/Makefile
@@ -5,8 +5,6 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gdb
-
 MAINTAINER=	stas@FreeBSD.org
 
 TGTARCH=	sparc
diff --git a/devel/sparc-rtems-objc/Makefile b/devel/sparc-rtems-objc/Makefile
index 990b10016bce..e60a7c9c6ff2 100644
--- a/devel/sparc-rtems-objc/Makefile
+++ b/devel/sparc-rtems-objc/Makefile
@@ -14,7 +14,7 @@ TGTABI=		rtems
 
 IGNORE=		deprecated; use sparc-rtems-gcc instead
 DEPRECIATED=	${IGNORE}
-EXPIRE_DATE=	2007-06-22
+EXPIRE_DATE=	2007-07-02
 
 MASTERDIR=	${.CURDIR}/../cross-gcc
 .include "${MASTERDIR}/Makefile"