From owner-svn-ports-all@FreeBSD.ORG Mon Jun 9 15:40:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A5F64B1; Mon, 9 Jun 2014 15:40:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 574DA23B4; Mon, 9 Jun 2014 15:40:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59Fepc2076990; Mon, 9 Jun 2014 15:40:51 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59Feomv076985; Mon, 9 Jun 2014 15:40:50 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201406091540.s59Feomv076985@svn.freebsd.org> From: "Vanilla I. Shu" Date: Mon, 9 Jun 2014 15:40:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357175 - in head/net/linuxigd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jun 2014 15:40:51 -0000 Author: vanilla Date: Mon Jun 9 15:40:50 2014 New Revision: 357175 URL: http://svnweb.freebsd.org/changeset/ports/357175 QAT: https://qat.redports.org/buildarchive/r357175/ Log: 1: Stagify. 2: convert to new format of LIB_DEPENDS 3: add @sample to pkg-plist. Modified: head/net/linuxigd/Makefile head/net/linuxigd/files/patch-Makefile head/net/linuxigd/pkg-plist Modified: head/net/linuxigd/Makefile ============================================================================== --- head/net/linuxigd/Makefile Mon Jun 9 15:38:18 2014 (r357174) +++ head/net/linuxigd/Makefile Mon Jun 9 15:40:50 2014 (r357175) @@ -10,15 +10,12 @@ MASTER_SITES= SF/linux-igd/linux-igd/${P MAINTAINER= ports@FreeBSD.org COMMENT= Linux UPnP Internet Gateway Device -LIB_DEPENDS= upnp.9:${PORTSDIR}/devel/upnp +LIB_DEPENDS= libupnp.so:${PORTSDIR}/devel/upnp USE_RC_SUBR= linuxigd USES= gmake MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} -MAN8= upnpd.8 - -NO_STAGE= yes post-extract: @${RM} ${WRKSRC}/iptc.? Modified: head/net/linuxigd/files/patch-Makefile ============================================================================== --- head/net/linuxigd/files/patch-Makefile Mon Jun 9 15:38:18 2014 (r357174) +++ head/net/linuxigd/files/patch-Makefile Mon Jun 9 15:40:50 2014 (r357175) @@ -1,5 +1,5 @@ ---- Makefile.orig Sun Jun 17 00:17:05 2007 -+++ Makefile Sun Jun 17 00:18:25 2007 +--- Makefile.orig 2006-05-24 06:16:36.000000000 +0800 ++++ Makefile 2014-06-09 23:38:21.146264899 +0800 @@ -1,25 +1,11 @@ -PREFIX=/usr -LIBUPNP_PREFIX=/usr @@ -28,7 +28,7 @@ all: upnpd upnpd: $(FILES) -@@ -33,11 +19,12 @@ +@@ -33,11 +19,11 @@ clean: rm -f *.o upnpd install: upnpd @@ -40,12 +40,11 @@ - install upnpd $(PREFIX)/sbin - install upnpd.8 $(PREFIX)/share/man/man8 - if [ ! -f /etc/upnpd.conf ]; then install etc/upnpd.conf /etc; fi -+ install -d $(PREFIX)/etc/linuxigd -+ $(BSD_INSTALL_DATA) etc/gatedesc.xml $(PREFIX)/etc/linuxigd -+ $(BSD_INSTALL_DATA) etc/gateconnSCPD.xml $(PREFIX)/etc/linuxigd -+ $(BSD_INSTALL_DATA) etc/gateicfgSCPD.xml $(PREFIX)/etc/linuxigd -+ $(BSD_INSTALL_DATA) etc/dummy.xml $(PREFIX)/etc/linuxigd -+ $(BSD_INSTALL_PROGRAM) upnpd $(PREFIX)/sbin -+ $(BSD_INSTALL_DATA) upnpd.8 $(PREFIX)/man/man8 -+ $(BSD_INSTALL_DATA) etc/upnpd.conf $(PREFIX)/etc/upnpd.conf.sample -+ if [ ! -f $(PREFIX)/etc/upnpd.conf ]; then $(BSD_INSTALL_DATA) $(PREFIX)/etc/upnpd.conf.sample $(PREFIX)/etc/upnpd.conf; fi ++ install -d $(DESTDIR)$(PREFIX)/etc/linuxigd ++ $(BSD_INSTALL_DATA) etc/gatedesc.xml $(DESTDIR)$(PREFIX)/etc/linuxigd ++ $(BSD_INSTALL_DATA) etc/gateconnSCPD.xml $(DESTDIR)$(PREFIX)/etc/linuxigd ++ $(BSD_INSTALL_DATA) etc/gateicfgSCPD.xml $(DESTDIR)$(PREFIX)/etc/linuxigd ++ $(BSD_INSTALL_DATA) etc/dummy.xml $(DESTDIR)$(PREFIX)/etc/linuxigd ++ $(BSD_INSTALL_PROGRAM) upnpd $(DESTDIR)$(PREFIX)/sbin ++ $(BSD_INSTALL_DATA) upnpd.8 $(DESTDIR)$(PREFIX)/man/man8 ++ $(BSD_INSTALL_DATA) etc/upnpd.conf $(DESTDIR)$(PREFIX)/etc/upnpd.conf.sample Modified: head/net/linuxigd/pkg-plist ============================================================================== --- head/net/linuxigd/pkg-plist Mon Jun 9 15:38:18 2014 (r357174) +++ head/net/linuxigd/pkg-plist Mon Jun 9 15:40:50 2014 (r357175) @@ -1,9 +1,8 @@ -sbin/upnpd etc/linuxigd/dummy.xml etc/linuxigd/gateconnSCPD.xml etc/linuxigd/gatedesc.xml etc/linuxigd/gateicfgSCPD.xml -@unexec if cmp -s %D/etc/upnpd.conf.sample %D/etc/upnpd.conf; then rm -f %D/etc/upnpd.conf; fi -etc/upnpd.conf.sample -@exec if [ ! -f %D/etc/upnpd.conf ]; then cp %D/etc/upnpd.conf.sample %D/etc/upnpd.conf; fi +@sample etc/upnpd.conf.sample +man/man8/upnpd.8.gz +sbin/upnpd @dirrm etc/linuxigd