4 files changed, 81 insertions, 82 deletions

diff --git a/comms/mwavem/Makefile b/comms/mwavem/Makefile
index 78afd9e02ab8..43876781e9a8 100644
--- a/comms/mwavem/Makefile
+++ b/comms/mwavem/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mwavem-fbsd
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
+PORTREVISION=	0
 CATEGORIES=	comms
 MASTER_SITES=	http://www.escape.com/~simonw/ \
-		http://home.pacbell.net/simonw2/src/ \
-		${MASTER_SITE_LOCAL}
+		http://home.pacbell.net/simonw2/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	oberman@es.net
@@ -20,6 +19,7 @@ LIB_DEPENDS=	lthread.2:${PORTSDIR}/devel/linuxthreads
 
 ONLY_FOR_ARCHS=	i386
 
+GNU_CONFIGURE=	yes
 STARTUP=	mwavem.sh
 USE_GMAKE=	yes
 SLEEP=		/bin/sleep
@@ -27,12 +27,11 @@ SLEEP=		/bin/sleep
 .include <bsd.port.pre.mk>
 
 pre-build:
-	${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
 
 pre-install:
-	${MKDIR} ${PREFIX}/share/mwave
+	${MKDIR} ${DATADIR}
 
 post-install:
 	@${RM} -f /dev/mwave
diff --git a/comms/mwavem/distinfo b/comms/mwavem/distinfo
index d4508341864d..eebb8b3a2729 100644
--- a/comms/mwavem/distinfo
+++ b/comms/mwavem/distinfo
@@ -1 +1 @@
-MD5 (mwavem-fbsd-1.1.tgz) = 77bb7e86b2ab4caf251076e38e5d8a61
+MD5 (mwavem-fbsd-1.2.tgz) = b9449c68842261ead834792d2ecafcfc
diff --git a/comms/mwavem/files/mwavem.sh b/comms/mwavem/files/mwavem.sh
index 1f179fce4ede..8153e09e9ff5 100644
--- a/comms/mwavem/files/mwavem.sh
+++ b/comms/mwavem/files/mwavem.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-MWAVE_NAME="mwavem"
+MWAVEM_NAME="mwavem"
 MWAVEM_PATH="/usr/local/bin/"
 #
 # -- START --
@@ -19,8 +19,8 @@ case "$1" in
     stop  )
             ;;
     start )
-            echo -n ' modem'
-            kldstat -n mwavedd 2>/dev/null >/dev/null || kldload /usr/local/share/mwave/mwavedd
-            ${MWAVE_PATH}${MWAVE_NAME} > /dev/null &
+            echo -n ' internal modem'
+            kldstat -n mwave 2>/dev/null >/dev/null || kldload /usr/local/share/mwave/mwavedd
+            ${MWAVEM_PATH}${MWAVEM_NAME} > /dev/null &
             ;;
 esac
diff --git a/comms/mwavem/pkg-plist b/comms/mwavem/pkg-plist
index f22f16f71248..5c4aeefa4f63 100644
--- a/comms/mwavem/pkg-plist
+++ b/comms/mwavem/pkg-plist
@@ -1,75 +1,75 @@
-sbin/mwavem
+bin/mwavem
 etc/mwavem.conf
 etc/rc.d/mwavem.sh
