On Jul 13, 2013, at 9:24 PM, Peter Wemm wrote:

> On Sat, Jul 13, 2013 at 11:54 AM, Teske, Devin
> <devin.te...@fisglobal.com> wrote:
> 
>> So yes... I'm asking... in a HEAD world, what is the "officially supported" 
>> method of acquisition?
> 
> * pkgng will be configured to pull via http from project
> infrastructure by default.

So is this the right _first step_ patch for HEAD bsdconfig?

NOTE: Based on feedback, this will be the list of what official pkg 
infrastructure we want to support from the base. The selection would be 
communicated to pkg via $PACKAGESITE.

Index: head/usr.sbin/bsdconfig/share/media/http.subr
===================================================================
--- head/usr.sbin/bsdconfig/share/media/http.subr       (revision 253333)
+++ head/usr.sbin/bsdconfig/share/media/http.subr       (working copy)
@@ -77,7 +77,9 @@ f_dialog_menu_media_http()
        f_dialog_title_restore
        local prompt="$msg_please_select_the_site_closest_to_you_or_other"
        local menu_list="
-               'URL' '$msg_specify_some_other_http_site'
+               '$msg_main_site'          'http.freebsd.org'
+               'URL'                     '$msg_specify_some_other_http_site'
+               'IPv6 $msg_main_site'     'http.freebsd.org'
        " # END-QUOTE
        local hline="$msg_select_a_site_thats_close"
 
Index: head/usr.sbin/bsdconfig/share/media/ftp.subr
===================================================================
--- head/usr.sbin/bsdconfig/share/media/ftp.subr        (revision 253333)
+++ head/usr.sbin/bsdconfig/share/media/ftp.subr        (working copy)
@@ -73,157 +73,7 @@ f_dialog_menu_media_ftp()
        f_dialog_title_restore
        local prompt="$msg_please_select_the_site_closest_to_you_or_other"
        local menu_list="
