summaryrefslogtreecommitdiff
path: root/sysutils/dmidecode/files
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2020-10-15 20:07:17 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2020-10-15 20:07:17 +0000
commit8ffa5845a7f7e72c836ada65980a9c055d2432a0 (patch)
tree01e97bf8a0682d29820b0c2531d91f9a04d8a02c /sysutils/dmidecode/files
parentUpdate to 7.73.0 (diff)
Update to 3.3
Changes: https://git.savannah.gnu.org/cgit/dmidecode.git/tree/NEWS
Notes
Notes: svn path=/head/; revision=552449
Diffstat (limited to 'sysutils/dmidecode/files')
-rw-r--r--sysutils/dmidecode/files/patch-Makefile33
-rw-r--r--sysutils/dmidecode/files/patch-dmidecode.c10
2 files changed, 13 insertions, 30 deletions
diff --git a/sysutils/dmidecode/files/patch-Makefile b/sysutils/dmidecode/files/patch-Makefile
index 577dd7df6ed1..dac1e2d99c48 100644
--- a/sysutils/dmidecode/files/patch-Makefile
+++ b/sysutils/dmidecode/files/patch-Makefile
@@ -1,27 +1,21 @@
---- Makefile.orig 2015-09-03 06:03:19 UTC
+--- Makefile.orig 2020-10-14 12:51:11 UTC
+++ Makefile
-@@ -12,8 +12,8 @@
+@@ -12,7 +12,7 @@
# (at your option) any later version.
#
--CC = gcc
--CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
-+#CC = gcc
-+CFLAGS+= -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
- -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
-
- # Let lseek and mmap support 64-bit wide offsets
-@@ -23,23 +23,23 @@ CFLAGS += -D_FILE_OFFSET_BITS=64
+-CC ?= gcc
++#CC ?= gcc
+ # Base CFLAGS can be overridden by environment
+ CFLAGS ?= -O2
+ # When debugging, disable -O2 and enable -g
+@@ -28,19 +28,20 @@ CFLAGS += -D_FILE_OFFSET_BITS=64
#CFLAGS += -DALIGNMENT_WORKAROUND
- # When debugging, disable -O2 and enable -g.
--CFLAGS += -O2
-+#CFLAGS += -O2
- #CFLAGS += -g
-
- # Pass linker flags here
--LDFLAGS =
-+LDFLAGS+= $(CFLAGS)
+ # Pass linker flags here (can be set from environment too)
+-LDFLAGS ?=
++#LDFLAGS ?=
++LDFLAGS += $(CFLAGS)
DESTDIR =
-prefix = /usr/local
@@ -30,8 +24,7 @@
-mandir = $(prefix)/share/man
+mandir = $(MANPREFIX)/man
man8dir = $(mandir)/man8
--docdir = $(prefix)/share/doc/dmidecode
-+docdir = $(DOCSDIR)
+ docdir = $(prefix)/share/doc/dmidecode
INSTALL := install
-INSTALL_DATA := $(INSTALL) -m 644
diff --git a/sysutils/dmidecode/files/patch-dmidecode.c b/sysutils/dmidecode/files/patch-dmidecode.c
deleted file mode 100644
index 2c354478c612..000000000000
--- a/sysutils/dmidecode/files/patch-dmidecode.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- dmidecode.c.orig 2018-09-14 13:52:12 UTC
-+++ dmidecode.c
-@@ -66,6 +66,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <arpa/inet.h>
-+#include <sys/socket.h>
-
- #ifdef __FreeBSD__
- #include <errno.h>