-Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.

-Update libtool and libltdl to 2.2.6a.
-Remove devel/libtool15 and devel/libltdl15.
-Fix ports build with libtool22/libltdl22.
-Bump ports that depend on libltdl22 due to shared library version change.
-Explain what to do update in the UPDATING.

It has been tested with GNOME2, XFCE4, KDE3, KDE4 and other many wm/desktop
and applications in the runtime.

With help:	marcus and kwm
Pointyhat-exp:	a few times by pav
Tested by:	pgollucci, "Romain Tartière" <romain@blogreen.org>, and
		a few MarcusCom CVS users. Also, I might have missed a few.
Repocopy by:	marcus
Approved by:	portmgr

2 files changed, 11 insertions, 23 deletions

diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 58b01d195b87..7ad2b3d27ce4 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -22,29 +22,17 @@ USE_BZIP2=	yes
 USE_GNOME=	pkgconfig glib20 gtk20 libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:110 autoconf:262 aclocal:110 libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 DESKTOP_ENTRIES="Ochusha" "A GUI BBS browser for 2ch.net" \
 		"${LOCALBASE}/share/ochusha/ochusha32.xpm" \
 		"ochusha" "Application;Network;" \
 		false
 
-ACLOCAL_ARGS=	-I "${ACLOCAL_DIR}" -I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	-c -a
-
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.* | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-DG.*_DISABLE_DEPRECATED||g'
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure \
 		${WRKSRC}/libmodifiedghttp/configure ${WRKSRC}/libmodifiedgtk2/configure
 
-pre-configure:
-	@echo "===>  Regenerating ${WRKSRC}/libmodifiedgtk2/Makefile.in"
-	@${RM} ${WRKSRC}/libmodifiedgtk2/aclocal.m4
-	@${RM} ${WRKSRC}/libmodifiedgtk2/Makefile.in
-	@(cd ${WRKSRC}/libmodifiedgtk2/ && \
-	${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} && \
-	${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} && \
-	${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF})
-
 .include <bsd.port.mk>
diff --git a/japanese/ochusha/files/patch-for-glib b/japanese/ochusha/files/patch-for-glib
index b428f66b78ac..b3aa39295eeb 100644
--- a/japanese/ochusha/files/patch-for-glib
+++ b/japanese/ochusha/files/patch-for-glib
@@ -1,11 +1,11 @@
---- libmodifiedgtk2/Makefile.am.orig	Sun Jul 16 23:43:53 2006
-+++ libmodifiedgtk2/Makefile.am	Sun Jul 16 23:44:27 2006
-@@ -21,7 +21,7 @@
+--- libmodifiedgtk2/Makefile.in.orig	2009-07-13 16:14:33.000000000 -0500
++++ libmodifiedgtk2/Makefile.in	2009-07-13 16:15:05.000000000 -0500
+@@ -222,7 +222,7 @@
+ libmodifiedgtk2_la_SOURCES = $(LIBSOURCES)
+ libmodifiedgtk2_la_LDFLAGS = -version-info $(SOVERSION)
+ localedir = $(datadir)/locale
+-AM_CPPFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
++AM_CPPFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DGTK_COMPILATION
+ all: $(BUILT_SOURCES) config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
  
- localedir		= $(datadir)/locale
- 
--AM_CPPFLAGS		= -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
-+AM_CPPFLAGS		= -Wall -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -DGTK_COMPILATION
- #AM_CPPFLAGS		= -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -Wall $(GLIB_CFLAGS) $(GTK_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -pg
- 
- marshal.h:	marshal.list