cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 20100416

Browse Source 
PR:		ports/148085
Submitted by:	Ganael Laplanche <ganael.laplanche@martymac.com> (maintainer)
This commit is contained in:
Pav Lucistnik 2010-08-13 14:35:08 +00:00
parent 7a1ca5ae83
commit bbf61b662c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=259179
7 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
comms/uhso-kmod/Makefile
View File

@ -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 @@ IGNORE= requires FreeBSD 8.0 or later, please try comms/hso-kmod instead
.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

12
comms/uhso-kmod/distinfo
View File

@ -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

11
comms/uhso-kmod/files/UHSO-DEBUG-patch-Makefile
View File

@ -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

11
comms/uhso-kmod/files/UHSO-NODEBUG-patch-Makefile Normal file
View File

@ -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

13
comms/uhso-kmod/files/UHSOCTL-DEBUG-patch-Makefile
View File

@ -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

10
comms/uhso-kmod/files/UHSOCTL-NODEBUG-patch-Makefile
View File

@ -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

12
comms/uhso-kmod/files/patch-uhso.c Normal file
View File

@ -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);
}