From owner-svn-ports-all@FreeBSD.ORG  Fri Oct 18 14:03:12 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTP id 4763EAC5;
 Fri, 18 Oct 2013 14:03:12 +0000 (UTC)
 (envelope-from gahr@FreeBSD.org)
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 35CC523E0;
 Fri, 18 Oct 2013 14:03:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IE3CHt086255;
 Fri, 18 Oct 2013 14:03:12 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IE3CIN086254;
 Fri, 18 Oct 2013 14:03:12 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201310181403.r9IE3CIN086254@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Fri, 18 Oct 2013 14:03:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330747 - head/graphics/tkpng
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.14
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: Fri, 18 Oct 2013 14:03:12 -0000

Author: gahr
Date: Fri Oct 18 14:03:11 2013
New Revision: 330747
URL: http://svnweb.freebsd.org/changeset/ports/330747

Log:
  - Convert to USES+=tk
  - STAGE-clean
  - Bring PLIST into Makefile

Deleted:
  head/graphics/tkpng/pkg-plist
Modified:
  head/graphics/tkpng/Makefile   (contents, props changed)

Modified: head/graphics/tkpng/Makefile
==============================================================================
--- head/graphics/tkpng/Makefile	Fri Oct 18 14:00:34 2013	(r330746)
+++ head/graphics/tkpng/Makefile	Fri Oct 18 14:03:11 2013	(r330747)
@@ -15,18 +15,21 @@ COMMENT=	PNG support for Tcl/Tk
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/license.terms
 
-USE_TK=		84+
+USES+=		tk
 GNU_CONFIGURE=	yes
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR} \
-		--with-tclinclude=${TCL_INCLUDEDIR}/generic \
-		--with-tkinclude=${TK_INCLUDEDIR}/generic \
-		--exec-prefix=${PREFIX} --enable-shared
-CPPFLAGS+=	-I${TK_INCLUDEDIR}/generic -I${LOCALBASE}/include
+		--with-tclinclude=${TCL_INCLUDEDIR} \
+		--with-tkinclude=${TK_INCLUDEDIR} \
+		--exec-prefix=${PREFIX} \
+		--enable-shared
+
 TKPKG=		${PORTNAME}${PORTVERSION}
 PLIST_SUB=	VER=${PORTVERSION} TKPKG=${TKPKG} TKLIBVER=${TKLIBVER}
 
-.include <bsd.port.post.mk>
+PLIST_FILES=	lib/${TKPKG}/lib${TKPKG}.so \
+		lib/${TKPKG}/pkgIndex.tcl
+PLIST_DIRS=	lib/${TKPKG}
+
+.include <bsd.port.mk>