Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/libexo/Makefile,v
retrieving revision 1.42
diff -u -u -r1.42 Makefile
--- Makefile	14 Apr 2011 06:07:12 -0000	1.42
+++ Makefile	7 May 2011 18:09:40 -0000
@@ -8,8 +8,8 @@
 PORTNAME=	libexo
 PORTVERSION=	0.6.0
 CATEGORIES=	x11 xfce
-DISTNAME=	exo-${PORTVERSION}
 MASTER_SITES=	${MASTER_SITE_XFCE}
+DISTNAME=	exo-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
@@ -42,7 +42,7 @@
 
 MAN1=		exo-csource.1 exo-open.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_HAL)
 CONFIGURE_ARGS+=--enable-hal
@@ -63,10 +63,9 @@
 .if defined(WITH_PYTHON)
 USE_PYTHON=	yes
 CONFIGURE_ARGS+=--enable-python
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
-PLIST_SUB+=	PYTHON=""
+PLIST_SUB+=	PYTHON="" EXODIR="exo-0.6"
 .else
 CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
@@ -85,4 +84,4 @@
 	${FIND} ${WRKSRC}/docs/reference -type f -regex '.*\.1' \
 	-exec ${INSTALL_MAN} "{}" "${MANPREFIX}/man/man1" \;
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11/libexo/pkg-plist,v
retrieving revision 1.17
diff -u -u -r1.17 pkg-plist
--- pkg-plist	3 Mar 2011 10:12:26 -0000	1.17
+++ pkg-plist	7 May 2011 17:53:31 -0000
@@ -196,6 +196,7 @@
 share/locale/zh_CN/LC_MESSAGES/exo-1.mo
 share/locale/zh_TW/LC_MESSAGES/exo-1.mo
 share/pixmaps/exo-1/exo-thumbnail-frame.png
+%%PYTHON%%share/pygtk/2.0/defs/%%EXODIR%%/exo.defs
 share/xfce4/helpers/Terminal.desktop
 share/xfce4/helpers/Thunar.desktop
 share/xfce4/helpers/aterm.desktop
@@ -230,6 +231,20 @@
 share/xfce4/helpers/urxvt.desktop
 share/xfce4/helpers/w3m.desktop
 share/xfce4/helpers/xterm.desktop
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.la
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.a
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyo
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%
+%%PYTHON%%@dirrm share/pygtk/2.0/defs/%%EXODIR%%
 @dirrm share/xfce4/helpers
 @dirrm share/xfce4
 @dirrm share/pixmaps/exo-1