[pkgsrc/trunk]: pkgsrc/sysutils/usbutil Back out new-style BSD makefile, as o...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe308e814046
branches:  trunk
changeset: 551107:fe308e814046
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Sun Dec 07 12:32:27 2008 +0000

description:
Back out new-style BSD makefile, as older NetBSD mk files do not
support PROGS.  Ensure that we install the usbgen(8) manual page,
though.  No PKGREVISION bump as no change in installed files from
previous revision.

diffstat:

 sysutils/usbutil/Makefile         |  18 +++++-------------
 sysutils/usbutil/distinfo         |   3 ++-
 sysutils/usbutil/files/Makefile   |  14 --------------
 sysutils/usbutil/patches/patch-ae |  14 ++++++++++++++
 4 files changed, 21 insertions(+), 28 deletions(-)

diffs (81 lines):

diff -r 61b49f31ef3a -r fe308e814046 sysutils/usbutil/Makefile
--- a/sysutils/usbutil/Makefile Sun Dec 07 11:42:01 2008 +0000
+++ b/sysutils/usbutil/Makefile Sun Dec 07 12:32:27 2008 +0000
@@ -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 @@
 
 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 -r 61b49f31ef3a -r fe308e814046 sysutils/usbutil/distinfo
--- a/sysutils/usbutil/distinfo Sun Dec 07 11:42:01 2008 +0000
+++ b/sysutils/usbutil/distinfo Sun Dec 07 12:32:27 2008 +0000
@@ -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-ab) = af20c5d609c5fccfb0f8672d00daeda195a3b4a0
 SHA1 (patch-ac) = 0c1c7e67c84c1a6db1ad0144803977bee7c61ceb
 SHA1 (patch-ad) = a98c2a46c6eb860416ff631c62361f5b0282def8
+SHA1 (patch-ae) = 92844785b7e6232332a0437cc257b8ecb3f2f50e
diff -r 61b49f31ef3a -r fe308e814046 sysutils/usbutil/files/Makefile
--- a/sysutils/usbutil/files/Makefile   Sun Dec 07 11:42:01 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 61b49f31ef3a -r fe308e814046 sysutils/usbutil/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/usbutil/patches/patch-ae Sun Dec 07 12:32:27 2008 +0000
@@ -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)