summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorMark Linimon <linimon@FreeBSD.org>2018-01-02 00:35:25 +0000
committerMark Linimon <linimon@FreeBSD.org>2018-01-02 00:35:25 +0000
commitbfbf6537e2e3ddc0dfdd8a3f5b172afd1c5c7f13 (patch)
tree18c97f4b25d287e1f7df19d66dde33f00b6451d5 /Mk
parentgames/minecraft-server: Update to 1.12.2 (diff)
Repairs to MASTER_SITE_DEBIAN_NON_US:
- ftp.df.lth.se has gone away. - some of the "ftp\." sites now only accept http:// addresses.
Notes
Notes: svn path=/head/; revision=457821
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.qt.mk5
-rw-r--r--Mk/bsd.sites.mk17
2 files changed, 12 insertions, 10 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index 2b8589f5bfff..009652b2f0d0 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -306,9 +306,12 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
_USE_QT_ALL= assistant dbus declarative designer doc gui help \
imageformats l10n linguist linguisttools multimedia \
network opengl pixeltool qdbusviewer qmake script \
- scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
+ scripttools sql sql-mysql sql-odbc sql-pgsql \
sql-sqlite2 sql-sqlite3 svg testlib webkit \
xml xmlpatterns
+.if ${ARCH} == amd64 || ${ARCH} == i386
+_USE_QT_ALL+= sql-ibase
+.endif
_USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
codecs-kr codecs-tw corelib demo graphicssystems-opengl \
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index b00d117d0b3f..3c351b769630 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -140,23 +140,23 @@ MASTER_SITE_DEBIAN+= \
.if !defined(IGNORE_MASTER_SITE_DEBIAN_NON_US)
MASTER_SITE_DEBIAN_NON_US+= \
- ftp://ftp.au.debian.org/debian-non-US/%SUBDIR%/ \
+ http://ftp.au.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.bg.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.br.debian.org/debian-non-US/%SUBDIR%/ \
- ftp://ftp.cl.debian.org/debian-non-US/%SUBDIR%/ \
+ http://ftp.cl.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.cz.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.de.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.ee.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.es.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.fi.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.fr.debian.org/debian-non-US/%SUBDIR%/ \
- ftp://ftp.hk.debian.org/debian-non-US/%SUBDIR%/ \
- ftp://ftp.hr.debian.org/debian-non-US/%SUBDIR%/ \
+ http://ftp.hk.debian.org/debian-non-US/%SUBDIR%/ \
+ http://ftp.hr.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.hu.debian.org/debian-non-US/%SUBDIR%/ \
- ftp://ftp.ie.debian.org/debian-non-US/%SUBDIR%/ \
+ http://ftp.ie.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.is.debian.org/debian-non-US/%SUBDIR%/ \
- ftp://ftp.it.debian.org/debian-non-US/%SUBDIR%/ \
- ftp://ftp.jp.debian.org/debian-non-US/%SUBDIR%/ \
+ http://ftp.it.debian.org/debian-non-US/%SUBDIR%/ \
+ http://ftp.jp.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.nl.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.no.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.pl.debian.org/debian-non-US/%SUBDIR%/ \
@@ -165,10 +165,9 @@ MASTER_SITE_DEBIAN_NON_US+= \
ftp://ftp.si.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.sk.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.uk.debian.org/debian-non-US/%SUBDIR%/ \
- ftp://ftp.wa.au.debian.org/debian-non-US/%SUBDIR%/ \
+ http://ftp.wa.au.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp2.de.debian.org/debian-non-US/%SUBDIR%/ \
ftp://ftp.snt.utwente.nl/pub/linux/debian-non-US/%SUBDIR%/ \
- ftp://ftp.df.lth.se/pub/debian-non-US/%SUBDIR%/ \
ftp://ftp.acc.umu.se/debian-non-US/%SUBDIR%/ \
ftp://mirror.symnds.com/debian-non-US/%SUBDIR%/
.endif