- Convert to USES+=tk

- STAGE-clean
- Bring PLIST into Makefile

2 files changed, 11 insertions, 11 deletions

diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile
index 05d21a8cb465..79889c01eb40 100644
--- a/graphics/tkpng/Makefile
+++ b/graphics/tkpng/Makefile
@@ -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>
diff --git a/graphics/tkpng/pkg-plist b/graphics/tkpng/pkg-plist
deleted file mode 100644
index bac026bb8c96..000000000000
--- a/graphics/tkpng/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/%%TKPKG%%/lib%%TKPKG%%.so
-lib/%%TKPKG%%/pkgIndex.tcl
-@dirrm lib/%%TKPKG%%