- Update lang/librep to 0.92.3

 - Remove shlib versions
 - Add USE_READLINE and USES= pkgconfig
 - Update CPPFLAGS and LDFLAGS
 - Update pkg-descr

- Update x11-toolkits/rep-gtk2 to 0.90.8.1

- Update x11-wm/sawfish to 1.9.1
 - Add ART20 license and set LICENSE_COMB to multi
 - Update USE_XORG to include xtst
 - Add USES= pkgconfig
 - Add PORTSCOUT to exclude unstable releases

- Trim Makefile headers
- Update MASTER_SITES

PR:           ports/170173
Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
Approved by:  beat (mentor)

4 files changed, 31 insertions, 16 deletions

diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 84c5ba80b103..130f8a6888b0 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,29 +1,27 @@
-# New ports collection makefile for:   librep
-# Date created:        13 September 1999
-# Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
-#
+# Created by: Yukihiro Nakai <nakai@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/lang/librep/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $
 
 PORTNAME=	librep
-PORTVERSION=	0.92.1b
+PORTVERSION=	0.92.3
 CATEGORIES=	lang elisp gnome
-MASTER_SITES=	http://download.tuxfamily.org/librep/
+MASTER_SITES=	http://download.tuxfamily.org/librep/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. Archive
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An Emacs Lisp like runtime library
+COMMENT=	Emacs Lisp like runtime library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm \
+LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm \
 		ffi:${PORTSDIR}/devel/libffi \
-    		gmp.10:${PORTSDIR}/math/gmp
+    		gmp:${PORTSDIR}/math/gmp
 RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
 
 USE_CSTD=	gnu89
 
 USE_XZ=		yes
-USES=	pathfix gettext
+USES=		gettext pathfix pkgconfig
+USE_READLINE=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal \
@@ -31,8 +29,8 @@ CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal \
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -pthread
 
 MANCOMPRESSED=	yes
 MAN1=		rep.1 rep-remote.1 rep-xgettext.1 repdoc.1
diff --git a/lang/librep/distinfo b/lang/librep/distinfo
index 9692ac879268..d53979f5d285 100644
--- a/lang/librep/distinfo
+++ b/lang/librep/distinfo
@@ -1,2 +1,2 @@
-SHA256 (librep-0.92.1b.tar.xz) = aedca2716252a1ff2256aca321cce35646b795840b65a3c481708c04a6fd7e3e
-SIZE (librep-0.92.1b.tar.xz) = 598352
+SHA256 (librep-0.92.3.tar.xz) = 45c98a5bbdfde4f1d98e3839b319d9ae15857d2d1ae8e3838d9a18d53f3e8b85
+SIZE (librep-0.92.3.tar.xz) = 607128
diff --git a/lang/librep/files/patch-src__lispmach.h b/lang/librep/files/patch-src__lispmach.h
new file mode 100644
index 000000000000..e682b7b5e21a
--- /dev/null
+++ b/lang/librep/files/patch-src__lispmach.h
@@ -0,0 +1,11 @@
+--- src/lispmach.h.orig
++++ src/lispmach.h
+@@ -475,7 +475,7 @@
+ #ifdef __arm__
+ #define PC_REG asm("r9")
+ #define SP_REG asm("r8")
+-#define SLOTS_REG asm("r7")
++#define SLOTS_REG asm("r10")
+ #endif
+ #endif
+ 
diff --git a/lang/librep/pkg-descr b/lang/librep/pkg-descr
index a29d1e04af91..cfced9c5aa4e 100644
--- a/lang/librep/pkg-descr
+++ b/lang/librep/pkg-descr
@@ -1,3 +1,9 @@
-An Emacs Lisp like runtime library
+Librep is a Lisp system for UNIX, needed by Sawfish window manager.
+It contains a Lisp interpreter, byte-code compiler and virtual
+machine. Applications may use the Lisp interpreter as an extension
+language, or it may be used for stand-alone scripts.
+
+The Lisp dialect was originally inspired by Emacs Lisp, but with the
+worst features removed. It also borrows many ideas from Scheme.
 
 WWW: http://sawfish.tuxfamily.org/