Update to 2.6.0

5 files changed, 27 insertions, 77 deletions

diff --git a/devel/glademm/Makefile b/devel/glademm/Makefile
index abfca1ced425..f5932cd9653c 100644
--- a/devel/glademm/Makefile
+++ b/devel/glademm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	glademm
-PORTVERSION=	2.0.0.1
-PORTREVISION=	2
+PORTVERSION=	2.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://home.wtal.de/petig/Gtk/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
@@ -19,19 +18,24 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnometarget
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
 USE_GETOPT_LONG=	yes
 
+PLIST_FILES=	bin/glade-- bin/glademm-embed
+
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${RM} -f ${WRKSRC}/src/getopt.*
+	@${RM} -f ${WRKSRC}/src/getopt.*
+	@${REINPLACE_CMD} \
+		-Ee '/^@AMDEP/!s|getopt([^[:space:]])+||g' \
+		-Ee '/^@AMDEP(.)+getopt/d' \
+			${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} \
-		-e 's|automake-1.7|automake18|g' \
-		-e 's|automake-1.5|automake15|g' \
-		-e 's|automake-1.4|automake14|g' \
-		-e 's|autoconf2.50|autoconf259|g' \
-		-e 's|autoconf2.13|autoconf213|g' \
-		${WRKSRC}/src/glade--.cc
+		-Ee 's|automake-([[:digit:]]+)\.([[:digit:]]+)|automake\1\2|g' \
+		-e 's|autoconf2\.50|autoconf259|g' \
+		-e 's|autoconf2\.13|autoconf213|g' \
+			${WRKSRC}/src/glade--.cc \
+			${WRKSRC}/src/Cxx.cc
 
 .include <bsd.port.post.mk>
diff --git a/devel/glademm/distinfo b/devel/glademm/distinfo
index 7d9f87a78846..6f30275a658c 100644
--- a/devel/glademm/distinfo
+++ b/devel/glademm/distinfo
@@ -1,2 +1,2 @@
-MD5 (glademm-2.0.0.1.tar.gz) = 82cae27b35978b1122abb138cc1683d4
-SIZE (glademm-2.0.0.1.tar.gz) = 535309
+MD5 (glademm-2.6.0.tar.gz) = e88be4e895ff3b99d8ae39e799b714a2
+SIZE (glademm-2.6.0.tar.gz) = 551629
diff --git a/devel/glademm/files/patch-src::Makefile.in b/devel/glademm/files/patch-src::Makefile.in
deleted file mode 100644
index 83f92b76016b..000000000000
--- a/devel/glademm/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/Makefile.in.orig	Sat May 24 19:33:07 2003
-+++ src/Makefile.in	Sat May 24 19:34:33 2003
-@@ -142,12 +142,12 @@
- 
- glade___SOURCES = Cxx.cc Cxx_Fileset.cc Cxx_Fs_Signal.cc Naming.cc Tag.cc \
- 	TagStream.cc Widget.cc const_contained_iterator.cc glade--.cc  \
--	getopt.c getopt1.c strsep.c WidgetFile.cc ChildParamList.cc \
-+	strsep.c WidgetFile.cc ChildParamList.cc \
- 	GladeTag.cc
- 
- 
- sanity_checks_SOURCES = sanity_checks.cc Naming.cc Tag.cc Widget.cc \
--	const_contained_iterator.cc getopt.c getopt1.c strsep.c \
-+	const_contained_iterator.cc strsep.c \
- 	TagStream.cc Cxx_Fileset.cc Cxx_Fs_Signal.cc Cxx.cc WidgetFile.cc \
- 	ChildParamList.cc GladeTag.cc
- 
-@@ -166,7 +166,7 @@
- 	File_type.hh Naming.hh Tag.hh \
- 	TagStream.hh Widget.hh WidgetFile.hh WidgetMap.hh \
- 	Widget_iterators.hh Widget_type.hh \
--	getopt.h strsep.h GladeTag.hh stringtok.h
-+	strsep.h GladeTag.hh stringtok.h
- 
- 
- LDADD = `cat writers/libwriters.a` SourceWriter/libSourceWriter.a
-@@ -188,7 +188,7 @@
- 	Cxx_Fs_Signal.$(OBJEXT) Naming.$(OBJEXT) Tag.$(OBJEXT) \
- 	TagStream.$(OBJEXT) Widget.$(OBJEXT) \
- 	const_contained_iterator.$(OBJEXT) glade--.$(OBJEXT) \
--	getopt.$(OBJEXT) getopt1.$(OBJEXT) strsep.$(OBJEXT) \
-+	strsep.$(OBJEXT) \
- 	WidgetFile.$(OBJEXT) ChildParamList.$(OBJEXT) \
- 	GladeTag.$(OBJEXT)
- glade___OBJECTS = $(am_glade___OBJECTS)
-@@ -204,8 +204,8 @@
- rexml_LDFLAGS =
- am_sanity_checks_OBJECTS = sanity_checks.$(OBJEXT) Naming.$(OBJEXT) \
- 	Tag.$(OBJEXT) Widget.$(OBJEXT) \
--	const_contained_iterator.$(OBJEXT) getopt.$(OBJEXT) \
--	getopt1.$(OBJEXT) strsep.$(OBJEXT) TagStream.$(OBJEXT) \
-+	const_contained_iterator.$(OBJEXT) \
-+	strsep.$(OBJEXT) TagStream.$(OBJEXT) \
- 	Cxx_Fileset.$(OBJEXT) Cxx_Fs_Signal.$(OBJEXT) Cxx.$(OBJEXT) \
- 	WidgetFile.$(OBJEXT) ChildParamList.$(OBJEXT) \
- 	GladeTag.$(OBJEXT)
-@@ -229,7 +229,6 @@
- @AMDEP_TRUE@	./$(DEPDIR)/Tag.Po ./$(DEPDIR)/TagStream.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/Widget.Po ./$(DEPDIR)/WidgetFile.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/const_contained_iterator.Po \
--@AMDEP_TRUE@	./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/glade--.Po ./$(DEPDIR)/glademm-embed.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/rexml.Po ./$(DEPDIR)/sanity_checks.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/strsep.Po ./$(DEPDIR)/test_matches.Po
-@@ -334,8 +333,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Widget.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WidgetFile.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/const_contained_iterator.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glade--.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glademm-embed.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rexml.Po@am__quote@
diff --git a/devel/glademm/files/patch-src__Configuration.hh b/devel/glademm/files/patch-src__Configuration.hh
new file mode 100644
index 000000000000..6094aa290085
--- /dev/null
+++ b/devel/glademm/files/patch-src__Configuration.hh
@@ -0,0 +1,11 @@
+--- src/Configuration.hh.orig	Mon Apr 25 13:12:16 2005
++++ src/Configuration.hh	Mon Apr 25 13:12:40 2005
+@@ -145,7 +145,7 @@
+      verbose(),
+      // had been "_glade"
+      template_postfix("_new"),
+-     source_suffix(".cc"), header_suffix(".hh"),  gettext_source(),
++     source_suffix(".cc"), header_suffix(".hh"),  gettext_source(GT_NONE),
+      custom_signal_args("")
+    {  if (gnome2) select_Gnome2();
+       else select_Gnome1();
diff --git a/devel/glademm/pkg-plist b/devel/glademm/pkg-plist
deleted file mode 100644
index a95934abc17a..000000000000
--- a/devel/glademm/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/glade--
-bin/glademm-embed