From owner-svn-ports-all@FreeBSD.ORG  Mon Dec 23 02:46:50 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 88D2666B;
 Mon, 23 Dec 2013 02:46:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5B3661E8A;
 Mon, 23 Dec 2013 02:46:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBN2koVN052135;
 Mon, 23 Dec 2013 02:46:50 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBN2knUi052133;
 Mon, 23 Dec 2013 02:46:49 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201312230246.rBN2knUi052133@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 23 Dec 2013 02:46:49 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Dec 2013 02:46:50 -0000

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>