Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jan 2014 08:59:44 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339211 - head/x11-toolkits/tkshape
Message-ID:  <201401090859.s098xixq038213@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Thu Jan  9 08:59:44 2014
New Revision: 339211
URL: http://svnweb.freebsd.org/changeset/ports/339211

Log:
  - Convert to USES=tk
  - Convert to USES=gmake
  - STAGE-clean
  
  MFH:		2014Q1

Modified:
  head/x11-toolkits/tkshape/Makefile
  head/x11-toolkits/tkshape/pkg-plist   (contents, props changed)

Modified: head/x11-toolkits/tkshape/Makefile
==============================================================================
--- head/x11-toolkits/tkshape/Makefile	Thu Jan  9 08:55:21 2014	(r339210)
+++ head/x11-toolkits/tkshape/Makefile	Thu Jan  9 08:59:44 2014	(r339211)
@@ -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
 

Modified: head/x11-toolkits/tkshape/pkg-plist
==============================================================================
--- head/x11-toolkits/tkshape/pkg-plist	Thu Jan  9 08:55:21 2014	(r339210)
+++ head/x11-toolkits/tkshape/pkg-plist	Thu Jan  9 08:59:44 2014	(r339211)
@@ -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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401090859.s098xixq038213>