Date: Fri, 20 Jan 2017 19:39:25 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431991 - in head/sysutils/usbutils: . files Message-ID: <201701201939.v0KJdPWm098811@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Fri Jan 20 19:39:25 2017 New Revision: 431991 URL: https://svnweb.freebsd.org/changeset/ports/431991 Log: Update to 0.91 - Use usbhid-dump and usbids from ports - Use USES=shebangfix - Convert to new options target helper - Cosmetic change - Sort PLIST - Update WWW - Take maintainership Changes: https://github.com/gregkh/usbutils/blob/master/NEWS Added: head/sysutils/usbutils/files/patch-Makefile.am - copied, changed from r422968, head/sysutils/usbutils/files/patch-Makefile.am head/sysutils/usbutils/files/patch-configure.ac (contents, props changed) Deleted: head/sysutils/usbutils/files/patch-lsusb.c Modified: head/sysutils/usbutils/Makefile head/sysutils/usbutils/distinfo head/sysutils/usbutils/pkg-descr head/sysutils/usbutils/pkg-plist Modified: head/sysutils/usbutils/Makefile ============================================================================== --- head/sysutils/usbutils/Makefile Fri Jan 20 19:38:56 2017 (r431990) +++ head/sysutils/usbutils/Makefile Fri Jan 20 19:39:25 2017 (r431991) @@ -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> Modified: head/sysutils/usbutils/distinfo ============================================================================== --- head/sysutils/usbutils/distinfo Fri Jan 20 19:38:56 2017 (r431990) +++ head/sysutils/usbutils/distinfo Fri Jan 20 19:39:25 2017 (r431991) @@ -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 Copied and modified: head/sysutils/usbutils/files/patch-Makefile.am (from r422968, head/sysutils/usbutils/files/patch-Makefile.am) ============================================================================== --- head/sysutils/usbutils/files/patch-Makefile.am Fri Sep 30 08:41:12 2016 (r422968, copy source) +++ head/sysutils/usbutils/files/patch-Makefile.am Fri Jan 20 19:39:25 2017 (r431991) @@ -1,10 +1,32 @@ ---- Makefile.am.orig 2010-07-13 21:30:02.000000000 +0200 -+++ Makefile.am 2010-07-13 21:30:21.000000000 +0200 -@@ -56,7 +56,7 @@ lsusb.8: $(srcdir)/lsusb.8.in +--- 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 = $(datadir)/pkgconfig +-pkgconfigdir = $(datarootdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = usbutils.pc Added: head/sysutils/usbutils/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/usbutils/files/patch-configure.ac Fri Jan 20 19:39:25 2017 (r431991) @@ -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([ Modified: head/sysutils/usbutils/pkg-descr ============================================================================== --- head/sysutils/usbutils/pkg-descr Fri Jan 20 19:38:56 2017 (r431990) +++ head/sysutils/usbutils/pkg-descr Fri Jan 20 19:39:25 2017 (r431991) @@ -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 Modified: head/sysutils/usbutils/pkg-plist ============================================================================== --- head/sysutils/usbutils/pkg-plist Fri Jan 20 19:38:56 2017 (r431990) +++ head/sysutils/usbutils/pkg-plist Fri Jan 20 19:39:25 2017 (r431991) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701201939.v0KJdPWm098811>