- Update to 2.0.2

- MASTER_SITE_SOURCEFORGE -> MASTER_SITE_GNOME
- Use lthack
- Sort plist

8 files changed, 14 insertions, 36 deletions

diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 4898a97..129a488 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gconfmm
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.0.2
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkmm
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
@@ -21,7 +20,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gconf2
+USE_GNOME=	gnomehack lthack gconf2
 USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/devel/gconfmm/distinfo b/devel/gconfmm/distinfo
index b22aab7..f2ebe6b 100644
--- a/devel/gconfmm/distinfo
+++ b/devel/gconfmm/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gconfmm-2.0.1.tar.gz) = 9d8f9da08c021344ad94b10d1c962894
-SIZE (gnome2/gconfmm-2.0.1.tar.gz) = 258313
+MD5 (gnome2/gconfmm-2.0.2.tar.gz) = 55ca17a4b9cd744e797aefab826bdb21
+SIZE (gnome2/gconfmm-2.0.2.tar.gz) = 363645
diff --git a/devel/gconfmm/files/patch-configure b/devel/gconfmm/files/patch-configure
deleted file mode 100644
index e723c36..0000000
--- a/devel/gconfmm/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed May 21 12:55:00 2003
-+++ configure	Wed May 21 12:55:29 2003
-@@ -7850,6 +7850,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/gconfmm/pkg-plist b/devel/gconfmm/pkg-plist
index 0702380..8865ccf 100644
--- a/devel/gconfmm/pkg-plist
+++ b/devel/gconfmm/pkg-plist
@@ -1,3 +1,4 @@
+include/gconfmm-2.0/gconfmm.h
 include/gconfmm-2.0/gconfmm/callback.h
 include/gconfmm-2.0/gconfmm/changeset.h
 include/gconfmm-2.0/gconfmm/client.h
@@ -13,7 +14,6 @@ include/gconfmm-2.0/gconfmm/setinterface.h
 include/gconfmm-2.0/gconfmm/value.h
 include/gconfmm-2.0/gconfmm/value_listhelpers.h
 include/gconfmm-2.0/gconfmm/wrap_init.h
-include/gconfmm-2.0/gconfmm.h
 lib/gconfmm-2.0/include/gconfmmconfig.h
 lib/gconfmm-2.0/proc/m4/convert.m4
 lib/gconfmm-2.0/proc/m4/convert_gconfmm.m4
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 4898a97..129a488 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gconfmm
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.0.2
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkmm
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
@@ -21,7 +20,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gconf2
+USE_GNOME=	gnomehack lthack gconf2
 USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/devel/gconfmm26/distinfo b/devel/gconfmm26/distinfo
index b22aab7..f2ebe6b 100644
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gconfmm-2.0.1.tar.gz) = 9d8f9da08c021344ad94b10d1c962894
-SIZE (gnome2/gconfmm-2.0.1.tar.gz) = 258313
+MD5 (gnome2/gconfmm-2.0.2.tar.gz) = 55ca17a4b9cd744e797aefab826bdb21
+SIZE (gnome2/gconfmm-2.0.2.tar.gz) = 363645
diff --git a/devel/gconfmm26/files/patch-configure b/devel/gconfmm26/files/patch-configure
deleted file mode 100644
index e723c36..0000000
--- a/devel/gconfmm26/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed May 21 12:55:00 2003
-+++ configure	Wed May 21 12:55:29 2003
-@@ -7850,6 +7850,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/gconfmm26/pkg-plist b/devel/gconfmm26/pkg-plist
index 0702380..8865ccf 100644
--- a/devel/gconfmm26/pkg-plist
+++ b/devel/gconfmm26/pkg-plist
@@ -1,3 +1,4 @@
+include/gconfmm-2.0/gconfmm.h
 include/gconfmm-2.0/gconfmm/callback.h
 include/gconfmm-2.0/gconfmm/changeset.h
 include/gconfmm-2.0/gconfmm/client.h
@@ -13,7 +14,6 @@ include/gconfmm-2.0/gconfmm/setinterface.h
 include/gconfmm-2.0/gconfmm/value.h
 include/gconfmm-2.0/gconfmm/value_listhelpers.h
 include/gconfmm-2.0/gconfmm/wrap_init.h
-include/gconfmm-2.0/gconfmm.h
 lib/gconfmm-2.0/include/gconfmmconfig.h
 lib/gconfmm-2.0/proc/m4/convert.m4
 lib/gconfmm-2.0/proc/m4/convert_gconfmm.m4