Attachment #241976 for bug #271244

View | Details | Raw Unified | Return to bug 271244
Collapse All | Expand All

Lines 1-9 Link Here

(-)b/net/miniupnpd/Makefile (-4 / +10 lines)
1	PORTNAME= miniupnpd	1	PORTNAME= miniupnpd
2	PORTVERSION= 2.1.20200510	2	PORTVERSION= 2.3.3
3	PORTEPOCH= 1	3	PORTEPOCH= 1
4	CATEGORIES= net	4	CATEGORIES= net
5	MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \
6	http://miniupnp.free.fr/files/
7		5
8	MAINTAINER= squat@squat.no	6	MAINTAINER= squat@squat.no
9	COMMENT= UPnP IGD implementation which uses pf/ipf	7	COMMENT= UPnP IGD implementation which uses pf/ipf
Lines 13-18 LICENSE= BSD3CLAUSE Link Here
13		11
14	USES= cpe ssl	12	USES= cpe ssl
15	CPE_VENDOR= miniupnp_project	13	CPE_VENDOR= miniupnp_project
		14
		15	USE_GITHUB= yes
		16	GH_ACCOUNT= miniupnp
		17	GH_PROJECT= miniupnp
		18	GH_TAGNAME= e439318
		19
16	USE_RC_SUBR= miniupnpd	20	USE_RC_SUBR= miniupnpd
17		21
18	HAS_CONFIGURE= yes	22	HAS_CONFIGURE= yes
Lines 21-26 MAKE_JOBS_UNSAFE= yes Link Here
21	CFLAGS+= -I${OPENSSLINC}	25	CFLAGS+= -I${OPENSSLINC}
22	LDFLAGS+= -L${OPENSSLLIB}	26	LDFLAGS+= -L${OPENSSLLIB}
23		27
		28	WRKSRC_SUBDIR= miniupnpd
		29
24	PLIST_FILES= etc/miniupnpd.conf.sample \	30	PLIST_FILES= etc/miniupnpd.conf.sample \
25	man/man8/miniupnpd.8.gz \	31	man/man8/miniupnpd.8.gz \
26	sbin/miniupnpd	32	sbin/miniupnpd
Lines 29-35 OPTIONS_DEFINE= CHECK_PORTINUSE IPV6 LEASEFILE UPNP_IGDV2 \ Link Here
29	UPNP_STRICT	35	UPNP_STRICT
30	OPTIONS_DEFAULT= AUTODETECT_FW	36	OPTIONS_DEFAULT= AUTODETECT_FW
31	OPTIONS_SINGLE= FIREWALL	37	OPTIONS_SINGLE= FIREWALL
32	OPTIONS_SINGLE_FIREWALL= AUTODETECT_FW PF IPFW	38	OPTIONS_SINGLE_FIREWALL= AUTODETECT_FW IPFW PF
33	AUTODETECT_FW_DESC= Try to autodetect firewall type	39	AUTODETECT_FW_DESC= Try to autodetect firewall type
34	CHECK_PORTINUSE_DESC= Check if ports are in use	40	CHECK_PORTINUSE_DESC= Check if ports are in use
35	IPFW_DESC= Use IPFW as firewall type	41	IPFW_DESC= Use IPFW as firewall type

Lines 1-3 Link Here

(-)b/net/miniupnpd/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1591038112	1	TIMESTAMP = 1683175217
2	SHA256 (miniupnpd-2.1.20200510.tar.gz) = 821e708f369cc1fb851506441fbc3a1f4a1b5a8bf8e84a9e71758a32f5127e8b	2	SHA256 (miniupnp-miniupnp-2.3.3-e439318_GH0.tar.gz) = 9324cd00db2d203f0f09e15d8556ff63b40de09bfa755b2b9a64856e146b3b44
3	SIZE (miniupnpd-2.1.20200510.tar.gz) = 245426	3	SIZE (miniupnp-miniupnp-2.3.3-e439318_GH0.tar.gz) = 454838




--- Makefile.bsd.orig	2023-02-17 03:09:33 UTC
+++ Makefile.bsd
@@ -150,8 +150,8 @@ install:	miniupnpd genuuid
 
 INSTALLBINDIR = $(PREFIX)/sbin
 INSTALLETCDIR = $(PREFIX)/etc
-# INSTALLMANDIR = $(PREFIX)/man
-INSTALLMANDIR = /usr/share/man
+INSTALLMANDIR = $(MANPREFIX)/man
 
 all:	$(EXECUTABLES)
 
