Index: lang/gcc11/Makefile =================================================================== --- lang/gcc11/Makefile +++ lang/gcc11/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcc PORTVERSION= 11.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= GCC PKGNAMESUFFIX= ${SUFFIX} Index: lang/gcc11/files/patch-gcc_Makefile.in =================================================================== --- /dev/null +++ lang/gcc11/files/patch-gcc_Makefile.in @@ -0,0 +1,19 @@ +--- gcc/Makefile.in.orig 2022-11-02 20:13:34 UTC ++++ gcc/Makefile.in +@@ -630,6 +630,8 @@ libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/ + + # Directory in which the compiler finds libraries etc. + libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) ++# Directory in which the compiler finds headers. ++libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include + # Directory in which the compiler finds executables + libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix) + # Directory in which all plugin resources are installed +@@ -3609,6 +3611,7 @@ installdirs: + # $(libdir)/gcc/include isn't currently searched by cpp. + installdirs: + $(mkinstalldirs) $(DESTDIR)$(libsubdir) ++ $(mkinstalldirs) $(DESTDIR)$(libsubincludedir) + $(mkinstalldirs) $(DESTDIR)$(libexecsubdir) + $(mkinstalldirs) $(DESTDIR)$(bindir) + $(mkinstalldirs) $(DESTDIR)$(includedir) Index: lang/gcc11/files/patch-gcc_jit_Make-lang.in =================================================================== --- /dev/null +++ lang/gcc11/files/patch-gcc_jit_Make-lang.in @@ -0,0 +1,14 @@ +--- gcc/jit/Make-lang.in.orig 2022-11-02 17:25:43 UTC ++++ gcc/jit/Make-lang.in +@@ -355,9 +355,9 @@ jit.install-headers: installdirs + # Install hooks: + jit.install-headers: installdirs + $(INSTALL_DATA) $(srcdir)/jit/libgccjit.h \ +- $(DESTDIR)$(includedir)/libgccjit.h ++ $(DESTDIR)$(libsubincludedir)/libgccjit.h + $(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \ +- $(DESTDIR)$(includedir)/libgccjit++.h ++ $(DESTDIR)$(libsubincludedir)/libgccjit++.h + + ifneq (,$(findstring mingw,$(target))) + jit.install-common: installdirs jit.install-headers Index: lang/gcc11/pkg-plist =================================================================== --- lang/gcc11/pkg-plist +++ lang/gcc11/pkg-plist @@ -20,8 +20,6 @@ bin/gdc%%SUFFIX%% bin/gfortran%%SUFFIX%% bin/lto-dump%%SUFFIX%% -include/libgccjit++.h -include/libgccjit.h man/man1/cpp%%SUFFIX%%.1.gz man/man1/g++%%SUFFIX%%.1.gz man/man1/gcc%%SUFFIX%%.1.gz