From 1c3ce7614302ca19df8f98c40e2007477027e53a Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 9 Jan 2014 08:59:44 +0000
Subject: [PATCH] - Convert to USES=tk - Convert to USES=gmake - STAGE-clean

MFH:		2014Q1
---
 x11-toolkits/tkshape/Makefile  | 15 +++++++--------
 x11-toolkits/tkshape/pkg-plist |  3 +++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/x11-toolkits/tkshape/Makefile b/x11-toolkits/tkshape/Makefile
index b32223cb50d5..6284c3e30acb 100644
--- a/x11-toolkits/tkshape/Makefile
+++ b/x11-toolkits/tkshape/Makefile
@@ -12,7 +12,7 @@ DISTNAME=		shape${PORTVERSION:S/.//g}
 MAINTAINER=		nivit@FreeBSD.org
 COMMENT=		A Tk library to access to X Shaped Window Extension
 
-USE_TK=			yes
+USES=			gmake tk:85+
 
 USE_XORG=		x11 xext
 
@@ -24,17 +24,16 @@ OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 MANPAGES_DESC=	Install manual pages
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
-MAN3=			CombShape.3 QuryShape.3
-MANN=			shape.n
+PLIST_SUB+=		MAN=""
+.else
+PLIST_SUB+=		MAN="@comment "
 .endif
 
 WRKSRC=			${WRKDIR}/${PORTNAME:C/^tk//1}${PORTVERSION}
 
-USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-tclconf=${TCL_LIBDIR} \
 			--with-tkconf=${TK_LIBDIR}
@@ -60,8 +59,8 @@ FIND_IMAGES=		demos/images -type f \
 			-and \( -name "*.gif" -or -name "*.xbm" \
 			-or -name "*.cur" \)
 
-TARGET_DIR=		${PREFIX}/lib/${PORTNAME}
-MANPAGES=		${MAN3} ${MANN}
+TARGET_DIR=		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+MANPAGES=		CombShape.3 QuryShape.3 shape.n
 
 do-install:
 # script, library
@@ -87,7 +86,7 @@ do-install:
 	cd ${WRKSRC}; \
 	for m in ${MANPAGES} ; do \
 	    s=$${m##*.}; \
-	    ${INSTALL_MAN} doc/$${m} ${MANPREFIX}/man/man$${s}/$${m}; \
+	    ${INSTALL_MAN} doc/$${m} ${STAGEDIR}${PREFIX}/man/man$${s}/$${m}; \
 	done;
 .endif
 
diff --git a/x11-toolkits/tkshape/pkg-plist b/x11-toolkits/tkshape/pkg-plist
index 51de76df6f54..02c1b43a4435 100644
--- a/x11-toolkits/tkshape/pkg-plist
+++ b/x11-toolkits/tkshape/pkg-plist
@@ -10,6 +10,9 @@ lib/%%PORTNAME%%/demos/images/none.cur
 lib/%%PORTNAME%%/demos/images/ptr-green.gif
 lib/%%PORTNAME%%/demos/images/ptr-mask.xbm
 lib/%%PORTNAME%%/demos/images/ptr-red.gif
+%%MAN%%man/man3/CombShape.3.gz
+%%MAN%%man/man3/QuryShape.3.gz
+%%MAN%%man/mann/shape.n.gz
 @dirrm lib/%%PORTNAME%%/demos/images
 @dirrm lib/%%PORTNAME%%/demos
 @dirrm lib/%%PORTNAME%%