devel/py-omniorb: Update version 4.2.0=>4.2.1

- Rearrange USES in alphabetical order
- Remove <bsd.port.options.mk> in lieu of OPTIONSNG
- Fix patch files to reflect 'make makepatch'

devel/py-omniorb/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	omniorb
-PORTVERSION=	4.2.0
+PORTVERSION=	4.2.1
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/omniORBpy/omniORBpy-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -34,14 +34,12 @@ USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
-USES=		gmake tar:bzip2 python
+USES=		gmake python tar:bzip2
 
 CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--with-openssl=${OPENSSLBASE} --with-omniorb=${LOCALBASE}
 
-.include <bsd.port.options.mk>
-
 pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
@@ -50,24 +48,23 @@ 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)"
-#	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
-.if ${PORT_OPTIONS:MDOCS}
+
+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
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${FIND} . \
 	  | ${CPIO} --quiet -pdum -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>

devel/py-omniorb/distinfo

@@ -1,2 +1,2 @@
-SHA256 (omniORBpy-4.2.0.tar.bz2) = c82b3bafacbb93cfaace41765219155f2b24eb3781369bba0581feb1dc50fe5e
-SIZE (omniORBpy-4.2.0.tar.bz2) = 653795
+SHA256 (omniORBpy-4.2.1.tar.bz2) = 29cc5603681c777c9aa9a06a368b39d24fc6a20d123eaac0d96cec5bb56b5c00
+SIZE (omniORBpy-4.2.1.tar.bz2) = 656054

devel/py-omniorb/files/patch-python-dir.mk

@@ -1,6 +1,6 @@
---- python/dir.mk.orig	Wed Feb  8 23:42:23 2006
-+++ python/dir.mk	Wed Feb  8 23:42:44 2006
-@@ -24,7 +24,7 @@
+--- python/dir.mk.orig	2015-06-26 10:32:49 UTC
++++ python/dir.mk
+@@ -24,7 +24,7 @@ export:: $(FILES)
              $(ExportFileToDir) \
            done; \
            cd $(PYLIBDIR); \
@@ -9,7 +9,7 @@
  	 )
  
  ifdef INSTALLTARGET
-@@ -34,6 +34,6 @@
+@@ -34,6 +34,6 @@ install:: $(FILES)
              $(ExportFileToDir) \
            done; \
            cd $(INSTALLPYLIBDIR); \

devel/py-omniorb/files/patch-python_omniidl__be_dir.mk

@@ -1,6 +1,6 @@
---- omniidl_be/dir.mk.orig	Wed Feb  8 23:42:52 2006
-+++ omniidl_be/dir.mk	Wed Feb  8 23:43:03 2006
-@@ -13,8 +13,6 @@
+--- python/omniidl_be/dir.mk.orig	2003-03-23 21:51:59 UTC
++++ python/omniidl_be/dir.mk
+@@ -13,8 +13,6 @@ export:: $(FILES)
            for file in $^; do \
              $(ExportFileToDir) \
            done; \
@@ -9,7 +9,7 @@
  	 )
  
  ifdef INSTALLTARGET
-@@ -23,7 +21,5 @@
+@@ -23,7 +21,5 @@ install:: $(FILES)
            for file in $^; do \
              $(ExportFileToDir) \
            done; \