As proposed in following mail:

  http://mail-index.netbsd.org/pkgsrc-users/2013/11/16/msg018897.html

(1) Import nios2-binutils 2.23 (CodeSourcery derived) from wip.
(2) nios2-gcc41 now does not include nios2/Makefile.common,
    and unnecessary buildlink3 line to kpathsea removed.
(3) Switch nios2/Makefile.common to provide above (1) package.
(4) Import nios2-gcc 4.7.3 (CodeSourcery derived) from wip,
   including file (3) nios2/Makefile.common and DEPENDS (1) binutils.
(5) Switch all gcc's, nios2-gcc{3,41} to DEPENDS above (1) binutils.
(6) Delete nios2-binutils220 (2.20).

19 files changed, 447 insertions, 61 deletions

diff --git a/cross/nios2-binutils/DESCR b/cross/nios2-binutils/DESCR
new file mode 100644
index 00000000000..1071554d8bc
--- /dev/null
+++ b/cross/nios2-binutils/DESCR
@@ -0,0 +1 @@
+Cross binutils 2.23 for ALTERA FPGA Nios2 processor.
diff --git a/cross/nios2-binutils220/Makefile b/cross/nios2-binutils/Makefile
index 77a6dde6c95..dac90ae6fcb 100644
--- a/cross/nios2-binutils220/Makefile
+++ b/cross/nios2-binutils/Makefile
@@ -1,24 +1,21 @@
-# $NetBSD: Makefile,v 1.1 2013/11/16 07:41:00 mef Exp $
-
-PKG_VERSION=		2.20
-PKGNAME=		nios2-binutils220-${PKG_VERSION}
-CATEGORIES=		cross
-MASTER_SITES=		ftp://ftp.altera.com/outgoing/download/support/ip/processors/nios2/gnu/
+# $NetBSD: Makefile,v 1.3 2013/11/18 06:41:27 mef Exp $
+.include		"../../cross/nios2/Makefile.common"
+PKGNAME=		nios2-binutils-${PKG_VERSION}
+PKG_VERSION=		2.23
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
+#HOMEPAGE=
 COMMENT=		GNU binutils for Altera FPGA Nios2 processor
-LICENSE=		gnu-gpl-v2
+LICENSE=		gnu-gpl-v3
 
-EXTRACT_ELEMENTS=	binutils-${PKGVERSION}
-WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
-
-USE_TOOLS+=		gmake makeinfo perl tar
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-BUILD_DEFS+=		${NIOS_INFO_DIR}
-INFO_FILES=		yes
+WRKSRC=			${WRKDIR}/binutils-2013.05
 
-.include		"../../cross/nios2/Makefile.common"
+USE_TOOLS+=		ksh gettext gmake makeinfo perl tar automake autoconf gawk
+USE_LIBTOOL=		yes
+USE_LANGUAGES+=		c c++
+BUILD_DEFS+=		${NIOS_INFO_DIR}
 
 CONFIGURE_ARGS+=	--disable-nls
 # install libiberty by architecture
@@ -35,10 +32,19 @@ INFO_DIR?=		${NIOS_INFO_DIR}
 GNU_CONFIGURE_INFODIR=	${NIOS_INFO_DIR}
 
 do-extract:
