Attachment #223862 for bug #254818

Lines 1-7 Link Here

(-)b/sysutils/pcapfix/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= pcapfix	3	PORTNAME= pcapfix
4	PORTVERSION= 1.1.4	4	PORTVERSION= 1.1.5
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7		7

Lines 1-3 Link Here

(-)b/sysutils/pcapfix/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1548274664	1	TIMESTAMP = 1617716795
2	SHA256 (Rup0rt-pcapfix-v1.1.4_GH0.tar.gz) = 73c2e316937792f6b9265ab2e12b9bb0e6d6a46626e311412c4903ace3e3a9f6	2	SHA256 (Rup0rt-pcapfix-v1.1.5_GH0.tar.gz) = 60c25e2410db5b161a3c16f6d097dc4a62fdb815df2a9f3abc6f22a085ed90cb
3	SIZE (Rup0rt-pcapfix-v1.1.4_GH0.tar.gz) = 51659	3	SIZE (Rup0rt-pcapfix-v1.1.5_GH0.tar.gz) = 52670




--- Makefile.orig	2021-04-06 13:54:58 UTC
+++ Makefile
@@ -7,18 +7,7 @@ OPTFLAGS = $(shell getconf LFS_CFLAGS) -D_FORTIFY_SOUR
 WARNFLAGS = -Wall -Wextra -std=gnu99 -pedantic -Wformat -Werror=format-security
 DEBUGFLAGS = -g
 CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
-
-# Determine extra LDFLAGS
-OS := $(shell uname)
-ifeq ($(findstring Darwin,$(OS)),Darwin)
-   skip_ldflags = yes
-endif
-ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
-   skip_ldflags = yes
-endif
-ifndef skip_ldflags
-   LDFLAGS += -Wl,-z,relro
-endif
+.if ${OS} != Darwin
+LDFLAGS += -Wl,-z,relro
+.endif
 
 
 
 all: pcap pcap_kuznet pcapng
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) pcapfix.c pcap.o pcap_kuznet.o pcapng.o -o pcapfix

Return to bug 254818

Lines 1-15 Link Here

(-)b/sysutils/pcapfix/files/patch-Makefile (-9 / +16 lines)
1	--- Makefile.orig 2018-07-16 12:17:05 UTC	1	--- Makefile.orig 2021-04-06 13:54:58 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -8,9 +8,9 @@ WARNFLAGS = -Wall -Wextra -std=gnu99 -pe	3	@@ -7,18 +7,7 @@ OPTFLAGS = $(shell getconf LFS_CFLAGS) -D_FORTIFY_SOUR
		4	WARNFLAGS = -Wall -Wextra -std=gnu99 -pedantic -Wformat -Werror=format-security
4	DEBUGFLAGS = -g	5	DEBUGFLAGS = -g
5	CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)	6	CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
6	OS := $(shell uname)	7	-
7	-ifneq ($(OS), Darwin)	8	-# Determine extra LDFLAGS
8	- LDFLAGS += -Wl,-z,relro	9	-OS := $(shell uname)
		10	-ifeq ($(findstring Darwin,$(OS)),Darwin)
		11	- skip_ldflags = yes
		12	-endif
		13	-ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
		14	- skip_ldflags = yes
		15	-endif
		16	-ifndef skip_ldflags
		17	- LDFLAGS += -Wl,-z,relro
9	-endif	18	-endif
10	+.if ${OS} != Darwin
11	+LDFLAGS += -Wl,-z,relro	19	+LDFLAGS += -Wl,-z,relro
12	+.endif
13
14
15		20
		21	all: pcap pcap_kuznet pcapng
		22	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) pcapfix.c pcap.o pcap_kuznet.o pcapng.o -o pcapfix