- Add patch-Makefile.buildvars to add ${LOCALBASE}/include to INCLUDEDIRS

  (port did not build with ORBit ports >= 0.5.10).
- GNU_CONFIGURE -> USE_AUTOMAKE, in order to incorporate variables from
  Makefile.buildvars in Makefiles.
- Move removal of "test" directory from Makefile.in to Makefile.am, to
  accommodate the fact that we're now using automake:  Remove
  patch-Makefile.in and add patch-Makefile.am.
- Expand pkg-descr a bit.
- Alphabetise pkg-plist and add directories.
- Bump PORTREVISION.

6 files changed, 42 insertions, 30 deletions

diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index bc705675a0d..c549365e38a 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	orbitcpp
 PORTVERSION=	0.30.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	orbitcpp
@@ -17,7 +18,7 @@ LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit
 
 USE_GMAKE=	yes
 USE_GLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/orbitcpp/files/patch-Makefile.am b/devel/orbitcpp/files/patch-Makefile.am
new file mode 100644
index 00000000000..437bc027e92
--- /dev/null
+++ b/devel/orbitcpp/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	Fri Feb  9 01:17:50 2001
++++ Makefile.am	Thu Nov 15 11:00:58 2001
+@@ -3,7 +3,7 @@
+ # remove tests from global 'make' target if we don't have
+ #                orbit-idl --backenddir=<foo>
+ if HAVE_ORBIT_IDL_BACKENDDIR
+-SUBDIRS=compiler orb services test 
++SUBDIRS=compiler orb services
+ else
+ SUBDIRS=compiler orb 
+ endif
diff --git a/devel/orbitcpp/files/patch-Makefile.buildvars b/devel/orbitcpp/files/patch-Makefile.buildvars
new file mode 100644
index 00000000000..81c330f2715
--- /dev/null
+++ b/devel/orbitcpp/files/patch-Makefile.buildvars
@@ -0,0 +1,8 @@
+--- Makefile.buildvars.orig	Thu Apr  5 11:57:48 2001
++++ Makefile.buildvars	Thu Nov 15 11:04:56 2001
+@@ -1,4 +1,4 @@
+-INCLUDES= -I$(top_builddir) -I$(top_srcdir) $(ORBIT_CFLAGS) 
++INCLUDES= -I$(top_builddir) -I$(top_srcdir) -I${LOCALBASE}/include $(ORBIT_CFLAGS) 
+ # -ansi and -pedantic suck because of many superfluous warnings.
+ FLAGS = -Wall
+ CFLAGS = -g -O0 $(FLAGS)
diff --git a/devel/orbitcpp/files/patch-Makefile.in b/devel/orbitcpp/files/patch-Makefile.in
deleted file mode 100644
index f72e9febd0d..00000000000
--- a/devel/orbitcpp/files/patch-Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in	Wed May 23 01:52:34 2001
-+++ Makefile.in	Thu Aug 30 19:57:42 2001
-@@ -92,7 +92,7 @@
- idlbackenddir = @idlbackenddir@
- 
- AUTOMAKE_OPTIONS = 1.4 # required version of automake.
--@HAVE_ORBIT_IDL_BACKENDDIR_TRUE@SUBDIRS = compiler orb services test 
-+@HAVE_ORBIT_IDL_BACKENDDIR_TRUE@SUBDIRS = compiler orb services 
- @HAVE_ORBIT_IDL_BACKENDDIR_FALSE@SUBDIRS = compiler orb 
- EXTRA_DIST = HACKING FAQ README README-0.30 orbitcpp.m4 Makefile.buildvars #KNOWN-BUGS  
- 
-@@ -118,7 +118,7 @@
- 
- TAR = tar
- GZIP_ENV = --best
--DIST_SUBDIRS =  compiler orb services test compiler orb
-+DIST_SUBDIRS =  compiler orb services compiler orb
- all: all-redirect
- .SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
diff --git a/devel/orbitcpp/pkg-descr b/devel/orbitcpp/pkg-descr
index 63718b64ab1..c264906833a 100644
--- a/devel/orbitcpp/pkg-descr
+++ b/devel/orbitcpp/pkg-descr
@@ -1,4 +1,16 @@
-orbitcpp provides C++ bindings for ORBit, an open source CORBA
-2.2-compliant Object Request Broker.
+Paraphrasing the website:
+
+  ORBit-C++ provides C++ bindings for ORBit, an open source CORBA
+  2.2-compliant Object Request Broker.
+
+  The primary objectives of ORBit-C++ are:
+  - To provide a spec-compliant C++ CORBA mapping for ORBit.
+  - To allow programmers to use and write ORBit objects and gnome components
+    in C++ with little or no runtime overhead (compared to writing C ones)
+  - To allow C programmers to use C++ objects without having to deal with any
+    of that "horrible C++ syntax".
+
+  In short, to C++ programmers, all ORBit objects look like C++ objects, and
+  to C programmers, all ORBit objects should look like C objects.
 
 WWW: http://orbitcpp.sourceforge.net/
diff --git a/devel/orbitcpp/pkg-plist b/devel/orbitcpp/pkg-plist
index fffca2530e8..1fa11250e3f 100644
--- a/devel/orbitcpp/pkg-plist
+++ b/devel/orbitcpp/pkg-plist
@@ -1,5 +1,7 @@
 bin/orbitcpp-config
+include/ORBitservices/CosNaming.hh
 include/orb/orbitcpp.hh
+include/orb/orbitcpp_any.hh
 include/orb/orbitcpp_config.hh
 include/orb/orbitcpp_constants.hh
 include/orb/orbitcpp_exception.hh
@@ -9,12 +11,10 @@ include/orb/orbitcpp_orb.hh
 include/orb/orbitcpp_poa.hh
 include/orb/orbitcpp_sequence.hh
 include/orb/orbitcpp_smartptr.hh
-include/orb/orbitcpp_var_smartptr.hh
 include/orb/orbitcpp_tools.hh
-include/orb/orbitcpp_types.hh
-include/orb/orbitcpp_any.hh
 include/orb/orbitcpp_typecode.hh
-include/ORBitservices/CosNaming.hh
+include/orb/orbitcpp_types.hh
+include/orb/orbitcpp_var_smartptr.hh
 lib/liborbitcpp.a
 lib/liborbitcpp.so
 lib/liborbitcpp.so.30
@@ -25,3 +25,6 @@ lib/orbit-idl/liborbit-idl-c++-backend.a
 lib/orbit-idl/liborbit-idl-c++-backend.so
 lib/orbit-idl/liborbit-idl-c++-backend.so.0
 share/aclocal/orbitcpp.m4
+@dirrm lib/orbit-idl
+@dirrm include/orb
+@dirrm include/ORBitservices