Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Jul 2014 14:20:01 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361780 - head/irc/qwebirc
Message-ID:  <201407141420.s6EEK1Kq094065@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Mon Jul 14 14:20:00 2014
New Revision: 361780
URL: http://svnweb.freebsd.org/changeset/ports/361780
QAT: https://qat.redports.org/buildarchive/r361780/

Log:
  1: Stagify.
  2: use @sample, bump version.
  
  Approved by:	portmgr@ (blanket)

Modified:
  head/irc/qwebirc/Makefile
  head/irc/qwebirc/pkg-descr
  head/irc/qwebirc/pkg-plist

Modified: head/irc/qwebirc/Makefile
==============================================================================
--- head/irc/qwebirc/Makefile	Mon Jul 14 14:17:01 2014	(r361779)
+++ head/irc/qwebirc/Makefile	Mon Jul 14 14:20:00 2014	(r361780)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qwebirc
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc www
 MASTER_SITES=	https://bitbucket.org/slug/qwebirc/get/
 DISTNAME=	stable
@@ -12,29 +12,25 @@ EXTRACT_SUFX=	.gz
 MAINTAINER=	tabmow@freenode.net
 COMMENT=	Fast, easy to use, free, and open source web IRC client
 
-WRKSRC=	${WRKDIR}/${PORTNAME}
-NO_BUILD=	yes
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore \
+		${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb \
+		${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:${PORTSDIR}/mail/py-twistedMail \
+		${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords \
+		${PYTHON_SITELIBDIR}/twisted/names/__init__.py:${PORTSDIR}/dns/py-twistedNames \
+		${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:${PORTSDIR}/security/py-twistedConch
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+NO_BUILD=	yes
 USE_PYTHON=	yes
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:${PORTSDIR}/mail/py-twistedMail
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/names/__init__.py:${PORTSDIR}/dns/py-twistedNames
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:${PORTSDIR}/security/py-twistedConch
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 do-install:
-	@${MKDIR} ${PREFIX}/www/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}
 	(cd ${WRKDIR}/${PORTNAME} && \
-	${COPYTREE_SHARE} \* ${PREFIX}/www/${PORTNAME} )
+	${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/www/${PORTNAME} )
 
 post-install:
-	@if [ ! -f ${PREFIX}/www/${PORTNAME}/config.py ]; then \
-		${CP} -p ${PREFIX}/www/${PORTNAME}/config.py.example ${PREFIX}/www/${PORTNAME}/config.py ; \
-	fi
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/${PORTNAME}
+	${MV} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/config.py.example \
+		${STAGEDIR}${PREFIX}/www/${PORTNAME}/config.py.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/irc/qwebirc/pkg-descr
==============================================================================
--- head/irc/qwebirc/pkg-descr	Mon Jul 14 14:17:01 2014	(r361779)
+++ head/irc/qwebirc/pkg-descr	Mon Jul 14 14:20:00 2014	(r361780)
@@ -2,4 +2,4 @@ qwebirc is a fast, easy to use, free and
 designed by and originally just for the QuakeNet IRC network.
 It incorporates SSL and notifications via favicon/titlebar flashing.
 
-WWW:	http://qwebirc.org
+WWW: http://qwebirc.org

Modified: head/irc/qwebirc/pkg-plist
==============================================================================
--- head/irc/qwebirc/pkg-plist	Mon Jul 14 14:17:01 2014	(r361779)
+++ head/irc/qwebirc/pkg-plist	Mon Jul 14 14:20:00 2014	(r361780)
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/AUTHORS
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/bin/__init__.py
@@ -12,9 +14,7 @@
 %%WWWDIR%%/bin/yuicompressor-2.3.5.jar
 %%WWWDIR%%/clean.py
 %%WWWDIR%%/compile.py
-@unexec if cmp -s %D/www/qwebirc/config.py.example %D/www/qwebirc/config.py; then rm -f %D/www/qwebirc/config.py; fi
-%%WWWDIR%%/config.py.example
-@exec if [ ! -f %D/www/qwebirc/config.py ] ; then cp -p %D/%F %B/config.py; fi
+@sample %%WWWDIR%%/config.py.sample
 %%WWWDIR%%/css/colours.css
 %%WWWDIR%%/css/dialogs.css
 %%WWWDIR%%/css/mochaui.css
@@ -159,6 +159,8 @@
 %%WWWDIR%%/static/sound/soundmanager2.swf
 %%WWWDIR%%/static/sound/soundmanager2_flash9.swf
 %%WWWDIR%%/twisted/plugins/webirc.py
+@group
+@owner
 @dirrm %%WWWDIR%%/twisted/plugins
 @dirrm %%WWWDIR%%/twisted
 @dirrm %%WWWDIR%%/static/sound



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