diff options
author | Jacques Vidrine <nectar@FreeBSD.org> | 1999-03-09 01:13:40 +0000 |
---|---|---|
committer | Jacques Vidrine <nectar@FreeBSD.org> | 1999-03-09 01:13:40 +0000 |
commit | f4442a7aa7d134c8de8574845b26edddcac65935 (patch) | |
tree | 0f55c576fb88ce09083373c32ab8312529d29dc5 /devel/ORBit2 | |
parent | Upgrade to strobe 1.05 (diff) |
Upgrade to GNOME 1.0. The following are the details:
ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422
ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426
ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421
ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435
ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423
ports/devel/gettext shared libs now PR ports/10293
ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419
ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430
ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436
ports/graphics/electriceyes distfile moved PR ports/10437
ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424
ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441
ports/math/gnumeric 0.6 -> 0.15 PR ports/10439
ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442
ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445
ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446
ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477
ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438
ports/www/libghttp distfile moved PR ports/10429
ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450
ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432
ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425
ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448
ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427
ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420
Note that repository copies were made before this commit, as follows:
ports/devel/glib11-devel -> ports/devel/glib12
ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12
Submitted by: Jeremy Lea <reg@shale.csir.co.za>
Notes
Notes:
svn path=/head/; revision=17091
Diffstat (limited to 'devel/ORBit2')
-rw-r--r-- | devel/ORBit2/Makefile | 10 | ||||
-rw-r--r-- | devel/ORBit2/distinfo | 2 | ||||
-rw-r--r-- | devel/ORBit2/files/patch-ac | 48 | ||||
-rw-r--r-- | devel/ORBit2/files/patch-ad | 8 | ||||
-rw-r--r-- | devel/ORBit2/files/patch-ae | 13 | ||||
-rw-r--r-- | devel/ORBit2/pkg-plist | 3 |
6 files changed, 50 insertions, 34 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index d7371d88bfa6..7317e7015572 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -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.13 1999/01/31 16:57:13 vanilla Exp $ +# $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 --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 70fa965d9807..cc28ec485663 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1 +1 @@ -MD5 (ORBit-0.3.98.tar.gz) = 3c3368d25d2dd154130ec882d63ce602 +MD5 (ORBit-0.4.0.tar.gz) = 41182664df08b1a5c4a9a7e46823d0cc diff --git a/devel/ORBit2/files/patch-ac b/devel/ORBit2/files/patch-ac index 97e231005bab..a4ebc3344f61 100644 --- a/devel/ORBit2/files/patch-ac +++ b/devel/ORBit2/files/patch-ac @@ -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 --git a/devel/ORBit2/files/patch-ad b/devel/ORBit2/files/patch-ad index 44689977d4f7..bc0a5f58b9c9 100644 --- a/devel/ORBit2/files/patch-ad +++ b/devel/ORBit2/files/patch-ad @@ -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 --git a/devel/ORBit2/files/patch-ae b/devel/ORBit2/files/patch-ae new file mode 100644 index 000000000000..1468b8fed6bd --- /dev/null +++ b/devel/ORBit2/files/patch-ae @@ -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 --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index 453ddbaa26dc..f1424dd5e314 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -1,3 +1,4 @@ +bin/libIDL-config bin/name-client bin/old-name-server bin/orbit-config @@ -5,6 +6,7 @@ bin/orbit-event-server 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/libORBitutil.so.1 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 |