>Number:         23656
>Category:       pkg
>Synopsis:       net/ORBit2 update to 2.8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Dec 04 18:55:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Min Sik Kim
>Release:        NetBSD 1.6ZF
>Organization:
>Environment:
System: NetBSD mike.infnis.com 1.6ZF NetBSD 1.6ZF (MIKE) #9: Sun Nov 30 11:57:42 CST 2003 root@mike.infnis.com:/usr/obj/sys/arch/i386/compile/MIKE i386
Architecture: i386
Machine: i386
>Description:
Many bug fixes and improvements since 2.6.0.

>How-To-Repeat:
>Fix:

 - net/linc is unnecessary because the ORBit2 tarball includes a
   newer version.
 - devel/pkgconfig is required to build.
 - Explicit dependency on glib2.
 - html-dir is specified.
 - More PKGCONFIG_OVERRIDE.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ORBit2/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	2003/12/04 17:08:51	1.21
+++ Makefile	2003/12/04 18:39:49
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.21 2003/12/04 17:08:51 xtraeme Exp $
 #
 
-DISTNAME=		ORBit2-2.6.0
-PKGREVISION=		5
+DISTNAME=		ORBit2-2.8.2
 CATEGORIES=		net gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ORBit2/2.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ORBit2/2.8/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -16,11 +15,15 @@
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-html-dir="${LOCALBASE}/share/doc/html"
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/ORBit-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/ORBit-CosNaming-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/ORBit-imodule-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/idl-compiler/ORBit-idl-2.0.pc.in
 
-.include "../../net/linc/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../net/libIDL/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/ORBit2/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST	2003/01/04 23:46:49	1.4
+++ PLIST	2003/12/04 18:39:49
@@ -1,19 +1,13 @@
 @comment $NetBSD: PLIST,v 1.4 2003/01/04 23:46:49 jmmv Exp $
 bin/ior-decode-2
+bin/linc-cleanup-sockets
 bin/orbit-idl-2
 bin/orbit2-config
 bin/typelib-dump
 include/orbit-2.0/ORBitservices/CosNaming.h
 include/orbit-2.0/ORBitservices/CosNaming_impl.h
+include/orbit-2.0/ORBitservices/orbit-imodule.h
 include/orbit-2.0/orbit-idl/orbit-idl-backend.h
-include/orbit-2.0/orbit/GIOP/giop-basics.h
-include/orbit-2.0/orbit/GIOP/giop-connection.h
-include/orbit-2.0/orbit/GIOP/giop-endian.h
-include/orbit-2.0/orbit/GIOP/giop-recv-buffer.h
-include/orbit-2.0/orbit/GIOP/giop-send-buffer.h
-include/orbit-2.0/orbit/GIOP/giop-server.h
-include/orbit-2.0/orbit/GIOP/giop-types.h
-include/orbit-2.0/orbit/GIOP/giop.h
 include/orbit-2.0/orbit/dynamic/dynamic-defs.h
 include/orbit-2.0/orbit/dynamic/dynamic.h
 include/orbit-2.0/orbit/orb-core/allocators.h
@@ -60,6 +54,11 @@
 lib/libORBit-2.so
 lib/libORBit-2.so.0
 lib/libORBit-2.so.0.0
+lib/libORBit-imodule-2.a
+lib/libORBit-imodule-2.la
+lib/libORBit-imodule-2.so
+lib/libORBit-imodule-2.so.0
+lib/libORBit-imodule-2.so.0.0
 lib/libORBitCosNaming-2.a
 lib/libORBitCosNaming-2.la
 lib/libORBitCosNaming-2.so
@@ -69,21 +68,30 @@
 lib/orbit-2.0/Everything_module.a
 lib/orbit-2.0/Everything_module.la
 lib/orbit-2.0/Everything_module.so
-lib/orbit-2.0/Everything_module.so.0
-lib/orbit-2.0/Everything_module.so.0.0
 lib/pkgconfig/ORBit-2.0.pc
 lib/pkgconfig/ORBit-CosNaming-2.0.pc
 lib/pkgconfig/ORBit-idl-2.0.pc
