head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.120 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.118 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.116 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.114 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.112 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.110 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.108 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.106 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.104 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.102 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.100 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.98 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.96 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.94 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.92 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.90 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.88 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.86 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.84 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.82 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.80 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.78 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.76 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.72 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.52 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.74 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.70 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.68 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.66 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.64 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.62 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.60 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.58 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.56 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.54 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.50 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.48 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.46 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.44 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.42 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.40 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.38 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.36 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.34 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.32 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.30 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.28 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.26 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.24 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.22 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.20 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.18 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.16 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.14 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.12 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.10 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.8 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.4 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.2.0.66 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.64 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.62 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.60 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.58 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.56 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.54 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.52 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.50 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.48 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.46 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.44 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.42 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.40 pkgsrc-2008Q1:1.2.0.38 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.36 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.34 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.32 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.30 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.28 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.26 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.24 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.22 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.20 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.18 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.16 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.14 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.12 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.10 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.8 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.6 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2011.05.22.19.11.42; author dholland; state Exp; branches; next 1.2; 1.2 date 2003.01.27.23.39.03; author ad; state Exp; branches; next 1.1; 1.1 date 2002.12.09.11.07.20; author ad; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.12.09.11.07.20; author ad; state Exp; branches; next ; desc @@ 1.3 log @Fix assorted build problems. Should close PR 42081. While here, add at least minimal comments to all patches and tidy up some (but by no means all) pkglint. I have no idea if this works. It spews warnings about "packed", which lead me to suspect it may not run correctly, but I don't have the facilities to test it. It does, however, now build ok on LP64 and if someone can test it may be reasonable to remove the restriction on that. @ text @$NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $ - fix shmget? - use intptr_t - config for netbsd --- dpteng/osd_unix.c.orig 2002-08-13 15:02:26.000000000 +0000 +++ dpteng/osd_unix.c @@@@ -2588,7 +2588,7 @@@@ int BufferAlloc(uLONG toLoggerSize, char BufferID = shmget(IPC_PRIVATE,(int)(toLoggerTotalSize + fromLoggerTotalSize), - SHM_ALLRD | SHM_ALLWR | IPC_CREAT); + SHM_URD | SHM_UWR | IPC_CREAT); /* If We Got The Segment, Try To Attach To It */ @@@@ -2599,7 +2599,7 @@@@ int BufferAlloc(uLONG toLoggerSize, char /* The Attach Failed, So DeAllocate The Shared Memory */ - if((int)SharedMemoryPtr == -1) + if((intptr_t)SharedMemoryPtr == -1) { Rtnval = 1; shmctl(BufferID,IPC_RMID,&shm_buff); @@@@ -3676,7 +3676,7 @@@@ uSHORT BuildNodeNameList(void) uCHAR DataBuff[100]; EATA_CP pkt; int IoctlRtn; -# if (defined(_DPT_FREE_BSD)) +# if (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__) int c; int i2oMajorNode = 0; FILE *fp = popen ( @@@@ -3695,7 +3695,7 @@@@ uSHORT BuildNodeNameList(void) NumEntries = 0; for(i = 0; i < MAX_HAS; ++i) { -# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) +# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__) int created = 0; # endif @@@@ -3710,7 +3710,7 @@@@ uSHORT BuildNodeNameList(void) IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries],DPT_SIGNATURE, DataBuff,&pkt); -# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) +# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__) /* * Use Alternate access. */ @@@@ -3758,7 +3758,7 @@@@ uSHORT BuildNodeNameList(void) HbaDevs[NumEntries].IoAddress = 0xffffffff; ++NumEntries; } -# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) +# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__) else if (created) { unlink (HbaDevs[NumEntries].NodeName); @@@@ -3777,8 +3777,10 @@@@ uSHORT BuildNodeNameList(void) } HbaDevs[NumEntries].Flags = 0; strcpy(HbaDevs[NumEntries].NodeName,"/dev"); -# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) +# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__) strcat(HbaDevs[NumEntries].NodeName,"/rdptr"); +# elif (defined(__NetBSD__)) + strcat(HbaDevs[NumEntries].NodeName,"/dpt"); # else strcat(HbaDevs[NumEntries].NodeName,"/dptr"); # endif @@@@ -3789,7 +3791,7 @@@@ uSHORT BuildNodeNameList(void) mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR, (MAJOR_NODE << 20) + (i << 10) + 0); # undef MAJOR_NODE -# elif (defined(_DPT_FREE_BSD)) +# elif (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__) # define MAJOR_NODE 88 mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR, (MAJOR_NODE << 8) + i); @ 1.2 log @Miscellaneous fixes and improvements; crank version to nb1. @ text @d1 1 a1 1 $NetBSD$ d3 7 a9 3 --- dpteng/osd_unix.c.orig Tue Aug 13 16:02:26 2002 +++ dpteng/osd_unix.c Fri Dec 13 14:15:13 2002 @@@@ -2588,7 +2588,7 @@@@ d18 10 a27 1 @@@@ -3676,7 +3676,7 @@@@ d36 1 a36 1 @@@@ -3695,7 +3695,7 @@@@ d45 1 a45 1 @@@@ -3710,7 +3710,7 @@@@ d54 1 a54 1 @@@@ -3758,7 +3758,7 @@@@ d63 1 a63 1 @@@@ -3777,8 +3777,10 @@@@ d75 1 a75 1 @@@@ -3789,7 +3791,7 @@@@ @ 1.1 log @Initial revision @ text @d3 11 a13 2 --- dpteng/osd_unix.c.orig Fri Dec 6 07:56:59 2002 +++ dpteng/osd_unix.c Sat Dec 7 17:15:49 2002 @ 1.1.1.1 log @Re-import of raidutil-3.31 as dptutil-3.31. @ text @@