-	(cd ${WRKDIR}; tar zxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${EXTRACT_ELEMENTS} )
+	(cd ${WRKDIR}; tar zxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}	\
+	        sourceryg++-2013.05-43-nios2-linux-gnu/binutils-2013.05-43.tar.bz2;\
+	tar zxf sourceryg++-2013.05-43-nios2-linux-gnu/binutils-2013.05-43.tar.bz2;\
+	)
 
 # following file installed is reference only, not used at all for the moment
 post-install:
 	${INSTALL_DATA} files/nios2elf-netbsd.x ${DESTDIR}${PREFIX}/${NIOS2_TARGET}/lib/ldscripts
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+CONFIGURE_ENV+=		PATH=${CROSSBASE}/bin:${PATH}
+
+# ./configure.lineno: 3238: Syntax error: "else" unexpected
+#  gmake[1]: *** [configure-gas] Error 1
+PKGSRC_MAKE_ENV+=	SH=/bin/ksh
diff --git a/cross/nios2-binutils220/PLIST b/cross/nios2-binutils/PLIST
index 9b0b72a8e5f..6c89b58abff 100644
--- a/cross/nios2-binutils220/PLIST
+++ b/cross/nios2-binutils/PLIST
@@ -1,33 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2013/11/16 07:41:00 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/11/18 06:41:27 mef Exp $
 ${NIOS2_TARGET}/bin/ar
 ${NIOS2_TARGET}/bin/as
 ${NIOS2_TARGET}/bin/ld
+${NIOS2_TARGET}/bin/ld.bfd
 ${NIOS2_TARGET}/bin/nm
 ${NIOS2_TARGET}/bin/objcopy
 ${NIOS2_TARGET}/bin/objdump
 ${NIOS2_TARGET}/bin/ranlib
 ${NIOS2_TARGET}/bin/strip
-${NIOS2_TARGET}/lib/ldscripts/nios2elf-netbsd.x
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.x
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xbn
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xd
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdw
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xn
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xr
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xs
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsc
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsw
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xu
-${NIOS2_TARGET}/lib/ldscripts/nios2elf.xw
-${NIOS2_TARGET}/lib/libiberty.a
 bin/${NIOS2_TARGET}-addr2line
 bin/${NIOS2_TARGET}-ar
 bin/${NIOS2_TARGET}-as
 bin/${NIOS2_TARGET}-c++filt
+bin/${NIOS2_TARGET}-elfedit
 bin/${NIOS2_TARGET}-gprof
 bin/${NIOS2_TARGET}-ld
+bin/${NIOS2_TARGET}-ld.bfd
 bin/${NIOS2_TARGET}-nm
 bin/${NIOS2_TARGET}-objcopy
 bin/${NIOS2_TARGET}-objdump
@@ -38,18 +26,32 @@ bin/${NIOS2_TARGET}-strings
 bin/${NIOS2_TARGET}-strip
 info/${NIOS2_TARGET}/as.info
 info/${NIOS2_TARGET}/bfd.info
-info/${NIOS2_TARGET}/bfd.info-1
-info/${NIOS2_TARGET}/bfd.info-2
 info/${NIOS2_TARGET}/binutils.info
 info/${NIOS2_TARGET}/configure.info
 info/${NIOS2_TARGET}/gprof.info
 info/${NIOS2_TARGET}/ld.info
 info/${NIOS2_TARGET}/standards.info
+${NIOS2_TARGET}/lib/ldscripts/nios2elf-netbsd.x
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.x
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xbn
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xc
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xd
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdc
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xdw
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xn
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xr
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xs
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsc
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xsw
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xu
+${NIOS2_TARGET}/lib/ldscripts/nios2elf.xw
+${NIOS2_TARGET}/lib/libiberty.a
 man/man1/${NIOS2_TARGET}-addr2line.1
 man/man1/${NIOS2_TARGET}-ar.1
 man/man1/${NIOS2_TARGET}-as.1
 man/man1/${NIOS2_TARGET}-c++filt.1
 man/man1/${NIOS2_TARGET}-dlltool.1
+man/man1/${NIOS2_TARGET}-elfedit.1
 man/man1/${NIOS2_TARGET}-gprof.1
 man/man1/${NIOS2_TARGET}-ld.1
 man/man1/${NIOS2_TARGET}-nlmconv.1
