diff options
| -rw-r--r-- | sysutils/usbutils/Makefile | 35 | ||||
| -rw-r--r-- | sysutils/usbutils/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/usbutils/files/patch-Makefile.am | 33 | ||||
| -rw-r--r-- | sysutils/usbutils/files/patch-configure.ac | 10 | ||||
| -rw-r--r-- | sysutils/usbutils/files/patch-lsusb.c | 15 | ||||
| -rw-r--r-- | sysutils/usbutils/pkg-descr | 2 | ||||
| -rw-r--r-- | sysutils/usbutils/pkg-plist | 5 |
7 files changed, 64 insertions, 41 deletions
diff --git a/sysutils/usbutils/Makefile b/sysutils/usbutils/Makefile index 968e454f93b3..1f7737fa4ebf 100644 --- a/sysutils/usbutils/Makefile +++ b/sysutils/usbutils/Makefile @@ -2,38 +2,35 @@ # $FreeBSD$ PORTNAME= usbutils -PORTVERSION= 0.86 -PORTREVISION= 2 +PORTVERSION= 0.91 +DISTVERSIONPREFIX= v CATEGORIES= sysutils -MASTER_SITES= SF/linux-usb/${PORTNAME} \ - http://pkgs.fedoraproject.org/repo/pkgs/usbutils/usbutils-0.86.tar.gz/34979f675d2bcb3e1b45012fa830a53f/ \ - http://ftp.be.debian.org/pub/linux/utils/usb/usbutils/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Utility for listing USB devices LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake pathfix pkgconfig +RUN_DEPENDS= usbhid-dump:sysutils/usbhid-dump \ + ${LOCALBASE}/share/usbids/usb.ids:misc/usbids + +OPTIONS_DEFINE= DOCS + +CONFIGURE_ARGS= --datadir=${LOCALBASE}/share/usbids --enable-zlib +CONFIGURE_ENV= LIBUSB_CFLAGS="-I/usr/include" LIBUSB_LIBS="-L/usr/lib -lusb" GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --datadir=${DATADIR} --enable-zlib +USES= autoreconf gmake pkgconfig shebangfix PORTDOCS= AUTHORS ChangeLog NEWS README -OPTIONS_DEFINE= DOCS +GH_ACCOUNT= gregkh +USE_GITHUB= yes -post-patch: - @${REINPLACE_CMD} -e '/PKG_CONFIG.*libusb/s/ >= 0\.1\.[0-9]*/-0.1/' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -i '' \ - -e 's|/bin/bash|/bin/sh|' \ - ${WRKSRC}/usb-devices +SHEBANG_FILES= usb-devices post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include <bsd.port.mk> diff --git a/sysutils/usbutils/distinfo b/sysutils/usbutils/distinfo index d0e222f6e692..2fd06ca99cf8 100644 --- a/sysutils/usbutils/distinfo +++ b/sysutils/usbutils/distinfo @@ -1,2 +1,3 @@ -SHA256 (usbutils-0.86.tar.gz) = b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4 -SIZE (usbutils-0.86.tar.gz) = 246623 +TIMESTAMP = 1484941159 +SHA256 (gregkh-usbutils-v0.91_GH0.tar.gz) = 26175117575a3e3ebf784d27d0822f7e86040fdc51ab94b54bbfc238257af2de +SIZE (gregkh-usbutils-v0.91_GH0.tar.gz) = 185068 diff --git a/sysutils/usbutils/files/patch-Makefile.am b/sysutils/usbutils/files/patch-Makefile.am new file mode 100644 index 000000000000..49a31fe581d6 --- /dev/null +++ b/sysutils/usbutils/files/patch-Makefile.am @@ -0,0 +1,33 @@ +--- Makefile.am.orig 2010-10-22 23:38:09 UTC ++++ Makefile.am +@@ -1,21 +1,9 @@ +-SUBDIRS = \ +- usbhid-dump +- + AM_LDFLAGS = \ + -Wl,--as-needed + +-data_DATA = \ +- usb.ids +-if HAVE_ZLIB +-data_DATA += usb.ids.gz +-endif +- + sbin_PROGRAMS = \ + lsusb + +-sbin_SCRIPTS = \ +- update-usbids.sh +- + bin_SCRIPTS = \ + usb-devices + +@@ -59,7 +47,7 @@ lsusb.8: $(srcdir)/lsusb.8.in + usb-devices.1: $(srcdir)/usb-devices.1.in + sed 's|VERSION|$(VERSION)|g' $< >$@ + +-pkgconfigdir = $(datarootdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_DATA = usbutils.pc + + usbutils.pc: $(srcdir)/usbutils.pc.in diff --git a/sysutils/usbutils/files/patch-configure.ac b/sysutils/usbutils/files/patch-configure.ac new file mode 100644 index 000000000000..52ce84fa17a8 --- /dev/null +++ b/sysutils/usbutils/files/patch-configure.ac @@ -0,0 +1,10 @@ +--- configure.ac.orig 2010-10-22 23:38:09 UTC ++++ configure.ac +@@ -35,7 +35,6 @@ AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_FILES([ + Makefile + ]) +-AC_CONFIG_SUBDIRS([usbhid-dump]) + + AC_OUTPUT + AC_MSG_RESULT([ diff --git a/sysutils/usbutils/files/patch-lsusb.c b/sysutils/usbutils/files/patch-lsusb.c deleted file mode 100644 index 86841c67cc56..000000000000 --- a/sysutils/usbutils/files/patch-lsusb.c +++ /dev/null @@ -1,15 +0,0 @@ ---- lsusb.c.orig 2009-08-17 22:28:42.000000000 +0000 -+++ lsusb.c 2010-07-26 13:08:52.000000000 +0000 -@@ -31,8 +31,11 @@ - #include <string.h> - #include <errno.h> - #include <stdio.h> -+#include <stdlib.h> - #include <stdarg.h> --#include <byteswap.h> -+#if defined(HAVE_UNISTD_H) -+#include <unistd.h> -+#endif - #include <usb.h> - - #include "names.h" diff --git a/sysutils/usbutils/pkg-descr b/sysutils/usbutils/pkg-descr index 99bdfe3ce1a9..85d7f1d29ea8 100644 --- a/sysutils/usbutils/pkg-descr +++ b/sysutils/usbutils/pkg-descr @@ -1,4 +1,4 @@ Usbutils contains the lsusb utility for displaying information about USB buses in the system and the devices connected to them. -WWW: http://sourceforge.net/projects/linux-usb/ +WWW: https://github.com/gregkh/usbutils diff --git a/sysutils/usbutils/pkg-plist b/sysutils/usbutils/pkg-plist index 58ae3e452b2f..08408bd6b498 100644 --- a/sysutils/usbutils/pkg-plist +++ b/sysutils/usbutils/pkg-plist @@ -1,8 +1,5 @@ bin/usb-devices libdata/pkgconfig/usbutils.pc -sbin/lsusb -sbin/update-usbids.sh man/man1/usb-devices.1.gz man/man8/lsusb.8.gz -%%DATADIR%%/usb.ids -%%DATADIR%%/usb.ids.gz +sbin/lsusb |