From owner-svn-ports-head@FreeBSD.ORG Thu Jan 16 20:40:18 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9003BF21; Thu, 16 Jan 2014 20:40:18 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 70DD8168D; Thu, 16 Jan 2014 20:40:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GKeIDt088271; Thu, 16 Jan 2014 20:40:18 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GKeHQE088262; Thu, 16 Jan 2014 20:40:17 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401162040.s0GKeHQE088262@svn.freebsd.org> From: Antoine Brodin Date: Thu, 16 Jan 2014 20:40:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339982 - in head: audio/napster audio/napster/files russian/napster X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 20:40:18 -0000 Author: antoine Date: Thu Jan 16 20:40:17 2014 New Revision: 339982 URL: http://svnweb.freebsd.org/changeset/ports/339982 QAT: https://qat.redports.org/buildarchive/r339982/ Log: Stage support Modified: head/audio/napster/Makefile head/audio/napster/files/patch-doc::Makefile.in head/audio/napster/pkg-plist head/russian/napster/Makefile Modified: head/audio/napster/Makefile ============================================================================== --- head/audio/napster/Makefile Thu Jan 16 20:37:09 2014 (r339981) +++ head/audio/napster/Makefile Thu Jan 16 20:40:17 2014 (r339982) @@ -7,23 +7,18 @@ CATEGORIES+= audio net MASTER_SITES= SF/nap/nap/${PORTVERSION} MAINTAINER?= ports@FreeBSD.org -COMMENT?= An MP3 sharing, search, and chat client for the OpenNAP network +COMMENT?= MP3 sharing, search, and chat client for the OpenNAP network CONFLICTS?= ru-nap-* GNU_CONFIGURE= yes -NO_STAGE= yes -MAN1= nap.1 - -.include +OPTIONS_DEFINE= DOCS post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in NEWS README doc/napster.txt doc/userguide.html - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Modified: head/audio/napster/files/patch-doc::Makefile.in ============================================================================== --- head/audio/napster/files/patch-doc::Makefile.in Thu Jan 16 20:37:09 2014 (r339981) +++ head/audio/napster/files/patch-doc::Makefile.in Thu Jan 16 20:40:17 2014 (r339982) @@ -9,19 +9,3 @@ man_MANS = nap.1 html_DATA = userguide.html all: all-am -@@ -208,6 +208,7 @@ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ - done - install-htmlDATA: $(html_DATA) -+.ifndef(NOPORTDOCS) - @$(NORMAL_INSTALL) - $(mkdir_p) $(DESTDIR)$(htmldir) - @list='$(html_DATA)'; for p in $$list; do \ -@@ -216,6 +217,7 @@ - echo " $(htmlDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldir)/$$f"; \ - $(htmlDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldir)/$$f; \ - done -+.endif - - uninstall-htmlDATA: - @$(NORMAL_UNINSTALL) Modified: head/audio/napster/pkg-plist ============================================================================== --- head/audio/napster/pkg-plist Thu Jan 16 20:37:09 2014 (r339981) +++ head/audio/napster/pkg-plist Thu Jan 16 20:40:17 2014 (r339982) @@ -1,5 +1,6 @@ bin/nap bin/napping +man/man1/nap.1.gz %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/napster.txt Modified: head/russian/napster/Makefile ============================================================================== --- head/russian/napster/Makefile Thu Jan 16 20:37:09 2014 (r339981) +++ head/russian/napster/Makefile Thu Jan 16 20:40:17 2014 (r339982) @@ -13,7 +13,6 @@ CONFLICTS= nap-[0-9]* WITH_ENCODING_PATCH= yes -NO_STAGE= yes pre-configure: @${PATCH} ${PATCH_ARGS} < ${.CURDIR}/files/extra-win2koi