Date: Thu, 14 Feb 2002 11:17:56 -0800 (PST) From: Kevin Oberman <oberman@es.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34945: Multiple corrections to port Message-ID: <20020214191756.5CBF05D8@puppeteer.es.net>
next in thread | raw e-mail | index | archive | help
>Number: 34945
>Category: ports
>Synopsis: Multiple corrections to port
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 14 15:50:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Kevin Oberman
>Release: FreeBSD 4.5-RC i386
>Organization:
ESnet--The Energy Sciences Network
>Environment:
System: FreeBSD puppeteer.es.net 4.5-RC FreeBSD 4.5-RC #4: Fri Jan 25 19:24:26 PST 2002 oberman@puppeteer.es.net:/scratch/obj/scratch/src/sys/THINKPAD i386
>Description:
Fixed pkg-message and Makefile to correct path information and
provide notification of possible problems. Updated pkg-plist.
>How-To-Repeat:
Install port
>Fix:
diff -ruN mwavem.old/Makefile mwavem/Makefile
--- mwavem.old/Makefile Thu Jan 10 18:55:14 2002
+++ mwavem/Makefile Thu Feb 14 10:46:40 2002
@@ -27,8 +27,7 @@
.include <bsd.port.pre.mk>
pre-build:
- ${PERL} -pi.orig -e "s@/etc/mwavem@${PREFIX}/etc/mwavem@g" ${WRKSRC}/modem.c
- ${PERL} -pi.orig -e "s@ko /modules@ko ${PREFIX}/share/mwave@g" ${WRKSRC}/drivers/Makefile
+ ${PERL} -pi.orig -e "s@ /modules@ ${PREFIX}/share/mwavem@g" ${WRKSRC}/src/drivers/Makefile
pre-install:
${MKDIR} ${DATADIR}
@@ -43,19 +42,20 @@
${ECHO} "* Driver loading information *"; \
${ECHO} "* *"; \
${ECHO} "* This package includes a device driver in a kernel module. While it is *"; \
- ${ECHO} "* installed in ${PREFIX}/share/mwave, this results in the initial device *"; \
+ ${ECHO} "* installed in ${PREFIX}/share/mwavem, this results in the initial device *"; \
${ECHO} "* probe not seeing the device and possibly reporting errors for the sio *"; \
${ECHO} "* device which may be ignored. *"; \
${ECHO} "* *"; \
- ${ECHO} "* It may also result in the serial device being probed at a 8250 instead of *"; \
- ${ECHO} "* a 16550A as the probe may occur before he device is fully initialized. If *"; \
- ${ECHO} "* this happens you must re-boot to get the modem to work. *"; \
- ${ECHO} "* *"; \
- ${ECHO} "* You can eliminate this problem by copying ${PREFIX}/share/mwave/mwavedd.ko*"; \
- ${ECHO} "* into /modules. Then add the line: *"; \
- ${ECHO} "* mwavedd_load=\"YES\" *"; \
- ${ECHO} "* to /boot/loader.conf. This will load the driver at the start of the *"; \
- ${ECHO} "* bootstrap and it will probe in a normal manner. *"; \
+ ${ECHO} "* You may choose to standardize the module loading by copying *"; \
+ ${ECHO} "* ${PREFIX}/share/mwavem/mwave.ko into /modules. Then add the *"; \
+ ${ECHO} "* mwavedd_load=\"YES\" to /boot/loader.conf. This will load the driver *"; \
+ ${ECHO} "* at the start of the bootstrap and it will probe in a normal manner. *"; \
+ ${ECHO} "******************************************************************************"; \
+ ${ECHO} "* Known problem! *"; \
+ ${ECHO} "* If the sio device connected to the modem probe as an 8250 device, the *"; \
+ ${ECHO} "* modem will not work. Make sure that the mwavem process is running and *"; \
+ ${ECHO} "* reboot the system. It should probe correctly and the modem should be *"; \
+ ${ECHO} "* opertional. *"; \
${ECHO} "******************************************************************************"; \
${ECHO} " "
@${SLEEP} 5
diff -ruN mwavem.old/files/mwavem.sh mwavem/files/mwavem.sh
--- mwavem.old/files/mwavem.sh Wed Dec 12 11:40:09 2001
+++ mwavem/files/mwavem.sh Thu Feb 14 09:58:20 2002
@@ -20,7 +20,7 @@
;;
start )
echo -n ' internal modem'
- kldstat -n mwave 2>/dev/null >/dev/null || kldload /usr/local/share/mwave/mwavedd
+ kldstat -n mwave 2>/dev/null >/dev/null || kldload /usr/local/share/mwavem/mwave
${MWAVEM_PATH}${MWAVEM_NAME} > /dev/null &
;;
esac
diff -ruN mwavem.old/pkg-message mwavem/pkg-message
--- mwavem.old/pkg-message Mon Jun 4 10:19:05 2001
+++ mwavem/pkg-message Thu Feb 14 10:48:40 2002
@@ -1,18 +1,20 @@
******************************************************************************
* Driver loading information *
* *
-* This package includes a device driver in a kernel module. While it is *
-* installed in $PREFIX/share/mwave, this results in the initial device *
+* This package includes a device driver as a kernel module. While it is *
+* installed in $PREFIX/share/mwavem, this results in the initial device *
* probe not seeing the device and possibly reporting errors for the sio *
* device which may be ignored. *
* *
-* It may also result in the serial device being probed at a 8250 instead of *
-* a 16550A as the probe may occur before he device is fully initialized. If *
-* this happens you must re-boot to get the modem to work. *
-* *
-* You can eliminate this problem by copying $PREFIX/share/mwave/mwavedd.ko *
-* into /modules. Then add the line 'mwavedd_load="YES"' to /boot/loader.conf.*
-* This will load the driver at the start of the bootstrap and it will probe *
-* in a normal manner. *
+* You may choose to standardize the module loading by copying *
+* $PREFIX/share/mwavem/mwave.ko into /modules. Then add the line *
+* 'mwave_load="YES"' to /boot/loader.conf. This will load the driver *
+* at the start of the bootstrap and it will probe in a normal manner. *
+******************************************************************************
+* Known problem! *
+* If the sio device connected to the modem probe as an 8250 device, the *
+* modem will not work. Make sure that the mwavem process is running and *
+* reboot the system. It should probe correctly and the modem should be *
+* opertional. *
******************************************************************************
diff -ruN mwavem.old/pkg-plist mwavem/pkg-plist
--- mwavem.old/pkg-plist Wed Dec 12 11:40:09 2001
+++ mwavem/pkg-plist Thu Feb 14 09:59:07 2002
@@ -69,14 +69,7 @@
share/mwavem/vv_prot.dsp
share/mwavem/mwmmem.prf
share/mwavem/tigr1040.wtt
-share/mwavem/mwavedd.ko
-lib/libmwave.a
-lib/libmeio.a
-lib/libmwmutil.a
-lib/libmwwtt32.a
-lib/libmwmlw32.a
-lib/libmwmpw32.a
-lib/libmwmbl.a
+share/mwavem/mwave.ko
@dirrm share/mwavem
@exec rm -f /dev/mwave
@exec mknod /dev/mwave c 96 0
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020214191756.5CBF05D8>