svn commit: r339982 - in head: audio/napster audio/napster/files russian/napster

[Antoine Brodin]

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 at 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 <bsd.port.options.mk>
+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 <bsd.port.mk>

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