From owner-svn-ports-all@FreeBSD.ORG  Tue Jun  3 10:45:19 2014
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 8DE52E96;
 Tue,  3 Jun 2014 10:45:19 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6234C29AF;
 Tue,  3 Jun 2014 10:45:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53AjJZP098685;
 Tue, 3 Jun 2014 10:45:19 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53AjJQX098682;
 Tue, 3 Jun 2014 10:45:19 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201406031045.s53AjJQX098682@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 3 Jun 2014 10:45:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356320 - in head/graphics/libimg: . files
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.18
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: Tue, 03 Jun 2014 10:45:19 -0000

Author: gahr
Date: Tue Jun  3 10:45:18 2014
New Revision: 356320
URL: http://svnweb.freebsd.org/changeset/ports/356320
QAT: https://qat.redports.org/buildarchive/r356320/

Log:
  - Convert to new LIB_DEPENDS format
  - STAGE-clean

Modified:
  head/graphics/libimg/Makefile
  head/graphics/libimg/files/Makefile.bsd

Modified: head/graphics/libimg/Makefile
==============================================================================
--- head/graphics/libimg/Makefile	Tue Jun  3 10:38:43 2014	(r356319)
+++ head/graphics/libimg/Makefile	Tue Jun  3 10:45:18 2014	(r356320)
@@ -11,9 +11,9 @@ DISTNAME=	img${PORTVERSION}
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	A library of image format handlers for Tk4.1 and later
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
 DIR=		lib/Img1.2
 
@@ -28,7 +28,6 @@ MAKEFILE=	${FILESDIR}/Makefile.bsd
 USES=		tk
 MAKE_ENV+=	TCL_VER=${TCL_VER}
 
-NO_STAGE=	yes
 # We don't need the bundled libraries:
 EXTRACT_AFTER_ARGS=	--exclude '*/libz/*' \
 		--exclude '*/compat/*' --exclude '*/libtiff/*' \
@@ -41,11 +40,9 @@ MAKE_ARGS=	PORTVERSION="${PORTVERSION}" 
 
 USE_LDCONFIG=	yes
 
-.if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.pre.mk>
 

Modified: head/graphics/libimg/files/Makefile.bsd
==============================================================================
--- head/graphics/libimg/files/Makefile.bsd	Tue Jun  3 10:38:43 2014	(r356319)
+++ head/graphics/libimg/files/Makefile.bsd	Tue Jun  3 10:45:18 2014	(r356320)
@@ -41,8 +41,8 @@ pkgIndex.tcl: pkgIndex.tcl.in
 		< pkgIndex.tcl.in > pkgIndex.tcl
 
 DIR?		= lib/Img1.2
-INSTDIR		= ${LOCALBASE}/${DIR}
-LIBDIR		= ${LOCALBASE}/lib
+INSTDIR		= ${DESTDIR}${PREFIX}/${DIR}
+LIBDIR		= ${PREFIX}/lib
 
 ${INSTDIR} ${INSTDIR}/msgs:
 	${MKDIR} $@