ports/138934: Update devel/omniORB port to 4.1.4

Andrey Ignatov rdna at rdna.ru
Fri Sep 18 09:30:01 UTC 2009 

>Number:         138934
>Category:       ports
>Synopsis:       Update devel/omniORB port to 4.1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 18 09:30:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Andrey Ignatov
>Release:        FreeBSD 7.2-RELEASE amd64
>Organization:
Andrey Ignatov
>Environment:
System: FreeBSD rdna.yandex.ru 7.2-RELEASE FreeBSD 7.2-RELEASE #3: Thu Jul 9 15:02:47 MSD 2009 root at rdna.yandex.ru:/usr/obj/usr/src/sys/RDNA amd64


>Description:
	Update omniORB port to 4.1.4. Fixes for some warnings of portlint.
>How-To-Repeat:
>Fix:

--- omniORB_4.1.3_4.1.4.diff begins here ---
diff -ruN omniORB.orig/Makefile omniORB/Makefile
--- omniORB.orig/Makefile	2009-08-22 04:18:19.000000000 +0400
+++ omniORB/Makefile	2009-09-11 15:45:43.000000000 +0400
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	omniORB
-PORTVERSION=	4.1.3
+PORTVERSION=	4.1.4
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sem at FreeBSD.org
 COMMENT=	A robust high performance CORBA ORB for C++ and Python
@@ -21,12 +21,7 @@
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 MAKEFILE=	GNUmakefile
-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
-CONFIGURE_WRKSRC=	${WRKSRC}/build
-CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ENV+=	CC=${CC} CFLAGS="${CFLAGS}" CXX=${CXX} CXXFLAGS="${CXXFLAGS}" \
-		CPP=${CPP} PYTHON=${PYTHON_CMD}
+CONFIGURE_ENV+=	CC=${CC} CXX=${CXX} CPP=${CPP} PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \
 		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
 		--with-omniNames-logdir=/var/log
@@ -37,21 +32,18 @@
 PLIST_SUB+=	STATIC=""
 .endif
 
-MAN1=		catior.1 genior.1 nameclt.1 omniNames.1 omniidl.1
+MAN1=		catior.1 convertior.1 genior.1 nameclt.1 omnicpp.1 omniidl.1
+MAN8=		omniMapper.8 omniNames.8
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#-pthread|-lc_r#${PTHREAD_LIBS}#' \
 		-e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in
 
