Index: head/misc/usbrh-libusb/Makefile
===================================================================
--- head/misc/usbrh-libusb/Makefile	(revision 434932)
+++ head/misc/usbrh-libusb/Makefile	(revision 434933)
@@ -1,19 +1,22 @@
 # Created by: sanpei@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	usbrh-libusb
 PORTVERSION=	0.05
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.dd.iij4u.or.jp/~briareos/soft/ \
 		LOCAL/sanpei
 DISTNAME=	usbrh-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another reads temperatures and humidity from a Strawberry Linux USB-RH
 
+LICENSE=	GPLv2
+
 PLIST_FILES=	bin/usbrh
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/usbrh ${STAGEDIR}${PREFIX}/bin/usbrh
+	${INSTALL_PROGRAM} ${WRKSRC}/usbrh ${STAGEDIR}${PREFIX}/bin/usbrh
 
 .include <bsd.port.mk>
Index: head/misc/usbrh-libusb/files/patch-Makefile
===================================================================
--- head/misc/usbrh-libusb/files/patch-Makefile	(revision 434932)
+++ head/misc/usbrh-libusb/files/patch-Makefile	(revision 434933)
@@ -1,13 +1,13 @@
---- ./Makefile.orig	2008-03-24 23:22:09.000000000 +0900
-+++ ./Makefile	2009-07-20 23:23:39.000000000 +0900
+--- Makefile.orig	2008-03-24 14:22:09 UTC
++++ Makefile
 @@ -2,8 +2,9 @@
  SRC = usbrh_main.c
  EXE = usbrh
  
 +all:	$(EXE)
  $(EXE): $(SRC)
 -	gcc -lusb -g -o $@ $^
-+	cc -lusb -g -o $@ $(SRC)
++	${CC} ${CFLAGS} ${LDFLAGS} -lusb -o $@ $(SRC)
  
  clean: 
  	rm $(EXE)
Index: head/misc/usbrh-libusb/files/patch-usbrh_main.c
===================================================================
--- head/misc/usbrh-libusb/files/patch-usbrh_main.c	(revision 434932)
+++ head/misc/usbrh-libusb/files/patch-usbrh_main.c	(revision 434933)
@@ -1,72 +1,72 @@
---- ./usbrh_main.c.orig	2008-03-24 23:23:26.000000000 +0900
-+++ ./usbrh_main.c	2009-07-20 23:22:59.000000000 +0900
-@@ -198,7 +198,7 @@
+--- usbrh_main.c.orig	2008-03-24 14:23:26 UTC
++++ usbrh_main.c
+@@ -198,7 +198,7 @@ int  DeviceNum;
                  break;
              default:
                  usage();
 -                exit(0);
 +                return(0);
                  break;
          }
      }
-@@ -209,7 +209,7 @@
+@@ -209,7 +209,7 @@ int  DeviceNum;
  
      if(flag_l){
          listdevice(USBRH_VENDOR, USBRH_PRODUCT);
 -        exit(0);
 +        return(0);
      }
  
      if(flag_d)
-@@ -217,7 +217,7 @@
+@@ -217,7 +217,7 @@ int  DeviceNum;
  
      if((dev = searchdevice(USBRH_VENDOR, USBRH_PRODUCT, DeviceNum)) == (struct usb_device *)NULL){
          puts("USBRH not found");
 -        exit(1);
 +        return(1);
      } 
  
      if(flag_d){
-@@ -226,26 +226,30 @@
+@@ -226,26 +226,30 @@ int  DeviceNum;
      dh = usb_open(dev);
      if(dh == NULL){
          puts("usb_open error");
 -        exit(2);
 +        return(2);
      }
  
      if((rc = usb_set_configuration(dh, dev->config->bConfigurationValue))<0){
          puts("usb_set_configuration error");
          usb_close(dh);
 -        exit(3);
 +        return(3);
      }
  
      if((rc =usb_claim_interface(dh, dev->config->interface->altsetting->bInterfaceNumber))<0){
          //puts("usb_claim_interface error");
 +#if 0
          if((rc = usb_detach_kernel_driver_np(dh, dev->config->interface->altsetting->bInterfaceNumber))<0){
              puts("usb_detach_kernel_driver_np error");
              usb_close(dh);
              exit(4);
          }else{
 +#endif
 +	{
 +	
              if((rc =usb_claim_interface(dh, dev->config->interface->altsetting->bInterfaceNumber))<0){
                  puts("usb_claim_interface error");
                  usb_close(dh);
 -                exit(4);
 +                return(4);
              }
          }
      }
-@@ -311,7 +315,7 @@
+@@ -311,7 +315,7 @@ int  DeviceNum;
      if((rc = usb_release_interface(dh, dev->config->interface->altsetting->bInterfaceNumber))<0){
          puts("usb_release_interface error");
          usb_close(dh);
 -        exit(5);
 +        return(5);
      }
  
      usb_close(dh);