5 files changed, 52 insertions, 12 deletions

diff --git a/comms/mwavem/Makefile b/comms/mwavem/Makefile
index dcbd4e0164fb..490cde17ba93 100644
--- a/comms/mwavem/Makefile
+++ b/comms/mwavem/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	mwavem-fbsd
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	comms
-MASTER_SITES=	http://oss.software.ibm.com/developer/opensource/linux/projects/mwave/releases/ \
+MASTER_SITES=	http://www.escape.com/developer/~simonw/ \
 		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tgz
 
@@ -18,27 +18,46 @@ LIB_DEPENDS=	lthread.2:${PORTSDIR}/devel/linuxthreads
 
 ONLY_FOR_ARCHS=	i386
 
-STARTUP=	mwave.sh
+STARTUP=	mwavem.sh
 USE_GMAKE=	yes
 SLEEP=		/bin/sleep
 
 .include <bsd.port.pre.mk>
 
 pre-build:
-	${PERL} -pi.orig -e "s@f /etc@f ${PREFIX}/etc@g" ${WRKSRC}/Makefile
+	${PERL} -pi.orig -e "s@f /etc@f ${PREFIX}/etc@g;s@install -c -m -755@install -s -c -m 755@g" ${WRKSRC}/Makefile
+	${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@install -m@install -c -m@g" \
-		${WRKSRC}/manager/Makefile ${WRKSRC}/meio/Makefile ${WRKSRC}/mwmbl/Makefile \
-		${WRKSRC}/mwmlw32/Makefile ${WRKSRC}/mwmpw32/Makefile ${WRKSRC}/mwmutil/Makefile \
-		${WRKSRC}/mwwtt32/Makefile
 
 pre-install:
 	${MKDIR} ${PREFIX}/share/mwave
 
 post-install:
+	@${RM} -f /dev/mwave
+	@${ECHO} "Creating /dev/mwave"
+	mknod /dev/mwave c 96 0
 	@${ECHO} "Installing ${PREFIX}/etc/rc.d/${STARTUP} startup file."
 	@${INSTALL_SCRIPT} ${FILESDIR}/${STARTUP} ${PREFIX}/etc/rc.d/
-	strip ${PREFIX}/sbin/mwavem
+	@${ECHO} "******************************************************************************"; \
+	${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} "* 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} "******************************************************************************"; \
+	${ECHO} " "
+	@${SLEEP} 5
 
 pre-fetch:
 .if !exists(${SRC_BASE}/sys/Makefile)
diff --git a/comms/mwavem/distinfo b/comms/mwavem/distinfo
index 60d5a8494d92..d4508341864d 100644
--- a/comms/mwavem/distinfo
+++ b/comms/mwavem/distinfo
@@ -1 +1 @@
-MD5 (mwavem-fbsd-1.0.tgz) = 3bd9fe34d9d850da64759825908cc883
+MD5 (mwavem-fbsd-1.1.tgz) = 77bb7e86b2ab4caf251076e38e5d8a61
diff --git a/comms/mwavem/files/mwave.sh b/comms/mwavem/files/mwavem.sh
index 6aebec7e34a3..75d4a677888d 100644
--- a/comms/mwavem/files/mwave.sh
+++ b/comms/mwavem/files/mwavem.sh
@@ -21,7 +21,7 @@ case "$1" in
             ;;
     start )
             echo -n ' modem'
-            kldstat -n mwavedd 2>/dev/null >/dev/null || kldload /usr/local/modules/mwavedd
+            kldstat -n mwavedd 2>/dev/null >/dev/null || kldload /usr/local/share/mwave/mwavedd
             ${MWAVE_PATH}${MWAVE_NAME} > /dev/null &
             ;;
 esac
diff --git a/comms/mwavem/pkg-message b/comms/mwavem/pkg-message
new file mode 100644
index 000000000000..81a2b098f022
--- /dev/null
+++ b/comms/mwavem/pkg-message
@@ -0,0 +1,18 @@
+******************************************************************************
+*                       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       *
+* 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.                                                        *
+******************************************************************************
+
diff --git a/comms/mwavem/pkg-plist b/comms/mwavem/pkg-plist
index 8db754909dbc..f22f16f71248 100644
--- a/comms/mwavem/pkg-plist
+++ b/comms/mwavem/pkg-plist
@@ -1,6 +1,6 @@
 sbin/mwavem
 etc/mwavem.conf
-etc/rc.d/mwave.sh
+etc/rc.d/mwavem.sh
 share/mwave/agc8.dsp
 share/mwave/agc9.dsp
 share/mwave/agc9wt.dsp
@@ -78,3 +78,6 @@ lib/libmwmlw32.a
 lib/libmwmpw32.a
 lib/libmwmbl.a
 @dirrm share/mwave
+@exec rm -f /dev/mwave
+@exec mknod /dev/mwave c 96 0
+@unexec rm -f /dev/mwave