diff options
| author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-21 18:58:09 +0000 |
|---|---|---|
| committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-21 18:58:09 +0000 |
| commit | bc99b50d3f452e474b88356e7c250e8927ee06ca (patch) | |
| tree | 7e9701ed9adcfd8e7b44411551f8da9791dc2ab9 | |
| parent | af59388ecccd0aa058c1e4f76db9d5e83f12b912 (diff) | |
| download | fpc-bc99b50d3f452e474b88356e7c250e8927ee06ca.tar.gz | |
--- Merging r36550 into '.':
U utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r36550 into '.':
U .
--- Merging r36551 into '.':
U utils/fpcmkcfg/fppkg.cfg
--- Recording mergeinfo for merge of r36551 into '.':
G .
--- Merging r36552 into '.':
G utils/fpcmkcfg/fppkg.cfg
--- Recording mergeinfo for merge of r36552 into '.':
G .
--- Merging r36553 into '.':
C utils/fpcmkcfg/fppkg.inc
--- Recording mergeinfo for merge of r36553 into '.':
G .
Summary of conflicts:
Text conflicts: 1
# revisions: 36550,36551,36552,36553
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_0@36563 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | utils/fpcmkcfg/fppkg.cfg | 4 | ||||
| -rw-r--r-- | utils/fpcmkcfg/fppkg.inc | 6 | ||||
| -rw-r--r-- | utils/fppkg/fppkg.pp | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/utils/fpcmkcfg/fppkg.cfg b/utils/fpcmkcfg/fppkg.cfg index 517f0fc7ad..6adc9e97c0 100644 --- a/utils/fpcmkcfg/fppkg.cfg +++ b/utils/fpcmkcfg/fppkg.cfg @@ -4,8 +4,8 @@ LocalRepository=%LocalRepository% BuildDir={LocalRepository}build/ ArchivesDir={LocalRepository}archives/ CompilerConfigDir=%CompilerConfigDir% -RemoteMirrors=http://www.freepascal.org/repository/mirrors.xml +RemoteMirrors=https://www.freepascal.org/repository/mirrors.xml RemoteRepository=auto CompilerConfig=default FPMakeCompilerConfig=default -Downloader=lnet +Downloader=FPC diff --git a/utils/fpcmkcfg/fppkg.inc b/utils/fpcmkcfg/fppkg.inc index ebda2123bf..1d58124fc5 100644 --- a/utils/fpcmkcfg/fppkg.inc +++ b/utils/fpcmkcfg/fppkg.inc @@ -9,9 +9,9 @@ const fppkg : array[0..1,1..240] of char=( 'BuildDir={LocalRepository}build/'#010+ 'ArchivesDir={LocalRepository}archives/'#010+ 'CompilerConfigDir=%CompilerConfigDir%'#010+ - 'RemoteMirrors=http://www.freepascal.org/repository/mirrors.xml'#010+ - 'Remote','Repository=auto'#010+ + 'RemoteMirrors=https://www.freepascal.org/repository/mirrors.xml'#010+ + 'Remot','eRepository=auto'#010+ 'CompilerConfig=default'#010+ 'FPMakeCompilerConfig=default'#010+ - 'Downloader=lnet'#010 + 'Downloader=FPC'#010 ); diff --git a/utils/fppkg/fppkg.pp b/utils/fppkg/fppkg.pp index 9b646a4e6d..9075d58a59 100644 --- a/utils/fppkg/fppkg.pp +++ b/utils/fppkg/fppkg.pp @@ -23,6 +23,7 @@ uses {$if (defined(unix) and not defined(android)) or defined(windows)} ,pkgwget ,pkglnet + ,pkgfphttp {$endif} ; |