From owner-svn-ports-head@FreeBSD.ORG  Tue Feb 18 19:14:53 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7EF917C3;
 Tue, 18 Feb 2014 19:14:53 +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 4F5C518D5;
 Tue, 18 Feb 2014 19:14:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1IJEr02003005;
 Tue, 18 Feb 2014 19:14:53 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1IJEr6h003004;
 Tue, 18 Feb 2014 19:14:53 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201402181914.s1IJEr6h003004@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 18 Feb 2014 19:14:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344943 - head/graphics/py-imaging
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Feb 2014 19:14:53 -0000

Author: antoine
Date: Tue Feb 18 19:14:52 2014
New Revision: 344943
URL: http://svnweb.freebsd.org/changeset/ports/344943
QAT: https://qat.redports.org/buildarchive/r344943/

Log:
  - Stage support
  - New LIB_DEPENDS syntax
  - OPTIONS helpers
  - Use PYDISTUTILS_AUTOPLIST

Deleted:
  head/graphics/py-imaging/pkg-plist
Modified:
  head/graphics/py-imaging/Makefile

Modified: head/graphics/py-imaging/Makefile
==============================================================================
--- head/graphics/py-imaging/Makefile	Tue Feb 18 18:57:36 2014	(r344942)
+++ head/graphics/py-imaging/Makefile	Tue Feb 18 19:14:52 2014	(r344943)
@@ -13,38 +13,33 @@ DISTNAME=	Imaging-${PORTVERSION}
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	The Python Imaging Library
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		lcms.1:${PORTSDIR}/graphics/lcms \
-		freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		liblcms.so:${PORTSDIR}/graphics/lcms \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
 UNIQUENAME=	py-${PORTNAME}
 
 DIST_SUBDIR=	python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	PIL
-PYDISTUTILS_EGGINFODIR=	${PYTHON_SITELIBDIR}/PIL
+PYDISTUTILS_AUTOPLIST=	yes
 
+PLIST_FILES=	%%PYTHON_INCLUDEDIR%%/ImPlatform.h %%PYTHON_INCLUDEDIR%%/Imaging.h
 PORTDOCS=	*
+PORTEXAMPLES=	*
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
-OPTIONS_DEFINE=	TKINTER
+OPTIONS_DEFINE=	DOCS TKINTER
 TKINTER_DESC=	tkinter for X support
 
 OPTIONS_DEFAULT=	TKINTER
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+TKINTER_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
+TKINTER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
 
-.if ${PORT_OPTIONS:MTKINTER}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
-PLIST_SUB+=	TKINTER=""
-.else
-PLIST_SUB+=	TKINTER="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MTKINTER}
 post-patch:
@@ -53,13 +48,12 @@ post-patch:
 
 post-install:
 .for file in ImPlatform.h Imaging.h
-	${INSTALL_DATA} ${WRKSRC}/libImaging/${file} ${PYTHON_INCLUDEDIR}
+	@${MKDIR} ${STAGEDIR}${PYTHON_INCLUDEDIR}
+	${INSTALL_DATA} ${WRKSRC}/libImaging/${file} ${STAGEDIR}${PYTHON_INCLUDEDIR}
 .endfor
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/Scripts/* ${EXAMPLESDIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Docs/* ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/Scripts/* ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Docs/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>