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, 64 insertions, 40 deletions

diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index 884f0348527e..d09cc1ccf923 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/accessibility/gnomemag/Makefile,v 1.1 2006/03/13 23:49:23 mezz Exp $
+#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.22 2006/09/10 00:51:05 mezz Exp $
 #
 
 PORTNAME=	gnome-mag
-PORTVERSION=	0.12.6
+PORTVERSION=	0.13.1
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,12 +18,12 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME screen magnifier
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack
+USE_XLIB=	yes
+USE_GNOME=	gnomehack gnomeprefix atspi libbonobo intlhack ltverhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index e0f87378a3a7..80cd46043389 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.12.6.tar.bz2) = c402b06408d3b40843720ae09ad74234
-SHA256 (gnome2/gnome-mag-0.12.6.tar.bz2) = 8b2f6ff5c9f74398c41f72c7bb554327f6df01a0408c67d6ce2f14862d38e6eb
-SIZE (gnome2/gnome-mag-0.12.6.tar.bz2) = 608859
+MD5 (gnome2/gnome-mag-0.13.1.tar.bz2) = 4b16b95fd978640c103a6f9cf452c579
+SHA256 (gnome2/gnome-mag-0.13.1.tar.bz2) = ee253e12750f241e2c299fa990032965458ad7a5adf1bc708604b4efff34571e
+SIZE (gnome2/gnome-mag-0.13.1.tar.bz2) = 466020
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index 797aebdcf46b..297e75a89b79 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -1,19 +1,16 @@
 bin/magnifier
 include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h
+lib/libgnome-mag.a
 lib/libgnome-mag.la
 lib/libgnome-mag.so
 lib/libgnome-mag.so.2
+lib/orbit-2.0/GNOME_Magnifier_module.a
 lib/orbit-2.0/GNOME_Magnifier_module.la
 lib/orbit-2.0/GNOME_Magnifier_module.so
 libdata/bonobo/servers/GNOME_Magnifier.server
 libdata/pkgconfig/gnome-mag-1.0.pc
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-common_8c-source.html
 %%DOCSDIR%%/reference/html/GNOME__Magnifier-common_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-imodule_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-imodule_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-skels_8c-source.html
 %%DOCSDIR%%/reference/html/GNOME__Magnifier-skels_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-stubs_8c-source.html
 %%DOCSDIR%%/reference/html/GNOME__Magnifier-stubs_8c.html
 %%DOCSDIR%%/reference/html/GNOME__Magnifier_8h-source.html
 %%DOCSDIR%%/reference/html/GNOME__Magnifier_8h.html
@@ -22,7 +19,6 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/annotated.html
 %%DOCSDIR%%/reference/html/classGNOME_1_1Magnifier_1_1Magnifier.html
 %%DOCSDIR%%/reference/html/classGNOME_1_1Magnifier_1_1ZoomRegion.html
-%%DOCSDIR%%/reference/html/damage-client_8c-source.html
 %%DOCSDIR%%/reference/html/damage-client_8c.html
 %%DOCSDIR%%/reference/html/damage-client_8h-source.html
 %%DOCSDIR%%/reference/html/damage-client_8h.html
@@ -84,23 +80,18 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/functions_vars_0x79.html
 %%DOCSDIR%%/reference/html/functions_vars_0x7a.html
 %%DOCSDIR%%/reference/html/globals.html
-%%DOCSDIR%%/reference/html/globals_0x61.html
 %%DOCSDIR%%/reference/html/globals_0x62.html
 %%DOCSDIR%%/reference/html/globals_0x63.html
 %%DOCSDIR%%/reference/html/globals_0x64.html
 %%DOCSDIR%%/reference/html/globals_0x65.html
-%%DOCSDIR%%/reference/html/globals_0x66.html
 %%DOCSDIR%%/reference/html/globals_0x67.html
 %%DOCSDIR%%/reference/html/globals_0x69.html
-%%DOCSDIR%%/reference/html/globals_0x6c.html
 %%DOCSDIR%%/reference/html/globals_0x6d.html
