Date: Sat, 19 Sep 2015 12:20:33 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397321 - in head/net/miniupnpd: . files Message-ID: <201509191220.t8JCKXnX080731@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Sat Sep 19 12:20:32 2015 New Revision: 397321 URL: https://svnweb.freebsd.org/changeset/ports/397321 Log: - Update net/miniupnpd to 1.9.20150721 [1] - Stop calling uuidgen on port Makefile, miniupnpd Makefile already does it - Do not modify CFLAGS since it's already attributed using ?= - Remove do-install: target from ports Makefile, let miniupnpd Makefile installs it - Patch miniupnpd Makefile to install conf with .sample suffix - Patch miniupnpd Makefile to install manpage in the proper place, respecting MANPREFIX PR: 203191 [1] Submitted by: Tor Halvard Furulund <squat@squat.no> [1] Approved by: Tor Halvard Furulund <squat@squat.no> (maintainer) Sponsored by: Rubicon Communications (Netgate) Modified: head/net/miniupnpd/Makefile head/net/miniupnpd/distinfo head/net/miniupnpd/files/patch-Makefile Modified: head/net/miniupnpd/Makefile ============================================================================== --- head/net/miniupnpd/Makefile Sat Sep 19 12:18:12 2015 (r397320) +++ head/net/miniupnpd/Makefile Sat Sep 19 12:20:32 2015 (r397321) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= miniupnpd -PORTVERSION= 1.9 -PORTREVISION= 1 +PORTVERSION= 1.9.20150721 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \ @@ -12,12 +11,10 @@ MASTER_SITES= http://miniupnp.tuxfamily. 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 @@ -42,15 +39,4 @@ UPNP_IGDV2_EXTRA_PATCHES= ${PATCHDIR}/en 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 <bsd.port.mk> Modified: head/net/miniupnpd/distinfo ============================================================================== --- head/net/miniupnpd/distinfo Sat Sep 19 12:18:12 2015 (r397320) +++ head/net/miniupnpd/distinfo Sat Sep 19 12:20:32 2015 (r397321) @@ -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 Modified: head/net/miniupnpd/files/patch-Makefile ============================================================================== --- head/net/miniupnpd/files/patch-Makefile Sat Sep 19 12:18:12 2015 (r397320) +++ head/net/miniupnpd/files/patch-Makefile Sat Sep 19 12:20:32 2015 (r397321) @@ -1,6 +1,30 @@ ---- 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509191220.t8JCKXnX080731>