Index: head/devel/py-omniorb/Makefile
===================================================================
--- head/devel/py-omniorb/Makefile	(revision 412575)
+++ head/devel/py-omniorb/Makefile	(revision 412576)
@@ -1,70 +1,71 @@
 # Created by: Johann Visagie <johann@egenetics.com>
 # $FreeBSD$
 
 PORTNAME=	omniorb
-PORTVERSION=	4.2.1
+DISTVERSION=	4.2.1-2
 CATEGORIES=	devel python
-MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${DISTVERSION:S/-2//}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	omniORBpy-${PORTVERSION}
+DISTNAME=	omniORBpy-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python bindings for omniORB4, a CORBA 2.6 ORB
 
 LICENSE=	LGPL21
 
 LIB_DEPENDS=	libomniORB4.so:devel/omniORB
 RUN_DEPENDS=	omniidl:devel/omniORB
 # parts of omniORB4 source tree is required to build omniORBpy;
 # see also the "post-extract" target below.
 BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB:patch
 
 CONFLICTS=	py*-orbit-2* py${PYTHON_SUFFIX}-omniorb3-3*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PLIST_SUB=	SONUM=2
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
 CONFIGURE_WRKSRC=	${WRKSRC}/build
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 OMNIORB_WRKSRC!=	cd ${.CURDIR}/../omniORB && ${MAKE} -V WRKSRC
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
 USES=		gmake python tar:bzip2
 
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
 
 pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
 
 post-install:
 	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('CosNaming/__init__.py',None,'CosNaming/__init__.pyc',True)"
 	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('CosNaming__POA/__init__.py',None,'CosNaming__POA/__init__.pyc',True)"
 	cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c "import py_compile;py_compile.compile('omniidl_be/python.py',None,'omniidl_be/python.pyc',True)"
 	@${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be/__init__.py
 	@${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omnipymodule.so.4.2
 	@${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omniZIOPmodule.so.4.2
 	@${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omniConnMgmtmodule.so.4.2
 	@${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omnicodesetsmodule.so.4.2
 	@${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/_omnisslTPmodule.so.4.2
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/tex
 	${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy.* ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/omniORBpy/* ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/tex/* ${STAGEDIR}${DOCSDIR}/tex
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${FIND} . \
 	  | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/devel/py-omniorb/distinfo
===================================================================
--- head/devel/py-omniorb/distinfo	(revision 412575)
+++ head/devel/py-omniorb/distinfo	(revision 412576)
@@ -1,2 +1,2 @@
-SHA256 (omniORBpy-4.2.1.tar.bz2) = 29cc5603681c777c9aa9a06a368b39d24fc6a20d123eaac0d96cec5bb56b5c00
-SIZE (omniORBpy-4.2.1.tar.bz2) = 656054
+SHA256 (omniORBpy-4.2.1-2.tar.bz2) = e0d0f89c0fc6e33b480a2bf7acc7d353b9346a7067571a6be8f594c78b161422
+SIZE (omniORBpy-4.2.1-2.tar.bz2) = 656200