FreeBSD Bugzilla – Attachment 47985 Details for
Bug 73451
[PATCH] comms/mlan3: Unbreak port for build on FreeBSD 5.x
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
mlan3-1.00.patch
mlan3-1.00.patch (text/plain), 9.68 KB, created by
darth
on 2004-11-03 12:40:27 UTC
(
hide
)
Description:
mlan3-1.00.patch
Filename:
MIME Type:
Creator:
darth
Created:
2004-11-03 12:40:27 UTC
Size:
9.68 KB
patch
obsolete
>--- Makefile Sat Apr 10 19:26:30 2004 >+++ Makefile Wed Oct 27 17:43:33 2004 >@@ -21,8 +21,4 @@ > > .include <bsd.port.pre.mk> > >-.if ${OSVERSION} >= 500113 >-BROKEN= "Does not install (Makefiles need rework)" >-.endif >- > .include <bsd.port.post.mk> >--- files/patch-aa Wed Jan 16 14:05:42 2002 >+++ files/patch-aa Wed Oct 27 17:44:44 2004 >@@ -1,14 +1,12 @@ >-diff -u -r --new-file ../mlan-dist/Makefile ./Makefile >---- ../mlan-dist/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./Makefile Tue Jan 15 16:26:17 2002 >+--- Makefile Thu Jan 1 01:00:00 1970 >++++ Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,4 @@ > + > +SUBDIR= lib apps > + > +.include <bsd.subdir.mk> >-diff -u -r --new-file ../mlan-dist/apps/Makefile ./apps/Makefile >---- ../mlan-dist/apps/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/Makefile Wed Jan 16 10:38:52 2002 >+--- apps/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,6 @@ > + > +SUBDIR= atodtst counter coupler fish gethumd memutil mweather shaapp \ >@@ -16,9 +14,8 @@ > + > +.include <bsd.subdir.mk> > + >-diff -u -r --new-file ../mlan-dist/apps/atodtst/Makefile ./apps/atodtst/Makefile >---- ../mlan-dist/apps/atodtst/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/atodtst/Makefile Wed Jan 16 11:13:57 2002 >+--- apps/atodtst/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/atodtst/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= atodtst > +PREFIX?= /usr/local >@@ -35,9 +32,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/counter/Makefile ./apps/counter/Makefile >---- ../mlan-dist/apps/counter/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/counter/Makefile Wed Jan 16 11:08:03 2002 >+--- apps/counter/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/counter/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= counter > +PREFIX?= /usr/local >@@ -54,9 +50,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/coupler/Makefile ./apps/coupler/Makefile >---- ../mlan-dist/apps/coupler/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/coupler/Makefile Wed Jan 16 11:09:03 2002 >+--- apps/coupler/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/coupler/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= coupler > +PREFIX?= /usr/local >@@ -73,9 +68,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/fish/Makefile ./apps/fish/Makefile >---- ../mlan-dist/apps/fish/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/fish/Makefile Wed Jan 16 11:09:19 2002 >+--- apps/fish/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/fish/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= fish > +PREFIX?= /usr/local >@@ -92,9 +86,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/gethumd/Makefile ./apps/gethumd/Makefile >---- ../mlan-dist/apps/gethumd/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/gethumd/Makefile Wed Jan 16 11:09:41 2002 >+--- apps/gethumd/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/gethumd/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= gethumd > +PREFIX?= /usr/local >@@ -111,9 +104,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/memutil/Makefile ./apps/memutil/Makefile >---- ../mlan-dist/apps/memutil/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/memutil/Makefile Wed Jan 16 11:10:00 2002 >+--- apps/memutil/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/memutil/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= memutil > +PREFIX?= /usr/local >@@ -130,9 +122,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/mweather/Makefile ./apps/mweather/Makefile >---- ../mlan-dist/apps/mweather/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/mweather/Makefile Wed Jan 16 11:10:19 2002 >+--- apps/mweather/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/mweather/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= mweather > +PREFIX?= /usr/local >@@ -149,9 +140,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/shaapp/Makefile ./apps/shaapp/Makefile >---- ../mlan-dist/apps/shaapp/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/shaapp/Makefile Wed Jan 16 11:10:39 2002 >+--- apps/shaapp/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/shaapp/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= shaapp > +PREFIX?= /usr/local >@@ -168,9 +158,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/swtloop/Makefile.app ./apps/swtloop/Makefile.app >---- ../mlan-dist/apps/swtloop/Makefile.app Thu Jan 1 01:00:00 1970 >-+++ ./apps/swtloop/Makefile.app Tue Jan 15 16:09:46 2002 >+--- apps/swtloop/Makefile.app Thu Jan 1 01:00:00 1970 >++++ apps/swtloop/Makefile.app Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,8 @@ > +PROG= tstfind > +CFLAGS= -I. -Wall -I ../../common >@@ -180,9 +169,8 @@ > +SRCS= tstfind.c > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/swtsngl/Makefile ./apps/swtsngl/Makefile >---- ../mlan-dist/apps/swtsngl/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/swtsngl/Makefile Wed Jan 16 11:11:24 2002 >+--- apps/swtsngl/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/swtsngl/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= swtsngl > +PREFIX?= /usr/local >@@ -199,9 +187,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/temp/Makefile ./apps/temp/Makefile >---- ../mlan-dist/apps/temp/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/temp/Makefile Wed Jan 16 11:11:59 2002 >+--- apps/temp/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/temp/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= temp > +PREFIX?= /usr/local >@@ -218,9 +205,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/thermo/Makefile.app ./apps/thermo/Makefile.app >---- ../mlan-dist/apps/thermo/Makefile.app Thu Jan 1 01:00:00 1970 >-+++ ./apps/thermo/Makefile.app Tue Jan 15 16:09:57 2002 >+--- apps/thermo/Makefile.app Thu Jan 1 01:00:00 1970 >++++ apps/thermo/Makefile.app Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,8 @@ > +PROG= tstfind > +CFLAGS= -I. -Wall -I ../../common >@@ -230,9 +216,8 @@ > +SRCS= tstfind.c > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/apps/tstfind/Makefile ./apps/tstfind/Makefile >---- ../mlan-dist/apps/tstfind/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./apps/tstfind/Makefile Wed Jan 16 11:12:51 2002 >+--- apps/tstfind/Makefile Thu Jan 1 01:00:00 1970 >++++ apps/tstfind/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,15 @@ > +PROG= tstfind > +PREFIX?= /usr/local >@@ -249,9 +234,8 @@ > + ./${PROG} /dev/cuaa0 > + > +.include <bsd.prog.mk> >-diff -u -r --new-file ../mlan-dist/common/ownet.h ./common/ownet.h >---- ../mlan-dist/common/ownet.h Fri Sep 28 21:42:02 2001 >-+++ ./common/ownet.h Tue Jan 15 17:59:50 2002 >+--- common/ownet.h Fri Sep 28 21:42:02 2001 >++++ common/ownet.h Wed Oct 27 17:03:17 2004 > @@ -133,6 +133,10 @@ > typedef unsigned short ushort; > typedef unsigned long ulong; >@@ -263,16 +247,14 @@ > #endif > #ifdef SDCC > //intent of ushort is 2 bytes unsigned. >-diff -u -r --new-file ../mlan-dist/lib/Makefile ./lib/Makefile >---- ../mlan-dist/lib/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./lib/Makefile Wed Jan 16 11:15:52 2002 >+--- lib/Makefile Thu Jan 1 01:00:00 1970 >++++ lib/Makefile Wed Oct 27 17:03:17 2004 > @@ -0,0 +1,3 @@ > +SUBDIR= userial > + > +.include <bsd.subdir.mk> >-diff -u -r --new-file ../mlan-dist/lib/userial/Link/linuxlnk.c ./lib/userial/Link/linuxlnk.c >---- ../mlan-dist/lib/userial/Link/linuxlnk.c Fri Sep 28 21:42:14 2001 >-+++ ./lib/userial/Link/linuxlnk.c Wed Jan 16 11:29:22 2002 >+--- lib/userial/Link/linuxlnk.c Fri Sep 28 21:42:14 2001 >++++ lib/userial/Link/linuxlnk.c Wed Oct 27 17:03:17 2004 > @@ -93,6 +93,7 @@ > #include <termios.h> > #include <errno.h> >@@ -281,10 +263,9 @@ > > #include "ds2480.h" > #include "ownet.h" >-diff -u -r --new-file ../mlan-dist/lib/userial/Makefile ./lib/userial/Makefile >---- ../mlan-dist/lib/userial/Makefile Thu Jan 1 01:00:00 1970 >-+++ ./lib/userial/Makefile Wed Jan 16 11:34:34 2002 >-@@ -0,0 +1,30 @@ >+--- lib/userial/Makefile Thu Jan 1 01:00:00 1970 >++++ lib/userial/Makefile Wed Oct 27 17:03:56 2004 >+@@ -0,0 +1,33 @@ > +MLANCOM= ${.CURDIR}/../../common > +MLANLNK= ${.CURDIR}/Link > +LIB= mlan >@@ -293,22 +274,25 @@ > +PREFIX?= /usr/local > +LIBDIR= ${PREFIX}/lib > + >++ >++.PATH: ${MLANCOM} ${MLANLNK} >++ > +SRCS= ds2480ut.c owllu.c ownetu.c owsesu.c owtrnu.c > + >-+SRCS+= ${MLANLNK}/linuxlnk.c >++SRCS+= linuxlnk.c > + >-+SRCS+= ${MLANCOM}/ad26.c ${MLANCOM}/atod20.c ${MLANCOM}/cnt1d.c \ >-+ ${MLANCOM}/crcutil.c ${MLANCOM}/findtype.c ${MLANCOM}/ibsha33o.c \ >-+ ${MLANCOM}/ioutil.c ${MLANCOM}/mbappreg.c ${MLANCOM}/mbee.c \ >-+ ${MLANCOM}/mbeprom.c ${MLANCOM}/mbnv.c ${MLANCOM}/mbnvcrc.c \ >-+ ${MLANCOM}/mbscr.c ${MLANCOM}/mbscrcrc.c ${MLANCOM}/mbscree.c \ >-+ ${MLANCOM}/mbscrex.c ${MLANCOM}/mbsha.c ${MLANCOM}/mbshaee.c \ >-+ ${MLANCOM}/owcache.c ${MLANCOM}/owerr.c ${MLANCOM}/owfile.c \ >-+ ${MLANCOM}/owpgrw.c ${MLANCOM}/owprgm.c ${MLANCOM}/rawmem.c \ >-+ ${MLANCOM}/screenio.c ${MLANCOM}/sha18.c ${MLANCOM}/sha33.c \ >-+ ${MLANCOM}/shadebit.c ${MLANCOM}/shadebitvm.c ${MLANCOM}/shaibutton.c \ >-+ ${MLANCOM}/swt05.c ${MLANCOM}/swt12.c ${MLANCOM}/swt1f.c \ >-+ ${MLANCOM}/temp10.c ${MLANCOM}/thermo21.c ${MLANCOM}/weather.c >++SRCS+= ad26.c atod20.c cnt1d.c \ >++ crcutil.c findtype.c ibsha33o.c \ >++ ioutil.c mbappreg.c mbee.c \ >++ mbeprom.c mbnv.c mbnvcrc.c \ >++ mbscr.c mbscrcrc.c mbscree.c \ >++ mbscrex.c mbsha.c mbshaee.c \ >++ owcache.c owerr.c owfile.c \ >++ owpgrw.c owprgm.c rawmem.c \ >++ screenio.c sha18.c sha33.c \ >++ shadebit.c shadebitvm.c shaibutton.c \ >++ swt05.c swt12.c swt1f.c \ >++ temp10.c thermo21.c weather.c > + > +beforeinstall: > + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 73451
: 47985 |
47986