Date: Wed, 13 Feb 2002 11:23:43 +0200 From: Maxim Sobolev <sobomax@FreeBSD.org> To: gnome@FreeBSD.org Subject: Removing old compatibility tweaks from ORBit, gnomevfs and libglade [path for testing] Message-ID: <3C6A309F.64352072@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------A955FBEE77CBD0AAD0420964
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Hi folks!
Since GNOME2 is coming we have to remove old compatibility tweaks from
the number of ports and fix all resulting breakages. Therefore, I
would be nice if someone will run attached patch through the full
build of the gnome-fifth-toe and report any problems.
Thanks!
-Maxim
--------------A955FBEE77CBD0AAD0420964
Content-Type: text/plain; charset=koi8-r;
name="gnome.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="gnome.diff"
? devel/gnomevfs/pkg-plist,v
Index: devel/ORBit/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/ORBit/Makefile,v
retrieving revision 1.58
diff -d -u -r1.58 Makefile
--- devel/ORBit/Makefile 29 Jan 2002 10:16:25 -0000 1.58
+++ devel/ORBit/Makefile 13 Feb 2002 09:19:03 -0000
@@ -7,7 +7,7 @@
PORTNAME= ORBit
PORTVERSION= 0.5.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/ORBit
@@ -35,15 +35,5 @@
@if [ ! -f ${PREFIX}/etc/orbitrc ]; then \
${CP} -p ${PREFIX}/etc/orbitrc.default ${PREFIX}/etc/orbitrc ; \
fi
-.for dir in IIOP ORBitservices ORBitutil orb orbit-idl2.h
- @if [ -L ${PREFIX}/include/${dir} ]; then \
- ${RM} -f ${PREFIX}/include/${dir}; \
- fi
- @${LN} -sf ${PREFIX}/include/orbit-1.0/${dir} ${PREFIX}/include/${dir}
-.endfor
- @if [ -L ${PREFIX}/include/libIDL ]; then \
- ${RM} -f ${PREFIX}/include/libIDL; \
- fi
- @${LN} -sf ${PREFIX}/include/libIDL-1.0/libIDL ${PREFIX}/include/libIDL
.include <bsd.port.mk>
Index: devel/ORBit/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/ORBit/pkg-plist,v
retrieving revision 1.14
diff -d -u -r1.14 pkg-plist
--- devel/ORBit/pkg-plist 13 Jan 2002 12:51:13 -0000 1.14
+++ devel/ORBit/pkg-plist 13 Feb 2002 09:19:03 -0000
@@ -10,12 +10,7 @@
@unexec if cmp -s %D/etc/orbitrc.default %D/etc/orbitrc; then rm -f %D/etc/orbitrc; fi
etc/orbitrc.default
@exec if [ ! -f %D/etc/orbitrc ] ; then cp -p %D/%F %B/orbitrc; fi
-include/IIOP
-include/ORBitservices
-include/ORBitutil
-include/libIDL
include/libIDL-1.0/libIDL/IDL.h
-include/orb
include/orbit-1.0/IIOP/IIOP-config.h
include/orbit-1.0/IIOP/IIOP-types.h
include/orbit-1.0/IIOP/IIOP.h
@@ -72,7 +67,6 @@
include/orbit-1.0/orb/sequences.h
include/orbit-1.0/orb/typecode.h
include/orbit-1.0/orbit-idl2.h
-include/orbit-idl2.h
@unexec install-info --delete %D/info/libIDL.info %D/info/dir
info/libIDL.info
@exec install-info %D/info/libIDL.info %D/info/dir
Index: devel/gnomevfs/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnomevfs/Makefile,v
retrieving revision 1.26
diff -d -u -r1.26 Makefile
--- devel/gnomevfs/Makefile 26 Jan 2002 08:05:28 -0000 1.26
+++ devel/gnomevfs/Makefile 13 Feb 2002 09:19:03 -0000
@@ -7,7 +7,7 @@
PORTNAME= gnomevfs
PORTVERSION= 1.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-vfs
@@ -44,12 +44,5 @@
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
@find ${WRKSRC} -name 'xml-i18n-*' | xargs ${PERL} -pi -e \
's|/usr/local/bin/perl|${PERL}|g'
-
-post-install:
- @if [ -L ${PREFIX}/include/libgnomevfs ]; then \
- ${RM} -f ${PREFIX}/include/libgnomevfs; \
- fi
- ${LN} -sf ${PREFIX}/include/gnome-vfs-1.0/libgnomevfs \
- ${PREFIX}/include/libgnomevfs
.include <bsd.port.mk>
Index: devel/gnomevfs/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/gnomevfs/pkg-plist,v
retrieving revision 1.13
diff -d -u -r1.13 pkg-plist
--- devel/gnomevfs/pkg-plist 26 Jan 2002 14:15:15 -0000 1.13
+++ devel/gnomevfs/pkg-plist 13 Feb 2002 09:19:03 -0000
@@ -48,7 +48,6 @@
include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-utils.h
include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-xfer.h
include/gnome-vfs-1.0/libgnomevfs/gnome-vfs.h
-include/libgnomevfs
lib/libgnomevfs-pthread.so
lib/libgnomevfs.a
lib/libgnomevfs.so
Index: devel/libglade/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libglade/Makefile,v
retrieving revision 1.28
diff -d -u -r1.28 Makefile
--- devel/libglade/Makefile 15 Sep 2001 22:33:09 -0000 1.28
+++ devel/libglade/Makefile 13 Feb 2002 09:19:03 -0000
@@ -7,7 +7,7 @@
PORTNAME= libglade
PORTVERSION= 0.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/libglade
@@ -26,11 +26,5 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-
-post-install:
- @if [ -L ${PREFIX}/include/glade ]; then \
- ${RM} -f ${PREFIX}/include/glade; \
- fi
- @${LN} -sf ${PREFIX}/include/libglade-1.0/glade ${PREFIX}/include/glade
.include <bsd.port.mk>
Index: devel/libglade/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/libglade/pkg-plist,v
retrieving revision 1.13
diff -d -u -r1.13 pkg-plist
--- devel/libglade/pkg-plist 16 Sep 2001 00:21:07 -0000 1.13
+++ devel/libglade/pkg-plist 13 Feb 2002 09:19:03 -0000
@@ -24,6 +24,3 @@
share/aclocal/libglade.m4
@dirrm include/libglade-1.0/glade
@dirrm include/libglade-1.0
-@exec /bin/rm -rf %D/include/glade
-@exec /bin/ln -sf libglade-1.0/glade %D/include/glade
-@unexec /bin/rm -f %D/include/glade
--------------A955FBEE77CBD0AAD0420964--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3C6A309F.64352072>