svn commit: r356320 - in head/graphics/libimg: . files

[Pietro Cerutti]

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 at 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} $@