author: Joe Marcus Clarke <marcus@FreeBSD.org> 2006-10-14 08:54:54 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2006-10-14 08:54:54 +0000
commit: 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch)
tree: 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /devel
parent: 7aad84f808b93baa6a7077ce0b47573b9c4c79a0 (diff)
download: ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.tar.gz
ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.zip
44 files changed, 374 insertions, 119 deletions
diff --git a/devel/alleyoop/Makefile b/devel/alleyoop/Makefile
index f0a881e6706e..75b51b0626d4 100644
--- a/devel/alleyoop/Makefile
+++ b/devel/alleyoop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alleyoop
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,10 +25,10 @@ DEPRECATED=	${BROKEN}
 EXPIRATION_DATE=2006-12-01
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yex
+USE_XLIB=	yex
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehier \
+USE_GNOME=	gnomeprefix \
 		gconf2 \
 		glib20 \
 		gtk20 \
diff --git a/devel/alleyoop/pkg-plist b/devel/alleyoop/pkg-plist
index bf907c9e468d..1a275e1cf3c6 100644
--- a/devel/alleyoop/pkg-plist
+++ b/devel/alleyoop/pkg-plist
@@ -29,3 +29,23 @@ share/locale/sr@Latn/LC_MESSAGES/alleyoop.mo
 share/locale/sv/LC_MESSAGES/alleyoop.mo
 share/locale/uk/LC_MESSAGES/alleyoop.mo
 share/locale/zh_CN/LC_MESSAGES/alleyoop.mo
+@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/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@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/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
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 390506128ff8..d8a8457501b3 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/bonobo/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
 #
 
 PORTNAME=	bonobo
 PORTVERSION=	1.0.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
@@ -17,13 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The component and compound document system for GNOME
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix oaf gnomehier gnomeprint
 USE_GETTEXT=	yes
 GNOME_HTML_DIR=	${PREFIX}/share/doc/bonobo
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 4cc3ae908a2e..cd3f5acaa7b8 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -251,3 +251,31 @@ share/locale/zh_TW/LC_MESSAGES/bonobo.mo
 @dirrm %%DOCSDIR%%/bonobo
 @dirrm %%DOCSDIR%%
 @dirrm include/gnome-1.0/bonobo
+@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/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/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 1dae10a0e7ae..46839bcbda2a 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	devhelp
 PORTVERSION=	0.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C,^([[:digit:]]+\.[[:digit:]]+).*,\1,}
@@ -16,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Developer help browser for GNOME 2
 
-BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+BUILD_DEPENDS=	${LOCALBASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	${LOCALBASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
 MOZILLA=	mozilla
 
@@ -30,12 +30,12 @@ MOZILLA=	firefox
 .endif
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	${X11BASE}/lib/${MOZILLA}
+USE_LDCONFIG=	${LOCALBASE}/lib/${MOZILLA}
 GCONF_SCHEMAS=	devhelp.schemas
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 6f3906d576ca..ae12a8397655 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -76,5 +76,33 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrm share/gnome/devhelp
 @dirrm include/devhelp-1.0/devhelp
 @dirrm include/devhelp-1.0
+@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/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@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/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@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
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 3247d29b113e..a82ce60e0de7 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/gconf/Makefile,v 1.2 2006/09/10 00:51:07 mezz Exp $
 #
 
 PORTNAME=	gconf
 PORTVERSION=	1.0.9
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/GConf/1.0
@@ -21,10 +22,10 @@ LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/gconf/pkg-plist b/devel/gconf/pkg-plist
index 7ff843231b9e..cc6ceb612da6 100644
--- a/devel/gconf/pkg-plist
+++ b/devel/gconf/pkg-plist
@@ -64,3 +64,31 @@ share/locale/zh_CN/LC_MESSAGES/GConf.mo
 @dirrm include/gconf/1/gconf
 @dirrm include/gconf/1
 @dirrm etc/gconf/1
+@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/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
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 6d055fca1b72..944042f0e52a 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconfmm26/Makefile,v 1.10 2006/04/13 07:52:32 bland Exp $
+#   $MCom: ports/devel/gconfmm26/Makefile,v 1.14 2006/08/21 15:35:55 ahze Exp $
 #
 
 PORTNAME=	gconfmm
-PORTVERSION=	2.14.2
+PORTVERSION=	2.16.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,17 +18,17 @@ COMMENT=	C++ wrapper for gconf2 API library
 
 LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
-		${X11BASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24
+		${LOCALBASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24
 
 LATEST_LINK=	gconfmm26
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_GNOME=	gnomehack gconf2
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
 PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index d83ce30ad974..c74297b16ff2 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.14.2.tar.bz2) = adcaeb572c466c1395b35d0271ac6438
-SHA256 (gnome2/gconfmm-2.14.2.tar.bz2) = b9ef70b158d254b8bdce6f7aeb252a84239a649ce2db0ab4c11d8efeca08c88b
-SIZE (gnome2/gconfmm-2.14.2.tar.bz2) = 275781
+MD5 (gnome2/gconfmm-2.16.0.tar.bz2) = 2b3aa57276f6f63c4effc585ba205a3d
+SHA256 (gnome2/gconfmm-2.16.0.tar.bz2) = 514f1062d85b7b3843f461b095b64551f20e647386dab6a513982af52e0392f2
+SIZE (gnome2/gconfmm-2.16.0.tar.bz2) = 275789
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 8e250bdac660..5c5534e2cc40 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -3,11 +3,11 @@
 # Whom:					dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
-#
+#    $MCom: ports/devel/gcvs/Makefile,v 1.1 2006/10/07 17:10:25 ahze Exp $
 
 PORTNAME=	gcvs
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	devel tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -19,8 +19,9 @@ COMMENT=	High-end interface client for CVS
 BUILD_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 RUN_DEPENDS+=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
+BROKEN=	Does not build
+
 USE_GETOPT_LONG=yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -32,6 +33,6 @@ MAN1=		cvs.1
 MAN5=		cvs.5
 MAN8=		cvsbug.8
 INFO=		cvs cvsclient
-USE_AUTOTOOLS=	automake:14:env autoconf:213:env
+USE_AUTOTOOLS=	automake:15:env autoconf:259:env
 
 .include <bsd.port.mk>
diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile
index 04577ce383cf..03b6ec142d2d 100644
--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib-java/Makefile,v 1.2 2005/10/29 22:06:05 marcus Exp $
+#   $MCom: ports/devel/glib-java/Makefile,v 1.4 2006/09/14 12:37:40 ahze Exp $
 #
 
 PORTNAME=	glib-java
-PORTVERSION=	0.2.5
+PORTVERSION=	0.2.6
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.2
@@ -18,7 +18,7 @@ COMMENT=	Java wrapper GLib 2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
diff --git a/devel/glib-java/distinfo b/devel/glib-java/distinfo
index 0655eba3025c..faeb48896762 100644
--- a/devel/glib-java/distinfo
+++ b/devel/glib-java/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-java-0.2.5.tar.bz2) = 83d49e96f6bc806aead66b83be542ef0
-SHA256 (gnome2/glib-java-0.2.5.tar.bz2) = 777b3b064ad5daae9890ca08698bff662ff0c397a968d74ada3209161fb3ffc1
-SIZE (gnome2/glib-java-0.2.5.tar.bz2) = 229396
+MD5 (gnome2/glib-java-0.2.6.tar.bz2) = 80aa32ba4901ed92a1ef8a53fd9157e5
+SHA256 (gnome2/glib-java-0.2.6.tar.bz2) = 57733a9308c9f6781411e38b8936fff99d33298cc65790b63be67b15678a086b
+SIZE (gnome2/glib-java-0.2.6.tar.bz2) = 229797
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 29e3fa37fb6f..cda44db471d7 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glibmm/Makefile,v 1.31 2006/04/14 21:55:21 mezz Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.37 2006/09/29 20:47:23 ahze Exp $
 #
 
 PORTNAME=	glibmm
-PORTVERSION=	2.10.7
+PORTVERSION=	2.12.2
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -29,7 +29,7 @@ USE_GCC=	3.4
 USE_GNOME=	gnomehack gnometarget glib20
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
 PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 2046b7195944..a551edef5930 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.10.7.tar.bz2) = f64b962ec2f9ec7e7daebff9769680e3
-SHA256 (gnome2/glibmm-2.10.7.tar.bz2) = 55ec9aae13c47821835a11ebcd3747df1f30213072197716f45c7822a412699a
-SIZE (gnome2/glibmm-2.10.7.tar.bz2) = 2353315
+MD5 (gnome2/glibmm-2.12.2.tar.bz2) = a70be72261b19a080b1666e5e04fd43a
+SHA256 (gnome2/glibmm-2.12.2.tar.bz2) = 9280ae9c45fa0178dea65778d7fcf02d06988c9168804aa3ca9e649e33dd74d8
+SIZE (gnome2/glibmm-2.12.2.tar.bz2) = 2351574
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 48c146419b57..8116f1a61932 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.17 2006/04/13 07:52:32 bland Exp $
+#   $MCom: ports/devel/gnome-vfsmm/Makefile,v 1.21 2006/08/21 15:51:25 ahze Exp $
 #
 
 PORTNAME=	gnome-vfsmm
-PORTVERSION=	2.14.0
+PORTVERSION=	2.16.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,12 +20,11 @@ LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GCC=	3.4
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomevfs2
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
 PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo
index 6678e003e9e7..49ba615d3dc1 100644
--- a/devel/gnome-vfsmm/distinfo
+++ b/devel/gnome-vfsmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = bd5c3796e417a9780201835060461be3
-SHA256 (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = c59e640cdff8f877a3eae0e39a67e2ff07485290d8abccffbb522c54ccccb796
-SIZE (gnome2/gnome-vfsmm-2.14.0.tar.bz2) = 324357
+MD5 (gnome2/gnome-vfsmm-2.16.0.tar.bz2) = 523d7195cabaf2ecfeda9f6683f475d1
+SHA256 (gnome2/gnome-vfsmm-2.16.0.tar.bz2) = 1db5a031a0cc3649c487ba85cd6116f73aab067f1b8ff2370733dbc42e6b70e1
+SIZE (gnome2/gnome-vfsmm-2.16.0.tar.bz2) = 328827
diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index cc1457909986..d2d590d4a4d7 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -3,10 +3,11 @@
 # Whom:			giffunip
 #
 # $FreeBSD$
-#
+#    $MCom: ports/devel/lasi/Makefile,v 1.1 2006/10/04 20:25:40 ahze Exp $
 
 PORTNAME=	lasi
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.unifont.org/lasi/download/
 
diff --git a/devel/lasi/files/patch-src_drawGlyph.cpp b/devel/lasi/files/patch-src_drawGlyph.cpp
new file mode 100644
index 000000000000..18338e6e1dda
--- /dev/null
+++ b/devel/lasi/files/patch-src_drawGlyph.cpp
@@ -0,0 +1,34 @@
+--- src/drawGlyph.cpp.orig	Wed Oct  4 16:21:41 2006
++++ src/drawGlyph.cpp	Wed Oct  4 16:23:29 2006
+@@ -81,7 +81,7 @@
+   return 0;
+ }
+ 
+-static int moveTo(FT_Vector* pftVec, void* data) {
++static int moveTo(const FT_Vector* pftVec, void* data) {
+   StateOfDrawGlyph* const state = reinterpret_cast<StateOfDrawGlyph* const>(data);
+   state->os() << (state->isNewPath() ? "newpath" : "closepath") << endl;
+   state->setNewPathFalse();
+@@ -89,19 +89,19 @@
+   return 0;
+ }
+ 
+-static int lineTo(FT_Vector* pftVec, void* data) {
++static int lineTo(const FT_Vector* pftVec, void* data) {
+   xTo(pftVec, data, "lineto");
+   return 0;
+ }
+ 
+-static int cubicTo(FT_Vector* ctrlPt1, FT_Vector* ctrlPt2, FT_Vector* pEndPt, void* data) {
++static int cubicTo(const FT_Vector* ctrlPt1, const FT_Vector* ctrlPt2, const FT_Vector* pEndPt, void* data) {
+   StateOfDrawGlyph* const state = reinterpret_cast<StateOfDrawGlyph* const>(data);
+   state->os() << *ctrlPt1 << " " << *ctrlPt2 << " " << *pEndPt << " curveto" << endl;
+   state->setStartPt(*pEndPt);
+   return 0;
+ }
+ 
+-static int conicTo(FT_Vector* pCtrlPt, FT_Vector* pEndPt, void* data) {
++static int conicTo(const FT_Vector* pCtrlPt, const FT_Vector* pEndPt, void* data) {
+   StateOfDrawGlyph* const state = reinterpret_cast<StateOfDrawGlyph* const>(data);
+   FT_Vector ctrlPt1 = (state->startPt() + 2 * *pCtrlPt) / 3;
+   FT_Vector ctrlPt2 = (*pEndPt + 2 * *pCtrlPt) / 3;
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 7b1c0860e0cb..140b06f7de08 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libglademm
 PORTVERSION=	2.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
@@ -19,7 +19,7 @@ COMMENT=	C++ wrapper for libglade2 library
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libglade2
 USE_AUTOTOOLS=	libtool:15
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 85f389f72885..855ea368d2bb 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -3,11 +3,12 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/devel/libglademm24/Makefile,v 1.1 2006/02/25 20:51:44 marcus Exp $
+#   $MCom: ports/devel/libglademm24/Makefile,v 1.8 2006/08/19 19:06:16 mezz Exp $
 #
 
 PORTNAME=	libglademm
 PORTVERSION=	2.6.3
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -22,7 +23,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 LATEST_LINK=	libglademm24
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_GNOME=	gnomehack libglade2
diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile
index b3085265c065..1eb637898184 100644
--- a/devel/libnotify/Makefile
+++ b/devel/libnotify/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	libnotify
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/libnotify/
 
 MAINTAINER=	andreas@syndrom23.de
 COMMENT=	A library for desktop notifications
 
-LIB_DEPENDS=	dbus-1.2:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		popt.0:${PORTSDIR}/devel/popt
 
 USE_GNOME=	gnomehack gnometarget intlhack glib20 gtk20
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index d4343172c5a4..be57ecf06b86 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/devel/libunicode/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $
 
 PORTNAME=	libunicode
 PORTVERSION=	0.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/libunicode/0.4
@@ -17,9 +17,9 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for manipulating Unicode characters and strings
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index b2ff6cdc1459..a29bb93c0ce3 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	maketool
 PORTVERSION=	0.8.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://home.alphalink.com.au/~gnb/maketool/downloads/
 
diff --git a/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c b/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c
new file mode 100644
index 000000000000..da481dae85d3
--- /dev/null
+++ b/devel/maketool/files/patch-lib_gtk2_gtk_gtkctree.c
@@ -0,0 +1,50 @@
+--- lib/gtk2/gtk/gtkctree.c.orig	Sun Oct  8 23:15:57 2006
++++ lib/gtk2/gtk/gtkctree.c	Sun Oct  8 23:18:58 2006
+@@ -563,24 +563,12 @@ gtk_ctree_set_arg (GtkObject      *objec
+   switch (arg_id)
+     {
+     case ARG_N_COLUMNS: /* construct-only arg, only set at construction time */
+-      g_return_if_fail (clist->row_mem_chunk == NULL);
+       clist->columns = MAX (1, GTK_VALUE_UINT (*arg));
+-      clist->row_mem_chunk = g_mem_chunk_new ("ctree row mem chunk",
+-					      sizeof (GtkCTreeRow),
+-					      sizeof (GtkCTreeRow)
+-					      * CLIST_OPTIMUM_SIZE,
+-					      G_ALLOC_AND_FREE);
+-      clist->cell_mem_chunk = g_mem_chunk_new ("ctree cell mem chunk",
+-					       sizeof (GtkCell) * clist->columns,
+-					       sizeof (GtkCell) * clist->columns
+-					       * CLIST_OPTIMUM_SIZE,
+-					       G_ALLOC_AND_FREE);
+       ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
+       break;
+     case ARG_TREE_COLUMN: /* construct-only arg, only set at construction time */
+       ctree->tree_column = GTK_VALUE_UINT (*arg);
+-      if (clist->row_mem_chunk)
+-	ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
++      ctree->tree_column = CLAMP (ctree->tree_column, 0, clist->columns);
+       break;
+     case ARG_INDENT:
+       gtk_ctree_set_indent (ctree, GTK_VALUE_UINT (*arg));
+@@ -3197,8 +3185,8 @@ row_new (GtkCTree *ctree)
+   int i;
+ 
+   clist = GTK_CLIST (ctree);
+-  ctree_row = g_chunk_new (GtkCTreeRow, clist->row_mem_chunk);
+-  ctree_row->row.cell = g_chunk_new (GtkCell, clist->cell_mem_chunk);
++  ctree_row = g_slice_new (GtkCTreeRow);
++  ctree_row->row.cell = g_slice_alloc (sizeof (GtkCell) * clist->columns);
+ 
+   for (i = 0; i < clist->columns; i++)
+     {
+@@ -3286,8 +3274,8 @@ row_delete (GtkCTree    *ctree,
+       dnotify (ddata);
+     }
+ 
+-  g_mem_chunk_free (clist->cell_mem_chunk, ctree_row->row.cell);
+-  g_mem_chunk_free (clist->row_mem_chunk, ctree_row);
++  g_slice_free1 (sizeof (GtkCell) * clist->columns, ctree_row->row.cell);
++  g_slice_free (GtkCTreeRow, ctree_row);
+ }
+ 
+ static void
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 43c84c1dac59..ded7de44e514 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/oaf/Makefile,v 1.2 2006/09/10 00:51:09 mezz Exp $
 #
 
 PORTNAME=	oaf
 PORTVERSION=	0.6.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/oaf/0.6
@@ -19,12 +20,12 @@ COMMENT=	Object Activation Framework for GNOME
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk12 orbit libxml
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS= --enable-static --enable-shared \
 		--disable-more-warnings
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/oaf/pkg-plist b/devel/oaf/pkg-plist
index 59a4b1ac80f2..6ae0a769c48e 100644
--- a/devel/oaf/pkg-plist
+++ b/devel/oaf/pkg-plist
@@ -63,3 +63,31 @@ share/locale/zh_TW/LC_MESSAGES/oaf.mo
 @dirrm include/liboaf
 @dirrm etc/oaf
 @unexec ps gx | grep '[0-9]:[0-9][0-9]\.[0-9][0-9] oafd --ac-activate' | awk '{print $1}' | xargs kill 2>/dev/null || true
+@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
diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile
index 87b861f593f6..3150e8824413 100644
--- a/devel/p5-Glib2/Makefile
+++ b/devel/p5-Glib2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Glib2
 PORTVERSION=	1.140
+PORTREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN/Glib SF/gtk2-perl
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Glib2/pkg-plist b/devel/p5-Glib2/pkg-plist
index 775e980cf89a..4f38c222e6a2 100644
--- a/devel/p5-Glib2/pkg-plist
+++ b/devel/p5-Glib2/pkg-plist
@@ -1,4 +1,5 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/Glib.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Glib/BookmarkFile.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Glib/Boxed.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Glib/CodeGen.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Glib/Error.pod
diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index 1cce9ff6c30e..ba2d833063d0 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	preps
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://webpages.charter.net/stuffle/preps/download/files/
 PKGNAMESUFFIX=	-gui
@@ -19,9 +19,9 @@ COMMENT=	Problem reporting system
 
 RUN_DEPENDS=	prepsdb_tool:${PORTSDIR}/devel/prepstools
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 gconf2 libgnomeui
+USE_GNOME=	gnomehack gnomeprefix gtk20 gconf2 libgnomeui
 USE_PGSQL=	yes
 INSTALLS_OMF=	yes
 GCONF_SCHEMAS=	preps.schema
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--with-pgsqldir=${LOCALBASE} \
 			--localstatedir=/var
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#^\(omf_dest_dir\).*#\1=${PREFIX}/share/gnome/omf/@PACKAGE@#' \
-		${WRKSRC}/omf.make ${WRKSRC}/help/C/Makefile.in
+	@${REINPLACE_CMD} -e 's|@PACKAGE@/gnome/help|help|g' \
+		${WRKSRC}/help/C/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/preps-gui/pkg-plist b/devel/preps-gui/pkg-plist
index 2e674abb8e3f..d35c0dc66ee3 100644
--- a/devel/preps-gui/pkg-plist
+++ b/devel/preps-gui/pkg-plist
@@ -1,34 +1,32 @@
 @comment $FreeBSD$
 bin/preps
 share/gnome/apps/Development/PRepS.desktop
+share/gnome/help/preps/C/figures/arch_dlg.png
+share/gnome/help/preps/C/figures/attriblist.png
+share/gnome/help/preps/C/figures/editpr.png
+share/gnome/help/preps/C/figures/findpr.png
+share/gnome/help/preps/C/figures/gentab.png
+share/gnome/help/preps/C/figures/login.png
+share/gnome/help/preps/C/figures/main_win_arch.png
+share/gnome/help/preps/C/figures/mainwin.png
+share/gnome/help/preps/C/figures/mainwintab.png
+share/gnome/help/preps/C/figures/newpr.png
+share/gnome/help/preps/C/figures/printdlg.png
+share/gnome/help/preps/C/figures/prjedit.png
+share/gnome/help/preps/C/figures/prjvers.png
+share/gnome/help/preps/C/figures/prquery.png
+share/gnome/help/preps/C/figures/ptedit.png
+share/gnome/help/preps/C/figures/rawsql.png
+share/gnome/help/preps/C/figures/sevredit.png
+share/gnome/help/preps/C/figures/statedit.png
+share/gnome/help/preps/C/figures/useredit.png
+share/gnome/help/preps/C/legal.xml
+share/gnome/help/preps/C/preps.xml
 share/gnome/omf/preps/preps-C.omf
-share/pixmaps/preps.png
-%%DATADIR%%/preps_logo.xpm
-%%DATADIR%%/gnome/help/preps/C/legal.xml
-%%DATADIR%%/gnome/help/preps/C/preps.xml
-%%DATADIR%%/gnome/help/preps/C/figures/arch_dlg.png
-%%DATADIR%%/gnome/help/preps/C/figures/attriblist.png
-%%DATADIR%%/gnome/help/preps/C/figures/editpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/findpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/gentab.png
-%%DATADIR%%/gnome/help/preps/C/figures/login.png
-%%DATADIR%%/gnome/help/preps/C/figures/main_win_arch.png
-%%DATADIR%%/gnome/help/preps/C/figures/mainwin.png
-%%DATADIR%%/gnome/help/preps/C/figures/mainwintab.png
-%%DATADIR%%/gnome/help/preps/C/figures/newpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/printdlg.png
-%%DATADIR%%/gnome/help/preps/C/figures/prjedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/prjvers.png
-%%DATADIR%%/gnome/help/preps/C/figures/prquery.png
-%%DATADIR%%/gnome/help/preps/C/figures/ptedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/rawsql.png
-%%DATADIR%%/gnome/help/preps/C/figures/sevredit.png
-%%DATADIR%%/gnome/help/preps/C/figures/statedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/useredit.png
+share/gnome/pixmaps/preps.png
+share/gnome/preps/preps_logo.xpm
+@dirrm share/gnome/preps
 @dirrm share/gnome/omf/preps
-@dirrm %%DATADIR%%/gnome/help/preps/C/figures
-@dirrm %%DATADIR%%/gnome/help/preps/C
-@dirrm %%DATADIR%%/gnome/help/preps
-@dirrm %%DATADIR%%/gnome/help
-@dirrm %%DATADIR%%/gnome
-@dirrm %%DATADIR%%
+@dirrm share/gnome/help/preps/C/figures
+@dirrm share/gnome/help/preps/C
+@dirrm share/gnome/help/preps
diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index 335205ff8ca9..02ba1a264f72 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -3,11 +3,12 @@
 # Whom:			michael johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#    $MCom: ports-stable/devel/py-xdg/Makefile,v 1.4 2005/08/12 00:08:44 ahze Exp $
+#    $MCom: ports/devel/py-xdg/Makefile,v 1.2 2006/09/02 14:38:55 ahze Exp $
 #
 
 PORTNAME=	xdg
 PORTVERSION=	0.15
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.freedesktop.org/~lanius/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +22,7 @@ USE_PYDISTUTILS=yes
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/etc|${X11BASE}/etc|g ; \
+		's|/etc|${LOCALBASE}/etc|g ; \
 		s|%%X11BASE%%|${X11BASE}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${WRKSRC}/xdg/BaseDirectory.py \
diff --git a/devel/py-xdg/files/patch-xdg::BaseDirectory.py b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
index 52e303d8124c..47bd3f33a7ab 100644
--- a/devel/py-xdg/files/patch-xdg::BaseDirectory.py
+++ b/devel/py-xdg/files/patch-xdg::BaseDirectory.py
@@ -5,7 +5,7 @@
  
  xdg_data_dirs = [xdg_data_home] + \
 -	os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
-+	os.environ.get('XDG_DATA_DIRS', '%%X11BASE%%/share/gnome:%%X11BASE%%/share:%%LOCALBASE%%/share:/usr/share').split(':')
++	os.environ.get('XDG_DATA_DIRS', '%%LOCALBASE%%/share/gnome:%%LOCALBASE%%/share:/usr/share').split(':')
  
  xdg_config_home = os.environ.get('XDG_CONFIG_HOME',
  			os.path.join(_home, '.config'))
diff --git a/devel/py-xdg/files/patch-xdg::IconTheme.py b/devel/py-xdg/files/patch-xdg::IconTheme.py
index c368e385f246..cc5714b82a78 100644
--- a/devel/py-xdg/files/patch-xdg::IconTheme.py
+++ b/devel/py-xdg/files/patch-xdg::IconTheme.py
@@ -7,7 +7,7 @@
 -icondirs.append("/usr/share/pixmaps")
 +icondirs.append("%%X11BASE%%/share/pixmaps")
 +icondirs.append("%%LOCALBASE%%/share/pixmaps")
-+icondirs.append("%%X11BASE%%/share/gnome/pixmaps")
++icondirs.append("%%LOCALBASE%%/share/gnome/pixmaps")
 +icondirs.append("%%X11BASE%%/share/icons")
 +icondirs.append("%%LOCALBASE%%/share/icons")
  icondirs.append(os.path.expanduser("~/.icons"))
diff --git a/devel/py-xdg/files/patch-xdg_Menu.py b/devel/py-xdg/files/patch-xdg_Menu.py
new file mode 100644
index 000000000000..186fda59171f
--- /dev/null
+++ b/devel/py-xdg/files/patch-xdg_Menu.py
@@ -0,0 +1,13 @@
+--- xdg/Menu.py.orig	Thu Aug 11 07:37:48 2005
++++ xdg/Menu.py	Sat Sep  2 05:10:19 2006
+@@ -494,6 +494,10 @@
+ 	if not filename:
+ 		filename = __getFileName("applications.menu")
+ 
++	# use gnome if no filename given
++	if not filename:
++		filename = __getFileName("gnome-applications.menu")
++
+ 	if not filename:
+ 		raise ParsingError('File not found', "/etc/xdg/menus/applications.menu")
+ 
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 4b9bf08ec08b..f673625d6997 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		regexxer
 PORTVERSION=		0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=		devel textproc gnome
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
 			ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/:pcre \
@@ -25,7 +25,7 @@ LIB_DEPENDS=		gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
 			glademm-2.4:${PORTSDIR}/devel/libglademm24
 
 USE_BZIP2=		yes
-USE_X_PREFIX=		yes
+USE_XLIB=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_GNOME=		gnomehack gnomeprefix gnometarget intltool intlhack
@@ -33,6 +33,8 @@ CONFIGURE_ARGS=		PCRE_CONFIG="${PCRE_WRKDIR}/.install/bin/pcre-config"
 CONFIGURE_ENV=		CPPFLAGS="-I${PCRE_WRKDIR}/.install/include -I${LOCALBASE}/include" \
 			LDFLAGS="-L${PCRE_WRKDIR}/.install/lib -L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=		regexxer.schemas
+
 PCRE_NAME=		pcre
 PCRE_VERSION=		4.5
 PCRE_WRKDIR=		${WRKDIR}/${PCRE_NAME}-${PCRE_VERSION}
diff --git a/devel/regexxer/pkg-plist b/devel/regexxer/pkg-plist
index def9d28900c2..54bdb44a8944 100644
--- a/devel/regexxer/pkg-plist
+++ b/devel/regexxer/pkg-plist
@@ -1,7 +1,4 @@
 bin/regexxer
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/regexxer.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/regexxer.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/regexxer.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/regexxer.desktop
 share/gnome/pixmaps/regexxer.png
 share/gnome/regexxer/aboutdialog.glade
@@ -19,3 +16,7 @@ share/locale/pt/LC_MESSAGES/regexxer.mo
 share/locale/pt_BR/LC_MESSAGES/regexxer.mo
 share/locale/sv/LC_MESSAGES/regexxer.mo
 @dirrm share/gnome/regexxer
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index aec069a8d0aa..f2673b557e36 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	0.030809
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.etek.chalmers.se/~e8cal1/sge/files/ \
 		http://www.digitalfanatics.org/cal/sge/files/
diff --git a/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp b/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp
index 44571a375c9f..83cff497cf45 100644
--- a/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp
+++ b/devel/sdl_sge/files/patch-sge030809-sge_tt_text.cpp
@@ -1,17 +1,26 @@
-diff -ur sge030809_orig/sge_tt_text.cpp sge030809/sge_tt_text.cpp
---- sge030809_orig/sge_tt_text.cpp	Fri Aug  8 14:48:08 2003
-+++ sge_tt_text.cpp	Sun Jul 30 20:49:29 2006
-@@ -36,9 +36,10 @@
+--- sge_tt_text.cpp.orig	Fri Aug  8 08:48:08 2003
++++ sge_tt_text.cpp	Wed Oct  4 11:43:47 2006
+@@ -36,10 +36,10 @@
  #include "sge_textpp.h"
  
  #ifndef _SGE_NOTTF
 -#include <freetype/freetype.h>
 -#include <freetype/ftoutln.h>
 -#include <freetype/ttnameid.h>
+-#include <freetype/internal/ftobjs.h>
 +#include <ft2build.h>
 +#include FT_FREETYPE_H
 +#include FT_OUTLINE_H
 +#include FT_TRUETYPE_IDS_H
- #include <freetype/internal/ftobjs.h>
  
  /* The structure used to hold glyph information (cached) */
+ struct glyph {
+@@ -294,7 +294,7 @@
+ 	}
+ 	memset(stream, 0, sizeof(*stream));
+ 
+-	stream->memory = _sge_library->memory;
++	stream->memory = NULL;
+ 	stream->read = RWread;
+ 	stream->descriptor.pointer = src;
+ 	stream->pos = (unsigned long)position;
diff --git a/devel/sge/Makefile b/devel/sge/Makefile
index aec069a8d0aa..f2673b557e36 100644
--- a/devel/sge/Makefile
+++ b/devel/sge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sge
 PORTVERSION=	0.030809
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel graphics
 MASTER_SITES=	http://www.etek.chalmers.se/~e8cal1/sge/files/ \
 		http://www.digitalfanatics.org/cal/sge/files/
diff --git a/devel/sge/files/patch-sge030809-sge_tt_text.cpp b/devel/sge/files/patch-sge030809-sge_tt_text.cpp
index 44571a375c9f..83cff497cf45 100644
--- a/devel/sge/files/patch-sge030809-sge_tt_text.cpp
+++ b/devel/sge/files/patch-sge030809-sge_tt_text.cpp
@@ -1,17 +1,26 @@
-diff -ur sge030809_orig/sge_tt_text.cpp sge030809/sge_tt_text.cpp
---- sge030809_orig/sge_tt_text.cpp	Fri Aug  8 14:48:08 2003
-+++ sge_tt_text.cpp	Sun Jul 30 20:49:29 2006
-@@ -36,9 +36,10 @@
+--- sge_tt_text.cpp.orig	Fri Aug  8 08:48:08 2003
++++ sge_tt_text.cpp	Wed Oct  4 11:43:47 2006
+@@ -36,10 +36,10 @@
  #include "sge_textpp.h"
  
  #ifndef _SGE_NOTTF
 -#include <freetype/freetype.h>
 -#include <freetype/ftoutln.h>
 -#include <freetype/ttnameid.h>
+-#include <freetype/internal/ftobjs.h>
 +#include <ft2build.h>
 +#include FT_FREETYPE_H
 +#include FT_OUTLINE_H
 +#include FT_TRUETYPE_IDS_H
- #include <freetype/internal/ftobjs.h>
  
  /* The structure used to hold glyph information (cached) */
+ struct glyph {
+@@ -294,7 +294,7 @@
+ 	}
+ 	memset(stream, 0, sizeof(*stream));
+ 
+-	stream->memory = _sge_library->memory;
++	stream->memory = NULL;
+ 	stream->read = RWread;
+ 	stream->descriptor.pointer = src;
+ 	stream->pos = (unsigned long)position;
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index fa3a8e0c81a1..ef11dbb96024 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	titano
 PORTVERSION=	0.0.7
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,6 @@ COMMENT=	An IDE for GNOME desktop
 LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
 USE_GNOME=	gnomelibs libglade
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/devel/titano/pkg-plist b/devel/titano/pkg-plist
index 323d2fd5ecc2..2ec921f35b29 100644
--- a/devel/titano/pkg-plist
+++ b/devel/titano/pkg-plist
@@ -54,4 +54,5 @@ share/pixmaps/titano/gnome.png
 share/pixmaps/titano/gtk.png
 share/pixmaps/titano/logo.png
 @dirrm share/pixmaps/titano
+@dirrmtry share/pixmaps
 share/gnome/apps/Development/titano.desktop
diff --git a/devel/xfc/Makefile b/devel/xfc/Makefile
index 3b2063f2d9a1..9bdc71d7a7f5 100644
--- a/devel/xfc/Makefile
+++ b/devel/xfc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfc
 PORTVERSION=	4.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel xfce
 MASTER_SITES=	http://xfc.xfce.org/download/${PORTVERSION}/src/
 
@@ -21,7 +21,6 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GCC=	3.4+
 USE_GNOME=	glib20 gtk20 atk pango pkgconfig libglade2 gnomehack
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2006-10-14 08:54:54 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2006-10-14 08:54:54 +0000
commit	29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch)
tree	1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /devel
parent	7aad84f808b93baa6a7077ce0b47573b9c4c79a0 (diff)
download	ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.tar.gz ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.zip