Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Jan 2014 03:34:13 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341800 - head/www/analog
Message-ID:  <201401300334.s0U3YDRe099564@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Thu Jan 30 03:34:12 2014
New Revision: 341800
URL: http://svnweb.freebsd.org/changeset/ports/341800
QAT: https://qat.redports.org/buildarchive/r341800/

Log:
  - Stage support

Modified:
  head/www/analog/Makefile
  head/www/analog/pkg-plist

Modified: head/www/analog/Makefile
==============================================================================
--- head/www/analog/Makefile	Thu Jan 30 03:13:00 2014	(r341799)
+++ head/www/analog/Makefile	Thu Jan 30 03:34:12 2014	(r341800)
@@ -27,41 +27,34 @@ ALL_TARGET=	${PORTNAME}
 
 SUB_FILES=	pkg-message
 
-MAN1=		analog.1
-
 LIMGDIR?=	www/data/images
 IMGDIR=		${PREFIX}/${LIMGDIR}
 PLIST_SUB=	IMGDIR="${LIMGDIR}"
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/analog.man ${MANPREFIX}/man/man1/analog.1
-	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg-dist
-	@${MKDIR} ${DATADIR}/lang
-	${INSTALL_DATA} ${WRKSRC}/lang/* ${DATADIR}/lang
-	@${MKDIR} ${IMGDIR}
-	${INSTALL_DATA} ${WRKSRC}/images/* ${IMGDIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/anlgform.html ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/anlgform.pl ${EXAMPLESDIR}
-	@${MKDIR} ${EXAMPLESDIR}/css
-	${INSTALL_DATA} ${WRKSRC}/examples/css/Readme.txt ${EXAMPLESDIR}/css
-	${INSTALL_DATA} ${WRKSRC}/examples/css/default.css ${EXAMPLESDIR}/css
-	@${MKDIR} ${EXAMPLESDIR}/css/jreeves
-	${INSTALL_DATA} ${WRKSRC}/examples/css/jreeves/* ${EXAMPLESDIR}/css/jreeves
-.endif
-.if !exists(${PREFIX}/etc/analog.cfg)
-	@cd ${PREFIX}/etc && ${CP} -f analog.cfg-dist analog.cfg
+	${INSTALL_PROGRAM} ${WRKSRC}/analog ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/analog.man ${STAGEDIR}${MANPREFIX}/man/man1/analog.1
+	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${STAGEDIR}${PREFIX}/etc/analog.cfg-dist
+	${MKDIR} ${STAGEDIR}${DATADIR}/lang
+	${INSTALL_DATA} ${WRKSRC}/lang/* ${STAGEDIR}${DATADIR}/lang
+	${MKDIR} ${STAGEDIR}${IMGDIR}
+	${INSTALL_DATA} ${WRKSRC}/images/* ${STAGEDIR}${IMGDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/anlgform.html ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/anlgform.pl ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/css
+	${INSTALL_DATA} ${WRKSRC}/examples/css/Readme.txt ${STAGEDIR}${EXAMPLESDIR}/css
+	${INSTALL_DATA} ${WRKSRC}/examples/css/default.css ${STAGEDIR}${EXAMPLESDIR}/css
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/css/jreeves
+	${INSTALL_DATA} ${WRKSRC}/examples/css/jreeves/* ${STAGEDIR}${EXAMPLESDIR}/css/jreeves
+
+.if !exists(${STAGEDIR}${PREFIX}/etc/analog.cfg)
+	@cd ${STAGEDIR}${PREFIX}/etc && ${CP} -f analog.cfg-dist analog.cfg
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Modified: head/www/analog/pkg-plist
==============================================================================
--- head/www/analog/pkg-plist	Thu Jan 30 03:13:00 2014	(r341799)
+++ head/www/analog/pkg-plist	Thu Jan 30 03:34:12 2014	(r341800)
@@ -387,6 +387,7 @@ etc/analog.cfg-dist
 %%IMGDIR%%/sq8.png
 %%IMGDIR%%/sq9.png
 %%IMGDIR%%/sqg.png
+man/man1/analog.1.gz
 @dirrmtry %%IMGDIR%%
 @dirrmtry www/data
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/css/jreeves



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