ports/143681: port updates: comms/hso-kmod and comms/uhso-kmod

[Ganael Laplanche]

>Number:         143681
>Category:       ports
>Synopsis:       port updates: comms/hso-kmod and comms/uhso-kmod
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 08 21:10:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Ganael Laplanche
>Release:        9.0-CURRENT
>Organization:
http://contribs.martymac.org
>Environment:
FreeBSD laptop.martymac.com 9.0-CURRENT FreeBSD 9.0-CURRENT #6: Thu Jan 21 14:46:32 UTC 2010     martymac at laptop.martymac.com:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Here are two small patches that add CONFLICTS and good advice on choosing between hso-kmod and uhso-kmod depending on your FreeBSD version.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN hso-kmod.orig/Makefile hso-kmod/Makefile
--- hso-kmod.orig/Makefile	2010-02-08 18:34:15.867873710 +0000
+++ hso-kmod/Makefile	2010-02-08 18:37:38.003829536 +0000
@@ -15,6 +15,8 @@
 MAINTAINER=	ganael.laplanche at martymac.com
 COMMENT=	Driver for Option HSDPA modem
 
+CONFLICTS=	uhso-kmod-[0-9]*
+
 NO_PACKAGE=	should be recompiled for a particular FreeBSD kernel
 
 OPTIONS=	HSOCTL "Build hsoctl tool" on \
@@ -31,7 +33,7 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 800063
-BROKEN=	Does not build with USB2
+BROKEN=	does not build with USB2, please try comms/uhso-kmod instead
 .endif
 
 .if !defined(WITHOUT_HSOCTL)
diff -aurN uhso-kmod.orig/Makefile uhso-kmod/Makefile
--- uhso-kmod.orig/Makefile	2010-02-08 18:34:40.403755016 +0000
+++ uhso-kmod/Makefile	2010-02-08 18:38:35.032531648 +0000
@@ -27,14 +27,14 @@
 PLIST_SUB+=	KMODDIR=${KMODDIR}
 MAKE_ENV+=	KMODDIR=${KMODDIR}
 
-MAN4=		uhso.4
+MAN4=	uhso.4
 
 .include <bsd.port.pre.mk>
 
 .if !exists(/usr/src/sys/Makefile)
 IGNORE=		requires kernel source files
 .elif ${OSVERSION} <= 800063
-IGNORE=		requires FreeBSD 8.0 (with USB2) or superior
+IGNORE=		requires FreeBSD 8.0 or superior, please try comms/hso-kmod instead
 .endif
 
 .if !defined(WITHOUT_UHSOCTL)


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