diff --git a/cross/nios2-binutils/buildlink3.mk b/cross/nios2-binutils/buildlink3.mk
new file mode 100644
index 00000000000..d6af94f62bb
--- /dev/null
+++ b/cross/nios2-binutils/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/11/18 06:41:27 mef Exp $
+
+BUILDLINK_TREE+=	nios2-binutils
+
+.if !defined(NIOS2_BINUTILS_BUILDLINK3_MK)
+NIOS2_BINUTILS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nios2-binutils+=		nios2-binutils>=2.20
+BUILDLINK_PKGSRCDIR.nios2-binutils?=		../../cross/nios2-binutils
+BUILDLINK_FNAME_TRANSFORM.nios2-binutils+=	-e "s,${NIOS2_TARGET}/lib,lib/,g"
+#BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${EGREP} '.*'
+BUILDLINK_CONTENTS_FILTER.nios2-binutils=	${GREP} '${CROSSBASE}'
+
+.endif # NIOS2-BINUTILS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-nios2-binutils
diff --git a/cross/nios2-binutils/distinfo b/cross/nios2-binutils/distinfo
new file mode 100644
index 00000000000..72e46458904
--- /dev/null
+++ b/cross/nios2-binutils/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.3 2013/11/18 06:41:27 mef Exp $
+
+SHA1 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 94a0dadc4c1370dadfacf4bc6cac591e3e47959b
+RMD160 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = de056d240a73236d6d8be4851813d8b15d16808f
+Size (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 251136787 bytes
diff --git a/cross/nios2-binutils220/files/nios2elf-netbsd.x b/cross/nios2-binutils/files/nios2elf-netbsd.x
index be0b2ac41a6..be0b2ac41a6 100644
--- a/cross/nios2-binutils220/files/nios2elf-netbsd.x
+++ b/cross/nios2-binutils/files/nios2elf-netbsd.x
diff --git a/cross/nios2-binutils220/DESCR b/cross/nios2-binutils220/DESCR
deleted file mode 100644
index 0f68e4e80b7..00000000000
--- a/cross/nios2-binutils220/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Cross binutils for ALTERA FPGA Nios2 processor.
diff --git a/cross/nios2-binutils220/distinfo b/cross/nios2-binutils220/distinfo
deleted file mode 100644
index 1e1eed91fa2..00000000000
--- a/cross/nios2-binutils220/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2013/11/16 07:41:00 mef Exp $
-
-SHA1 (nios2_gnu_gcc4_13.0.gz) = 1df8e0ebd1f0e42ab4dd8a507c0a3dc85c1d598b
-RMD160 (nios2_gnu_gcc4_13.0.gz) = 5331366fc1ab307909bbe6a2ef1fc11d70b0f523
-Size (nios2_gnu_gcc4_13.0.gz) = 110799088 bytes
diff --git a/cross/nios2-gcc/DESCR b/cross/nios2-gcc/DESCR
new file mode 100644
index 00000000000..c05ff555d71
--- /dev/null
+++ b/cross/nios2-gcc/DESCR
@@ -0,0 +1 @@
+Cross gcc-4.7 for ALTERA Nios2 processor.
diff --git a/cross/nios2-gcc/Makefile b/cross/nios2-gcc/Makefile
new file mode 100644
index 00000000000..3a1e9dd7044
--- /dev/null
+++ b/cross/nios2-gcc/Makefile
@@ -0,0 +1,67 @@
+# $NetBSD: Makefile,v 1.3 2013/11/18 06:41:27 mef Exp $
+.include		"../../cross/nios2/Makefile.common"
+PKGNAME=		nios2-gcc-${PKG_VERSION}
+PKG_VERSION=		4.7.3
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+COMMENT=		GNU gcc for Altera FPGA Nios2 processor
+LICENSE=		gnu-gpl-v3
+
+DEPENDS+=		nios2-binutils>=2.23:../../cross/nios2-binutils
+
+USE_TOOLS+=		ksh gettext gmake makeinfo perl tar automake autoconf gawk
+USE_LIBTOOL=		yes
+USE_LANGUAGES+=		c c++
+USE_GNU_CONFIGURE_HOST=	no
+#BUILD_DEFS+=		CROSSBASE	#included in ../nios2/Makefile.common
+WRKSRC=			${WRKDIR}/gcc-nios2
+
+CONFIGURE_ARGS+=	--enable-languages=c
+#CONFIGURE_ARGS+=	--disable-multilib
+CONFIGURE_ARGS+=	--disable-threads
+CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=	--disable-libssp
+# to avoid strange problem due to long `uname -a` result
+CONFIGURE_ARGS+=	--host=${MACHINE_ARCH}--${LOWER_OPSYS}
+CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}--${LOWER_OPSYS}
+# See line :2760 of configure
+CONFIGURE_ARGS+=	--srcdir=.
+PKGSRC_MAKE_ENV+=	SH=/bin/ksh
+CFLAGS+=		-g
+
+PLIST_VARS+=		doc
+
+SUBST_CLASSES+=			host-subdir
+# Work around for the problem
+# gmake[2]: *** No rule to make target `../.././gcc/libgcc.mvars'.  Stop.
+SUBST_MESSAGE.host-subdir= 	Purely work-around, replacing @host-subdir@ in advance
+SUBST_STAGE.host-subdir=	post-patch
+SUBST_FILES.host-subdir=	libgcc/Makefile.in
+SUBST_SED.host-subdir=		'-e /host_subdir = @host_subdir@/s,@host_subdir@,host-${MACHINE_ARCH}--${OPSYS:tl},'
+
+.include "options.mk"
+
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
+.include "../../math/mpcomplex/buildlink3.mk"
+
+do-extract:
+	(cd ${WRKDIR}; tar zxf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}	\
+	        sourceryg++-2013.05-43-nios2-linux-gnu/gcc-2013.05-43.tar.bz2;\
+	tar zxf sourceryg++-2013.05-43-nios2-linux-gnu/gcc-2013.05-43.tar.bz2;\
+	)
+
+# to avoid conflict with binutils (to be fixed by more sophisticated way)
+post-install:
+	${RM}  ${DESTDIR}${CROSSBASE}/lib/libiberty.a
+#  to avoid conflict wit mingw-w64-gcc-4.5.1
+	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/fsf-funding.7
+	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/gfdl.7
+	${RM}  ${DESTDIR}${CROSSBASE}/man/man7/gpl.7
+	${RM}  ${DESTDIR}${CROSSBASE}/info/cpp.info
+	${RM}  ${DESTDIR}${CROSSBASE}/info/cppinternals.info
+	${RM}  ${DESTDIR}${CROSSBASE}/info/gcc.info
+	${RM}  ${DESTDIR}${CROSSBASE}/info/gccinstall.info
+	${RM}  ${DESTDIR}${CROSSBASE}/info/gccint.info
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/cross/nios2-gcc/PLIST b/cross/nios2-gcc/PLIST
new file mode 100644
index 00000000000..b94e2922530
--- /dev/null
+++ b/cross/nios2-gcc/PLIST
@@ -0,0 +1,188 @@
+@comment $NetBSD: PLIST,v 1.3 2013/11/18 06:41:27 mef Exp $
+bin/${NIOS2_TARGET}-cpp
+bin/${NIOS2_TARGET}-gcc
+bin/${NIOS2_TARGET}-gcc-${PKGVERSION}
+bin/${NIOS2_TARGET}-gcc-ar
+bin/${NIOS2_TARGET}-gcc-nm
+bin/${NIOS2_TARGET}-gcc-ranlib
+bin/${NIOS2_TARGET}-gcov
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtbegin.o
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtend.o
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crti.o
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/crtn.o
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/README
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/limits.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include-fixed/syslimits.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/float.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/iso646.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdalign.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdarg.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdbool.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stddef.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdfix.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdint-gcc.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdint.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/stdnoreturn.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/tgmath.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/unwind.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/include/varargs.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc_list
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/gsyslimits.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/README
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/include/limits.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/macro_list
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders.conf
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcc.a
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/libgcov.a
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/gtype.state
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ada/gcc-interface/ada-tree.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/alias.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/all-tree.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/alloc-pool.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ansidecl.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/auto-host.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/b-header-vars
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/basic-block.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/bitmap.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/builtins.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/bversion.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-common.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-common.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-objc.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-pragma.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-family/c-pretty-print.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/c-tree.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cfghooks.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cfgloop.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cgraph.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cif-code.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/elfos.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/initfini-array.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/newlib-stdint.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/elf.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2-opts.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2-protos.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/config/nios2/nios2.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/configargs.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/coretypes.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cp/cp-tree.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cppdefault.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/cpplib.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/debug.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/defaults.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic-core.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/diagnostic.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/double-int.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/emit-rtl.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/except.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/filenames.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/fixed-value.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/flag-types.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/flags.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/function.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gcc-plugin.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/genrtl.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ggc.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple-pretty-print.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gimple.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gsstruct.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gtm-builtins.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/gtype-desc.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hard-reg-set.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hashtab.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/highlev-plugin-common.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/hwint.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/incpath.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/input.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-constants.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-flags.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-modes.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/insn-notes.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/internal-fn.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/internal-fn.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/intl.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-prop.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-ref-inline.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-ref.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-reference.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/ipa-utils.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/java/java-tree.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/langhooks.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/libiberty.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/line-map.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/machmode.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/md5.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/mode-classes.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/objc/objc-tree.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/obstack.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/omp-builtins.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/options.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/opts.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/output.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/params.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/params.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin-api.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin-version.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/plugin.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/pointer-set.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/predict.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/predict.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/prefix.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/pretty-print.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/real.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/realmpfr.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/reg-notes.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/rtl.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/rtl.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/safe-ctype.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/sbitmap.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/splay-tree.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/statistics.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/symtab.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/sync-builtins.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/system.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target-hooks-macros.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/target.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/timevar.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/timevar.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm-preds.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tm_p.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/toplev.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-check.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-dump.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-flow-inline.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-flow.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-inline.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-iterator.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-pass.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-pretty-print.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-alias.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-operands.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree-ssa-sccvn.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/tree.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/treestruct.def
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vec.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vecir.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/vecprim.h
+lib/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/include/version.h
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/cc1
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/collect2
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixinc.sh
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/fixincl
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkheaders
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/install-tools/mkinstalldirs
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/liblto_plugin.la
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/lto-wrapper
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/lto1
+libexec/gcc/${NIOS2_TARGET}/${PKGVERSION}/plugin/gengtype
+man/man1/${NIOS2_TARGET}-cpp.1
+man/man1/${NIOS2_TARGET}-gcc.1
+man/man1/${NIOS2_TARGET}-gcov.1
+@pkgdir nios2-elf/lib
diff --git a/cross/nios2-gcc/buildlink3.mk b/cross/nios2-gcc/buildlink3.mk
new file mode 100644
index 00000000000..69cbf3f9011
--- /dev/null
+++ b/cross/nios2-gcc/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/11/18 06:41:27 mef Exp $
+
+BUILDLINK_TREE+=	nios2-gcc
+
+.if !defined(NIOS2_GCC_BUILDLINK3_MK)
+NIOS2_GCC_BUILDLINK3_MK:=
+
+
+BUILDLINK_API_DEPENDS.nios2-gcc+=         nios2-gcc>=4.7.3
+BUILDLINK_PKGSRCDIR.nios2-gcc?=           ../../cross/nios2-gcc
+BUILDLINK_FNAME_TRANSFORM.nios2-gcc+=     -e "s,${NIOS2_TARGET}/lib,lib/,g"
+.endif # NIOS2-GCC_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-nios2-gcc
diff --git a/cross/nios2-gcc/distinfo b/cross/nios2-gcc/distinfo
new file mode 100644
index 00000000000..3307012ad00
--- /dev/null
+++ b/cross/nios2-gcc/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.3 2013/11/18 06:41:27 mef Exp $
+
+SHA1 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 94a0dadc4c1370dadfacf4bc6cac591e3e47959b
+RMD160 (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = de056d240a73236d6d8be4851813d8b15d16808f
+Size (sourceryg++-2013.05-43-nios2-linux-gnu.src.tar.bz2) = 251136787 bytes
+SHA1 (patch-aa) = a5c69ac3c3768c90d70665a308a155c584b68e60
+SHA1 (patch-gcc_doc_invoke.texi) = 649bc208f3c516263888d5431dc9cba890f53498
diff --git a/cross/nios2-gcc/options.mk b/cross/nios2-gcc/options.mk
new file mode 100644
index 00000000000..8ce12e3b538
--- /dev/null
+++ b/cross/nios2-gcc/options.mk
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1 2013/11/18 06:41:27 mef Exp $
+### Set options
+PKG_OPTIONS_VAR=        PKG_OPTIONS.nios2-gcc
+PKG_SUPPORTED_OPTIONS=  doc
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+# conditional SUBST_CLASSES
+.if empty(PKG_OPTIONS:Mdoc)
+post-patch:
+	(cd ${WRKSRC};					\
+	${MV}  gcc/Makefile.in gcc/Makefile.in.orig;	\
+	${SED} '-e s/@@DOC@@//'				\
+	       '-e s/@@INSTALL_HTML@@//'		\
+	       '-e s/@@INSTALL_PDF@@//'			\
+	gcc/Makefile.in.orig > gcc/Makefile.in;		\
+	)
+.else
+# bin/tex is required
+BUILD_DEPENDS+=		web2c-[0-9]*:../../print/web2c
+BUILD_DEPENDS+=		tex-cm-[0-9]*:../../fonts/tex-cm
+BUILD_DEPENDS+=		tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
+BUILD_DEPENDS+=		tex-pdftex-doc-[0-9]*:../../print/tex-pdftex-doc
+BUILD_DEPENDS+=		tex-pdftex-[0-9]*:../../print/tex-pdftex
+BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
+PLIST.doc=		yes
+post-patch:
+	(cd ${WRKSRC};					\
+	${MV}  gcc/Makefile.in gcc/Makefile.in.orig;	\
+	${SED} '-e s/@@DOC@@/doc/'			\
+	       '-e s/@@INSTALL_HTML@@/install-html/'	\
+	       '-e s/@@INSTALL_PDF@@/install-pdf/'	\
+	gcc/Makefile.in.orig > gcc/Makefile.in;		\
+	)
+.endif
diff --git a/cross/nios2-gcc/patches/patch-aa b/cross/nios2-gcc/patches/patch-aa
new file mode 100644
index 00000000000..fafe4344dc1
--- /dev/null
+++ b/cross/nios2-gcc/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.3 2013/11/18 06:41:27 mef Exp $
+#
+# (1) craft FPBIT_FUNCS and DPBIT_FUNCS lists to avoid routine collision
+# against NetBSD softfloat implementation. Following twelve are to
+# be eliminated;
+#	_addsub_df.o _addsub_sf.o _df_to_sf.o _df_to_si.o
+#	_div_df.o _div_sf.o _mul_df.o _mul_sf.o _sf_to_df.o _sf_to_si.o
+#	_si_to_df.o _si_to_sf.o
+# (2) To swith with and without documents, put @@VAR@@ type words. 
+
+--- gcc/Makefile.in.orig	2013-06-26 06:01:21.000000000 +0900
++++ gcc/Makefile.in	2013-11-16 17:45:15.000000000 +0900
+@@ -1752,7 +1752,7 @@ quickstrap: all
+ all.internal: start.encap rest.encap doc
+ # This is what to compile if making a cross-compiler.
+ all.cross: native gcc-cross$(exeext) cpp$(exeext) specs \
+-	libgcc-support lang.all.cross doc @GENINSRC@ srcextra
++	libgcc-support lang.all.cross @@DOC@@ @GENINSRC@ srcextra
+ # This is what must be made before installing GCC and converting libraries.
+ start.encap: native xgcc$(exeext) cpp$(exeext) specs \
+ 	libgcc-support lang.start.encap @GENINSRC@ srcextra
diff --git a/cross/nios2-gcc/patches/patch-gcc_doc_invoke.texi b/cross/nios2-gcc/patches/patch-gcc_doc_invoke.texi
new file mode 100644
index 00000000000..2898db82f26
--- /dev/null
+++ b/cross/nios2-gcc/patches/patch-gcc_doc_invoke.texi
@@ -0,0 +1,15 @@
+$NetBSD: patch-gcc_doc_invoke.texi,v 1.1 2013/11/18 06:41:27 mef Exp $
+
+wip/nios2-gcc/work/gcc-4.1/gcc/doc/invoke.texi:1078: I can't find file `'.
+
+--- gcc-nios2/gcc/doc/invoke.texi.orig	2013-06-26 05:56:33.000000000 +0900
++++ gcc/doc/invoke.texi	2013-11-11 13:58:30.000000000 +0900
+@@ -1457,7 +1457,7 @@
+ useful way to start writing a Go interface to code written in some
+ other language.
+ 
+-@include @value{srcdir}/../libiberty/at-file.texi
++@c @include @value{srcdir}/../libiberty/at-file.texi
+ @end table
+ 
+ @node Invoking G++
diff --git a/cross/nios2-gcc3/Makefile b/cross/nios2-gcc3/Makefile
index 3142a05de95..27fb46cfefa 100644
--- a/cross/nios2-gcc3/Makefile
+++ b/cross/nios2-gcc3/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2013/11/16 07:41:00 mef Exp $
+# $NetBSD: Makefile,v 1.2 2013/11/18 06:41:27 mef Exp $
 
 PKG_VERSION=		3.4.6
 # PKGNAME will have option name only when explictly selected
 PKGNAME=		nios2-gcc3-${PKG_VERSION}
 CATEGORIES=		cross
 MAINTAINER=		pkgsrc-users@NetBSD.org
-COMMENT=		GNU gcc for Altera FPGA Nios2 processor
+COMMENT=		GNU gcc3 for Altera FPGA Nios2 processor
 LICENSE=		gnu-gpl-v2
 
 MASTER_SITES=		ftp://ftp.altera.com/outgoing/download/support/ip/processors/nios2/gnu/
@@ -20,7 +20,7 @@ USE_TOOLS+=		gmake makeinfo perl
 USE_GNU_CONFIGURE_HOST=	no
 #BUILD_DEFS+=		CROSSBASE	#included in ../nios2/Makefile.common
 
-DEPENDS+=		nios2-binutils220-[0-9]*:../../cross/nios2-binutils220
+DEPENDS+=		nios2-binutils-[0-9]*:../../cross/nios2-binutils
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/cross/nios2-gcc41/Makefile b/cross/nios2-gcc41/Makefile
index 9fef653da3d..e627da73998 100644
--- a/cross/nios2-gcc41/Makefile
+++ b/cross/nios2-gcc41/Makefile
@@ -1,24 +1,35 @@
-# $NetBSD: Makefile,v 1.1 2013/11/16 07:41:00 mef Exp $
+# $NetBSD: Makefile,v 1.2 2013/11/18 06:41:27 mef Exp $
+DISTNAME=		nios2_gnu_gcc4_13.0
 PKG_VERSION=		4.1.2
 PKGNAME=		nios2-gcc41-${PKG_VERSION}
 CATEGORIES=		cross
+MASTER_SITES=		ftp://ftp.altera.com/outgoing/download/support/ip/processors/nios2/gnu/
+EXTRACT_SUFX=		.gz
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
+COMMENT=		GNU gcc 4.1 for Altera FPGA Nios2 processor
 LICENSE=		gnu-gpl-v2
 
+DEPENDS+=		nios2-binutils-[0-9]*:../../cross/nios2-binutils
+BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
+
+BUILD_DEFS+=		CROSSBASE
+GNU_CONFIGURE=		yes
+INFO_FILES=		no
 EXTRACT_ELEMENTS=	gcc-4.1
+USE_PKGLOCALEDIR=	yes
 WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
 PATH:=                  ${CROSSBASE}/bin:${PATH}
-COMMENT=		GNU gcc for Altera FPGA Nios2 processor
-
+USE_CROSSBASE=		yes
 USE_TOOLS+=		gmake makeinfo perl bison tar
-USE_GNU_CONFIGURE_HOST=	no
-#BUILD_DEFS+=		CROSSBASE	#included in ../nios2/Makefile.common
-EXTRACT_SUFX=		.gz
-
-DEPENDS+=		nios2-binutils220-[0-9]*:../../cross/nios2-binutils220
+# following line to avoid getting
+#    make: exec(nios2--netbsdelf-ar) failed (No such file or directory)
+USE_GNU_CONFIGURE_HOST= NO
 
-.include		"../../cross/nios2/Makefile.common"
+NIOS2_TARGET?=		nios2-elf
 
+CONFIGURE_ARGS=		# reset
+CONFIGURE_ARGS+=	--target=${NIOS2_TARGET:Q}
 CONFIGURE_ARGS+=	--enable-languages=c
 CONFIGURE_ARGS+=	--disable-multilib
 CONFIGURE_ARGS+=	--disable-threads
@@ -29,8 +40,7 @@ CONFIGURE_ARGS+=	--host=${MACHINE_ARCH}--${LOWER_OPSYS}
 CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}--${LOWER_OPSYS}
 CFLAGS+=		-g
 
