- 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)

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

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

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
+ 

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/

x11-toolkits/rep-gtk2/Makefile

@@ -1,12 +1,12 @@
 # Created by: Yukihiro Nakai <nakai@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/x11-toolkits/rep-gtk2/Makefile,v 1.8 2006/07/18 16:50:28 ahze Exp $
+
 PORTNAME=	rep-gtk2
-PORTVERSION=	0.90.7
-PORTREVISION=	1
+PORTVERSION=	0.90.8.1
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://download.tuxfamily.org/librep/rep-gtk/
+MASTER_SITES=	http://download.tuxfamily.org/librep/rep-gtk/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. Archive
 DISTNAME=	rep-gtk-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -14,7 +14,7 @@ COMMENT=	GTK+-2 binding for rep Lisp interpreter
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	rep.16:${PORTSDIR}/lang/librep
+LIB_DEPENDS=	rep:${PORTSDIR}/lang/librep
 
 USE_XZ=		yes
 USES=		pathfix pkgconfig

x11-toolkits/rep-gtk2/distinfo

@@ -1,2 +1,2 @@
-SHA256 (rep-gtk-0.90.7.tar.xz) = d25d2763323bbdf7b3541c7215b29c00c9e06ad336cf84a69daafa3910481c0f
-SIZE (rep-gtk-0.90.7.tar.xz) = 244368
+SHA256 (rep-gtk-0.90.8.1.tar.xz) = aebb2ae356cb11a2a5a6516703f1b5c6d1d71c48715bc340c13db98b9bd1a650
+SIZE (rep-gtk-0.90.8.1.tar.xz) = 251652

x11-wm/sawfish/Makefile

@@ -2,16 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	sawfish
-PORTVERSION=	1.8.2
-PORTREVISION=	2
+PORTVERSION=	1.9.1
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://download.tuxfamily.org/sawfish/
+MASTER_SITES=	http://download.tuxfamily.org/sawfish/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. Archive
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lisp configurable window manager
 
-LICENSE=	GPLv2
+LICENSE=	ART20 GPLv2
+LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
 LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
@@ -19,8 +20,8 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 RUN_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
 
 USE_XZ=		yes
-USE_XORG=	ice sm x11 xft xinerama xrandr
-USES=		pathfix gettext
+USES=		gettext pathfix pkgconfig
+USE_XORG=	ice sm x11 xft xinerama xrandr xtst
 USE_GNOME=	gnomehier gtk20
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -36,6 +37,8 @@ MANCOMPRESSED=	yes
 MAN1=		sawfish.1 sawfish-client.1 sawfish-config.1
 INFO=		sawfish
 
+PORTSCOUT=	limit:^1\.9\.[0-9]
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/dnsdomainname/d' ${WRKSRC}/build-info

x11-wm/sawfish/distinfo

@@ -1,2 +1,2 @@
-SHA256 (sawfish-1.8.2.tar.xz) = 41f557e399371334f81a46bb1d1fa3a554e91cafb3c8ff9523832263c34c1252
-SIZE (sawfish-1.8.2.tar.xz) = 3870232
+SHA256 (sawfish-1.9.1.tar.xz) = c1751abf46a52dead8a50fa4b91c09ff0540cb9cc988c76ebfea0bee9edd0618
+SIZE (sawfish-1.9.1.tar.xz) = 2616612