From e69519a20448e821203d99ed9d766daaa0db6c58 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Tue, 29 Dec 2015 19:49:17 +0000
Subject: Simplify installation; set LICENSE.

---
 benchmarks/ubench/Makefile         | 12 ++----------
 benchmarks/ubench/distinfo         |  4 ++--
 benchmarks/ubench/patches/patch-aa | 13 +++++++++----
 3 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'benchmarks')

diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile
index 6c5bdc90f18..7a5ddbbb541 100644
--- a/benchmarks/ubench/Makefile
+++ b/benchmarks/ubench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/04/01 06:30:45 sbd Exp $
+# $NetBSD: Makefile,v 1.10 2015/12/29 19:49:17 dholland Exp $
 #
 
 DISTNAME=	ubench-0.32
@@ -9,20 +9,12 @@ MASTER_SITES=	http://www.phystech.com/ftp/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.phystech.com/download/ubench.html
 COMMENT=	The Unix Benchmark utility
+LICENSE=	gnu-gpl-v2
 
 BUILD_TARGET=	ubench
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 share/doc/ubench
 
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-configure
-SUBST_FILES.path=	Makefile
-SUBST_SED.path=		-e "s,/usr/local,${DESTDIR}${PREFIX},"
-
 CFLAGS.SunOS+=	-DSunOS
 CFLAGS.Linux+=	-D_POSIX_SOURCE
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/ubench.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/ubench
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/ubench/distinfo b/benchmarks/ubench/distinfo
index ccd14bf8dbe..5aefc0c040f 100644
--- a/benchmarks/ubench/distinfo
+++ b/benchmarks/ubench/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 00:25:52 agc Exp $
+$NetBSD: distinfo,v 1.4 2015/12/29 19:49:17 dholland Exp $
 
 SHA1 (ubench-0.32.tar.gz) = 749ae490c95b9fe95753b47b5711cbeb9bdb3a29
 RMD160 (ubench-0.32.tar.gz) = 33a2e7b869af1e7c81eb2211b3ee4946e97933d2
 SHA512 (ubench-0.32.tar.gz) = 6937847d0d8bc5ccc152361fdf01e1da1202eceeaab59466dacc3b038c9473fa9e1e6e2b739517c5fcc76fd176761b6aadfbdea9dfc6c6bb11797955d5d3250d
 Size (ubench-0.32.tar.gz) = 9341 bytes
-SHA1 (patch-aa) = 07a31eccb56a50b6a5261a6db7b4d37bdc57a3a6
+SHA1 (patch-aa) = a29fef577d5dafa6b137a165d86fa51e6dce0648
 SHA1 (patch-cpubench_c) = 45a7ea8e8773d7d1fdd3152716bb64b7ce6acfe2
 SHA1 (patch-diskbench_c) = 8b6db9abafe6afacd7cd919683e0cd6530897d0a
 SHA1 (patch-membench_c) = 2db9657a837e00d3a1b50528836fc644aa3dcb7a
diff --git a/benchmarks/ubench/patches/patch-aa b/benchmarks/ubench/patches/patch-aa
index 20e9762a1ce..b7bc94e9385 100644
--- a/benchmarks/ubench/patches/patch-aa
+++ b/benchmarks/ubench/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/09/03 05:57:45 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2015/12/29 19:49:17 dholland Exp $
+
+ - configure for pkgsrc
+ - install the man page and readme
 
 --- Makefile.orig	2005-09-03 07:50:21.000000000 +0200
 +++ Makefile	2005-09-03 07:51:42.000000000 +0200
@@ -7,23 +10,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/09/03 05:57:45 xtraeme Exp $
  
  #DEFINES=-DDEBUG
 -INSTALLDIR= /usr/local/bin
-+INSTALLDIR=/usr/local/bin
++INSTALLDIR=$(DESTDIR)$(PREFIX)/bin
  
 -CC = gcc
 -CFLAGS = -O2 -m486 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
 -LDFLAGS = -s -lm
 +#CC = gcc
-+#CFLAGS = -O2 -m486 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
++CFLAGS += -Wall
 +LDFLAGS += -s -lm
  INCLUDES = -I.
  
  objects = signals.o cpubench.o membench.o ubench.o
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,9 @@
  default: ubench
  
  install: ubench
 -	install -c -m 0555 ubench $(INSTALLDIR)
 +	$(BSD_INSTALL_PROGRAM) ubench $(INSTALLDIR)
++	${BSD_INSTALL_MAN} ubench.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
++	${BSD_INSTALL_DATA} README ${DESTDIR}${PREFIX}/share/doc/ubench
  
  utime:	$(utimeobjects)
  	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-- 
cgit v1.2.3