-share/mwave/agc8.dsp
-share/mwave/agc9.dsp
-share/mwave/agc9wt.dsp
-share/mwave/async.dsp
-share/mwave/async2x.dsp
-share/mwave/c96441.dsp
-share/mwave/callerid.dsp
-share/mwave/callprog.dsp
-share/mwave/cancel.dsp
-share/mwave/cl1_hdlc.dsp
-share/mwave/class1.dsp
-share/mwave/class2.dsp
-share/mwave/class8.dsp
-share/mwave/class80.dsp
-share/mwave/disc.dsp
-share/mwave/dtmfr8.dsp
-share/mwave/dtmfrm.dsp
-share/mwave/fax01.dsp
-share/mwave/faxpmp17.dsp
-share/mwave/gain96.dsp
-share/mwave/gainwt.dsp
-share/mwave/gpc2pc.dsp
-share/mwave/gsm.dsp
-share/mwave/imaadpcm.dsp
-share/mwave/init0437.dsp
-share/mwave/int0896.dsp
-share/mwave/int9608.dsp
-share/mwave/meix0437.dsp
-share/mwave/mhint.dsp
-share/mwave/mixer96.dsp
-share/mwave/mnp.dsp
-share/mwave/mnp5.dsp
-share/mwave/modem.dsp
-share/mwave/mwbi0917.dsp
-share/mwave/mwos3780.dsp
-share/mwave/pc2gpc.dsp
-share/mwave/ramm.dsp
-share/mwave/rammv34.dsp
-share/mwave/router.dsp
-share/mwave/sildet.dsp
-share/mwave/spk076.dsp
-share/mwave/spk076m.dsp
-share/mwave/spkeec.dsp
-share/mwave/spkeecm.dsp
-share/mwave/spkmmtp.dsp
-share/mwave/spkvod.dsp
-share/mwave/stp08m.dsp
-share/mwave/stpvm.dsp
-share/mwave/str08ser.dsp
-share/mwave/strvm.dsp
-share/mwave/t30.dsp
-share/mwave/tonegen.dsp
-share/mwave/uartdma.dsp
-share/mwave/v22.dsp
-share/mwave/v23.dsp
-share/mwave/v32bis.dsp
-share/mwave/v34.dsp
-share/mwave/v34pcmc.dsp
-share/mwave/v42.dsp
-share/mwave/v42bisn.dsp
-share/mwave/v8.dsp
-share/mwave/v80.dsp
-share/mwave/v80mac.dsp
-share/mwave/v90.dsp
-share/mwave/vv_hdlc.dsp
-share/mwave/vv_prot.dsp
-share/mwave/mwmmem.prf
-share/mwave/tigr1040.wtt
-share/mwave/mwavedd.ko
+share/mwavem/agc8.dsp
+share/mwavem/agc9.dsp
+share/mwavem/agc9wt.dsp
+share/mwavem/async.dsp
+share/mwavem/async2x.dsp
+share/mwavem/c96441.dsp
+share/mwavem/callerid.dsp
+share/mwavem/callprog.dsp
+share/mwavem/cancel.dsp
+share/mwavem/cl1_hdlc.dsp
+share/mwavem/class1.dsp
+share/mwavem/class2.dsp
+share/mwavem/class8.dsp
+share/mwavem/class80.dsp
+share/mwavem/disc.dsp
+share/mwavem/dtmfr8.dsp
+share/mwavem/dtmfrm.dsp
+share/mwavem/fax01.dsp
+share/mwavem/faxpmp17.dsp
+share/mwavem/gain96.dsp
+share/mwavem/gainwt.dsp
+share/mwavem/gpc2pc.dsp
+share/mwavem/gsm.dsp
+share/mwavem/imaadpcm.dsp
+share/mwavem/init0437.dsp
+share/mwavem/int0896.dsp
+share/mwavem/int9608.dsp
+share/mwavem/meix0437.dsp
+share/mwavem/mhint.dsp
+share/mwavem/mixer96.dsp
+share/mwavem/mnp.dsp
+share/mwavem/mnp5.dsp
+share/mwavem/modem.dsp
+share/mwavem/mwbi0917.dsp
+share/mwavem/mwos3780.dsp
+share/mwavem/pc2gpc.dsp
+share/mwavem/ramm.dsp
+share/mwavem/rammv34.dsp
+share/mwavem/router.dsp
+share/mwavem/sildet.dsp
+share/mwavem/spk076.dsp
+share/mwavem/spk076m.dsp
+share/mwavem/spkeec.dsp
+share/mwavem/spkeecm.dsp
+share/mwavem/spkmmtp.dsp
+share/mwavem/spkvod.dsp
+share/mwavem/stp08m.dsp
+share/mwavem/stpvm.dsp
+share/mwavem/str08ser.dsp
+share/mwavem/strvm.dsp
+share/mwavem/t30.dsp
+share/mwavem/tonegen.dsp
+share/mwavem/uartdma.dsp
+share/mwavem/v22.dsp
+share/mwavem/v23.dsp
+share/mwavem/v32bis.dsp
+share/mwavem/v34.dsp
+share/mwavem/v34pcmc.dsp
+share/mwavem/v42.dsp
+share/mwavem/v42bisn.dsp
+share/mwavem/v8.dsp
+share/mwavem/v80.dsp
+share/mwavem/v80mac.dsp
+share/mwavem/v90.dsp
+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
@@ -77,7 +77,7 @@ lib/libmwwtt32.a
 lib/libmwmlw32.a
 lib/libmwmpw32.a
 lib/libmwmbl.a
-@dirrm share/mwave
+@dirrm share/mwavem
 @exec rm -f /dev/mwave
 @exec mknod /dev/mwave c 96 0
 @unexec rm -f /dev/mwave