Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Apr 2014 11:05:31 +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: r352410 - head/graphics/fv
Message-ID:  <201404271105.s3RB5VCx093209@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sun Apr 27 11:05:30 2014
New Revision: 352410
URL: http://svnweb.freebsd.org/changeset/ports/352410
QAT: https://qat.redports.org/buildarchive/r352410/

Log:
  - Add staging support
  - Convert to new LIB_DEPENDS format, options framework, USES=gmake

Modified:
  head/graphics/fv/Makefile

Modified: head/graphics/fv/Makefile
==============================================================================
--- head/graphics/fv/Makefile	Sun Apr 27 09:51:17 2014	(r352409)
+++ head/graphics/fv/Makefile	Sun Apr 27 11:05:30 2014	(r352410)
@@ -13,11 +13,10 @@ COMMENT=	Viewer of hdr/pfm images
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-USES=		pkgconfig zip
+USES=		gmake pkgconfig zip
 USE_GL=		glut
-USE_GMAKE=	yes
 ALL_TARGET=	${PORTNAME}
 
 CXXFLAGS+=	$$(pkg-config --cflags libpng15) \
@@ -29,13 +28,11 @@ LDFLAGS+=	$$(pkg-config --libs libpng15)
 PORTDOCS=	AUTHORS ChangeLog README
 PLIST_FILES=	bin/${PORTNAME}
 
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DEBUG DOCS
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITH_DEBUG)
+.if ! ${PORT_OPTIONS:MDEBUG}
 CXXFLAGS+=	-DNDEBUG
 .endif
 
@@ -46,11 +43,8 @@ post-patch:
 		 s|^LDFLAGS=|LDFLAGS?=|' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${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?201404271105.s3RB5VCx093209>