upgrade to 1.0p4

PR:		30793
Submitted by:	MAINTAINER

7 files changed, 24 insertions, 75 deletions

diff --git a/devel/adabroker/Makefile b/devel/adabroker/Makefile
index 6387b07cc331..6e4b389aaaa6 100644
--- a/devel/adabroker/Makefile
+++ b/devel/adabroker/Makefile
@@ -6,28 +6,26 @@
 #
 
 PORTNAME=	adabroker
-PORTVERSION=	1.0p3
+PORTVERSION=	1.0p4
 CATEGORIES=	devel
 MASTER_SITES=	http://adabroker.eu.org/distrib/
-DISTNAME=	adabroker-1.0pre3
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/pre/}
 
 MAINTAINER=	sam@inf.enst.fr
 
 BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
 LIB_DEPENDS=	adasockets.0:${PORTSDIR}/net/adasockets
 
-USE_AUTOCONF=	yes
-USE_AUTOMAKE=	yes
 USE_LIBTOOL=	yes
+USE_AUTOMAKE=	yes
+CONFIGURE_ARGS=	--enable-adasockets
 USE_GMAKE=	yes
+INSTALLS_SHLIB=	yes
 
-CONFIGURE_ARGS=	--enable-adasockets
+MAN1=	ab_names.1 ab_gnome.1
+MAN7=	adabroker.7
 
 post-install:
 	${RM} ${PREFIX}/lib/adabroker/allsrc.adb
-	${LDCONFIG} -m ${PREFIX}/lib
-
-MAN1=		ab_names.1 ab_gnome.1
-MAN7=		adabroker.7
 
 .include <bsd.port.mk>
diff --git a/devel/adabroker/distinfo b/devel/adabroker/distinfo
index 4f2fb96faaa6..a43e2e16abc9 100644
--- a/devel/adabroker/distinfo
+++ b/devel/adabroker/distinfo
@@ -1 +1 @@
-MD5 (adabroker-1.0pre3.tar.gz) = 98759fb79b3d0886969c9f82855b4ab5
+MD5 (adabroker-1.0pre4.tar.gz) = d43b9bcc28ecc8acd067b783cd13af28
diff --git a/devel/adabroker/files/patch-aa b/devel/adabroker/files/patch-aa
deleted file mode 100644
index afabc9b85c19..000000000000
--- a/devel/adabroker/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- cos/naming/Makefile.am.orig	Mon Jul  3 19:08:30 2000
-+++ cos/naming/Makefile.am	Wed Aug  2 16:27:32 2000
-@@ -6,9 +6,9 @@
- 	-I../../src \
- 	-I$(srcdir)/../../src \
- 	-I$(COS_DIRS) \
--	-I../../adasockets/src \
--	-I$(srcdir)/../../adasockets/src \
--	-g -O2 -m -gnata
-+	$(ADASOCKETS_INCLUDE) \
-+	-g -O2 -m -gnata \
-+	-largs $(ADASOCKETS_LIBS)
- 
- PROGS= ab_names test_naming
- 
diff --git a/devel/adabroker/files/patch-ab b/devel/adabroker/files/patch-ab
deleted file mode 100644
index 516962fdb6f6..000000000000
--- a/devel/adabroker/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
---- cos/event/Makefile.am.orig	Mon Jul  3 19:08:28 2000
-+++ cos/event/Makefile.am	Wed Aug  2 16:36:02 2000
-@@ -7,9 +7,9 @@
- 	-I$(COS_ROOT)/naming \
- 	-I../../src \
- 	-I$(srcdir)/../../src \
--	-I../../adasockets/src \
--	-I$(srcdir)/../../adasockets/src \
--	-g -O2 -m -gnata
-+	$(ADASOCKETS_INCLUDE) \
-+	-g -O2 -m -gnata \
-+	-largs $(ADASOCKETS_LIBS)
- 
- PROGS=test_event
- 
diff --git a/devel/adabroker/files/patch-ac b/devel/adabroker/files/patch-ac
deleted file mode 100644
index 6c7e33ed2991..000000000000
--- a/devel/adabroker/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- cos/time/Makefile.am.orig	Mon Jul  3 19:08:30 2000
-+++ cos/time/Makefile.am	Wed Aug  2 16:36:29 2000
-@@ -6,9 +6,9 @@
- 	-I$(COS_DIRS) \
- 	-I../../src \
- 	-I$(srcdir)/../../src \
--	-I../../adasockets/src \
--	-I$(srcdir)/../../adasockets/src \
--	-g -O2 -m -gnata
-+	$(ADASOCKETS_INCLUDE) \
-+	-g -O2 -m -gnata \
-+	-largs $(ADASOCKETS_LIBS)
- 
- PROGS = test_time
- 
diff --git a/devel/adabroker/files/patch-ad b/devel/adabroker/files/patch-ad
deleted file mode 100644
index a878d1d8374d..000000000000
--- a/devel/adabroker/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.common.orig	Wed Aug  2 16:43:46 2000
-+++ examples/Makefile.common	Wed Aug  2 16:43:56 2000
-@@ -10,7 +10,7 @@
- 	-I$(EXAMPLES_ROOT)/../cos/naming \
- 	-I$(EXAMPLES_ROOT)/../idls/cos/naming $(ADASOCKETS_INCLUDE) \
- 	-g -O2 -m -gnata \
--	$(EXAMPLE_GNATMAKE_FLAGS)
-+	$(EXAMPLE_GNATMAKE_FLAGS) \
- 	-largs $(ADASOCKETS_LIBS)
- 
- # Due to a bug in Automake 1.4, this line must not be splitted.
diff --git a/devel/adabroker/pkg-plist b/devel/adabroker/pkg-plist
index 197d78f18314..494e3c3b6929 100644
--- a/devel/adabroker/pkg-plist
+++ b/devel/adabroker/pkg-plist
@@ -3,8 +3,8 @@ bin/adabroker-config
 bin/ab_gnome
 bin/ab_names
 lib/libbroca.so.0
