diff --git a/devel/arm-eabi-gcc921/Makefile b/devel/arm-eabi-gcc9/Makefile
similarity index 100%
rename from devel/arm-eabi-gcc921/Makefile
rename to devel/arm-eabi-gcc9/Makefile
diff --git a/devel/arm-eabi-gcc921/distinfo b/devel/arm-eabi-gcc9/distinfo
similarity index 100%
rename from devel/arm-eabi-gcc921/distinfo
rename to devel/arm-eabi-gcc9/distinfo
diff --git a/devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_dtrace-probe.c b/devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_dtrace-probe.c
similarity index 100%
rename from devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_dtrace-probe.c
rename to devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_dtrace-probe.c
diff --git a/devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_dwarf2read.c b/devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_dwarf2read.c
similarity index 100%
rename from devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_dwarf2read.c
rename to devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_dwarf2read.c
diff --git a/devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_gnulib_import_stddef.in.h b/devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_gnulib_import_stddef.in.h
similarity index 100%
rename from devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_gnulib_import_stddef.in.h
rename to devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_gnulib_import_stddef.in.h
diff --git a/devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_probe.c b/devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_probe.c
similarity index 100%
rename from devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_probe.c
rename to devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_probe.c
diff --git a/devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_python_python-config.py b/devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_python_python-config.py
similarity index 100%
rename from devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_python_python-config.py
rename to devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_python_python-config.py
diff --git a/devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_stap-probe.c b/devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_stap-probe.c
similarity index 100%
rename from devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_stap-probe.c
rename to devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_stap-probe.c
diff --git a/devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_target-float.c b/devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_target-float.c
similarity index 100%
rename from devel/arm-eabi-gcc921/files/gdb/patch-src_gdb_gdb_target-float.c
rename to devel/arm-eabi-gcc9/files/gdb/patch-src_gdb_gdb_target-float.c
diff --git a/devel/arm-eabi-gcc921/files/patch-src_gcc_gcc_config_arm_arm.h b/devel/arm-eabi-gcc9/files/patch-src_gcc_gcc_config_arm_arm.h
similarity index 100%
rename from devel/arm-eabi-gcc921/files/patch-src_gcc_gcc_config_arm_arm.h
rename to devel/arm-eabi-gcc9/files/patch-src_gcc_gcc_config_arm_arm.h
diff --git a/devel/arm-eabi-gcc921/files/patch-src_gcc_gcc_tree-vect-loop.c b/devel/arm-eabi-gcc9/files/patch-src_gcc_gcc_tree-vect-loop.c
similarity index 100%
rename from devel/arm-eabi-gcc921/files/patch-src_gcc_gcc_tree-vect-loop.c
rename to devel/arm-eabi-gcc9/files/patch-src_gcc_gcc_tree-vect-loop.c
diff --git a/devel/arm-eabi-gcc921/multilib b/devel/arm-eabi-gcc9/multilib
similarity index 100%
rename from devel/arm-eabi-gcc921/multilib
rename to devel/arm-eabi-gcc9/multilib
diff --git a/devel/arm-eabi-gcc921/pkg-descr b/devel/arm-eabi-gcc9/pkg-descr
similarity index 100%
rename from devel/arm-eabi-gcc921/pkg-descr
rename to devel/arm-eabi-gcc9/pkg-descr
diff --git a/devel/arm-eabi-gcc921/pkg-plist b/devel/arm-eabi-gcc9/pkg-plist
similarity index 100%
rename from devel/arm-eabi-gcc921/pkg-plist
rename to devel/arm-eabi-gcc9/pkg-plist
diff --git a/devel/arm-eabi-libstdc++921/Makefile b/devel/arm-eabi-libstdc++9/Makefile
similarity index 100%
rename from devel/arm-eabi-libstdc++921/Makefile
rename to devel/arm-eabi-libstdc++9/Makefile
diff --git a/devel/arm-eabi-libstdc++921/distinfo b/devel/arm-eabi-libstdc++9/distinfo
similarity index 100%
rename from devel/arm-eabi-libstdc++921/distinfo
rename to devel/arm-eabi-libstdc++9/distinfo
diff --git a/devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_dtrace-probe.c b/devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_dtrace-probe.c
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_dtrace-probe.c
rename to devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_dtrace-probe.c
diff --git a/devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_dwarf2read.c b/devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_dwarf2read.c
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_dwarf2read.c
rename to devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_dwarf2read.c
diff --git a/devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_gnulib_import_stddef.in.h b/devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_gnulib_import_stddef.in.h
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_gnulib_import_stddef.in.h
rename to devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_gnulib_import_stddef.in.h
diff --git a/devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_probe.c b/devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_probe.c
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_probe.c
rename to devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_probe.c
diff --git a/devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_python_python-config.py b/devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_python_python-config.py
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_python_python-config.py
rename to devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_python_python-config.py
diff --git a/devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_stap-probe.c b/devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_stap-probe.c
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_stap-probe.c
rename to devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_stap-probe.c
diff --git a/devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_target-float.c b/devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_target-float.c
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/gdb/patch-src_gdb_gdb_target-float.c
rename to devel/arm-eabi-libstdc++9/files/gdb/patch-src_gdb_gdb_target-float.c
diff --git a/devel/arm-eabi-libstdc++921/files/patch-src_gcc_gcc_config_arm_arm.h b/devel/arm-eabi-libstdc++9/files/patch-src_gcc_gcc_config_arm_arm.h
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/patch-src_gcc_gcc_config_arm_arm.h
rename to devel/arm-eabi-libstdc++9/files/patch-src_gcc_gcc_config_arm_arm.h
diff --git a/devel/arm-eabi-libstdc++921/files/patch-src_gcc_gcc_tree-vect-loop.c b/devel/arm-eabi-libstdc++9/files/patch-src_gcc_gcc_tree-vect-loop.c
similarity index 100%
rename from devel/arm-eabi-libstdc++921/files/patch-src_gcc_gcc_tree-vect-loop.c
rename to devel/arm-eabi-libstdc++9/files/patch-src_gcc_gcc_tree-vect-loop.c
diff --git a/devel/arm-eabi-libstdc++921/multilib b/devel/arm-eabi-libstdc++9/multilib
similarity index 100%
rename from devel/arm-eabi-libstdc++921/multilib
rename to devel/arm-eabi-libstdc++9/multilib
diff --git a/devel/arm-eabi-libstdc++921/pkg-descr b/devel/arm-eabi-libstdc++9/pkg-descr
similarity index 100%
rename from devel/arm-eabi-libstdc++921/pkg-descr
rename to devel/arm-eabi-libstdc++9/pkg-descr
diff --git a/devel/arm-eabi-libstdc++921/pkg-plist b/devel/arm-eabi-libstdc++9/pkg-plist
similarity index 100%
rename from devel/arm-eabi-libstdc++921/pkg-plist
rename to devel/arm-eabi-libstdc++9/pkg-plist