From owner-svn-ports-head@FreeBSD.ORG Wed Aug 13 19:37:44 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 99B92F1D; Wed, 13 Aug 2014 19:37:44 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8525124E9; Wed, 13 Aug 2014 19:37:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7DJbhkg001088; Wed, 13 Aug 2014 19:37:43 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7DJbh60001086; Wed, 13 Aug 2014 19:37:43 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201408131937.s7DJbh60001086@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 13 Aug 2014 19:37:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364802 - head/net-im/jabber-pyicq 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.18-1 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, 13 Aug 2014 19:37:44 -0000 Author: sunpoet Date: Wed Aug 13 19:37:43 2014 New Revision: 364802 URL: http://svnweb.freebsd.org/changeset/ports/364802 QAT: https://qat.redports.org/buildarchive/r364802/ Log: - Adjust options: - Add DOCS and EXAMPLES - Rename TWISTED1 TWISTED - Adjust TWISTED behavior: use USES=twisted:core,web,words if enabled - Fix typo - Use @sample - Simplify Makefile - Support STAGEDIR - Bump PORTREVISION for package change Modified: head/net-im/jabber-pyicq/Makefile head/net-im/jabber-pyicq/pkg-plist Modified: head/net-im/jabber-pyicq/Makefile ============================================================================== --- head/net-im/jabber-pyicq/Makefile Wed Aug 13 19:10:46 2014 (r364801) +++ head/net-im/jabber-pyicq/Makefile Wed Aug 13 19:37:43 2014 (r364802) @@ -2,6 +2,7 @@ PORTNAME= pyicq PORTVERSION= 0.8.1.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-im MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -19,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSS ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging PROJECTHOST= pyicqt -OPTIONS_DEFINE= TWISTED1 MYSQL +OPTIONS_DEFINE= DOCS EXAMPLES MYSQL TWISTED OPTIONS_DEFAULT=DAEMON OPTIONS_SINGLE= SERVER OPTIONS_SINGLE_SERVER= JABBER JABBERD EJABBERD DAEMON @@ -27,7 +28,7 @@ JABBER_DESC= Use with jabberd14 (net-im/ JABBERD_DESC= Use with jabberd 2.x (net-im/jabberd) EJABBERD_DESC= Use with ejabberd (net-im/ejabberd) DAEMON_DESC= Use builtin daemon -TWISTED1_DESC= Use old py-twisted 1.x +TWISTED_DESC= Use py-twisted NO_BUILD= yes USE_PYTHON= yes @@ -39,9 +40,12 @@ SUB_LIST= PYTHON_CMD=${LOCAL_PYTHON} INST_DIR= ${PREFIX}/lib/jabber/${PORTNAME} -PORTDOCS= NEWS README README.jabberd14 README.jabberd2 README.external +PORTDOCS= NEWS README +PORTEXAMPLES= db-setup.mysql jabber-pyicq.xml + +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb +TWISTED_USES= twisted:core,web,words -NO_STAGE= yes .include .if ${PORT_OPTIONS:MJABBER} @@ -73,18 +77,6 @@ SUB_LIST+= JABBER_REQUIRE="${JABBER_REQU JABBER_PIDDIR="${JABBER_PIDDIR}" \ JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" -.if ${PORT_OPTIONS:MTWIESTED1} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted -.else -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore \ - ${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb \ - ${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords -.endif - -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb -.endif - SUB_LIST+= JABBER_USER=${JABBER_USER} post-patch: @@ -97,30 +89,18 @@ post-patch: ${WRKSRC}/PyICQt.py do-install: - @${MKDIR} ${INST_DIR}/src ${INST_DIR}/data - ${INSTALL_SCRIPT} ${WRKSRC}/PyICQt.py ${INST_DIR} - ${INSTALL_DATA} ${WRKSRC}/data/defaultAIMAvatar.png ${INST_DIR}/data - ${INSTALL_DATA} ${WRKSRC}/data/defaultICQAvatar.png ${INST_DIR}/data - @${CP} -Rv ${WRKSRC}/src/* ${INST_DIR}/src - @${FIND} ${INST_DIR}/src/ -type d -exec ${CHMOD} 755 "{}" \; - @${FIND} ${INST_DIR}/src/ -type f -exec ${CHMOD} 644 "{}" \; - @${MKDIR} ${EXAMPLESDIR}/etc - ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${EXAMPLESDIR}/etc/jabber-pyicq.xml - ${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${EXAMPLESDIR} - @[ -f ${PREFIX}/etc/jabber-pyicq.xml ] || \ - ${CP} -v ${EXAMPLESDIR}/etc/jabber-pyicq.xml ${PREFIX}/etc/jabber-pyicq.xml -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -. for portdoc in ${PORTDOCS} - @if [ -f ${WRKDIR}/${portdoc} ]; then \ - ${INSTALL_DATA} ${WRKDIR}/${portdoc} ${DOCSDIR}/; \ - else \ - ${INSTALL_DATA} ${WRKSRC}/${portdoc} ${DOCSDIR}/; \ - fi -. endfor -.endif - -post-install: - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${INST_DIR}/data/ ${STAGEDIR}${INST_DIR}/src/ + ${INSTALL_SCRIPT} ${WRKSRC}/PyICQt.py ${STAGEDIR}${INST_DIR}/ + ${INSTALL_DATA} ${WRKSRC}/data/defaultAIMAvatar.png ${STAGEDIR}${INST_DIR}/data/ + ${INSTALL_DATA} ${WRKSRC}/data/defaultICQAvatar.png ${STAGEDIR}${INST_DIR}/data/ + ${CP} -Rv ${WRKSRC}/src/* ${STAGEDIR}${INST_DIR}/src/ + ${FIND} ${STAGEDIR}${INST_DIR}/src/ -type d -exec ${CHMOD} 755 "{}" \; + ${FIND} ${STAGEDIR}${INST_DIR}/src/ -type f -exec ${CHMOD} 644 "{}" \; + ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${PREFIX}/etc/jabber-pyicq.xml.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ + ${INSTALL_DATA} ${WRKSRC}/config_example.xml ${STAGEDIR}${EXAMPLESDIR}/jabber-pyicq.xml + ${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${STAGEDIR}${EXAMPLESDIR}/ .include Modified: head/net-im/jabber-pyicq/pkg-plist ============================================================================== --- head/net-im/jabber-pyicq/pkg-plist Wed Aug 13 19:10:46 2014 (r364801) +++ head/net-im/jabber-pyicq/pkg-plist Wed Aug 13 19:37:43 2014 (r364802) @@ -1,7 +1,4 @@ -@unexec if cmp -s %D/%%EXAMPLESDIR%%/etc/jabber-pyicq.xml %D/etc/jabber-pyicq.xml; then rm -f %D/etc/jabber-pyicq.xml; fi -%%EXAMPLESDIR%%/db-setup.mysql -%%EXAMPLESDIR%%/etc/jabber-pyicq.xml -@exec [ -f %D/etc/jabber-pyicq.xml ] || cp %B/%f %D/etc/jabber-pyicq.xml +@sample etc/jabber-pyicq.xml.sample lib/jabber/pyicq/PyICQt.py lib/jabber/pyicq/data/defaultAIMAvatar.png lib/jabber/pyicq/data/defaultICQAvatar.png @@ -100,5 +97,3 @@ lib/jabber/pyicq/src/xmlconfig.py @dirrm lib/jabber/pyicq/data @dirrm lib/jabber/pyicq @dirrmtry lib/jabber -@dirrm %%EXAMPLESDIR%%/etc -@dirrm %%EXAMPLESDIR%%