Unfortunately it seems while the build was sucessful the binary
packages are incomplete and unusable. Further research is needed into
why things are breaking.
Ok nailed that issue, it seems that at some point during the build
process debian/control was regenerated from debian/control.in undoing my
changes.
I've also discovered that grab_vcsa seems to be linux specific so i've
added fixes to debian/rules to exclude that. Likewise for serveral
"packages"
(in the fpc sense not the debian sense) that don't seem to be built when
building for freebsd (I dunno if this is because they can't be built on
freebsd
or simply because upstream doesn't think them appropriate to build on
freebsd).
That allowed me to build arch specific binary packages that for work for
freepascal programs that didn't link against libc but any freepascal
program that used libc would fail to link, I attempted to fix that up by
hacking the freebsd rtl in a couple of places to be like the linux rtl
but failed. I may take another look at this but I suspect it will need
someone with assembler knowlage to solve.
A new patch for the debian stuff with the above fixes is included as are
my attempts at fixing the libc link issue in the freebsd rtl but until
we get the libc link issue sorted it's IMO not suitable for inclusion in
debian. It would probablly also make sense to make kfreebsd it's own
target rather than hacking the freebsd RTL in place.
Index: fpc-2.4.4.new/fpcsrc/rtl/unix/initc.pp
===================================================================
--- fpc-2.4.4.new.orig/fpcsrc/rtl/unix/initc.pp 2011-05-28 00:25:22.000000000 +0100
+++ fpc-2.4.4.new/fpcsrc/rtl/unix/initc.pp 2011-05-28 00:26:49.000000000 +0100
@@ -50,13 +50,12 @@
end;
{$else}
-
{$ifdef Linux}
function geterrnolocation: pcint; cdecl;external clib name '__errno_location';
{$endif}
-{$ifdef FreeBSD} // tested on x86
-function geterrnolocation: pcint; cdecl;external clib name '__error';
+{$ifdef FreeBSD} //hack, treat freebsd like linux since while we are using a freebsd kernel we are using a GNU userland
+function geterrnolocation: pcint; cdecl;external clib name '__errno_location';
{$endif}
{$ifdef NetBSD} // from a sparc dump.
Index: fpc-2.4.4.new/fpcsrc/rtl/freebsd/i386/cprt0.as
===================================================================
--- fpc-2.4.4.new.orig/fpcsrc/rtl/freebsd/i386/cprt0.as 2011-05-28 00:28:16.000000000 +0100
+++ fpc-2.4.4.new/fpcsrc/rtl/freebsd/i386/cprt0.as 2011-05-28 00:29:21.000000000 +0100
@@ -1,8 +1,6 @@
#
-# $Id: cprt0.as,v 1.3 2000/11/21 19:03:23 marco Exp $
# This file is part of the Free Pascal run time library.
-# Copyright (c) 1999-2000 by Marco van de Voort, Michael Van Canneyt
-# and Peter Vreman
+# Copyright (c) 1999-2000 by Michael Van Canneyt and Peter Vreman
# members of the Free Pascal development team.
#
# See the file COPYING.FPC, included in this distribution,
@@ -14,172 +12,81 @@
#
#**********************************************************************}
#
-# FreeBSD ELF startup code for Free Pascal for dynamical linking to libc.
+# Linux ELF startup code for Free Pascal
+# Note: copied from the linux RTL to the freebsd one for debian kfreebsd
#
-# To avoid needing a "COMPAT" system, patch this file to change the number
-# according to what is retured by the "file" command on a normal binary:
#
-# `file gcc` gives
+# Stack layout at program start:
#
-# gcc: ELF 32-bit LSB executable, Intel 80386, version 1 (FreeBSD), for
-# FreeBSD 7.0 ($IDVERSION), statically linked, FreeBSD-style, stripped
-#
-# freebsd 5.4 504000
-# freebsd 6.3 (prerelease) : 603100
-# freebsd 7.0 700055
+# nil
+# envn
+# ....
+# .... ENVIRONMENT VARIABLES
+# env1
+# env0
+# nil
+# argn
+# ....
+# .... COMMAND LINE OPTIONS
+# arg1
+# arg0
+# argc <--- esp
#
.file "cprt0.as"
- .ident "FreePascal 2.2.x series dynlinked to libc"
-.section .note.ABI-tag,"a",@progbits
- .p2align 2
- .type abitag, @object
- .size abitag, 24
-abitag:
- .long 8
- .long 4
- .long 1
- .string "FreeBSD"
- .long 504000
- .section .rodata.str1.1,"aMS",@progbits,1
-.LC0:
- .string ""
- .data
- .p2align 2
- .globl __progname
- .type __progname,@object
- .size __progname,4
-__progname:
- .long .LC0
.text
- .p2align 2,,3
- .type __fpucw,@object
- .size __fpucw,4
- .global __fpucw
-___fpucw:
- .long 0x1332
- .globl ___fpc_brk_addr /* heap management */
- .type ___fpc_brk_addr,@object
- .size ___fpc_brk_addr,4
-___fpc_brk_addr:
- .long 0
-
- .text
- .p2align 4,,15
-.globl _start
- .type _start,@function
+ .globl _start
+ .type _start,@function
_start:
- pushl %ebp
- movl %esp,%ebp
- subl $40,%esp
- call get_rtld_cleanup
- movl %eax,%edx
-
- pushl %edi
- pushl %esi
- pushl %ebx
-#APP
- movl %edx,%edx
-#NO_APP
- leal 8(%ebp),%edi
- movl %edi,operatingsystem_parameter_argv
- mov -4(%edi),%eax
- movl %eax,operatingsystem_parameter_argc
- movl 4(%ebp),%ebx
- leal 12(%ebp,%ebx,4),%esi
- movl %esi,operatingsystem_parameter_envp
- movl %esi,environ
- testl %ebx,%ebx
- jle .L2
- movl 8(%ebp),%eax
- testl %eax,%eax
- je .L2
- movl %eax,__progname
- cmpb $0,(%eax)
- je .L2
- .p2align 2,0x90
-.L6:
- cmpb $47,(%eax)
- jne .L5
- leal 1(%eax),%ecx
- movl %ecx,__progname
-.L5:
- incl %eax
- cmpb $0,(%eax)
- jne .L6
-.L2:
- movl $_DYNAMIC,%eax
- testl %eax,%eax
- je .LTLS
- pushl %edx
- call atexit
- addl $4,%esp
-.L9:
- pushl $_fini
- call atexit
- call _init
-# pushl %esi
-# pushl %edi
-# pushl %ebx
-# call main
-# pushl %eax
-# call exit
-
-
- finit /* initialize fpu */
- fwait
- fldcw ___fpucw
+ /* First locate the start of the environment variables */
+ popl %ecx /* Get argc in ecx */
+ movl %esp,%ebx /* Esp now points to the arguments */
+ leal 4(%esp,%ecx,4),%eax /* The start of the environment is: esp+4*eax+8 */
+ andl $0xfffffff8,%esp /* Align stack */
+
+ movl %eax,operatingsystem_parameter_envp /* Move the environment pointer */
+ movl %ecx,operatingsystem_parameter_argc /* Move the argument counter */
+ movl %ebx,operatingsystem_parameter_argv /* Move the argument pointer */
+
+ movl %eax,__environ /* libc environ */
+
+ pushl %eax
+ pushl %ebx
+ pushl %ecx
+
+ call __libc_init /* init libc */
+ movzwl __fpu_control,%eax
+ pushl %eax
+ call __setfpucw
+ popl %eax
+ pushl $_fini
+ call atexit
+ popl %eax
+ call _init
- xorl %ebp,%ebp
+ popl %eax
+ popl %eax
+
+ /* Save initial stackpointer */
+ movl %esp,__stkptr
- call main
- pushl %eax
- jmp _haltproc
-.LTLS:
- call _init_tls
- jmp .L9
- .p2align 2,0x90
-
-
-.globl _haltproc
-.type _haltproc,@function
+ xorl %ebp,%ebp
+ call PASCALMAIN /* start the program */
+ .globl _haltproc
+ .type _haltproc,@function
_haltproc:
- mov $1,%eax
- movzwl operatingsystem_result,%ebx
- pushl %ebx
- call .Lactualsyscall
- addl $4,%esp
- jmp _haltproc
-
-.Lactualsyscall:
- int $0x80
- jb .LErrorcode
- xor %ebx,%ebx
- ret
-.LErrorcode:
- mov %eax,%ebx
- mov $-1,%eax
- ret
- .p2align 2,0x90
-.Lfe1:
- .size _start,.Lfe1-_start
- .comm environ,4,4
- .p2align 4,,15
- .type get_rtld_cleanup, @function
-get_rtld_cleanup:
- pushl %ebp
- movl %esp, %ebp
- subl $4, %esp
-#APP
- movl %edx,-4(%ebp)
-#NO_APP
- movl -4(%ebp), %eax
- leave
- ret
+_haltproc2: # GAS <= 2.15 bug: generates larger jump if a label is exported
+ movzwl operatingsystem_result,%ebx
+ pushl %ebx
+ call exit
+ xorl %eax,%eax
+ incl %eax /* eax=1, exit call */
+ popl %ebx
+ int $0x80
+ jmp _haltproc2
- .weak _DYNAMIC
- .ident "GCC: (GNU) 3.4.2 - FPC: 2.0.2"
+.data
.bss
.type __stkptr,@object
@@ -200,5 +107,4 @@
.set operatingsystem_parameter_argc,operatingsystem_parameters+4
.set operatingsystem_parameter_argv,operatingsystem_parameters+8
-//.section .threadvar,"aw",@nobits
- .comm ___fpc_threadvar_offset,4
+.section .note.GNU-stack,"",%progbits
diff -ur fpc-2.4.4/debian/control fpc-2.4.4.new/debian//control
--- fpc-2.4.4/debian/control 2011-05-28 00:56:58.000000000 +0100
+++ fpc-2.4.4.new/debian//control 2011-05-28 01:45:38.000000000 +0100
@@ -53,7 +53,7 @@
the Lazarus IDE.
Package: fp-compiler-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version}), binutils
Recommends: fp-utils-2.4.4 (>= ${binary:Version})
Suggests: fp-docs-2.4.4 (>= ${source:Upstream-Version})
@@ -76,7 +76,7 @@
This package contains the command line compiler.
Package: fp-ide-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version}), ${shlibs:Depends}
Recommends: fp-utils-2.4.4 (>= ${binary:Version})
Suggests: fp-docs-2.4.4 (>= ${source:Upstream-Version})
@@ -99,7 +99,7 @@
has an internal compiler.
Package: fp-utils-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}
Recommends: fp-compiler-2.4.4 (= ${binary:Version})
Provides: fp-utils
@@ -144,7 +144,7 @@
format.
Package: fp-units-rtl-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}
Recommends: fp-compiler-2.4.4 (= ${binary:Version})
Provides: fp-units-rtl, fpc-abi-${source:Upstream-Version}
@@ -161,7 +161,7 @@
This package contains the Runtime Libraries for the Free Pascal Compiler.
Package: fp-units-base-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version})
Provides: fp-units-base
Breaks: fp-units-base (<= 2.4.0-3)
@@ -181,7 +181,7 @@
- ZLib
Package: fp-units-fcl-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version}), fp-units-base-2.4.4 (= ${binary:Version})
Provides: fp-units-fcl
Breaks: fp-units-fcl (<= 2.4.0-3)
@@ -197,7 +197,7 @@
This package contains the Free Component Library for the Free Pascal Compiler.
Package: fp-units-fv-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version})
Provides: fp-units-fv
Breaks: fp-units-fv (<= 2.4.0-3)
@@ -213,7 +213,7 @@
This package contains the Free Vision units for the Free Pascal Compiler.
Package: fp-units-gtk-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version}), fp-units-fcl-2.4.4 (= ${binary:Version}), libgtk2.0-dev
Provides: fp-units-gtk
Breaks: fp-units-gtk (<= 2.4.0-3)
@@ -230,7 +230,7 @@
programs with GTK+ 1.2.
Package: fp-units-gtk2-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version}), fp-units-fcl-2.4.4 (= ${binary:Version})
Provides: fp-units-gtk2
Breaks: fp-units-gtk2 (<= 2.4.0-3)
@@ -247,7 +247,7 @@
programs with GTK+ 2.x.
Package: fp-units-gnome1-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version}), fp-units-gtk-2.4.4 (= ${binary:Version})
Provides: fp-units-gnome1
Breaks: fp-units-gnome1 (<= 2.4.0-3)
@@ -264,7 +264,7 @@
programs for GNOME 1.
Package: fp-units-db-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version})
Provides: fp-units-db
Breaks: fp-units-db (<= 2.4.0-3)
@@ -287,7 +287,7 @@
- SQLite
Package: fp-units-gfx-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version}), fp-units-base-2.4.4 (= ${binary:Version}), libsvga1-dev [i386 amd64 armel]
Provides: fp-units-gfx
Breaks: fp-units-gfx (<= 2.4.0-3)
@@ -312,7 +312,7 @@
- cairo
Package: fp-units-net-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version})
Provides: fp-units-net
Breaks: fp-units-net (<= 2.4.0-3)
@@ -338,7 +338,7 @@
- pcap
Package: fp-units-math-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version})
Provides: fp-units-math
Breaks: fp-units-math (<= 2.4.0-3)
@@ -358,7 +358,7 @@
- symbolic : symbolic computing
Package: fp-units-misc-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version})
Provides: fp-units-misc
Breaks: fp-units-misc (<= 2.4.0-3)
@@ -377,7 +377,7 @@
- PasZLib (Pascal-only zlib implementation)
Package: fp-units-multimedia-2.4.4
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl-2.4.4 (= ${binary:Version}), libogg-dev, libvorbis-dev, a52dec-dev, libdts-dev, libmad0-dev, libmodplug-dev
Provides: fp-units-multimedia
Breaks: fp-units-multimedia (<= 2.4.0-3)
diff -ur fpc-2.4.4/debian/control.in fpc-2.4.4.new/debian//control.in
--- fpc-2.4.4/debian/control.in 2011-05-23 10:00:39.000000000 +0100
+++ fpc-2.4.4.new/debian//control.in 2011-05-27 21:13:29.000000000 +0100
@@ -53,7 +53,7 @@
the Lazarus IDE.
Package: fp-compiler${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version}), binutils
Recommends: fp-utils${PACKAGESUFFIX} (>= ${binary:Version})
Suggests: fp-docs${PACKAGESUFFIX} (>= ${source:Upstream-Version})
@@ -76,7 +76,7 @@
This package contains the command line compiler.
Package: fp-ide${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version}), ${shlibs:Depends}
Recommends: fp-utils${PACKAGESUFFIX} (>= ${binary:Version})
Suggests: fp-docs${PACKAGESUFFIX} (>= ${source:Upstream-Version})
@@ -99,7 +99,7 @@
has an internal compiler.
Package: fp-utils${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}
Recommends: fp-compiler${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-utils
@@ -144,7 +144,7 @@
format.
Package: fp-units-rtl${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}
Recommends: fp-compiler${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-rtl, fpc-abi-${source:Upstream-Version}
@@ -161,7 +161,7 @@
This package contains the Runtime Libraries for the Free Pascal Compiler.
Package: fp-units-base${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-base
Breaks: fp-units-base (<= 2.4.0-3)
@@ -181,7 +181,7 @@
- ZLib
Package: fp-units-fcl${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version}), fp-units-base${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-fcl
Breaks: fp-units-fcl (<= 2.4.0-3)
@@ -197,7 +197,7 @@
This package contains the Free Component Library for the Free Pascal Compiler.
Package: fp-units-fv${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-fv
Breaks: fp-units-fv (<= 2.4.0-3)
@@ -213,7 +213,7 @@
This package contains the Free Vision units for the Free Pascal Compiler.
Package: fp-units-gtk${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version}), fp-units-fcl${PACKAGESUFFIX} (= ${binary:Version}), libgtk2.0-dev
Provides: fp-units-gtk
Breaks: fp-units-gtk (<= 2.4.0-3)
@@ -230,7 +230,7 @@
programs with GTK+ 1.2.
Package: fp-units-gtk2${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version}), fp-units-fcl${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-gtk2
Breaks: fp-units-gtk2 (<= 2.4.0-3)
@@ -247,7 +247,7 @@
programs with GTK+ 2.x.
Package: fp-units-gnome1${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version}), fp-units-gtk${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-gnome1
Breaks: fp-units-gnome1 (<= 2.4.0-3)
@@ -264,7 +264,7 @@
programs for GNOME 1.
Package: fp-units-db${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-db
Breaks: fp-units-db (<= 2.4.0-3)
@@ -287,7 +287,7 @@
- SQLite
Package: fp-units-gfx${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version}), fp-units-base${PACKAGESUFFIX} (= ${binary:Version}), libsvga1-dev [i386 amd64 armel]
Provides: fp-units-gfx
Breaks: fp-units-gfx (<= 2.4.0-3)
@@ -312,7 +312,7 @@
- cairo
Package: fp-units-net${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-net
Breaks: fp-units-net (<= 2.4.0-3)
@@ -338,7 +338,7 @@
- pcap
Package: fp-units-math${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-math
Breaks: fp-units-math (<= 2.4.0-3)
@@ -358,7 +358,7 @@
- symbolic : symbolic computing
Package: fp-units-misc${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version})
Provides: fp-units-misc
Breaks: fp-units-misc (<= 2.4.0-3)
@@ -377,7 +377,7 @@
- PasZLib (Pascal-only zlib implementation)
Package: fp-units-multimedia${PACKAGESUFFIX}
-Architecture: i386 powerpc sparc amd64 armel
+Architecture: any
Depends: ${misc:Depends}, fp-units-rtl${PACKAGESUFFIX} (= ${binary:Version}), libogg-dev, libvorbis-dev, a52dec-dev, libdts-dev, libmad0-dev, libmodplug-dev
Provides: fp-units-multimedia
Breaks: fp-units-multimedia (<= 2.4.0-3)
diff -ur fpc-2.4.4/debian/fp-compiler-2.4.4.install fpc-2.4.4.new/debian//fp-compiler-2.4.4.install
--- fpc-2.4.4/debian/fp-compiler-2.4.4.install 2011-05-28 00:56:58.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-compiler-2.4.4.install 2011-05-28 01:45:38.000000000 +0100
@@ -3,7 +3,7 @@
/usr/bin/fpc-depends-2.4.4
/usr/bin/fpcmkcfg-2.4.4
/usr/bin/grab_vcsa-2.4.4
-/usr/lib/fpc/2.4.4/ppc
+/usr/lib/fpc/2.4.4/ppc386
/usr/lib/fpc/2.4.4/samplecfg
/usr/lib/fpc/2.4.4/msg
/usr/share/doc/fp-compiler
diff -ur fpc-2.4.4/debian/fp-compiler-2.4.4.links fpc-2.4.4.new/debian//fp-compiler-2.4.4.links
--- fpc-2.4.4/debian/fp-compiler-2.4.4.links 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-compiler-2.4.4.links 2011-05-28 01:45:38.000000000 +0100
@@ -1 +1 @@
-/usr/lib/fpc/2.4.4/ppc /usr/bin/ppc-2.4.4
+/usr/lib/fpc/2.4.4/ppc386 /usr/bin/ppc386-2.4.4
diff -ur fpc-2.4.4/debian/fp-compiler-2.4.4.manpages fpc-2.4.4.new/debian//fp-compiler-2.4.4.manpages
--- fpc-2.4.4/debian/fp-compiler-2.4.4.manpages 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-compiler-2.4.4.manpages 2011-05-28 01:45:38.000000000 +0100
@@ -1,6 +1,6 @@
debian/fpc-depends-2.4.4.1
debian/tmp/usr/man/man1/fpc-2.4.4.1
debian/tmp/usr/man/man1/fpcmkcfg-2.4.4.1
-debian/tmp/usr/man/man1/ppc-2.4.4.1
+debian/tmp/usr/man/man1/ppc386-2.4.4.1
debian/tmp/usr/man/man1/grab_vcsa-2.4.4.1
debian/tmp/usr/man/man5/fpc-2.4.4.cfg.5
diff -ur fpc-2.4.4/debian/fp-units-base-2.4.4.install fpc-2.4.4.new/debian//fp-units-base-2.4.4.install
--- fpc-2.4.4/debian/fp-units-base-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-base-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,9 +1,9 @@
/usr/share/doc/fp-units-base
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fpmkunit
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/paszlib
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/pasjpeg
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/ncurses
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/x11
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/regexpr
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/hash
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/uuid
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fpmkunit
+/usr/lib/fpc/2.4.4/units/i386-freebsd/paszlib
+/usr/lib/fpc/2.4.4/units/i386-freebsd/pasjpeg
+/usr/lib/fpc/2.4.4/units/i386-freebsd/ncurses
+/usr/lib/fpc/2.4.4/units/i386-freebsd/x11
+/usr/lib/fpc/2.4.4/units/i386-freebsd/regexpr
+/usr/lib/fpc/2.4.4/units/i386-freebsd/hash
+/usr/lib/fpc/2.4.4/units/i386-freebsd/uuid
diff -ur fpc-2.4.4/debian/fp-units-db-2.4.4.install fpc-2.4.4.new/debian//fp-units-db-2.4.4.install
--- fpc-2.4.4/debian/fp-units-db-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-db-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,9 +1,9 @@
/usr/share/doc/fp-units-db
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/mysql
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/ibase
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/postgres
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/oracle
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/odbc
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/gdbm
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/sqlite
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/pxlib
+/usr/lib/fpc/2.4.4/units/i386-freebsd/mysql
+/usr/lib/fpc/2.4.4/units/i386-freebsd/ibase
+/usr/lib/fpc/2.4.4/units/i386-freebsd/postgres
+/usr/lib/fpc/2.4.4/units/i386-freebsd/oracle
+/usr/lib/fpc/2.4.4/units/i386-freebsd/odbc
+/usr/lib/fpc/2.4.4/units/i386-freebsd/gdbm
+/usr/lib/fpc/2.4.4/units/i386-freebsd/sqlite
+/usr/lib/fpc/2.4.4/units/i386-freebsd/pxlib
diff -ur fpc-2.4.4/debian/fp-units-fcl-2.4.4.install fpc-2.4.4.new/debian//fp-units-fcl-2.4.4.install
--- fpc-2.4.4/debian/fp-units-fcl-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-fcl-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,16 +1,16 @@
/usr/share/doc/fp-units-fcl
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-base
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-db
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-extra
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-fpcunit
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-image
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-js
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-net
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-passrc
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-registry
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-res
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-web
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-xml
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-async
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-json
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fcl-process
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-base
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-db
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-extra
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-fpcunit
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-image
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-js
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-net
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-passrc
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-registry
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-res
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-web
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-xml
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-async
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-json
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fcl-process
diff -ur fpc-2.4.4/debian/fp-units-fv-2.4.4.install fpc-2.4.4.new/debian//fp-units-fv-2.4.4.install
--- fpc-2.4.4/debian/fp-units-fv-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-fv-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,2 +1,2 @@
/usr/share/doc/fp-units-fv
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fv
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fv
diff -ur fpc-2.4.4/debian/fp-units-gfx-2.4.4.install fpc-2.4.4.new/debian//fp-units-gfx-2.4.4.install
--- fpc-2.4.4/debian/fp-units-gfx-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-gfx-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,14 +1,14 @@
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/hermes
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/opencl
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/opengl
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/xforms
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/svgalib
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/ggi
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/imagemagick
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/libgd
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/libpng
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/graph
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/cairo
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/ptc
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/rsvg
+/usr/lib/fpc/2.4.4/units/i386-freebsd/hermes
+/usr/lib/fpc/2.4.4/units/i386-freebsd/opencl
+/usr/lib/fpc/2.4.4/units/i386-freebsd/opengl
+/usr/lib/fpc/2.4.4/units/i386-freebsd/xforms
+/usr/lib/fpc/2.4.4/units/i386-freebsd/svgalib
+/usr/lib/fpc/2.4.4/units/i386-freebsd/ggi
+/usr/lib/fpc/2.4.4/units/i386-freebsd/imagemagick
+/usr/lib/fpc/2.4.4/units/i386-freebsd/libgd
+/usr/lib/fpc/2.4.4/units/i386-freebsd/libpng
+/usr/lib/fpc/2.4.4/units/i386-freebsd/graph
+/usr/lib/fpc/2.4.4/units/i386-freebsd/cairo
+/usr/lib/fpc/2.4.4/units/i386-freebsd/ptc
+/usr/lib/fpc/2.4.4/units/i386-freebsd/rsvg
/usr/share/doc/fp-units-gfx
diff -ur fpc-2.4.4/debian/fp-units-gnome1-2.4.4.install fpc-2.4.4.new/debian//fp-units-gnome1-2.4.4.install
--- fpc-2.4.4/debian/fp-units-gnome1-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-gnome1-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,3 +1,3 @@
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/imlib
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/gnome1
+/usr/lib/fpc/2.4.4/units/i386-freebsd/imlib
+/usr/lib/fpc/2.4.4/units/i386-freebsd/gnome1
#/usr/share/doc/fp-units-gnome1
diff -ur fpc-2.4.4/debian/fp-units-gtk-2.4.4.install fpc-2.4.4.new/debian//fp-units-gtk-2.4.4.install
--- fpc-2.4.4/debian/fp-units-gtk-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-gtk-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,4 +1,4 @@
/usr/share/doc/fp-units-gtk
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/gtk1
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fpgtk
+/usr/lib/fpc/2.4.4/units/i386-freebsd/gtk1
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fpgtk
diff -ur fpc-2.4.4/debian/fp-units-gtk2-2.4.4.install fpc-2.4.4.new/debian//fp-units-gtk2-2.4.4.install
--- fpc-2.4.4/debian/fp-units-gtk2-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-gtk2-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,3 +1,3 @@
/usr/share/doc/fp-units-gtk2
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/gtk2
+/usr/lib/fpc/2.4.4/units/i386-freebsd/gtk2
diff -ur fpc-2.4.4/debian/fp-units-i386-2.4.4.install fpc-2.4.4.new/debian//fp-units-i386-2.4.4.install
--- fpc-2.4.4/debian/fp-units-i386-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-i386-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,3 +1,3 @@
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/libc
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/unixutil
+/usr/lib/fpc/2.4.4/units/i386-freebsd/libc
+/usr/lib/fpc/2.4.4/units/i386-freebsd/unixutil
#/usr/share/doc/fp-units-i386
diff -ur fpc-2.4.4/debian/fp-units-math-2.4.4.install fpc-2.4.4.new/debian//fp-units-math-2.4.4.install
--- fpc-2.4.4/debian/fp-units-math-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-math-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,5 +1,5 @@
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/gmp
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/numlib
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/proj4
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/symbolic
+/usr/lib/fpc/2.4.4/units/i386-freebsd/gmp
+/usr/lib/fpc/2.4.4/units/i386-freebsd/numlib
+/usr/lib/fpc/2.4.4/units/i386-freebsd/proj4
+/usr/lib/fpc/2.4.4/units/i386-freebsd/symbolic
/usr/share/doc/fp-units-math
diff -ur fpc-2.4.4/debian/fp-units-misc-2.4.4.install fpc-2.4.4.new/debian//fp-units-misc-2.4.4.install
--- fpc-2.4.4/debian/fp-units-misc-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-misc-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,21 +1,21 @@
/usr/share/doc/fp-units-misc
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/bzip2
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/chm
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fppkg
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/iconvenc
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/libxml2
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/libsee
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/lua
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/utmp
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/pthreads
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/zlib
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/tcl
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/cdrom
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/bfd
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/syslog
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/gdbint
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/unzip
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/newt
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fftw
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/aspell
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/users
+/usr/lib/fpc/2.4.4/units/i386-freebsd/bzip2
+/usr/lib/fpc/2.4.4/units/i386-freebsd/chm
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fppkg
+/usr/lib/fpc/2.4.4/units/i386-freebsd/iconvenc
+/usr/lib/fpc/2.4.4/units/i386-freebsd/libxml2
+/usr/lib/fpc/2.4.4/units/i386-freebsd/libsee
+/usr/lib/fpc/2.4.4/units/i386-freebsd/lua
+/usr/lib/fpc/2.4.4/units/i386-freebsd/utmp
+/usr/lib/fpc/2.4.4/units/i386-freebsd/pthreads
+/usr/lib/fpc/2.4.4/units/i386-freebsd/zlib
+/usr/lib/fpc/2.4.4/units/i386-freebsd/tcl
+/usr/lib/fpc/2.4.4/units/i386-freebsd/cdrom
+/usr/lib/fpc/2.4.4/units/i386-freebsd/bfd
+/usr/lib/fpc/2.4.4/units/i386-freebsd/syslog
+/usr/lib/fpc/2.4.4/units/i386-freebsd/gdbint
+/usr/lib/fpc/2.4.4/units/i386-freebsd/unzip
+/usr/lib/fpc/2.4.4/units/i386-freebsd/newt
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fftw
+/usr/lib/fpc/2.4.4/units/i386-freebsd/aspell
+/usr/lib/fpc/2.4.4/units/i386-freebsd/users
diff -ur fpc-2.4.4/debian/fp-units-multimedia-2.4.4.install fpc-2.4.4.new/debian//fp-units-multimedia-2.4.4.install
--- fpc-2.4.4/debian/fp-units-multimedia-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-multimedia-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,8 +1,8 @@
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/a52
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/dts
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/mad
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/modplug
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/oggvorbis
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/openal
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/sdl
+/usr/lib/fpc/2.4.4/units/i386-freebsd/a52
+/usr/lib/fpc/2.4.4/units/i386-freebsd/dts
+/usr/lib/fpc/2.4.4/units/i386-freebsd/mad
+/usr/lib/fpc/2.4.4/units/i386-freebsd/modplug
+/usr/lib/fpc/2.4.4/units/i386-freebsd/oggvorbis
+/usr/lib/fpc/2.4.4/units/i386-freebsd/openal
+/usr/lib/fpc/2.4.4/units/i386-freebsd/sdl
/usr/share/doc/fp-units-multimedia
diff -ur fpc-2.4.4/debian/fp-units-net-2.4.4.install fpc-2.4.4.new/debian//fp-units-net-2.4.4.install
--- fpc-2.4.4/debian/fp-units-net-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-net-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1,12 +1,12 @@
/usr/share/doc/fp-units-net
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/libcurl
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/dbus
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/fastcgi
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/httpd13
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/httpd20
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/httpd22
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/ldap
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/openssl
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/pcap
-#/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/zorba
+/usr/lib/fpc/2.4.4/units/i386-freebsd/libcurl
+/usr/lib/fpc/2.4.4/units/i386-freebsd/dbus
+/usr/lib/fpc/2.4.4/units/i386-freebsd/fastcgi
+/usr/lib/fpc/2.4.4/units/i386-freebsd/httpd13
+/usr/lib/fpc/2.4.4/units/i386-freebsd/httpd20
+/usr/lib/fpc/2.4.4/units/i386-freebsd/httpd22
+/usr/lib/fpc/2.4.4/units/i386-freebsd/ldap
+/usr/lib/fpc/2.4.4/units/i386-freebsd/openssl
+/usr/lib/fpc/2.4.4/units/i386-freebsd/pcap
+#/usr/lib/fpc/2.4.4/units/i386-freebsd/zorba
diff -ur fpc-2.4.4/debian/fp-units-rtl-2.4.4.install fpc-2.4.4.new/debian//fp-units-rtl-2.4.4.install
--- fpc-2.4.4/debian/fp-units-rtl-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-units-rtl-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -1 +1 @@
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/rtl
+/usr/lib/fpc/2.4.4/units/i386-freebsd/rtl
diff -ur fpc-2.4.4/debian/fp-utils-2.4.4.install fpc-2.4.4.new/debian//fp-utils-2.4.4.install
--- fpc-2.4.4/debian/fp-utils-2.4.4.install 2011-05-28 00:56:59.000000000 +0100
+++ fpc-2.4.4.new/debian//fp-utils-2.4.4.install 2011-05-28 01:45:39.000000000 +0100
@@ -28,4 +28,4 @@
/usr/bin/rmcvsdir-2.4.4
/usr/lib/fpc/2.4.4/lexyacc/yylex.cod
/usr/lib/fpc/2.4.4/lexyacc/yyparse.cod
-/usr/lib/fpc/2.4.4/units/kfreebsd-i386-linux/lexyacc
+/usr/lib/fpc/2.4.4/units/i386-freebsd/lexyacc
diff -ur fpc-2.4.4/debian/moveexamples fpc-2.4.4.new/debian//moveexamples
--- fpc-2.4.4/debian/moveexamples 2010-11-15 21:50:06.000000000 +0000
+++ fpc-2.4.4.new/debian//moveexamples 2011-05-27 04:41:41.000000000 +0100
@@ -5,6 +5,7 @@
EXAMPLE_TEMP=$1
DOC_DIR=$2
VERSION=$3
+EXAMPLE_TEMP_SUFFIX=$4
function move_examples()
{
@@ -13,9 +14,9 @@
for package in $2
do
- if [ -d $EXAMPLE_TEMP/$package/examples ]; then
+ if [ -d $EXAMPLE_TEMP/$package$EXAMPLE_TEMP_SUFFIX ]; then
echo "Moving examples of $package"
- EXAMPLE_TEMP_DIR="$EXAMPLE_TEMP/$package/examples"
+ EXAMPLE_TEMP_DIR="$EXAMPLE_TEMP/$package$EXAMPLE_TEMP_SUFFIX"
EXAMPLE_INSTALL_DIR="$DOC_DIR/$1/${VERSION}/examples/$package"
# Move dir renaming it
if [ -e "${EXAMPLE_INSTALL_DIR}" ]
@@ -24,10 +25,17 @@
exit 255
else
mv -v -f "${EXAMPLE_TEMP_DIR}" "${EXAMPLE_INSTALL_DIR}"
- rmdir $EXAMPLE_TEMP/$package
+ #on kfreebsd $EXAMPLE_TEMP_SUFFIX is an empty string so
+ #$EXAMPLE_TEMP/$package will already be gone at this point
+ if [ -e "$EXAMPLE_TEMP/$package" ]
+ then
+ rmdir $EXAMPLE_TEMP/$package
+ fi
# Remove empty directories:
rmdir --ignore-fail-on-non-empty "${EXAMPLE_INSTALL_DIR}"
fi
+ else
+ echo $EXAMPLE_TEMP/$package/examples$EXAMPLE_TEMP/$package$EXAMPLE_TEMP_SUFFIX does not exist
fi
done
Only in fpc-2.4.4.new/debian//patches: kfreebsd_stuff.diff
diff -ur fpc-2.4.4/debian/patches/series fpc-2.4.4.new/debian//patches/series
--- fpc-2.4.4/debian/patches/series 2011-04-22 11:42:08.000000000 +0100
+++ fpc-2.4.4.new/debian//patches/series 2011-05-28 00:25:01.000000000 +0100
@@ -1,3 +1,4 @@
version.diff
spell_errors_in_fpcsrc.diff
spell_errors_in_fpcdocs.diff
+kfreebsd_stuff.diff
diff -ur fpc-2.4.4/debian/rules fpc-2.4.4.new/debian//rules
--- fpc-2.4.4/debian/rules 2011-05-23 22:03:37.000000000 +0100
+++ fpc-2.4.4.new/debian//rules 2011-05-27 23:10:56.000000000 +0100
@@ -19,12 +19,8 @@
unexport FPC
# Detect name of new compiler, take care that debian uses amd64 instead of x86_64
-CPU_SOURCE := $(subst amd64,x86_64,$(shell dpkg-architecture -qDEB_BUILD_ARCH))
-CPU_TARGET := $(subst amd64,x86_64,$(shell dpkg-architecture -qDEB_HOST_ARCH))
-
-# Fixup armel, too
-CPU_SOURCE := $(subst armel,arm,$(CPU_SOURCE))
-CPU_TARGET := $(subst armel,arm,$(CPU_TARGET))
+CPU_SOURCE := $(subst amd64,x86_64,$(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU))
+CPU_TARGET := $(subst amd64,x86_64,$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU))
ifeq ($(CPU_TARGET),m68k)
PPSUF=68k
@@ -56,7 +52,9 @@
PPNEW=$(PPPRE)$(PPSUF)
-FPCTARGET=$(CPU_TARGET)-linux
+OS_TARGET=$(subst kfreebsd,freebsd,$(shell dpkg-architecture -qDEB_HOST_ARCH_OS))
+
+FPCTARGET=$(CPU_TARGET)-$(OS_TARGET)
# Get version information from changelog file
DEB_VERSION:=$(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
DEB_UPSTREAM_VERSION:=$(shell echo $(DEB_VERSION) | cut -f 1 -d -)
@@ -73,7 +71,22 @@
LIB_DIR=${INSTALL_DIR}/usr/lib/${DEB_PACKAGE_NAME}/${DEB_UPSTREAM_MAIN_VERSION}
DOC_DIR=${INSTALL_DIR}/usr/share/doc
SRC_DIR=${INSTALL_DIR}/usr/share/fpcsrc/${DEB_UPSTREAM_MAIN_VERSION}
+
+#the upstream makefiles seem to install the examples in a different place on freebsd
+ifeq ($(OS_TARGET),freebsd)
+EXAMPLE_TEMP=${INSTALL_DIR}/usr/share/examples/fpc-${DEB_UPSTREAM_MAIN_VERSION}
+EXAMPLE_TEMP_SUFFIX=
+#exclude some stuff that doesn't appear to be built on kfreebsd
+#long term it might be an idea to review this list and see if there
+#is actually a way to get some of this stuff to build on kfreebsd
+#but for now getting stuff bootstrapped is the aim
+DH_INSTALL_EXCLUDE_OPTS=-Xgrab_vcsa -Xuuid -Xopencl -Xptc -Xdbus -Xldap -Xproj4 -Xlibsee -Xlua -Xcdrom -Xnewt -Xa52 -Xdts -Xmad -Xmodplug -Xoggvorbis -Xopenal -Xdoc/fp-units-multimedia
+else
EXAMPLE_TEMP=${INSTALL_DIR}/usr/share/doc/fpc-${DEB_UPSTREAM_MAIN_VERSION}
+EXAMPLE_TEMP_SUFFIX=/examples
+DH_INSTALL_EXCLUDE_OPTS=
+endif
+
# Get utils
ifndef MKDIR
MKDIR=mkdir -p
@@ -198,7 +211,7 @@
${MV} -t ${LIB_DIR} ${INSTALL_DIR}/usr/lib/fpc/lexyacc
${CP} -t ${BIN_DIR} debian/fpc-depends
# Copy examples to the correct doc dir
- /bin/bash debian/moveexamples ${EXAMPLE_TEMP} ${DOC_DIR} ${DEB_UPSTREAM_MAIN_VERSION}
+ /bin/bash debian/moveexamples ${EXAMPLE_TEMP} ${DOC_DIR} ${DEB_UPSTREAM_MAIN_VERSION} ${EXAMPLE_TEMP_SUFFIX}
# Rename executables
for f in ${BIN_DIR}/* ; do ${MV} $$f $${f}-${DEB_UPSTREAM_MAIN_VERSION} ; done
# Install configuration files
@@ -234,7 +247,7 @@
arrange-arch-stamp:
dh_testdir
dh_testroot
- dh_install -s --sourcedir=debian/tmp --list-missing
+ dh_install -s --sourcedir=debian/tmp --list-missing $(DH_INSTALL_EXCLUDE_OPTS)
touch arrange-arch-stamp
build-indep:
