Skip to content

Commit

Permalink
opnsense/miniupnpd: update to 2.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Tawmu authored and fichtner committed Nov 9, 2022
1 parent 51ea95e commit d0b581e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 29 deletions.
2 changes: 1 addition & 1 deletion opnsense/miniupnpd/Makefile
@@ -1,5 +1,5 @@
PORTNAME= miniupnpd
PORTVERSION= 2.1.20200510
PORTVERSION= 2.3.1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \
Expand Down
6 changes: 3 additions & 3 deletions opnsense/miniupnpd/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1591038112
SHA256 (miniupnpd-2.1.20200510.tar.gz) = 821e708f369cc1fb851506441fbc3a1f4a1b5a8bf8e84a9e71758a32f5127e8b
SIZE (miniupnpd-2.1.20200510.tar.gz) = 245426
TIMESTAMP = 1666091646
SHA256 (miniupnpd-2.3.1.tar.gz) = d1dfd4c0276549bbd3d5e434b913f1212481b5f726a9258f90f65e8ccb493b33
SIZE (miniupnpd-2.3.1.tar.gz) = 258050
34 changes: 9 additions & 25 deletions opnsense/miniupnpd/files/patch-Makefile.bsd
@@ -1,35 +1,19 @@
--- Makefile.bsd.orig 2020-05-10 16:58:42 UTC
+++ Makefile.bsd
@@ -121,8 +121,7 @@ LIBS += -lssl -lcrypto

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
--- Makefile.bsd 2021-08-21 09:32:42.000000000 +0100
+++ Makefile.bsd.new 2022-10-18 12:36:44.886103000 +0100
@@ -150,8 +150,10 @@
$(INSTALL) -d $(DESTDIR)$(INSTALLBINDIR)
$(INSTALL) -m 755 miniupnpd $(DESTDIR)$(INSTALLBINDIR)
$(INSTALL) -d $(DESTDIR)$(INSTALLETCDIR)
- $(INSTALL) -b miniupnpd.conf $(DESTDIR)$(INSTALLETCDIR)
+ $(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)
+ $(INSTALL) -d $(DESTDIR)$(INSTALLMANDIR)/man8
+ $(INSTALL) miniupnpd.8 $(DESTDIR)$(INSTALLMANDIR)/man8/miniupnpd.8
$(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)
@@ -260,4 +262,3 @@
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<

# BSDmake :
# $(CC) $(LDFLAGS) -o $@ $> $(LIBS)
# $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $(.TARGET) $(.IMPSRC)
-

0 comments on commit d0b581e

Please sign in to comment.