-lib/libbroca.so
 lib/libbroca.a
+lib/adabroker/allsrc.adb
 lib/adabroker/broca-buffers-io_operations.adb
 lib/adabroker/broca-buffers-io_operations.ads
 lib/adabroker/broca-buffers.adb
@@ -51,12 +51,17 @@ lib/adabroker/broca-poa.adb
 lib/adabroker/broca-poa.ads
 lib/adabroker/broca-policy.adb
 lib/adabroker/broca-policy.ads
+lib/adabroker/broca-profiles-tc.adb
+lib/adabroker/broca-profiles-tc.ads
+lib/adabroker/broca-profiles-unknown.adb
+lib/adabroker/broca-profiles-unknown.ads
+lib/adabroker/broca-profiles.adb
+lib/adabroker/broca-profiles.ads
 lib/adabroker/broca-protected_objects.adb
 lib/adabroker/broca-protected_objects.ads
 lib/adabroker/broca-refs.adb
 lib/adabroker/broca-refs.ads
 lib/adabroker/broca-repository.adb
-lib/adabroker/broca.ads
 lib/adabroker/broca-repository.ads
 lib/adabroker/broca-rootpoa.adb
 lib/adabroker/broca-rootpoa.ads
@@ -83,6 +88,7 @@ lib/adabroker/broca-value-value_skel.ads
 lib/adabroker/broca-value.ads
 lib/adabroker/broca-vararray.adb
 lib/adabroker/broca-vararray.ads
+lib/adabroker/broca.ads
 lib/adabroker/corba-abstractbase.adb
 lib/adabroker/corba-abstractbase.ads
 lib/adabroker/corba-context.adb
@@ -100,6 +106,7 @@ lib/adabroker/corba-local.ads
 lib/adabroker/corba-nvlist.adb
 lib/adabroker/corba-nvlist.ads
 lib/adabroker/corba-object-helper.adb
+lib/adabroker/corba.adb
 lib/adabroker/corba-object-helper.ads
 lib/adabroker/corba-object.adb
 lib/adabroker/corba-object.ads
