Update to 0.5.4

8 files changed, 98 insertions, 84 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 4cce72445018..bd564d26d7f8 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ORBit
-PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTVERSION=	0.5.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
diff --git a/devel/ORBit/distinfo b/devel/ORBit/distinfo
index a5176e18c737..2444e6123fd8 100644
--- a/devel/ORBit/distinfo
+++ b/devel/ORBit/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.5.3.tar.gz) = ef0e295ab0666973030c552672aaaee7
+MD5 (ORBit-0.5.4.tar.gz) = 166ba4601ff2e58ddfb5cdd621f0b37f
diff --git a/devel/ORBit/files/patch-ab b/devel/ORBit/files/patch-ab
index 2f0283ffae3c..b690fbea9a83 100644
--- a/devel/ORBit/files/patch-ab
+++ b/devel/ORBit/files/patch-ab
@@ -1,11 +1,23 @@
---- Makefile.in.orig	Mon Feb 15 12:59:53 1999
-+++ Makefile.in	Thu Feb 18 22:37:23 1999
-@@ -92,7 +92,7 @@
- 
- AUTOMAKE_OPTIONS = 1.3 # required version of automake.
+--- Makefile.in.orig	Thu Oct 12 11:06:49 2000
++++ Makefile.in	Thu Oct 12 13:28:39 2000
+@@ -97,3 +97,3 @@
  
 -SUBDIRS = popt libIDL src test
 +SUBDIRS = popt libIDL src
  
- bin_SCRIPTS = orbit-config
+@@ -114,3 +114,3 @@
+ 
+-DATA =  $(m4data_DATA) $(pkgconfig_DATA)
++DATA =  $(m4data_DATA)
+ 
+@@ -396,3 +396,3 @@
+ 
+-install-data-am: install-m4dataDATA install-pkgconfigDATA
++install-data-am: install-m4dataDATA
+ install-data: install-data-recursive
+@@ -411,4 +411,3 @@
+ installdirs-am:
+-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \
+-		$(DESTDIR)$(pkgconfigdir)
++	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir)
  
diff --git a/devel/ORBit/files/patch-ac b/devel/ORBit/files/patch-ac
index 4f419c0dddd3..f8f88a5fd61d 100644
--- a/devel/ORBit/files/patch-ac
+++ b/devel/ORBit/files/patch-ac
@@ -31,53 +31,49 @@
  libORBit_la_LIBADD = $(GLIB_LIBS) -lm
  
  BUILT_SOURCES =  	interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
---- src/services/name/Makefile.in.orig	Tue Jul 25 17:34:11 2000
-+++ src/services/name/Makefile.in	Tue Aug  1 21:27:41 2000
-@@ -118,7 +118,7 @@
+--- src/services/name/Makefile.in.orig	Thu Oct 12 11:07:08 2000
++++ src/services/name/Makefile.in	Thu Oct 12 13:11:55 2000
+@@ -109,3 +109,3 @@
  
+-libORBitCosNaming_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libORBitCosNaming_la_LDFLAGS =  	-version-info 2:0:0
  
- libORBitCosNaming_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+	-version-info 2:0:0
- 
- 
- INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
---- libIDL/Makefile.in.orig	Tue Jul 25 17:34:00 2000
-+++ libIDL/Makefile.in	Tue Aug  1 21:29:05 2000
-@@ -88,7 +88,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
+--- libIDL/Makefile.in.orig	Thu Oct 12 11:06:54 2000
++++ libIDL/Makefile.in	Thu Oct 12 13:30:30 2000
+@@ -92,3 +92,3 @@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
-@@ -130,8 +130,7 @@
- libIDL_la_SOURCES = parser.c parser.h lexer.c \
- 			  ns.c util.c util.h rename.h
+@@ -122,4 +122,3 @@
  
--libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
--			  -release $(LT_RELEASE)
+-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				  -release $(LT_RELEASE)
+-
 +libIDL_la_LDFLAGS = -version-info 2:0:0
  
- 
- m4datadir = $(datadir)/aclocal
-@@ -140,7 +139,7 @@
- tstidl_SOURCES = tstidl.c
- tstidl_LDADD = libIDL.la
+@@ -131,3 +130,3 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = libIDLConf.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -596,7 +595,7 @@
- 		uninstall-info uninstall-confexecDATA \
- 		uninstall-m4dataDATA uninstall-pkgincludeHEADERS
+@@ -164,3 +163,3 @@
+ TEXINFOS = libIDL.texi
+-DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
++DATA =  $(confexec_DATA) $(m4data_DATA)
+ 
+@@ -596,3 +595,3 @@
+ install-data-am: install-info-am install-m4dataDATA \
+-		install-pkgconfigDATA install-pkgincludeHEADERS
++		install-pkgincludeHEADERS
+ install-data: install-data-am
+@@ -607,3 +606,3 @@
  uninstall: uninstall-am
 -all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
 +all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \
  		$(DATA) $(HEADERS)
