Index: Makefile
===================================================================
--- Makefile	(Revision 401486)
+++ Makefile	(Arbeitskopie)
@@ -2,20 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	battray
-PORTVERSION=	1.5
+PORTVERSION=	2.1
 CATEGORIES=	sysutils python
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	http://code.arp242.net/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
 
-MAINTAINER=	martin@arp242.net
+MAINTAINER=	ports@toco-domains.de
 COMMENT=	Display notebook battery status in tray
 
-LICENSE=	CCS+
-LICENSE_NAME=	Creative Commons Sampling Plus
-LICENSE_TEXT=	http://creativecommons.org/licenses/sampling+/1.0/
-LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+LICENSE=	MIT
 
-USE_GNOME=	pygtk2
-USES=		python
+RUN_DEPENDS=	devel/py3-gobject3>=3.16:${PORTSDIR}/devel/py3-gobject3
+BUILD_DEPENDS=	${RUN_DEPENDS}
+
+USES=		python:3.2+
 USE_PYTHON=	distutils
 
+WRKSRC=	${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
+
+BB_ACCOUNT=	Carpetsmoker
+BB_PROJECT=	${PORTNAME}
+BB_COMMIT=	011402fbc2a3
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(Revision 401486)
+++ distinfo	(Arbeitskopie)
@@ -1,2 +1,2 @@
-SHA256 (battray-1.5.tar.gz) = 0c92976b042870a59dd740d0feb26962c5b535bcaa52244590e172075faa73e4
-SIZE (battray-1.5.tar.gz) = 66421
+SHA256 (battray-2.1.tar.gz) = eb0a647422f52aa5e719e129b555b8f57e2ca042df7a05817f14e6a6976bb31d
+SIZE (battray-2.1.tar.gz) = 68062
Index: pkg-descr
===================================================================
--- pkg-descr	(Revision 401486)
+++ pkg-descr	(Arbeitskopie)
@@ -6,4 +6,4 @@
 It's simple, easy, fairly environment-independent, and "just works" without
 tons of (Gnome|KDE|..) dependencies.
 
-WWW: http://code.google.com/p/battray/
+WWW: http://code.arp242.net/battray
Index: pkg-plist
===================================================================
--- pkg-plist	(Revision 401486)
+++ pkg-plist	(Arbeitskopie)
@@ -1,28 +1,17 @@
 bin/battray
 %%PYTHON_SITELIBDIR%%/battray/__init__.py
-%%PYTHON_SITELIBDIR%%/battray/__init__.pyc
-%%PYTHON_SITELIBDIR%%/battray/__init__.pyo
-%%PYTHON_SITELIBDIR%%/battray/battrayrc_default.py
-%%PYTHON_SITELIBDIR%%/battray/battrayrc_default.pyc
-%%PYTHON_SITELIBDIR%%/battray/battrayrc_default.pyo
-%%PYTHON_SITELIBDIR%%/battray/platforms/__init__.py
-%%PYTHON_SITELIBDIR%%/battray/platforms/__init__.pyc
-%%PYTHON_SITELIBDIR%%/battray/platforms/__init__.pyo
-%%PYTHON_SITELIBDIR%%/battray/platforms/freebsd.py
-%%PYTHON_SITELIBDIR%%/battray/platforms/freebsd.pyc
-%%PYTHON_SITELIBDIR%%/battray/platforms/freebsd.pyo
-%%PYTHON_SITELIBDIR%%/battray/platforms/linux.py
-%%PYTHON_SITELIBDIR%%/battray/platforms/linux.pyc
-%%PYTHON_SITELIBDIR%%/battray/platforms/linux.pyo
-%%PYTHON_SITELIBDIR%%/battray/platforms/openbsd.py
-%%PYTHON_SITELIBDIR%%/battray/platforms/openbsd.pyc
-%%PYTHON_SITELIBDIR%%/battray/platforms/openbsd.pyo
-man/man1/battray.1.gz
+%%PYTHON_SITELIBDIR%%/battray/__pycache__/__init__.cpython-34.pyc
+%%PYTHON_SITELIBDIR%%/battray/__pycache__/__init__.cpython-34.pyo
+%%PYTHON_SITELIBDIR%%/battray/__pycache__/platforms.cpython-34.pyc
+%%PYTHON_SITELIBDIR%%/battray/__pycache__/platforms.cpython-34.pyo
+%%PYTHON_SITELIBDIR%%/battray/__pycache__/sound.cpython-34.pyc
+%%PYTHON_SITELIBDIR%%/battray/__pycache__/sound.cpython-34.pyo
+%%PYTHON_SITELIBDIR%%/battray/platforms.py
+%%PYTHON_SITELIBDIR%%/battray/sound.py
 %%DATADIR%%/alert.wav
-%%DATADIR%%/icons/battery.png
-%%DATADIR%%/icons/charging.png
-%%DATADIR%%/icons/connected.png
-%%DATADIR%%/icons/error.png
-%%DATADIR%%/icons/green.png
-%%DATADIR%%/icons/red.png
-%%DATADIR%%/icons/yellow.png
+%%DATADIR%%/battery.png
+%%DATADIR%%/battrayrc.py
+%%DATADIR%%/charging.png
+%%DATADIR%%/connected.png
+%%DATADIR%%/error.png
+%%DATADIR%%/icon.png