ports/65312: [maintainer] audio/mpio-driver: unbreak, support both -CURRENT & -STABLE, minor fixes

[Sergey Akifyev]

>Number:         65312
>Category:       ports
>Synopsis:       [maintainer] audio/mpio-driver: unbreak, support both -CURRENT & -STABLE, minor fixes
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 08 00:10:14 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Akifyev
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
JSC Gascom
>Environment:
System: FreeBSD asa.gascom.net.ru 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #3: Tue Mar 2 13:30:28 MSK 2004 asa at boulder-current.gascom.ru:/usr/src/sys/i386/compile/ASA i386

>Description:
Subj.
>How-To-Repeat:
>Fix:

--- mpio-driver.diff begins here ---
diff -ruN /usr/ports/audio/mpio-driver/Makefile mpio-driver/Makefile
--- /usr/ports/audio/mpio-driver/Makefile	Mon Apr  5 09:26:13 2004
+++ mpio-driver/Makefile	Thu Apr  8 10:57:34 2004
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=		mpio-driver
-PORTVERSION=		0.2
+PORTVERSION=		0.3
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ftp.gascom.ru/pub/patches/
-DISTFILES=		urio.c.diff_1
+DISTFILES=		urio.c.diff_2
 EXTRACT_ONLY=
 
 MAINTAINER=		asa at gascom.ru
@@ -17,12 +17,12 @@
 
 NO_PACKAGE=		should be recompiled for a particular FreeBSD kernel
 
-BROKEN=			Does not patch
-
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 500000
-IGNORE=		This port only works for FreeBSD 4.x
+.if ${OSVERSION} >= 500000
+PLIST_SUB=	MODDEST=/boot
+.else
+PLIST_SUB=	MODDEST=
 .endif
 
 post-extract:
@@ -31,10 +31,12 @@
 
 pre-patch:
 	@${CP} ${MASTERDIR}/files/Makefile ${WRKSRC}
-	@cd ${WRKSRC} && ${PATCH} < ${DISTDIR}/urio.c.diff_1
+	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/urio.c.diff_2
 
 post-install:
 	${INSTALL_SCRIPT} ${MASTERDIR}/files/mpio-driver.sh.sample ${PREFIX}/etc/rc.d
+.if exists(/dev/MAKEDEV)
 	@cd /dev && sh MAKEDEV urio0
+.endif
 
 .include <bsd.port.post.mk>
diff -ruN /usr/ports/audio/mpio-driver/distinfo mpio-driver/distinfo
--- /usr/ports/audio/mpio-driver/distinfo	Thu Apr  1 10:35:12 2004
+++ mpio-driver/distinfo	Thu Apr  8 10:38:04 2004
@@ -1,2 +1,2 @@
-MD5 (urio.c.diff_1) = df344d5bde81ba5b813ba98649ab0c8f
-SIZE (urio.c.diff_1) = 4717
+MD5 (urio.c.diff_2) = c28643eb5ae5ec40e66b24fdbe35a6d2
+SIZE (urio.c.diff_2) = 5537
diff -ruN /usr/ports/audio/mpio-driver/files/Makefile mpio-driver/files/Makefile
--- /usr/ports/audio/mpio-driver/files/Makefile	Mon Sep  1 08:30:04 2003
+++ mpio-driver/files/Makefile	Thu Apr  8 10:59:40 2004
@@ -6,5 +6,8 @@
 KMOD=	mpio
 SRCS=	urio.c usb_if.h device_if.h bus_if.h opt_usb.h vnode_if.h
 CFLAGS=	-DUSB_VENDOR_DIGITALWAY=0x2735 -DUSB_PRODUCT_DIGITALWAY_MPIO=0x0001
+.if ${OSVERSION} >= 500000
+KMODDIR=	/boot/modules
+.endif
 
 .include <bsd.kmod.mk>
diff -ruN /usr/ports/audio/mpio-driver/pkg-plist mpio-driver/pkg-plist
--- /usr/ports/audio/mpio-driver/pkg-plist	Mon Sep  1 08:30:04 2003
+++ mpio-driver/pkg-plist	Thu Apr  8 10:55:46 2004
@@ -1,2 +1,2 @@
 etc/rc.d/mpio-driver.sh.sample
- at unexec rm -f /modules/mpio.ko 2> /dev/null || true
+ at unexec rm -f %%MODDEST%%/modules/mpio.ko 2> /dev/null || true

--- mpio-driver.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: