Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Oct 2013 22:06:44 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329633 - head/ftp/ftpcopy
Message-ID:  <201310062206.r96M6iPY035401@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Sun Oct  6 22:06:43 2013
New Revision: 329633
URL: http://svnweb.freebsd.org/changeset/ports/329633

Log:
  Support staging; cleanup !NOPORTDOCS -> PORT_OPTIONS:MDOCS

Modified:
  head/ftp/ftpcopy/Makefile
  head/ftp/ftpcopy/pkg-plist   (contents, props changed)

Modified: head/ftp/ftpcopy/Makefile
==============================================================================
--- head/ftp/ftpcopy/Makefile	Sun Oct  6 21:56:53 2013	(r329632)
+++ head/ftp/ftpcopy/Makefile	Sun Oct  6 22:06:43 2013	(r329633)
@@ -14,9 +14,8 @@ USE_PERL5=	build
 
 WRKSRC=		${WRKDIR}/web/${DISTNAME}
 
-MAN1=		ftpcopy.1 ftpcp.1 ftpls.1
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 pre-build:
 	${ECHO} "${CC}" >${WRKSRC}/src/conf-cc
 	${ECHO} "${CPPFLAGS} ${CFLAGS}" >${WRKSRC}/src/conf-cflags
@@ -24,14 +23,14 @@ pre-build:
 
 do-install:
 	cd ${WRKSRC}/compile && \
-		${INSTALL_PROGRAM} ftpcopy ftpls ${PREFIX}/bin && \
-		${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1 && \
-		${INSTALL_SCRIPT} ftpcp ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} && \
+		${INSTALL_PROGRAM} ftpcopy ftpls ${STAGEDIR}${PREFIX}/bin && \
+		${INSTALL_MAN} *.1 ${STAGEDIR}${PREFIX}/man/man1 && \
+		${INSTALL_SCRIPT} ftpcp ${STAGEDIR}${PREFIX}/bin
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR} && \
 	cd ${WRKSRC}/compile && \
 		${INSTALL_DATA} ChangeLog NEWS \
-			README THANKS ftpcopy.html ftpls.html ${DOCSDIR}
+			README THANKS ftpcopy.html ftpls.html ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/ftp/ftpcopy/pkg-plist
==============================================================================
--- head/ftp/ftpcopy/pkg-plist	Sun Oct  6 21:56:53 2013	(r329632)
+++ head/ftp/ftpcopy/pkg-plist	Sun Oct  6 22:06:43 2013	(r329633)
@@ -1,6 +1,9 @@
 bin/ftpcp
 bin/ftpcopy
 bin/ftpls
+man/man1/ftpcopy.1.gz
+man/man1/ftpcp.1.gz
+man/man1/ftpls.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310062206.r96M6iPY035401>