@@ -140,10 +139,10 @@ install:	miniupnpd genuuid
 	$(INSTALL) -d $(DESTDIR)$(INSTALLBINDIR)
 	$(INSTALL) -m 755 miniupnpd $(DESTDIR)$(INSTALLBINDIR)
 	$(INSTALL) -d $(DESTDIR)$(INSTALLETCDIR)
-	$(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
-	$(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)
+	$(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)/miniupnpd.conf.sample
 	# TODO : install man page correctly
-#	$(INSTALL) -d $(INSTALLMANDIR)
-#	$(INSTALL) miniupnpd.8 $(INSTALLMANDIR)/cat8/miniupnpd.0
+	$(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)/man8
 	$(INSTALL) -m 644 miniupnpd.8 $(DESTDIR)$(INSTALLMANDIR)/man8/miniupnpd.8
 
 # genuuid is using the uuid cli tool available under OpenBSD 4.0 in
 # the uuid-1.5.0 package
@@ -187,7 +186,7 @@ dox:	miniupnpd.doxyconf
 	$(DOXYGEN) $>
 
 miniupnpd: config.h $(ALLOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(ALLOBJS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ALLOBJS) $(LIBS)
 
 # BSDmake :
 #	$(CC) $(LDFLAGS) -o $@ $> $(LIBS)
- 

Return to bug 271244

Lines 1-35 Link Here

(-)b/net/miniupnpd/files/patch-Makefile.bsd (-27 / +4 lines)
1	--- Makefile.bsd.orig 2020-05-10 16:58:42 UTC	1	--- Makefile.bsd.orig 2023-02-17 03:09:33 UTC
2	+++ Makefile.bsd	2	+++ Makefile.bsd
3	@@ -121,8 +121,7 @@ LIBS += -lssl -lcrypto	3	@@ -150,8 +150,8 @@ install: miniupnpd genuuid
4
5	INSTALLBINDIR = $(PREFIX)/sbin
6	INSTALLETCDIR = $(PREFIX)/etc
7	-# INSTALLMANDIR = $(PREFIX)/man
8	-INSTALLMANDIR = /usr/share/man
9	+INSTALLMANDIR = $(MANPREFIX)/man
10
11	all: $(EXECUTABLES)
12
13	@@ -140,10 +139,10 @@ install: miniupnpd genuuid
14	$(INSTALL) -d $(DESTDIR)$(INSTALLBINDIR)	4	$(INSTALL) -d $(DESTDIR)$(INSTALLBINDIR)
15	$(INSTALL) -m 755 miniupnpd $(DESTDIR)$(INSTALLBINDIR)	5	$(INSTALL) -m 755 miniupnpd $(DESTDIR)$(INSTALLBINDIR)
16	$(INSTALL) -d $(DESTDIR)$(INSTALLETCDIR)	6	$(INSTALL) -d $(DESTDIR)$(INSTALLETCDIR)
17	- $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)	7	- $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
		8	- $(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)
18	+ $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)/miniupnpd.conf.sample	9	+ $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)/miniupnpd.conf.sample
19	# TODO : install man page correctly
20	-# $(INSTALL) -d $(INSTALLMANDIR)
21	-# $(INSTALL) miniupnpd.8 $(INSTALLMANDIR)/cat8/miniupnpd.0
22	+ $(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)/man8	10	+ $(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)/man8
23	+ $(INSTALL) miniupnpd.8 $(DESTDIR)$(INSTALLMANDIR)/man8/miniupnpd.8	11	$(INSTALL) -m 644 miniupnpd.8 $(DESTDIR)$(INSTALLMANDIR)/man8/miniupnpd.8
24		12
25	# genuuid is using the uuid cli tool available under OpenBSD 4.0 in	13	# genuuid is using the uuid cli tool available under OpenBSD 4.0 in
26	# the uuid-1.5.0 package
27	@@ -187,7 +186,7 @@ dox: miniupnpd.doxyconf
28	$(DOXYGEN) $>
29
30	miniupnpd: config.h $(ALLOBJS)
31	- $(CC) $(LDFLAGS) -o $@ $(ALLOBJS) $(LIBS)
32	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ALLOBJS) $(LIBS)
33
34	# BSDmake :
35	# $(CC) $(LDFLAGS) -o $@ $> $(LIBS)
36	-