Index: head/net-im/jabber-pyicq/Makefile
===================================================================
--- head/net-im/jabber-pyicq/Makefile	(revision 364801)
+++ head/net-im/jabber-pyicq/Makefile	(revision 364802)
@@ -1,126 +1,106 @@
 # $FreeBSD$
 
 PORTNAME=	pyicq
 PORTVERSION=	0.8.1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	jabber-
 PKGNAMESUFFIX=	-transport
 DISTNAME=	${PORTNAME}t-${PORTVERSION}
 DIST_SUBDIR=	jabber
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python ICQ-Transport for Jabber
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:${PORTSDIR}/security/py-openssl \
 		${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
 JABBER_DESC=	Use with jabberd14 (net-im/jabber)
 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
 USE_RC_SUBR=	jabber-pyicq-transport
 LOCAL_PYTHON=	${PYTHON_CMD}
 
 SUB_FILES=	pkg-message README.jabberd14 README.jabberd2 README.external
 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
 
-NO_STAGE=	yes
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
+TWISTED_USES=		twisted:core,web,words
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJABBER}
 JABBER_REQUIRE?=	jabber
 JABBER_USER?=		jabber
 JABBER_PIDDIR?=		/var/run/jabberd
 JABBER_SPOOLDIR?=	/var/spool/jabberd
 RUN_DEPENDS+=		jabberd14:${PORTSDIR}/net-im/jabber
 .elif ${PORT_OPTIONS:MJABBERD}
 JABBER_REQUIRE?=	jabberd
 JABBER_USER?=		jabber
 JABBER_PIDDIR?=		/var/jabberd/pid
 JABBER_SPOOLDIR?=	/var/spool/jabber
 RUN_DEPENDS+=		jabberd:${PORTSDIR}/net-im/jabberd
 .elif ${PORT_OPTIONS:MEJABBERD}
 JABBER_REQUIRE?=	ejabberd
 JABBER_USER?=		ejabberd
 JABBER_PIDDIR?=		/var/jabberd/pid
 JABBER_SPOOLDIR?=	/var/spool/jabber
 RUN_DEPENDS+=		ejabberdctl:${PORTSDIR}/net-im/ejabberd
 .elif ${PORT_OPTIONS:MDAEMON}
 JABBER_REQUIRE?=	DAEMON
 JABBER_USER?=		nobody
 JABBER_PIDDIR?=		/var/run/pyicq
 JABBER_SPOOLDIR?=	/var/spool/pyicq
 .endif
 
 SUB_LIST+=	JABBER_REQUIRE="${JABBER_REQUIRE}" \
 		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:
 	@${REINPLACE_CMD} -i "" -e '/spooldir/s|\.|${JABBER_SPOOLDIR}|' \
 		-e '/pid/s|PyICQt.pid|${JABBER_PIDDIR}/PyICQt.pid|' \
 		${WRKSRC}/config_example.xml
 	@${REINPLACE_CMD} -i "" -e 's,"config.xml","${PREFIX}/etc/jabber-pyicq.xml",' \
 		${WRKSRC}/src/main.py
 	@${REINPLACE_CMD} -i "" 's|^#!.*$$|#!${LOCAL_PYTHON}|' \
 		${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 <bsd.port.mk>
Index: head/net-im/jabber-pyicq/pkg-plist
===================================================================
--- head/net-im/jabber-pyicq/pkg-plist	(revision 364801)
+++ head/net-im/jabber-pyicq/pkg-plist	(revision 364802)
@@ -1,104 +1,99 @@
-@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
 lib/jabber/pyicq/src/adhoc.py
 lib/jabber/pyicq/src/avatar.py
 lib/jabber/pyicq/src/bool.py
 lib/jabber/pyicq/src/chardet_utf/mbcsgroupprober.py
 lib/jabber/pyicq/src/chardet_utf/__init__.py
 lib/jabber/pyicq/src/chardet_utf/charsetprober.py
 lib/jabber/pyicq/src/chardet_utf/charsetgroupprober.py
 lib/jabber/pyicq/src/chardet_utf/utf16leprober.py
 lib/jabber/pyicq/src/chardet_utf/utf8prober.py
 lib/jabber/pyicq/src/chardet_utf/mbcssm.py
 lib/jabber/pyicq/src/chardet_utf/codingstatemachine.py
 lib/jabber/pyicq/src/chardet_utf/universaldetector.py
 lib/jabber/pyicq/src/chardet_utf/utf16beprober.py
 lib/jabber/pyicq/src/chardet_utf/constants.py
 lib/jabber/pyicq/src/config.py
 lib/jabber/pyicq/src/contact.py
 lib/jabber/pyicq/src/debug.py
 lib/jabber/pyicq/src/disco.py
 lib/jabber/pyicq/src/git_ver.py
 lib/jabber/pyicq/src/globals.py
 lib/jabber/pyicq/src/imgmanip.py
 lib/jabber/pyicq/src/iq.py
 lib/jabber/pyicq/src/jabw.py
 lib/jabber/pyicq/src/lang.py
 lib/jabber/pyicq/src/langs/sv.py
 lib/jabber/pyicq/src/langs/cs.py
 lib/jabber/pyicq/src/langs/de.py
 lib/jabber/pyicq/src/langs/en.py
 lib/jabber/pyicq/src/langs/es.py
 lib/jabber/pyicq/src/langs/fr.py
 lib/jabber/pyicq/src/langs/nl.py
 lib/jabber/pyicq/src/langs/pl.py
 lib/jabber/pyicq/src/langs/ru.py
 lib/jabber/pyicq/src/langs/__init__.py
 lib/jabber/pyicq/src/legacy/__init__.py
 lib/jabber/pyicq/src/legacy/buddies.py
 lib/jabber/pyicq/src/legacy/glue.py
 lib/jabber/pyicq/src/legacy/icqt.py
 lib/jabber/pyicq/src/legacy/services/__init__.py
 lib/jabber/pyicq/src/legacy/services/ConfirmAccount.py
 lib/jabber/pyicq/src/legacy/services/EmailLookup.py
 lib/jabber/pyicq/src/legacy/services/Help.py
 lib/jabber/pyicq/src/legacy/services/SetXStatus.py
 lib/jabber/pyicq/src/legacy/services/Settings.py
 lib/jabber/pyicq/src/main.py
 lib/jabber/pyicq/src/pubsub.py
 lib/jabber/pyicq/src/register.py
 lib/jabber/pyicq/src/sasl.py
 lib/jabber/pyicq/src/services/__init__.py
 lib/jabber/pyicq/src/services/ConnectUsers.py
 lib/jabber/pyicq/src/services/EntityTime.py
 lib/jabber/pyicq/src/services/GatewayTranslator.py
 lib/jabber/pyicq/src/services/IqAvatarFactory.py
 lib/jabber/pyicq/src/services/LastActivity.py
 lib/jabber/pyicq/src/services/PingService.py
 lib/jabber/pyicq/src/services/RosterRetrieval.py
 lib/jabber/pyicq/src/services/SearchFactory.py
 lib/jabber/pyicq/src/services/Statistics.py
 lib/jabber/pyicq/src/services/VCardFactory.py
 lib/jabber/pyicq/src/services/VersionTeller.py
 lib/jabber/pyicq/src/services/XMPPPing.py
 lib/jabber/pyicq/src/session.py
 lib/jabber/pyicq/src/tlib/__init__.py
 lib/jabber/pyicq/src/tlib/countrycodes.py
 lib/jabber/pyicq/src/tlib/httpcompat.py
 lib/jabber/pyicq/src/tlib/ifcompat.py
 lib/jabber/pyicq/src/tlib/langcodes.py
 lib/jabber/pyicq/src/tlib/oscar.py
 lib/jabber/pyicq/src/tlib/scheduler.py
 lib/jabber/pyicq/src/tlib/socks5.py
 lib/jabber/pyicq/src/tlib/sockserror.py
 lib/jabber/pyicq/src/twistd.py
 lib/jabber/pyicq/src/utils.py
 lib/jabber/pyicq/src/web/__init__.py
 lib/jabber/pyicq/src/web/handler.py
 lib/jabber/pyicq/src/web/xmppcred.py
 lib/jabber/pyicq/src/xdb/__init__.py
 lib/jabber/pyicq/src/xdb/legacyaimtransport.py
 lib/jabber/pyicq/src/xdb/legacyjittransport.py
 lib/jabber/pyicq/src/xdb/mysql.py
 lib/jabber/pyicq/src/xdb/template.py
 lib/jabber/pyicq/src/xdb/xmlfiles.py
 lib/jabber/pyicq/src/xmlconfig.py
 @dirrm lib/jabber/pyicq/src/chardet_utf
 @dirrm lib/jabber/pyicq/src/langs
 @dirrm lib/jabber/pyicq/src/legacy/services
 @dirrm lib/jabber/pyicq/src/legacy
 @dirrm lib/jabber/pyicq/src/services
 @dirrm lib/jabber/pyicq/src/tlib
 @dirrm lib/jabber/pyicq/src/web
 @dirrm lib/jabber/pyicq/src/xdb
 @dirrm lib/jabber/pyicq/src
 @dirrm lib/jabber/pyicq/data
 @dirrm lib/jabber/pyicq
 @dirrmtry lib/jabber
-@dirrm %%EXAMPLESDIR%%/etc
-@dirrm %%EXAMPLESDIR%%