Don't create compatibility symlinks, which might get in the way of the GNOME2.

Tested by:	Joe Marcus Clarke <marcus@marcuscom.com>

12 files changed, 6 insertions, 63 deletions

diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index 3e7c5be83e75..470870e518a1 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -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 @@ post-install:
 	@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>
diff --git a/devel/ORBit/pkg-plist b/devel/ORBit/pkg-plist
index ddcc8e9caf84..acfe24b4988e 100644
--- a/devel/ORBit/pkg-plist
+++ b/devel/ORBit/pkg-plist
@@ -10,12 +10,7 @@ etc/libIDLConf.sh
 @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/poa.h
 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
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 07bb60e79d63..40b90d917fc3 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -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
@@ -45,11 +45,4 @@ pre-patch:
 	@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>
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 8b294c71f8ea..ff09a8d244e3 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -48,7 +48,6 @@ include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
 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
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index 07bb60e79d63..40b90d917fc3 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -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
@@ -45,11 +45,4 @@ pre-patch:
 	@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>
diff --git a/devel/gnome-vfs1/pkg-plist b/devel/gnome-vfs1/pkg-plist
index 8b294c71f8ea..ff09a8d244e3 100644
--- a/devel/gnome-vfs1/pkg-plist
+++ b/devel/gnome-vfs1/pkg-plist
@@ -48,7 +48,6 @@ include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
 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
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index 07bb60e79d63..40b90d917fc3 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -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
@@ -45,11 +45,4 @@ pre-patch:
 	@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>
diff --git a/devel/gnomevfs/pkg-plist b/devel/gnomevfs/pkg-plist
index 8b294c71f8ea..ff09a8d244e3 100644
--- a/devel/gnomevfs/pkg-plist
+++ b/devel/gnomevfs/pkg-plist
@@ -48,7 +48,6 @@ include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
 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
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 07bb60e79d63..40b90d917fc3 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -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
@@ -45,11 +45,4 @@ pre-patch:
 	@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>
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 8b294c71f8ea..ff09a8d244e3 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -48,7 +48,6 @@ include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
 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
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 218f04927368..21990853de6c 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -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
@@ -27,10 +27,4 @@ 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>
diff --git a/devel/libglade/pkg-plist b/devel/libglade/pkg-plist
index b642fde4ccf4..cdd8c14cd329 100644
--- a/devel/libglade/pkg-plist
+++ b/devel/libglade/pkg-plist
@@ -24,6 +24,3 @@ libdata/pkgconfig/libglade.pc
 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