Index: head/sysutils/mcelog/Makefile =================================================================== --- head/sysutils/mcelog/Makefile (revision 433507) +++ head/sysutils/mcelog/Makefile (revision 433508) @@ -1,41 +1,42 @@ # Created by: Jeremy Chadwick # $FreeBSD$ PORTNAME= mcelog -PORTVERSION= 147 +PORTVERSION= 148 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= ultima1252@gmail.com COMMENT= Collects and decodes Machine Check Exception data LICENSE= GPLv2 TEST_DEPENDS= bash:shells/bash USE_GITHUB= yes GH_ACCOUNT= andikleen ONLY_FOR_ARCHS= amd64 i386 ia64 USES= alias gmake shebangfix SHEBANG_FILES= tests/cache/inject tests/memdb/inject tests/page/inject \ tests/pfa/inject tests/server/inject tests/socket/inject \ tests/trigger tests/unknown/inject MAKE_ENV+= FREEBSD=1 +MAKE_ARGS+= CFLAGS="${CFLAGS}" prefix="${PREFIX}" LDFLAGS+= -lkvm PLIST_FILES= bin/mcelog man/man8/mcelog.8.gz post-patch: @${CP} ${FILESDIR}/memstream.c ${WRKSRC}/memstream.c @${REINPLACE_CMD} 's/\"unknown\"/\"${PORTVERSION}\"/' \ ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mcelog ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/mcelog.8 ${STAGEDIR}${MANPREFIX}/man/man8 .include Index: head/sysutils/mcelog/distinfo =================================================================== --- head/sysutils/mcelog/distinfo (revision 433507) +++ head/sysutils/mcelog/distinfo (revision 433508) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484491926 -SHA256 (andikleen-mcelog-v147_GH0.tar.gz) = f18c5c12a8c8addf56f66f0046a8f0c7ba262f48f95bf57abed8430df0eeebe6 -SIZE (andikleen-mcelog-v147_GH0.tar.gz) = 296947 +TIMESTAMP = 1486231306 +SHA256 (andikleen-mcelog-v148_GH0.tar.gz) = 3de7312ee13b0968ae8e1aa0a77acaaee89a0ed7de45f7ce557939723df3dc04 +SIZE (andikleen-mcelog-v148_GH0.tar.gz) = 296927 Index: head/sysutils/mcelog/files/patch-Makefile =================================================================== --- head/sysutils/mcelog/files/patch-Makefile (revision 433507) +++ head/sysutils/mcelog/files/patch-Makefile (revision 433508) @@ -1,61 +1,54 @@ ---- Makefile.orig 2016-10-18 22:32:19 UTC +--- Makefile.orig 2017-02-04 00:51:04 UTC +++ Makefile -@@ -1,5 +1,4 @@ --CFLAGS := -g -Os --prefix := /usr -+prefix := /usr/local - etcprefix := - MANDIR := ${prefix}/share/man - # Define appropiately for your distribution -@@ -27,14 +26,21 @@ all: mcelog +@@ -27,14 +27,21 @@ all: mcelog .PHONY: install clean depend FORCE +LIBS := OBJ := p4.o k8.o mcelog.o dmi.o tsc.o core2.o bitfield.o intel.o \ nehalem.o dunnington.o tulsa.o config.o memutil.o msg.o \ - eventloop.o leaky-bucket.o memdb.o server.o trigger.o \ - client.o cache.o sysfs.o yellow.o page.o rbtree.o \ + eventloop.o leaky-bucket.o memdb.o server.o \ + client.o cache.o rbtree.o \ sandy-bridge.o ivy-bridge.o haswell.o \ broadwell_de.o broadwell_epex.o skylake_xeon.o \ denverton.o \ - msr.o bus.o unknown.o + msr.o +ifndef FREEBSD +OBJ += page.o trigger.o sysfs.o yellow.o bus.o unknown.o +endif +ifdef FREEBSD +OBJ += memstream.o +endif CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o \ version.o version.c version.tmp DOC := mce.pdf -@@ -43,7 +49,7 @@ ADD_DEFINES := +@@ -43,7 +50,7 @@ ADD_DEFINES := SRC := $(OBJ:.o=.c) -mcelog: ${OBJ} version.o +mcelog: ${OBJ} ${LIBS} version.o # dbquery intentionally not installed by default install: mcelog mcelog.conf mcelog.conf.5 mcelog.triggers.5 -@@ -82,7 +88,7 @@ depend: .depend +@@ -82,7 +89,7 @@ depend: .depend version.tmp: FORCE ( echo -n "char version[] = \"" ; \ -- if type -p git >/dev/null; then \ -+ if command -v git >/dev/null; then \ +- if command -v git >/dev/null; then \ ++ if false; then \ if [ -d .git ] ; then \ git describe --tags HEAD | tr -d '\n'; \ else \ -@@ -98,8 +104,6 @@ version.c: version.tmp +@@ -98,8 +105,6 @@ version.c: version.tmp .depend: ${SRC} ${CC} -MM -I. ${SRC} > .depend.X && mv .depend.X .depend -include .depend - Makefile: .depend .PHONY: iccverify src test