Index: head/sysutils/mcelog/Makefile =================================================================== --- head/sysutils/mcelog/Makefile (revision 518376) +++ head/sysutils/mcelog/Makefile (revision 518377) @@ -1,42 +1,42 @@ # Created by: Jeremy Chadwick # $FreeBSD$ PORTNAME= mcelog -PORTVERSION= 165 +PORTVERSION= 166 DISTVERSIONPREFIX= v CATEGORIES= sysutils MAINTAINER= ultima@FreeBSD.org COMMENT= Collects and decodes Machine Check Exception data LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 TEST_DEPENDS= bash:shells/bash USES= alias gmake shebangfix USE_GITHUB= yes GH_ACCOUNT= andikleen 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: @${ECHO} "${DISTVERSIONPREFIX}${PORTVERSION}" >${WRKSRC}/.os_version @${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 518376) +++ head/sysutils/mcelog/distinfo (revision 518377) @@ -1,3 +1,3 @@ -TIMESTAMP = 1573447397 -SHA256 (andikleen-mcelog-v165_GH0.tar.gz) = a18fdef9cfe2dfaefa09087c616c376a301dc87b1fa14a37476d97370962c668 -SIZE (andikleen-mcelog-v165_GH0.tar.gz) = 308405 +TIMESTAMP = 1574649926 +SHA256 (andikleen-mcelog-v166_GH0.tar.gz) = f717b7bd725a2573e9d1556d3543cb385f1c9fa68fe682f1bc93952b726eedb4 +SIZE (andikleen-mcelog-v166_GH0.tar.gz) = 312451 Index: head/sysutils/mcelog/files/patch-Makefile =================================================================== --- head/sysutils/mcelog/files/patch-Makefile (revision 518376) +++ head/sysutils/mcelog/files/patch-Makefile (revision 518377) @@ -1,45 +1,45 @@ ---- Makefile.orig 2017-05-22 16:38:47 UTC +--- Makefile.orig 2019-11-12 19:05:12 UTC +++ Makefile -@@ -27,14 +27,21 @@ all: mcelog +@@ -29,14 +29,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 \ ++ 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 \ + denverton.o i10nm.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 +50,7 @@ ADD_DEFINES := +@@ -45,7 +52,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 -@@ -101,8 +108,6 @@ version.c: version.tmp +@@ -103,8 +110,6 @@ version.c: version.tmp .depend: ${SRC} ${CC} -MM -I. ${SRC} > .depend.X && mv .depend.X .depend - -include .depend Makefile: .depend