Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Sep 2015 18:21:13 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r398227 - in head/deskutils/ljcharm: . files
Message-ID:  <201509301821.t8UILDUS027028@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"]) ] )



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