Update to 2.6.0

6 files changed, 42 insertions, 59 deletions

diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 603175bc7c47..933c14e9bcc2 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -6,26 +6,33 @@
 #
 
 PORTNAME=	libpanelappletmm
-PORTVERSION=	1.3.1
-PORTREVISION=	2
+PORTVERSION=	2.6.0
 CATEGORIES=	x11-toolkits 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
-COMMENT=	C++ binding for the panel applet API
+COMMENT=	C++ wrapper for libpanelapplet library
 
-LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2 \
-		gconfmm-2.0:${PORTSDIR}/devel/gconfmm \
-		gnomeuimm-2.0:${PORTSDIR}/x11-toolkits/libgnomeuimm
+LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
+                gconfmm-2.6.1:${PORTSDIR}/devel/gconfmm26 \
+		gnomemm-2.6.1:${PORTSDIR}/x11/libgnomemm26
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GCC=	3.3
 USE_GNOME=	gnomehack gnomepanel
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
 
+PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libpanelappletmm/distinfo b/x11-toolkits/libpanelappletmm/distinfo
index c84eb40caa1a..a6263f88b53d 100644
--- a/x11-toolkits/libpanelappletmm/distinfo
+++ b/x11-toolkits/libpanelappletmm/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libpanelappletmm-1.3.1.tar.gz) = 6be7f0ae65d81f1e42b9e22427682972
-SIZE (gnome2/libpanelappletmm-1.3.1.tar.gz) = 233329
+MD5 (gnome2/libpanelappletmm-2.6.0.tar.bz2) = 74368673013ca6fe470d2b3f4a06b1df
+SIZE (gnome2/libpanelappletmm-2.6.0.tar.bz2) = 246596
diff --git a/x11-toolkits/libpanelappletmm/files/patch-Makefile.in b/x11-toolkits/libpanelappletmm/files/patch-Makefile.in
deleted file mode 100644
index 2d70c94f926d..000000000000
--- a/x11-toolkits/libpanelappletmm/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Dec  3 16:16:50 2003
-+++ Makefile.in	Thu Dec  4 03:39:42 2003
-@@ -93,7 +93,7 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- 
--SUBDIRS = tools libpanelapplet docs examples
-+SUBDIRS = tools libpanelapplet docs 
- DIST_SUBDIRS = $(SUBDIRS) scripts
- 
- EXTRA_DIST = libpanelappletmm.spec.in 		  build_shared/Makefile_build.am_fragment 		  build_shared/Makefile_build_gensrc.am_fragment 		  build_shared/Makefile_gensrc.am_fragment autogen.sh
diff --git a/x11-toolkits/libpanelappletmm/files/patch-configure b/x11-toolkits/libpanelappletmm/files/patch-configure
deleted file mode 100644
index 8c117297dcb6..000000000000
--- a/x11-toolkits/libpanelappletmm/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed May 21 15:52:43 2003
-+++ configure	Wed May 21 15:53:07 2003
-@@ -7854,6 +7854,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/x11-toolkits/libpanelappletmm/pkg-descr b/x11-toolkits/libpanelappletmm/pkg-descr
index 783cb4915ec1..7154f45098b4 100644
--- a/x11-toolkits/libpanelappletmm/pkg-descr
+++ b/x11-toolkits/libpanelappletmm/pkg-descr
@@ -1,5 +1,3 @@
-libpanelappletmm provides a C++ binding for the panel applet API.
-This API is simpler and more object oriented than
-the underlying C API.
+This is a set of thin C++ wrappers for libpanelapplet (part of gnomepanel).
 
 WWW: http://www.gtkmm.org/
diff --git a/x11-toolkits/libpanelappletmm/pkg-plist b/x11-toolkits/libpanelappletmm/pkg-plist
index eb457bf0bd62..1aa3fdc3b81d 100644
--- a/x11-toolkits/libpanelappletmm/pkg-plist
+++ b/x11-toolkits/libpanelappletmm/pkg-plist
@@ -1,24 +1,23 @@
-include/libpanelappletmm-2.0/libpanelappletmm.h
-include/libpanelappletmm-2.0/libpanelappletmm/applet.h
-include/libpanelappletmm-2.0/libpanelappletmm/enums.h
-include/libpanelappletmm-2.0/libpanelappletmm/factory.h
-include/libpanelappletmm-2.0/libpanelappletmm/init.h
-include/libpanelappletmm-2.0/libpanelappletmm/private.h
-include/libpanelappletmm-2.0/libpanelappletmm/private/applet_p.h
-include/libpanelappletmm-2.0/libpanelappletmm/private/enums_p.h
-include/libpanelappletmm-2.0/libpanelappletmm/types.h
-include/libpanelappletmm-2.0/libpanelappletmm/wrap_init.h
-lib/libpanelappletmm-1.3.a
-lib/libpanelappletmm-1.3.so
-lib/libpanelappletmm-1.3.so.2
-lib/libpanelappletmm-2.0/include/libpanelappletmmconfig.h
-lib/libpanelappletmm-2.0/proc/m4/convert.m4
-lib/libpanelappletmm-2.0/proc/m4/convert_libpanelappletmm.m4
-libdata/pkgconfig/libpanelappletmm-2.0.pc
-@dirrm lib/libpanelappletmm-2.0/proc/m4
-@dirrm lib/libpanelappletmm-2.0/proc
-@dirrm lib/libpanelappletmm-2.0/include
-@dirrm lib/libpanelappletmm-2.0
-@dirrm include/libpanelappletmm-2.0/libpanelappletmm/private
-@dirrm include/libpanelappletmm-2.0/libpanelappletmm/
-@dirrm include/libpanelappletmm-2.0
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm.h
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/applet.h
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/enums.h
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/factory.h
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/init.h
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/private.h
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/private/applet_p.h
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/private/enums_p.h
+include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/wrap_init.h
+lib/libpanelappletmm-%%VERSION%%.a
+lib/libpanelappletmm-%%VERSION%%.so
+lib/libpanelappletmm-%%VERSION%%.so.1
+lib/libpanelappletmm-%%API_VERSION%%/include/libpanelappletmmconfig.h
+lib/libpanelappletmm-%%API_VERSION%%/proc/m4/convert.m4
+lib/libpanelappletmm-%%API_VERSION%%/proc/m4/convert_libpanelappletmm.m4
+libdata/pkgconfig/libpanelappletmm-%%API_VERSION%%.pc
+@dirrm lib/libpanelappletmm-%%API_VERSION%%/proc/m4
+@dirrm lib/libpanelappletmm-%%API_VERSION%%/proc
+@dirrm lib/libpanelappletmm-%%API_VERSION%%/include
+@dirrm lib/libpanelappletmm-%%API_VERSION%%
+@dirrm include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm/private
+@dirrm include/libpanelappletmm-%%API_VERSION%%/libpanelappletmm
+@dirrm include/libpanelappletmm-%%API_VERSION%%