Attachment #179677 for bug #216789

Lines 2-8 Link Here

(-)sysutils/mcelog/Makefile (-1 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mcelog	4	PORTNAME= mcelog
5	PORTVERSION= 147	5	PORTVERSION= 148
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8		8
Lines 25-30 Link Here
25	tests/trigger tests/unknown/inject	25	tests/trigger tests/unknown/inject
26		26
27	MAKE_ENV+= FREEBSD=1	27	MAKE_ENV+= FREEBSD=1
		28	MAKE_ARGS+= CFLAGS="${CFLAGS}" prefix="${PREFIX}"
28	LDFLAGS+= -lkvm	29	LDFLAGS+= -lkvm
29		30
30	PLIST_FILES= bin/mcelog man/man8/mcelog.8.gz	31	PLIST_FILES= bin/mcelog man/man8/mcelog.8.gz

Lines 1-3 Link Here

(-)sysutils/mcelog/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1484491926	1	TIMESTAMP = 1486231306
2	SHA256 (andikleen-mcelog-v147_GH0.tar.gz) = f18c5c12a8c8addf56f66f0046a8f0c7ba262f48f95bf57abed8430df0eeebe6	2	SHA256 (andikleen-mcelog-v148_GH0.tar.gz) = 3de7312ee13b0968ae8e1aa0a77acaaee89a0ed7de45f7ce557939723df3dc04
3	SIZE (andikleen-mcelog-v147_GH0.tar.gz) = 296947	3	SIZE (andikleen-mcelog-v148_GH0.tar.gz) = 296927




--- Makefile.orig	2017-02-04 00:51:04 UTC
+++ Makefile
@@ -1,5 +1,5 @@
 CFLAGS := -g -Os
-prefix := /usr
+prefix := /usr/local
 etcprefix :=
 MANDIR := ${prefix}/share/man
 # Define appropiately for your distribution
@@ -27,14 +27,21 @@ all: mcelog
 
 .PHONY: install clean depend FORCE
 

 CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o \
 	version.o version.c version.tmp
 DOC := mce.pdf
@@ -43,7 +50,7 @@ ADD_DEFINES :=
 
 SRC := $(OBJ:.o=.c)
 

 
 # dbquery intentionally not installed by default
 install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5
@@ -82,7 +89,7 @@ depend: .depend
 
 version.tmp: FORCE
 	( echo -n "char version[] = \"" ; 	\
-	if command -v git >/dev/null; then 	\
+	if false; then 	\
 	if [ -d .git ] ; then 			\
 		git describe --tags HEAD | tr -d '\n'; 	\
 	else 					\
@@ -98,8 +105,6 @@ version.c: version.tmp
 .depend: ${SRC}
 	${CC} -MM -I. ${SRC} > .depend.X && mv .depend.X .depend
 

Return to bug 216789

Lines 1-13 Link Here

(-)sysutils/mcelog/files/patch-Makefile (-9 / +9 lines)
1	--- Makefile.orig 2016-10-18 22:32:19 UTC	1	--- Makefile.orig 2017-02-04 00:51:04 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,5 +1,4 @@	3	@@ -1,5 +1,5 @@
4	-CFLAGS := -g -Os	4	CFLAGS := -g -Os
5	-prefix := /usr	5	-prefix := /usr
6	+prefix := /usr/local	6	+prefix := /usr/local
7	etcprefix :=	7	etcprefix :=
8	MANDIR := ${prefix}/share/man	8	MANDIR := ${prefix}/share/man
9	# Define appropiately for your distribution	9	# Define appropiately for your distribution
10	@@ -27,14 +26,21 @@ all: mcelog	10	@@ -27,14 +27,21 @@ all: mcelog
11		11
12	.PHONY: install clean depend FORCE	12	.PHONY: install clean depend FORCE
13		13
Lines 32-38 Link Here
32	CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o \	32	CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o \
33	version.o version.c version.tmp	33	version.o version.c version.tmp
34	DOC := mce.pdf	34	DOC := mce.pdf
35	@@ -43,7 +49,7 @@ ADD_DEFINES :=	35	@@ -43,7 +50,7 @@ ADD_DEFINES :=
36		36
37	SRC := $(OBJ:.o=.c)	37	SRC := $(OBJ:.o=.c)
38		38
Lines 41-56 Link Here
41		41
42	# dbquery intentionally not installed by default	42	# dbquery intentionally not installed by default
43	install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5	43	install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5
44	@@ -82,7 +88,7 @@ depend: .depend	44	@@ -82,7 +89,7 @@ depend: .depend
45		45
46	version.tmp: FORCE	46	version.tmp: FORCE
47	( echo -n "char version[] = \"" ; \	47	( echo -n "char version[] = \"" ; \
48	- if type -p git >/dev/null; then \	48	- if command -v git >/dev/null; then \
49	+ if command -v git >/dev/null; then \	49	+ if false; then \
50	if [ -d .git ] ; then \	50	if [ -d .git ] ; then \
51	git describe --tags HEAD \| tr -d '\n'; \	51	git describe --tags HEAD \| tr -d '\n'; \
52	else \	52	else \
53	@@ -98,8 +104,6 @@ version.c: version.tmp	53	@@ -98,8 +105,6 @@ version.c: version.tmp
54	.depend: ${SRC}	54	.depend: ${SRC}
55	${CC} -MM -I. ${SRC} > .depend.X && mv .depend.X .depend	55	${CC} -MM -I. ${SRC} > .depend.X && mv .depend.X .depend
56		56