Date: Sat, 6 Mar 1999 14:47:41 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10423: Port update: devel/ORBit Message-ID: <199903061247.OAA17305@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 10423
>Category: ports
>Synopsis: Port update: devel/ORBit
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 6 04:50:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports Collection.
>Description:
Upgrade to ORBit-0.4.0.
>How-To-Repeat:
Requires changes to bsd.port.mk. Adds patch patch-ae (to work
around bug in autoconf).
>Fix:
diff -urN -x CVS /usr/ports.ref/devel/ORBit/Makefile /usr/ports/devel/ORBit/Makefile
--- /usr/ports.ref/devel/ORBit/Makefile Fri Feb 19 00:55:05 1999
+++ /usr/ports/devel/ORBit/Makefile Mon Mar 1 18:31:17 1999
@@ -1,24 +1,24 @@
# New ports collection makefile for: orbit
-# Version required: 0.3.98
+# Version required: 0.4.0
# Date Created: 16 Aug 1998
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $Id: Makefile,v 1.14 1999/02/18 17:49:05 vanilla Exp $
#
-DISTNAME= ORBit-0.3.98
+DISTNAME= ORBit-0.4.0
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= ORBit
MAINTAINER= clkao@CirX.ORG
-LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel
+LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/glib12-config"
CONFIGURE_ARGS= --disable-indent
pre-install:
diff -urN -x CVS /usr/ports.ref/devel/ORBit/files/md5 /usr/ports/devel/ORBit/files/md5
--- /usr/ports.ref/devel/ORBit/files/md5 Fri Feb 19 00:55:05 1999
+++ /usr/ports/devel/ORBit/files/md5 Mon Mar 1 18:32:17 1999
@@ -1 +1 @@
-MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602
+MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc
diff -urN -x CVS /usr/ports.ref/devel/ORBit/patches/patch-aa /usr/ports/devel/ORBit/patches/patch-aa
--- /usr/ports.ref/devel/ORBit/patches/patch-aa Fri Feb 19 00:55:06 1999
+++ /usr/ports/devel/ORBit/patches/patch-aa Mon Mar 1 18:35:25 1999
@@ -1,15 +1,15 @@
---- ltconfig.orig Fri Feb 12 08:25:52 1999
-+++ ltconfig Thu Feb 18 22:35:52 1999
-@@ -1201,7 +1201,7 @@
+--- ltconfig.orig Wed Feb 24 21:54:20 1999
++++ ltconfig Mon Mar 1 18:33:37 1999
+@@ -1225,7 +1225,7 @@
;;
# FreeBSD 3, at last, uses gcc -shared to do shared libraries.
- freebsd3*)
+ freebsd*)
- archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -1606,7 +1606,7 @@
+@@ -1661,7 +1661,7 @@
shlibpath_var=PATH
;;
@@ -18,18 +18,18 @@
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
library_names_spec='${libname}${release}.so$versuffix $libname.so'
---- libIDL/ltconfig.orig Fri Feb 12 08:25:59 1999
-+++ libIDL/ltconfig Thu Feb 18 22:36:12 1999
-@@ -1201,7 +1201,7 @@
+--- libIDL/ltconfig.orig Wed Feb 24 21:54:29 1999
++++ libIDL/ltconfig Mon Mar 1 18:34:33 1999
+@@ -1225,7 +1225,7 @@
;;
# FreeBSD 3, at last, uses gcc -shared to do shared libraries.
- freebsd3*)
+ freebsd*)
- archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -1606,7 +1606,7 @@
+@@ -1661,7 +1661,7 @@
shlibpath_var=PATH
;;
@@ -38,18 +38,18 @@
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
library_names_spec='${libname}${release}.so$versuffix $libname.so'
---- popt/ltconfig.orig Thu Feb 18 22:45:11 1999
-+++ popt/ltconfig Thu Feb 18 22:45:21 1999
-@@ -1201,7 +1201,7 @@
+--- popt/ltconfig.orig Tue Feb 16 23:47:41 1999
++++ popt/ltconfig Mon Mar 1 18:35:12 1999
+@@ -1225,7 +1225,7 @@
;;
# FreeBSD 3, at last, uses gcc -shared to do shared libraries.
- freebsd3*)
+ freebsd*)
- archive_cmds='$CC -shared -o $lib$libobjs$deplibs'
+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -1606,7 +1606,7 @@
+@@ -1661,7 +1661,7 @@
shlibpath_var=PATH
;;
diff -urN -x CVS /usr/ports.ref/devel/ORBit/patches/patch-ac /usr/ports/devel/ORBit/patches/patch-ac
--- /usr/ports.ref/devel/ORBit/patches/patch-ac Fri Feb 19 00:55:06 1999
+++ /usr/ports/devel/ORBit/patches/patch-ac Mon Mar 1 18:55:37 1999
@@ -42,41 +42,41 @@
INCLUDES = -I. -I$(top_builddir)/src -I$(top_srcdir)/src @GLIB_CFLAGS@
---- libIDL/Makefile.in.orig Mon Feb 15 12:59:56 1999
-+++ libIDL/Makefile.in Thu Feb 18 22:55:15 1999
-@@ -50,7 +50,7 @@
- AUTOMAKE = @AUTOMAKE@
- AUTOHEADER = @AUTOHEADER@
-
--INSTALL = @INSTALL@
-+INSTALL = @INSTALL_PROGRAM@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -76,7 +76,7 @@
- LEX = @LEX@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
+--- libIDL/Makefile.in.orig Thu Feb 25 17:17:07 1999
++++ libIDL/Makefile.in Mon Mar 1 18:54:57 1999
+@@ -89,7 +89,7 @@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
NM = @NM@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
-@@ -101,7 +101,7 @@
+@@ -120,7 +120,7 @@
libIDL_la_SOURCES = parser.c parser.h lexer.c ns.c util.c util.h rename.h
--libIDL_la_LDFLAGS = -version-info 5:9:5
+-libIDL_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
+libIDL_la_LDFLAGS = -version-info 1:0:0
- tstidl_SOURCES = tstidl.c
+
+ m4datadir = $(datadir)/aclocal
+@@ -130,7 +130,7 @@
tstidl_LDFLAGS = -static
-@@ -478,7 +478,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-info \
- uninstall-pkgincludeHEADERS
+ tstidl_LDADD = libIDL.la
+
+-confexecdir = $(libdir)
++confexecdir = $(sysconfdir)
+ confexec_DATA = libIDLConf.sh
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -580,7 +580,7 @@
+ uninstall-info uninstall-confexecDATA \
+ uninstall-m4dataDATA uninstall-pkgincludeHEADERS
uninstall: uninstall-am
--all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(HEADERS)
+-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
++all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(SCRIPTS) \
+ $(DATA) $(HEADERS)
all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff -urN -x CVS /usr/ports.ref/devel/ORBit/patches/patch-ad /usr/ports/devel/ORBit/patches/patch-ad
--- /usr/ports.ref/devel/ORBit/patches/patch-ad Mon Dec 28 22:58:04 1998
+++ /usr/ports/devel/ORBit/patches/patch-ad Sat Feb 27 21:44:12 1999
@@ -6,8 +6,8 @@
- client (calls glib-config)
- server (calls glib-config)
-+ client (calls glib11d-config)
-+ server (calls glib11d-config)
++ client (calls glib12-config)
++ server (calls glib12-config)
EOF
exit $1
@@ -17,8 +17,8 @@
client|server)
- the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib-config --libs` @LIBS@ -lm"
- the_flags="$the_flags `glib-config --cflags` -I@includedir@"
-+ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib11d-config --libs` @LIBS@ -lm"
-+ the_flags="$the_flags `glib11d-config --cflags` -I@includedir@"
++ the_libs="$the_libs -L@libdir@ -lORBit -lIIOP -lORBitutil `glib12-config --libs` @LIBS@ -lm"
++ the_flags="$the_flags `glib12-config --cflags` -I@includedir@"
;;
--use-service=*)
diff -urN -x CVS /usr/ports.ref/devel/ORBit/patches/patch-ae /usr/ports/devel/ORBit/patches/patch-ae
--- /usr/ports.ref/devel/ORBit/patches/patch-ae Thu Jan 1 02:00:00 1970
+++ /usr/ports/devel/ORBit/patches/patch-ae Tue Mar 2 17:06:06 1999
@@ -0,0 +1,13 @@
+--- configure.orig Fri Feb 19 00:50:06 1999
++++ configure Fri Feb 19 00:50:21 1999
+@@ -5288,10 +5288,6 @@
+ *) # Relative path.
+ ac_sub_cache_file="$ac_dots$cache_file" ;;
+ esac
+- case "$ac_given_INSTALL" in
+- [/$]*) INSTALL="$ac_given_INSTALL" ;;
+- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+- esac
+
+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+ # The eval makes quoting arguments work.
diff -urN -x CVS /usr/ports.ref/devel/ORBit/pkg/PLIST /usr/ports/devel/ORBit/pkg/PLIST
--- /usr/ports.ref/devel/ORBit/pkg/PLIST Tue Jan 5 04:18:20 1999
+++ /usr/ports/devel/ORBit/pkg/PLIST Tue Mar 2 15:07:12 1999
@@ -1,3 +1,4 @@
+bin/libIDL-config
bin/name-client
bin/old-name-server
bin/orbit-config
@@ -5,6 +6,7 @@
bin/orbit-idl
bin/orbit-ird
bin/orbit-name-server
+etc/libIDLConf.sh
include/IIOP/IIOP-config.h
include/IIOP/IIOP-types.h
include/IIOP/IIOP.h
@@ -90,6 +92,7 @@
lib/libname-server.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/libIDL.m4
@dirrm include/IIOP
@dirrm include/ORBitservices
@dirrm include/ORBitutil
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903061247.OAA17305>