From af1fc7a24eda71b11fbfc0bc73c1d53d079e5b57 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 2 Aug 2009 19:36:34 +0000 Subject: -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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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" , and a few MarcusCom CVS users. Also, I might have missed a few. Repocopy by: marcus Approved by: portmgr --- devel/gaul/Makefile | 5 +---- devel/gaul/files/patch-Makefile.am | 11 ----------- devel/gaul/files/patch-Makefile.in | 11 +++++++++++ 3 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 devel/gaul/files/patch-Makefile.am create mode 100644 devel/gaul/files/patch-Makefile.in (limited to 'devel/gaul') diff --git a/devel/gaul/Makefile b/devel/gaul/Makefile index a149175fe69f..8ffe4aed7f29 100644 --- a/devel/gaul/Makefile +++ b/devel/gaul/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2 MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= automake:19 libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -31,7 +31,4 @@ USE_LDCONFIG= yes post-patch: @${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/configure -run-autotools:: - (cd ${WRKSRC} ; ${ACLOCAL} ; ${AUTOMAKE}) - .include diff --git a/devel/gaul/files/patch-Makefile.am b/devel/gaul/files/patch-Makefile.am deleted file mode 100644 index 067456489e7f..000000000000 --- a/devel/gaul/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.am.orig 2009-01-19 02:10:49.000000000 -0500 -+++ ./Makefile.am 2009-01-19 02:11:12.000000000 -0500 -@@ -30,7 +30,7 @@ - # require automake 1.4 - AUTOMAKE_OPTIONS = 1.4 - --SUBDIRS = util src tests debian . -+SUBDIRS = util src . - - # Configuration process should create gaul.spec from a gaul.spec.in file. - EXTRA_DIST = gaul-devel.spec gaul-devel-noslang.spec autogen.sh diff --git a/devel/gaul/files/patch-Makefile.in b/devel/gaul/files/patch-Makefile.in new file mode 100644 index 000000000000..f7b3be56e226 --- /dev/null +++ b/devel/gaul/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2009-07-13 13:34:54.000000000 -0500 ++++ Makefile.in 2009-07-13 13:35:06.000000000 -0500 +@@ -235,7 +235,7 @@ + + # require automake 1.4 + AUTOMAKE_OPTIONS = 1.4 +-SUBDIRS = util src tests debian . ++SUBDIRS = util src . + + # Configuration process should create gaul.spec from a gaul.spec.in file. + EXTRA_DIST = gaul-devel.spec gaul-devel-noslang.spec autogen.sh -- cgit