From nemysis@gmx.ch  Sun Jun  2 10:46:48 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 2B962311
	for <freebsd-gnats-submit@freebsd.org>; Sun,  2 Jun 2013 10:46:48 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.19])
	by mx1.freebsd.org (Postfix) with ESMTP id B483D1E76
	for <freebsd-gnats-submit@freebsd.org>; Sun,  2 Jun 2013 10:46:47 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.1]) by mrigmx.server.lan
 (mrigmx001) with ESMTP (Nemesis) id 0MFfRr-1UfVRb2ECb-00Ed6U for
 <FreeBSD-gnats-submit@freebsd.org>; Sun, 02 Jun 2013 12:46:46 +0200
Received: (qmail invoked by alias); 02 Jun 2013 10:46:45 -0000
Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5]
  by mail.gmx.net (mp001) with SMTP; 02 Jun 2013 12:46:45 +0200
Received: by something.email.com (sSMTP sendmail emulation); Sun, 02 Jun 2013 12:46:45 +0200
Message-Id: <20130602104648.2B962311@hub.freebsd.org>
Date: Sun, 02 Jun 2013 12:46:45 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jpaetzel@freebsd.org
Subject: [PATCH] net-im/cjc: Trim docs and pkg-plist
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         179201
>Category:       ports
>Synopsis:       [PATCH] net-im/cjc: Trim docs and pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nemysis
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 02 10:50:00 UTC 2013
>Closed-Date:    Sat Mar 22 13:37:38 UTC 2014
>Last-Modified:  Sat Mar 22 14:10:00 UTC 2014
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:

- Shorten header
- Trim docs
- Comply with OptionsNG
- Trim pkg-plist

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130531230800-30835/

>Fix:

--- cjc-1.2.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-im/cjc/Makefile ./Makefile
--- /usr/ports/net-im/cjc/Makefile	2013-01-14 17:54:52.000000000 +0100
+++ ./Makefile	2013-04-01 20:26:32.000000000 +0200
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cjc
-# Date created:		19 April 2006
-# Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD: head/net-im/cjc/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
 
 PORTNAME=	cjc
 PORTVERSION=	1.2.1
@@ -14,12 +10,22 @@
 COMMENT=	The Console Jabber Client
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.1.0:${PORTSDIR}/net-im/py-pyxmpp
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:${PORTSDIR}/net-im/py-pyxmpp
 
 USE_PYTHON=	2.6+
 
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	ChangeLog README TODO
+
+DOCSRCDIR2=	${WRKSRC}/doc
+DOCSDIR2=	${DOCSDIR}/doc
+DOC_FILES2=	manual.html
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -e "s|/usr/bin/python|${PYTHON_CMD}|"
@@ -31,12 +37,11 @@
 		 s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g" ${WRKSRC}/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
 .endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/net-im/cjc/pkg-plist ./pkg-plist
--- /usr/ports/net-im/cjc/pkg-plist	2013-01-14 17:54:52.000000000 +0100
+++ ./pkg-plist	2013-04-01 20:07:52.000000000 +0200
@@ -95,11 +95,6 @@
 %%DATADIR%%/plugins/version.pyc
 %%DATADIR%%/plugins/xmlconsole.py
 %%DATADIR%%/plugins/xmlconsole.pyc
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/cjc/ui
 @dirrm %%DATADIR%%/cjc
--- cjc-1.2.1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jun 2 10:50:08 UTC 2013 
Responsible-Changed-Why:  
beech@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179201 
Responsible-Changed-From-To: beech->nemysis 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Fri Jan 10 03:38:06 UTC 2014 
Responsible-Changed-Why:  
Submitter is committer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179201 
State-Changed-From-To: open->closed 
State-Changed-By: nemysis 
State-Changed-When: Sat Mar 22 13:37:37 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179201 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179201: commit references a PR
Date: Sat, 22 Mar 2014 14:01:18 +0000 (UTC)

 Author: nemysis
 Date: Sat Mar 22 14:01:14 2014
 New Revision: 348794
 URL: http://svnweb.freebsd.org/changeset/ports/348794
 QAT: https://qat.redports.org/buildarchive/r348794/
 
 Log:
   - Change dependency for net-im/py-pyxmpp
   - Change DOCS, remove from pkg-plist
   - Change REINPLACE, install conditional DOCS
   
   PR:		ports/179201
   Submitted by:	nemysis (self)
 
 Modified:
   head/net-im/cjc/Makefile
   head/net-im/cjc/pkg-plist
 
 Modified: head/net-im/cjc/Makefile
 ==============================================================================
 --- head/net-im/cjc/Makefile	Sat Mar 22 13:00:54 2014	(r348793)
 +++ head/net-im/cjc/Makefile	Sat Mar 22 14:01:14 2014	(r348794)
 @@ -11,9 +11,7 @@ COMMENT=	Console Jabber Client
  
  LICENSE=	GPLv2
  
 -RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.1.0:${PORTSDIR}/net-im/py-pyxmpp
 -
 -OPTIONS_DEFINE=	DOCS
 +RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:${PORTSDIR}/net-im/py-pyxmpp
  
  USE_GITHUB=	yes
  GH_ACCOUNT=	Jajcus
 @@ -24,17 +22,34 @@ USES=		shebangfix
  SHEBANG_FILES=	cjc.in cjc.py cjc/main.py
  USE_PYTHON=	2
  
 +PORTDOCS=	*
 +
 +DOCSRCDIR1=	${WRKSRC}
 +DOC_FILES1=	ChangeLog README
 +
 +DOCSRCDIR2=	${WRKSRC}/doc
 +DOCSDIR2=	${DOCSDIR}/doc
 +DOC_FILES2=	manual.html
 +
 +OPTIONS_DEFINE=	DOCS
 +
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		"s|prefix=.*|prefix=${PREFIX}| ; \
 -		 /^DOCS/s|COPYING|| ; \
 -		 s|INSTALL=.*|INSTALL=${INSTALL}| ; \
 -		 s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}| ; \
 -		 s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g ; \
 -		 /compileall/d" ${WRKSRC}/Makefile
 +		's|prefix=.*|prefix=${PREFIX}|; \
 +		 s|$$(INSTALL_DIR) $$(DESTDIR)$$(pkg_docdir)||; \
 +		 s|$$(INSTALL_DATA) $$(DOCS) $$(DESTDIR)$$(pkg_docdir)||; \
 +		 s|INSTALL=.*|INSTALL=${INSTALL}|; \
 +		 s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}|; \
 +		 s|^INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|; \
 +		 /compileall/d' ${WRKSRC}/Makefile
  
  post-install:
  	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
  		-d ${PREFIX} -f ${DATADIR_REL})
  
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
 +	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
 +
  .include <bsd.port.mk>
 
 Modified: head/net-im/cjc/pkg-plist
 ==============================================================================
 --- head/net-im/cjc/pkg-plist	Sat Mar 22 13:00:54 2014	(r348793)
 +++ head/net-im/cjc/pkg-plist	Sat Mar 22 14:01:14 2014	(r348794)
 @@ -95,11 +95,6 @@ bin/cjc
  %%DATADIR%%/plugins/version.pyc
  %%DATADIR%%/plugins/xmlconsole.py
  %%DATADIR%%/plugins/xmlconsole.pyc
 -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%%%DOCSDIR%%/TODO
 -%%PORTDOCS%%%%DOCSDIR%%/manual.html
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm %%DATADIR%%/plugins
  @dirrm %%DATADIR%%/cjc/ui
  @dirrm %%DATADIR%%/cjc
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
