From a16c291d25f45a854973a579c616f4738d6aa14d Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Tue, 14 May 2019 10:32:37 +0000 Subject: [PATCH] Sort categories Makefile and hook forgotten ports to the build. Pointy hat: bofh, glewis, gerald, swills, manu, ijiao, sunpoet, egypcio --- emulators/Makefile | 2 +- java/Makefile | 10 +++++----- lang/Makefile | 2 +- net-mgmt/Makefile | 2 +- sysutils/Makefile | 3 ++- textproc/Makefile | 2 +- x11-fonts/Makefile | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/emulators/Makefile b/emulators/Makefile index a2d92d345db4..747a87f47d6b 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -111,7 +111,6 @@ SUBDIR += py-gns3-converter SUBDIR += py-unicorn SUBDIR += qemu - SUBDIR += qemu2 SUBDIR += qemu-cheri SUBDIR += qemu-devel SUBDIR += qemu-powernv @@ -119,6 +118,7 @@ SUBDIR += qemu-sbruno SUBDIR += qemu-user-static SUBDIR += qemu-utils + SUBDIR += qemu2 SUBDIR += qmc2 SUBDIR += quasi88 SUBDIR += riscv-fesvr diff --git a/java/Makefile b/java/Makefile index 86d83a232c34..1c6e337c0321 100644 --- a/java/Makefile +++ b/java/Makefile @@ -7,9 +7,9 @@ SUBDIR += avis SUBDIR += berkeley-db SUBDIR += bluej + SUBDIR += bootstrap-openjdk11 SUBDIR += bootstrap-openjdk6 SUBDIR += bootstrap-openjdk8 - SUBDIR += bootstrap-openjdk11 SUBDIR += bouncycastle SUBDIR += bouncycastle15 SUBDIR += castor @@ -69,11 +69,11 @@ SUBDIR += jcommon SUBDIR += jd-gui SUBDIR += jdbcpool - SUBDIR += jdk8-doc - SUBDIR += jdk9-doc SUBDIR += jdk10-doc SUBDIR += jdk11-doc SUBDIR += jdk12-doc + SUBDIR += jdk8-doc + SUBDIR += jdk9-doc SUBDIR += jdom SUBDIR += jflex SUBDIR += jfreechart @@ -106,14 +106,14 @@ SUBDIR += netcomponents SUBDIR += netrexx SUBDIR += netty + SUBDIR += openjdk11 + SUBDIR += openjdk12 SUBDIR += openjdk6 SUBDIR += openjdk6-jre SUBDIR += openjdk7 SUBDIR += openjdk7-jre SUBDIR += openjdk8 SUBDIR += openjdk8-jre - SUBDIR += openjdk11 - SUBDIR += openjdk12 SUBDIR += openjfx8-devel SUBDIR += openjfx8-scenebuilder SUBDIR += phpeclipse diff --git a/lang/Makefile b/lang/Makefile index 0ffb7a9b64d0..c0b4d75412c4 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -100,6 +100,7 @@ SUBDIR += gawk SUBDIR += gcc SUBDIR += gcc-ecj45 + SUBDIR += gcc10-devel SUBDIR += gcc48 SUBDIR += gcc5 SUBDIR += gcc6 @@ -109,7 +110,6 @@ SUBDIR += gcc8 SUBDIR += gcc8-devel SUBDIR += gcc9-devel - SUBDIR += gcc10-devel SUBDIR += gforth SUBDIR += ghc SUBDIR += ghc843 diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index d2346db7d954..b7639e27c536 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -203,8 +203,8 @@ SUBDIR += nsca-ng-client SUBDIR += nsca27 SUBDIR += nsca27-client - SUBDIR += nstat SUBDIR += nsd_exporter + SUBDIR += nstat SUBDIR += nstreams SUBDIR += nvidia_gpu_prometheus_exporter SUBDIR += observium diff --git a/sysutils/Makefile b/sysutils/Makefile index 3219eff77a10..9a6ec42e0479 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1003,6 +1003,7 @@ SUBDIR += py-azure-cli-vm SUBDIR += py-bcfg2 SUBDIR += py-bitrot + SUBDIR += py-borgmatic SUBDIR += py-cdmi SUBDIR += py-cpuinfo SUBDIR += py-croniter @@ -1371,8 +1372,8 @@ SUBDIR += u-boot-nanopi-a64 SUBDIR += u-boot-nanopi-m1plus SUBDIR += u-boot-nanopi-neo - SUBDIR += u-boot-nanopi-neo2 SUBDIR += u-boot-nanopi-neo-air + SUBDIR += u-boot-nanopi-neo2 SUBDIR += u-boot-olimex-a20-som-evb SUBDIR += u-boot-olinuxino-lime SUBDIR += u-boot-olinuxino-lime2 diff --git a/textproc/Makefile b/textproc/Makefile index ab96504df6b0..880af6c1e012 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1434,8 +1434,8 @@ SUBDIR += raptor2 SUBDIR += rarian SUBDIR += rasqal - SUBDIR += re_graph SUBDIR += re-flex + SUBDIR += re_graph SUBDIR += redet SUBDIR += redland SUBDIR += redland-bindings diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile index 2a5e543e0ea4..24cee4126c25 100644 --- a/x11-fonts/Makefile +++ b/x11-fonts/Makefile @@ -167,9 +167,9 @@ SUBDIR += noto-sc SUBDIR += noto-tc SUBDIR += nucleus - SUBDIR += orbitron SUBDIR += ohsnap SUBDIR += oldschool-pc-fonts + SUBDIR += orbitron SUBDIR += oxygen-fonts SUBDIR += p5-Font-AFM SUBDIR += p5-Font-TTF