Page MenuHomeFreeBSD

D34094.id103247.diff
No OneTemporary

D34094.id103247.diff

diff --git a/sysutils/superiotool/Makefile b/sysutils/superiotool/Makefile
--- a/sysutils/superiotool/Makefile
+++ b/sysutils/superiotool/Makefile
@@ -1,9 +1,9 @@
PORTNAME= superiotool
-DISTVERSION= 20121019
-PORTREVISION= 1
+DISTVERSION= 4.15
+PORTEPOCH= 1
+DISTFILES= coreboot-4.15.tar.xz
CATEGORIES= sysutils
-MASTER_SITES= LOCAL/avg \
- http://www.icyb.net.ua/~avg/distfiles/
+MASTER_SITES= https://coreboot.org/releases/
MAINTAINER= avg@FreeBSD.org
COMMENT= Helper tool for Super I/O chip detection and analysis
@@ -18,8 +18,9 @@
PLIST_FILES= sbin/superiotool \
man/man8/superiotool.8.gz
-WRKSRC= ${WRKDIR}/${PORTNAME}
-UPSTREAM_VERS= 4.0-2827-g1a00cf0
+WRKSRC= ${WRKDIR}/coreboot-${DISTVERSION}
+WRKSRC_SUBDIR= util/superiotool
+UPSTREAM_VERS= 4.15-cc66b56c8
MAKE_ENV+= VERSION=-DSUPERIOTOOL_VERSION='\"${UPSTREAM_VERS}\"'
post-patch:
diff --git a/sysutils/superiotool/distinfo b/sysutils/superiotool/distinfo
--- a/sysutils/superiotool/distinfo
+++ b/sysutils/superiotool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (superiotool-20121019.tar.bz2) = d4140f3a50e53f46dd9b1edfc8353113f29f437201907d613150d431dbfc7a62
-SIZE (superiotool-20121019.tar.bz2) = 29827
+SHA256 (coreboot-4.15.tar.xz) = 20e6aaa6dd0eaec7753441c799711d1b4630e3ca709536386f2242ac2c8a1ec5
+SIZE (coreboot-4.15.tar.xz) = 54600772
diff --git a/sysutils/superiotool/files/patch-Makefile b/sysutils/superiotool/files/patch-Makefile
--- a/sysutils/superiotool/files/patch-Makefile
+++ b/sysutils/superiotool/files/patch-Makefile
@@ -1,49 +1,22 @@
---- Makefile.orig 2012-10-19 16:44:32.000000000 +0300
-+++ Makefile 2012-10-20 01:32:35.427651135 +0300
-@@ -20,28 +20,24 @@
-
- PROGRAM = superiotool
-
--CC = gcc
--INSTALL = /usr/bin/install
--PREFIX = /usr/local
-+CC ?= gcc
-+INSTALL ?= /usr/bin/install
-+PREFIX ?= /usr/local
+--- Makefile.orig 2022-01-30 01:12:26.804214000 +0000
++++ Makefile 2022-01-30 01:14:39.815103000 +0000
+@@ -8,7 +8,7 @@
# Set the superiotool version string to the output of 'git describe'.
-VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
--
--CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
-- -Werror-implicit-function-declaration -ansi -pedantic $(VERSION)
--LDFLAGS += -lz
-+VERSION ?= -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
-
- OBJS = superiotool.o serverengines.o ali.o fintek.o ite.o nsc.o nuvoton.o \
- smsc.o winbond.o infineon.o
++#VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"'
--OS_ARCH = $(shell uname)
-+OS_ARCH = FreeBSD
- ifeq ($(OS_ARCH), Darwin)
- LIBS = -framework IOKit -framework DirectHW -lpci -lz
- endif
- ifeq ($(OS_ARCH), FreeBSD)
--CFLAGS = -O2 -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
-- -Werror-implicit-function-declaration -ansi $(VERSION) \
-+CFLAGS += -Wall -Werror -Wstrict-prototypes -Wundef -Wstrict-aliasing \
-+ -Werror-implicit-function-declaration $(VERSION) \
- -I/usr/local/include
- LDFLAGS += -L/usr/local/lib
- LIBS = -lz
-@@ -69,8 +65,8 @@ $(PROGRAM): $(OBJS) superiotool.h
+ CFLAGS += -O2 -Wall -Wstrict-prototypes -Wundef -Wstrict-aliasing \
+ -Werror-implicit-function-declaration -ansi -pedantic $(VERSION)
+@@ -56,8 +56,8 @@
install: $(PROGRAM)
mkdir -p $(DESTDIR)$(PREFIX)/sbin
$(INSTALL) $(PROGRAM) $(DESTDIR)$(PREFIX)/sbin
- mkdir -p $(DESTDIR)$(PREFIX)/share/man/man8
-- $(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
+- $(INSTALL) -p -m644 $(PROGRAM).8 $(DESTDIR)$(PREFIX)/share/man/man8
+ mkdir -p $(DESTDIR)$(PREFIX)/man/man8
-+ $(INSTALL) $(PROGRAM).8 $(DESTDIR)$(PREFIX)/man/man8
++ $(INSTALL) -p -m644 $(PROGRAM).8 $(DESTDIR)$(PREFIX)/man/man8
clean:
- rm -f $(PROGRAM) *.o
+ rm -f $(PROGRAM) *.o junit.xml

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 12, 6:55 AM (8 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33901759
Default Alt Text
D34094.id103247.diff (3 KB)

Event Timeline