svn commit: r409736 - in head/benchmarks/ubench: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sun Feb 28 12:09:22 UTC 2016
Author: amdmi3
Date: Sun Feb 28 12:09:20 2016
New Revision: 409736
URL: https://svnweb.freebsd.org/changeset/ports/409736
Log:
- Add LICENSE
- Simplify upstream makefile handling
Added:
head/benchmarks/ubench/files/patch-configure
- copied, changed from r409735, head/benchmarks/ubench/files/patch-Makefile
Deleted:
head/benchmarks/ubench/files/patch-Makefile
Modified:
head/benchmarks/ubench/Makefile
Modified: head/benchmarks/ubench/Makefile
==============================================================================
--- head/benchmarks/ubench/Makefile Sun Feb 28 11:48:08 2016 (r409735)
+++ head/benchmarks/ubench/Makefile Sun Feb 28 12:09:20 2016 (r409736)
@@ -9,11 +9,16 @@ MASTER_SITES= SUNSITE/system/benchmark
MAINTAINER= ports at FreeBSD.org
COMMENT= Unix Benchmark Utility for CPU(s) and memory
+LICENSE= GPLv2+
+
HAS_CONFIGURE= yes
-MAKE_ARGS= INSTALLDIR=${STAGEDIR}${PREFIX}/bin \
- MANDIR=${STAGEDIR}${PREFIX}/man/man8
+ALL_TARGET= ubench
PLIST_FILES= bin/ubench \
man/man8/ubench.8.gz
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/ubench ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/ubench.8 ${STAGEDIR}${MANPREFIX}/man/man8
+
.include <bsd.port.mk>
Copied and modified: head/benchmarks/ubench/files/patch-configure (from r409735, head/benchmarks/ubench/files/patch-Makefile)
==============================================================================
--- head/benchmarks/ubench/files/patch-Makefile Sun Feb 28 11:48:08 2016 (r409735, copy source)
+++ head/benchmarks/ubench/files/patch-configure Sun Feb 28 12:09:20 2016 (r409736)
@@ -1,99 +1,15 @@
---- configure.orig Mon May 29 09:46:09 2000
-+++ configure Mon Apr 2 11:49:28 2007
-@@ -12,7 +12,8 @@
- ###############################################################################
-
- #DEFINES=-DDEBUG
--INSTALLDIR= /usr/local/bin
-+INSTALLDIR= \$(PREFIX)/bin
-+MANDIR = \$(PREFIX)/man/man8
-
- !
-
-@@ -23,7 +24,6 @@
- case $ARCH in
- i486)
- cat <<! >> Makefile
--CC = gcc
- CFLAGS = -O2 -m486 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
- LDFLAGS = -s -lm
- INCLUDES = -I.
-@@ -32,7 +32,6 @@
- ;;
- i586)
- cat <<! >> Makefile
--CC = gcc
- CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
- LDFLAGS = -s -lm
- INCLUDES = -I.
-@@ -41,7 +40,6 @@
- ;;
- i686)
- cat <<! >> Makefile
--CC = gcc
- CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
- LDFLAGS = -s -lm
- INCLUDES = -I.
-@@ -50,7 +48,6 @@
- ;;
- *)
- cat <<! >> Makefile
--CC = gcc
- CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2
- LDFLAGS = -s -lm
- INCLUDES = -I.
-@@ -66,7 +63,6 @@
- case ${BITS} in
- 64)
- cat <<! >> Makefile
--CC = cc
- CFLAGS = +O2 -Ae -z -DHPUX +DA2.0W +DS2.0 -DSS_64BIT_SERVER -DHPPA64 \\
- -DSLS8NATIVE -DSLU8NATIVE -D_REENTRANT -DHPUX_KTHREAD -DSLXMX_ENABLE \\
- -DSLMXMX_ENABLE -DSLTS_ENABLE +Omultiprocessor +Olibcalls +Ofastaccess \\
-@@ -78,7 +74,6 @@
- ;;
- *)
- cat <<! >> Makefile
--CC = cc
- CFLAGS = +O2 -Ae -z -DHPUX +DA2.0W +DS2.0 -DSS_32BIT_SERVER -DHPPA32 \\
- -DSLS8NATIVE -DSLU8NATIVE -D_REENTRANT -DHPUX_KTHREAD -DSLXMX_ENABLE \\
- -DSLMXMX_ENABLE -DSLTS_ENABLE +Omultiprocessor +Olibcalls +Ofastaccess \\
-@@ -94,7 +89,6 @@
- ARCH="`oslevel`"
- echo "==== Creating Makefile for ${SYSTEM} ${ARCH}"
- cat <<! >> Makefile
--CC = xlc
- CFLAGS = -O2 -DOSLEVEL=\\\"${ARCH}\\\" -D_XOPEN_SOURCE -D_POSIX_SOURCE -D_ANSI_C_SOURCE -D_ALL_SOURCE
- LDFLAGS = -lm
- INCLUDE = -I.
-@@ -104,7 +98,6 @@
- SunOS)
- echo "==== Creating Makefile for ${SYSTEM} ${ARCH}"
- cat <<! >> Makefile
--CC = cc
- CFLAGS = -xO5 -DSunOS
- LDFLAGS = -s -lm
- INCLUDE = -I.
-@@ -113,7 +106,6 @@
+--- configure.orig 2000-05-29 01:46:09 UTC
++++ configure
+@@ -113,9 +113,9 @@ INCLUDE = -I.
;;
*)
cat <<! >> Makefile
-CC = cc
- CFLAGS =
- LDFLAGS = -lm
+-CFLAGS =
+-LDFLAGS = -lm
++CC ?= cc
++CFLAGS +=
++LDFLAGS += -lm
INCLUDES = -I.
-@@ -134,11 +126,11 @@
- %.o: %.c
- \$(CC) \$(CFLAGS) \$(INCLUDES) -c \$<
-
--default: ubench
-+all: ubench
- install: ubench
-- mv -f \$(INSTALLDIR)/ubench \$(INSTALLDIR)/ubench.old
-- install -c -m 0555 ubench \$(INSTALLDIR)
-+ \$(BSD_INSTALL_MAN) ubench.8 \$(MANDIR)
-+ \$(BSD_INSTALL_PROGRAM) ubench \$(INSTALLDIR)
-
- utime: \$(utimeobjects)
- \$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$^
+ !
More information about the svn-ports-head
mailing list