PR: ports/14303

Submitted by:Ade Lovett<ade@lovett.com>
Update to 0.5.3

10 files changed, 74 insertions, 18 deletions

diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 7fefabb31ed4..f1d1ab28237e 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,18 +1,26 @@
 # New ports collection makefile for:	glade
-# Version required:     0.4.1
+# Version required:     0.5.3
 # Date created:		29 June 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	glade-0.4.1
+DISTNAME=	glade-0.5.3
 CATEGORIES=	devel
 MASTER_SITES=   http://glade.pn.org/
 
 MAINTAINER=     dom@myrddin.demon.co.uk
 
+.if defined(USE_GNOME)
+LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+PLIST_GNOME=	${PKGDIR}/PLIST.gnome
+.else
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+CONFIGURE_ARGS=	--disable-gnome
+.endif
+
+PLIST=		${WRKDIR}/PLIST
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -20,11 +28,23 @@ FETCH_BEFORE_ARGS=	-b
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--disable-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/libs"
 
+.if !defined(USE_GNOME)
+pre-extract:
+	@${ECHO} "You can add hooks for GNOME by defining USE_GNOME"
+.endif
+
+post-patch:
+.if !defined(USE_GNOME)
+	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-nognome
+.endif
+
+pre-install:
+	@sort -r -o ${PLIST} ${PLIST_GNOME} ${PKGDIR}/PLIST
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/glade
diff --git a/devel/glade/distinfo b/devel/glade/distinfo
index 56f9dd9df05e..34c905e3f227 100644
--- a/devel/glade/distinfo
+++ b/devel/glade/distinfo
@@ -1 +1 @@
-MD5 (glade-0.4.1.tar.gz) = 742a40580b3576d3ea17dd19643b1d45
+MD5 (glade-0.5.3.tar.gz) = 0364807d88ba3f3f6eee20d47dea43c5
diff --git a/devel/glade/pkg-comment b/devel/glade/pkg-comment
index 03bc7f6ce638..7b6ad0d0aef4 100644
--- a/devel/glade/pkg-comment
+++ b/devel/glade/pkg-comment
@@ -1 +1 @@
-A user interface builder for GTK+
+A user interface builder for GTK+ and GNOME
diff --git a/devel/glade/pkg-descr b/devel/glade/pkg-descr
index 073df7e3568f..503d07c742c1 100644
--- a/devel/glade/pkg-descr
+++ b/devel/glade/pkg-descr
@@ -1,5 +1,5 @@
-This is Glade, a user interface builder for GTK+.  (GTK+, which
-stands for the Gimp ToolKit, is a library for creating graphical
-user interfaces for the X Window System. See http://www.gtk.org/)
+Glade is a RAD tool to enable quick & easy development of user interfaces
+for the GTK+ toolkit. It also contains built-in support for generating the
+C source code needed to recreate the interfaces.
 
-http://www.comp.lancs.ac.uk/~damon/builder/index.html
+WWW: http://glade.pn.org/
diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist
index 15334377a262..0b2da799d989 100644
--- a/devel/glade/pkg-plist
+++ b/devel/glade/pkg-plist
@@ -8,10 +8,18 @@ share/doc/glade/manual.txt
 share/doc/glade/notes.txt
 share/doc/glade/portability.txt
 share/doc/glade/source_code.txt
+share/glade/gtk/autogen.sh
+share/locale/da/LC_MESSAGES/glade.mo
 share/locale/de/LC_MESSAGES/glade.mo
+share/locale/en_GB/LC_MESSAGES/glade.mo
 share/locale/es/LC_MESSAGES/glade.mo
 share/locale/fr/LC_MESSAGES/glade.mo
+share/locale/it/LC_MESSAGES/glade.mo
 share/locale/ja/LC_MESSAGES/glade.mo
+share/locale/no/LC_MESSAGES/glade.mo
+share/locale/pl/LC_MESSAGES/glade.mo
 share/locale/pt_BR/LC_MESSAGES/glade.mo
 share/locale/ru/LC_MESSAGES/glade.mo
+@dirrm share/glade/gtk
+@dirrm share/glade
 @dirrm share/doc/glade
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 7fefabb31ed4..f1d1ab28237e 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,18 +1,26 @@
 # New ports collection makefile for:	glade
-# Version required:     0.4.1
+# Version required:     0.5.3
 # Date created:		29 June 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	glade-0.4.1
+DISTNAME=	glade-0.5.3
 CATEGORIES=	devel
 MASTER_SITES=   http://glade.pn.org/
 
 MAINTAINER=     dom@myrddin.demon.co.uk
 
+.if defined(USE_GNOME)
+LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+PLIST_GNOME=	${PKGDIR}/PLIST.gnome
+.else
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+CONFIGURE_ARGS=	--disable-gnome
+.endif
+
+PLIST=		${WRKDIR}/PLIST
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -20,11 +28,23 @@ FETCH_BEFORE_ARGS=	-b
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--disable-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/libs"
 
+.if !defined(USE_GNOME)
+pre-extract:
+	@${ECHO} "You can add hooks for GNOME by defining USE_GNOME"
+.endif
+
+post-patch:
+.if !defined(USE_GNOME)
+	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-nognome
+.endif
+
+pre-install:
+	@sort -r -o ${PLIST} ${PLIST_GNOME} ${PKGDIR}/PLIST
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/glade
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index 56f9dd9df05e..34c905e3f227 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1 +1 @@
-MD5 (glade-0.4.1.tar.gz) = 742a40580b3576d3ea17dd19643b1d45
+MD5 (glade-0.5.3.tar.gz) = 0364807d88ba3f3f6eee20d47dea43c5
diff --git a/devel/glade2/pkg-comment b/devel/glade2/pkg-comment
index 03bc7f6ce638..7b6ad0d0aef4 100644
--- a/devel/glade2/pkg-comment
+++ b/devel/glade2/pkg-comment
@@ -1 +1 @@
-A user interface builder for GTK+
+A user interface builder for GTK+ and GNOME
diff --git a/devel/glade2/pkg-descr b/devel/glade2/pkg-descr
index 073df7e3568f..503d07c742c1 100644
--- a/devel/glade2/pkg-descr
+++ b/devel/glade2/pkg-descr
@@ -1,5 +1,5 @@
-This is Glade, a user interface builder for GTK+.  (GTK+, which
-stands for the Gimp ToolKit, is a library for creating graphical
-user interfaces for the X Window System. See http://www.gtk.org/)
+Glade is a RAD tool to enable quick & easy development of user interfaces
+for the GTK+ toolkit. It also contains built-in support for generating the
+C source code needed to recreate the interfaces.
 
-http://www.comp.lancs.ac.uk/~damon/builder/index.html
+WWW: http://glade.pn.org/
diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist
index 15334377a262..0b2da799d989 100644
--- a/devel/glade2/pkg-plist
+++ b/devel/glade2/pkg-plist
@@ -8,10 +8,18 @@ share/doc/glade/manual.txt
 share/doc/glade/notes.txt
 share/doc/glade/portability.txt
 share/doc/glade/source_code.txt
+share/glade/gtk/autogen.sh
+share/locale/da/LC_MESSAGES/glade.mo
 share/locale/de/LC_MESSAGES/glade.mo
+share/locale/en_GB/LC_MESSAGES/glade.mo
 share/locale/es/LC_MESSAGES/glade.mo
 share/locale/fr/LC_MESSAGES/glade.mo
+share/locale/it/LC_MESSAGES/glade.mo
 share/locale/ja/LC_MESSAGES/glade.mo
+share/locale/no/LC_MESSAGES/glade.mo
+share/locale/pl/LC_MESSAGES/glade.mo
 share/locale/pt_BR/LC_MESSAGES/glade.mo
 share/locale/ru/LC_MESSAGES/glade.mo
+@dirrm share/glade/gtk
+@dirrm share/glade
 @dirrm share/doc/glade