Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Apr 2016 10:43:50 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413192 - in head/devel: omniNotify py-omniorb py-omniorb-3
Message-ID:  <201604131043.u3DAhoBu001617@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Apr 13 10:43:50 2016
New Revision: 413192
URL: https://svnweb.freebsd.org/changeset/ports/413192

Log:
  devel/omniNotify, devel/py-omniorb*: modernize
  
  - Convert to CONFIGURE_OUTSOURCE
  - Convert to target option helpers
  
  Approved by:	bofh (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D4157

Modified:
  head/devel/omniNotify/Makefile   (contents, props changed)
  head/devel/py-omniorb-3/Makefile   (contents, props changed)
  head/devel/py-omniorb/Makefile   (contents, props changed)

Modified: head/devel/omniNotify/Makefile
==============================================================================
--- head/devel/omniNotify/Makefile	Wed Apr 13 10:43:21 2016	(r413191)
+++ head/devel/omniNotify/Makefile	Wed Apr 13 10:43:50 2016	(r413192)
@@ -20,35 +20,29 @@ LIB_DEPENDS=	libomniORB4.so:devel/omniOR
 BUILD_DEPENDS=	${NONEXISTENT}:devel/omniORB-4.1:patch
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-CONFIGURE_WRKSRC=	${WRKSRC}/build
-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 OMNIORB_WRKSRC=	`cd ${PORTSDIR}/devel/omniORB-4.1 && ${MAKE} -V WRKSRC`
 
 USES=		gmake python
 GNU_CONFIGURE=	yes
+CONFIGURE_OUTSOURCE=	yes
 MAKEFILE=	GNUmakefile
 USE_LDCONFIG=	yes
 
-CONFIGURE_SCRIPT=	../configure
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--with-omniorb=${LOCALBASE}
 OPTIONS_DEFINE=	EXAMPLES
 
-.include <bsd.port.options.mk>
-
 pre-configure:
 	${REINPLACE_CMD} -Ee 's|-O2|${CFLAGS}|' \
 		${WRKSRC}/mk/beforeauto.mk.in
-	${MKDIR} ${CONFIGURE_WRKSRC}
 	cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notifd \
 		${STAGEDIR}${PREFIX}/lib/lib*.so
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! ( -name \.cvsignore -o -name *\.orig )"
-.endif
 
 .include <bsd.port.mk>

Modified: head/devel/py-omniorb-3/Makefile
==============================================================================
--- head/devel/py-omniorb-3/Makefile	Wed Apr 13 10:43:21 2016	(r413191)
+++ head/devel/py-omniorb-3/Makefile	Wed Apr 13 10:43:50 2016	(r413192)
@@ -27,25 +27,19 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PLIST_SUB=	SONUM=${PORTVERSION:C/.*\.//}
 
-CONFIGURE_WRKSRC=	${WRKSRC}/build
-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 OMNIORB_WRKSRC!=	cd ${.CURDIR}/../omniORB-4.1 && ${MAKE} -V WRKSRC
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_OUTSOURCE=	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}
 
-.include <bsd.port.options.mk>
-
 pre-configure:
-	${MKDIR} ${CONFIGURE_WRKSRC}
 	cd ${OMNIORB_WRKSRC} && ${FIND} idl | ${CPIO} --quiet -pdum ${WRKSRC}
 
 post-install:
@@ -54,17 +48,17 @@ 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)"
-.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>

Modified: head/devel/py-omniorb/Makefile
==============================================================================
--- head/devel/py-omniorb/Makefile	Wed Apr 13 10:43:21 2016	(r413191)
+++ head/devel/py-omniorb/Makefile	Wed Apr 13 10:43:50 2016	(r413192)
@@ -26,23 +26,19 @@ 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
+CONFIGURE_OUTSOURCE=	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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604131043.u3DAhoBu001617>