Update to 20020509 (version in GNOME2 RC2) after a repo-copies from

lang/librep, x11-toolkits/rep-gtk and x11-wm/sawfish.

4 files changed, 26 insertions, 69 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 40241c32fb77..d9076b925ff0 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -114,6 +114,7 @@
     SUBDIR += qt30
     SUBDIR += qwt
     SUBDIR += rep-gtk
+    SUBDIR += rep-gtk2
     SUBDIR += ruby-fltk
     SUBDIR += ruby-fox
     SUBDIR += ruby-gtk
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index b0c03512acb8..33687c342f6d 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -5,44 +5,29 @@
 # $FreeBSD$
 #
 
-PORTNAME=	rep-gtk
-PORTVERSION=	0.15
-PORTREVISION=	1
+PORTNAME=	rep-gtk2
+PORTVERSION=	2002.05.02
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/rep-gtk
-#DIST_SUBDIR=	gnome
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020509
+DISTNAME=	rep-gtk-${PORTVERSION:S/./-/g}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	rep.11:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	rep.11:${PORTSDIR}/lang/librep2 \
+		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
 
 PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GTK=	yes
-WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-libglade \
+		--with-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
-.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
-.undef WITHOUT_GNOME
-.undef WITHOUT_ALL
-WITH_GNOME=	yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(HAVE_GNOME)
-USE_GNOME=	yes
-CONFIGURE_ARGS=	--with-gnome --with-libglade --with-gdk-pixbuf \
-		--with-gnome-canvas-pixbuf
-.else
-CONFIGURE_ARGS=	--without-libglade --without-gnome --without-gdk-pixbuf \
-		--without-gnome-canvas-pixbuf
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/rep-gtk2/distinfo b/x11-toolkits/rep-gtk2/distinfo
index b546220d4a47..e896ea4099d9 100644
--- a/x11-toolkits/rep-gtk2/distinfo
+++ b/x11-toolkits/rep-gtk2/distinfo
@@ -1 +1 @@
-MD5 (rep-gtk-0.15.tar.gz) = e351980234c3220ed2ad031c9ad9448f
+MD5 (gnome2/rep-gtk-2002-05-02.tar.bz2) = 79ee1c8dca2179a7c6748293cadcdc26
diff --git a/x11-toolkits/rep-gtk2/pkg-plist b/x11-toolkits/rep-gtk2/pkg-plist
index 4ae4e3e25f02..67beac4f3519 100644
--- a/x11-toolkits/rep-gtk2/pkg-plist
+++ b/x11-toolkits/rep-gtk2/pkg-plist
@@ -1,43 +1,14 @@
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gdk-pixbuf.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gdk-pixbuf.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas-pixbuf.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas-pixbuf.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomelib.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomelib.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomeui.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomeui.so
-libexec/rep/%%GNUHOST%%/gtk.la
-libexec/rep/%%GNUHOST%%/gtk.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/canvas-pixbuf.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/canvas-pixbuf.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/canvas.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/canvas.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/lib.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/lib.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/libglade.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/libglade.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/ui.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gnome/ui.so
-libexec/rep/%%GNUHOST%%/gui/gtk.la
-libexec/rep/%%GNUHOST%%/gui/gtk.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk/gdk-pixbuf.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk/gdk-pixbuf.so
-libexec/rep/%%GNUHOST%%/gui/gtk/gtk.la
-libexec/rep/%%GNUHOST%%/gui/gtk/gtk.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk/libglade.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk/libglade.so
-libexec/rep/%%GNUHOST%%/gui/gtk/types.la
-libexec/rep/%%GNUHOST%%/gui/gtk/types.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade-gnome.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade-gnome.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade.so
-libexec/rep/%%GNUHOST%%/sgtk-types.la
-libexec/rep/%%GNUHOST%%/sgtk-types.so
-@dirrm libexec/rep/%%GNUHOST%%/gui/gnome
-@dirrm libexec/rep/%%GNUHOST%%/gui/gtk
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-canvas.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-canvas.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-lib.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-lib.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-ui.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-ui.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gtk.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/gtk.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/libglade.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/libglade.so
+libexec/rep/%%GNUHOST%%/gui/gtk-2/types.la
+libexec/rep/%%GNUHOST%%/gui/gtk-2/types.so
+@dirrm libexec/rep/%%GNUHOST%%/gui/gtk-2
 @dirrm libexec/rep/%%GNUHOST%%/gui