ports/148085: Port update: comms/uhso-kmod - Update to v20100416
Ganael Laplanche
ganael.laplanche at martymac.com
Wed Jun 23 10:20:05 UTC 2010
>Number: 148085
>Category: ports
>Synopsis: Port update: comms/uhso-kmod - Update to v20100416
>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: Wed Jun 23 10:20: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 #9 r209412: Tue Jun 22 14:21:19 UTC 2010 martymac at laptop.martymac.com:/usr/obj/usr/src/sys/GENERIC i386
>Description:
This patch updates comms/uhso-kmod to v20100416.
It also includes a warning message regarding the recent inclusion of uhso into base.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -aurN uhso-kmod.orig/Makefile uhso-kmod/Makefile
--- uhso-kmod.orig/Makefile 2010-06-21 18:37:07.799428698 +0000
+++ uhso-kmod/Makefile 2010-06-23 06:03:50.294243262 +0000
@@ -6,7 +6,7 @@
#
PORTNAME= uhso
-PORTVERSION= 20091122
+PORTVERSION= 20100416
CATEGORIES= comms kld
MASTER_SITES= http://www.shapeshifter.se/pub/hso/
PKGNAMESUFFIX= -kmod
@@ -38,25 +38,33 @@
.endif
.if !defined(WITHOUT_UHSOCTL)
-UHSOCTL_VERSION= 20090820
-DISTFILES+= uhsoctl-beta-${UHSOCTL_VERSION}${EXTRACT_SUFX}
-WRKSRC_UHSOCTL= ${WRKDIR}/uhsoctl-beta-${UHSOCTL_VERSION}
+UHSOCTL_VERSION= 20100416
+DISTFILES+= uhsoctl-${UHSOCTL_VERSION}${EXTRACT_SUFX}
+WRKSRC_UHSOCTL= ${WRKDIR}/uhsoctl-${UHSOCTL_VERSION}
PLIST_SUB+= PL_UHSOCTL=""
MAN1= uhsoctl.1
.else
PLIST_SUB+= PL_UHSOCTL="@comment "
.endif
-.if defined(WITH_DEBUG)
-EXTRA_PATCHES+= ${PATCHDIR}/UHSO-DEBUG-patch-Makefile
+.if !defined(WITH_DEBUG)
+EXTRA_PATCHES+= ${PATCHDIR}/UHSO-NODEBUG-patch-Makefile
+.endif
+
+pre-fetch:
+.if ${OSVERSION} >= 800501
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "==================================================================="
+ @${ECHO_CMD} " Warning: the uhso driver is already available in the base system,"
+ @${ECHO_CMD} " you may want to use this version instead of the port."
+ @${ECHO_CMD} "==================================================================="
+ @${ECHO_CMD} ""
.endif
post-patch:
.if !defined(WITHOUT_UHSOCTL)
.if defined(WITH_DEBUG)
@${PATCH} -d ${WRKSRC_UHSOCTL} < ${PATCHDIR}/UHSOCTL-DEBUG-patch-Makefile
-.else
- @${PATCH} -d ${WRKSRC_UHSOCTL} < ${PATCHDIR}/UHSOCTL-NODEBUG-patch-Makefile
.endif
.endif
diff -aurN uhso-kmod.orig/distinfo uhso-kmod/distinfo
--- uhso-kmod.orig/distinfo 2010-06-21 18:37:07.783443426 +0000
+++ uhso-kmod/distinfo 2010-06-21 18:38:19.378756517 +0000
@@ -1,6 +1,6 @@
-MD5 (uhso-20091122.tar.gz) = 68e96e3d6fab93ba9eab148c1ef79ca7
-SHA256 (uhso-20091122.tar.gz) = a861411fecbc1d1f1fb8910026eeafb6331a1a87ec6562f2b46797e92f1db043
-SIZE (uhso-20091122.tar.gz) = 14430
-MD5 (uhsoctl-beta-20090820.tar.gz) = cb430d12217511554a3d7f13385432db
-SHA256 (uhsoctl-beta-20090820.tar.gz) = c512b821c632cd3a5295bae764d30654e2538f42357bca365a7cc9a9edae57b8
-SIZE (uhsoctl-beta-20090820.tar.gz) = 10626
+MD5 (uhso-20100416.tar.gz) = 872a36b0fa14e2ccf3b889b5fc582fb9
+SHA256 (uhso-20100416.tar.gz) = fd502c2c13914eb9aff4bd96453d848a1c6ab9bae8dcde4764082bfe87f4120a
+SIZE (uhso-20100416.tar.gz) = 15215
+MD5 (uhsoctl-20100416.tar.gz) = 43db3ea161d52c83626da47ec5e968dc
+SHA256 (uhsoctl-20100416.tar.gz) = 959899b55125e4840664caafbe8b43da2dc857ba00330825f83079c03aeef6e4
+SIZE (uhsoctl-20100416.tar.gz) = 10827
diff -aurN uhso-kmod.orig/files/UHSO-DEBUG-patch-Makefile uhso-kmod/files/UHSO-DEBUG-patch-Makefile
--- uhso-kmod.orig/files/UHSO-DEBUG-patch-Makefile 2010-06-21 18:37:07.741509884 +0000
+++ uhso-kmod/files/UHSO-DEBUG-patch-Makefile 1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- Makefile.orig 2009-12-28 18:29:47.732668607 +0000
-+++ Makefile 2009-12-28 18:29:56.747883459 +0000
-@@ -2,7 +2,7 @@
- S= ${.CURDIR}/../..
- .PATH: $S/dev/usb
-
--#CFLAGS+= -DUSB_DEBUG=1 -DUHSO_DEBUG=2 -DUHSO_DEBUG_HEXDUMP=1 -g
-+CFLAGS+= -DUSB_DEBUG=1 -DUHSO_DEBUG=2 -DUHSO_DEBUG_HEXDUMP=1 -g
- KMOD= uhso
- SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usbdevs.h uhso.c
-
diff -aurN uhso-kmod.orig/files/UHSO-NODEBUG-patch-Makefile uhso-kmod/files/UHSO-NODEBUG-patch-Makefile
--- uhso-kmod.orig/files/UHSO-NODEBUG-patch-Makefile 1970-01-01 00:00:00.000000000 +0000
+++ uhso-kmod/files/UHSO-NODEBUG-patch-Makefile 2010-06-22 06:06:00.513982293 +0000
@@ -0,0 +1,11 @@
+--- Makefile.orig 2010-06-22 06:03:42.164699354 +0000
++++ Makefile 2010-06-22 06:03:49.158604515 +0000
+@@ -2,7 +2,7 @@
+ S= ${.CURDIR}/../..
+ .PATH: $S/dev/usb
+
+-CFLAGS+= -DUSB_DEBUG=1 -DUHSO_DEBUG=0 -DUHSO_DEBUG_HEXDUMP=1 -g
++#CFLAGS+= -DUSB_DEBUG=1 -DUHSO_DEBUG=0 -DUHSO_DEBUG_HEXDUMP=1 -g
+ KMOD= uhso
+ SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usbdevs.h uhso.c
+
diff -aurN uhso-kmod.orig/files/UHSOCTL-DEBUG-patch-Makefile uhso-kmod/files/UHSOCTL-DEBUG-patch-Makefile
--- uhso-kmod.orig/files/UHSOCTL-DEBUG-patch-Makefile 2010-06-21 18:37:07.718442706 +0000
+++ uhso-kmod/files/UHSOCTL-DEBUG-patch-Makefile 2010-06-22 06:08:20.756210076 +0000
@@ -1,11 +1,10 @@
---- Makefile.orig 2009-08-19 14:41:30.923433005 +0000
-+++ Makefile 2009-08-19 14:42:03.472847525 +0000
-@@ -1,7 +1,7 @@
+--- Makefile.orig 2010-06-22 06:06:28.074431037 +0000
++++ Makefile 2010-06-22 06:06:51.625986682 +0000
+@@ -1,6 +1,6 @@
SRCS= uhsoctl.c
PROG= uhsoctl
- CFLAGS+= -g
--#CFLAGS+= -DDEBUG=1
-+CFLAGS+= -DDEBUG=1
+-#CFLAGS+= -g -DDEBUG=1
++CFLAGS+= -g -DDEBUG=1
LDFLAGS+= -lutil
DESTDIR?= /usr/local
-
+ WARNS=1
diff -aurN uhso-kmod.orig/files/UHSOCTL-NODEBUG-patch-Makefile uhso-kmod/files/UHSOCTL-NODEBUG-patch-Makefile
--- uhso-kmod.orig/files/UHSOCTL-NODEBUG-patch-Makefile 2010-06-21 18:37:07.695508507 +0000
+++ uhso-kmod/files/UHSOCTL-NODEBUG-patch-Makefile 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
---- Makefile.orig 2009-08-19 14:41:30.923433005 +0000
-+++ Makefile 2009-08-19 14:42:32.492341064 +0000
-@@ -1,6 +1,6 @@
- SRCS= uhsoctl.c
- PROG= uhsoctl
--CFLAGS+= -g
-+#CFLAGS+= -g
- #CFLAGS+= -DDEBUG=1
- LDFLAGS+= -lutil
- DESTDIR?= /usr/local
diff -aurN uhso-kmod.orig/files/patch-uhso.c uhso-kmod/files/patch-uhso.c
--- uhso-kmod.orig/files/patch-uhso.c 1970-01-01 00:00:00.000000000 +0000
+++ uhso-kmod/files/patch-uhso.c 2010-06-22 16:44:41.307431251 +0000
@@ -0,0 +1,12 @@
+--- uhso.c.orig 2010-06-22 06:13:57.405352705 +0000
++++ uhso.c 2010-06-22 06:14:13.902069815 +0000
+@@ -657,7 +657,8 @@
+ static void
+ uhso_cd_read_callback(struct usb_xfer *xfer, usb_error_t error)
+ {
+- struct uhso_cd_softc *sc = usbd_xfer_softc(xfer);
++ struct uhso_cd_softc *sc;
++ sc = usbd_xfer_softc(xfer);
+
+ UHSO_DPRINTF(1, "sc=%p\n", sc);
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list