Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

3 files changed, 39 insertions, 8 deletions

diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index d0ed1c41e51e..e75f354ccf80 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-wm/sawfish/Makefile,v 1.1 2006/07/18 17:01:14 ahze Exp $
 
 PORTNAME=	sawfish
 PORTVERSION=	1.3
-PORTREVISION=	12
+PORTREVISION=	13
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,13 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lisp configurable window manager
 
 LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
-BUILD_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
-RUN_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
+BUILD_DEPENDS=	${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
+RUN_DEPENDS=	${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
 
 GNUHOST=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 PLIST_SUB=	GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehier gnomehack esound
 WANT_GNOME=	yes
diff --git a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
index 232fd5e6bc62..af4e2b49afb1 100644
--- a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
+++ b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
@@ -1,6 +1,3 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-wm/sawfish/files/Attic/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl,v 1.1 2006-05-29 06:23:01 mezz Exp $
-
 --- lisp/sawfish/ui/widgets/workspace-geometry.jl	2002/04/29 19:16:50	1.1
 +++ lisp/sawfish/ui/widgets/workspace-geometry.jl	2002/04/29 19:17:07
 @@ -28,7 +28,6 @@
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 5dfcd8ffc5df..49a6645e91aa 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -680,3 +680,37 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 @dirrm libexec/sawfish/%%VERSION%%
 @dirrm libexec/sawfish
 @dirrm libexec/rep/%%GNUHOST%%/sawfish
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be