Index: head/net/miniupnpd/Makefile =================================================================== --- head/net/miniupnpd/Makefile (revision 397320) +++ head/net/miniupnpd/Makefile (revision 397321) @@ -1,56 +1,42 @@ # Created by: Daniel O'Connor # $FreeBSD$ PORTNAME= miniupnpd -PORTVERSION= 1.9 -PORTREVISION= 1 +PORTVERSION= 1.9.20150721 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \ http://miniupnp.free.fr/files/ MAINTAINER= squat@squat.no COMMENT= UPnP IGD implementation which uses pf/ipf -SUB_FILES= miniupnpd.conf.sample -SUB_LIST= UUID=${UUID} +LICENSE= BSD3CLAUSE USES= cpe CPE_VENDOR= miniupnp_project -UUID!= uuidgen PLIST_FILES= etc/miniupnpd.conf.sample sbin/miniupnpd \ man/man8/miniupnpd.8.gz MAKE_JOBS_UNSAFE=yes USE_OPENSSL= yes USE_RC_SUBR= miniupnpd CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} OPTIONS_DEFINE= PF_ENABLE_FILTER_RULES CHECK_PORTINUSE IPV6 UPNP_IGDV2 UPNP_STRICT LEASEFILE PF_ENABLE_FILTER_RULES_DESC= Enable pf generation of filter rules CHECK_PORTINUSE_DESC= Check if ports are in use IPV6_DESC= Enable IPv6 UPNP_IGDV2_DESC= Build an IGDv2 instead of an IGDv1 UPNP_STRICT_DESC= Be more strict regarding compliance with UPnP specifications LEASEFILE_DESC= Enable lease file PF_ENABLE_FILTER_RULES_EXTRA_PATCHES= ${PATCHDIR}/pf_enable_filter_rules.patch CHECK_PORTINUSE_EXTRA_PATCHES= ${PATCHDIR}/enable_check_portinuse.patch IPV6_EXTRA_PATCHES= ${PATCHDIR}/enable_ipv6.patch UPNP_IGDV2_EXTRA_PATCHES= ${PATCHDIR}/enable_igdv2.patch UPNP_STRICT_EXTRA_PATCHES= ${PATCHDIR}/enable_upnp_strict.patch LEASEFILE_EXTRA_PATCHES= ${PATCHDIR}/enable_leasefile.patch - -post-patch: - @${REINPLACE_CMD} 's|CFLAGS ?= -pipe -Os|CFLAGS ?= -pipe|' \ - ${WRKSRC}/Makefile - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/miniupnpd ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_DATA} ${WRKDIR}/miniupnpd.conf.sample \ - ${STAGEDIR}${PREFIX}/etc/miniupnpd.conf.sample - ${INSTALL_MAN} ${WRKSRC}/miniupnpd.8 \ - ${STAGEDIR}${MAN8PREFIX}/man/man8/miniupnpd.8 .include Index: head/net/miniupnpd/distinfo =================================================================== --- head/net/miniupnpd/distinfo (revision 397320) +++ head/net/miniupnpd/distinfo (revision 397321) @@ -1,2 +1,2 @@ -SHA256 (miniupnpd-1.9.tar.gz) = 6176eb21a6422a7ee68ef1c62ccbbd5003335fa773d8c9013228c2a217bba2ac -SIZE (miniupnpd-1.9.tar.gz) = 192183 +SHA256 (miniupnpd-1.9.20150721.tar.gz) = 9340224e5023ecb5d1b7f45e4d69734dcfbadbe41a80d1f0182347e6b8104470 +SIZE (miniupnpd-1.9.20150721.tar.gz) = 207562 Index: head/net/miniupnpd/files/patch-Makefile =================================================================== --- head/net/miniupnpd/files/patch-Makefile (revision 397320) +++ head/net/miniupnpd/files/patch-Makefile (revision 397321) @@ -1,11 +1,35 @@ ---- Makefile.orig 2014-06-30 12:03:05 UTC +--- Makefile.orig 2015-04-30 09:08:34 UTC +++ Makefile -@@ -204,7 +204,7 @@ depend: config.h +@@ -160,8 +160,7 @@ LIBS += -lssl -lcrypto + + INSTALLBINDIR = $(PREFIX)/sbin + INSTALLETCDIR = $(PREFIX)/etc +-# INSTALLMANDIR = $(PREFIX)/man +-INSTALLMANDIR = /usr/share/man ++INSTALLMANDIR = $(MANPREFIX)/man + + all: $(EXECUTABLES) + +@@ -178,10 +177,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) -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) 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 +@@ -204,7 +203,7 @@ depend: config.h testgetroute.c testportinuse.c testasyncsendto.c miniupnpd: config.h $(ALLOBJS) - $(CC) $(CFLAGS) -o $@ $(ALLOBJS) $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ALLOBJS) $(LIBS) # BSDmake : # $(CC) $(CFLAGS) -o $@ $> $(LIBS)