-%%DOCSDIR%%/reference/html/globals_0x6e.html
 %%DOCSDIR%%/reference/html/globals_0x6f.html
 %%DOCSDIR%%/reference/html/globals_0x70.html
 %%DOCSDIR%%/reference/html/globals_0x72.html
 %%DOCSDIR%%/reference/html/globals_0x73.html
 %%DOCSDIR%%/reference/html/globals_0x74.html
-%%DOCSDIR%%/reference/html/globals_0x75.html
 %%DOCSDIR%%/reference/html/globals_0x7a.html
 %%DOCSDIR%%/reference/html/globals_defs.html
 %%DOCSDIR%%/reference/html/globals_defs_0x62.html
@@ -117,23 +108,12 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/globals_enum.html
 %%DOCSDIR%%/reference/html/globals_eval.html
 %%DOCSDIR%%/reference/html/globals_func.html
-%%DOCSDIR%%/reference/html/globals_func_0x62.html
-%%DOCSDIR%%/reference/html/globals_func_0x63.html
-%%DOCSDIR%%/reference/html/globals_func_0x67.html
-%%DOCSDIR%%/reference/html/globals_func_0x69.html
-%%DOCSDIR%%/reference/html/globals_func_0x6d.html
-%%DOCSDIR%%/reference/html/globals_func_0x70.html
-%%DOCSDIR%%/reference/html/globals_func_0x72.html
-%%DOCSDIR%%/reference/html/globals_func_0x74.html
-%%DOCSDIR%%/reference/html/globals_func_0x7a.html
 %%DOCSDIR%%/reference/html/globals_type.html
 %%DOCSDIR%%/reference/html/globals_vars.html
 %%DOCSDIR%%/reference/html/index.html
-%%DOCSDIR%%/reference/html/magnifier-main_8c-source.html
 %%DOCSDIR%%/reference/html/magnifier-main_8c.html
 %%DOCSDIR%%/reference/html/magnifier-private_8h-source.html
 %%DOCSDIR%%/reference/html/magnifier-private_8h.html
-%%DOCSDIR%%/reference/html/magnifier_8c-source.html
 %%DOCSDIR%%/reference/html/magnifier_8c.html
 %%DOCSDIR%%/reference/html/magnifier_8h-source.html
 %%DOCSDIR%%/reference/html/magnifier_8h.html
@@ -186,7 +166,6 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/structtiming.html
 %%DOCSDIR%%/reference/html/zoom-region-private_8h-source.html
 %%DOCSDIR%%/reference/html/zoom-region-private_8h.html
-%%DOCSDIR%%/reference/html/zoom-region_8c-source.html
 %%DOCSDIR%%/reference/html/zoom-region_8c.html
 %%DOCSDIR%%/reference/html/zoom-region_8h-source.html
 %%DOCSDIR%%/reference/html/zoom-region_8h.html
@@ -285,25 +264,69 @@ share/locale/vi/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
+@dirrm share/gnome/idl/gnome-mag-1.0
+@dirrm share/gnome/gnome-mag/1_32
+@dirrm share/gnome/gnome-mag
+@dirrm %%DOCSDIR%%/reference/html
+@dirrm %%DOCSDIR%%/reference
+@dirrm %%DOCSDIR%%
+@dirrm include/gnome-mag-1.0/magnifier
+@dirrm include/gnome-mag-1.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@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/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/tk/LC_MESSAGES
+@dirrmtry share/locale/tk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@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/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mi/LC_MESSAGES
+@dirrmtry share/locale/mi
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@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/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang
-@dirrm share/gnome/idl/gnome-mag-1.0
-@dirrm share/gnome/gnome-mag/1_32
-@dirrm share/gnome/gnome-mag
-@dirrm %%DOCSDIR%%/reference/html
-@dirrm %%DOCSDIR%%/reference
-@dirrm %%DOCSDIR%%
-@dirrm include/gnome-mag-1.0/magnifier
-@dirrm include/gnome-mag-1.0