Move GMP spec directories to standard locations

Ref #3028

repos/libports/lib/import/import-gmp.mk

@@ -5,16 +5,16 @@ REP_INC_DIR += include/gmp
 INC_DIR += $(GMP_PORT_DIR)/include
 
 ifeq ($(filter-out $(SPECS),arm),)
-	REP_INC_DIR += include/gmp/32bit
-	INC_DIR += $(GMP_PORT_DIR)/include/arm
+	REP_INC_DIR += include/spec/32bit/gmp
+	INC_DIR += $(GMP_PORT_DIR)/include/spec/arm
 endif
 
 ifeq ($(filter-out $(SPECS),x86_32),)
-	REP_INC_DIR += include/gmp/32bit
-	INC_DIR += $(GMP_PORT_DIR)/include/x86_32
+	REP_INC_DIR += include/spec/32bit/gmp
+	INC_DIR += $(GMP_PORT_DIR)/include/spec/x86_32
 endif
 
 ifeq ($(filter-out $(SPECS),x86_64),)
-	REP_INC_DIR += include/gmp/64bit
-	INC_DIR += $(GMP_PORT_DIR)/include/x86_64
+	REP_INC_DIR += include/spec/64bit/gmp
+	INC_DIR += $(GMP_PORT_DIR)/include/spec/x86_64
 endif

repos/libports/lib/mk/gmp.inc

@@ -6,4 +6,5 @@ LIBS += libc
 
 CC_OPT += -DHAVE_CONFIG_H -D__GMP_WITHIN_GMP
 
+INC_DIR += $(GMP_DIR)
 INC_DIR += $(REP_DIR)/include/gcc

repos/libports/ports/gmp.hash

@@ -1 +1 @@
-614ff9d3db2aa667fb6a128edf9fba7e56181a32
+95c8f71ec42c9c8afe05ecbe7425312555171a4f

repos/libports/ports/gmp.port

@@ -11,7 +11,7 @@ DIR(gmp) := src/lib/gmp
 DIRS := include
 DIR_CONTENT(include) := ${DIR(gmp)}/gmp-impl.h
 
-DIRS += $(addprefix include/, x86_32 x86_64 arm)
-DIR_CONTENT(include/x86_32) := ${DIR(gmp)}/mpn/x86/pentium/gmp-mparam.h
-DIR_CONTENT(include/x86_64) := ${DIR(gmp)}/mpn/x86_64//gmp-mparam.h
-DIR_CONTENT(include/arm)    := ${DIR(gmp)}/mpn/arm/gmp-mparam.h
+DIRS += $(addprefix include/spec/, x86_32 x86_64 arm)
+DIR_CONTENT(include/spec/x86_32) := ${DIR(gmp)}/mpn/x86/pentium/gmp-mparam.h
+DIR_CONTENT(include/spec/x86_64) := ${DIR(gmp)}/mpn/x86_64/gmp-mparam.h
+DIR_CONTENT(include/spec/arm)    := ${DIR(gmp)}/mpn/arm/gmp-mparam.h