4 files changed, 26 insertions, 31 deletions

diff --git a/comms/mwavem/Makefile b/comms/mwavem/Makefile
index 860c096d9474..bbb2ec5a1f4e 100644
--- a/comms/mwavem/Makefile
+++ b/comms/mwavem/Makefile
@@ -27,8 +27,7 @@ SLEEP=		/bin/sleep
 .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 @@ post-install:
 	${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 --git a/comms/mwavem/files/mwavem.sh b/comms/mwavem/files/mwavem.sh
index 8153e09e9ff5..ae58f04c46cf 100644
--- a/comms/mwavem/files/mwavem.sh
+++ b/comms/mwavem/files/mwavem.sh
@@ -20,7 +20,7 @@ case "$1" in
             ;;
     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 --git a/comms/mwavem/pkg-message b/comms/mwavem/pkg-message
index 81a2b098f022..fe0fefacc7e6 100644
--- a/comms/mwavem/pkg-message
+++ b/comms/mwavem/pkg-message
@@ -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 --git a/comms/mwavem/pkg-plist b/comms/mwavem/pkg-plist
index 5c4aeefa4f63..3471e558a0ee 100644
--- a/comms/mwavem/pkg-plist
+++ b/comms/mwavem/pkg-plist
@@ -69,14 +69,7 @@ share/mwavem/vv_hdlc.dsp
 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