-INFO_FILES=		no
-
+PLIST_SUBST+=		NIOS2_TARGET=${NIOS2_TARGET:Q}
 PLIST_VARS+=		doc
 .include "options.mk"
 
@@ -50,5 +60,4 @@ post-install:
 	${RM}  ${DESTDIR}${CROSSBASE}/info/gccinstall.info
 	${RM}  ${DESTDIR}${CROSSBASE}/info/gccint.info
 
-.include "../../print/kpathsea/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cross/nios2/Makefile.common b/cross/nios2/Makefile.common
index 9511d8b73e0..8dad99a7049 100644
--- a/cross/nios2/Makefile.common
+++ b/cross/nios2/Makefile.common
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile.common,v 1.2 2013/11/16 07:41:00 mef Exp $
+# $NetBSD: Makefile.common,v 1.3 2013/11/18 06:41:27 mef Exp $ -*- Makefile -*-
 #
-# used by cross/nios2-binutils220/Makefile
-# used by cross/nios2-gcc41/Makefile
+# used by cross/nios2-binutils/Makefile
+# used by cross/nios2-gcc/Makefile
 
 # sentinel to avoid duplicate
 .if !defined(NIOS2_MAKEFILECOMMON)
 NIOS2_MAKEFILECOMMON=  # yes
-
-MASTER_SITES=		ftp://ftp.altera.com/outgoing/download/support/ip/processors/nios2/gnu/
-DISTNAME=		nios2_gnu_gcc4_13.0
-EXTRACT_SUFX=		.gz
+DISTNAME=		sourceryg++-2013.05-43-nios2-linux-gnu.src
+CATEGORIES=		cross
+MASTER_SITES=		https://sourcery.mentor.com/GNUToolchain/package11649/public/nios2-linux-gnu/
+EXTRACT_SUFX=           .tar.bz2
+FETCH_USING=            curl
 
 GNU_CONFIGURE=		yes
+INFO_FILES=		#empty
 USE_PKGLOCALEDIR=	yes
 
 NIOS2_TARGET?=		nios2-elf
@@ -22,6 +24,8 @@ BUILD_DEFS+=		CROSSBASE
 PATH:=			${CROSSBASE}/bin:${PATH}
 
 BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
+# MASTER_SITES with https:// and FETCH_USING= curl
+BUILD_DEPENDS+=         curl-[0-9]*:../../www/curl
 
 .if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS=		# reset