summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2014-10-31 14:22:20 +0000
committerryoon <ryoon@pkgsrc.org>2014-10-31 14:22:20 +0000
commitc2e1971e1444f675d8531a47eb69ebae1dd34493 (patch)
treed3db3555aff435b13571606fad8d8f3a16303d05 /lang
parent25fb20c92b1c4e4046b0b75e46a5e9dbe4e20039 (diff)
downloadpkgsrc-c2e1971e1444f675d8531a47eb69ebae1dd34493.tar.gz
Restore monolithic gcc48 and gcc48-libs.
* No objection on tech-pkg@ mailing list.
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc48-cc++/DESCR1
-rw-r--r--lang/gcc48-cc++/Makefile43
-rw-r--r--lang/gcc48-cc++/PLIST771
-rw-r--r--lang/gcc48-cc++/PLIST.NetBSD181
-rw-r--r--lang/gcc48-cc++/PLIST.OpenBSD13
-rw-r--r--lang/gcc48-cc++/PLIST.nls40
-rw-r--r--lang/gcc48-cc++/buildlink3.mk22
-rw-r--r--lang/gcc48-fortran/DESCR2
-rw-r--r--lang/gcc48-fortran/Makefile51
-rw-r--r--lang/gcc48-fortran/PLIST14
-rw-r--r--lang/gcc48-fortran/buildlink3.mk22
-rw-r--r--lang/gcc48-libs/DESCR4
-rw-r--r--lang/gcc48-libs/Makefile139
-rw-r--r--lang/gcc48-libs/PLIST21
-rw-r--r--lang/gcc48-libs/buildlink3.mk6
-rw-r--r--lang/gcc48-objc/DESCR2
-rw-r--r--lang/gcc48-objc/Makefile41
-rw-r--r--lang/gcc48-objc/PLIST13
-rw-r--r--lang/gcc48-objc/buildlink3.mk22
-rw-r--r--lang/gcc48/Makefile148
-rw-r--r--lang/gcc48/Makefile.common180
-rw-r--r--lang/gcc48/buildlink3.mk36
-rw-r--r--lang/gcc48/c++.mk8
-rw-r--r--lang/gcc48/distinfo8
-rw-r--r--lang/gcc48/java.mk53
-rw-r--r--lang/gcc48/options.mk144
26 files changed, 349 insertions, 1636 deletions
diff --git a/lang/gcc48-cc++/DESCR b/lang/gcc48-cc++/DESCR
deleted file mode 100644
index 7d50e7720b9..00000000000
--- a/lang/gcc48-cc++/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-C and C++ compilers from the GNU Compiler Collection (GCC) 4.8 release branch.
diff --git a/lang/gcc48-cc++/Makefile b/lang/gcc48-cc++/Makefile
deleted file mode 100644
index d353d8d195d..00000000000
--- a/lang/gcc48-cc++/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2014/05/31 13:06:25 ryoon Exp $
-
-PKGNAME= ${GCC_PKGNAME}-cc++-${GCC48_DIST_VERSION}
-
-COMMENT= C/C++ compilers from the GNU Compiler Collection (GCC) 4.8
-
-DISTINFO_FILE= ${.CURDIR}/../../lang/gcc48/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/gcc48/patches
-
-DEPENDS+= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48-libs
-
-.include "../../lang/gcc48/options.mk"
-
-.include "../../lang/gcc48/c++.mk"
-
-.include "../../lang/gcc48/Makefile.common"
-
-post-install:
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libatomic.a
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libatomic.la
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libatomic.so*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libgcc_s.so*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libgomp.a
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libgomp.la
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libgomp.so*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libitm.a
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libitm.la
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libitm.so*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libssp.a
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libquadmath*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libssp.la
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libssp.so*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libstdc++.a
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libstdc++.la
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libstdc++.so
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libstdc++.so.6
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libstdc++.so.6.19
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libobjc.*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/*lto*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/cc1obj*
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/include/objc
- cd ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/bin && \
- ${LN} -sf gcc cc
diff --git a/lang/gcc48-cc++/PLIST b/lang/gcc48-cc++/PLIST
deleted file mode 100644
index 67a1aceb632..00000000000
--- a/lang/gcc48-cc++/PLIST
+++ /dev/null
@@ -1,771 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2014/05/31 13:06:25 ryoon Exp $
-gcc48/bin/c++
-gcc48/bin/cc
-gcc48/bin/cpp
-gcc48/bin/g++
-gcc48/bin/gcc
-gcc48/bin/gcc-ar
-gcc48/bin/gcc-nm
-gcc48/bin/gcc-ranlib
-gcc48/bin/gcov
-gcc48/bin/${MACHINE_GNU_PLATFORM}-c++
-gcc48/bin/${MACHINE_GNU_PLATFORM}-g++
-gcc48/bin/${MACHINE_GNU_PLATFORM}-gcc
-gcc48/bin/${MACHINE_GNU_PLATFORM}-gcc-${PKGVERSION}
-gcc48/bin/${MACHINE_GNU_PLATFORM}-gcc-ar
-gcc48/bin/${MACHINE_GNU_PLATFORM}-gcc-nm
-gcc48/bin/${MACHINE_GNU_PLATFORM}-gcc-ranlib
-gcc48/include/c++/algorithm
-gcc48/include/c++/array
-gcc48/include/c++/atomic
-gcc48/include/c++/backward/auto_ptr.h
-gcc48/include/c++/backward/backward_warning.h
-gcc48/include/c++/backward/binders.h
-gcc48/include/c++/backward/hash_fun.h
-gcc48/include/c++/backward/hash_map
-gcc48/include/c++/backward/hash_set
-gcc48/include/c++/backward/hashtable.h
-gcc48/include/c++/backward/strstream
-gcc48/include/c++/bits/algorithmfwd.h
-gcc48/include/c++/bits/alloc_traits.h
-gcc48/include/c++/bits/allocator.h
-gcc48/include/c++/bits/atomic_base.h
-gcc48/include/c++/bits/atomic_lockfree_defines.h
-gcc48/include/c++/bits/basic_ios.h
-gcc48/include/c++/bits/basic_ios.tcc
-gcc48/include/c++/bits/basic_string.h
-gcc48/include/c++/bits/basic_string.tcc
-gcc48/include/c++/bits/boost_concept_check.h
-gcc48/include/c++/bits/c++0x_warning.h
-gcc48/include/c++/bits/char_traits.h
-gcc48/include/c++/bits/codecvt.h
-gcc48/include/c++/bits/concept_check.h
-gcc48/include/c++/bits/cpp_type_traits.h
-gcc48/include/c++/bits/cxxabi_forced.h
-gcc48/include/c++/bits/deque.tcc
-gcc48/include/c++/bits/exception_defines.h
-gcc48/include/c++/bits/exception_ptr.h
-gcc48/include/c++/bits/forward_list.h
-gcc48/include/c++/bits/forward_list.tcc
-gcc48/include/c++/bits/fstream.tcc
-gcc48/include/c++/bits/functexcept.h
-gcc48/include/c++/bits/functional_hash.h
-gcc48/include/c++/bits/gslice.h
-gcc48/include/c++/bits/gslice_array.h
-gcc48/include/c++/bits/hash_bytes.h
-gcc48/include/c++/bits/hashtable.h
-gcc48/include/c++/bits/hashtable_policy.h
-gcc48/include/c++/bits/indirect_array.h
-gcc48/include/c++/bits/ios_base.h
-gcc48/include/c++/bits/istream.tcc
-gcc48/include/c++/bits/list.tcc
-gcc48/include/c++/bits/locale_classes.h
-gcc48/include/c++/bits/locale_classes.tcc
-gcc48/include/c++/bits/locale_facets.h
-gcc48/include/c++/bits/locale_facets.tcc
-gcc48/include/c++/bits/locale_facets_nonio.h
-gcc48/include/c++/bits/locale_facets_nonio.tcc
-gcc48/include/c++/bits/localefwd.h
-gcc48/include/c++/bits/mask_array.h
-gcc48/include/c++/bits/memoryfwd.h
-gcc48/include/c++/bits/move.h
-gcc48/include/c++/bits/nested_exception.h
-gcc48/include/c++/bits/ostream.tcc
-gcc48/include/c++/bits/ostream_insert.h
-gcc48/include/c++/bits/postypes.h
-gcc48/include/c++/bits/ptr_traits.h
-gcc48/include/c++/bits/random.h
-gcc48/include/c++/bits/random.tcc
-gcc48/include/c++/bits/range_access.h
-gcc48/include/c++/bits/regex.h
-gcc48/include/c++/bits/regex_compiler.h
-gcc48/include/c++/bits/regex_constants.h
-gcc48/include/c++/bits/regex_cursor.h
-gcc48/include/c++/bits/regex_error.h
-gcc48/include/c++/bits/regex_grep_matcher.h
-gcc48/include/c++/bits/regex_grep_matcher.tcc
-gcc48/include/c++/bits/regex_nfa.h
-gcc48/include/c++/bits/regex_nfa.tcc
-gcc48/include/c++/bits/shared_ptr.h
-gcc48/include/c++/bits/shared_ptr_base.h
-gcc48/include/c++/bits/slice_array.h
-gcc48/include/c++/bits/sstream.tcc
-gcc48/include/c++/bits/stl_algo.h
-gcc48/include/c++/bits/stl_algobase.h
-gcc48/include/c++/bits/stl_bvector.h
-gcc48/include/c++/bits/stl_construct.h
-gcc48/include/c++/bits/stl_deque.h
-gcc48/include/c++/bits/stl_function.h
-gcc48/include/c++/bits/stl_heap.h
-gcc48/include/c++/bits/stl_iterator.h
-gcc48/include/c++/bits/stl_iterator_base_funcs.h
-gcc48/include/c++/bits/stl_iterator_base_types.h
-gcc48/include/c++/bits/stl_list.h
-gcc48/include/c++/bits/stl_map.h
-gcc48/include/c++/bits/stl_multimap.h
-gcc48/include/c++/bits/stl_multiset.h
-gcc48/include/c++/bits/stl_numeric.h
-gcc48/include/c++/bits/stl_pair.h
-gcc48/include/c++/bits/stl_queue.h
-gcc48/include/c++/bits/stl_raw_storage_iter.h
-gcc48/include/c++/bits/stl_relops.h
-gcc48/include/c++/bits/stl_set.h
-gcc48/include/c++/bits/stl_stack.h
-gcc48/include/c++/bits/stl_tempbuf.h
-gcc48/include/c++/bits/stl_tree.h
-gcc48/include/c++/bits/stl_uninitialized.h
-gcc48/include/c++/bits/stl_vector.h
-gcc48/include/c++/bits/stream_iterator.h
-gcc48/include/c++/bits/streambuf.tcc
-gcc48/include/c++/bits/streambuf_iterator.h
-gcc48/include/c++/bits/stringfwd.h
-gcc48/include/c++/bits/unique_ptr.h
-gcc48/include/c++/bits/unordered_map.h
-gcc48/include/c++/bits/unordered_set.h
-gcc48/include/c++/bits/uses_allocator.h
-gcc48/include/c++/bits/valarray_after.h
-gcc48/include/c++/bits/valarray_array.h
-gcc48/include/c++/bits/valarray_array.tcc
-gcc48/include/c++/bits/valarray_before.h
-gcc48/include/c++/bits/vector.tcc
-gcc48/include/c++/bitset
-gcc48/include/c++/cassert
-gcc48/include/c++/ccomplex
-gcc48/include/c++/cctype
-gcc48/include/c++/cerrno
-gcc48/include/c++/cfenv
-gcc48/include/c++/cfloat
-gcc48/include/c++/chrono
-gcc48/include/c++/cinttypes
-gcc48/include/c++/ciso646
-gcc48/include/c++/climits
-gcc48/include/c++/clocale
-gcc48/include/c++/cmath
-gcc48/include/c++/complex
-gcc48/include/c++/complex.h
-gcc48/include/c++/condition_variable
-gcc48/include/c++/csetjmp
-gcc48/include/c++/csignal
-gcc48/include/c++/cstdalign
-gcc48/include/c++/cstdarg
-gcc48/include/c++/cstdbool
-gcc48/include/c++/cstddef
-gcc48/include/c++/cstdint
-gcc48/include/c++/cstdio
-gcc48/include/c++/cstdlib
-gcc48/include/c++/cstring
-gcc48/include/c++/ctgmath
-gcc48/include/c++/ctime
-gcc48/include/c++/cwchar
-gcc48/include/c++/cwctype
-gcc48/include/c++/cxxabi.h
-gcc48/include/c++/debug/array
-gcc48/include/c++/debug/bitset
-gcc48/include/c++/debug/debug.h
-gcc48/include/c++/debug/deque
-gcc48/include/c++/debug/formatter.h
-gcc48/include/c++/debug/forward_list
-gcc48/include/c++/debug/functions.h
-gcc48/include/c++/debug/list
-gcc48/include/c++/debug/macros.h
-gcc48/include/c++/debug/map
-gcc48/include/c++/debug/map.h
-gcc48/include/c++/debug/multimap.h
-gcc48/include/c++/debug/multiset.h
-gcc48/include/c++/debug/safe_base.h
-gcc48/include/c++/debug/safe_iterator.h
-gcc48/include/c++/debug/safe_iterator.tcc
-gcc48/include/c++/debug/safe_local_iterator.h
-gcc48/include/c++/debug/safe_local_iterator.tcc
-gcc48/include/c++/debug/safe_sequence.h
-gcc48/include/c++/debug/safe_sequence.tcc
-gcc48/include/c++/debug/safe_unordered_base.h
-gcc48/include/c++/debug/safe_unordered_container.h
-gcc48/include/c++/debug/safe_unordered_container.tcc
-gcc48/include/c++/debug/set
-gcc48/include/c++/debug/set.h
-gcc48/include/c++/debug/string
-gcc48/include/c++/debug/unordered_map
-gcc48/include/c++/debug/unordered_set
-gcc48/include/c++/debug/vector
-gcc48/include/c++/decimal/decimal
-gcc48/include/c++/decimal/decimal.h
-gcc48/include/c++/deque
-gcc48/include/c++/exception
-gcc48/include/c++/ext/algorithm
-gcc48/include/c++/ext/alloc_traits.h
-gcc48/include/c++/ext/array_allocator.h
-gcc48/include/c++/ext/atomicity.h
-gcc48/include/c++/ext/bitmap_allocator.h
-gcc48/include/c++/ext/cast.h
-gcc48/include/c++/ext/cmath
-gcc48/include/c++/ext/codecvt_specializations.h
-gcc48/include/c++/ext/concurrence.h
-gcc48/include/c++/ext/debug_allocator.h
-gcc48/include/c++/ext/enc_filebuf.h
-gcc48/include/c++/ext/extptr_allocator.h
-gcc48/include/c++/ext/functional
-gcc48/include/c++/ext/hash_map
-gcc48/include/c++/ext/hash_set
-gcc48/include/c++/ext/iterator
-gcc48/include/c++/ext/malloc_allocator.h
-gcc48/include/c++/ext/memory
-gcc48/include/c++/ext/mt_allocator.h
-gcc48/include/c++/ext/new_allocator.h
-gcc48/include/c++/ext/numeric
-gcc48/include/c++/ext/numeric_traits.h
-gcc48/include/c++/ext/pb_ds/assoc_container.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/bin_search_tree_/traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/branch_policy/branch_policy.hpp
-gcc48/include/c++/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp
-gcc48/include/c++/ext/pb_ds/detail/branch_policy/traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/cond_dealtor.hpp
-gcc48/include/c++/ext/pb_ds/detail/container_base_dispatch.hpp
-gcc48/include/c++/ext/pb_ds/detail/debug_map_base.hpp
-gcc48/include/c++/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
-gcc48/include/c++/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
-gcc48/include/c++/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp
-gcc48/include/c++/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/ov_tree_map_/traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
-gcc48/include/c++/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/node.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rb_tree_map_/traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
-gcc48/include/c++/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
-gcc48/include/c++/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
-gcc48/include/c++/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/node.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/splay_tree_/traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/standard_policies.hpp
-gcc48/include/c++/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
-gcc48/include/c++/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
-gcc48/include/c++/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
-gcc48/include/c++/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
-gcc48/include/c++/ext/pb_ds/detail/tree_trace_base.hpp
-gcc48/include/c++/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
-gcc48/include/c++/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/trie_policy/sample_trie_access_traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
-gcc48/include/c++/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
-gcc48/include/c++/ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp
-gcc48/include/c++/ext/pb_ds/detail/type_utils.hpp
-gcc48/include/c++/ext/pb_ds/detail/types_traits.hpp
-gcc48/include/c++/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
-gcc48/include/c++/ext/pb_ds/detail/unordered_iterator/iterator.hpp
-gcc48/include/c++/ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp
-gcc48/include/c++/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
-gcc48/include/c++/ext/pb_ds/exception.hpp
-gcc48/include/c++/ext/pb_ds/hash_policy.hpp
-gcc48/include/c++/ext/pb_ds/list_update_policy.hpp
-gcc48/include/c++/ext/pb_ds/priority_queue.hpp
-gcc48/include/c++/ext/pb_ds/tag_and_trait.hpp
-gcc48/include/c++/ext/pb_ds/tree_policy.hpp
-gcc48/include/c++/ext/pb_ds/trie_policy.hpp
-gcc48/include/c++/ext/pod_char_traits.h
-gcc48/include/c++/ext/pointer.h
-gcc48/include/c++/ext/pool_allocator.h
-gcc48/include/c++/ext/random
-gcc48/include/c++/ext/random.tcc
-gcc48/include/c++/ext/rb_tree
-gcc48/include/c++/ext/rc_string_base.h
-gcc48/include/c++/ext/rope
-gcc48/include/c++/ext/ropeimpl.h
-gcc48/include/c++/ext/slist
-gcc48/include/c++/ext/sso_string_base.h
-gcc48/include/c++/ext/stdio_filebuf.h
-gcc48/include/c++/ext/stdio_sync_filebuf.h
-gcc48/include/c++/ext/string_conversions.h
-gcc48/include/c++/ext/throw_allocator.h
-gcc48/include/c++/ext/type_traits.h
-gcc48/include/c++/ext/typelist.h
-gcc48/include/c++/ext/vstring.h
-gcc48/include/c++/ext/vstring.tcc
-gcc48/include/c++/ext/vstring_fwd.h
-gcc48/include/c++/ext/vstring_util.h
-gcc48/include/c++/fenv.h
-gcc48/include/c++/forward_list
-gcc48/include/c++/fstream
-gcc48/include/c++/functional
-gcc48/include/c++/future
-gcc48/include/c++/initializer_list
-gcc48/include/c++/iomanip
-gcc48/include/c++/ios
-gcc48/include/c++/iosfwd
-gcc48/include/c++/iostream
-gcc48/include/c++/istream
-gcc48/include/c++/iterator
-gcc48/include/c++/limits
-gcc48/include/c++/list
-gcc48/include/c++/locale
-gcc48/include/c++/map
-gcc48/include/c++/memory
-gcc48/include/c++/mutex
-gcc48/include/c++/new
-gcc48/include/c++/numeric
-gcc48/include/c++/ostream
-gcc48/include/c++/parallel/algo.h
-gcc48/include/c++/parallel/algobase.h
-gcc48/include/c++/parallel/algorithm
-gcc48/include/c++/parallel/algorithmfwd.h
-gcc48/include/c++/parallel/balanced_quicksort.h
-gcc48/include/c++/parallel/base.h
-gcc48/include/c++/parallel/basic_iterator.h
-gcc48/include/c++/parallel/checkers.h
-gcc48/include/c++/parallel/compatibility.h
-gcc48/include/c++/parallel/compiletime_settings.h
-gcc48/include/c++/parallel/equally_split.h
-gcc48/include/c++/parallel/features.h
-gcc48/include/c++/parallel/find.h
-gcc48/include/c++/parallel/find_selectors.h
-gcc48/include/c++/parallel/for_each.h
-gcc48/include/c++/parallel/for_each_selectors.h
-gcc48/include/c++/parallel/iterator.h
-gcc48/include/c++/parallel/list_partition.h
-gcc48/include/c++/parallel/losertree.h
-gcc48/include/c++/parallel/merge.h
-gcc48/include/c++/parallel/multiseq_selection.h
-gcc48/include/c++/parallel/multiway_merge.h
-gcc48/include/c++/parallel/multiway_mergesort.h
-gcc48/include/c++/parallel/numeric
-gcc48/include/c++/parallel/numericfwd.h
-gcc48/include/c++/parallel/omp_loop.h
-gcc48/include/c++/parallel/omp_loop_static.h
-gcc48/include/c++/parallel/par_loop.h
-gcc48/include/c++/parallel/parallel.h
-gcc48/include/c++/parallel/partial_sum.h
-gcc48/include/c++/parallel/partition.h
-gcc48/include/c++/parallel/queue.h
-gcc48/include/c++/parallel/quicksort.h
-gcc48/include/c++/parallel/random_number.h
-gcc48/include/c++/parallel/random_shuffle.h
-gcc48/include/c++/parallel/search.h
-gcc48/include/c++/parallel/set_operations.h
-gcc48/include/c++/parallel/settings.h
-gcc48/include/c++/parallel/sort.h
-gcc48/include/c++/parallel/tags.h
-gcc48/include/c++/parallel/types.h
-gcc48/include/c++/parallel/unique_copy.h
-gcc48/include/c++/parallel/workstealing.h
-gcc48/include/c++/profile/array
-gcc48/include/c++/profile/base.h
-gcc48/include/c++/profile/bitset
-gcc48/include/c++/profile/deque
-gcc48/include/c++/profile/forward_list
-gcc48/include/c++/profile/impl/profiler.h
-gcc48/include/c++/profile/impl/profiler_algos.h
-gcc48/include/c++/profile/impl/profiler_container_size.h
-gcc48/include/c++/profile/impl/profiler_hash_func.h
-gcc48/include/c++/profile/impl/profiler_hashtable_size.h
-gcc48/include/c++/profile/impl/profiler_list_to_slist.h
-gcc48/include/c++/profile/impl/profiler_list_to_vector.h
-gcc48/include/c++/profile/impl/profiler_map_to_unordered_map.h
-gcc48/include/c++/profile/impl/profiler_node.h
-gcc48/include/c++/profile/impl/profiler_state.h
-gcc48/include/c++/profile/impl/profiler_trace.h
-gcc48/include/c++/profile/impl/profiler_vector_size.h
-gcc48/include/c++/profile/impl/profiler_vector_to_list.h
-gcc48/include/c++/profile/iterator_tracker.h
-gcc48/include/c++/profile/list
-gcc48/include/c++/profile/map
-gcc48/include/c++/profile/map.h
-gcc48/include/c++/profile/multimap.h
-gcc48/include/c++/profile/multiset.h
-gcc48/include/c++/profile/set
-gcc48/include/c++/profile/set.h
-gcc48/include/c++/profile/unordered_base.h
-gcc48/include/c++/profile/unordered_map
-gcc48/include/c++/profile/unordered_set
-gcc48/include/c++/profile/vector
-gcc48/include/c++/queue
-gcc48/include/c++/random
-gcc48/include/c++/ratio
-gcc48/include/c++/regex
-gcc48/include/c++/scoped_allocator
-gcc48/include/c++/set
-gcc48/include/c++/sstream
-gcc48/include/c++/stack
-gcc48/include/c++/stdexcept
-gcc48/include/c++/streambuf
-gcc48/include/c++/string
-gcc48/include/c++/system_error
-gcc48/include/c++/tgmath.h
-gcc48/include/c++/thread
-gcc48/include/c++/tr1/array
-gcc48/include/c++/tr1/bessel_function.tcc
-gcc48/include/c++/tr1/beta_function.tcc
-gcc48/include/c++/tr1/ccomplex
-gcc48/include/c++/tr1/cctype
-gcc48/include/c++/tr1/cfenv
-gcc48/include/c++/tr1/cfloat
-gcc48/include/c++/tr1/cinttypes
-gcc48/include/c++/tr1/climits
-gcc48/include/c++/tr1/cmath
-gcc48/include/c++/tr1/complex
-gcc48/include/c++/tr1/complex.h
-gcc48/include/c++/tr1/cstdarg
-gcc48/include/c++/tr1/cstdbool
-gcc48/include/c++/tr1/cstdint
-gcc48/include/c++/tr1/cstdio
-gcc48/include/c++/tr1/cstdlib
-gcc48/include/c++/tr1/ctgmath
-gcc48/include/c++/tr1/ctime
-gcc48/include/c++/tr1/ctype.h
-gcc48/include/c++/tr1/cwchar
-gcc48/include/c++/tr1/cwctype
-gcc48/include/c++/tr1/ell_integral.tcc
-gcc48/include/c++/tr1/exp_integral.tcc
-gcc48/include/c++/tr1/fenv.h
-gcc48/include/c++/tr1/float.h
-gcc48/include/c++/tr1/functional
-gcc48/include/c++/tr1/functional_hash.h
-gcc48/include/c++/tr1/gamma.tcc
-gcc48/include/c++/tr1/hashtable.h
-gcc48/include/c++/tr1/hashtable_policy.h
-gcc48/include/c++/tr1/hypergeometric.tcc
-gcc48/include/c++/tr1/inttypes.h
-gcc48/include/c++/tr1/legendre_function.tcc
-gcc48/include/c++/tr1/limits.h
-gcc48/include/c++/tr1/math.h
-gcc48/include/c++/tr1/memory
-gcc48/include/c++/tr1/modified_bessel_func.tcc
-gcc48/include/c++/tr1/poly_hermite.tcc
-gcc48/include/c++/tr1/poly_laguerre.tcc
-gcc48/include/c++/tr1/random
-gcc48/include/c++/tr1/random.h
-gcc48/include/c++/tr1/random.tcc
-gcc48/include/c++/tr1/regex
-gcc48/include/c++/tr1/riemann_zeta.tcc
-gcc48/include/c++/tr1/shared_ptr.h
-gcc48/include/c++/tr1/special_function_util.h
-gcc48/include/c++/tr1/stdarg.h
-gcc48/include/c++/tr1/stdbool.h
-gcc48/include/c++/tr1/stdint.h
-gcc48/include/c++/tr1/stdio.h
-gcc48/include/c++/tr1/stdlib.h
-gcc48/include/c++/tr1/tgmath.h
-gcc48/include/c++/tr1/tuple
-gcc48/include/c++/tr1/type_traits
-gcc48/include/c++/tr1/unordered_map
-gcc48/include/c++/tr1/unordered_map.h
-gcc48/include/c++/tr1/unordered_set
-gcc48/include/c++/tr1/unordered_set.h
-gcc48/include/c++/tr1/utility
-gcc48/include/c++/tr1/wchar.h
-gcc48/include/c++/tr1/wctype.h
-gcc48/include/c++/tr2/bool_set
-gcc48/include/c++/tr2/bool_set.tcc
-gcc48/include/c++/tr2/dynamic_bitset
-gcc48/include/c++/tr2/ratio
-gcc48/include/c++/tr2/type_traits
-gcc48/include/c++/tuple
-gcc48/include/c++/type_traits
-gcc48/include/c++/typeindex
-gcc48/include/c++/typeinfo
-gcc48/include/c++/unordered_map
-gcc48/include/c++/unordered_set
-gcc48/include/c++/utility
-gcc48/include/c++/valarray
-gcc48/include/c++/vector
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/atomic_word.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/basic_file.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/c++allocator.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/c++config.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/c++io.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/c++locale.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/cpu_defines.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/ctype_base.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/ctype_inline.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/cxxabi_tweaks.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/error_constants.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/extc++.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/gthr-default.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/gthr-posix.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/gthr-single.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/gthr.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/messages_members.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/opt_random.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/os_defines.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/stdc++.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/stdtr1c++.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/bits/time_members.h
-gcc48/include/c++/${MACHINE_GNU_PLATFORM}/ext/opt_random.h
-gcc48/info/cpp.info
-gcc48/info/cppinternals.info
-gcc48/info/gcc.info
-gcc48/info/gccinstall.info
-gcc48/info/gccint.info
-gcc48/info/libgomp.info
-gcc48/info/libitm.info
-gcc48/info/libquadmath.info
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/adxintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/ammintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/avx2intrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/avxintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/bmi2intrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/bmiintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/bmmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/cpuid.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/cross-stdarg.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/emmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/f16cintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/fma4intrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/fmaintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/fxsrintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/ia32intrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/immintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/lwpintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/lzcntintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/mm3dnow.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/mm_malloc.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/mmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/nmmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/omp.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/pmmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/popcntintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/prfchwintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/rdseedintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/rtmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/smmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/ssp/ssp.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/ssp/stdio.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/ssp/string.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/ssp/unistd.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/tbmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/tgmath.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/tmmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/unwind.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/wmmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/x86intrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/xmmintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/xopintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/xsaveintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/xsaveoptintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/xtestintrin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/fixinc_list
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/gsyslimits.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/include/README
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/include/limits.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/macro_list
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/mkheaders.conf
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libgcc.a
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libgcov.a
-gcc48/lib/libgomp.spec
-gcc48/lib/libiberty.a
-gcc48/lib/libitm.spec
-gcc48/lib/libssp_nonshared.la
-gcc48/lib/libstdc++.so.6.19-gdb.py
-gcc48/lib/libsupc++.la
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1plus
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/collect2
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/fixinc.sh
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/fixincl
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/mkheaders
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/install-tools/mkinstalldirs
-gcc48/man/man1/cpp.1
-gcc48/man/man1/g++.1
-gcc48/man/man1/gcc.1
-gcc48/man/man1/gcov.1
-gcc48/man/man7/fsf-funding.7
-gcc48/man/man7/gfdl.7
-gcc48/man/man7/gpl.7
-gcc48/share/gcc-${PKGVERSION}/python/libstdcxx/__init__.py
-gcc48/share/gcc-${PKGVERSION}/python/libstdcxx/v6/__init__.py
-gcc48/share/gcc-${PKGVERSION}/python/libstdcxx/v6/printers.py
-@pkgdir gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/finclude
diff --git a/lang/gcc48-cc++/PLIST.NetBSD b/lang/gcc48-cc++/PLIST.NetBSD
deleted file mode 100644
index 7278ac9fda2..00000000000
--- a/lang/gcc48-cc++/PLIST.NetBSD
+++ /dev/null
@@ -1,181 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.2 2014/05/31 13:06:25 ryoon Exp $
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/README
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/curses.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/limits.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/math.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_compat.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_fil.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_lookup.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_nat.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_proxy.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_scan.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/netinet/ip_state.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/stddef.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/stdio.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/stdlib.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/sys/types.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/syslimits.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/wchar.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/float.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/iso646.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/stdalign.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/stdarg.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/stdbool.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/stddef.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/stdfix.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/stdnoreturn.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/varargs.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libgcc_eh.a
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libgcc_eh.a
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/gtype.state
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/ada/gcc-interface/ada-tree.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/alias.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/all-tree.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/alloc-pool.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/ansidecl.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/auto-host.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/b-header-vars
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/basic-block.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/bitmap.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/builtins.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/bversion.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/c-family/c-common.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/c-family/c-common.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/c-family/c-objc.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/c-family/c-pragma.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/c-family/c-pretty-print.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/c-tree.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cfg-flags.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cfghooks.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cfgloop.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cgraph.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cif-code.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/dbxelf.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/elfos.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/i386/att.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/i386/biarch64.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/i386/i386-opts.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/i386/i386-protos.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/i386/i386.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/i386/netbsd64.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/i386/unix.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/i386/x86-64.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/initfini-array.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/netbsd-elf.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/netbsd.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/config/vxworks-dummy.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/configargs.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/coretypes.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cp/cp-tree.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cp/cp-tree.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cp/cxx-pretty-print.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cp/name-lookup.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cppdefault.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/cpplib.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/debug.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/defaults.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/diagnostic-core.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/diagnostic.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/diagnostic.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/double-int.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/dumpfile.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/emit-rtl.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/except.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/filenames.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/fixed-value.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/flag-types.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/flags.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/function.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/gcc-plugin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/genrtl.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/ggc.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/gimple-pretty-print.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/gimple.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/gimple.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/gsstruct.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/gtm-builtins.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/gtype-desc.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/hard-reg-set.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/hashtab.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/highlev-plugin-common.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/hwint.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/incpath.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/input.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/insn-constants.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/insn-flags.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/insn-modes.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/insn-notes.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/internal-fn.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/internal-fn.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/intl.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/ipa-prop.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/ipa-ref-inline.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/ipa-ref.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/ipa-reference.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/ipa-utils.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/is-a.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/java/java-tree.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/langhooks.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/libiberty.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/line-map.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/machmode.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/md5.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/mode-classes.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/objc/objc-tree.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/obstack.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/omp-builtins.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/options.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/opts.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/output.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/params.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/params.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/plugin-api.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/plugin-version.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/plugin.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/plugin.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/pointer-set.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/predict.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/predict.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/prefix.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/pretty-print.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/real.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/realmpfr.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/reg-notes.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/rtl.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/rtl.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/safe-ctype.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/sanitizer.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/sbitmap.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/splay-tree.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/statistics.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/symtab.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/symtab.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/sync-builtins.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/system.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/target-hooks-macros.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/target.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/target.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/timevar.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/timevar.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tm-preds.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tm.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tm_p.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/toplev.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-check.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-dump.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-flow-inline.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-flow.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-inline.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-iterator.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-pass.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-pretty-print.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-ssa-alias.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-ssa-operands.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree-ssa-sccvn.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/tree.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/treestruct.def
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/vec.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/include/version.h
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/plugin/gengtype
diff --git a/lang/gcc48-cc++/PLIST.OpenBSD b/lang/gcc48-cc++/PLIST.OpenBSD
deleted file mode 100644
index 50bc7d1e2ba..00000000000
--- a/lang/gcc48-cc++/PLIST.OpenBSD
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.1 2014/05/31 13:06:25 ryoon Exp $
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/README
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/limits.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/rpc/rpc_des.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/rpc/svc.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/stddef.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/stdio.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/stdlib.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/sys/types.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/syslimits.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include-fixed/wchar.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/quadmath.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/quadmath_weak.h
diff --git a/lang/gcc48-cc++/PLIST.nls b/lang/gcc48-cc++/PLIST.nls
deleted file mode 100644
index cca8190c8b8..00000000000
--- a/lang/gcc48-cc++/PLIST.nls
+++ /dev/null
@@ -1,40 +0,0 @@
-@comment $NetBSD: PLIST.nls,v 1.1 2014/05/31 13:06:25 ryoon Exp $
-gcc48/share/locale/be/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/be/LC_MESSAGES/gcc.mo
-gcc48/share/locale/ca/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/da/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/da/LC_MESSAGES/gcc.mo
-gcc48/share/locale/de/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/de/LC_MESSAGES/gcc.mo
-gcc48/share/locale/el/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/el/LC_MESSAGES/gcc.mo
-gcc48/share/locale/eo/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/es/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/es/LC_MESSAGES/gcc.mo
-gcc48/share/locale/fi/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/fi/LC_MESSAGES/gcc.mo
-gcc48/share/locale/fr/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/fr/LC_MESSAGES/gcc.mo
-gcc48/share/locale/hr/LC_MESSAGES/gcc.mo
-gcc48/share/locale/id/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/id/LC_MESSAGES/gcc.mo
-gcc48/share/locale/ja/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/ja/LC_MESSAGES/gcc.mo
-gcc48/share/locale/nl/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/nl/LC_MESSAGES/gcc.mo
-gcc48/share/locale/pt_BR/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/ru/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/ru/LC_MESSAGES/gcc.mo
-gcc48/share/locale/sr/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/sr/LC_MESSAGES/gcc.mo
-gcc48/share/locale/sv/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/sv/LC_MESSAGES/gcc.mo
-gcc48/share/locale/tr/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/tr/LC_MESSAGES/gcc.mo
-gcc48/share/locale/uk/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/vi/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/vi/LC_MESSAGES/gcc.mo
-gcc48/share/locale/zh_CN/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/zh_CN/LC_MESSAGES/gcc.mo
-gcc48/share/locale/zh_TW/LC_MESSAGES/cpplib.mo
-gcc48/share/locale/zh_TW/LC_MESSAGES/gcc.mo
diff --git a/lang/gcc48-cc++/buildlink3.mk b/lang/gcc48-cc++/buildlink3.mk
deleted file mode 100644
index fdfbc1f436d..00000000000
--- a/lang/gcc48-cc++/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/09/13 01:12:09 obache Exp $
-
-BUILDLINK_TREE+= gcc48-ccxx
-
-.if !defined(GCC48_CCXX_BUILDLINK3_MK)
-GCC48_CCXX_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gcc48-ccxx+= gcc48-cc++>=4.8
-BUILDLINK_PKGSRCDIR.gcc48-ccxx?= ../../lang/gcc48-cc++
-
-BUILDLINK_GCC48_LIBDIRS= gcc48/lib
-BUILDLINK_LIBDIRS.gcc48-ccxx+= ${BUILDLINK_GCC48_LIBDIRS}
-BUILDLINK_DEPMETHOD.gcc48-ccxx?= build
-.endif # GCC48_CCXX_BUILDLINK3_MK
-
-# Packages that link against shared libraries need a full dependency.
-.if defined(_USE_GCC_SHLIB)
-DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs
-ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs
-.endif
-
-BUILDLINK_TREE+= -gcc48-ccxx
diff --git a/lang/gcc48-fortran/DESCR b/lang/gcc48-fortran/DESCR
deleted file mode 100644
index 25b464d5a19..00000000000
--- a/lang/gcc48-fortran/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The Fortran 95/2003/2008 compiler from the GNU Compiler
-Collection (GCC) 4.8 release branch.
diff --git a/lang/gcc48-fortran/Makefile b/lang/gcc48-fortran/Makefile
deleted file mode 100644
index 543abe56cd7..00000000000
--- a/lang/gcc48-fortran/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2014/04/22 20:46:41 ryoon Exp $
-
-PKGNAME= ${GCC_PKGNAME}-fortran-${GCC48_DIST_VERSION}
-
-COMMENT= Fortran 95/2003/2008 compiler from the GNU Compiler Collection (GCC) 4.8
-
-DISTINFO_FILE= ${.CURDIR}/../../lang/gcc48/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/gcc48/patches
-
-DEPENDS+= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48-libs
-
-# c,c++ are specified by default.
-LANGS+= fortran
-
-.include "../../lang/gcc48/options.mk"
-
-.include "../../lang/gcc48/Makefile.common"
-
-post-install:
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/bin/*c++*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/bin/*cpp*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/bin/*gcc*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/bin/*g++
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/bin/gcov
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/include
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/cc1*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/collect2
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/install-tools
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/install-tools
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/include-fixed
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/include
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/plugin
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/libgc*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/*lto*
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/plugin
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libatomic.*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libgc*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libgfortran.*a
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libgfortran.so*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libgomp*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libiberty*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libitm*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/libs*
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/info
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/man
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/share
-
- cd ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/bin && \
- ${LN} -sf gfortran f77 && \
- ${LN} -sf gfortran g77 && \
- ${LN} -sf gfortran g95
diff --git a/lang/gcc48-fortran/PLIST b/lang/gcc48-fortran/PLIST
deleted file mode 100644
index de9318d2ef9..00000000000
--- a/lang/gcc48-fortran/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/04/22 20:46:41 ryoon Exp $
-gcc48/bin/f77
-gcc48/bin/g77
-gcc48/bin/g95
-gcc48/bin/gfortran
-gcc48/bin/${MACHINE_GNU_PLATFORM}-gfortran
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/finclude/omp_lib.f90
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/finclude/omp_lib.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/finclude/omp_lib.mod
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/finclude/omp_lib_kinds.mod
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libcaf_single.la
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/libgfortranbegin.la
-gcc48/lib/libgfortran.spec
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/f951
diff --git a/lang/gcc48-fortran/buildlink3.mk b/lang/gcc48-fortran/buildlink3.mk
deleted file mode 100644
index 914bc9ee4d0..00000000000
--- a/lang/gcc48-fortran/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/09/06 08:20:29 jperkin Exp $
-
-BUILDLINK_TREE+= gcc48-fortran
-
-.if !defined(GCC48_FORTRAN_BUILDLINK3_MK)
-GCC48_FORTRAN_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gcc48-fortran+= gcc48-fortran>=4.8
-BUILDLINK_PKGSRCDIR.gcc48-fortran?= ../../lang/gcc48-fortran
-
-BUILDLINK_GCC48_LIBDIRS= gcc48/lib
-BUILDLINK_LIBDIRS.gcc48-fortran+= ${BUILDLINK_GCC48_LIBDIRS}
-BUILDLINK_DEPMETHOD.gcc48-fortran?= build
-.endif # GCC48_FORTRAN_BUILDLINK3_MK
-
-# Packages that link against shared libraries need a full dependency.
-.if defined(_USE_GCC_SHLIB)
-DEPENDS+= gcc48-libs>=4.8:../../lang/gcc48-libs
-ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs
-.endif
-
-BUILDLINK_TREE+= -gcc48-fortran
diff --git a/lang/gcc48-libs/DESCR b/lang/gcc48-libs/DESCR
index a6bfe8421e9..67396068e82 100644
--- a/lang/gcc48-libs/DESCR
+++ b/lang/gcc48-libs/DESCR
@@ -1 +1,3 @@
-The runtime libraries from the GNU Compiler Collection (GCC) 4.8 release branch.
+The GNU Compiler Collection (GCC) includes front ends for C, C++, Objective-C,
+Fortran, and Go, as well as libraries for these languages (libstdc++,
+libgfortran, ...).
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile
index 0d21992f3bc..b028f5461ef 100644
--- a/lang/gcc48-libs/Makefile
+++ b/lang/gcc48-libs/Makefile
@@ -1,107 +1,66 @@
-# $NetBSD: Makefile,v 1.15 2014/05/31 13:06:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2014/10/31 14:22:20 ryoon Exp $
-PKGNAME= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}
-
-COMMENT= Runtime libraries from the GNU Compiler Collection (GCC) 4.8
-
-DISTINFO_FILE= ${.CURDIR}/../../lang/gcc48/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/gcc48/patches
-
-LANGS= fortran
-
-.include "../../lang/gcc48/options.mk"
+GCC_PKGNAME= gcc48
+.include "../../lang/${GCC_PKGNAME}/version.mk"
-.include "../../lang/gcc48/c++.mk"
-
-INSTALLATION_DIRS= ${GCC_PKGNAME}/lib \
- ${GCC_PKGNAME}/lib/gcj-${GCC48_DIST_VERSION}-14 \
- ${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
+DISTNAME= gcc-${GCC48_DIST_VERSION}
+PKGNAME= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}
+## The PKGREVISION of this package needs to be at least 1 more than the
+## PKGREVISION of the lang/gcc48 package so that with the dependence pattern
+## '{gcc48,gcc48-libs}>=4.8.*' pkg_all will choose gcc48-libs over gcc48.
+PKGREVISION= 1
+CATEGORIES= lang
+MASTER_SITES= # empty
+DISTFILES= # empty
-.if !empty(PKG_OPTIONS:Mgcc-java)
-INSTALLATION_DIRS+= java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/client \
- java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server
-.endif
+MAINTAINER= sbd@NetBSD.org
+HOMEPAGE= http://gcc.gnu.org/
+COMMENT= The GNU Compiler Collection (GCC) support shared libraries.
+LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
-do-install:
-.if ${OPSYS} != "NetBSD"
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libquadmath/libquadmath.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
-.endif
+USE_TOOLS+= pax
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libatomic/libatomic.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+NO_BUILD= yes
-.if ${OPSYS} == "NetBSD"
-# libgcc_s has no libtool la file.
- ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgcc/libgcc_s.* \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
-.endif
+## Depend on exactly ${GCC48_DIST_VERSION}.
+BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgfortran/libgfortran.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+.include "../../mk/bsd.prefs.mk"
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libgomp/libgomp.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+FIND_PREFIX:= GCC_PKG_PREFIX=${GCC_PKGNAME}-${GCC48_DIST_VERSION}*
+.include "../../mk/find-prefix.mk"
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libitm/libitm.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+LIBGCC_SUBPREFIX= ${GCC_PKGNAME}
+LIBGCC_PREFIX= ${GCC_PKG_PREFIX}/${LIBGCC_SUBPREFIX}
+GCC_TARGET_MACHINE?= ${MACHINE_GNU_PLATFORM}
+BUILD_DEFS+= GCC_TARGET_MACHINE
-.if ${OPSYS} == "Darwin"
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libobjc/libobjc-gnu.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+.include "../../mk/bsd.prefs.mk"
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+SHLIB_EXT= dylib
.else
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libobjc/libobjc.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
-
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/lto-plugin/liblto_plugin.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
-
- ${INSTALL_PROGRAM} ${WRKSRC}/${OBJDIR}/gcc/lto1 \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
-
- ${INSTALL_PROGRAM} ${WRKSRC}/${OBJDIR}/gcc/lto-wrapper \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}
+SHLIB_EXT= so
.endif
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libstdc++-v3/src/libstdc++.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
-
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libssp/libssp.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+LIBRARY_FILES= ${WRKDIR}/lib_files
-.if !empty(PKG_OPTIONS:Mgcc-java)
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libjava/libjvm.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcj-${GCC48_DIST_VERSION}-14
+GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
+ ${LIBRARY_FILES};
+GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
+ ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ;
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libjava/libgcj.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
+${LIBRARY_FILES}:
+ ${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC48_DIST_VERSION}*' | \
+ ${SED} -n -e's,^${LIBGCC_PREFIX}/,,' -e'/libexec\//d' \
+ -e'/libgij/d;/libgcj/d;/libjvm/d' \
+ -e'/lib.*\.${SHLIB_EXT}/p' >${LIBRARY_FILES}
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libjava/libgij.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
-
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/${OBJDIR}/${MACHINE_GNU_PLATFORM}/libjava/libgcj-tools.la \
- ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib
-
- cd ${DESTDIR}${PREFIX}/java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/client && \
- ${LN} -sf ../../../../../../${GCC_PKGNAME}/lib/gcj-${GCC48_DIST_VERSION}-14/libjvm.so .
-
- cd ${DESTDIR}${PREFIX}/java/${GCC_PKGNAME}/jre/lib/${MACHINE_ARCH:S/x86_64/amd64/}/server && \
- ${LN} -sf ../../../../../../${GCC_PKGNAME}/lib/gcj-${GCC48_DIST_VERSION}-14/libjvm.so .
-.endif
+do-install: ${LIBRARY_FILES}
+ ${TEST} -d ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib || \
+ ${MKDIR} ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE}/lib
+ cd ${LIBGCC_PREFIX} && \
+ ${PAX} -rw ${DESTDIR}${LIBGCC_PREFIX}/${GCC_TARGET_MACHINE} <${LIBRARY_FILES}
-.include "../../lang/gcc48/Makefile.common"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc48-libs/PLIST b/lang/gcc48-libs/PLIST
deleted file mode 100644
index 9103627f963..00000000000
--- a/lang/gcc48-libs/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2014/05/31 13:06:25 ryoon Exp $
-${PLIST.java}gcc48/lib/gcj-${PKGVERSION}-14/libjvm.la
-gcc48/lib/libatomic.la
-${PLIST.libgcc_s}gcc48/lib/libgcc_s.so
-${PLIST.libgcc_s}gcc48/lib/libgcc_s.so.1
-${PLIST.java}gcc48/lib/libgcj-tools.la
-${PLIST.java}gcc48/lib/libgcj.la
-gcc48/lib/libgfortran.la
-${PLIST.java}gcc48/lib/libgij.la
-gcc48/lib/libgomp.la
-gcc48/lib/libitm.la
-${PLIST.darwin}gcc48/lib/libobjc-gnu.la
-${PLIST.unix}gcc48/lib/libobjc.la
-${PLIST.nonetbsd}gcc48/lib/libquadmath.la
-gcc48/lib/libssp.la
-gcc48/lib/libstdc++.la
-${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/liblto_plugin.la
-${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/lto-wrapper
-${PLIST.unix}gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION_NOREV}/lto1
-${PLIST.java}java/gcc48/jre/lib/${JAVA_MACHINE_ARCH}/client/libjvm.so
-${PLIST.java}java/gcc48/jre/lib/${JAVA_MACHINE_ARCH}/server/libjvm.so
diff --git a/lang/gcc48-libs/buildlink3.mk b/lang/gcc48-libs/buildlink3.mk
index 768a45a829e..75a950efc0d 100644
--- a/lang/gcc48-libs/buildlink3.mk
+++ b/lang/gcc48-libs/buildlink3.mk
@@ -1,11 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/05/31 13:06:25 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2014/10/31 14:22:20 ryoon Exp $
BUILDLINK_TREE+= gcc48-libs
.if !defined(GCC48_LIBS_BUILDLINK3_MK)
GCC48_LIBS_BUILDLINK3_MK:=
+.if !empty(USE_PKGSRC_GCC_RUNTIME:M[Yy][Ee][Ss])
BUILDLINK_API_DEPENDS.gcc48-libs+= gcc48-libs>=4.8.0
+.else
+BUILDLINK_API_DEPENDS.gcc48-libs+= {gcc48,gcc48-libs}>=4.8.0
+.endif
BUILDLINK_PKGSRCDIR.gcc48-libs= ../../lang/gcc48-libs
BUILDLINK_DEPMETHOD.gcc48-libs?= full
diff --git a/lang/gcc48-objc/DESCR b/lang/gcc48-objc/DESCR
deleted file mode 100644
index 5dffb30718a..00000000000
--- a/lang/gcc48-objc/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Objective C and Objective C++ compiler from the GNU Compiler
-Collection (GCC) 4.8 release branch.
diff --git a/lang/gcc48-objc/Makefile b/lang/gcc48-objc/Makefile
deleted file mode 100644
index 00ceb40920f..00000000000
--- a/lang/gcc48-objc/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2014/04/22 20:46:41 ryoon Exp $
-
-PKGNAME= ${GCC_PKGNAME}-objc-${GCC48_DIST_VERSION}
-
-COMMENT= Objective C/Objective C++ compiler from the GNU Compiler Collection (GCC) 4.8
-
-DISTINFO_FILE= ${.CURDIR}/../../lang/gcc48/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/gcc48/patches
-
-DEPENDS+= ${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48-libs
-DEPENDS+= ${GCC_PKGNAME}-cc++-${GCC48_DIST_VERSION}{,nb[0-9]*}:../../lang/gcc48-cc++
-
-.include "../../lang/gcc48/options.mk"
-
-.include "../../lang/gcc48/c++.mk"
-
-.include "../../lang/gcc48/Makefile.common"
-
-post-install:
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/bin
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/lib*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/lib*
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/finclude
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/include-fixed
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/install-tools
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/include/*.h
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/lib*
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/include/ssp
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/lib/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/plugin
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/include
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/info
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/man
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/share
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/cc1
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/cc1plus
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/collect2
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/install-tools
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/liblto_plugin.la
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/lto*
- rm -f ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/lib*
- rm -rf ${DESTDIR}${PREFIX}/${GCC_PKGNAME}/libexec/gcc/${MACHINE_GNU_PLATFORM}/${GCC48_DIST_VERSION}/plugin
diff --git a/lang/gcc48-objc/PLIST b/lang/gcc48-objc/PLIST
deleted file mode 100644
index 8eadfefef2a..00000000000
--- a/lang/gcc48-objc/PLIST
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/04/22 20:46:41 ryoon Exp $
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/NXConstStr.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/Object.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/Protocol.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/message.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc-decls.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc-exception.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc-sync.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/objc.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/runtime.h
-gcc48/lib/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/include/objc/thr.h
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1obj
-gcc48/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1objplus
diff --git a/lang/gcc48-objc/buildlink3.mk b/lang/gcc48-objc/buildlink3.mk
deleted file mode 100644
index b176b47f960..00000000000
--- a/lang/gcc48-objc/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/09/06 08:20:29 jperkin Exp $
-
-BUILDLINK_TREE+= gcc48-objc
-
-.if !defined(GCC48_OBJC_BUILDLINK3_MK)
-GCC48_OBJC_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gcc48-objc+= gcc48-objc>=4.8
-BUILDLINK_PKGSRCDIR.gcc48-objc?= ../../lang/gcc48-objc
-
-BUILDLINK_GCC48_LIBDIRS= gcc48/lib
-BUILDLINK_LIBDIRS.gcc48-objc+= ${BUILDLINK_GCC48_LIBDIRS}
-BUILDLINK_DEPMETHOD.gcc48-objc?= build
-.endif # GCC48_OBJC_BUILDLINK3_MK
-
-# Packages that link against shared libraries need a full dependency.
-.if defined(_USE_GCC_SHLIB)
-DEPENDS+= gcc48-libs>=4.8:../../lang/gcc48-libs
-ABI_DEPENDS+= gcc48-libs>=4.8.0:../../lang/gcc48-libs
-.endif
-
-BUILDLINK_TREE+= -gcc48-objc
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 21f75bf0988..49c80931315 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,21 +1,157 @@
-# $NetBSD: Makefile,v 1.16 2014/05/31 13:06:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2014/10/31 14:22:20 ryoon Exp $
GCC_PKGNAME= gcc48
.include "version.mk"
+DISTNAME= gcc-${GCC48_DIST_VERSION}
PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION}
+## When bumping the PKGREVISION of this package the PKGREVISION of
+## lang/gcc48-libs needs to be bump to be at least 1 more than the
+## PKGREVISION of this package!
+PKGREVISION= 1
CATEGORIES= lang
+MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= sbd@NetBSD.org
HOMEPAGE= http://gcc.gnu.org/
COMMENT= The GNU Compiler Collection (GCC) - 4.8 Release Series
LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
-META_PACKAGE= yes
+DISTFILES= ${DEFAULT_DISTFILES}
+EXTRACT_ONLY= ${DEFAULT_DISTFILES}
-DEPENDS+= gcc48-libs-[0-9]*:../../lang/gcc48-libs
-DEPENDS+= gcc48-cc++-[0-9]*:../../lang/gcc48-cc++
-DEPENDS+= gcc48-fortran-[0-9]*:../../lang/gcc48-fortran
-DEPENDS+= gcc48-objc-[0-9]*:../../lang/gcc48-objc
+NOT_FOR_PLATFORM= Interix-*-*
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake makeinfo sed:run
+GNU_CONFIGURE= yes
+## Build outside ${WRKSRC}
+OBJDIR= ../build
+CONFIGURE_DIRS= ${OBJDIR}
+CONFIGURE_SCRIPT= ../${DISTNAME}/configure
+GCC_SUBPREFIX= ${GCC_PKGNAME}
+GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
+GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
+INFO_FILES= yes
+
+UNLIMIT_RESOURCES+= datasize
+UNLIMIT_RESOURCES+= stacksize
+
+SUBST_CLASSES+= vars
+SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars}
+SUBST_STAGE.vars= pre-configure
+SUBST_FILES.vars= gcc/Makefile.in
+SUBST_VARS.vars= GCC_TARGET_MACHINE
+
+.include "../../mk/bsd.prefs.mk"
+
+LANGS= c
+
+# In some cases LINKER_RPATH_FLAG needs a trailing space.
+LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
+
+## The Library rpath to use in end programs.
+LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
+
+# The "-static-libstdc++ -static-libgcc" flags are normally added to the
+# boot-ldflags by configure but because we are supply the boot-ldflags
+# we mash supply them.
+BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
+# Needed on Darwin when LDFLAGS point to a SDK
+BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
+# GCC does not understand this option; remove it, or stage build will fail
+BUILDLINK_TRANSFORM+= rm:-stdlib=libc++
+
+## For target librarys and libjava programs.
+CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
+
+CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
+CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --enable-long-long
+CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
+CONFIGURE_ARGS+= --enable-libssp
+CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
+.if ${OPSYS} == "NetBSD"
+CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld
+CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as
+MAKE_ENV+= ac_cv_func_clock_gettime=yes
+.endif
+.if ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+= --disable-bootstrap
+.endif
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
+CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
+.endif
+
+.include "options.mk"
+
+# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
+# a binary so we need to make sure we give it the installed sed and not
+# the tool wrapped one.
+MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
+MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
+
+# Determine whether to use binutils
+.if ${OPSYS} == "SunOS"
+. if exists(/usr/sfw/bin/gobjdump)
+CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
+. endif
+. if exists(/usr/bin/ld)
+CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
+. else
+CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
+. endif
+. if exists(/usr/sfw/bin/gas)
+CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
+. elif exists(/usr/ccs/bin/as)
+CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
+. else
+BUILDLINK_DEPMETHOD.binutils= full
+. include "../../devel/binutils/buildlink3.mk"
+CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
+. endif
+.endif
+
+pre-configure:
+.if ${OPSYS} == "OpenBSD"
+ cd ${WRKSRC}/gcc && \
+ patch -p1 < ${FILESDIR}/patch-gcc_targhooks.c-openbsd.diff
+.endif
+ ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
+
+TEST_TARGET= -k check || ${TRUE}
+pre-test:
+ ${RUN} \
+ if runtest --version >/dev/null 2>/dev/null ; then \
+ : ; \
+ else \
+ ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
+ exit 1 ; \
+ fi
+post-test:
+ ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
+ ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
+ @${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
+
+post-install:
+ ${TEST} -f ${DESTDIR}${GCC_PREFIX}/bin/cc || \
+ ( cd ${DESTDIR}${GCC_PREFIX}/bin ; ${LN} -f gcc cc )
+.if !empty(PKG_OPTIONS:Mgcc-java)
+ ${RM} -f ${DESTDIR}${JAVA_HOME}/bin/javadoc
+ ${RM} -f ${DESTDIR}${JAVA_HOME}/jre/lib/${JAVA_ARCH}/libjawt.so
+.endif
+.if !empty(MACHINE_PLATFORM:MSunOS-*-*86*) && ${OS_VERSION} != "5.11"
+ ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m32 || ${TRUE}
+ ${SH} files/values.c ${DESTDIR}${GCC_PREFIX}/bin/gcc -m64 || ${TRUE}
+.endif
+
+GENERATE_PLIST+= \
+ cd ${DESTDIR}${PREFIX} && \
+ ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ;
+
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc48/Makefile.common b/lang/gcc48/Makefile.common
deleted file mode 100644
index 2d213899b06..00000000000
--- a/lang/gcc48/Makefile.common
+++ /dev/null
@@ -1,180 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2014/10/05 16:41:07 wiz Exp $
-#
-# used by lang/gcc48-objc/Makefile
-# used by lang/gcc48-libs/Makefile
-# used by lang/gcc48-fortran/Makefile
-# used by lang/gcc48-cc++/Makefile
-
-GCC_PKGNAME= gcc48
-.include "../../lang/gcc48/version.mk"
-
-DISTNAME= gcc-${GCC48_DIST_VERSION}
-## When bumping the PKGREVISION of this package the PKGREVISION of
-## lang/gcc48-* needs to be bump to be at least 1 more than the
-## PKGREVISION of this package!
-CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= sbd@NetBSD.org
-HOMEPAGE= http://gcc.gnu.org/
-LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
-
-DISTFILES+= ${DEFAULT_DISTFILES}
-EXTRACT_ONLY+= ${DEFAULT_DISTFILES}
-
-DISTINFO_FILE= ${.CURDIR}/../../lang/gcc48/distinfo
-PATCHDIR= ${.CURDIR}/../../lang/gcc48/patches
-FILESDIR= ${.CURDIR}/../../lang/gcc48/files
-
-NOT_FOR_PLATFORM= Interix-*-*
-
-USE_LANGUAGES= c c++
-USE_TOOLS+= bison gmake makeinfo perl:build sed:run
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-## Build outside ${WRKSRC}
-OBJDIR= ../build
-CONFIGURE_DIRS= ${OBJDIR}
-CONFIGURE_SCRIPT= ../${DISTNAME}/configure
-GCC_SUBPREFIX= ${GCC_PKGNAME}
-GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
-GNU_CONFIGURE_PREFIX= ${GCC_PREFIX}
-INFO_FILES= yes
-
-PLIST_VARS+= java darwin unix libgcc_s nonetbsd
-JAVA_MACHINE_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/}
-PLIST_SUBST+= JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH}
-PLIST_SUBST+= PKGVERSION_NOREV=${PKGVERSION_NOREV}
-
-# Errors in libgo/runtime/runtime.h
-#BUILDLINK_TRANSFORM+= rm:-Werror
-# segfault of gcj (Java) related programs
-#BUILDLINK_TRANSFORM+= rename:-O2:-O1
-
-UNLIMIT_RESOURCES+= datasize
-UNLIMIT_RESOURCES+= stacksize
-
-SUBST_CLASSES+= vars
-SUBST_MESSAGE.vars= Setting target machine name path in ${SUBST_FILES.vars}
-SUBST_STAGE.vars= pre-configure
-SUBST_FILES.vars= gcc/Makefile.in
-SUBST_VARS.vars= GCC_TARGET_MACHINE
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-PLIST.darwin= yes
-.elif ${OPSYS} != "NetBSD"
-PLIST.nonetbsd= yes
-PLIST.unix= yes
-.else # NetBSD
-PLIST.libgcc_s= yes
-PLIST.unix= yes
-.endif
-
-# In some cases LINKER_RPATH_FLAG needs a trailing space.
-LINKER_RPATH_FLAG:= ${LINKER_RPATH_FLAG:S/-rpath/& /}
-
-## The Library rpath to use in end programs.
-LDFLAGS_FOR_TARGET= ${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
-
-# The "-static-libstdc++ -static-libgcc" flags are normally added to the
-# boot-ldflags by configure but because we are supply the boot-ldflags
-# we mash supply them.
-.if ${OPSYS} == "OpenBSD"
-BOOT_LDFLAGS= -static ${LDFLAGS_FOR_TARGET}
-.else
-BOOT_LDFLAGS= -static-libstdc++ -static-libgcc ${LDFLAGS_FOR_TARGET}
-.endif
-# Needed on Darwin when LDFLAGS point to a SDK
-BOOT_LDFLAGS+= ${LDFLAGS:M-Wl,-syslibroot*}
-# GCC does not understand this option; remove it, or stage build will fail
-BUILDLINK_TRANSFORM+= rm:-stdlib=libc++
-
-## For target librarys and libjava programs.
-CONFIGURE_ENV+= LDFLAGS_FOR_TARGET=${LDFLAGS_FOR_TARGET:Q}
-
-CONFIGURE_ARGS+= --enable-languages=${LANGS:S/ /,/g:Q}
-CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= --enable-long-long
-CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q}
-CONFIGURE_ARGS+= --enable-libssp
-CONFIGURE_ARGS+= --enable-threads=posix
-CONFIGURE_ARGS+= --with-boot-ldflags=${BOOT_LDFLAGS:Q}
-.if ${OPSYS} == "NetBSD"
-#CONFIGURE_ARGS+= --disable-lto
-CONFIGURE_ARGS+= --with-gnu-ld --with-ld=/usr/bin/ld
-CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/bin/as
-MAKE_ENV+= ac_cv_func_clock_gettime=yes
-# for libjava's configure script
-MAKE_ENV+= ac_cv_func_gethostbyname_r=no
-.endif
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= --disable-bootstrap
-.endif
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
-CONFIGURE_ARGS+= --with-arch=i486 --with-tune=i486
-.endif
-
-# ${WRKSRC}/fixincludes/ looks for sed and compiles the path to sed into
-# a binary so we need to make sure we give it the installed sed and not
-# the tool wrapped one.
-MAKE_ENV+= ac_cv_path_SED=${TOOLS_SED}
-MAKE_ENV+= lt_cv_path_SED=${TOOLS_SED}
-
-# Determine whether to use binutils
-.if ${OPSYS} == "SunOS"
-. if exists(/usr/sfw/bin/gobjdump)
-CONFIGURE_ENV+= OBJDUMP=/usr/sfw/bin/gobjdump
-. endif
-. if exists(/usr/bin/ld)
-CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/bin/ld
-. else
-CONFIGURE_ARGS+= --without-gnu-ld --with-ld=/usr/ccs/bin/ld
-. endif
-. if exists(/usr/sfw/bin/gas)
-CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
-. elif exists(/usr/ccs/bin/as)
-CONFIGURE_ARGS+= --without-gnu-as --with-as=/usr/ccs/bin/as
-. else
-BUILDLINK_DEPMETHOD.binutils= full
-. include "../../devel/binutils/buildlink3.mk"
-CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
-. endif
-.elif ${OPSYS} == "OpenBSD"
-BUILDLINK_DEPMETHOD.binutils= full
-. include "../../devel/binutils/buildlink3.mk"
-CONFIGURE_ARGS+= --with-gnu-as --with-as=${PREFIX}/bin/gas
-.endif
-
-# Create in-tree isl and cloog
-.if !empty(PKG_OPTIONS:Mgcc-graphite)
-post-extract: post-extract-graphite
-.endif
-
-pre-configure:
-.if ${OPSYS} == "OpenBSD"
- cd ${WRKSRC}/gcc && \
- patch -p1 < ${FILESDIR}/patch-gcc_targhooks.c-openbsd.diff
-.endif
- ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
-
-TEST_TARGET= -k check || ${TRUE}
-pre-test:
- ${RUN} \
- if runtest --version >/dev/null 2>/dev/null ; then \
- : ; \
- else \
- ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite." ; \
- exit 1 ; \
- fi
-post-test:
- ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \
- ${SHELL} ${WRKSRC}/contrib/test_summary >${WRKDIR}/test_summary.log
- @${INFO_MSG} "Test summary are available in ${WRKDIR}/test_summary.log"
-
-.include "../../mk/dlopen.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc48/buildlink3.mk b/lang/gcc48/buildlink3.mk
new file mode 100644
index 00000000000..b4501aae19a
--- /dev/null
+++ b/lang/gcc48/buildlink3.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.5 2014/10/31 14:22:20 ryoon Exp $
+
+BUILDLINK_TREE+= gcc48
+
+.if !defined(GCC48_BUILDLINK3_MK)
+GCC48_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gcc48+= gcc48>=${_GCC_REQD}
+BUILDLINK_ABI_DEPENDS.gcc48+= gcc48>=4.8.0
+BUILDLINK_PKGSRCDIR.gcc48= ../../lang/gcc48
+BUILDLINK_DEPMETHOD.gcc48?= build
+
+FIND_PREFIX:= BUILDLINK_PREFIX.gcc48=gcc48
+.include "../../mk/find-prefix.mk"
+BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc48}/gcc48
+
+BUILDLINK_FILES.gcc48= #empty
+BUILDLINK_AUTO_VARS.gcc48= no
+
+# Packages that link against shared libraries need a full dependency.
+.if defined(_USE_GCC_SHLIB)
+DEPENDS+= {gcc,gcc48-libs}>=${_GCC_REQD}:../../lang/gcc48-libs
+ABI_DEPENDS+= {gcc,gcc48-libs}>=4.8.0:../../lang/gcc48-libs
+.endif
+
+pkgbase := gcc48
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.gcc48:Mgcc-java)
+.include "../../devel/zlib/buildlink3.mk"
+.endif
+
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.endif # GCC48_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -gcc48
diff --git a/lang/gcc48/c++.mk b/lang/gcc48/c++.mk
deleted file mode 100644
index d05e15d568f..00000000000
--- a/lang/gcc48/c++.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: c++.mk,v 1.1 2014/04/22 20:46:41 ryoon Exp $
-
-# Objective C and Objective C++ enabled gcc should be built.
-LANGS+= c c++ objc obj-c++
-
-USE_TOOLS+= perl
-CONFIGURE_ARGS+= --enable-__cxa_atexit
-CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 0fec0ab077a..eaa3139b9d9 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.17 2014/05/31 13:06:25 ryoon Exp $
+$NetBSD: distinfo,v 1.18 2014/10/31 14:22:20 ryoon Exp $
-SHA1 (cloog-0.18.1.tar.gz) = 2dc70313e8e2c6610b856d627bce9c9c3f848077
-RMD160 (cloog-0.18.1.tar.gz) = 5c4a182efc0d42e7d5c30e6fcca5832776a2e69a
-Size (cloog-0.18.1.tar.gz) = 3857324 bytes
SHA1 (gcc-4.8.3.tar.bz2) = da0a2b9ec074f2bf624a34f3507f812ebb6e4dce
RMD160 (gcc-4.8.3.tar.bz2) = 2c7214ff607cbe822282c04d1d6f9fea765c82c5
Size (gcc-4.8.3.tar.bz2) = 86126808 bytes
-SHA1 (isl-0.12.2.tar.bz2) = ca98a91e35fb3ded10d080342065919764d6f928
-RMD160 (isl-0.12.2.tar.bz2) = e8fb6bad4b579865a6a31c160fc21a0c9ad1e7b8
-Size (isl-0.12.2.tar.bz2) = 1319434 bytes
SHA1 (patch-boehm-gc_configure) = 4ab0772cede9d4bef0c7eab412359f0700195135
SHA1 (patch-boehm-gc_dyn__load.c) = 48fa440a1b5c05835550c12039739feb35b8927b
SHA1 (patch-boehm-gc_include_gc__config.h.in) = cbd88100e8fb371d3d42c531658ce467c823498e
diff --git a/lang/gcc48/java.mk b/lang/gcc48/java.mk
deleted file mode 100644
index b227c20487c..00000000000
--- a/lang/gcc48/java.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: java.mk,v 1.1 2014/04/22 20:46:41 ryoon Exp $
-
-LANGS+= java
-USE_TOOLS+= perl
-
-# Add the Eclipse Java compiler for to parse `.java' source files.
-ECJ_JAR= ecj-4.5.jar
-SITES.${ECJ_JAR}= ftp://sourceware.org/pub/java/
-DISTFILES+= ${ECJ_JAR}
-CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q}
-
-JAVA_NAME= ${GCC_PKGNAME}
-JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
-.if !empty(PKGPATH:Mlang/gcc48-java)
-JAVA_WRAPPERS= appletviewer jar jarsigner java javah keytool \
- native2ascii orbd rmic rmid rmiregistry serialver \
- tnameserv
-.endif
-
-JAVA_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/}
-
-PLIST_SUBST+= JAVA_NAME=${JAVA_NAME:Q}
-PLIST_SUBST+= JAVA_ARCH=${JAVA_ARCH:Q}
-
-# Create a JPackage compatible SDK environment.
-CONFIGURE_ARGS+= --enable-java-home
-CONFIGURE_ARGS+= --with-os-directory=${LOWER_OPSYS:Q}
-CONFIGURE_ARGS+= --with-arch-directory=${JAVA_ARCH:Q}
-CONFIGURE_ARGS+= --with-jvm-root-dir=${JAVA_HOME:Q}
-CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q}
-
-REPLACE_PYTHON= libjava/contrib/aot-compile.in
-
-USE_TOOLS+= unzip zip:run gmake:run
-CONFIGURE_ARGS+= --with-system-zlib
-
-# libjava/contrib/aotcompile.py.in stores the path to a 'make' program so
-# we need to make sure we give it the installed 'make' and not the tool
-# wrapped one.
-CONFIGURE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake}
-MAKE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake}
-
-# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build
-# failure (seen on NetBSD-5.0/i386) when building java. So in case
-# the fastjar package is installed, make sure the configure script
-# doesn't pick it up.
-CONFIGURE_ENV+= JAR=no
-MAKE_ENV+= JAR=no
-MAKE_ENV+= ac_cv_prog_JAR=no
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/java-env.mk"
diff --git a/lang/gcc48/options.mk b/lang/gcc48/options.mk
index 262024e4e16..46d08d47dab 100644
--- a/lang/gcc48/options.mk
+++ b/lang/gcc48/options.mk
@@ -1,22 +1,20 @@
-# $NetBSD: options.mk,v 1.6 2014/05/31 13:06:25 ryoon Exp $
+# $NetBSD: options.mk,v 1.7 2014/10/31 14:22:20 ryoon Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.gcc48
-PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-graphite gcc-java
-PKG_SUGGESTED_OPTIONS= gcc-graphite gcc-inplace-math
+PKG_OPTIONS_VAR= PKG_OPTIONS.${GCC_PKGNAME}
+PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran gcc-java \
+ gcc-go gcc-objc gcc-objc++ gcc-graphite
+PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ gcc-graphite
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
+.if ${OPSYS} == "NetBSD"
PKG_SUGGESTED_OPTIONS+= nls
-#.elif ${OPSYS} == "SunOS"
-#PKG_SUGGESTED_OPTIONS+= gcc-inplace-math
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgcc-java)
-.include "../../lang/gcc48/java.mk"
-PLIST.java= yes
+.elif ${OPSYS} == "Linux"
+PKG_SUGGESTED_OPTIONS+= nls gcc-java
+.elif ${OPSYS} == "DragonFly"
+PKG_SUGGESTED_OPTIONS+= nls
+.elif ${OPSYS} == "SunOS"
+PKG_SUGGESTED_OPTIONS+= gcc-inplace-math
+.else
+PKG_SUGGESTED_OPTIONS+= gcc-java
.endif
###
@@ -36,6 +34,8 @@ PKG_SUPPORTED_OPTIONS+= gcc-multilib
PKG_SUGGESTED_OPTIONS+= gcc-multilib
.endif
+.include "../../mk/bsd.options.mk"
+
###
### Native Language Support
###
@@ -46,9 +46,6 @@ CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-. if ${PKGPATH} == "lang/gcc48-cc++"
-PLIST_SRC+= ${PLIST_SRC_DFLT} PLIST.nls
-. endif
.else
CONFIGURE_ARGS+= --disable-nls
.endif
@@ -84,17 +81,102 @@ LIBS.SunOS+= -lgmp
### Graphite Support
###
.if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL12= isl-0.12.2
-SITES.${ISL12}.tar.bz2= ${MASTER_SITE_GNU:=gcc/infrastructure/}
-CLOOG18= cloog-0.18.1
-SITES.${CLOOG18}.tar.gz= ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES+= ${ISL12}.tar.bz2 ${CLOOG18}.tar.gz
-EXTRACT_ONLY+= ${ISL12}.tar.bz2 ${CLOOG18}.tar.gz
-post-extract-graphite:
- ${MV} ${WRKDIR}/${ISL12} ${WRKSRC}/isl
- ${MV} ${WRKDIR}/${CLOOG18} ${WRKSRC}/cloog
-.else
-CONFIGURE_ARGS+= --without-cloog --without-isl
+CONFIGURE_ARGS+= --with-cloog=${BUILDLINK_PREFIX.cloog}
+CONFIGURE_ARGS+= --enable-cloog-backend=isl
+.include "../../math/cloog/buildlink3.mk"
+.include "../../math/isl/buildlink3.mk"
.endif
-.include "../../mk/bsd.options.mk"
+###
+### Optional languages
+### Ada could be added although there is a bootstrapping issue. See
+### ../gcc34-ada for guidance
+###
+
+.if !empty(PKG_OPTIONS:Mgcc-objc++)
+. if empty(PKG_OPTIONS:Mgcc-c++)
+PKG_OPTIONS+= gcc-c++
+. endif
+. if empty(PKG_OPTIONS:Mgcc-objc)
+PKG_OPTIONS+= gcc-objc
+. endif
+LANGS+= obj-c++
+.endif
+
+.if !empty(PKG_OPTIONS:Mgcc-objc)
+LANGS+= objc
+.endif
+
+.if !empty(PKG_OPTIONS:Mgcc-java)
+. if empty(PKG_OPTIONS:Mgcc-c++)
+PKG_OPTIONS+= gcc-c++
+. endif
+
+LANGS+= java
+
+# Add the Eclipse Java compiler for to parse `.java' source files.
+ECJ_JAR= ecj-4.5.jar
+SITES.${ECJ_JAR}= ftp://sourceware.org/pub/java/
+DISTFILES+= ${ECJ_JAR}
+CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q}
+
+JAVA_NAME= ${GCC_PKGNAME}
+JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
+JAVA_WRAPPERS= appletviewer jar jarsigner java javah keytool \
+ native2ascii orbd rmic rmid rmiregistry serialver \
+ tnameserv
+
+JAVA_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/}
+
+PLIST_SRC+= PLIST.java
+PLIST_SUBST+= JAVA_NAME=${JAVA_NAME:Q}
+PLIST_SUBST+= JAVA_ARCH=${JAVA_ARCH:Q}
+
+# Create a JPackage compatible SDK environment.
+CONFIGURE_ARGS+= --enable-java-home
+CONFIGURE_ARGS+= --with-os-directory=${LOWER_OPSYS:Q}
+CONFIGURE_ARGS+= --with-arch-directory=${JAVA_ARCH:Q}
+CONFIGURE_ARGS+= --with-jvm-root-dir=${JAVA_HOME:Q}
+CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q}
+
+REPLACE_PYTHON= libjava/contrib/aot-compile.in
+
+USE_TOOLS+= unzip zip:run gmake:run
+CONFIGURE_ARGS+= --with-system-zlib
+
+# libjava/contrib/aotcompile.py.in stores the path to a 'make' program so
+# we need to make sure we give it the installed 'make' and not the tool
+# wrapped one.
+CONFIGURE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake}
+MAKE_ENV+= PKGSRC_MAKE=${TOOLS_PATH.gmake}
+
+# fastjar-0.93 from pkgsrc/archivers/fastjar seems to trigger a build
+# failure (seen on NetBSD-5.0/i386) when building java. So in case
+# the fastjar package is installed, make sure the configure script
+# doesn't pick it up.
+CONFIGURE_ENV+= JAR=no
+MAKE_ENV+= JAR=no
+MAKE_ENV+= ac_cv_prog_JAR=no
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/java-env.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgcc-go)
+LANGS+= go
+.endif
+
+.if !empty(PKG_OPTIONS:Mgcc-fortran)
+LANGS+= fortran
+.endif
+
+.if !empty(PKG_OPTIONS:Mgcc-c++)
+LANGS+= c++
+USE_TOOLS+= perl
+CONFIGURE_ARGS+= --enable-__cxa_atexit
+CONFIGURE_ARGS+= --with-gxx-include-dir=${GCC_PREFIX}/include/c++/
+.else
+CONFIGURE_ARGS+= --disable-build-with-cxx
+CONFIGURE_ARGS+= --disable-build-poststage1-with-cxx
+.endif