-pre-configure:
-	@${MKDIR} ${CONFIGURE_WRKSRC}
-
 post-install:
 	@${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${PYTHON_SITELIBDIR}/omniidl')"
 	@${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${PYTHON_SITELIBDIR}/omniidl_be')"
-.for manpage in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/man/man1/${manpage} ${MANPREFIX}/man/man1
-.endfor
+	@cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1
+	@cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix \
diff -ruN omniORB.orig/distinfo omniORB/distinfo
--- omniORB.orig/distinfo	2008-10-03 01:25:27.000000000 +0400
+++ omniORB/distinfo	2009-09-10 16:04:43.000000000 +0400
@@ -1,3 +1,3 @@
-MD5 (omniORB-4.1.3.tar.gz) = 8a7b583e98ee78f10d8c43014dcaa923
-SHA256 (omniORB-4.1.3.tar.gz) = b9668cb4b0f1abe81065d726fac8a3df2e6df7425fee7aa5affbd3699fe52f8a
-SIZE (omniORB-4.1.3.tar.gz) = 3268141
+MD5 (omniORB-4.1.4.tar.gz) = 1f6070ff9b6339876976d61981eeaa6a
+SHA256 (omniORB-4.1.4.tar.gz) = 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e
+SIZE (omniORB-4.1.4.tar.gz) = 3093814
diff -ruN omniORB.orig/files/patch-ak omniORB/files/patch-ak
--- omniORB.orig/files/patch-ak	2002-08-08 22:02:22.000000000 +0400
+++ omniORB/files/patch-ak	2009-09-10 16:13:22.000000000 +0400
@@ -1,6 +1,6 @@
 --- src/tool/omniidl/cxx/idlutil.cc.orig	Thu Jul 25 16:49:13 2002
 +++ src/tool/omniidl/cxx/idlutil.cc	Thu Jul 25 16:49:25 2002
-@@ -139,13 +139,13 @@
+@@ -148,13 +148,13 @@
    IdlIntLiteral ull;
    switch (base) {
    case 8:
diff -ruN omniORB.orig/files/patch-configure omniORB/files/patch-configure
--- omniORB.orig/files/patch-configure	2008-10-03 01:25:27.000000000 +0400
+++ omniORB/files/patch-configure	2009-09-10 16:13:58.000000000 +0400
@@ -1,6 +1,6 @@
 --- configure.orig	2008-09-16 13:22:10.000000000 +0400
 +++ configure	2008-10-02 00:37:42.000000000 +0400
-@@ -12635,6 +12635,7 @@
+@@ -13077,6 +13077,7 @@
    *-*-freebsd5*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="5";;
    *-*-freebsd6*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="6";;
    *-*-freebsd7*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="7";;
diff -ruN omniORB.orig/files/patch-contrib::pkgconfig::GNUmakefile.in omniORB/files/patch-contrib::pkgconfig::GNUmakefile.in
--- omniORB.orig/files/patch-contrib::pkgconfig::GNUmakefile.in	2004-07-18 00:31:00.000000000 +0400
+++ omniORB/files/patch-contrib::pkgconfig::GNUmakefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- contrib/pkgconfig/GNUmakefile.in.orig       Fri Jul 16 15:33:32 2004
-+++ contrib/pkgconfig/GNUmakefile.in    Fri Jul 16 15:33:53 2004
-@@ -4,7 +4,7 @@
- VPATH=@srcdir@
- INSTALL=@INSTALL@
-
--INSTALLDIR = $(INSTALLLIBDIR)/pkgconfig
-+INSTALLDIR = @prefix@/libdata/pkgconfig
-
- PKGFILES = omnithread3.pc omniORB4.pc omniDynamic4.pc \
-            omniCOS4.pc omniCOSDynamic4.pc
diff -ruN omniORB.orig/files/patch-contrib_pkgconfig_GNUmakefile.in omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in
--- omniORB.orig/files/patch-contrib_pkgconfig_GNUmakefile.in	1970-01-01 03:00:00.000000000 +0300
+++ omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in	2009-09-10 16:16:49.000000000 +0400
@@ -0,0 +1,11 @@
+--- contrib/pkgconfig/GNUmakefile.in.orig       Fri Jul 16 15:33:32 2004
++++ contrib/pkgconfig/GNUmakefile.in    Fri Jul 16 15:33:53 2004
+@@ -4,7 +4,7 @@
+ VPATH=@srcdir@
+ INSTALL=@INSTALL@
+
+-INSTALLDIR = $(INSTALLLIBDIR)/pkgconfig
++INSTALLDIR = @prefix@/libdata/pkgconfig
+
+ PKGFILES = omnithread3.pc omniORB4.pc omniDynamic4.pc \
+            omniCOS4.pc omniCOSDynamic4.pc omniConnectionMgmt4.pc
diff -ruN omniORB.orig/files/patch-idl::COS::Gnumakefile.in omniORB/files/patch-idl::COS::Gnumakefile.in
--- omniORB.orig/files/patch-idl::COS::Gnumakefile.in	2002-11-01 15:01:34.000000000 +0300
+++ omniORB/files/patch-idl::COS::Gnumakefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- idl/COS/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
-+++ idl/COS/GNUmakefile.in	Fri Oct 18 20:27:23 2002
-@@ -4,7 +4,7 @@
- VPATH=@srcdir@
- INSTALL=@INSTALL@
- 
--INSTALLDIR = $(INSTALLIDLDIR)/omniORB/COS
-+INSTALLDIR = $(INSTALLIDLDIR)/COS
- 
- FILES = AttNotifyChannelAdmin.idl CosCollection.idl			\
-         CosCompoundLifeCycle.idl CosConcurrencyControl.idl		\
diff -ruN omniORB.orig/files/patch-idl::Gnumakefile.in omniORB/files/patch-idl::Gnumakefile.in
--- omniORB.orig/files/patch-idl::Gnumakefile.in	2002-11-01 15:01:34.000000000 +0300
+++ omniORB/files/patch-idl::Gnumakefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- idl/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
-+++ idl/GNUmakefile.in	Fri Oct 18 17:32:26 2002
-@@ -4,7 +4,7 @@
- VPATH=@srcdir@
- INSTALL=@INSTALL@
- 
--INSTALLDIR = $(INSTALLIDLDIR)/omniORB
-+INSTALLDIR = $(INSTALLIDLDIR)
- 
- FILES = Naming.idl bootstrap.idl corbaidl.idl echo.idl ir.idl orb.idl \
-         poa.idl poa_include.idl
diff -ruN omniORB.orig/files/patch-idl_COS_Gnumakefile.in omniORB/files/patch-idl_COS_Gnumakefile.in
--- omniORB.orig/files/patch-idl_COS_Gnumakefile.in	1970-01-01 03:00:00.000000000 +0300
+++ omniORB/files/patch-idl_COS_Gnumakefile.in	2009-09-10 16:17:47.000000000 +0400
@@ -0,0 +1,11 @@
+--- idl/COS/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
++++ idl/COS/GNUmakefile.in	Fri Oct 18 20:27:23 2002
+@@ -4,7 +4,7 @@
+ VPATH=@srcdir@
+ INSTALL=@INSTALL@
+ 
+-INSTALLDIR = $(INSTALLIDLDIR)/omniORB/COS
++INSTALLDIR = $(INSTALLIDLDIR)/COS
+ 
+ FILES = CosCollection.idl						\
+         CosCompoundLifeCycle.idl CosConcurrencyControl.idl		\
diff -ruN omniORB.orig/files/patch-idl_Gnumakefile.in omniORB/files/patch-idl_Gnumakefile.in
--- omniORB.orig/files/patch-idl_Gnumakefile.in	1970-01-01 03:00:00.000000000 +0300
+++ omniORB/files/patch-idl_Gnumakefile.in	2009-09-10 16:18:47.000000000 +0400
@@ -0,0 +1,11 @@
+--- idl/GNUmakefile.in.orig	Sun Aug 18 17:38:33 2002
++++ idl/GNUmakefile.in	Fri Oct 18 17:32:26 2002
+@@ -4,7 +4,7 @@
+ VPATH=@srcdir@
+ INSTALL=@INSTALL@
+ 
+-INSTALLDIR = $(INSTALLIDLDIR)/omniORB
++INSTALLDIR = $(INSTALLIDLDIR)
+ 
+ FILES = Naming.idl bootstrap.idl corbaidl.idl echo.idl ir.idl orb.idl \
+         poa.idl poa_include.idl boxes.idl
diff -ruN omniORB.orig/files/patch-undef_minor_macro omniORB/files/patch-undef_minor_macro
--- omniORB.orig/files/patch-undef_minor_macro	2005-11-07 23:10:38.000000000 +0300
+++ omniORB/files/patch-undef_minor_macro	1970-01-01 03:00:00.000000000 +0300
@@ -1,30 +0,0 @@
---- src/appl/utils/catior/catior.cc.orig	Mon Nov  7 22:38:04 2005
-+++ src/appl/utils/catior/catior.cc	Mon Nov  7 22:38:55 2005
-@@ -42,6 +42,12 @@
- #  include <unistd.h>
- #endif
- 
-+#ifdef minor
-+  // Digital Unix 3.2, and may be others as well, defines minor() as
-+  // a macro in its sys/types.h. Get rid of it!
-+#undef minor
-+#endif
-+
- #ifndef Swap16
- #define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff))
- #else
---- src/appl/utils/convertior/convertior.cc.orig	Mon Nov  7 22:39:11 2005
-+++ src/appl/utils/convertior/convertior.cc	Mon Nov  7 22:39:28 2005
-@@ -40,6 +40,12 @@
- #  include <unistd.h>
- #endif
- 
-+#ifdef minor
-+  // Digital Unix 3.2, and may be others as well, defines minor() as
-+  // a macro in its sys/types.h. Get rid of it!
-+#undef minor
-+#endif
-+
- #ifndef Swap16
- #define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff))
- #else
diff -ruN omniORB.orig/pkg-plist omniORB/pkg-plist
--- omniORB.orig/pkg-plist	2008-10-03 01:25:27.000000000 +0400
+++ omniORB/pkg-plist	2009-09-10 18:54:41.000000000 +0400
@@ -238,6 +238,8 @@
 %%PYTHON_SITELIBDIR%%/omniidl/__init__.pyc
 %%PYTHON_SITELIBDIR%%/omniidl/idlast.py
 %%PYTHON_SITELIBDIR%%/omniidl/idlast.pyc
+%%PYTHON_SITELIBDIR%%/omniidl/idlstring.py
+%%PYTHON_SITELIBDIR%%/omniidl/idlstring.pyc
 %%PYTHON_SITELIBDIR%%/omniidl/idltype.py
 %%PYTHON_SITELIBDIR%%/omniidl/idltype.pyc
 %%PYTHON_SITELIBDIR%%/omniidl/idlutil.py
@@ -338,9 +340,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes.txt
 %%PORTDOCS%%%%DOCSDIR%%/omniNames.html
 %%PORTDOCS%%%%DOCSDIR%%/omniNames.pdf
-%%PORTDOCS%%%%DOCSDIR%%/omniNames.ps
 %%PORTDOCS%%%%DOCSDIR%%/omniORB.pdf
-%%PORTDOCS%%%%DOCSDIR%%/omniORB.ps
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/contents_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/index.html
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/next_motif.gif
@@ -364,10 +364,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/omniORB/previous_motif.gif
 %%PORTDOCS%%%%DOCSDIR%%/omniidl.html
 %%PORTDOCS%%%%DOCSDIR%%/omniidl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/omniidl.ps
 %%PORTDOCS%%%%DOCSDIR%%/omnithread.html
 %%PORTDOCS%%%%DOCSDIR%%/omnithread.pdf
-%%PORTDOCS%%%%DOCSDIR%%/omnithread.ps
 %%PORTDOCS%%%%DOCSDIR%%/tex/cover.tex
 %%PORTDOCS%%%%DOCSDIR%%/tex/ode.tex
 %%PORTDOCS%%%%DOCSDIR%%/tex/omniNames.tex
@@ -378,8 +376,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/tex/utilities.tex
 %%PORTDOCS%%%%DOCSDIR%%/utilities.html
 %%PORTDOCS%%%%DOCSDIR%%/utilities.pdf
-%%PORTDOCS%%%%DOCSDIR%%/utilities.ps
-%%PORTDOCS%%%%EXAMPLESDIR%%/omniORB.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/omniORB.cfg
 %%DATADIR%%/idl/COS/CosCollection.idl
 %%DATADIR%%/idl/COS/CosCompoundLifeCycle.idl
 %%DATADIR%%/idl/COS/CosConcurrencyControl.idl
@@ -452,7 +449,7 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tex
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/omniORB
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/skel
 @dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/impl
 @dirrm %%PYTHON_SITELIBDIR%%/omniidl_be/cxx/header
--- omniORB_4.1.3_4.1.4.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list