Index: head/sysutils/mcelog/Makefile =================================================================== --- head/sysutils/mcelog/Makefile (revision 421491) +++ head/sysutils/mcelog/Makefile (revision 421492) @@ -1,35 +1,35 @@ # Created by: Jeremy Chadwick # $FreeBSD$ PORTNAME= mcelog +PORTVERSION= 141 DISTVERSIONPREFIX= v -DISTVERSION= 140 CATEGORIES= sysutils MAINTAINER= ultima1252@gmail.com COMMENT= Collects and decodes Machine Check Exception data LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= andikleen ONLY_FOR_ARCHS= amd64 i386 ia64 USES= alias gmake MAKE_ENV+= FREEBSD=1 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}\"/' \ + @${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 421491) +++ head/sysutils/mcelog/distinfo (revision 421492) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471813607 -SHA256 (andikleen-mcelog-v140_GH0.tar.gz) = 5e06a120e555420206ca2a3dbad919d889e3e0d1d840964d01ac9424d5b66bff -SIZE (andikleen-mcelog-v140_GH0.tar.gz) = 301815 +TIMESTAMP = 1473218091 +SHA256 (andikleen-mcelog-v141_GH0.tar.gz) = 30f4e4966ff46a9e32d262295af50b7cb4a865a1231002092b610f2b7306aeec +SIZE (andikleen-mcelog-v141_GH0.tar.gz) = 295791 Index: head/sysutils/mcelog/files/patch-Makefile =================================================================== --- head/sysutils/mcelog/files/patch-Makefile (revision 421491) +++ head/sysutils/mcelog/files/patch-Makefile (revision 421492) @@ -1,60 +1,60 @@ ---- Makefile.orig 2016-04-15 20:19:32 UTC +--- Makefile.orig 2016-09-02 21:52:54 UTC +++ Makefile @@ -1,5 +1,4 @@ -CFLAGS := -g -Os -prefix := /usr +prefix := /usr/local etcprefix := MANDIR := ${prefix}/share/man # Define appropiately for your distribution -@@ -32,13 +31,20 @@ all: mcelog +@@ -27,13 +26,20 @@ 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 \ - xeon75xx.o sandy-bridge.o ivy-bridge.o haswell.o \ + sandy-bridge.o ivy-bridge.o haswell.o \ broadwell_de.o broadwell_epex.o skylake_xeon.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 - DISKDB_OBJ := diskdb.o dimm.o db.o - CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o ${DISKDB_OBJ} \ + CLEAN := mcelog dmi tsc dbquery .depend .depend.X dbquery.o \ version.o version.c version.tmp -@@ -55,7 +61,7 @@ endif + DOC := mce.pdf +@@ -42,7 +48,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 -@@ -94,7 +100,7 @@ depend: .depend +@@ -81,7 +87,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 [ -d .git ] ; then \ git describe --tags HEAD | tr -d '\n'; \ else \ -@@ -110,8 +116,6 @@ version.c: version.tmp +@@ -97,8 +103,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