Skip to content

Commit 610582e

Browse files
More NetBSD.
1 parent 27030ae commit 610582e

File tree

6 files changed

+49
-6
lines changed

6 files changed

+49
-6
lines changed

fpcupdeluxetrunk.lps

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ProjectSession>
44
<PathDelim Value="\"/>
55
<Version Value="12"/>
6-
<ManyBuildModesSelection Value="darwinarm64cocoa,linuxloongarch64,openbsdx64,openbsdi386,freebsdaarch64,freebsdx64,linuxx64QT6,linuxx64QT6zip"/>
6+
<ManyBuildModesSelection Value="darwinarm64cocoa,linuxloongarch64,openbsdx64,openbsdi386,freebsdaarch64,linuxx64QT6,linuxx64QT6zip"/>
77
<Units Count="16">
88
<Unit0>
99
<Filename Value="up.lpr"/>

fpcuptools/libraryscanner/scannercore.pas

+6-2
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,17 @@ implementation
102102
{$endif}
103103

104104
{$if defined(FreeBSD) OR defined(NetBSD) OR defined(OenBSD) OR defined(DragonFly)}
105-
BSDSEARCHDIRS : array [0..5] of string = (
105+
BSDSEARCHDIRS : array [0..9] of string = (
106106
'/lib',
107107
'/libexec',
108108
'/usr/lib',
109+
'/usr/pkg/lib',
110+
'/usr/X11R7/lib',
109111
'/usr/local/lib',
110112
'/usr/local/lib/qt5',
111-
'/usr/local/lib/qt6'
113+
'/usr/local/lib/qt6',
114+
'/usr/pkg/qt5/lib',
115+
'/usr/pkg/qt6/lib'
112116
);
113117
{$endif}
114118

installscripts/netbsd.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
sudo pkgin -y install xterm
1+
sudo pkgin -y install gcc10
22
sudo pkgin -y install git
33
sudo pkgin -y install subversion
44
sudo pkgin -y install unzip
55
sudo pkgin -y install wget
66
sudo pkgin -y install gmake
7-
sudo pkgin -y install gcc
87
sudo pkgin -y install build-essential
98
sudo pkgin -y install binutils
109
sudo pkgin -y install gdb
@@ -25,8 +24,10 @@ sudo pkgin -y install SDL_gfx
2524
sudo pkgin -y install SDL_ttf
2625

2726
sudo pkgin -y install qt5
27+
sudo pkgin -y install qt5-qtbase
2828
sudo pkgin -y install qt5-qttools
2929
sudo pkgin -y install qt5-qtwebkit
30+
sudo pkgin -y install qt5-qtx11extras
3031

3132
sudo pkgin -y install qt6
3233
sudo pkgin -y install qt6-qtbase

installscripts/netbsd_xfce.sh

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
sudo pkgin -y install xfce4
2+
sudo pkgin -y install xfce4-extras
3+
sudo pkgin -y install xfce4-desktop
4+
5+
sudo pkgin -y install xdg-user-dirs
6+
xdg-user-dirs-update
7+
8+
sudo pkgin -y install dbus
9+
sudo cp /usr/pkg/share/examples/rc.d/dbus /etc/rc.d
10+
sudo echo "dbus=YES" >> /etc/rc.conf
11+
sudo /etc/rc.d/dbus start
12+
13+
sudo pkgin -y install hal
14+
sudo cp /usr/pkg/share/examples/rc.d/hal /etc/rc.d
15+
sudo echo "hal=YES" >> /etc/rc.conf
16+
sudo /etc/rc.d/hal start
17+
18+
sudo pkgin -y install fam
19+
sudo cp /usr/pkg/share/examples/rc.d/famd /etc/rc.d
20+
sudo echo "famd=YES" >> /etc/rc.conf
21+
sudo /etc/rc.d/famd start
22+
23+
# This is perhaps needed for login through xdm
24+
# If not present, your login will be rejected, and the system drops you back to the XDM login screen.
25+
# sudo echo 'DisplayManager*authName: MIT-MAGIC-COOKIE-1' >> /etc/X11/xdm/xdm-conf
26+
# echo 'xdm=YES' >> /etc/rc.conf
27+
28+
# this must be done for the local user
29+
touch .xsession
30+
# echo 'exec ck-launch-session xfce4-session' > .xsession
31+
echo 'exec xfce4-session' > .xsession
32+
ln -s .xsession .xinitrc
33+
xdg-user-dirs-update

public/gitrevision.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[master]crosslibs_all-2795(d7c94d7)
1+
[master]crosslibs_all-2796(27030ae)

sources/installermanager.pas

+5
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,11 @@ procedure TFPCupManager.GetCrossToolsFileName(out BinsFileName,LibsFileName:stri
13071307
//http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/VM-IMAGES
13081308
if (CrossCPU_Target=TCPU.x86_64) then s:='FreeBSD_AMD64_FreeBSD_10.zip';
13091309
end;
1310+
if (CrossOS_Target=TOS.netbsd) then
1311+
begin
1312+
if (CrossCPU_Target=TCPU.i386) then s:='NetBSD_i386_NetBSD_0903.zip';
1313+
if (CrossCPU_Target=TCPU.x86_64) then s:='NetBSD_AMD64_NetBSD_0903.zip';
1314+
end;
13101315
if (CrossOS_Target=TOS.openbsd) then
13111316
begin
13121317
if (CrossCPU_Target=TCPU.aarch64) then s:='OpenBSD_AArch64_OpenBSD_0606.zip';

0 commit comments

Comments
 (0)