From owner-svn-ports-head@freebsd.org Wed Sep 30 18:21:14 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13414A0B8CE; Wed, 30 Sep 2015 18:21:14 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED1DF1D2A; Wed, 30 Sep 2015 18:21:13 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8UILDPu027030; Wed, 30 Sep 2015 18:21:13 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8UILDUS027028; Wed, 30 Sep 2015 18:21:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509301821.t8UILDUS027028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 30 Sep 2015 18:21:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398227 - in head/deskutils/ljcharm: . 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.20 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: Wed, 30 Sep 2015 18:21:14 -0000 Author: amdmi3 Date: Wed Sep 30 18:21:12 2015 New Revision: 398227 URL: https://svnweb.freebsd.org/changeset/ports/398227 Log: - Fix documentation handling as it doesn't work properly with autoplist - Simplify patching, don't patch and REINPLACE_CMD a same file - Add LICENSE_FILE - Add NO_ARCH - Pet portlint PR: 203013 Submitted by: amdmi3 Approved by: maintainer timeout (seawolf@marinewolf.net, 3 weeks) Modified: head/deskutils/ljcharm/Makefile head/deskutils/ljcharm/files/patch-setup.py Modified: head/deskutils/ljcharm/Makefile ============================================================================== --- head/deskutils/ljcharm/Makefile Wed Sep 30 17:49:01 2015 (r398226) +++ head/deskutils/ljcharm/Makefile Wed Sep 30 18:21:12 2015 (r398227) @@ -3,6 +3,7 @@ PORTNAME= charm PORTVERSION= 1.9.2 +PORTREVISION= 1 CATEGORIES= deskutils net MASTER_SITES= SF/lj${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -10,23 +11,24 @@ MAINTAINER= seawolf@marinewolf.net COMMENT= Menu-driven python-based livejournal client LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:2 -USE_PYTHON= distutils autoplist +USE_PYTHON= autoplist distutils +NO_ARCH= yes PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES -post-patch: - ${REINPLACE_CMD} -e 's,share/doc/charm,${DOCSDIR},' ${WRKSRC}/setup.py - ${REINPLACE_CMD} -e 's,1.9.1,1.9.2,' ${WRKSRC}/setup.py - -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGES.charm ${STAGEDIR}${DOCSDIR}/CHANGES ${INSTALL_DATA} ${WRKSRC}/README.charm ${STAGEDIR}${DOCSDIR}/README + ${INSTALL_DATA} ${WRKSRC}/charm.html ${STAGEDIR}${DOCSDIR}/ + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample.charmrc ${STAGEDIR}${EXAMPLESDIR} Modified: head/deskutils/ljcharm/files/patch-setup.py ============================================================================== --- head/deskutils/ljcharm/files/patch-setup.py Wed Sep 30 17:49:01 2015 (r398226) +++ head/deskutils/ljcharm/files/patch-setup.py Wed Sep 30 18:21:12 2015 (r398227) @@ -1,12 +1,19 @@ ---- ./setup.py Fri Jun 24 15:10:27 2005 -+++ ./setup.py.update Fri Jun 24 15:12:28 2005 -@@ -8,6 +8,6 @@ - url = "http://ljcharm.sourceforge.net", +--- setup.py.orig 2013-03-28 03:14:46 UTC ++++ setup.py +@@ -1,13 +1,12 @@ + from distutils.core import setup + + setup(name = "charm", +- version = "1.9.1", ++ version = "1.9.2", + description = "Text-based console client for LiveJournal", + author = "Lydia Leong", + author_email = "evilhat@livejournal.com", + url = "http://ljcharm.sourceforge.net/", py_modules = ["ljcharm"], scripts = ["charm"], - data_files = [ ("share/doc/charm", ["charm.html", "sample.charmrc"]), - ("share/man/man1", ["charm.1"]), - ("share/man/man5", ["charmrc.5"]) ] ) -+ data_files = [ ("share/doc/charm", ["charm.html"]), -+ ("man/man1", ["charm.1"]), ++ data_files = [ ("man/man1", ["charm.1"]), + ("man/man5", ["charmrc.5"]) ] )