+lib/pkgconfig/ORBit-imodule-2.0.pc
 share/aclocal/ORBit2.m4
+share/doc/html/ORBit2/ORBit2-orbit2-allocators.html
+share/doc/html/ORBit2/ORBit2-orbit2-small.html
+share/doc/html/ORBit2/ORBit2.devhelp
+share/doc/html/ORBit2/general.html
+share/doc/html/ORBit2/home.png
+share/doc/html/ORBit2/index.html
+share/doc/html/ORBit2/index.sgml
+share/doc/html/ORBit2/left.png
+share/doc/html/ORBit2/right.png
+share/doc/html/ORBit2/up.png
 share/idl/orbit-2.0/CosNaming.idl
 @dirrm share/idl/orbit-2.0
 @unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}
+@dirrm share/doc/html/ORBit2
 @dirrm lib/orbit-2.0
 @dirrm include/orbit-2.0/orbit/util
 @dirrm include/orbit-2.0/orbit/poa
 @dirrm include/orbit-2.0/orbit/orb-core
 @dirrm include/orbit-2.0/orbit/dynamic
-@dirrm include/orbit-2.0/orbit/GIOP
 @dirrm include/orbit-2.0/orbit-idl
 @dirrm include/orbit-2.0/orbit
 @dirrm include/orbit-2.0/ORBitservices
Index: buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/net/ORBit2/buildlink2.mk,v
retrieving revision 1.10
diff -u -r1.10 buildlink2.mk
--- buildlink2.mk	2003/11/12 01:31:50	1.10
+++ buildlink2.mk	2003/12/04 18:39:49
@@ -4,7 +4,7 @@
 ORBIT2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		orbit2
-BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.6.0nb4
+BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.8.2
 BUILDLINK_PKGSRCDIR.orbit2?=	../../net/ORBit2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.orbit2=orbit2
@@ -12,17 +12,18 @@
 
 BUILDLINK_FILES.orbit2=		include/orbit-2.0/orbit/*/*
 BUILDLINK_FILES.orbit2+=	include/orbit-2.0/orbit/*
+BUILDLINK_FILES.orbit2+=	include/orbit-2.0/orbit-idl/*
 BUILDLINK_FILES.orbit2+=	include/orbit-2.0/ORBitservices/*
 BUILDLINK_FILES.orbit2+=	lib/libORBit-2.*
+BUILDLINK_FILES.orbit2+=	lib/libORBit-imodule-2.*
 BUILDLINK_FILES.orbit2+=	lib/libORBitCosNaming-2.*
-BUILDLINK_FILES.orbit2+=	lib/libname-server-2.*
-BUILDLINK_FILES.orbit2+=	lib/orbit-2.0/*
+BUILDLINK_FILES.orbit2+=	lib/libname-server-2.a
+BUILDLINK_FILES.orbit2+=	lib/orbit-2.0/Everything_module.*
 BUILDLINK_FILES.orbit2+=	share/idl/orbit-2.0/CosNaming.idl
 
-.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/popt/buildlink2.mk"
 .include "../../net/libIDL/buildlink2.mk"
-.include "../../net/linc/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	orbit2-buildlink
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/ORBit2/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo	2003/01/22 09:25:44	1.11
+++ distinfo	2003/12/04 18:39:49
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.11 2003/01/22 09:25:44 jmmv Exp $
 
-SHA1 (ORBit2-2.6.0.tar.bz2) = 0d68b90e860bbf855ff5c9b347865860ca678838
-Size (ORBit2-2.6.0.tar.bz2) = 432522 bytes
+SHA1 (ORBit2-2.8.2.tar.bz2) = 71802214c4c61002a6e6c2a0d8c9a8b2452b0c36
+Size (ORBit2-2.8.2.tar.bz2) = 619464 bytes
>Release-Note:
>Audit-Trail:
>Unformatted: