From owner-svn-ports-head@FreeBSD.ORG Fri Jan 17 10:23:29 2014 Return-Path: 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 21E5DF08; Fri, 17 Jan 2014 10:23:29 +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 0DCE713DA; Fri, 17 Jan 2014 10:23:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HANS6f016831; Fri, 17 Jan 2014 10:23:28 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HANSTV016824; Fri, 17 Jan 2014 10:23:28 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401171023.s0HANSTV016824@svn.freebsd.org> From: Pietro Cerutti Date: Fri, 17 Jan 2014 10:23:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340024 - in head/net-im/tkabber: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2014 10:23:29 -0000 Author: gahr Date: Fri Jan 17 10:23:28 2014 New Revision: 340024 URL: http://svnweb.freebsd.org/changeset/ports/340024 QAT: https://qat.redports.org/buildarchive/r340024/ Log: - Convert to USES=tk - Convert to OPTIONSng - STAGE-clean Modified: head/net-im/tkabber/Makefile (contents, props changed) head/net-im/tkabber/files/patch-Makefile (contents, props changed) head/net-im/tkabber/files/patch-tkabber.tcl (contents, props changed) Modified: head/net-im/tkabber/Makefile ============================================================================== --- head/net-im/tkabber/Makefile Fri Jan 17 10:15:47 2014 (r340023) +++ head/net-im/tkabber/Makefile Fri Jan 17 10:23:28 2014 (r340024) @@ -9,37 +9,44 @@ MASTER_SITES= http://files.jabber.ru/tka MAINTAINER= c.kworr@gmail.com COMMENT= Tcl/Tk based jabber client -RUN_DEPENDS= wish8.5:${PORTSDIR}/x11-toolkits/tk85 \ - dtplite:${PORTSDIR}/devel/tcllib \ +RUN_DEPENDS= dtplite:${PORTSDIR}/devel/tcllib \ ${LOCALBASE}/lib/tls/pkgIndex.tcl:${PORTSDIR}/devel/tcltls \ ${LOCALBASE}/lib/bwidget/pkgIndex.tcl:${PORTSDIR}/x11-toolkits/bwidget +OPTIONS_DEFINE= DOCS EXAMPLES + CONFLICTS= tkabber-devel-* +USES= tk:85 WRKSRC= ${WRKDIR}/${DISTNAME} NO_BUILD= yes SUBDIRS= contrib doc emoticons examples ifacetk jabberlib mclistbox \ msgs pixmaps plugins sounds tclxml trans -NO_STAGE= yes +.include + +post-patch: + ${REINPLACE_CMD} -e 's|%%WISH%%|${WISH}|g' \ + ${WRKSRC}/Makefile ${WRKSRC}/tkabber.tcl + do-install: - ${ECHO} -e "#!/bin/sh\nexec wish8.5 ${DATADIR}/tkabber.tcl \ - -name tkabber \"\$$@\"\n" > ${PREFIX}/bin/tkabber - ${CHMOD} +x ${PREFIX}/bin/tkabber - ${MKDIR} ${DATADIR} - ${CP} ${WRKSRC}/*.tcl ${DATADIR} + ${ECHO} -e "#!/bin/sh\nexec ${WISH} ${DATADIR}/tkabber.tcl \ + -name tkabber \"\$$@\"\n" > ${STAGEDIR}${PREFIX}/bin/tkabber + ${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/tkabber + ${MKDIR} ${STAGEDIR}${DATADIR} + ${CP} ${WRKSRC}/*.tcl ${STAGEDIR}${DATADIR} .for i in ${SUBDIRS} - ${CP} -R ${WRKSRC}/${i} ${DATADIR} + ${CP} -R ${WRKSRC}/${i} ${STAGEDIR}${DATADIR} .endfor -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - ${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR} +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR} .endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in tkabber.html tkabber.xml - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/net-im/tkabber/files/patch-Makefile ============================================================================== --- head/net-im/tkabber/files/patch-Makefile Fri Jan 17 10:15:47 2014 (r340023) +++ head/net-im/tkabber/files/patch-Makefile Fri Jan 17 10:23:28 2014 (r340024) @@ -5,7 +5,7 @@ cp -r *.tcl $(SUBDIRS) $(DESTDIR)/$(TKABBERDIR) mkdir -p $(DESTDIR)/$(BINDIR) - echo -e "#!/bin/sh\nexec wish $(TKABBERDIR)/tkabber.tcl -name tkabber \"\$$@\"\n" \ -+ echo -e "#!/bin/sh\nexec wish8.5 $(PREFIX)/share/tkabber/tkabber.tcl -name tkabber \"\$$@\"\n" > $(DESTDIR)/$(PREFIX)/bin/tkabber ++ echo -e "#!/bin/sh\nexec %%WISH%% $(PREFIX)/share/tkabber/tkabber.tcl -name tkabber \"\$$@\"\n" > $(DESTDIR)/$(PREFIX)/bin/tkabber >$(DESTDIR)/$(BINDIR)/tkabber chmod 755 $(DESTDIR)/$(BINDIR)/tkabber Modified: head/net-im/tkabber/files/patch-tkabber.tcl ============================================================================== --- head/net-im/tkabber/files/patch-tkabber.tcl Fri Jan 17 10:15:47 2014 (r340023) +++ head/net-im/tkabber/files/patch-tkabber.tcl Fri Jan 17 10:23:28 2014 (r340024) @@ -4,7 +4,7 @@ #!/bin/sh # the next line restarts using the correct interpreter \ -exec wish "$0" -name tkabber "$@" -+exec wish8.4 "$0" -name tkabber "$@" ++exec %%WISH%% "$0" -name tkabber "$@" # $Id: tkabber.tcl,v 1.236 2006/06/08 20:21:44 aleksey Exp $