--- 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: branches/fixes_3_0@36563 -

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

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
 );

utils/fppkg/fppkg.pp

@@ -23,6 +23,7 @@ uses
 {$if (defined(unix) and not defined(android)) or defined(windows)}
   ,pkgwget
   ,pkglnet
+  ,pkgfphttp
 {$endif}
   ;