Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Dec 2013 02:46:49 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337225 - in head/graphics: libwmf libwmf-nox11
Message-ID:  <201312230246.rBN2knUi052133@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Dec 23 02:46:49 2013
New Revision: 337225
URL: http://svnweb.freebsd.org/changeset/ports/337225

Log:
  - Support staging
  - Use new LIB_DEPENDS syntax

Modified:
  head/graphics/libwmf-nox11/Makefile
  head/graphics/libwmf/Makefile

Modified: head/graphics/libwmf-nox11/Makefile
==============================================================================
--- head/graphics/libwmf-nox11/Makefile	Sun Dec 22 23:11:53 2013	(r337224)
+++ head/graphics/libwmf-nox11/Makefile	Mon Dec 23 02:46:49 2013	(r337225)
@@ -7,5 +7,4 @@ MASTERDIR=	${.CURDIR}/../libwmf
 OPTIONS_EXCLUDE=	X11
 OPTIONS_FILE_UNSET=	X11
 
-NO_STAGE=	yes
 .include        "${MASTERDIR}/Makefile"

Modified: head/graphics/libwmf/Makefile
==============================================================================
--- head/graphics/libwmf/Makefile	Sun Dec 22 23:11:53 2013	(r337224)
+++ head/graphics/libwmf/Makefile	Mon Dec 23 02:46:49 2013	(r337225)
@@ -13,9 +13,9 @@ COMMENT=	Tools and library for convertin
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	libxml2
@@ -28,9 +28,8 @@ USE_LDCONFIG=	yes
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=	X11
+OPTIONS_DEFAULT=X11
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
@@ -55,10 +54,10 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \
-		${TAR} -C ${DOCSDIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGROUP} ${DOCSDIR}
+		${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGROUP} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>



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