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

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

5 files changed, 26 insertions, 19 deletions

diff --git a/lang/Makefile b/lang/Makefile
index 35f3170172ff..b2755287bde7 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -88,6 +88,7 @@
     SUBDIR += kawa
     SUBDIR += klone
     SUBDIR += librep
+    SUBDIR += librep2
     SUBDIR += libutils
     SUBDIR += linux-j
     SUBDIR += logo
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index 685d222848b5..630dc923d4d6 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -5,27 +5,29 @@
 # $FreeBSD$
 #
 
-PORTNAME=	librep
-PORTVERSION=	0.15.2
-PORTREVISION=	1
+PORTNAME=	librep2
+PORTVERSION=	2002.05.02
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/librep
-#DIST_SUBDIR=	gnome
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020509
+DISTNAME=	librep-${PORTVERSION:S/./-/g}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
 		intl.2:${PORTSDIR}/devel/gettext
 
-PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
+PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} \
+		VERSION=0.15.2
 
-USE_NEWGCC=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl"
+		LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl" \
+		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal
 CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
diff --git a/lang/librep2/distinfo b/lang/librep2/distinfo
index a09e2d089d66..7acf71a6f929 100644
--- a/lang/librep2/distinfo
+++ b/lang/librep2/distinfo
@@ -1 +1 @@
-MD5 (librep-0.15.2.tar.gz) = 0f009b208206e33bbb4754eba0a7d4d2
+MD5 (gnome2/librep-2002-05-02.tar.bz2) = 6ed777d23f73b2b1770d72d31c3fbe2a
diff --git a/lang/librep2/files/patch-aa b/lang/librep2/files/patch-aa
index 997a2290722a..5fae22d08bcc 100644
--- a/lang/librep2/files/patch-aa
+++ b/lang/librep2/files/patch-aa
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Oct 29 06:19:47 2001
-+++ configure	Thu Jan 24 17:54:12 2002
-@@ -4659,7 +4659,7 @@
+--- configure.orig	Sat Apr 20 00:42:14 2002
++++ configure	Mon Apr 29 20:51:22 2002
+@@ -5622,7 +5622,7 @@
      ;;
    esac
  fi
@@ -12,12 +12,12 @@ $FreeBSD$
  
  # The second clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -6136,7 +6136,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+@@ -7359,7 +7359,7 @@
+ echo "$as_me:7359: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+ echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6
+ if test $ac_cv_lib_gdbm_gdbm_open = yes; then
 -  GDBM_LIBS="-lgdbm"
-+  GDBM_LIBS="-lgdbm $LIBS"
++  GDBM_LIBS="-L$LOCALBASE/lib -lgdbm"
  else
-   echo "$ac_t""no" 1>&6
- { echo "configure: error: Cannot find GDBM library" 1>&2; exit 1; }
+   { { echo "$as_me:7364: error: Cannot find GDBM library" >&5
+ echo "$as_me: error: Cannot find GDBM library" >&2;}
diff --git a/lang/librep2/pkg-plist b/lang/librep2/pkg-plist
index 3a7aecae1e6f..b2b11c0e4033 100644
--- a/lang/librep2/pkg-plist
+++ b/lang/librep2/pkg-plist
@@ -106,6 +106,8 @@ share/rep/%%VERSION%%/lisp/rep/data/string-util.jl
 share/rep/%%VERSION%%/lisp/rep/data/string-util.jlc
 share/rep/%%VERSION%%/lisp/rep/data/symbol-table.jl
 share/rep/%%VERSION%%/lisp/rep/data/symbol-table.jlc
+share/rep/%%VERSION%%/lisp/rep/data/trie.jl
+share/rep/%%VERSION%%/lisp/rep/data/trie.jlc
 share/rep/%%VERSION%%/lisp/rep/i18n/xgettext.jl
 share/rep/%%VERSION%%/lisp/rep/i18n/xgettext.jlc
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers.jl
@@ -175,6 +177,8 @@ share/rep/%%VERSION%%/lisp/rep/threads/message-port.jl
 share/rep/%%VERSION%%/lisp/rep/threads/message-port.jlc
 share/rep/%%VERSION%%/lisp/rep/threads/mutex.jl
 share/rep/%%VERSION%%/lisp/rep/threads/mutex.jlc
+share/rep/%%VERSION%%/lisp/rep/threads/proxy.jl
+share/rep/%%VERSION%%/lisp/rep/threads/proxy.jlc
 share/rep/%%VERSION%%/lisp/rep/threads/utils.jl
 share/rep/%%VERSION%%/lisp/rep/threads/utils.jlc
 share/rep/%%VERSION%%/lisp/rep/user.jl