- all-redirect: all-am
- install-strip:
+@@ -615,4 +614,3 @@
+ 		$(DESTDIR)$(infodir) $(DESTDIR)$(confexecdir) \
+-		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir) \
+-		$(DESTDIR)$(pkgincludedir)
++		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgincludedir)
+ 
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 4cce72445018..bd564d26d7f8 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ORBit
-PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTVERSION=	0.5.4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ORBit
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index a5176e18c737..2444e6123fd8 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (ORBit-0.5.3.tar.gz) = ef0e295ab0666973030c552672aaaee7
+MD5 (ORBit-0.5.4.tar.gz) = 166ba4601ff2e58ddfb5cdd621f0b37f
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
index 2f0283ffae3c..b690fbea9a83 100644
--- a/devel/ORBit2/files/patch-ab
+++ b/devel/ORBit2/files/patch-ab
@@ -1,11 +1,23 @@
---- Makefile.in.orig	Mon Feb 15 12:59:53 1999
-+++ Makefile.in	Thu Feb 18 22:37:23 1999
-@@ -92,7 +92,7 @@
- 
- AUTOMAKE_OPTIONS = 1.3 # required version of automake.
+--- Makefile.in.orig	Thu Oct 12 11:06:49 2000
++++ Makefile.in	Thu Oct 12 13:28:39 2000
+@@ -97,3 +97,3 @@
  
 -SUBDIRS = popt libIDL src test
 +SUBDIRS = popt libIDL src
  
- bin_SCRIPTS = orbit-config
+@@ -114,3 +114,3 @@
+ 
+-DATA =  $(m4data_DATA) $(pkgconfig_DATA)
++DATA =  $(m4data_DATA)
+ 
+@@ -396,3 +396,3 @@
+ 
+-install-data-am: install-m4dataDATA install-pkgconfigDATA
++install-data-am: install-m4dataDATA
+ install-data: install-data-recursive
+@@ -411,4 +411,3 @@
+ installdirs-am:
+-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \
+-		$(DESTDIR)$(pkgconfigdir)
++	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir)
  
diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac
index 4f419c0dddd3..f8f88a5fd61d 100644
--- a/devel/ORBit2/files/patch-ac
+++ b/devel/ORBit2/files/patch-ac
@@ -31,53 +31,49 @@
  libORBit_la_LIBADD = $(GLIB_LIBS) -lm
  
  BUILT_SOURCES =  	interface_repository.h 	interface_repository-common.c 	interface_repository-stubs.c
---- src/services/name/Makefile.in.orig	Tue Jul 25 17:34:11 2000
-+++ src/services/name/Makefile.in	Tue Aug  1 21:27:41 2000
-@@ -118,7 +118,7 @@
+--- src/services/name/Makefile.in.orig	Thu Oct 12 11:07:08 2000
++++ src/services/name/Makefile.in	Thu Oct 12 13:11:55 2000
+@@ -109,3 +109,3 @@
  
+-libORBitCosNaming_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++libORBitCosNaming_la_LDFLAGS =  	-version-info 2:0:0
  
- libORBitCosNaming_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+	-version-info 2:0:0
- 
- 
- INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/src/ORBitutil -I$(top_srcdir)/src @GLIB_CFLAGS@
---- libIDL/Makefile.in.orig	Tue Jul 25 17:34:00 2000
-+++ libIDL/Makefile.in	Tue Aug  1 21:29:05 2000
-@@ -88,7 +88,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
+--- libIDL/Makefile.in.orig	Thu Oct 12 11:06:54 2000
++++ libIDL/Makefile.in	Thu Oct 12 13:30:30 2000
+@@ -92,3 +92,3 @@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
-@@ -130,8 +130,7 @@
- libIDL_la_SOURCES = parser.c parser.h lexer.c \
- 			  ns.c util.c util.h rename.h
+@@ -122,4 +122,3 @@
  
--libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
--			  -release $(LT_RELEASE)
+-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)				  -release $(LT_RELEASE)
+-
 +libIDL_la_LDFLAGS = -version-info 2:0:0
  
- 
- m4datadir = $(datadir)/aclocal
-@@ -140,7 +139,7 @@
- tstidl_SOURCES = tstidl.c
- tstidl_LDADD = libIDL.la
+@@ -131,3 +130,3 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = libIDLConf.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -596,7 +595,7 @@
- 		uninstall-info uninstall-confexecDATA \
- 		uninstall-m4dataDATA uninstall-pkgincludeHEADERS
+@@ -164,3 +163,3 @@
+ TEXINFOS = libIDL.texi
+-DATA =  $(confexec_DATA) $(m4data_DATA) $(pkgconfig_DATA)
++DATA =  $(confexec_DATA) $(m4data_DATA)
+ 
+@@ -596,3 +595,3 @@
+ install-data-am: install-info-am install-m4dataDATA \
+-		install-pkgconfigDATA install-pkgincludeHEADERS
++		install-pkgincludeHEADERS
+ install-data: install-data-am
+@@ -607,3 +606,3 @@
  uninstall: uninstall-am
 -all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
 +all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \
  		$(DATA) $(HEADERS)
- all-redirect: all-am
- install-strip:
+@@ -615,4 +614,3 @@
+ 		$(DESTDIR)$(infodir) $(DESTDIR)$(confexecdir) \
+-		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgconfigdir) \
+-		$(DESTDIR)$(pkgincludedir)
++		$(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgincludedir)
+