diff options
| -rw-r--r-- | sysutils/usbutil/Makefile | 18 | ||||
| -rw-r--r-- | sysutils/usbutil/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/usbutil/files/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/usbutil/patches/patch-ae | 14 |
4 files changed, 21 insertions, 28 deletions
diff --git a/sysutils/usbutil/Makefile b/sysutils/usbutil/Makefile index 76dc9f5d70b..48dc8b2714a 100644 --- a/sysutils/usbutil/Makefile +++ b/sysutils/usbutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/11/25 13:22:30 bjs Exp $ +# $NetBSD: Makefile,v 1.15 2008/12/07 12:32:27 bjs Exp $ # DISTNAME= usbutil-0.5 @@ -11,17 +11,9 @@ COMMENT= USB developer utilities PKG_DESTDIR_SUPPORT= user-destdir -AUTO_MKDIRS= yes -USE_BSD_MAKEFILE= yes - -INSTALL_TARGET+= maninstall install - -MAKE_FLAGS+= BINDIR=${PREFIX:Q}/sbin -MAKE_FLAGS+= MKCATPAGES=no -MAKE_FLAGS+= MKHTML=no -MAKE_FLAGS+= NOGCCERROR=yes # in keeping with original Makefile - -post-extract: - ${RUN} ${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile +post-install: + ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/usbgen.8 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/usbgen.8 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/usbutil/distinfo b/sysutils/usbutil/distinfo index 744ea097c8a..e003a062c14 100644 --- a/sysutils/usbutil/distinfo +++ b/sysutils/usbutil/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2008/11/25 13:21:48 bjs Exp $ +$NetBSD: distinfo,v 1.12 2008/12/07 12:32:27 bjs Exp $ SHA1 (usbutil-0.5.tar.gz) = 4c9abc6f370ab561bd2748b1792802d1e959c599 RMD160 (usbutil-0.5.tar.gz) = 48c6bedeed8daf50a760feedef3575db021066f8 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = 8db548f99befd76839b8b31caa2de0861c6d708b SHA1 (patch-ab) = af20c5d609c5fccfb0f8672d00daeda195a3b4a0 SHA1 (patch-ac) = 0c1c7e67c84c1a6db1ad0144803977bee7c61ceb SHA1 (patch-ad) = a98c2a46c6eb860416ff631c62361f5b0282def8 +SHA1 (patch-ae) = 92844785b7e6232332a0437cc257b8ecb3f2f50e diff --git a/sysutils/usbutil/files/Makefile b/sysutils/usbutil/files/Makefile deleted file mode 100644 index 46b444c8cef..00000000000 --- a/sysutils/usbutil/files/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2008/11/25 13:21:48 bjs Exp $ - -# NOTE: BINDIR, MKHTML, NOGCCERROR, and BINDIR set by pkgsrc Makefile - -PROGS= usbctl usbdebug usbstats usbgen - -CPPFLAGS+= -Wall # In keeping with original Makefile - -.for p in ${PROGS} -MAN.${p}?= # empty -.endfor -MAN.usbgen= usbgen.8 - -.include <bsd.prog.mk> diff --git a/sysutils/usbutil/patches/patch-ae b/sysutils/usbutil/patches/patch-ae new file mode 100644 index 00000000000..6040f66b582 --- /dev/null +++ b/sysutils/usbutil/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.4 2008/12/07 12:32:27 bjs Exp $ + +--- Makefile.orig 1999-05-19 17:05:31.000000000 -0400 ++++ Makefile +@@ -19,7 +19,8 @@ usbgen: usbgen.c + cc $(CFLAGS) usbgen.c -o usbgen + + install: $(PROGS) +- install usbctl usbdebug usbstats usbgen $(PREFIX)/sbin ++ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/sbin ++ install usbctl usbdebug usbstats usbgen ${DESTDIR}$(PREFIX)/sbin + + clean: + rm -f $(PROGS) |