From 8ffa5845a7f7e72c836ada65980a9c055d2432a0 Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Thu, 15 Oct 2020 20:07:17 +0000
Subject: [PATCH] Update to 3.3

Changes:	https://git.savannah.gnu.org/cgit/dmidecode.git/tree/NEWS
---
 sysutils/dmidecode/Makefile                |  4 +--
 sysutils/dmidecode/distinfo                |  6 ++--
 sysutils/dmidecode/files/patch-Makefile    | 33 +++++++++-------------
 sysutils/dmidecode/files/patch-dmidecode.c | 10 -------
 4 files changed, 17 insertions(+), 36 deletions(-)
 delete mode 100644 sysutils/dmidecode/files/patch-dmidecode.c

diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile
index 6421d29556cd..546636bda615 100644
--- a/sysutils/dmidecode/Makefile
+++ b/sysutils/dmidecode/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dmidecode
-PORTVERSION=	3.2
+PORTVERSION=	3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	SAVANNAH
 
@@ -16,8 +16,6 @@ ONLY_FOR_ARCHS=	amd64 i386
 
 USES=		tar:xz
 
-MAKE_ENV=	DOCSDIR="${DOCSDIR}"
-
 SUB_FILES=	dmidecode
 
 OPTIONS_DEFINE=	DOCS
diff --git a/sysutils/dmidecode/distinfo b/sysutils/dmidecode/distinfo
index 77c12340a663..6c449118c962 100644
--- a/sysutils/dmidecode/distinfo
+++ b/sysutils/dmidecode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537020822
-SHA256 (dmidecode-3.2.tar.xz) = 077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd
-SIZE (dmidecode-3.2.tar.xz) = 54440
+TIMESTAMP = 1602780728
+SHA256 (dmidecode-3.3.tar.xz) = 82c737a780614c38a783e8055340d295e332fb12c7f418b5d21a0797d3fb1455
+SIZE (dmidecode-3.3.tar.xz) = 56372
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>