@@ -120,7 +127,6 @@ lib/adabroker/corba-value-forward.adb
 lib/adabroker/corba-value-forward.ads
 lib/adabroker/corba-value.adb
 lib/adabroker/corba-value.ads
-lib/adabroker/corba.adb
 lib/adabroker/corba.ads
 lib/adabroker/portableserver-adapteractivator-impl.adb
 lib/adabroker/portableserver-adapteractivator-impl.ads
@@ -136,7 +142,6 @@ lib/adabroker/portableserver-servantactivator-impl.ads
 lib/adabroker/portableserver-servantactivator.adb
 lib/adabroker/portableserver-servantactivator.ads
 lib/adabroker/portableserver-servantlocator-impl.ads
-lib/adabroker/broca.ali
 lib/adabroker/portableserver-servantlocator.adb
 lib/adabroker/portableserver-servantlocator.ads
 lib/adabroker/portableserver-servantmanager-impl.adb
@@ -150,7 +155,6 @@ lib/adabroker/sequences-unbounded-search.adb
 lib/adabroker/sequences-unbounded-search.ads
 lib/adabroker/sequences-unbounded.adb
 lib/adabroker/sequences-unbounded.ads
-lib/adabroker/corba.ali
 lib/adabroker/sequences.ads
 lib/adabroker/test_cdr.adb
 lib/adabroker/broca-buffers-io_operations.ali
@@ -177,6 +181,9 @@ lib/adabroker/broca-orb.ali
 lib/adabroker/broca-parameters.ali
 lib/adabroker/broca-poa.ali
 lib/adabroker/broca-policy.ali
+lib/adabroker/broca-profiles-tc.ali
+lib/adabroker/broca-profiles-unknown.ali
+lib/adabroker/broca-profiles.ali
 lib/adabroker/broca-protected_objects.ali
 lib/adabroker/broca-refs.ali
 lib/adabroker/broca-repository.ali
@@ -193,6 +200,7 @@ lib/adabroker/broca-value-stream.ali
 lib/adabroker/broca-value-value_skel.ali
 lib/adabroker/broca-value.ali
 lib/adabroker/broca-vararray.ali
+lib/adabroker/broca.ali
 lib/adabroker/corba-abstractbase.ali
 lib/adabroker/corba-context.ali
 lib/adabroker/corba-contextlist.ali
@@ -202,8 +210,8 @@ lib/adabroker/corba-forward.ali
 lib/adabroker/corba-impl.ali
 lib/adabroker/corba-nvlist.ali
 lib/adabroker/corba-object-helper.ali
-lib/adabroker/corba-orb.ali
 lib/adabroker/corba-object.ali
+lib/adabroker/corba-orb.ali
 lib/adabroker/corba-request.ali
 lib/adabroker/corba-sequences-bounded.ali
 lib/adabroker/corba-sequences-unbounded.ali
@@ -211,6 +219,7 @@ lib/adabroker/corba-sequences.ali
 lib/adabroker/corba-value-box.ali
 lib/adabroker/corba-value-forward.ali
 lib/adabroker/corba-value.ali
+lib/adabroker/corba.ali
 lib/adabroker/portableserver-adapteractivator-impl.ali
 lib/adabroker/portableserver-adapteractivator.ali
 lib/adabroker/portableserver-current.ali
@@ -221,12 +230,10 @@ lib/adabroker/portableserver-servantactivator.ali
 lib/adabroker/portableserver-servantlocator-impl.ali
 lib/adabroker/portableserver-servantlocator.ali
 lib/adabroker/portableserver-servantmanager-impl.ali
-lib/adabroker/portableserver-servantmanager.ali
 lib/adabroker/portableserver.ali
+lib/adabroker/portableserver-servantmanager.ali
 lib/adabroker/sequences-bounded.ali
 lib/adabroker/sequences-unbounded-search.ali
 lib/adabroker/sequences-unbounded.ali
 lib/adabroker/sequences.ali
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
 @dirrm lib/adabroker