Update www/qt5-webkit to 5.212

[tcberner]

Summary

Qt upstram dropped webkit from their releases, and only provides "community releases" of webkit.
However, the webkit it uses is very outdated (538.1).

There are however active forks of Qt5 webkit, most prominently https://github.com/annulen/webkit .

This replaces www/qt5-webkit with that.

It is a drop in replacement, so everything should build fine against it.

Pro:

• Stuff works better
• Less outdated

Con:

• Fullscreen of youtube in qupzilla for example is broken

[tcberner]

As suggested by Matthew in IRC:
Rename the port to -<forkname>, and use QT5_USE_WEBKIT_FORK in the depends line in bsd.qt.mk.

[tcberner]

Fix pkgname

[mat]

www/qt5-webkit-annulen/Makefile

7 ↗

(On Diff #23621)

While you are free to use whatever scheme you want for your public_distfile directory, I find that creating a directory per port keeps everything tidy :-)

12 ↗

(On Diff #23621)

I would also rename the directory of the distfile to match PORTNAME-PORTVERSION, so that you don't need that.

47 ↗

(On Diff #23621)

What I think I would do to keep most of the informations around would be:

​PORTNAME=                webkit-annulen
​PORTVERSION=                5.602.2
DISTVERSIONSUFFIX=   -db25c2b

And drop PKGNAMESUFFIX.

Then rename the distfile directory, and the distfile to match that.

You could even automate it with a target in the Makefile, say, generate-tarball or something, see what is done in net/concourse-fly for example.

www/qt5-webkit-annulen/pkg-descr

1 ↗

(On Diff #23621)

A description a bit longer would be nice :-)

[tcberner]

• shuffle version/name stuff a bit
• add custom fetch via make create-src-archive
• get rid of the weird ASSERT patch, by passing -DNDEBUG (suggested by annulen).

[tcberner]

www/qt5-webkit-annulen/pkg-descr

1 ↗

(On Diff #23621)

Now its one more line -- I'll have to think of something ^^...

[tcberner]

I accidentally dropped KDE_INSTALL_INCLUDEDIR.

• which leads to the question... should we really install the headers to QT_INCDIR?

[tcberner]

Add patch to fix the generated pkgconfig files.

[tcberner]

• Disable ld.gold if it is installed
• Add entry to CHANGES
• Add it to www/Makefile

[tcberner]

Update to newer git tag.

[tcberner]

Get rid of the ld.gold part again. It's fixed by
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216012

[tcberner]

Don't add a new port. Replace the existing one.

[tcberner]

www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake

19 ↗

(On Diff #29930)

This looks wrong...

[tcberner]

Remove wrong hunk from patch.

[tcberner]

Update to 5.512 alpha2.

https://github.com/annulen/webkit/releases/tag/qtwebkit-5.212.0-alpha2

[tcberner]

ping in any general direction -- should I just ask for an exp-run? I've been using the port for ages (since last fall) and lost neither relatives nor pets in the process.

[sylvain_sylvaingarrigues.com]

Same here, good port!

[rezny]

This is looking pretty good. I had no difficulty building qt5-webkit or any of the dependents (not that it was necessary to do so, just verifying). I haven't found any issues with updated webkit in a couple weeks of use.

[rakuco]

With Fedora and Arch Linux having switched to this fork, I guess it's time to move in the same direction. The GitHub project has some official release tarballs. Have you tried using them and dropping the Makefile hacks?

www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake

7 ↗

(On Diff #29943)

Doesn't USES=pathfix work here?

[tcberner]

Use pathfix (modified) and official tar.xz file -- MASTER_SITES seems a bit hacky.

[rakuco]

As they used to say in WebKit-land, "lgtm with nits" :-)

Mk/Uses/pathfix.mk

33 ↗

(On Diff #31752)

Isn't this very specific to QtWebKit?

www/qt5-webkit/Makefile

4 ↗

(On Diff #31752)

I always forget the version numbering rules for ports; as long as you've checked the handbook and this format is OK I'm fine with it :-)

13 ↗

(On Diff #31752)

WebKit's actually a mixture of LGPL, BSD and other licenses. I'd either specify all the zillion licenses here or not set LICENSE at all.

[tcberner]

Don't specify license.

[tcberner]

Mk/Uses/pathfix.mk

33 ↗

(On Diff #31752)

It's specific to kf5-extra-cmake-modules GeneratePkgConfig cmake file.

The upstream version of this file has been fixed to behave properly on FreeBSD, however, the version imported into this webkti port has not.

www/qt5-webkit/Makefile

4 ↗

(On Diff #31752)

By magic this gets turned into qt5-webkit-5.212.0.a2 -- which should be accepted ^^

[mat]

Mk/Uses/pathfix.mk

33 ↗

(On Diff #31752)

Wouldn't it be easier to import the fix from upstream to fix the thing you are talking about instead of adding one more thing here ?

www/qt5-webkit/Makefile

4 ↗

(On Diff #31752)

This is exactly what DISTVERSION is for. Go read 5.2.2. Versions, DISTVERSION or PORTVERSION.

[tcberner]

Reinstate the EPGF patch. The upstreamed one just adds some if (OS = ) instead of directly setting the path, so this one is easier.

[rakuco]

not sure if you're waiting for feedback; still looks good to me.

[tcberner]

In D9048#248479, @rakuco wrote:

not sure if you're waiting for feedback; still looks good to me.

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221339

Sorry, I forgot to link this :)

[tcberner]

Fix fetch (PORTVERSION derives from DISTVERISON and is modified)

head/www/qt5-webkit/Makefile

 static void        run_rt2870_set_chan(struct run_softc *, u_int);
 static void        run_rt3070_set_chan(struct run_softc *, u_int);
 static void        run_rt3572_set_chan(struct run_softc *, u_int);
 static void        run_rt3593_set_chan(struct run_softc *, u_int);
 static void        run_rt5390_set_chan(struct run_softc *, u_int);
 static void        run_rt5592_set_chan(struct run_softc *, u_int);
 static int        run_set_chan(struct run_softc *, struct ieee80211_channel *);
 static void        run_set_channel(struct ieee80211com *);
+static void        run_getradiocaps(struct ieee80211com *, int, int *,
+                    struct ieee80211_channel[]);
 static void        run_scan_start(struct ieee80211com *);
 static void        run_scan_end(struct ieee80211com *);
 static void        run_update_beacon(struct ieee80211vap *, int);
 static void        run_update_beacon_cb(void *);
 static void        run_updateprot(struct ieee80211com *);
 static void        run_updateprot_cb(void *);
 static void        run_usb_timeout_cb(void *);
 static void        run_reset_livelock(struct run_softc *);

 
 static int
 run_attach(device_t self)
 {
         struct run_softc *sc = device_get_softc(self);
         struct usb_attach_arg *uaa = device_get_ivars(self);
         struct ieee80211com *ic = &sc->sc_ic;
         uint32_t ver;
-        uint8_t bands[IEEE80211_MODE_BYTES];
         uint8_t iface_index;
         int ntries, error;
 
         device_set_usb_desc(self);
         sc->sc_udev = uaa->device;
         sc->sc_dev = self;
         if (USB_GET_DRIVER_INFO(uaa) != RUN_EJECT)
                 sc->sc_flags |= RUN_FLAG_FWLOAD_NEEDED;
ic->ic_cryptocaps =
             IEEE80211_CRYPTO_WEP |
             IEEE80211_CRYPTO_AES_CCM |
             IEEE80211_CRYPTO_TKIPMIC |
             IEEE80211_CRYPTO_TKIP;
 
         ic->ic_flags |= IEEE80211_F_DATAPAD;
         ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS;
 
-        memset(bands, 0, sizeof(bands));
-        setbit(bands, IEEE80211_MODE_11B);
-        setbit(bands, IEEE80211_MODE_11G);
-        if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
-            sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 ||
-            sc->rf_rev == RT5592_RF_5592)
-                setbit(bands, IEEE80211_MODE_11A);
-        ieee80211_init_channels(ic, NULL, bands);
+        run_getradiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,
+            ic->ic_channels);
 
         ieee80211_ifattach(ic);
 
         ic->ic_scan_start = run_scan_start;
         ic->ic_scan_end = run_scan_end;
         ic->ic_set_channel = run_set_channel;
+        ic->ic_getradiocaps = run_getradiocaps;
         ic->ic_node_alloc = run_node_alloc;
         ic->ic_newassoc = run_newassoc;
         ic->ic_updateslot = run_updateslot;
         ic->ic_update_mcast = run_update_mcast;
         ic->ic_wme.wme_update = run_wme_update;
         ic->ic_raw_xmit = run_raw_xmit;
         ic->ic_update_promisc = run_update_promisc;
         ic->ic_vap_create = run_vap_create;

 {
         struct run_softc *sc = ic->ic_softc;
 
         RUN_LOCK(sc);
         run_set_chan(sc, ic->ic_curchan);
         RUN_UNLOCK(sc);
 
         return;
+}
+
+static void
+run_getradiocaps(struct ieee80211com *ic,
+    int maxchans, int *nchans, struct ieee80211_channel chans[])
+{
+        struct run_softc *sc = ic->ic_softc;
+        uint8_t bands[IEEE80211_MODE_BYTES];
+
+        memset(bands, 0, sizeof(bands));
+        setbit(bands, IEEE80211_MODE_11B);
+        setbit(bands, IEEE80211_MODE_11G);
+        ieee80211_add_channel_list_2ghz(chans, maxchans, nchans,
+            run_chan_2ghz, nitems(run_chan_2ghz), bands, 0);
+
+        if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
+            sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 ||
+            sc->rf_rev == RT5592_RF_5592) {
+                setbit(bands, IEEE80211_MODE_11A);
+                ieee80211_add_channel_list_5ghz(chans, maxchans, nchans,
+                    run_chan_5ghz, nitems(run_chan_5ghz), bands, 0);
+        }
 }
 
 static void
 run_scan_start(struct ieee80211com *ic)
 {
         struct run_softc *sc = ic->ic_softc;
         uint32_t tmp;
 

head/www/qt5-webkit/distinfo

 static void        run_rt2870_set_chan(struct run_softc *, u_int);
 static void        run_rt3070_set_chan(struct run_softc *, u_int);
 static void        run_rt3572_set_chan(struct run_softc *, u_int);
 static void        run_rt3593_set_chan(struct run_softc *, u_int);
 static void        run_rt5390_set_chan(struct run_softc *, u_int);
 static void        run_rt5592_set_chan(struct run_softc *, u_int);
 static int        run_set_chan(struct run_softc *, struct ieee80211_channel *);
 static void        run_set_channel(struct ieee80211com *);
+static void        run_getradiocaps(struct ieee80211com *, int, int *,
+                    struct ieee80211_channel[]);
 static void        run_scan_start(struct ieee80211com *);
 static void        run_scan_end(struct ieee80211com *);
 static void        run_update_beacon(struct ieee80211vap *, int);
 static void        run_update_beacon_cb(void *);
 static void        run_updateprot(struct ieee80211com *);
 static void        run_updateprot_cb(void *);
 static void        run_usb_timeout_cb(void *);
 static void        run_reset_livelock(struct run_softc *);

 
 static int
 run_attach(device_t self)
 {
         struct run_softc *sc = device_get_softc(self);
         struct usb_attach_arg *uaa = device_get_ivars(self);
         struct ieee80211com *ic = &sc->sc_ic;
         uint32_t ver;
-        uint8_t bands[IEEE80211_MODE_BYTES];
         uint8_t iface_index;
         int ntries, error;
 
         device_set_usb_desc(self);
         sc->sc_udev = uaa->device;
         sc->sc_dev = self;
         if (USB_GET_DRIVER_INFO(uaa) != RUN_EJECT)
                 sc->sc_flags |= RUN_FLAG_FWLOAD_NEEDED;
ic->ic_cryptocaps =
             IEEE80211_CRYPTO_WEP |
             IEEE80211_CRYPTO_AES_CCM |
             IEEE80211_CRYPTO_TKIPMIC |
             IEEE80211_CRYPTO_TKIP;
 
         ic->ic_flags |= IEEE80211_F_DATAPAD;
         ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS;
 
-        memset(bands, 0, sizeof(bands));
-        setbit(bands, IEEE80211_MODE_11B);
-        setbit(bands, IEEE80211_MODE_11G);
-        if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
-            sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 ||
-            sc->rf_rev == RT5592_RF_5592)
-                setbit(bands, IEEE80211_MODE_11A);
-        ieee80211_init_channels(ic, NULL, bands);
+        run_getradiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,
+            ic->ic_channels);
 
         ieee80211_ifattach(ic);
 
         ic->ic_scan_start = run_scan_start;
         ic->ic_scan_end = run_scan_end;
         ic->ic_set_channel = run_set_channel;
+        ic->ic_getradiocaps = run_getradiocaps;
         ic->ic_node_alloc = run_node_alloc;
         ic->ic_newassoc = run_newassoc;
         ic->ic_updateslot = run_updateslot;
         ic->ic_update_mcast = run_update_mcast;
         ic->ic_wme.wme_update = run_wme_update;
         ic->ic_raw_xmit = run_raw_xmit;
         ic->ic_update_promisc = run_update_promisc;
         ic->ic_vap_create = run_vap_create;

 {
         struct run_softc *sc = ic->ic_softc;
 
         RUN_LOCK(sc);
         run_set_chan(sc, ic->ic_curchan);
         RUN_UNLOCK(sc);
 
         return;
+}
+
+static void
+run_getradiocaps(struct ieee80211com *ic,
+    int maxchans, int *nchans, struct ieee80211_channel chans[])
+{
+        struct run_softc *sc = ic->ic_softc;
+        uint8_t bands[IEEE80211_MODE_BYTES];
+
+        memset(bands, 0, sizeof(bands));
+        setbit(bands, IEEE80211_MODE_11B);
+        setbit(bands, IEEE80211_MODE_11G);
+        ieee80211_add_channel_list_2ghz(chans, maxchans, nchans,
+            run_chan_2ghz, nitems(run_chan_2ghz), bands, 0);
+
+        if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
+            sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 ||
+            sc->rf_rev == RT5592_RF_5592) {
+                setbit(bands, IEEE80211_MODE_11A);
+                ieee80211_add_channel_list_5ghz(chans, maxchans, nchans,
+                    run_chan_5ghz, nitems(run_chan_5ghz), bands, 0);
+        }
 }
 
 static void
 run_scan_start(struct ieee80211com *ic)
 {
         struct run_softc *sc = ic->ic_softc;
         uint32_t tmp;
 

head/www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h

 static void        run_rt2870_set_chan(struct run_softc *, u_int);
 static void        run_rt3070_set_chan(struct run_softc *, u_int);
 static void        run_rt3572_set_chan(struct run_softc *, u_int);
 static void        run_rt3593_set_chan(struct run_softc *, u_int);
 static void        run_rt5390_set_chan(struct run_softc *, u_int);
 static void        run_rt5592_set_chan(struct run_softc *, u_int);
 static int        run_set_chan(struct run_softc *, struct ieee80211_channel *);
 static void        run_set_channel(struct ieee80211com *);
+static void        run_getradiocaps(struct ieee80211com *, int, int *,
+                    struct ieee80211_channel[]);
 static void        run_scan_start(struct ieee80211com *);
 static void        run_scan_end(struct ieee80211com *);
 static void        run_update_beacon(struct ieee80211vap *, int);
 static void        run_update_beacon_cb(void *);
 static void        run_updateprot(struct ieee80211com *);
 static void        run_updateprot_cb(void *);
 static void        run_usb_timeout_cb(void *);
 static void        run_reset_livelock(struct run_softc *);

 
 static int
 run_attach(device_t self)
 {
         struct run_softc *sc = device_get_softc(self);
         struct usb_attach_arg *uaa = device_get_ivars(self);
         struct ieee80211com *ic = &sc->sc_ic;
         uint32_t ver;
-        uint8_t bands[IEEE80211_MODE_BYTES];
         uint8_t iface_index;
         int ntries, error;
 
         device_set_usb_desc(self);
         sc->sc_udev = uaa->device;
         sc->sc_dev = self;
         if (USB_GET_DRIVER_INFO(uaa) != RUN_EJECT)
                 sc->sc_flags |= RUN_FLAG_FWLOAD_NEEDED;
ic->ic_cryptocaps =
             IEEE80211_CRYPTO_WEP |
             IEEE80211_CRYPTO_AES_CCM |
             IEEE80211_CRYPTO_TKIPMIC |
             IEEE80211_CRYPTO_TKIP;
 
         ic->ic_flags |= IEEE80211_F_DATAPAD;
         ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS;
 
-        memset(bands, 0, sizeof(bands));
-        setbit(bands, IEEE80211_MODE_11B);
-        setbit(bands, IEEE80211_MODE_11G);
-        if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
-            sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 ||
-            sc->rf_rev == RT5592_RF_5592)
-                setbit(bands, IEEE80211_MODE_11A);
-        ieee80211_init_channels(ic, NULL, bands);
+        run_getradiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,
+            ic->ic_channels);
 
         ieee80211_ifattach(ic);
 
         ic->ic_scan_start = run_scan_start;
         ic->ic_scan_end = run_scan_end;
         ic->ic_set_channel = run_set_channel;
+        ic->ic_getradiocaps = run_getradiocaps;
         ic->ic_node_alloc = run_node_alloc;
         ic->ic_newassoc = run_newassoc;
         ic->ic_updateslot = run_updateslot;
         ic->ic_update_mcast = run_update_mcast;
         ic->ic_wme.wme_update = run_wme_update;
         ic->ic_raw_xmit = run_raw_xmit;
         ic->ic_update_promisc = run_update_promisc;
         ic->ic_vap_create = run_vap_create;

 {
         struct run_softc *sc = ic->ic_softc;
 
         RUN_LOCK(sc);
         run_set_chan(sc, ic->ic_curchan);
         RUN_UNLOCK(sc);
 
         return;
+}
+
+static void
+run_getradiocaps(struct ieee80211com *ic,
+    int maxchans, int *nchans, struct ieee80211_channel chans[])
+{
+        struct run_softc *sc = ic->ic_softc;
+        uint8_t bands[IEEE80211_MODE_BYTES];
+
+        memset(bands, 0, sizeof(bands));
+        setbit(bands, IEEE80211_MODE_11B);
+        setbit(bands, IEEE80211_MODE_11G);
+        ieee80211_add_channel_list_2ghz(chans, maxchans, nchans,
+            run_chan_2ghz, nitems(run_chan_2ghz), bands, 0);
+
+        if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
+            sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 ||
+            sc->rf_rev == RT5592_RF_5592) {
+                setbit(bands, IEEE80211_MODE_11A);
+                ieee80211_add_channel_list_5ghz(chans, maxchans, nchans,
+                    run_chan_5ghz, nitems(run_chan_5ghz), bands, 0);
+        }
 }
 
 static void
 run_scan_start(struct ieee80211com *ic)
 {
         struct run_softc *sc = ic->ic_softc;
         uint32_t tmp;
 

head/www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h

 static void        run_rt2870_set_chan(struct run_softc *, u_int);
 static void        run_rt3070_set_chan(struct run_softc *, u_int);
 static void        run_rt3572_set_chan(struct run_softc *, u_int);
 static void        run_rt3593_set_chan(struct run_softc *, u_int);
 static void        run_rt5390_set_chan(struct run_softc *, u_int);
 static void        run_rt5592_set_chan(struct run_softc *, u_int);
 static int        run_set_chan(struct run_softc *, struct ieee80211_channel *);
 static void        run_set_channel(struct ieee80211com *);
+static void        run_getradiocaps(struct ieee80211com *, int, int *,
+                    struct ieee80211_channel[]);
 static void        run_scan_start(struct ieee80211com *);
 static void        run_scan_end(struct ieee80211com *);
 static void        run_update_beacon(struct ieee80211vap *, int);
 static void        run_update_beacon_cb(void *);
 static void        run_updateprot(struct ieee80211com *);
 static void        run_updateprot_cb(void *);
 static void        run_usb_timeout_cb(void *);
 static void        run_reset_livelock(struct run_softc *);

 
 static int
 run_attach(device_t self)
 {
         struct run_softc *sc = device_get_softc(self);
         struct usb_attach_arg *uaa = device_get_ivars(self);
         struct ieee80211com *ic = &sc->sc_ic;
         uint32_t ver;
-        uint8_t bands[IEEE80211_MODE_BYTES];
         uint8_t iface_index;
         int ntries, error;
 
         device_set_usb_desc(self);
         sc->sc_udev = uaa->device;
         sc->sc_dev = self;
         if (USB_GET_DRIVER_INFO(uaa) != RUN_EJECT)
                 sc->sc_flags |= RUN_FLAG_FWLOAD_NEEDED;
ic->ic_cryptocaps =
             IEEE80211_CRYPTO_WEP |
             IEEE80211_CRYPTO_AES_CCM |
             IEEE80211_CRYPTO_TKIPMIC |
             IEEE80211_CRYPTO_TKIP;
 
         ic->ic_flags |= IEEE80211_F_DATAPAD;
         ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS;
 
-        memset(bands, 0, sizeof(bands));
-        setbit(bands, IEEE80211_MODE_11B);
-        setbit(bands, IEEE80211_MODE_11G);
-        if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
-            sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 ||
-            sc->rf_rev == RT5592_RF_5592)
-                setbit(bands, IEEE80211_MODE_11A);
-        ieee80211_init_channels(ic, NULL, bands);
+        run_getradiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,
+            ic->ic_channels);
 
         ieee80211_ifattach(ic);
 
         ic->ic_scan_start = run_scan_start;
         ic->ic_scan_end = run_scan_end;
         ic->ic_set_channel = run_set_channel;
+        ic->ic_getradiocaps = run_getradiocaps;
         ic->ic_node_alloc = run_node_alloc;
         ic->ic_newassoc = run_newassoc;
         ic->ic_updateslot = run_updateslot;
         ic->ic_update_mcast = run_update_mcast;
         ic->ic_wme.wme_update = run_wme_update;
         ic->ic_raw_xmit = run_raw_xmit;
         ic->ic_update_promisc = run_update_promisc;
         ic->ic_vap_create = run_vap_create;

 {
         struct run_softc *sc = ic->ic_softc;
 
         RUN_LOCK(sc);
         run_set_chan(sc, ic->ic_curchan);
         RUN_UNLOCK(sc);
 
         return;
+}
+
+static void
+run_getradiocaps(struct ieee80211com *ic,
+    int maxchans, int *nchans, struct ieee80211_channel chans[])
+{
+        struct run_softc *sc = ic->ic_softc;
+        uint8_t bands[IEEE80211_MODE_BYTES];
+
+        memset(bands, 0, sizeof(bands));
+        setbit(bands, IEEE80211_MODE_11B);
+        setbit(bands, IEEE80211_MODE_11G);
+        ieee80211_add_channel_list_2ghz(chans, maxchans, nchans,
+            run_chan_2ghz, nitems(run_chan_2ghz), bands, 0);
+
+        if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
+            sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT3593_RF_3053 ||
+            sc->rf_rev == RT5592_RF_5592) {
+                setbit(bands, IEEE80211_MODE_11A);
+                ieee80211_add_channel_list_5ghz(chans, maxchans, nchans,
+                    run_chan_5ghz, nitems(run_chan_5ghz), bands, 0);
+        }
 }
 
 static void
 run_scan_start(struct ieee80211com *ic)
 {
         struct run_softc *sc = ic->ic_softc;
         uint32_t tmp;