Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Apr 2014 16:25:12 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352523 - head/graphics/pyro
Message-ID:  <201404281625.s3SGPC8o024422@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Mon Apr 28 16:25:12 2014
New Revision: 352523
URL: http://svnweb.freebsd.org/changeset/ports/352523
QAT: https://qat.redports.org/buildarchive/r352523/

Log:
  - Add staging support
  - Remove leading article from COMMENT
  - Convert to new LIB_DEPENDS format, options framework

Modified:
  head/graphics/pyro/Makefile

Modified: head/graphics/pyro/Makefile
==============================================================================
--- head/graphics/pyro/Makefile	Mon Apr 28 16:22:49 2014	(r352522)
+++ head/graphics/pyro/Makefile	Mon Apr 28 16:25:12 2014	(r352523)
@@ -9,9 +9,9 @@ MASTER_SITES=	http://nostatic.org/pyro/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A simple OpenGL-based firework simulator
+COMMENT=	Simple OpenGL-based firework simulator
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 
 USE_GL=		gl glut
 USE_XORG=	xi xmu xext
@@ -21,7 +21,8 @@ PLIST_FILES=	bin/pyro ${EXAMPLES:S|^|%%E
 PLIST_DIRS=	%%EXAMPLESDIR%%
 PORTDOCS=	README
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' ${WRKSRC}/*.c
 
@@ -31,14 +32,10 @@ do-build:
 		-L${LOCALBASE}/lib -ljpeg -lm -lXmu -lXi -lXext -lGL -lGLU -lglut
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${EXAMPLESDIR}
-
-.ifndef (NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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