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, 12 deletions

diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 4a027c033473..6286b38a095d 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.77 2006/04/13 07:52:39 bland Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.88 2006/10/02 23:42:29 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.10.3
+PORTVERSION=	3.12.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,11 +21,11 @@ LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui \
 		libgnomeprintui ltverhack
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 88125d5b0785..f4e41067dd8b 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtkhtml-3.10.3.tar.bz2) = 90b1807db0ef0e5d69442e1f85610ec4
-SHA256 (gnome2/gtkhtml-3.10.3.tar.bz2) = 182eac40325c7d279a3b48bbc53ed8299d97e5d75479ca553a62e2200a9eab27
-SIZE (gnome2/gtkhtml-3.10.3.tar.bz2) = 1269807
+MD5 (gnome2/gtkhtml-3.12.1.tar.bz2) = ac86f5770ea2d054644d14e7aa673eaa
+SHA256 (gnome2/gtkhtml-3.12.1.tar.bz2) = e374f0ab0df3429929baf2eb16f366f60f5134bf4ba139c4ce4b6bf925723a2f
+SIZE (gnome2/gtkhtml-3.12.1.tar.bz2) = 1278075
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 9bb8dfce8c6f..b8be05dbf59f 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -89,6 +89,7 @@ share/locale/az/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/be/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -119,14 +120,17 @@ share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ku/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/lv/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/mk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ml/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ms/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ne/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/nn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -149,12 +153,60 @@ share/locale/xh/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
 @dirrm share/gnome/gtkhtml-%%VERSION%%/icons
 @dirrm share/gnome/gtkhtml-%%VERSION%%
 @dirrm lib/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%/gtkhtml
 @dirrm include/libgtkhtml-%%VERSION%%
+@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/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@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/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@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