-               '$msg_main_site'          'ftp.freebsd.org'
-               'URL'                     '$msg_specify_some_other_ftp_site'
-               '$msg_snapshots_server_japan'
-                                         'snapshots.jp.freebsd.org'
-               '$msg_snapshots_server_sweden'
-                                         'snapshots.se.freebsd.org'
-               'IPv6 $msg_main_site'     'ftp.freebsd.org'
-               ' IPv6 $msg_ireland'      'ftp3.ie.freebsd.org'
-               ' IPv6 $msg_israel'       'ftp.il.freebsd.org'
-               ' IPv6 $msg_japan'        'ftp2.jp.freebsd.org'
-               ' IPv6 $msg_usa'          'ftp4.us.freebsd.org'
-               ' IPv6 $msg_turkey'       'ftp2.tr.freebsd.org'
-               '$msg_primary'            'ftp1.freebsd.org'
-               ' $msg_primary #2'        'ftp2.freebsd.org'
-               ' $msg_primary #3'        'ftp3.freebsd.org'
-               ' $msg_primary #4'        'ftp4.freebsd.org'
-               ' $msg_primary #5'        'ftp5.freebsd.org'
-               ' $msg_primary #6'        'ftp6.freebsd.org'
-               ' $msg_primary #7'        'ftp7.freebsd.org'
-               ' $msg_primary #8'        'ftp8.freebsd.org'
-               ' $msg_primary #9'        'ftp9.freebsd.org'
-               ' $msg_primary #10'       'ftp10.freebsd.org'
-               ' $msg_primary #11'       'ftp11.freebsd.org'
-               ' $msg_primary #12'       'ftp12.freebsd.org'
-               ' $msg_primary #13'       'ftp13.freebsd.org'
-               ' $msg_primary #14'       'ftp14.freebsd.org'
-               '$msg_argentina'          'ftp.ar.freebsd.org'
-               '$msg_australia'          'ftp.au.freebsd.org'
-               ' $msg_australia #2'      'ftp2.au.freebsd.org'
-               ' $msg_australia #3'      'ftp3.au.freebsd.org'
-               '$msg_austria'            'ftp.at.freebsd.org'
-               ' $msg_austria #2'        'ftp2.at.freebsd.org'
-               '$msg_brazil'             'ftp.br.freebsd.org'
-               ' $msg_brazil #2'         'ftp2.br.freebsd.org'
-               ' $msg_brazil #3'         'ftp3.br.freebsd.org'
-               ' $msg_brazil #4'         'ftp4.br.freebsd.org'
-               ' $msg_brazil #5'         'ftp5.br.freebsd.org'
-               ' $msg_brazil #6'         'ftp6.br.freebsd.org'
-               ' $msg_brazil #7'         'ftp7.br.freebsd.org'
-               '$msg_canada'             'ftp.ca.freebsd.org'
-               '$msg_china'              'ftp.cn.freebsd.org'
-               ' $msg_china #2'          'ftp2.cn.freebsd.org'
-               '$msg_croatia'            'ftp.hr.freebsd.org'
-               '$msg_czech_republic'     'ftp.cz.freebsd.org'
-               '$msg_denmark'            'ftp.dk.freebsd.org'
-               ' $msg_denmark #2'        'ftp2.dk.freebsd.org'
-               '$msg_estonia'            'ftp.ee.freebsd.org'
-               '$msg_finland'            'ftp.fi.freebsd.org'
-               '$msg_france'             'ftp.fr.freebsd.org'
-               ' $msg_france #2'         'ftp2.fr.freebsd.org'
-               ' $msg_france #3'         'ftp3.fr.freebsd.org'
-               ' $msg_france #5'         'ftp5.fr.freebsd.org'
-               ' $msg_france #6'         'ftp6.fr.freebsd.org'
-               ' $msg_france #8'         'ftp8.fr.freebsd.org'
-               '$msg_germany'            'ftp.de.freebsd.org'
-               ' $msg_germany #2'        'ftp2.de.freebsd.org'
-               ' $msg_germany #3'        'ftp3.de.freebsd.org'
-               ' $msg_germany #4'        'ftp4.de.freebsd.org'
-               ' $msg_germany #5'        'ftp5.de.freebsd.org'
-               ' $msg_germany #6'        'ftp6.de.freebsd.org'
-               ' $msg_germany #7'        'ftp7.de.freebsd.org'
-               ' $msg_germany #8'        'ftp8.de.freebsd.org'
-               '$msg_greece'             'ftp.gr.freebsd.org'
-               ' $msg_greece #2'         'ftp2.gr.freebsd.org'
-               '$msg_hungary'            'ftp.hu.freebsd.org'
-               '$msg_iceland'            'ftp.is.freebsd.org'
-               '$msg_ireland'            'ftp.ie.freebsd.org'
-               ' $msg_ireland #2'        'ftp2.ie.freebsd.org'
-               ' $msg_ireland #3'        'ftp3.ie.freebsd.org'
-               '$msg_israel'             'ftp.il.freebsd.org'
-               '$msg_italy'              'ftp.it.freebsd.org'
-               '$msg_japan'              'ftp.jp.freebsd.org'
-               ' $msg_japan #2'          'ftp2.jp.freebsd.org'
-               ' $msg_japan #3'          'ftp3.jp.freebsd.org'
-               ' $msg_japan #4'          'ftp4.jp.freebsd.org'
-               ' $msg_japan #5'          'ftp5.jp.freebsd.org'
-               ' $msg_japan #6'          'ftp6.jp.freebsd.org'
-               ' $msg_japan #7'          'ftp7.jp.freebsd.org'
-               ' $msg_japan #8'          'ftp8.jp.freebsd.org'
-               ' $msg_japan #9'          'ftp9.jp.freebsd.org'
-               '$msg_korea'              'ftp.kr.freebsd.org'
-               ' $msg_korea #2'          'ftp2.kr.freebsd.org'
-               '$msg_lithuania'          'ftp.lt.freebsd.org'
-               '$msg_netherlands'        'ftp.nl.freebsd.org'
-               ' $msg_netherlands #2'    'ftp2.nl.freebsd.org'
-               '$msg_norway'             'ftp.no.freebsd.org'
-               ' $msg_norway #3'         'ftp3.no.freebsd.org'
-               '$msg_poland'             'ftp.pl.freebsd.org'
-               ' $msg_poland #2'         'ftp2.pl.freebsd.org'
-               ' $msg_poland #5'         'ftp5.pl.freebsd.org'
-               '$msg_portugal'           'ftp.pt.freebsd.org'
-               ' $msg_portugal #2'       'ftp2.pt.freebsd.org'
-               ' $msg_portugal #4'       'ftp4.pt.freebsd.org'
-               '$msg_romania'            'ftp.ro.freebsd.org'
-               '$msg_russia'             'ftp.ru.freebsd.org'
-               ' $msg_russia #2'         'ftp2.ru.freebsd.org'
-               ' $msg_russia #3'         'ftp3.ru.freebsd.org'
-               ' $msg_russia #4'         'ftp4.ru.freebsd.org'
-               '$msg_singapore'          'ftp.sg.freebsd.org'
-               '$msg_slovak_republic'    'ftp.sk.freebsd.org'
-               '$msg_slovenia'           'ftp.si.freebsd.org'
-               ' $msg_slovenia #2'       'ftp2.si.freebsd.org'
-               '$msg_south_africa'       'ftp.za.freebsd.org'
-               ' $msg_south_africa #2'   'ftp2.za.freebsd.org'
-               ' $msg_south_africa #3'   'ftp3.za.freebsd.org'
-               ' $msg_south_africa #4'   'ftp4.za.freebsd.org'
-               '$msg_spain'              'ftp.es.freebsd.org'
-               ' $msg_spain #2'          'ftp2.es.freebsd.org'
-               ' $msg_spain #3'          'ftp3.es.freebsd.org'
-               '$msg_sweden'             'ftp.se.freebsd.org'
-               ' $msg_sweden #2'         'ftp2.se.freebsd.org'
-               ' $msg_sweden #3'         'ftp3.se.freebsd.org'
-               ' $msg_sweden #4'         'ftp4.se.freebsd.org'
-               ' $msg_sweden #5'         'ftp5.se.freebsd.org'
-               '$msg_switzerland'        'ftp.ch.freebsd.org'
-               ' $msg_switzerland #2'    'ftp2.ch.freebsd.org'
-               '$msg_taiwan'             'ftp.tw.freebsd.org'
-               ' $msg_taiwan #2'         'ftp2.tw.freebsd.org'
-               ' $msg_taiwan #3'         'ftp3.tw.freebsd.org'
-               ' $msg_taiwan #4'         'ftp4.tw.freebsd.org'
-               ' $msg_taiwan #6'         'ftp6.tw.freebsd.org'
-               ' $msg_taiwan #11'        'ftp11.tw.freebsd.org'
-               '$msg_turkey'             'ftp.tr.freebsd.org'
-               ' $msg_turkey #2'         'ftp2.tr.freebsd.org'
-               '$msg_uk'                 'ftp.uk.freebsd.org'
-               ' $msg_uk #2'             'ftp2.uk.freebsd.org'
-               ' $msg_uk #3'             'ftp3.uk.freebsd.org'
-               ' $msg_uk #4'             'ftp4.uk.freebsd.org'
-               ' $msg_uk #5'             'ftp5.uk.freebsd.org'
-               ' $msg_uk #6'             'ftp6.uk.freebsd.org'
-               '$msg_ukraine'            'ftp.ua.freebsd.org'
-               ' $msg_ukraine #2'        'ftp2.ua.freebsd.org'
-               ' $msg_ukraine #5'        'ftp5.ua.freebsd.org'
-               ' $msg_ukraine #6'        'ftp6.ua.freebsd.org'
-               ' $msg_ukraine #7'        'ftp7.ua.freebsd.org'
-               ' $msg_ukraine #8'        'ftp8.ua.freebsd.org'
-               '$msg_usa #1'             'ftp1.us.freebsd.org'
-               ' $msg_usa #2'            'ftp2.us.freebsd.org'
-               ' $msg_usa #3'            'ftp3.us.freebsd.org'
-               ' $msg_usa #4'            'ftp4.us.freebsd.org'
-               ' $msg_usa #5'            'ftp5.us.freebsd.org'
-               ' $msg_usa #6'            'ftp6.us.freebsd.org'
-               ' $msg_usa #7'            'ftp7.us.freebsd.org'
-               ' $msg_usa #8'            'ftp8.us.freebsd.org'
-               ' $msg_usa #9'            'ftp9.us.freebsd.org'
-               ' $msg_usa #10'           'ftp10.us.freebsd.org'
-               ' $msg_usa #11'           'ftp11.us.freebsd.org'
-               ' $msg_usa #12'           'ftp12.us.freebsd.org'
-               ' $msg_usa #13'           'ftp13.us.freebsd.org'
-               ' $msg_usa #14'           'ftp14.us.freebsd.org'
-               ' $msg_usa #15'           'ftp15.us.freebsd.org'
+               'URL' '$msg_specify_some_other_ftp_site'
        " # END-QUOTE
        local hline="$msg_select_a_site_thats_close"
 
-- 
Devin

_____________
The information contained in this message is proprietary and/or confidential. 
If you are not the intended recipient, please: (i) delete the message and all 
copies; (ii) do not disclose, distribute or use the message in any manner; and 
(iii) notify the sender immediately. In addition, please be aware that any 
message addressed to our domain is subject to archiving and review by persons 
other than the intended recipient. Thank you.
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"

Reply via email to