Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Oct 2013 14:17:10 +0000 (UTC)
From:      Emanuel Haupt <ehaupt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r331587 - in head/graphics: fig2sxd metacam pecomato telak
Message-ID:  <201310251417.r9PEHAkR088696@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ehaupt
Date: Fri Oct 25 14:17:10 2013
New Revision: 331587
URL: http://svnweb.freebsd.org/changeset/ports/331587

Log:
  Support staging.

Modified:
  head/graphics/fig2sxd/Makefile
  head/graphics/metacam/Makefile
  head/graphics/pecomato/Makefile
  head/graphics/telak/Makefile

Modified: head/graphics/fig2sxd/Makefile
==============================================================================
--- head/graphics/fig2sxd/Makefile	Fri Oct 25 14:04:57 2013	(r331586)
+++ head/graphics/fig2sxd/Makefile	Fri Oct 25 14:17:10 2013	(r331587)
@@ -14,17 +14,15 @@ USES=		gmake
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAN1=		fig2sxd.1
-PLIST_FILES=	bin/fig2sxd
+PLIST_FILES=	bin/fig2sxd man/man1/fig2sxd.1.gz
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^CXX/d; s|^\(all:\).*|\1 $$(TARGET1) fig2sxd.1|' \
 			${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/graphics/metacam/Makefile
==============================================================================
--- head/graphics/metacam/Makefile	Fri Oct 25 14:04:57 2013	(r331586)
+++ head/graphics/metacam/Makefile	Fri Oct 25 14:17:10 2013	(r331587)
@@ -14,25 +14,24 @@ USES=		gmake
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
 
-PLIST_FILES=	bin/metacam
+PLIST_FILES=	bin/metacam man/man1/metacam.1.gz
 PORTDOCS=	README.canon README.casio
-MAN1=		metacam.1
 
 ALL_TARGET=	${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 

Modified: head/graphics/pecomato/Makefile
==============================================================================
--- head/graphics/pecomato/Makefile	Fri Oct 25 14:04:57 2013	(r331586)
+++ head/graphics/pecomato/Makefile	Fri Oct 25 14:17:10 2013	(r331587)
@@ -15,19 +15,18 @@ USE_PYTHON_BUILD=	yes
 
 MAKEFILE=	Makefile.unix
 
-MAN1=		pecomato.1
-PLIST_FILES=	bin/pecomato
+PLIST_FILES=	bin/pecomato man/man1/pecomato.1.gz
 
-NO_STAGE=	yes
 post-build:
 	${PYTHON} ${WRKSRC}/devtools/txt2tags.py --no-rc -t man \
-		-i ${WRKSRC}/doc/manpage.t2t -o ${WRKSRC}/doc/${MAN1}
+		-i ${WRKSRC}/doc/manpage.t2t -o ${WRKSRC}/doc/${PORTNAME}.1
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CC/d' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/graphics/telak/Makefile
==============================================================================
--- head/graphics/telak/Makefile	Fri Oct 25 14:04:57 2013	(r331586)
+++ head/graphics/telak/Makefile	Fri Oct 25 14:17:10 2013	(r331587)
@@ -21,13 +21,11 @@ USE_EFL=	imlib2
 
 ALL_TARGET=	${PORTNAME}
 
-PLIST_FILES=	bin/telak
-MAN1=		telak.1
+PLIST_FILES=	bin/telak man/man1/telak.1.gz
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 post-install:
 	@${CAT} ${PKGMESSAGE}



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